diff --git a/Manifest b/Manifest
index 5f8f12963886..9931c03effa8 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29293 BLAKE2B aa75e03fcc6d60f1c96cc07697af2d9b245eb7cf8a204a5c7886c18d8c78e0729a2dd686908308516e1a72e838f2bf937888af85ba93b073e990c784ac640066 SHA512 89d1f93f1517cc6a373832498b31dfce1cf06394382c65901c6de996a7cd49dd280540110bb54ec6ff5f092f8a93922fdd4d29f8ab91ce8bfb88a545dd3a9d41
-TIMESTAMP 2020-12-01T06:38:46Z
+MANIFEST Manifest.files.gz 29281 BLAKE2B 7d9739436e01310bdf0ea1d09d24d40cd57b6204d326cf7ea3f4adb362838b570cddda2cb7b77c5f81a1b7cd9159e2f93c10b2f0f7aab0b7479bbaf30f2867a0 SHA512 3cee24d5dc40142a4eb679f7184792fcf23f6cd4bffcee236969c3dcd7fb64d3402420c630e90b0dd378d2f87038389855f191fd0aa26555aa8d06de26fc5da5
+TIMESTAMP 2020-12-03T08:08:32Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/F5PZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/InQBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCSXg//fFnpSglpQV0PJR0BVV8MDJVxLkCZgqDu5xoWWn25IW4x7YM8eGfhtY9X
-a78jMK2mSEBm9ZxSom+4YLulJdootMCqLcYFhji0wlXVavPivzk0LOTEzLaSdyT3
-HGxzAy09t94bKpeH3t1lWE3SYz1uIaa1BRNKB7NNtZ5Hj5ORRzUEvB94HZ2tJKWG
-yreSjnsSxxAaMRYxjNQkQw4ZVPwg8Ejuk7YZ27Mee7mgw0HRrCwsBJq93BCr9VP3
-HTbuDTOUHSHhyj325kuA+lpP2UpOI4XWqPiJuPELdGLu//8e8ARPiA1eNVpvkluM
-SkSdkSHAzpizw6b6mw10RoMBIhzkG3SQKoBT38jyzMV0YvWL4hxZqN4+4ctilMCv
-hdy7ZjwzCw7cNpJs4cxHGaety1Uw5GTaSf6sqfCSQOXAfwWXUyCczGI3n0Gp0vK4
-/R6Tf+npTrUsjdPGa5DWnq2bAuRrYR/tQ21tg2FbMhBUtp/aAOeGJCRz41EDQ87T
-OruWeBY/fmBJvnxjv44ItmxlcxCztlrN3q9uHi+4U3YLlQ9f3IlWppXJ6OPgxXUf
-t15RHop7JMaoIKnWX5WIJckUti76iHCHsHa1BT7owvc/NDW91KUnLO8VCTQH9yca
-n0NYuZqD9E6L4ScPW7Oj6ThQTpOpHq1w984tBIsLWylGd5EYWFI=
-=fhBK
+klAClw//XHLZJJFr5Y6Yk4zkOHdY/vPzKmeqCb8RoHLHb8TgCtZWR7vmAZ0DABgR
+3Zp2iYtNJ8Kek1/+9b/cK3TwedAx7RU/+sMQxqzCt8PZoA+19igj3zAFufPESRWF
+iRsUpYXj/RULojbvqzUYiLDzqcO+uAh5Gei9z98Wb45iKM80MgyOizKV4NHF7Umz
+4r7MBgzEexwQFi3t5hyvjvZpX/7kyDtJQc3yFtW3GfMRTvgZ9ZMSg7I+JzLDT5MI
+uDPBEiIRs36kadyBKDxbXL5jzzmI5ai0g3l8LmpmHcgRvmxFazbTAUPvt6CH1bFS
+EXu3E11hnSmBIw9acQJcPzmDhZDAYbo2n8OJjF7aNrY5pkioPXdzms94HAh+bwU7
+atpt+RB/RqenwAxnpASCIorzmldKUNGBDFwrBxBP9tM37HQxTP4oMrjEa+vtUlqS
+Br3fFkMIlI47EXT+gemPPB0YPHQVo7tkVg6sBSwLH3EGbhDRu3BmFcCnnDlbPpVp
+XqaqB+Oc2gbSNGxlhkg/hl/SfCglnhf0eRpwtN1IgG5GDh+pmjVx/AGxtSAEb82X
+8EBmvjoCWb5FYzazUwpo+Q0nmFXrvNndnUXx6PMc3o6/alDmGLgJC3DIyJWUgfeH
+90C4SMZh6+dk+y4JK3q653t1+tqXLB3tLlFoqAZGCmZIp3rON4A=
+=WnTE
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index aab2302b22d1..58703b3869c2 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index e27f2aae761e..ca4cd7b15f56 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/gatling/Manifest b/acct-group/gatling/Manifest
index cb4746735e38..f6e9e9fefbba 100644
--- a/acct-group/gatling/Manifest
+++ b/acct-group/gatling/Manifest
@@ -1,2 +1,2 @@
-EBUILD gatling-0.ebuild 180 BLAKE2B 992ae8da6fb672543038babfafaf58609c3ade4986626ec7fea19be252e8254336c0fcaba81ae8860468ee6996c7d2876424697f99529236a820e0f5f1c2b620 SHA512 2ac477a365f895a2837fbddae08a828cc2388db38433361eb50a54be0992cda15a305471ba6e6257fc1bbf6b14f7231207fcc91f7755f74d86378b736313d7d4
+EBUILD gatling-0-r1.ebuild 180 BLAKE2B f12c244d50cc81d30cdc906d8ccc0eacb4b7e02b3d5178194dbe14ece4dceb1f081642beafc4c55af73ee811fec61e9137bc366ca404ec0dcb696fbdb91f5bd2 SHA512 d6191769820fc8505aca4cdafe9bbbcd83ffcc18f3f44229512e174fbb3e8a40303b419b2ce4016707267887e99b56355ff719ffc6a185400af5dfc47aa815a0
 MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138
diff --git a/acct-group/gatling/gatling-0.ebuild b/acct-group/gatling/gatling-0-r1.ebuild
similarity index 73%
rename from acct-group/gatling/gatling-0.ebuild
rename to acct-group/gatling/gatling-0-r1.ebuild
index b4d3a3313de2..54710451d35d 100644
--- a/acct-group/gatling/gatling-0.ebuild
+++ b/acct-group/gatling/gatling-0-r1.ebuild
@@ -5,4 +5,4 @@ EAPI=7
 
 inherit acct-group
 
-ACCT_GROUP_ID=500  # matches acct-user/gatling
+ACCT_GROUP_ID=364  # matches acct-user/gatling
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index ae92dc66614c..581b41fa3a83 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/gatling/Manifest b/acct-user/gatling/Manifest
index 99529d11a380..e5245b0946cc 100644
--- a/acct-user/gatling/Manifest
+++ b/acct-user/gatling/Manifest
@@ -1,2 +1,2 @@
-EBUILD gatling-0.ebuild 262 BLAKE2B e19b7c7aae6e958100e9ecb5d43576a1a0616f3de42c962be015602663ad0420885bf6eb4bc035de1489a341184b082c942581446747ecec251bcb34cc2525b3 SHA512 01e0d77e27983527461650eaf3e38ea593dd0c462d439c81af1b9f26b083246cf9508052d029647c8205651b8a824c68c06fc01d37fbe411c74209978668eb55
+EBUILD gatling-0-r1.ebuild 262 BLAKE2B 17fee8322babc572c3bc7175237b7397ad25922492b6814657c823ad8543fdea26c47408deb115ae522494f7a2c4c7ba410931018fe94e507f2c79f021c451bf SHA512 a68a764a03961c3b56398a9d8eef1e9c371b4534ac9274e57c5ae6aa8b64007335a7dafa875a907803446d57338da16eff590e26238a90e77488d2d585e97606
 MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138
diff --git a/acct-user/gatling/gatling-0.ebuild b/acct-user/gatling/gatling-0-r1.ebuild
similarity index 82%
rename from acct-user/gatling/gatling-0.ebuild
rename to acct-user/gatling/gatling-0-r1.ebuild
index d32f48ebb8fa..ea4d268d2c40 100644
--- a/acct-user/gatling/gatling-0.ebuild
+++ b/acct-user/gatling/gatling-0-r1.ebuild
@@ -7,6 +7,6 @@ inherit acct-user
 
 ACCT_USER_GROUPS=( gatling )
 ACCT_USER_HOME=/var/www/localhost
-ACCT_USER_ID=500  # matches acct-group/gatling
+ACCT_USER_ID=364  # matches acct-group/gatling
 
 acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index e98bb2a464d6..e7c99ec678b9 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 baaa17b89c69..2a349ef7a814 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,5 +1,5 @@
 DIST ansible-base-2.10.2.tar.gz 6023200 BLAKE2B 80abfa3fab56d3f997cbe90b557ffd5004b216709d6ba2c6d50ea0fb7a2e5a2ad49ce83bfc7a17054582e786f53ce29814d8b5a3fc2408a1e729b1647619080c SHA512 2ee60303841e88d3451ddbcc4c18473d3a37253873406b0783816b1bbf9d8404599ebed12bac7c7f32693314048668b84f3a1c593621c7b8c37a7b48687c769b
 DIST ansible-base-2.10.3.tar.gz 5836841 BLAKE2B 000ee1e369beb450a9a58680030fc7605f62020a28f0ec4634569be0b12ca54c79d0c36a6022895f93b6f8449b8f8483e07590eeea233383490600bbce600aff SHA512 4da2c79c7d990bbe07e136447643484d947e512693194017623deadd88d6556dac67865069182059ae2daf82a13876600dc5472712d6ab6e0556cb829fce3b5b
 EBUILD ansible-base-2.10.2.ebuild 1943 BLAKE2B 30d354d1f5dbd1d9245552b7a992d88f3184655344f29b13f5dd8f2ccc3c838ff4c715a5cc0c72d9b7932a72075b0f769a7c759b248e60dbd80a0b3f003c9216 SHA512 ebdf8075dbf9abd8006b9a2dcf6f8417a2b9fb596ca3e79fe4a1c60e2f80cff1f8192080b0b492dd43c36366c78b9405759834cb0ce5ed213e10682355d6e050
-EBUILD ansible-base-2.10.3.ebuild 1946 BLAKE2B a6027d8b698968a9096acfac7f206704f9ab46a187e5df8c982469e4afa522d2de9e634ebf3d44de3739bdecef79bb86f053c968bbd244b9e67316cbcd42e731 SHA512 70bfc7aee70fb3dbe70b393fb16bddab0e9d7b809671e3e31b9f9e931f0d6649c069c66f1272392b160274b77adcc29083118f8c202debc98b34f7c2926a0dc2
+EBUILD ansible-base-2.10.3.ebuild 1944 BLAKE2B 8972d803f45566fd5289ee63438fcb1c196bc76e3ca74a2956eda7b225e9bc597f16d36cb7f357bb8575fd8be33998081f895902e91440893206c2b5171d0e55 SHA512 4cf2a3999cfe6a41249ab1e59131fc1f3b3aded75145447e49bc54bc47daea0ca302f54d706131e32e6cb14d07901791aa36ec90843d4263fe502c322e291d24
 MISC metadata.xml 1266 BLAKE2B 449ac5109e0fb6b64d32185f0660ce6e8c3828a830f8516d680f47ebc25aef880ab5116103d67cfba02e04b1ad496917fbf67252b7bfc062d828e22f15b961fd SHA512 95d52b68b5b3efad6d8575741430b2d1c18a7c7b41a1374229763fea7c599f3ff2b46dee51845e20388829faa4246e5a05011e61254e91d10709457a4b822f0f
diff --git a/app-admin/ansible-base/ansible-base-2.10.3.ebuild b/app-admin/ansible-base/ansible-base-2.10.3.ebuild
index c30b5bcbb879..020fba19e139 100644
--- a/app-admin/ansible-base/ansible-base-2.10.3.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.10.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index b3d3d1a1d5ca..9206e9df00d6 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -2,6 +2,6 @@ AUX ansible-2.10.0-CVE-2020-25635-6.patch 2961 BLAKE2B bd023424bb075a743881056d6
 DIST ansible-2.10.0.tar.gz 25454980 BLAKE2B 91f930518b90b36aa2c21f553092233059fada86fd1674c9c6e881484b1bd4e68a3eaa05d82e15115906e55da99c43394c3de36a898e26bb222f780b82f8a5bd SHA512 878036f06e1705e4392223bda210b2acae0232069d0cec02a47f13f6b3bc6c9538fb515a2d2dc6003695bcf0915fdd3dfc5b8dc59355e37e2ca8fa48bbd79657
 DIST ansible-2.10.1.tar.gz 25851704 BLAKE2B f9f42ab9f7864a48f0d960b4e8149dfba3ece6c4b01c08db59f9ba5fbcd39771c7b315bf7c9853641d15c2bb6319c9b9ebc791440fc8933780895024c9b74c12 SHA512 46bbbfb22e5c3715df0069d420b174877dffd59f91613779e7057648d15751d528a9cb57357709d0c04a507a60e20c87b109ba1904e1f313441cf5832ba93b5e
 EBUILD ansible-2.10.0-r2.ebuild 1985 BLAKE2B 30885a55981450ae698183239f9659e770e5afafb774722dc4dfeb48789c3b4e8985f39e917ff497911f84363dceaf1bdf7c2d45537c8f6e3bf21e57fc88a67e SHA512 e48e28eaf5ee8bfa2e54e3245b448105e6687cca172ba1f3fba5b68b2c165a16045d94f5794b936426658bdc53883342aaf7fc7a4eb4bb7ef7b3bb8bc0e014b9
-EBUILD ansible-2.10.1.ebuild 1923 BLAKE2B 63317a87180642d280eabbb19f5858b3d45a87b6aa503ff2f86bfb0d04accbbf2269ad6ede57b6617d3e7252844f0839e487f06c87abe5062eed2be02cdbe0ae SHA512 57478bab16bb0432ef913f8402ac239b7882d47d7c1e4c0c01c01607c35b0604d1c0f9eabb816f0fd3164373fe7bb3dab020c5876515ea100c135ed2e6de19cb
+EBUILD ansible-2.10.1.ebuild 1908 BLAKE2B 009631ae1683884cc6f0c7ee1de1849944e8ab6d967554fa19904a9d959dd6e63603a40ff2fb6b70b20c22211b03efb5ac65932d4aafb0e39aefff3017c4e8f3 SHA512 a53a5352f6f13e295bf93d27fba404b59ead3dfadd9d51472c22c9a6b2b3638c95961e262d55e8345de41f3ad76c2190c2bc852bbdfc57e4c1d614eaf33f7a2b
 EBUILD ansible-9999.ebuild 1937 BLAKE2B 98ab62b10f1d118b9d491639800cf12c61d89c76d7c825bee3f944baec488d7de3ac699e8e4ee024ce80b97ecc5625fdffa04c32b1a6590c3c2dd73103b9ca60 SHA512 c067bbb92042d932316ee2a26f43f974586eff96b8f5f679a8b51e4a66f2e6a7c532edc0d0bf996bf665a875c7af61e29d6fb5ac1b4ac10896140e77004778c8
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.10.1.ebuild b/app-admin/ansible/ansible-2.10.1.ebuild
index 3bfcb1fab2c6..e14d7dc95522 100644
--- a/app-admin/ansible/ansible-2.10.1.ebuild
+++ b/app-admin/ansible/ansible-2.10.1.ebuild
@@ -15,10 +15,9 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
-	KEYWORDS=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index 295e78838889..2316fdd0f838 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -4,6 +4,6 @@ AUX clsync.initd 555 BLAKE2B 18b3f0e1e8e079eb306709d2b55b99100ce3efa852f285d7ac9
 DIST clsync-0.4.4.tar.gz 268276 BLAKE2B 0027760cfdee5c4410c4cea45aae2def6498d812d2f50038993c39a33c6029722ec2dd2cfff20815a3ffd8834eb8c439059e5f1d2cc3d2cf98ecb22ed22f2322 SHA512 cdafbf43fdeafe9cb53c08e0514ef356fb5b4bbd8da2226263180e7441d222c76e6c73f847f484b3688a8672e4a85df0346c0236d8d0ed4506d209189af02dcd
 DIST clsync-0.4.5.tar.gz 276096 BLAKE2B 4fa534b342a806ca691f8a65455cb800800f7a943fa3f0913a26c37d2cd0f9d762630ad01eeb80bdd0d90a0731bed5f2aa60444a654972da9479c116e0e937aa SHA512 6568f3c49ac4fe11e54593ba23eed392d0b7d9b5bf052983c4a5a2befbb807dbd3f9d13412264f8909998702f869d1cd6db77d89bd9491414b1f3213437c5212
 EBUILD clsync-0.4.4.ebuild 2832 BLAKE2B b741cb0c391ae3bf8599d7013cd1a9f0a3680e61474312701775c2a3ef9c998cf547c83311d2d47ea377279aefdec794def5fcdb0d29aac04442da772871fe97 SHA512 239f53bda723da6e72852ef46fba96a30d6c1bf71623df6248ec113ce202b981bd9980deadcc2833c9a3796d16dce2d3f02947d1f07b16d6386d453f2e5b6f34
-EBUILD clsync-0.4.5.ebuild 3787 BLAKE2B bdbe927f14f77f9ce3a456543226dd60ec5ee77fe995b215453f45efeec59a51a69632466c3fe2150884d1a1a13d4bd31ed3f28c77ae92a4c3c70d5297a29322 SHA512 4c8be692a96362156fbb863cb27ca8ea932bfd8a9a46db27c186b8cf5f178d11171718559d0e8719f1f300a87db11a62602db54652fbb4c6995d047e5d985ee3
+EBUILD clsync-0.4.5.ebuild 3789 BLAKE2B 1970640b5658cd7d04bdb158d72b048cd1d14270fbae0b3c9352e317d782c928bd3f75ed70cbcbad5caebe32e51e42b41a6828a206b92ba6141a0f0fcea9b32a SHA512 cc2a15f91a09e2c40a53ee84d4ea818132dfa3f16ff0329284d4bd5150fe738853803fa7da3af72c99ff8501760f26447aee0fced10b9a34496add02667e0ea9
 EBUILD clsync-9999.ebuild 3787 BLAKE2B bdbe927f14f77f9ce3a456543226dd60ec5ee77fe995b215453f45efeec59a51a69632466c3fe2150884d1a1a13d4bd31ed3f28c77ae92a4c3c70d5297a29322 SHA512 4c8be692a96362156fbb863cb27ca8ea932bfd8a9a46db27c186b8cf5f178d11171718559d0e8719f1f300a87db11a62602db54652fbb4c6995d047e5d985ee3
 MISC metadata.xml 2138 BLAKE2B 95be20be2bd87c771de6f49269bfa7e54b2a10f6c0166648130198647fcc37b86dab3501c1df8f5ef211dd0ef04f60244fec80907c95e78efd9f7c6b148023bb SHA512 0a70059c2f24248056a5aade206eafb457b39f37ab559d61284941cfcd6b01ff40328049e2edacd9a8f1a8dbbb313aed4add7092629c6bdfca0c1151ab8d69ca
diff --git a/app-admin/clsync/clsync-0.4.5.ebuild b/app-admin/clsync/clsync-0.4.5.ebuild
index c17448327bb2..ba4c91c7f45d 100644
--- a/app-admin/clsync/clsync-0.4.5.ebuild
+++ b/app-admin/clsync/clsync-0.4.5.ebuild
@@ -6,10 +6,10 @@ EAPI=7
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/clsync/clsync.git"
 	inherit git-r3
-	KEYWORDS=""
+	KEYWORDS="x86"
 else
 	SRC_URI="https://github.com/clsync/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 fi
 
 inherit autotools linux-info systemd
diff --git a/app-admin/gentoo-perl-helpers/Manifest b/app-admin/gentoo-perl-helpers/Manifest
index 3dd34c16fe04..8cf90ca79291 100644
--- a/app-admin/gentoo-perl-helpers/Manifest
+++ b/app-admin/gentoo-perl-helpers/Manifest
@@ -1,5 +1,5 @@
 DIST gentoo-perl-helpers-0.3.1.tar.xz 9420 BLAKE2B dea001473832f4412ae090afbc458720ec1d40d19ac3db3a6a57b26115603f224f2f1c4155ecd3190866dfa0ab648fdd3a98a90e9ed576e7bd3ad8bdaf9a73c6 SHA512 dce6addfebbdfd16da3b580776c34346eb60b2eaef9cc7bed03d5ae0bf028de7a0175fbf7f68113d44b645c3d5ca7f5175389478655b08c115a5342ff930e096
 DIST gentoo-perl-helpers-0.4.0.tar.xz 9580 BLAKE2B daea9e3f43bcd24ea34c9448294fb730595e8a021dffcbbf7f123ff5439455aa362c623affee29341266a0494f4744df0bf195d2db422d6276eb54fdca07149c SHA512 fbbd33122028ad12cbec7adbc97faaa32aa485ef21ca38dc2e1906610fdea7709e5da7e8164f5f86afa3607928837f3b35468274b6c626e3bd843432d780701b
 EBUILD gentoo-perl-helpers-0.3.1-r1.ebuild 1255 BLAKE2B 59495c331a5363515ee725ca8ed048454023aa5b68db0d28e11d3d10df091a06b8790e5af778da55525bd04266e8107060f0a626c318582bfee92dcfe4f3aca5 SHA512 2dad7ad8fb595480d533a31e6c4b2c79b0975aec0e1782e17e3ead8e10ea3298217f66f2665977f511d9feb5aae536e74979a9d5cddca8250008a157c8aa937c
-EBUILD gentoo-perl-helpers-0.4.0.ebuild 1283 BLAKE2B a988fc2e412b33d6be7f170d74371e731f490cf4c6e0a8962829e0b35318a08ea812ca35f528095dbdff3c0caba8ba489ada39dc54139b26501cbb985055fcca SHA512 7a1853c7c75edc000e1edf34dc56ef4a5cb516bfd9e5c3b745f42455e6efff8df4b0f1ccfb17a8d5b8c0ec25c93c52cd558daeff7b2ea47831a04a25a7928086
+EBUILD gentoo-perl-helpers-0.4.0.ebuild 1282 BLAKE2B 3ea08b23c7e605a60b4a8492fda7eb065aa1e8d1dcdff2dc823af1e308f378dadb501d8f1808a5788defb41b7a045a4f427132d5a04411c319d0d6437b51c4fb SHA512 2acaa107856071b49e7c389c64c0cb5328eee72080d3efe7453bab8ee5f0a66e1111c5b62e00641f5841d586e1feae89a620364dc3b086f554d5440e10e4077f
 MISC metadata.xml 453 BLAKE2B 0a9ea49a54e1b0ac4c4d98615b15251770556bfe672eea650b8b52ac7dc9a0492d3456b894b8724c033aa272567bb0c7ad4847451ed3f29fd5aa365ea2e2d315 SHA512 a32d375d6aa0ac38a20cdec805c887be0d6493be5d47572a0e950e1f4a8b28018ab364cd06668ff59c52fe89487853c9c4bffdf05b79913c691d99fdc848b201
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild
index af74800de564..4304f8dd6662 100644
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 "
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE=""
 
 # Assumed System:
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 71bd136662f2..3687d7dbc851 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -6,5 +6,5 @@ EBUILD glance-20.0.0.ebuild 5110 BLAKE2B 1aaadeba8df184d7a23f179ac02064f06e28b02
 EBUILD glance-20.0.1.ebuild 4944 BLAKE2B ad7aa3abddb652e1303ca822cc9a381c100c9dc88437c2d382643998fa93763c66bff0406b6af945e8557758923a672de21d3ce33c5781c878e8a3f43bd87864 SHA512 2170628269f01c90bd55ea59eba866faf1b1ab88a88ae8808e72f67813e9121a0a82610db1e29ae4f6a32575fd4daf8090c79b0228a7f3f72894118a8d4b2ade
 EBUILD glance-2020.1.9999.ebuild 5112 BLAKE2B f78acaba51de4c25635bc563cb287f28ed10d96a5726f2b749359c60c2a34232e5a1f1854c6593e0a48599e6255c2a718c55b790fef2f1789203fa60ed8a1cb3 SHA512 ddeac42331eed87d97247dd4714d3720930673706d5fd268fd0a38e4c581423e32ffebc460b2b6b2a3aa34fdb63dbdcf8ffce14daa5394c84aae16204dd721c3
 EBUILD glance-2020.2.9999.ebuild 4980 BLAKE2B ab065aba9f5bd64913a68ca382533f2224416fc60aaa8469299c502a8fbe0b762168a9a1d17d068c6138ec088c596e2a706b2bea77cc12f4a7167aab029c1f4b SHA512 8f0515e8fb4ec8991e3503ad599f6e4a8065f33c29e0e87c7f96ce793757f7290c021b1f2d4c421958eb416042bbd00acc85dfd3dec8561d9edfe4f2390c4632
-EBUILD glance-21.0.0.ebuild 4980 BLAKE2B ab065aba9f5bd64913a68ca382533f2224416fc60aaa8469299c502a8fbe0b762168a9a1d17d068c6138ec088c596e2a706b2bea77cc12f4a7167aab029c1f4b SHA512 8f0515e8fb4ec8991e3503ad599f6e4a8065f33c29e0e87c7f96ce793757f7290c021b1f2d4c421958eb416042bbd00acc85dfd3dec8561d9edfe4f2390c4632
+EBUILD glance-21.0.0.ebuild 4978 BLAKE2B bba0baf883fda2a3a8da27ff05d4d8c97a03f6c923f5b7fd7a40baea1bc7029eb3f74e581d8df454c0a370d41428f1bf530b8f4b481a4f788f99e29eded331d2 SHA512 d2e448aa9fec6cb2ce657e5465225b4162adff2556ba17f945e849b658b0c0d0280be63d973f83657ad5a77c4aab0676e8ec7a7a6351b9dc73c46a058a1953fb
 MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a
diff --git a/app-admin/glance/glance-21.0.0.ebuild b/app-admin/glance/glance-21.0.0.ebuild
index dd4a939849af..dc947889962d 100644
--- a/app-admin/glance/glance-21.0.0.ebuild
+++ b/app-admin/glance/glance-21.0.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="stable/victoria"
 else
 	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 9be336735c05..8aaefc04c62c 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -9,7 +9,7 @@ DIST mongo-tools-4.2.10.tar.gz 15026566 BLAKE2B 28dfef83ca4f3e16b4adbfeb26499cdf
 DIST mongo-tools-4.2.3.tar.gz 15020325 BLAKE2B 8501a3ec6e947112ec561ce62f2ea568984f8ac911a7aff3cb8c08c1f29d2cfc64cf7f4b6a24ba73ae0f9b2b5853480f4fbed51c98fdc8c83cd433ea65e21dba SHA512 772719b450f8b656c22ac0126fee1e0fa58b5320c94ac6414b1d9af13e6437393c2482f2e386f4a73c84a2d1bfe0ea88df117a6a7ae87f4884477505cf662585
 DIST mongo-tools-4.2.6.tar.gz 15016596 BLAKE2B 5ee37bf21ea05ec5ba2764c935c1dd3632753e772a01f854dc8a9949620e9a41fe95ba658a0efae0332ed2c059561e39e681f672cf5f4302a7f92c364cfab4b6 SHA512 e91bfba4b015f80d35b6c2ca766c599c5eedea113d6415ec0aef433d46b5e5fe06956481a063e26908a45fdcee4002125ea01a29fa3ea9a541a9210d25625f8e
 DIST mongo-tools-4.2.8.tar.gz 15021497 BLAKE2B e066c299462167754e0752079f35fef25b387eb1df0631ff0e0b783a8a14c4b68c6ed126ec3429f63de87b87b9fdde6a2645badd53ac1386befc7175a61a999e SHA512 c0fca14c60e5f399934f4dfad5be832684d2c1a1145967a4c395b246774f73f71e506bff902a634b7f08f7133304c09f14eb56a1a6fc8585608f537e59d9c899
-EBUILD mongo-tools-100.2.0.ebuild 1383 BLAKE2B 8ecf9efa840b8e6242a36f34aff6f0ebb3cba25905fd488f34477c26133b7a33ef1d4bb0e10734d4faaa856980226533c5c4d0a58a56908b603ee18a4986048d SHA512 17960c5882da9cee65ba4338d9466e94fac20b61b01be65b5cb8bc2318f23a1f9e758ebf300e68809e7095ff12eedc185677ceded5173bd46a726d2e29440e28
+EBUILD mongo-tools-100.2.0.ebuild 1382 BLAKE2B ed2961f956d4dfb2da06270908ac3a5e36d2550e999a88266f30d12c13c6093bd642a4a0d334fe837e6c7b29fce5d54b74d374d3d30c5b8070d047ca04f7b1b4 SHA512 029a86ebf9d7deeddc74270c6ab86ec87e7a539cdae2d07c0a6e8ed0c55261380a7ab78488ce3d10b744bf720f11564df01b403c08701500c2a968169b5797fe
 EBUILD mongo-tools-3.6.13.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
 EBUILD mongo-tools-3.6.17.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe75efb9dd51561f23853b3d03ea7f5b3f766ea8759c9bb7c33c36bcda71ae57ca917154d575efbf6557bc7563e649280 SHA512 f4b4ac41d14bb8ef5a3b61ea18877a9171300c577b14fad7b55957ab5c1baf36af979584d6b0cdfb4987f46e08b0b13b86ab4eb5c8a9aef304fbadf56204102c
 EBUILD mongo-tools-4.0.12.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
diff --git a/app-admin/mongo-tools/mongo-tools-100.2.0.ebuild b/app-admin/mongo-tools/mongo-tools-100.2.0.ebuild
index a60bc8a3e1af..1a7e7c94b876 100644
--- a/app-admin/mongo-tools/mongo-tools-100.2.0.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-100.2.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="sasl ssl"
 
 DEPEND="dev-lang/go:=
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index cccbb81081e3..c6d4f952ebc0 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -3,6 +3,6 @@ AUX setools-4.3.0-remove-gui.patch 879 BLAKE2B d8c61405d96466fbd2f1704477dfbe644
 DIST setools-4.2.2.tar.bz2 237881 BLAKE2B 6c09223e36af4ccf1ab3c194df3a4dd2871887abf25c9bcd66ef3510357f2fb6efef65a8c773267eb951c05e8308b12d96bab8efb65eb07c2ae53be60f045e82 SHA512 03eb9dfa22da6d6cffd1732fbc7d50eb8276c235d29f76b774e190b3f04f3b00533131885c6d4bc3c8dc965526b1bf4d6aec4bb3af193b4eb76a15acaa9f743f
 DIST setools-4.3.0.tar.bz2 249694 BLAKE2B 03d689f0f7dcc5ad7cf1ed114b7466aa0add96b70aa4b4a0a563805ad58cd1bde5651b155d202835e238aee9f07bf7595bfb09c20d2984ef6b921866ac1dca2e SHA512 f2ef045e76223918f16d8b0d8365166d6afa320558269be96f3a8875189607253056179092fb8134aaa2e50a5d0862f246c0aa0f8d33060919f4bc1257c109d8
 EBUILD setools-4.2.2.ebuild 1244 BLAKE2B 12679432d583a6d7cf3bc5b4934afe807baa10beb06cd65554eff037041e4b920ca969cd74e7af575bc14987dd56e5490b54c8b99f31fe93309e30ebebd79800 SHA512 15d41d5cabd0cc8c5f0996379d371342701c42cfbf25e73c72d753bc798fc294ec0e6074b4d04074bc4965bc015acf1d16a083eeef1600b3f57e0eab54a136f6
-EBUILD setools-4.3.0.ebuild 1254 BLAKE2B 1779f71bac2945eca0ffc5fd077b82da117d414412f77d313ab722dff14b2de83728a8da316197798fb8bc7c8466980eb66fa622169c6128e780fcccd53b760f SHA512 2740c48f1b9bcd2faa1390dae29734ff96fb0c4a7fe76e9721bcb6a61562ba72d07530e6ee1860bbb271637adc3e0537d7163cdc0b1e576bfb301502196dd6c2
+EBUILD setools-4.3.0.ebuild 1252 BLAKE2B 26a50f11e28e24367ba07642fdf771a2459d03e524b31b8b970a91fc4e3fe8239e755d8e52067fc2f8bb3f09426b3134a30e520c0bf9b02d237b6fdf54845bb3 SHA512 285f3b7c30a96b8886892231de19a5f2fcaae03661116bb687665a10cbd9f59d4b13d693e1aeb3c06023453be34774c6d3560904b4b95a1a84cee5e3e0b88712
 EBUILD setools-9999.ebuild 1254 BLAKE2B 1779f71bac2945eca0ffc5fd077b82da117d414412f77d313ab722dff14b2de83728a8da316197798fb8bc7c8466980eb66fa622169c6128e780fcccd53b760f SHA512 2740c48f1b9bcd2faa1390dae29734ff96fb0c4a7fe76e9721bcb6a61562ba72d07530e6ee1860bbb271637adc3e0537d7163cdc0b1e576bfb301502196dd6c2
 MISC metadata.xml 334 BLAKE2B 7fa85c132495c221d8618934cfe5481df604ac8c4bf36878f36d8c35b31e923515634124b0e3b9abda16b748a7684463851574a23428dfdc54bd8a7bd3625ad5 SHA512 52b24eea951558dca0db5c046f0a803c94ebd9d9b42b4a317ecd2d60f0dff885872fc3813d94f4c5c5b9ec2696f609f59cb34f406348f3a75c7ce270218d4513
diff --git a/app-admin/setools/setools-4.3.0.ebuild b/app-admin/setools/setools-4.3.0.ebuild
index fd1fb1b07fac..22ab1263f7f0 100644
--- a/app-admin/setools/setools-4.3.0.ebuild
+++ b/app-admin/setools/setools-4.3.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
 else
 	SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index e511ed383d83..fdf855ff693b 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -4,6 +4,6 @@ AUX sshguard.initd-r2 389 BLAKE2B b4098e0baf82e1c1f1978d6b3916fe9f2e67891d02b7b8
 DIST sshguard-2.4.0.tar.gz 771506 BLAKE2B 82e9caf70dc9a1ba9ef6ba1c0916424a74891c84069a4a879c9057f3baea32af68f35d8b31cacdd60d323f5ec7b02a6e12aff1ec72fc0291b74c4882cd441d93 SHA512 64293700ef85f0843c333c3a27b04c5b2f69bf8dddf46353a371d4178915deb931362b3641ded0eeb5365f30cb63ce6ce17256d8d094383d1cfe661065b9c1c6
 DIST sshguard-2.4.1.tar.gz 723940 BLAKE2B 04e72b9959ef3ead418d2a6fe8029b0806a4d91c91f7cd36c236c7203cca1afc67305b21de0b1dee1594b188564f201ff2770d54d4c57c54b4d23db15e0298a0 SHA512 bae7485d963454f2a6dc4b7d96506b03fb49013fe3ab3d81e315ea88bd8067e7a2305cdf25e411720ac014a68ee9635cdbcef65a7dc806b7fc942f099a9d5ba8
 EBUILD sshguard-2.4.0.ebuild 746 BLAKE2B 0284fa3b1f9204fbca96a816efbe9c547556fd3b0cc18c5cf8b35d1e90bed01f4e0db7d0cf1705a575486ef11cbfd609deb8b06eb5c3a841415b853e62d96530 SHA512 8e6a32839fee40b4870ddd1b4308b44c8b3d3a0e9136f269bb935178e9f8551b8194a4a8e6f20f778c4a77ec261009928fa7267f357986ca27617d532360fddb
-EBUILD sshguard-2.4.1.ebuild 748 BLAKE2B ca2ca57e1e8701e864e85ac94eac7f1379376df940719c2248a6eb0ddb96512f0ff26f4c6ca962a9c68534ac15262f0f83c3dc436707ea733516ab4a1e08fbf6 SHA512 5c72d111c83de5dba984cd1bd9d45cc38c069f50382d4429b92f2bcb6cfd324dfd5ae2f335e3563ab24a227d54a9661dda4859b9ee63add76340874d727b7e3e
+EBUILD sshguard-2.4.1.ebuild 755 BLAKE2B 7604917bd565cf777a017f0385fd72e7cdcc3064b4c35d4884f9a6e3d1579a79fc1a7395a5a303bf6532d5c770ad194420e8b47f28b7af7e5edc3bfe4d6bf176 SHA512 92e4232be6d26e533e26265294cdb3da3b76a78e5d1b0559360a60e0fbff70dea032b9c6474ef65181908eca003132d4e7fef462d1902278408033bd050e6f31
 EBUILD sshguard-99999.ebuild 799 BLAKE2B 38b307936f73e2926466241496fdf59a6cf7def5e60405674a1a07666cdbf0042310977e79078352e623244670e22a8cd41b2ff7969b2ca6577441beca55ca69 SHA512 a33dbdc779c7021aecfa9927eb7e41313ce8b82f3509f1a33e8beacae5597db7e8f5b1a1484edee7e03956fe07d9a39717673985bc8988dba0e20835cd722aea
 MISC metadata.xml 348 BLAKE2B 9dd6c721b71bc5c73a367a9a7e4ef55ee0f0805c917968e66788716241db4c4aa4479ceffdb881d26c7da8b53fd2a5db921c7ef4138e9ff5401e621124d0bc19 SHA512 b93ba2b6eb5371962e1565ef4a333b50ba0dc44ae4365486fd55b04bdac546c8ff68fedebbb7a01d3cb4810f48148bfb870bef952b631fca931cf149ea8429ec
diff --git a/app-admin/sshguard/sshguard-2.4.1.ebuild b/app-admin/sshguard/sshguard-2.4.1.ebuild
index 99d5bbe8f103..fc6a2cf36767 100644
--- a/app-admin/sshguard/sshguard-2.4.1.ebuild
+++ b/app-admin/sshguard/sshguard-2.4.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND="
 	sys-devel/flex
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 99f6f92636bc..e720713c4cae 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,6 +1,7 @@
+AUX sudo-1.9.4-without-sendmail_build_fix.patch 1470 BLAKE2B fbffefb687a42cfac19cc1ede970729e17c1771421ff93a9d9c4df96046688b92e838cf48891e67e0ee8ce40b84a19c707a844c83bba2af5eae52caeca334573 SHA512 18d8ef507ce7c4c2ee8d5aed08199d527675a7757e9b1aff819380d156e4427a8c632b8a5cc1eee0698e6d20f2ec569e14d6ba957bb8dec788e75a82b706063a
 DIST sudo-1.9.3p1.tar.gz 3958071 BLAKE2B b681c120faa5dc7f25e27c1be423d68cea70f63dcdfea2183fd386a34dec0376555453399d3f8886c66c6507343648d40b59a058710432154061b210df2a704c SHA512 3ad13fd03e5b371fd6bf7909731ffc11431d2182a744b654f7e5d4b810e47955d49bc78f551afe13ec56acbce694139c33a15bc022cea41b17af5496b8b7f89f
 DIST sudo-1.9.4.tar.gz 3992062 BLAKE2B 65eb8f78eb34ca7009ea0752a1acbfcb4e06ddd7083301736ac1bac7019c1a45cf2c34f69ac5b86fa4ac01310e209f236840712ad4998b692ddf774b9d1bf60d SHA512 682b4d303147193149509b734b64f8541e00ccc1c41468928dff307f9d52f2b1aae005deee1ef5ac389cd3dc506368dba8a78c0392ea1434dd78cf7ef8a08408
 EBUILD sudo-1.9.3_p1.ebuild 6892 BLAKE2B 3ad32318e45533045e40e7d4ad282b5a218c9531d98dda7a6d92bc0568ee874e020f4497811e7e2dad677d8d14962d2e5aadb014d5d1e01a4559fda16867e39f SHA512 34803aae1dd4a8aaa696b7b4c72d69d9dbe08a25072aac9b8a2a3f9e47eed84a9273c2cc6f1c496477a88b8df74e5587cf8761906970d574ea140fd0a41ca639
-EBUILD sudo-1.9.4.ebuild 6901 BLAKE2B 57b94080303df4d32651aab3cd4be8601f59ff13138eb6b8941854255942422d338e47047ff98b1ec9c86863e77f2e1b36901ed001daf715f23b15ae65264709 SHA512 ecb146a12fe3ea3d32ef237e0e67a99d3eadd6ad99997c327eb31027b0f45aa6dbed9dec03ed5c39c62ddd1131762fdc708899e76b2a867416dc0997c1f0727e
+EBUILD sudo-1.9.4.ebuild 6975 BLAKE2B 9d5c62ddbf6011a9fa7578f7b57762f1aa94c275759a087e57f366add38c9385f7acc38d343c6e148c0c11ec0790a7ee3b080ff83ce75e35cf72ea50bdf257d6 SHA512 12737ac1922535b9ff0cf2aa0b4a67af191bb2baaa9f993cc26fb1ced11cf7aa67da76423703d6b8c92dbffe1c629e61cd1f4284cf2e72f241f376ea01f73919
 EBUILD sudo-9999.ebuild 6901 BLAKE2B 57b94080303df4d32651aab3cd4be8601f59ff13138eb6b8941854255942422d338e47047ff98b1ec9c86863e77f2e1b36901ed001daf715f23b15ae65264709 SHA512 ecb146a12fe3ea3d32ef237e0e67a99d3eadd6ad99997c327eb31027b0f45aa6dbed9dec03ed5c39c62ddd1131762fdc708899e76b2a867416dc0997c1f0727e
 MISC metadata.xml 1161 BLAKE2B 0c501bf06edca82993ece857f9f7565f99da15df36c916bc9dc57e78bccf2b247c382e97dd6c97cc7f5375e1a0513c1a30ecbf097516e96319fd1797257fb117 SHA512 d6bc9cf11ea1bd28c19bfe167580556af517d92c958d63cd7872ab5076840eca39a7ab3d1f56e84fc0fcfb675d7a89c23ccdd3629f665c45232be1140eb950ac
diff --git a/app-admin/sudo/files/sudo-1.9.4-without-sendmail_build_fix.patch b/app-admin/sudo/files/sudo-1.9.4-without-sendmail_build_fix.patch
new file mode 100644
index 000000000000..f40bfe445e04
--- /dev/null
+++ b/app-admin/sudo/files/sudo-1.9.4-without-sendmail_build_fix.patch
@@ -0,0 +1,45 @@
+
+# HG changeset patch
+# User Todd C. Miller <Todd.Miller@sudo.ws>
+# Date 1606767492 25200
+# Node ID 41db1aad85bbce444b511bcb28b9628a0a22fcd9
+# Parent  96a5cfe3c66b6ee84d7f7b6fb26d932f45a44b76
+Fix build when configured using --without-sendmail
+Bug #947
+
+diff -r 96a5cfe3c66b -r 41db1aad85bb lib/eventlog/eventlog.c
+--- a/lib/eventlog/eventlog.c	Sun Nov 29 15:11:34 2020 -0700
++++ b/lib/eventlog/eventlog.c	Mon Nov 30 13:18:12 2020 -0700
+@@ -78,7 +78,7 @@
+ static FILE *eventlog_stub_open_log(int type, const char *logfile);
+ static void eventlog_stub_close_log(int type, FILE *fp);
+ 
+-/* Eventlog config settings */
++/* Eventlog config settings (default values). */
+ static struct eventlog_config evl_conf = {
+     EVLOG_NONE,			/* type */
+     EVLOG_SUDO,			/* format */
+@@ -91,7 +91,11 @@
+     false,			/* omit_hostname */
+     _PATH_SUDO_LOGFILE,		/* logpath */
+     "%h %e %T",			/* time_fmt */
++#ifdef _PATH_SUDO_SENDMAIL
+     _PATH_SUDO_SENDMAIL,	/* mailerpath */
++#else
++    NULL,			/* mailerpath (disabled) */
++#endif
+     "-t",			/* mailerflags */
+     NULL,			/* mailfrom */
+     MAILTO,			/* mailto */
+@@ -1436,8 +1440,10 @@
+ 	evl_conf.logpath = _PATH_SUDO_LOGFILE;
+     if (evl_conf.time_fmt == NULL)
+ 	evl_conf.time_fmt = "%h %e %T";
++#ifdef _PATH_SUDO_SENDMAIL
+     if (evl_conf.mailerpath == NULL)
+ 	evl_conf.mailerpath = _PATH_SUDO_SENDMAIL;
++#endif
+     if (evl_conf.mailerflags == NULL)
+ 	evl_conf.mailerflags = "-t";
+     if (evl_conf.mailto == NULL)
+
diff --git a/app-admin/sudo/sudo-1.9.4.ebuild b/app-admin/sudo/sudo-1.9.4.ebuild
index 84770ae1b432..74f99d722acf 100644
--- a/app-admin/sudo/sudo-1.9.4.ebuild
+++ b/app-admin/sudo/sudo-1.9.4.ebuild
@@ -74,6 +74,10 @@ REQUIRED_USE="
 
 MAKEOPTS+=" SAMPLES="
 
+PATCHES=(
+	"${FILESDIR}/${P}-without-sendmail_build_fix.patch" #757819
+)
+
 src_prepare() {
 	default
 	elibtoolize
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index d3b3f5dab6cd..4f3676049464 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 422b9b096cb8..09ff56736b87 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,4 +1,6 @@
 AUX libarchive-3.3.3-libressl.patch 458 BLAKE2B 883523792c0d3e964a2bf9ae40d25a0127e43a2d95e0187d566fd371aa7ecc0861d99ab21641e9f2d6800b36155e3b845c1099ec7b1d3dc0f3c0fe2b78c9e273 SHA512 0a8dfd7f30ca450cf253bd475d328a886957257e1c7c6a6c9eace4cacdefd9f1eaeb4de81ad00a2439bb75336a82b08278f98c6143803f6047159036e848aabe
 DIST libarchive-3.4.3.tar.gz 6990533 BLAKE2B 12f97e8e4032daf0fa8f9e1839f9c7ef80fda0b2a0ba703c67d860437fad6a293484a61417f72eff933179d544cfed45083e7886f462276bc6abbce1097e6256 SHA512 d00167dec6e65a0b17b46a1e3bb0242d85716dbc637afd233360cb515b2750dafe0ff0644b9e01ad23534340b405a8551f496c5e39fba9ee99355a515580d65d
+DIST libarchive-3.5.0.tar.gz 7017726 BLAKE2B 651c9e28d1a1b0a6dd2dbd2aefa0a47ba23d5fb5e96c1bc8c059152952c284f089ce16626b9fbc2cbea70dac2d16ab949235bf4c28f38235f23aeb6da3d69f0d SHA512 9a3d4ce9d4bc856c8d85b846d9d0c9f30369393aa107941c202ba0100c6bac009952c92d809e6981276b3bf91e9f37d018e7f1446b17c0c1c316fe5aafe15440
 EBUILD libarchive-3.4.3.ebuild 3761 BLAKE2B 2d9bcb9f9e0d6ead67db818a64fb611ce6158b0a7b01f20aadbfcb73624db143b399c446e6b1797d25581f7fb89ffe3b9528377f72dfc96cf2f5db7a658e4570 SHA512 346b64cc503f74f0220d319f02fe8c8265c3468c54a5c09df23fd948be20262bd849a34648522f6774854afef004bfefef7fd3f0cc0ee52b1bd18ec99e978924
+EBUILD libarchive-3.5.0.ebuild 3770 BLAKE2B 4807869b7b89b14b1c97218ce92a316de81c806580049e134ebe39688d678462f0e8a4ee790c364ff0a3ec2879840990f6c337b5541e5db3e4f06ac91a133f1b SHA512 2aaa032adff8441721e42e6fe4de0787eaa9602f71f2e60735c6a0fbd388a0137f82e8058b1b635287d790774663575c673cfa5ba2a75a3f9940e81e903c2c00
 MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7
diff --git a/app-arch/libarchive/libarchive-3.5.0.ebuild b/app-arch/libarchive/libarchive-3.5.0.ebuild
new file mode 100644
index 000000000000..dde837017a82
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.5.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="Multi-format archive and compression library"
+HOMEPAGE="https://www.libarchive.org/"
+SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+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 ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
+
+RDEPEND="
+	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	kernel_linux? (
+		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	)
+	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
+	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
+	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	kernel_linux? (
+		virtual/os-headers
+		e2fsprogs? ( sys-fs/e2fsprogs )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.3-libressl.patch
+)
+
+src_prepare() {
+	default
+	elibtoolize  # is required for Solaris sol2_ld linker fix
+}
+
+multilib_src_configure() {
+	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+	local myconf=(
+		$(use_enable acl)
+		$(use_enable static-libs static)
+		$(use_enable xattr)
+		$(use_with blake2 libb2)
+		$(use_with bzip2 bz2lib)
+		$(use_with expat)
+		$(use_with !expat xml2)
+		$(use_with iconv)
+		$(use_with lz4)
+		$(use_with lzma)
+		$(use_with lzo lzo2)
+		$(use_with nettle)
+		$(use_with zlib)
+		$(use_with zstd)
+
+		# Windows-specific
+		--without-cng
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
+			--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
+			--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
+		)
+	else
+		myconf+=(
+			--disable-bsdcat
+			--disable-bsdcpio
+			--disable-bsdtar
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		emake libarchive.la
+	fi
+}
+
+src_test() {
+	mkdir -p "${T}"/bin || die
+	# tests fail when lbzip2[symlink] is used in place of ref bunzip2
+	ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
+	local -x PATH=${T}/bin:${PATH}
+	multilib-minimal_src_test
+}
+
+multilib_src_test() {
+	# sandbox is breaking long symlink behavior
+	local -x SANDBOX_ON=0
+	local -x LD_PRELOAD=
+	emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		emake DESTDIR="${D}" install
+
+		# Create symlinks for FreeBSD
+		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
+			# Exclude cat for the time being #589876
+			for bin in cpio tar; do
+				dosym bsd${bin} /usr/bin/${bin}
+				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
+				doman "${T}"/${bin}.1
+			done
+		fi
+	else
+		local install_targets=(
+			install-includeHEADERS
+			install-libLTLIBRARIES
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${install_targets[@]}"
+	fi
+
+	# Libs.private: should be used from libarchive.pc instead
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+multilib_src_install_all() {
+	cd "${S}" || die
+	einstalldocs
+}
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index 6c9c42289bc1..3fbef225dca6 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,3 +1,3 @@
 DIST xarchiver-0.5.4.15.tar.gz 1072943 BLAKE2B 6f80c8dba510bf5c05dfe5c8f12aafbd4f563861878c73b7da78562836ef4b85f9bc8e4ed7cda5d98c5e33a211a2677d163c2912f1bb605e0085627ca4ee5cbb SHA512 e5174241dd45dd6186d91b15a15b207a8b356480d9ce1a7b9ac2da167878cdb14316a3e7abf3f2aac8d41a02777df2131e205c7d5971a376ff7dd0ca70fbc82f
-EBUILD xarchiver-0.5.4.15.ebuild 1421 BLAKE2B 27dbf674f6d09d5810773f67cbcfb66353710fec46a7b0727e096a996b6b62a12002f7dc2108017ea3822a8e3321fdb2cc0d285024a9309f6b63fe0967d38aca SHA512 0febaf90ac9779f1e4cd10f366897f0d7a790a03704c02f8493b6d1a8155f807f0788b280b435aab0ccc5714bff02042fb05cce3043afb80800e34da0b0a1618
+EBUILD xarchiver-0.5.4.15.ebuild 1428 BLAKE2B 05941c387d97a5ff0e7e9e4c98c1c7a57118c562016213caaf0d464be9084787b9c9dab44cfac0cc982a3cb6c49473eabce5264b516952677d89a9adc57e2b4f SHA512 af14235bdcf1bf71033fcc1457e592fbaa2f7f6a5285a5740d8c6c530ee1f48df88e67ccb7f011253598dba2b33b901eaad150a6f0c9fcb98bb8ad00e482b424
 MISC metadata.xml 447 BLAKE2B 3ac670facb7c0034e1f079622c8c14e04a131e359e1cdbbc18b7cdd111a673651a97a7e35a430d13d80c1cf35e87f4aec0738836b60dd2837e4a77ff4e9485a3 SHA512 ccccc741a75658963153a71810ea9d8c25bfe49765f90a4aa5558ef8fef2abdd1e17d1c9ffb604a78deafeda1e5032b671c8f85a8189e6c89cf3f057dfec9a4a
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
index a31e0b6ca1f0..d3030bf6c079 100644
--- a/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
+++ b/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 # older pigz versions have incompatible command-line processing
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 89916c762d15..68a4af6ee2f8 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 27430e8896d7..8dc85a7fae77 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,4 +1,6 @@
+DIST certbot-1.10.0.tar.gz 1432396 BLAKE2B eae502acdac712ac148a4a349b500db61a0c14fda0ae4dc57077222d33f967595c4434d0b197649c6d2614018bafaab2c7f94c1571162a200943732cc3c0109c SHA512 af31bfa1f3d6bc189d1b55ac91aab5b7fb35579170c253f0c0e98c5f63be9ad27f3ff73cb03a4f59765874c01e78ae1423f977426e081161ae5f845ebfb0d23a
 DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
+EBUILD acme-1.10.0.ebuild 1727 BLAKE2B ac84ebb7f4297d6c2161f92ca674459aac9aff9eeabdefc5809a86821f7e93c91711380ec73748ba65440ff9e9d301e48b2f5e88ebeb4f4043bde6443962d26f SHA512 d1f1b78f04222efea90fe258cd1a45c43da90cea1d45b5158d72fb7a094c3f04d0b84a2e073fed365eaeea8a20c383fc572378d679ac37a1fd332a309d18c281
 EBUILD acme-1.9.0.ebuild 1721 BLAKE2B b6f1bf82f1a856659e423bf64da1e1db084e6ce9a3583cbdad5de574441b2b2a1216f23961352decd9323f8c6c115502d426312070891e1411d8632054a871ef SHA512 a017fea91a2c3b3ef8596e8a80b3bc9576e7fe80f4cea844b0be5a56c12578854a27b46c2921d0b5f32add2f4b64154a54b1183442c051366ae3764910cec668
 EBUILD acme-9999.ebuild 1723 BLAKE2B 1f9dcf588af71aa02df863c8d2704b261586fb72b088161cf4fd0643a941e7cf55f9d450c3a6c39bc9075092b63d62f7a16f2f5b295870de41c3bf409ab4e191 SHA512 cf5d3780b7dc9faf510b00ecd4342b52b6133f5852c7afe732ca50e52825cc6f8d55e3400928d3e99793e2457b86e8c0c1d199820fe3e2a086c596b4586970f0
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-1.10.0.ebuild b/app-crypt/acme/acme-1.10.0.ebuild
new file mode 100644
index 000000000000..e6b050a6c6a9
--- /dev/null
+++ b/app-crypt/acme/acme-1.10.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+	distutils-r1_src_compile
+	if use doc ; then
+		cd docs || die
+		sphinx-build -b html -d _build/doctrees   . _build/html
+	fi
+}
+
+python_test() {
+	nosetests -w ${PN} || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 2cafe9adffbe..8da543f747fe 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,4 +1,6 @@
+DIST certbot-1.10.0.tar.gz 1432396 BLAKE2B eae502acdac712ac148a4a349b500db61a0c14fda0ae4dc57077222d33f967595c4434d0b197649c6d2614018bafaab2c7f94c1571162a200943732cc3c0109c SHA512 af31bfa1f3d6bc189d1b55ac91aab5b7fb35579170c253f0c0e98c5f63be9ad27f3ff73cb03a4f59765874c01e78ae1423f977426e081161ae5f845ebfb0d23a
 DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
+EBUILD certbot-apache-1.10.0.ebuild 922 BLAKE2B ee7a35a10cef4129f766e2f77a9b32dde4d7c7b6862a2282c6321f0577aaf6f96a426aa57c94394e151d5c714c90597675e00d10fbf88e18eb4a8c19cd193295 SHA512 03f3b715ad49cb358f112ec76cb8ea50d2988de9a2f0c81ae447410fc76e08e1c56686e67e8a28dfb6e9563a8b73e6e2f6d0454bbe0de7d19bea25f05bef45aa
 EBUILD certbot-apache-1.9.0.ebuild 916 BLAKE2B 366995d48952ab5d4b3b1b9afa68561097b9238c2c56a505a49854c0e0c6126d5092d81b1178d4b45ff690194ec3b8de695f4d6b88455559ea3162dcaf2a09e9 SHA512 13ddca2809910b3c044bf725b58d0d728531314b0a02e7dea7836f047469b3e79d9bf38a729c045dc3f096689c10e9f829d44a14bd647e6687021fe9bf24ec1b
 EBUILD certbot-apache-9999.ebuild 918 BLAKE2B fb5b5acbb7373042f8960130f44e384494cfba7786e4964381631da44651c1e0b88f68c331cb1d7aa614e4aeabdc11bfa38bfa15d96af7cc3ad7cf38fd44ac41 SHA512 5b9d2895c2ced803d962aaf2dfffe8e934131b7d1d6bf09169b1df997baac9e992043804e7d7370ea92440d0c40ee5c2946b80a4e4fb3b4ba26c50146986b4ea
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-1.10.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.10.0.ebuild
new file mode 100644
index 000000000000..b7e449dda5b7
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-1.10.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 1f87401d3671..93edfb746e07 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,4 +1,6 @@
+DIST certbot-1.10.0.tar.gz 1432396 BLAKE2B eae502acdac712ac148a4a349b500db61a0c14fda0ae4dc57077222d33f967595c4434d0b197649c6d2614018bafaab2c7f94c1571162a200943732cc3c0109c SHA512 af31bfa1f3d6bc189d1b55ac91aab5b7fb35579170c253f0c0e98c5f63be9ad27f3ff73cb03a4f59765874c01e78ae1423f977426e081161ae5f845ebfb0d23a
 DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
+EBUILD certbot-nginx-1.10.0.ebuild 930 BLAKE2B 79cf8aeeaa3efab873a55c80e610ee949004d986b4a73459c211d5c5a673c90b0ed411bbffee6093e13ce4d2db05bb690a26c2bac2b166eed72d7cdde9082975 SHA512 623920ccfdb7b9f6dbb8245715483fe371038aa7602c99a5e19c82bd1c985359767c26c3af7e3248926f7804e63a6ca30bfed8591a5353161140da989c4b3123
 EBUILD certbot-nginx-1.9.0.ebuild 924 BLAKE2B d71d8e3d72d3a0f81a12474bcf4a67721b7f02fc4b8209e190cef58da3bcb3010e8b6b3384750aa2359d97950ad0169c8b016629b04b7d66f7668d48fe0d81a2 SHA512 87d6e7a796aa1ef9134fa2e35c63fd95147da73b36f0bdf4f7cb6870a9f42c7721557581aea518e5b39e8b6770f0d8e680b550b93311699b7459ddbf57ed2266
 EBUILD certbot-nginx-9999.ebuild 926 BLAKE2B c42649f6ceaeb670919b8660deb06e3380b4e971e0eedcd44db6c56a9ea88f9698e5c943b989fabcf067e8f716bc648474a5f2ad4a0f987d3e8edebbfe88f63a SHA512 0b959a25ebd24879649357928bbcf24d6de501c068a782b3ca073ba46312502480dc10ae540bd478fd4ed1979abe17dc8ca2461b5fc73686539eeb14b5dc2307
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.10.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.10.0.ebuild
new file mode 100644
index 000000000000..ad7e21e944ef
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.10.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index c6870f189d89..5c24c80d8179 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,4 +1,6 @@
+DIST certbot-1.10.0.tar.gz 1432396 BLAKE2B eae502acdac712ac148a4a349b500db61a0c14fda0ae4dc57077222d33f967595c4434d0b197649c6d2614018bafaab2c7f94c1571162a200943732cc3c0109c SHA512 af31bfa1f3d6bc189d1b55ac91aab5b7fb35579170c253f0c0e98c5f63be9ad27f3ff73cb03a4f59765874c01e78ae1423f977426e081161ae5f845ebfb0d23a
 DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
+EBUILD certbot-1.10.0.ebuild 1148 BLAKE2B 09152480cb110bb45e0c133b87e1de40dffaac4e419aac8735f2500121f4fe65da64ce4bfcad4cd91a6f926a5bf6b68620b7dea00a5d9cac5fa33b514f9cf66a SHA512 629c1fec0aea8cde13a635ebd2018e269f119ecd0013dcd5618a12d0bebb6daa4d3ba37967318cfeaee70a2d0dd41823c8bf8ca65db578cf69c261332a69e706
 EBUILD certbot-1.9.0.ebuild 1142 BLAKE2B 1f0f1256a7b81bda66c46a80129489f7f78cd30f53df771ed6fa70182f201baeb2917455fd6d9c7623d9f2b152c838d60a117fd3628436fda24bf69d75be44f4 SHA512 e12effe51a0c174441915ffd4f55dff83e22865fadf92ae6cc045b0fc05fca143dc4ad8ac0a17ccf7c71a18af850dddd60773bce0376e5ac0498b4c598e85f00
 EBUILD certbot-9999.ebuild 1144 BLAKE2B a5fc182ad4c58b23d018d63162641b27381e710d2bd2276ba9f0cdf8dc1a8fb5d222a8f0d6f248c06d70b1687e202e2a938b3176ae152ce22feceb342c7ef9a2 SHA512 6a35d2ce7faed403fb33bd345439371f277ffb2528b37b59f9130a234d4bf0bd166fde6c5e5349903b2cecc991b2deda3f054fb7c011e44094665c3e2901fab9
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-1.10.0.ebuild b/app-crypt/certbot/certbot-1.10.0.ebuild
new file mode 100644
index 000000000000..d6f1add60616
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.10.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+S=${WORKDIR}/${P}/${PN}
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	>=app-crypt/acme-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/openpgp-keys-django/Manifest b/app-crypt/openpgp-keys-django/Manifest
index 6e4c1170a095..388130d5b694 100644
--- a/app-crypt/openpgp-keys-django/Manifest
+++ b/app-crypt/openpgp-keys-django/Manifest
@@ -1,3 +1,5 @@
+DIST ABB2C2A8CD01F1613618B70D2EF56372BA48CD1B.asc 6888 BLAKE2B 2782b48f59abbc1caed8f91ea0ba5ad85edf921628bc8b3a56b3b71020e88693657ada02dddf1d667a2005b59751c4dcd27bd1950edf90dd50760822b8857923 SHA512 7c814596f1818a83ab5dd5ae781a2323b4a3fe3f1c21c6b8152d76c29366d0a1be50e0d4584307ba52cf0252245385ad138a01a6c99d8c071482c9c3f1dd461b
 DIST FE5FB63876A1D718A8C67556E17DF5C82B4F9D00.asc 5710 BLAKE2B 92cc184b779e7279f5e11d579ea12d604f955f4b422c6d7a58436567130cacfe138765cf76217ff6790fcf2a27dfd70d25a7b38911630a9c7d74c0e7d079bfe4 SHA512 8edfe3db0dd77feb52ee8683db103f3c0b2c87adac52047dd66f17e956227a9a2378a182351cf2d761645e3e755795528896f4e82f1c85aa77331a1f1a38de6e
 EBUILD openpgp-keys-django-20201105.ebuild 640 BLAKE2B 42d9e498b9e1f629046a2f213ee9a8e144c09d790bf60dce9129a85a5511072f878d8c5f512b65db223a391056fa10086978b58fcfbc23877b69e368239fa84b SHA512 4394f34ea3be333e533f1ca0a0e2a04cb18a8f7e088328597153ec9d3bba270c9b7daf6bb2a694b381521c411487942684a6dd21e8e4b41ae9ea03635b5391f3
+EBUILD openpgp-keys-django-20201201.ebuild 783 BLAKE2B 96a3f3a880b1c65fa720e17ed669eb3cc91bc19de59e62434ee7d15ed25ac2d2c03dc373cb25293e0650590440aa3de7a3ed6861198af3b4b96a7c15b0eda1d0 SHA512 16ec2470f9a5b48df1f1b5845f4b0997e7ec07eb19de02db5540f77643316514bdc41e34af2cffaade1397c5f41cfe3092c52490c2bb04a1943310509ee69ac2
 MISC metadata.xml 247 BLAKE2B b1be080032e657afc879ab3aaa222f493f548e83f31b4d760ed187eb47a7063e725e4d4c38ec73891d530e6ac8480aa69a659039bc9bb259981d2c7af3a7decb SHA512 5a4c7eac292be21b8ade871e7e31f73bd55c1f39220b457ee5ab021e85a3063bc913f33b4c36f4da97a038c786ce63ab43ccf4dccc9ae4da7596ae1c5bc8e709
diff --git a/app-crypt/openpgp-keys-django/openpgp-keys-django-20201201.ebuild b/app-crypt/openpgp-keys-django/openpgp-keys-django-20201201.ebuild
new file mode 100644
index 000000000000..89d87a7ac86d
--- /dev/null
+++ b/app-crypt/openpgp-keys-django/openpgp-keys-django-20201201.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OpenPGP keys used to sign Django releases"
+HOMEPAGE="https://www.djangoproject.com/download/"
+SRC_URI="
+	https://keys.openpgp.org/vks/v1/by-fingerprint/FE5FB63876A1D718A8C67556E17DF5C82B4F9D00
+		-> FE5FB63876A1D718A8C67556E17DF5C82B4F9D00.asc
+	https://keybase.io/felixx/pgp_keys.asc?fingerprint=abb2c2a8cd01f1613618b70d2ef56372ba48cd1b
+		-> ABB2C2A8CD01F1613618B70D2EF56372BA48CD1B.asc
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+
+S=${WORKDIR}
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - django.asc < <(cat "${files[@]/#/${DISTDIR}/}")
+}
diff --git a/app-crypt/ssss/Manifest b/app-crypt/ssss/Manifest
index 49e54af6e6d9..f5f6d21c3ede 100644
--- a/app-crypt/ssss/Manifest
+++ b/app-crypt/ssss/Manifest
@@ -1,5 +1,5 @@
 DIST ssss-0.5.6.tar.gz 20128 BLAKE2B d42fff5878e2ebcc62cd86b86f0f8a3e522c089cbb5e8fb2585cf375ff133da7d9ccf00e62cc6888e00abe5d64f87ac19ddbb3f6e6a0d86913e6a6aa5a8a1d4c SHA512 964af01610a7a269d19ae1fa1712ef12ca1afab02636ba83dd84ec5aeb185210a1247d932ee39d2869aa76e54ffb051d802800d295d17355d6fe2a8010edd509
 DIST ssss-0.5.tar.gz 17435 BLAKE2B 76aae463ce11341f8b0336526f7d19c9921025cabc05bc9e00005b0bdeb676ed5e069226962232f277de2fecb1cd71bafbd4b2fa0c03ef4faf0f66daa24599d1 SHA512 be8df1666ac61d4097b5fd54f2cee3640db8f85ec21411f1b208a35b671c5699bc692079525d8d313d1cf2500da31bfb03771829a9fdccc0bb6d806749526ec9
 EBUILD ssss-0.5-r1.ebuild 774 BLAKE2B 08fa8b0d2c88ba22cb3a74bd728a32c2e54ff9cd92b88c8345e407b035bc2916f547ed18ab90d76efb401e6cd7aa015f0262bdb9b9629039091aef5c19725dd6 SHA512 364456d49bf4625c632e42dfee4013b84cb4dee6df747b113dcc11362c4bbb9cbbc2c5b460411986c751c4fd0a4c34a288464b383601bc2eb6c331ad295224f8
-EBUILD ssss-0.5.6.ebuild 810 BLAKE2B 353efe544e4d85bf4cb3d7c400fbb9c9d351efd30aa50a276838db169add2c5c2ff01dbe742722c96dd65cef569314111305a65874422b803efda80f55274b29 SHA512 f1133c11c1c54777ab0ece70c2dabcec82cd599ba95c063648255aad6aeb2d55d6876bbace45d3aa754b08b4c1a8795bba443538aeaea7c56e86724422765efe
+EBUILD ssss-0.5.6.ebuild 809 BLAKE2B 5025aae75562b85423ff9996c9a83da107ea53bd0e0e0485ee86a35094c64705171ee82471a99ef89ddbe896f4ad36f908ac72c78ea01f90b812462ecd2112aa SHA512 e686cfc6579e2cafa17bf03d8d03a11cae0306f16dff410792cdd8bc4dcbae1ddb6a4c8693bb1021c5d8deaa2abe45fb2ff1cc6f454cc5e920af97eeca2730b4
 MISC metadata.xml 571 BLAKE2B 8e5b2a9efdbac1e9cf15c2e7c60e6c6a9c41300a6ec65df5751043ac85536ba31ace97f033aac89e47f9792b8003c134e1b8a8c3af6513e3406e38027d413e42 SHA512 daebb2e758087ee3cb49c5c89c0bafe3bdf57e2f7c3b64e1053e465b765ad8e95594065a7e236cf8072a406f7d92702a84807393820fcaec26ff29bee73ceff6
diff --git a/app-crypt/ssss/ssss-0.5.6.ebuild b/app-crypt/ssss/ssss-0.5.6.ebuild
index 724f2c160f99..89420c41084e 100644
--- a/app-crypt/ssss/ssss-0.5.6.ebuild
+++ b/app-crypt/ssss/ssss-0.5.6.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-releases-v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="dev-libs/gmp:0="
 DEPEND="${RDEPEND}"
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 78fb83b57964..00a6b24560b8 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/mathjax-docs/Manifest b/app-doc/mathjax-docs/Manifest
index a908b1b4c294..c08cd1007133 100644
--- a/app-doc/mathjax-docs/Manifest
+++ b/app-doc/mathjax-docs/Manifest
@@ -1,3 +1,3 @@
 DIST mathjax-docs-2.7.7.tar.gz 233452 BLAKE2B 280db6c794471d369a17161ad859dc73ddf1494af35114b69356aae41ea52d771f92b0b85ba82df8ed542039af152938f5fda71d752da4410ab183fe6a24ab81 SHA512 25fa97294ae153298d45b449d995c0402c481c6425ea4ebb38dcc509df741aed02d5469a520c8b793b8135b4140a6d1ad6688a42e3cb26004cfd7fcb838c32e6
-EBUILD mathjax-docs-2.7.7.ebuild 703 BLAKE2B 1f9ef61d25b8af7debff21088f1e922246bcbc4ca1e7a0914f6d250e34dc510f4444f395604effdbeb603a498564c43d815cc77df7668a9ab655dca4825084f5 SHA512 d6d7b78c51c3d070cd6e918c7d7afc1fc0308033e9e7b76b48e56fc928db0b874a4777328037d1269e93e16a52429b34c649b660eb0f441c3c91a5fe121e46f9
+EBUILD mathjax-docs-2.7.7.ebuild 748 BLAKE2B f7e856cc4de3f2b9412c002728f802158b15a46788dcdddac62ac80332f28a7281d43871b042d726b30c20f3c4f7eb2faf288d002be92b03135d3eb53cfdacde SHA512 fda832f66297e04782772ca65abf88729c3492ee863151a1813052ead996d02897bebd8b98045a78d7d13757d5feacfa1fba234a59028b87b4ab616f59c84780
 MISC metadata.xml 1035 BLAKE2B acc5848bf3750a7cf821621a689bd522e63181cdd653c34233a5eb0965722963d192396e560dcf6f4877605b67d196e6731c55e5e9d2e2c42485e224e94875da SHA512 ad470bd8037ab7c48c7641f973b4a308aaf07ef08152f22cf1d8d198e974707eda378a5bccd27e6645514d27d076b08228fbcf00a6badbd6edfbbb12596d2164
diff --git a/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild b/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild
index 7e44d949bd4f..6706659e7acf 100644
--- a/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild
+++ b/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild
@@ -10,14 +10,16 @@ COMMIT="9d711f40638202b02f2154d7f05ea35088ff9388"
 DESCRIPTION="MathJax documentation"
 HOMEPAGE="https://www.mathjax.org/"
 SRC_URI="https://github.com/mathjax/MathJax-docs/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/MathJax-docs-${COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
-DEPEND="dev-python/sphinx"
-
-S=${WORKDIR}/MathJax-docs-${COMMIT}
+BDEPEND="
+	dev-python/sphinx
+	dev-python/sphinx_rtd_theme
+"
 
 src_prepare() {
 	default
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 007d3559e965..8fb97eaecd3b 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index bb72c94e20b1..f401d2d1f095 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,10 +1,10 @@
 AUX nano-4.9.3-disable-speller_build_fix.patch 10305 BLAKE2B 1a319fa63eadfa8c98b2f3f35df3cae631253606f6ac38fce96049a1078f13b5885dc368d725d09bbf7cd840c0766d446f757282693526f9fb723b05d1d6c4f4 SHA512 ceef1ba4ce7fc296785cd579bc645d9565d16b9adffbb6871684421823addbef87a70bfcd8f3f87bc7e48477ee0c56d3b326aaa9c019e0d04a7f000bc46076c2
 AUX nano-4.9.3-minimal_build_fix.patch 1357 BLAKE2B d204314118779f7e433cea11ea070e66ea445c47259d48960cb96a7a4b63cf5b4ff2a8f0254573a57b78d194354af2a3d8b4ddb43a1af9f31a6fa12ea8628f1a SHA512 a4a1ddb4c1f1999251d499f8068ddc0e743e4499a1bf3781095c604ac08a1700f8648d30441c5aa6a2e96d75df262c77dec7f64bc29faa3b87ba8b664227614a
 DIST nano-4.9.3.tar.gz 2999198 BLAKE2B a96f707936934a965a9a41dfe13ac1ebbe1a5e38db714df6d219b2c6539f24924d4c4f0451508718f66259854806032b84dc89850a7fd55d157f28ae23531d0e SHA512 233e6ed103441bd2c85ed21c50547f85dc0838cc750a5e9b16ecfb393e3b7b978e971af4a4164062c7c267c98895ecb696c02cbd2e4c2eb1ceee657fd026c30a
-DIST nano-5.2.tar.gz 2865091 BLAKE2B 3822b3fd8dede897d698401a06ea0b4b49bf39f48d16c750e273007b1795a8adfc71654eadc08039a5c6999973ff7e70148b4c720b32a8f361424404e3c2ff3f SHA512 4c77bcfdf704a7882e944cb6d4cd571b698447500255e5701d30990def56cec0c396a33c761b8149f3cc4208a8dcd0f39372804d54cbe6bc2db9244f4a2259b3
 DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe88da6de19efd76ef13fedebe4b9339ae594b751a12cf18a8c4dcd57466ceedfabf61406f63b69c75fceff1 SHA512 019b58779f5a7d9a9472b415715876d0daac313a02b794900339469ee0b5a27ce202e397c00ad6396b7e26a7c303e52c28d981fff85cf774c79a5a8a9835836d
+DIST nano-5.4.tar.gz 2898561 BLAKE2B 7e5e48f1e85253a7a4a9be2be2b7663e8798655d9e9e2505df1d1752512058734062af953652c1d11dca464ca06d7c90faf2e54cdb65ba01d0f76cfca0282c18 SHA512 711b1a890649e3a2b62c778e6d54813ed98a8261c47a92aa6d7baa690f86d8563813a764f5dffcc6c259fe9b05f8fe76cf48a3178b09666ba55ee035c91cbe28
 EBUILD nano-4.9.3.ebuild 2334 BLAKE2B a46bb4bc1a3cb5d62c0f7db03c7ad1785d168daae307275b198e7f4527d98d84c7b7557ee1cfe2f70e4aa5e60f8cda4abb5fd8261decdcd4f7ff11f54f25e686 SHA512 a8dab8ae77a332ca5576b907e8a73fd288f3da0f8fdd4c2d52ab4e747c911c30425b81db7958a6b3a256ce4b1a2d6a480a728991e67b66d6d09434f36aaad1ef
-EBUILD nano-5.2.ebuild 2434 BLAKE2B 45daba891451bdb52ef94979aeed565ecd21a5c315f2cd575a2e3f00ec64d4c9f8ad392f1a90a9bce4879725a4fa8a39ef2443aed0ad6836a8a572838f22b546 SHA512 07d7f7ff0b04629106e0710dfb47b2ef397b69c4bb50b65b908cae1843424bd1425108b5a6ecfdc7411b3cd27f3f40f92bb7c8df87c18005bfabafd2e183b315
-EBUILD nano-5.3-r1.ebuild 2457 BLAKE2B d39aeabb27f649c9ee0c9b968b4dc0cafcd67c8acec27d71caeb151b70cb299a1ef9a152a5aa942676ae1af85837040ab7fcf6106fa54f54e381745efa821fa7 SHA512 38dfc0422a8d2821de4f5100edb23a3e797b75858a7cfcf29f1ef75d29f94730dc810569561e8c97efed3db3320b5714df77577c2d59a35cbc46598a062f07b4
+EBUILD nano-5.3-r1.ebuild 2453 BLAKE2B 2302041546e1349655fd8d45ec0290376830d88df5c562e3d2ee8ecd52128c91e2d909df7f8eb29f9802519bc98f23df1d44325d6eb236e4cb070244b1694b05 SHA512 f2ff5aa63ffd23da5a42e60cee9a4b31e3e92e72289ac5632a710b132009c55a684ddc7a98ad47cdbb142e4103b2c4950a7a7fb2f44ffccd9491593daa78bd54
+EBUILD nano-5.4.ebuild 2457 BLAKE2B d39aeabb27f649c9ee0c9b968b4dc0cafcd67c8acec27d71caeb151b70cb299a1ef9a152a5aa942676ae1af85837040ab7fcf6106fa54f54e381745efa821fa7 SHA512 38dfc0422a8d2821de4f5100edb23a3e797b75858a7cfcf29f1ef75d29f94730dc810569561e8c97efed3db3320b5714df77577c2d59a35cbc46598a062f07b4
 EBUILD nano-9999.ebuild 2457 BLAKE2B d39aeabb27f649c9ee0c9b968b4dc0cafcd67c8acec27d71caeb151b70cb299a1ef9a152a5aa942676ae1af85837040ab7fcf6106fa54f54e381745efa821fa7 SHA512 38dfc0422a8d2821de4f5100edb23a3e797b75858a7cfcf29f1ef75d29f94730dc810569561e8c97efed3db3320b5714df77577c2d59a35cbc46598a062f07b4
 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.3-r1.ebuild
index 58e6b0821478..5d52a4ec1bdc 100644
--- a/app-editors/nano/nano-5.3-r1.ebuild
+++ b/app-editors/nano/nano-5.3-r1.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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-5.2.ebuild b/app-editors/nano/nano-5.4.ebuild
similarity index 93%
rename from app-editors/nano/nano-5.2.ebuild
rename to app-editors/nano/nano-5.4.ebuild
index 86f22534c12f..58e6b0821478 100644
--- a/app-editors/nano/nano-5.2.ebuild
+++ b/app-editors/nano/nano-5.4.ebuild
@@ -18,7 +18,7 @@ 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 slang +spell +split-usr static unicode"
 
 LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
 	sys-libs/ncurses:0=[static-libs(+)]
@@ -33,7 +33,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="!ncurses? ( slang? ( minimal ) )"
+REQUIRED_USE="
+	!ncurses? ( slang? ( minimal ) )
+	magic? ( !minimal )
+"
 
 src_prepare() {
 	default
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index 912b4205f7cc..75f7e5aac574 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,5 +1,5 @@
 DIST pluma-1.24.0.tar.xz 3717544 BLAKE2B fd9375fd05566c11c24d5bdf55ab0d4619143127a5e48c4e91d18421f50340775d58c3e2264382aa3bbd8aad0569c559e87381a9ece07ce1592d1bc1a5315db1 SHA512 390bf2949549baa0e3dc706526217fbc1513e2f9778917710da806e58cdfb0b7a36e95ed2186442490996cf76783acd4e0f4b8f1fedacee9ba356c0d466510be
 DIST pluma-1.24.1.tar.xz 3679636 BLAKE2B e792433b93862c8b0c47145255311c3a3386c1b99ec1ac87ed91608d839ece4430205f83fcc3c0f5145f986105d4c5d8803393035fcaaea08155197bbcf15d03 SHA512 0cfd6a035fc95993dce3e556c49641e799888f20159b29f2c0712c54ee772aa6df1ce755f329414c94efdb2cb3819ce633b92e6559b0c8cb064dab3c74729ab3
 EBUILD pluma-1.24.0.ebuild 1780 BLAKE2B d845bbd202c228b0b8f11c1a74b6791081fabe9fdfe80e08e4e62b40e3e3e27b626caa9263f906b7c4eb9ad056412b0f18305a4a107d85ec14d7a39149d73e77 SHA512 1f81f212c6ad19b923e4f8a8aa5b935bb4ca05bba3059553583ecb178bc65bc562e939f690033d62e4737ba76e0d5b008076649dbabb06e87f632120fdfaabe2
-EBUILD pluma-1.24.1.ebuild 1786 BLAKE2B b857ee4a4f1d10b7867958238bcd8cf96cd1ad8cb2f710b9da51c01f1d175bc8dd98c41d82b05fc417f4af7fef597abfba30df96dd123358b08f8ef1c6e21b2f SHA512 96e61cac21d4f94b3efbea4c502e86a3b7c408b54bc79559acfdf599f4eebf6793413df33cf036770593c8bdf5a5390b5ae5bf8220c4cab8a9bd1e1e2d5fc39d
+EBUILD pluma-1.24.1.ebuild 1784 BLAKE2B 39b47155b554df35c3e24f4daa667532a6e5b25e4c7af2a8a9349ee6e3ddf8ba5978f81355f4ddb340d90803058a7fd17ec0b8c0d079bfa532d23267848e7326 SHA512 3e478d60f0d51e0a3cf7638e609d25778dc37667f1d34b6b1d4648b12a0ec0d57a415a252d5fc0c657543fbf212babd37e2aee10ab2de3cb86c8e895f5ee7e98
 MISC metadata.xml 334 BLAKE2B 2d5ac79ba6879f5486724c826a89ed81cf393bc3fedbdea40764b1fb23962672e7c2a625137080a16ccd8e67a55097a4f497269f89ccd8b256490ef99e15b9cb SHA512 fe30c9986ed7086a894a0835847351d92938c424af5b7da51211a23fc197eebbce53cc205014cdd2c3bcc951a5a449c5d5726bede7991716d81fb7bbfe8a3fca
diff --git a/app-editors/pluma/pluma-1.24.1.ebuild b/app-editors/pluma/pluma-1.24.1.ebuild
index 9d5382fbcd64..3b15fcea44a1 100644
--- a/app-editors/pluma/pluma-1.24.1.ebuild
+++ b/app-editors/pluma/pluma-1.24.1.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 inherit mate python-single-r1 virtualx
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Pluma text editor for the MATE desktop"
diff --git a/app-editors/shed/Manifest b/app-editors/shed/Manifest
index 46f7ebc64d36..f3201eebc683 100644
--- a/app-editors/shed/Manifest
+++ b/app-editors/shed/Manifest
@@ -2,5 +2,5 @@ AUX shed-1.15-cflags.patch 249 BLAKE2B 6249d526da1a4b1df8f456692e85bdbd275be7517
 AUX shed-1.15-interix.patch 313 BLAKE2B 423d51410a5371ee1fa0ae2e0d4426dddd410ea060a269f6d3c6b99826aa8d57635bb9a0cfeb82fcf2f51dcf179b0815485491110df3501d1e23ff950d838475 SHA512 31d403d95ce106443ccfe8c92b9621842bfc4264c71280398bb7c0d827d98bf28b403dce3c6ae4523b7ac30a8f529aac6d7cc30a91313a2e2a3d033766469e69
 AUX shed-1.15-tinfo.patch 355 BLAKE2B 5acffe509b9174187b4383f15bed90600790ed0267ee1dbc2713a28e2b8fd0a5eb67cdb1f84a635012128abd5075f9daa0ffdc86abbdd29d170a9b48868dd52c SHA512 fab71c3e99138f7cc4844964bbc40e95c90055612e6d34ff59c72b505b2c12c6244c4a25091de283f4615475652c202a4404273c0718b73b9f928c4bf0a74710
 DIST shed-1.15.tar.gz 87777 BLAKE2B 7c23f01e649de6ad15b870ef3786bd1747b6ab765f19a748d08bad878325f11e38483b957ed6a791ae4a7de752e96cca2057fd69838625c3fe660d2ba3fbc984 SHA512 fe401303e686fb11975b71de0f84d0cdb84dc5a48e1094356d012f95d8c956ed05bd6b39bf65af924212e83c1db45bbfe556342489150bb0e10fb4c832fb6c78
-EBUILD shed-1.15.ebuild 608 BLAKE2B 000613f1cef42ac582e385d816b2982ab2b6063867255d6138945b357629cc70a34b3a08fe8983f0e2e21767050fbdad2e23b4e4cc96ba3a26cd29c99162652c SHA512 f9a00e6cda4507f5e5e6c3d4a28bdb4ab54cdc132d18183ab60ec13ea5afc34f0bc24741d392af58bf054ede32cbc3c4025e2a1247faf4b29f2167863d00eaf7
+EBUILD shed-1.15.ebuild 615 BLAKE2B f52252ffab4f6fe24b89617b791e7412f78e7727234ca3f64faa69981259fe7662cd53d62c6faf8dd165778c2bc0e985502955eeefcf589c9c4e1108004aaec8 SHA512 eabe5181002bc511845cf56f5d968b676ccf816e1bae16375417319f9a9d86e63716228c0c24bda33306ab7b65c25081377b805c504b013c20da2c2671dfbfbd
 MISC metadata.xml 299 BLAKE2B ae48e2797586095e3e0d22645c036826b7165079cda4be2499cdf201e37806f0600086f9b0a6d52217b63f63e759c5d2ce02bddb2f828d1d4719898b0ad7f3a9 SHA512 ed903a7f91fa008f63e358253d7e66988cb57b616a8bf6e546f8a1d874e92524b29ef671a96f0e8fc56410619ff541d50e65ab788cf5373164d58b7afa625868
diff --git a/app-editors/shed/shed-1.15.ebuild b/app-editors/shed/shed-1.15.ebuild
index 8609122c355e..3c907f678988 100644
--- a/app-editors/shed/shed-1.15.ebuild
+++ b/app-editors/shed/shed-1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index 619b83c0e480..be6f47338c10 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -3,6 +3,6 @@ DIST vis-0.6.tar.gz 397707 BLAKE2B 9768f3d5586afd261f3e82721c08bdfddcd1c51a4f76d
 DIST vis-test-0.3.tar.gz 97814 BLAKE2B f62b216df3d846bb8bfdb14f6092309b55f6571cbc980e7a9aed46b1672fbaa65c007ac4617266dff3d5ad0293e3f5e7bd8390252817ebcdd6f64edb350f82ee SHA512 5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5
 DIST vis-test-0.4.tar.gz 98703 BLAKE2B dc9df00ae97ecd58022f885b25cb8163dd8b86f93d95cf93bbe1bd1efcc7690393efc4d47e3dccedc5f0ac6c33519136e6f13e6b9b9707f870b421aa3101537e SHA512 446eea2fdb7b15fd4962901e2076649964981217b9cf47112f16d1404da7cc024ba4b13164df0afa763363cef4f82db4ad9d7283a7554aead2165f29ca0bc9a5
 EBUILD vis-0.5.ebuild 1896 BLAKE2B 203ac7e00c94255e5566e2f446cda5749ffaf9eb563de663b3a1bec49a1bced3dd660ed0501b82d8f4cd399511b595aa62a6e6b6dee4e6fdabe2bd2286e0f28f SHA512 ccc982bb70fb8485a4fa44ed6a561305d4a8e016ee5ed0b1f671502a0c7e7f60b30718b61d2154e036a92300c280fa03c4edd7f46de319ee3ff44812dd14a41b
-EBUILD vis-0.6.ebuild 1696 BLAKE2B 651e46d6a9f8c2ba06b337dbdef90a796b8095f77a94baab2c1b9bd3b706223bb6abbab2e74eaeea791c2e4b12a86952a7ca19c3e6a31e1000ee0dac17a8e336 SHA512 ab68ff1949715e39a7df18a729b16b4dbad829ed94cd3ef6a787039b065dddca47de1c4175c83994d47fcdbe450feb6f1e1be6924fcf9b864aa1236a77471906
-EBUILD vis-9999.ebuild 1271 BLAKE2B 7cc5f74cdd5322bcfa8458bb4e2820466f54ffa1631a636925d79ab1b0568079434e31307df6f6251801b4fee7686b185b9aa5f30c45855eeda3d4c47fb34c66 SHA512 e0196ba4a01430415e6ec3cd0b6daa430486b7c5b2a9cfffc7bc99baa953e3f6465175a0fd2eeeb00ae46f6c70b3222e45537a1a05e314661e53e455406189a7
+EBUILD vis-0.6.ebuild 1730 BLAKE2B dd655e1b872d4434ef45b6396784d1551861a41925a1a1f1ebdf966a3126a9fcb98d03c81813b67f74fb37063ecf4b8b2559254888f9be9fc7069d83932af88c SHA512 a4c7273e8eb7b60c180464f7845136094b12a9a996f4142f54981fcfb91d4155a1993b956e79b3b8e186de1dc83c64f47a240ccadd85d293f4f27d90e124849a
+EBUILD vis-9999.ebuild 1297 BLAKE2B 114097b0329fcadd1deb4a89129962ea500cead232e543b32d74101cce0cc4d6c91964a860a8978db3699dc66f9b2533e4ff5f0361105c966e58f62e11faf94d SHA512 23fceb255e4a7be8ec31364816d811202ace08bf2a5072d3dc891dd0440bdfc1fe36f05032ffaee0d7e3611ee4752ba53795472e545b1bba3b439a63843126dc
 MISC metadata.xml 593 BLAKE2B c1f2c845ed329592118b0424bdbd4ff75d690fc657b60d6c1340fb668f2dc32cc34d807e3be77916630ea1db55c8d8d84db5d98b7763f6c1a69555c7b028230c SHA512 c9fce79e630218ffd9300592ca35a700bc5291a2a8453b30a1e33a4e64d03d9c5cf4f95357fdd87fc7b206a5d113b52b182dfb34ae713273992dc5d295a89730
diff --git a/app-editors/vis/vis-0.6.ebuild b/app-editors/vis/vis-0.6.ebuild
index 7a2ce6eaaa69..917b313cc0f3 100644
--- a/app-editors/vis/vis-0.6.ebuild
+++ b/app-editors/vis/vis-0.6.ebuild
@@ -4,6 +4,9 @@
 EAPI=7
 
 MY_PTV=0.4
+LUA_COMPAT=( lua5-2 lua5-3 )
+
+inherit lua-single optfeature
 
 DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor"
 HOMEPAGE="https://github.com/martanne/vis"
@@ -12,14 +15,13 @@ SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/${P}.tar.gz
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+ncurses selinux test tre"
+IUSE="+ncurses +lua selinux test tre"
 RESTRICT="!test? ( test )"
 
 # - Known to also work with NetBSD curses
-# - ::lua package done for using >=dev-lang/lua-5.2
-# which is needed for syntax highlighting and settings but masked in ::gentoo
 DEPEND="dev-libs/libtermkey
 	ncurses? ( sys-libs/ncurses:0= )
+	lua? ( ${LUA_DEPS} )
 	tre? ( dev-libs/tre:= )"
 RDEPEND="${DEPEND}
 	app-eselect/eselect-vi"
@@ -44,6 +46,7 @@ src_configure() {
 	./configure \
 		--prefix="${EPREFIX}"/usr \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_enable lua) \
 		$(use_enable ncurses curses) \
 		$(use_enable selinux) \
 		$(use_enable tre) || die
@@ -60,4 +63,5 @@ pkg_postrm() {
 
 pkg_postinst() {
 	update_symlinks
+	optfeature "syntax highlighting support" dev-lua/lpeg
 }
diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
index 600b5efb0576..96ca444a2491 100644
--- a/app-editors/vis/vis-9999.ebuild
+++ b/app-editors/vis/vis-9999.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3
+LUA_COMPAT=( lua5-2 lua5-3 )
+
+inherit lua-single git-r3 optfeature
 
 DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor"
 HOMEPAGE="https://github.com/martanne/vis"
@@ -10,14 +12,13 @@ EGIT_REPO_URI="https://github.com/martanne/vis.git"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS=""
-IUSE="+ncurses selinux test tre"
+IUSE="+ncurses +lua selinux test tre"
 RESTRICT="!test? ( test )"
 
 # - Known to also work with NetBSD curses
-# - ::lua package done for using >=dev-lang/lua-5.2
-# which is needed for syntax highlighting and settings but masked in ::gentoo
 DEPEND="dev-libs/libtermkey
 	ncurses? ( sys-libs/ncurses:0= )
+	lua? ( ${LUA_DEPS} )
 	tre? ( dev-libs/tre:= )"
 RDEPEND="${DEPEND}
 	app-eselect/eselect-vi"
@@ -34,6 +35,7 @@ src_configure() {
 	./configure \
 		--prefix="${EPREFIX}"/usr \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_enable lua) \
 		$(use_enable ncurses curses) \
 		$(use_enable selinux) \
 		$(use_enable tre) || die
@@ -50,4 +52,5 @@ pkg_postrm() {
 
 pkg_postinst() {
 	update_symlinks
+	optfeature "syntax highlighting support" dev-lua/lpeg
 }
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 903e4e6b7658..38533562c719 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index e089edc0b297..99e79795bfdf 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,4 +1,6 @@
 AUX containerd.initd 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037538ae23562c5663742a7453e00412eeafa72129a4806f3610f3f77865c7ebf3e58223a7286c9f712e SHA512 b70abb44d6bc0cdd8115104ef1fbb5099a270c29040351ceff738b9b6ff796a802f92dbbe2c49e04ae058043546bbe6a854e25044f5c07bea7bf6b6fc4f66018
 DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3 SHA512 7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
+DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa SHA512 79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
 EBUILD containerd-1.3.7.ebuild 1974 BLAKE2B 40e9d21e8bfc04de4931748ce962897a62353faaaf400b1f66ac625b24cd1f0aa8ed74ed808b3c5e97ebc0f4649126f9b9d806974a1103772f91537e89ec03f5 SHA512 6fe127a926c668b3c47ab90b82f56335125084dacfc75bc75a7af3d63adb8b7ade4fa5baaf437a80ef55f3383834e25d320106ca02ca3af106fbfdf92c54e8fe
+EBUILD containerd-1.3.9.ebuild 1941 BLAKE2B 4902047b9a87daf7aa960d4472fb7c0483515a8aea5cdba86970a408dd43b805cc0ca7cf69d45fea51fa47dfe5a4157016145293a083750d35af411db10e7fea SHA512 8bcecd9396a51ba28eb4a1008362e05f6bce203edeb97ab4b52f89f22bc5be67e8bbe05c8a27a330048feaab616c9660cdc91982d5de5bf90c2c56d27fdc976d
 MISC metadata.xml 1175 BLAKE2B ee2c3165391688c6e20b0ecb35ccb59a5b621624b0dbfe72d8311ea3d0c1fc17894870f4be00282c9e50c7f931889b8d5f9667fd925eba98756f7b4fbf98cd20 SHA512 68dcef07630bd32f06360c0afd5742a7e3ad75645cfa77ef56a6d0236634ed0c8e69b517c53114d95fab5dbc6cae37f306d3328289b1e562a0a335a36596d19e
diff --git a/app-emulation/containerd/containerd-1.3.9.ebuild b/app-emulation/containerd/containerd-1.3.9.ebuild
new file mode 100644
index 000000000000..7c664edf94cd
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.3.9.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# update on bump, look for https://github.com/docker\
+# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/containerd.installer
+CONTAINERD_COMMIT="ea765ab"
+EGO_PN="github.com/containerd/${PN}"
+
+inherit golang-vcs-snapshot toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/"
+SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+DEPEND="
+	btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )
+"
+
+RDEPEND="
+	${DEPEND}
+	~app-emulation/runc-1.0.0_rc10
+"
+
+BDEPEND="
+	dev-go/go-md2man
+	virtual/pkgconfig
+	test? ( "${RDEPEND}" )
+"
+
+# tests require root or docker
+# upstream does not recommend stripping binary
+RESTRICT+=" strip test"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+	sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+		-e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\
+		-e "s/-s -w//" \
+		Makefile || die
+}
+
+src_compile() {
+	local options=(
+		$(usev apparmor)
+		$(usex btrfs "" "no_btrfs")
+		$(usex cri "" "no_cri")
+		$(usex device-mapper "" "no_devmapper")
+		$(usev seccomp)
+		$(usev selinux)
+	)
+
+	myemakeargs=(
+		BUILDTAGS="${options[*]}"
+		DESTDIR="${ED}"
+		LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '')
+	)
+
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	export GOFLAGS="-v -x -mod=vendor"
+	emake "${myemakeargs[@]}" all man
+}
+
+src_install() {
+	dobin bin/*
+	doman man/*
+	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+	keepdir /var/lib/containerd
+
+	# we already installed manpages, remove markdown source
+	# before installing docs directory
+	rm -rf docs/man || die
+	local DOCS=( README.md PLUGINS.md docs/. )
+	einstalldocs
+}
diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest
index 80de40eaed71..27042f8a246d 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -1,3 +1,5 @@
 DIST docker-proxy-0.8.0_p20200617.tar.gz 3386043 BLAKE2B b32c3b6ef97f656414fdf026307f4054d4dd11cc91dc44a235eb5e5dc9f5f3da0cc4b001eaa28387b79f8f79f0124e6c01b8aab56d5c9e37d777e21cc186cb9c SHA512 fe8644611e975c051ee6e7ad4871624fb45862d9b4a2fd62ea4283e76ad9804d91d585e2165915b09356f11f9dfb31c40dd9ce6a66d63c5032c8c62354960538
+DIST docker-proxy-0.8.0_p20201105.tar.gz 3386010 BLAKE2B 414c3d37cfe2f36dbb5cfafc6047ee0aa299ba2aeb9c5c51da308285b1e2cc0a32e83557628e0de4817651331fbcfd6b430a88fd5a0f97bb7483a8fb10ae0791 SHA512 3d81ba20a91517e14da7e75a24d4e2eeb04c1dcb9c1bfe1115247982dbdb55d2fd72d0130093e9597363b742a20f2647f229c870da9a1cbdefc69aef65f02250
 EBUILD docker-proxy-0.8.0_p20200617.ebuild 772 BLAKE2B df0bec6f5cb6556af0b2ce0b06b93d2fdd324d746175c897cd21aacd6b4700e9c77690230a107ed6d2b0ac5bad501206269c3ed4c98e75ec3e7945c964617729 SHA512 42a76db8d1205e28db64dd95eab6b6020131c35fe6216be247da9a70c8a3ee28350fda47e310927f85e02e6b9270c18bc79053ba695652c7f79e30d8d745e7d3
+EBUILD docker-proxy-0.8.0_p20201105.ebuild 772 BLAKE2B 66ee164b2e0bc59d9166a041a8a5cc447ed3d4d7dae1ae165c593dd5755dbd97e96c758f86f5a423e6483606c03dd6081b194398e3bb17653a6f437d93f91e27 SHA512 5dedd4dca31623dbd715975ede6a22f945bd07c04d3600e9bdf368c9d48d494162e43dc3cbab2dbba61545295dc61bed8aa299611e6732be056504da0e443a8c
 MISC metadata.xml 549 BLAKE2B 7e18ea0a99b0943c8d275ca674f97f82fae990dbe778a662c414dbae3eb84f29dce92b4ab7b1d7e623a79544c3c2ed0f6b1815a25be21cedce54a3e710e789f8 SHA512 3d0fbb5922dee2dc482f67b193c55a77e9eeba0380b1cc9d89a00c5a3b167d72ae37a35f13c87ddc9ea6abe12aed59f1ae755dd16ca146bcc9d7392374832a0d
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201105.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201105.ebuild
new file mode 100644
index 000000000000..feb57a0f2c36
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20201105.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN="github.com/docker/libnetwork"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="55e924b8a84231a065879156c0de95aefc5f5435"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+# needs dockerd
+RESTRICT="test"
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || die
+}
+
+src_install() {
+	dodoc README.md CHANGELOG.md
+	dobin bin/docker-proxy
+}
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index bff22f315d2a..47bc01a68220 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,3 +1,5 @@
 DIST docker-19.03.13.tar.gz 18242693 BLAKE2B c19afed62694274298b42fc9af3b36c4cc6429b40f7e5447a996b87636a0d2e916476875652e20abd7aeab4e5e0e1cf887a04dcade1de03ded549fc36d911ac4 SHA512 5f34a14ef0b36a309d4a08926ac482ca82d24cdd873aa359c5ba7c65473cbb2e987fe615c38c1bc1c50135284da78a7eb98a8a0106d7d073aeda0cd8f1c31873
+DIST docker-19.03.14.tar.gz 18278132 BLAKE2B 5e32cb482fdc40531aa4ba79dd447093859f568b3d8b5c3ed584c78d5709fabf2a1e05e82af2686cd87462e1abd899bd3f0a746f97937b7d16950f5e94264dff SHA512 5e48185a7787d5637fc11f43f6af604d56a5fa4367fd5a558bb3a5ef3c0d767f1c7f83ecef369453696b68eed81e49520453f267fbe8c2b840b3f62d35f25c28
 EBUILD docker-19.03.13-r2.ebuild 9208 BLAKE2B e0fdb980ed5a99cef22fa76160634f0caca5251982a724ef5714a9282a06512f98fb7c88bf18fc7b0ff2da5cb16d243f5390b37f0bcd17ba60d199dff9ee0adb SHA512 5682caacdaaaa8ed1cb068957415d2b770bc75aa5000742249ae4741f9733fa1d533c9bd614bdd9450cbfedac4b6bcf7d587b7a8e063998eb25d6a4a88c02955
+EBUILD docker-19.03.14.ebuild 9207 BLAKE2B e5bbea70b2dc25438365f456acd4c090268ffe3dfd4a754eb9be302f4db020d39d966bf387416233198c679c59e8c85351dac3fa5068573b26817930964fdcbc SHA512 e0151c90a66de719d2149365e3badde2d5b49f4edc3881b288f6a83dc9a037724266341fef36f5d802b982f9bc21fa1bb9ff1922870e746b634cc83558ae0a85
 MISC metadata.xml 1480 BLAKE2B d55259087f20646d81686efc1def000be31b841eb450b16b41de984955688282c541dbf127d3638cabc1219f22d2dad77c6c0431a374148329f73f0ab91f8ca7 SHA512 2ca140b93f15f63d3e07989f4ff1e702b61e4ef62d199564e1fd91f995750740c08f28aafe35f0a0945fa588bc6240e3f02aa84aa06c6be7944ad5f5d2764bfa
diff --git a/app-emulation/docker/docker-19.03.14.ebuild b/app-emulation/docker/docker-19.03.14.ebuild
new file mode 100644
index 000000000000..fa355dcabb81
--- /dev/null
+++ b/app-emulation/docker/docker-19.03.14.ebuild
@@ -0,0 +1,333 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = *9999* ]]; then
+	# Docker cannot be fetched via "go get", thanks to autogenerated code
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+	inherit git-r3
+else
+	DOCKER_GITCOMMIT="5eb3275"
+	MY_PV=${PV/_/-}
+	SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+	inherit golang-vcs-snapshot
+fi
+inherit bash-completion-r1 golang-base linux-info systemd udev
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://www.docker.com/"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp selinux"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+BDEPEND="
+	>=dev-lang/go-1.13.12
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+
+DEPEND="
+	acct-group/docker
+	>=dev-db/sqlite-3.7.9:3
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
+	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+# https://github.com/docker/docker-ce/tree/master/components/engine/hack/dockerfile/install
+# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^,
+# for appropriate brachch/version of course
+RDEPEND="
+	${DEPEND}
+	!sys-apps/systemd[-cgroup-hybrid(+)]
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	dev-libs/libltdl
+	~app-emulation/containerd-1.3.9[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?]
+	~app-emulation/runc-1.0.0_rc10[apparmor?,seccomp?,selinux(-)?]
+	~app-emulation/docker-proxy-0.8.0_p20201105
+	container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~KEYS
+	~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
+	~IP_NF_NAT ~NF_NAT
+	~POSIX_MQUEUE
+
+	~USER_NS
+	~SECCOMP
+	~CGROUP_PIDS
+	~MEMCG_SWAP
+
+	~BLK_CGROUP ~BLK_DEV_THROTTLING
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+	~VXLAN
+	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
+	~IPVLAN
+	~MACVLAN ~DUMMY
+
+	~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR
+	~EXT4_FS_SECURITY
+	~EXT4_FS_POSIX_ACL
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+	if kernel_is lt 3 10; then
+		ewarn ""
+		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
+		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
+	fi
+
+	if kernel_is le 3 18; then
+		CONFIG_CHECK+="
+			~RESOURCE_COUNTERS
+		"
+	fi
+
+	if kernel_is le 3 13; then
+		CONFIG_CHECK+="
+			~NETPRIO_CGROUP
+		"
+	else
+		CONFIG_CHECK+="
+			~CGROUP_NET_PRIO
+		"
+	fi
+
+	if kernel_is lt 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+	fi
+
+	if kernel_is lt 4 7; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if kernel_is lt 5 1; then
+		CONFIG_CHECK+="
+			~NF_NAT_IPV4
+			~IOSCHED_CFQ
+			~CFQ_GROUP_IOSCHED
+		"
+	fi
+
+	if kernel_is lt 5 2; then
+		CONFIG_CHECK+="
+			~NF_NAT_NEEDED
+		"
+	fi
+
+	if kernel_is lt 5 8; then
+		CONFIG_CHECK+="
+			~MEMCG_SWAP_ENABLED
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	export GOPATH="${WORKDIR}/${P}"
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+	# if we're building from a tarball, we need the GITCOMMIT value
+	[[ ${DOCKER_GITCOMMIT} ]] && export DOCKER_GITCOMMIT
+
+	# fake golang layout
+	ln -s docker-ce/components/engine ../docker || die
+	ln -s docker-ce/components/cli ../cli || die
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor seccomp selinux; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	pushd components/engine || die
+
+	if use hardened; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-daemon || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+	fi
+
+	# build daemon
+	VERSION="$(cat ../../VERSION)" \
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	# build cli
+	DISABLE_WARN_OUTSIDE_CONTAINER=1 emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="$(cat ../../VERSION)" \
+		GITCOMMIT="${DOCKER_GITCOMMIT}" \
+		dynbinary
+
+	# build man pages
+	go build -o gen-manpages github.com/docker/cli/man || die
+	./gen-manpages --root . --target ./man/man1 || die
+	./man/md2man-all.sh -q || die
+	rm gen-manpages || die
+	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+
+	popd || die # components/cli
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+
+	pushd components/engine || die
+	newbin bundles/dynbinary-daemon/dockerd-${PV} dockerd
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/syntax/vim/ftdetect
+	doins -r contrib/syntax/vim/syntax
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	newbin build/docker-* docker
+
+	doman man/man*/*
+
+	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
+	dobashcomp contrib/completion/bash/*
+	bashcomp_alias docker dockerd
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+	popd || die # components/cli
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot:"
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "  systemctl enable docker.service"
+	else
+		elog "  rc-update add docker default"
+	fi
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog '  usermod -aG docker <youruser>'
+	elog
+
+	if use device-mapper; then
+		elog " Devicemapper storage driver has been deprecated"
+		elog " It will be removed in a future release"
+		elog
+	fi
+
+	if use overlay; then
+		elog " Overlay storage driver/USEflag has been deprecated"
+		elog " in favor of overlay2 (enabled unconditionally)"
+		elog
+	fi
+
+	if has_version sys-fs/zfs; then
+		elog " ZFS storage driver is available"
+		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
+		elog
+	fi
+}
diff --git a/app-emulation/dynamips/Manifest b/app-emulation/dynamips/Manifest
index df4681bc6eb5..ae69e0bdb360 100644
--- a/app-emulation/dynamips/Manifest
+++ b/app-emulation/dynamips/Manifest
@@ -3,4 +3,4 @@ DIST dynamips-0.2.18.tar.gz 833554 BLAKE2B 8152b436e8fc43061c5603a44ceae8feebdd4
 DIST dynamips-0.2.21.tar.gz 833863 BLAKE2B a3162de26839a4c99fd1f147fe0a12e04f4b225b6539aa1599550c40c6a9e21deed950b47f7afbbc1cfbe2f61a351a4185a18f56c4b63c191eccc7122e2c0115 SHA512 c7251963897b65ed5696f47f03be727cea79fe2245850c86fa6b4d8718afa10002b1e39bccefe1c7f2ba86fe6b8f52fe8663ee34f72ca3d9f846522b9b9b4d29
 EBUILD dynamips-0.2.18.ebuild 821 BLAKE2B 86ec42ec88cbbca52f6f50d9b703ad366452b730cf165714bcaf3a5a135c49872220e8fa6cc61b4d0ba0ce824fd0a100795a2f0493715e6080db1ec12ecce375 SHA512 a2a7ca16bb46b48ec1ef4e50bfabb0c6c420bb0baa43289dfeb83c11680f6a7f14be5957dcdedb8e48248192a8a054edeafb0a42135921d09168e9884b1248c0
 EBUILD dynamips-0.2.21.ebuild 835 BLAKE2B 523bbd9cf0edacd2993cfc30aefef3e86386545a9b6fad62ac038ec8ec0079be1144e4a4ba49c6599aaa5c6174a0f6a8f101327553eae93ea4287f109b3ce5a1 SHA512 9ebeac76aac14954daf3e01122aab5012ac81685c5b1d472df5bed6a3e35c0d9832128098ac531e3acdec9c5bc4be640d8c1bfd4366202f7ef12db807378d9aa
-MISC metadata.xml 375 BLAKE2B a7dbd13035f1fe8d48565d2bebe923992d8d8f8eac145a504ca13e416a30af978b836d29a58b0d80fb63190b6ebf511f3f6f8eba42aded724c5c6a1c61ee97c4 SHA512 e3917a92fba07b5e811a27425504ecb1c9a460ef9882fb9041cc5aa0a5fa5fc448f3906f431d7b8ac8bba134e6c0f669bf404872db8d6ef74a862e22149e90d2
+MISC metadata.xml 295 BLAKE2B 8620855399c33f332681337e77731ab41e62ffbf7cc3b4393b6eed9a00878275ee595696b0f2732722c8f1fc95a54e9a4960882b6adf198134ee3982b6958a9c SHA512 ff501b29ad43a5fedf38374c038c4682f1bc43a2a0b5ab90f56ee0ffaf899ebd90409af29803cc8c7c35b7d1033196d621243129144710eaad02f8b25e436d6c
diff --git a/app-emulation/dynamips/metadata.xml b/app-emulation/dynamips/metadata.xml
index 2f5d95978a96..bd4be58c8f43 100644
--- a/app-emulation/dynamips/metadata.xml
+++ b/app-emulation/dynamips/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">gns-3</remote-id>
 		<remote-id type="github">GNS3/dynamips</remote-id>
diff --git a/app-emulation/pcem/Manifest b/app-emulation/pcem/Manifest
index 089eda497358..be8d0cc823f2 100644
--- a/app-emulation/pcem/Manifest
+++ b/app-emulation/pcem/Manifest
@@ -1,4 +1,7 @@
 AUX pcem-15-respect-cflags.patch 300 BLAKE2B 4531829e43d43501fe889b34381fc056ffa2734ca499686558cf39ef245f3808e6488c32d6938487d018175ab8a370a28e491cc957406ea6e430a9afff44dae2 SHA512 7800d9056fc1ab4b38f97a6021da7288b990ab9c562846be1ae4ec6636c888fd444c635076f070c50f39681202995a41575823a225c77017d389638feaf1a93c
+AUX pcem-17-respect-cflags.patch 273 BLAKE2B 5c6bb6335677a1784b7fe99de3ebfc47351ab1c849d03f656e5428fd309256c46736ce6faf709aa379279c52ebdc7b46ea2e15ab1aa60a43dbdfc91fa09581af SHA512 4b83837f623971ccb91f525cee9bace2b9fd6b3a776a7d6907ec8e8796a021d8d68e665fc0dff7db083c7e068d6e07d3d61049ee2d9209c5b3d59a0fca388064
 DIST PCemV16Linux.tar.gz 1859892 BLAKE2B e388031e661b9320cc783e6400bdb7c191a2f946d9c207d9a58daa9270115b32ed55ac6a0b87227b51d10168e7d161bb03811eb83f5405ed1a71f7bfc6fd8aa5 SHA512 97d33ae1c4b59f281abe553ed4297c0d6c3956cf32b44474bfd5773700dd5c4ea6c209c679b9add5d4a7cba61748ee9794afa3c59af3230fa2a15812e13fd1c5
+DIST PCemV17Linux.tar.gz 1880868 BLAKE2B 64068f0f98e8fe3e9bfe42a04f462375a7ee0cb8259b103237f3b0542f54ad13ed625a55c8379e2c54a87348ed504496a6b163419855ceeda8e4f18e1ea5dcd9 SHA512 6d84c8cbe9b6116f6439f542ac08139cfc5652a34b615a1ed841a6f8c227e77f1d26573ec35d57511b9a69e7472fbe51f2abb9307f8f8c1207c74fbe8107cadd
 EBUILD pcem-16-r1.ebuild 1633 BLAKE2B 735440b0bda54c7433fda65d0147c201ce0afa98f138afaa2f5837ee1fffdbb2613996b15ddeb97f0c529db498336a58225b1647c1d760c41c8a21a0dbe79cce SHA512 6896184bbdb47b3e112abffe1296c147f67b07fe56ecb5bff7a399ee8de4dd42d2642eec936c0ceb08e45d8142fba1879a66fc658bf151f961a3fc42033548a2
+EBUILD pcem-17.ebuild 1664 BLAKE2B d43817f2f4f7cde340a081d4f9d740bad55d776d6926bdebe167aceaee72f2f3852734e51514fa093f7d7011ac0578286411f6c4c35294b8aae013bf6fa0aa50 SHA512 ddd6634df57c85ec406ac1147707b61c2035c59a56bc85ddafe85f16eee8ca36626f45d3bd642fd4a26f3c7eb25034b250f7496621cf2566fa0503d739d4cd41
 MISC metadata.xml 857 BLAKE2B c678e4578dca5c14416690cf8a421d4d1d8887237a4600580aad48d1d4ea6b641cc3c1f47c6c00be44344b760aa87c2b9bbded7625e0ccaedd0c8c2cb14dd057 SHA512 e610d16662365ae271fab8a2364e5781ba4be7a841d36759bc4e319b7f87a589c02131aeea83f194eabf940c0c4439459127468c0a65a72e3e2e91c74c0d409d
diff --git a/app-emulation/pcem/files/pcem-17-respect-cflags.patch b/app-emulation/pcem/files/pcem-17-respect-cflags.patch
new file mode 100644
index 000000000000..73cac4541bf1
--- /dev/null
+++ b/app-emulation/pcem/files/pcem-17-respect-cflags.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,8 +31,8 @@
+    CXXFLAGS="-Wall -O0 -g -D_DEBUG -fcommon"
+    AC_MSG_RESULT([yes])
+ else
+-   CFLAGS="-O3 -fcommon"
+-   CXXFLAGS="-O3 -fcommon"
++   CFLAGS?="-O3 -fcommon"
++   CXXFLAGS?="-O3 -fcommon"
+    AC_MSG_RESULT([no])
+ fi
+ 
diff --git a/app-emulation/pcem/pcem-17.ebuild b/app-emulation/pcem/pcem-17.ebuild
new file mode 100644
index 000000000000..825619a6ac61
--- /dev/null
+++ b/app-emulation/pcem/pcem-17.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic wxwidgets
+
+WX_GTK_VER="3.0-gtk3"
+
+DESCRIPTION="A PC emulator that specializes in running old operating systems and software"
+HOMEPAGE="
+	https://pcem-emulator.co.uk/
+	https://github.com/sarah-walker-pcem/pcem/
+"
+SRC_URI="https://pcem-emulator.co.uk/files/PCemV${PV}Linux.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="alsa networking"
+
+S="${WORKDIR}"
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib )
+	media-libs/libsdl2
+	media-libs/openal
+	x11-libs/wxGTK:${WX_GTK_VER}[tiff,X]
+"
+
+DEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "TESTED.md" )
+
+PATCHES=( "${FILESDIR}/${PN}-17-respect-cflags.patch" )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Does not compile with -fno-common.
+	# See https://pcem-emulator.co.uk/phpBB3/viewtopic.php?f=3&t=3443
+	append-cflags -fcommon
+
+	local myeconfargs=(
+		--enable-release-build
+		$(use_enable alsa)
+		$(use_enable networking)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/pcem
+	doins -r configs nvr roms
+
+	newicon src/icons/32x32/motherboard.png pcem.png
+	make_desktop_entry "pcem" "PCem" pcem "Development;Utility"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "In order to use PCem, you will need some roms for various emulated systems."
+	elog "You can either install globally for all users or locally for yourself."
+	elog ""
+	elog "To install globally, put your ROM files into '${ROOT}/usr/share/pcem/roms/<system>'."
+	elog "To install locally, put your ROM files into '~/.pcem/roms/<system>'."
+}
diff --git a/app-emulation/rex-client/Manifest b/app-emulation/rex-client/Manifest
deleted file mode 100644
index 471e03f736f2..000000000000
--- a/app-emulation/rex-client/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD rex-client-9999.ebuild 799 BLAKE2B fcaef591d7814eb8c1bd749c0c4360642b641a264a05e921d0c882b27142056af6400190e968e577918fe68a3ef83ffe973efba81a2c01c740eef5dc3217b8f2 SHA512 5fc207897713719ff42f9f0c77ad761566b3eefaaab9898f1f7e7c45480b1777f3219e48ada96363533fcee8805be25073d9f8720e0a056b92bf87bead9dbe57
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-emulation/rex-client/metadata.xml b/app-emulation/rex-client/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-emulation/rex-client/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-emulation/rex-client/rex-client-9999.ebuild b/app-emulation/rex-client/rex-client-9999.ebuild
deleted file mode 100644
index 4b6505b6105d..000000000000
--- a/app-emulation/rex-client/rex-client-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Remote EXexcution agent"
-HOMEPAGE="http://mduft.github.io/rex/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mduft/rex.git"
-else
-	SRC_URI=""
-	KEYWORDS="~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-REX_EXE=(
-	"client/rex-exec.sh"
-	"client/rex-register.sh"
-	"client/rex-paths.sh"
-	"client/rex-remote-pconv.sh"
-	"client/winpath2unix"
-	"client/unixpath2win"
-	)
-
-src_prepare() {
-	for x in ${REX_EXE[@]}; do
-		sed \
-			-e "s,\. \${HOME}/rex-config.sh,\. ${EPREFIX}/etc/rex.conf,g" \
-			-i "${x}" || die
-	done
-}
-
-src_install() {
-	for x in ${REX_EXE[@]}; do
-		dobin "${S}"/${x}
-	done
-
-	insinto /etc
-	newins client/rex-config.sh rex.conf
-}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 84810b670e57..03510af0b6f7 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -10,7 +10,6 @@ DIST wine-staging-5.22.tar.gz 10342905 BLAKE2B 9f59a0d8c06f29b52fec71cc09915c8a7
 EBUILD wine-staging-5.18.ebuild 20436 BLAKE2B 522ef18a86d633267119e239986bd2fba09eedad6358fb5f441dde3d05ad95af673bb29940e45b17b90415650f7b6e6da6d6c66fa4a1a746c48ef5373b18723f SHA512 37e945cdd14814105bf8d395ea2a36c0e845352bfa11deda2226db61c42706113ca849c11f230b5607dc81cf694be583542026b9b5c9d23463c5dc009bd2b92f
 EBUILD wine-staging-5.20.ebuild 20436 BLAKE2B 40da6c7a1e6d008ad55f53ec09b82f7c9830a7c00dca754c2a4d9afd6bf14f0a67cdbd22a1174aeef79d685b08f11628e8131ab7007351ba555c9742270062a1 SHA512 c658843b8dcc234c49c3071a24fa60f9884ef3a939612e203d3433077dd154f8f09429db3467e50d6f1c014f421b228a25cffb06843a758ee6f1a5f1cb4073c8
 EBUILD wine-staging-5.21.ebuild 20436 BLAKE2B 40da6c7a1e6d008ad55f53ec09b82f7c9830a7c00dca754c2a4d9afd6bf14f0a67cdbd22a1174aeef79d685b08f11628e8131ab7007351ba555c9742270062a1 SHA512 c658843b8dcc234c49c3071a24fa60f9884ef3a939612e203d3433077dd154f8f09429db3467e50d6f1c014f421b228a25cffb06843a758ee6f1a5f1cb4073c8
-EBUILD wine-staging-5.22-r1.ebuild 21582 BLAKE2B c12f6178bca07db81044968a95fc79be813dfce2c11e89fd1c84649e93ad1da15e19c60e270cea917d25d2392a75d35f196243463fdee99020c6c68b8b071ef1 SHA512 b9c045e8b1d38579591c87ff59bb0bf4d1e3424a4ec06e238ddc4e532979a4f7cbadc6d9d5a6fd32349fcc4f436d071386ed058179949c1845755ba560298a0f
-EBUILD wine-staging-5.22.ebuild 20436 BLAKE2B 40da6c7a1e6d008ad55f53ec09b82f7c9830a7c00dca754c2a4d9afd6bf14f0a67cdbd22a1174aeef79d685b08f11628e8131ab7007351ba555c9742270062a1 SHA512 c658843b8dcc234c49c3071a24fa60f9884ef3a939612e203d3433077dd154f8f09429db3467e50d6f1c014f421b228a25cffb06843a758ee6f1a5f1cb4073c8
-EBUILD wine-staging-9999.ebuild 21507 BLAKE2B 4ede53a70c4ff9304c6958828e3dbe8b03d996e2ea4ad9f3581c3098a996bba8e6df74629d68fec189779905a56c1d58872e8299fadf1164a974005bb6d368db SHA512 a491ca6b66d80bb46ce76ed91aae2a75a6c8120cdd9593baed293f6f5386e5ba874d0a0996ddc0ad2333c63ea5b0bb17a6a5826dd30e1bffabf26fda11bed86d
+EBUILD wine-staging-5.22-r2.ebuild 21639 BLAKE2B 783746bef52013679f3e060b67a038d6d6bf31bee9c46183f51ba74a5a1140c5f9ab8c74ef0e302b16685772053425e93b4b8416b380055625b9aae44431d711 SHA512 b6249475fe76a0440866c2986c9f979a3f1df86dec73a3542d63fc66717a18e2ca8a5d70cc3a50deaefdf0bd86eee37dd45cc374fb6e16816062f2631e6fcbc4
+EBUILD wine-staging-9999.ebuild 21564 BLAKE2B 56d62ebcd2b592fb3a02f0fe6f94885f7ce4aaf12542cdf360008af38f09eebd8990cb3567e9c9bff7545ae746377e0b45cf4223ecc99c23d14d00f0e58a6339 SHA512 a054385123ec7b91dc67654dc4472c7014059d3c7143a8104b72d202ce2d496ac429f46431ec9f5b8d5d57f598dc2936be48f7997afb3819f2341e2e4e8d1814
 MISC metadata.xml 3887 BLAKE2B 488d934f151903b52366045b3080f85543ebe7ae732ddff83fb85ecf011da53253f02a24fe2e3edf0775b4ec4abe2ca3ac2cc8d5445a94295d802486dc137e6b SHA512 016e53c706fb3be797a9d66dcd9d24a3824e890d0d4be4e3bee851e5b39439d1500b126def8623ec21ae1849c68026102d39d5b17bb145069d04aa435a2f0d8c
diff --git a/app-emulation/wine-staging/wine-staging-5.22-r1.ebuild b/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild
similarity index 99%
rename from app-emulation/wine-staging/wine-staging-5.22-r1.ebuild
rename to app-emulation/wine-staging/wine-staging-5.22-r2.ebuild
index cf0d7510808e..9d69e49cd8d0 100644
--- a/app-emulation/wine-staging/wine-staging-5.22-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild
@@ -448,6 +448,9 @@ src_configure() {
 
 	export LDCONFIG=/bin/true
 	use custom-cflags || strip-flags
+	if use mingw; then
+		export CROSSCFLAGS="${CFLAGS}"
+	fi
 
 	multilib-minimal_src_configure
 }
diff --git a/app-emulation/wine-staging/wine-staging-5.22.ebuild b/app-emulation/wine-staging/wine-staging-5.22.ebuild
deleted file mode 100644
index 9c6e2a76fa30..000000000000
--- a/app-emulation/wine-staging/wine-staging-5.22.ebuild
+++ /dev/null
@@ -1,621 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-STAGING_P="wine-staging-${PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20200523"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${PV} == "9999" ]] ; then
-	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
-else
-	SRC_URI="${SRC_URI}
-	staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	pipelight? ( staging )
-	test? ( abi_x86_32 )
-	themes? ( staging )
-	vaapi? ( staging )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	themes? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
-	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:5.1.1 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	staging? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${pn_live_val} ]]; then
-		if use staging; then
-			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
-			eerror "cannot be used to set the commit. Instead, you may use the"
-			eerror "environment variables:"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-			eerror
-			return 1
-		fi
-	fi
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environment variables:"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-		if use staging; then
-			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
-
-			EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
-			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
-
-			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
-				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
-				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
-				einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
-			fi
-		fi
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	if use staging; then
-		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
-		ewarn "Wine bugzilla should explicitly state that staging was used."
-
-		local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" #652176
-		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
-
-		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
-		ebegin "Running Wine-Staging patch installer"
-		(
-			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
-			cd "${STAGING_DIR}/patches"
-			source "${STAGING_DIR}/patches/patchinstall.sh"
-		)
-		eend $? || die "Failed to apply Wine-Staging patches"
-	fi
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir="${EPREFIX}/etc/wine"
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gcrypt)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with unwind)
-		$(use_with v4l v4l2)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	use staging && myconf+=(
-		--with-xattr
-		$(use_with themes gtk3)
-		$(use_with vaapi va)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	# Avoid double prefix from dosym and make_wrapper
-	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	else
-		if use staging; then
-			eselect wine register --staging ${P} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	else
-		if use staging; then
-			eselect wine deregister --staging ${P} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index df834fec4d88..89c382767067 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -448,6 +448,9 @@ src_configure() {
 
 	export LDCONFIG=/bin/true
 	use custom-cflags || strip-flags
+	if use mingw; then
+		export CROSSCFLAGS="${CFLAGS}"
+	fi
 
 	multilib-minimal_src_configure
 }
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 3d0d8a199fa0..c9378a1aadce 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -16,7 +16,6 @@ EBUILD wine-vanilla-5.0.3.ebuild 17554 BLAKE2B 4fb5c237a16645195516f980e6a0bb96a
 EBUILD wine-vanilla-5.19.ebuild 17601 BLAKE2B 38d18a7743bbc9a229928001dbf598224a76df8d56af2ff5f314dd14961483ae8b9470a6adcfd80bef6b1848420f8bf069545c615858c97dd45d752bc2fc252d SHA512 e4a5252018b1c5cb8b99a05a6a209c0c43e9e973dd305388fa5fe1ae9eb1653f37c1cee617161f5f1ada8085b1e660ae217707d4f0329f39d04f41e788ce2cf4
 EBUILD wine-vanilla-5.20.ebuild 17601 BLAKE2B 38d18a7743bbc9a229928001dbf598224a76df8d56af2ff5f314dd14961483ae8b9470a6adcfd80bef6b1848420f8bf069545c615858c97dd45d752bc2fc252d SHA512 e4a5252018b1c5cb8b99a05a6a209c0c43e9e973dd305388fa5fe1ae9eb1653f37c1cee617161f5f1ada8085b1e660ae217707d4f0329f39d04f41e788ce2cf4
 EBUILD wine-vanilla-5.21.ebuild 17601 BLAKE2B 38d18a7743bbc9a229928001dbf598224a76df8d56af2ff5f314dd14961483ae8b9470a6adcfd80bef6b1848420f8bf069545c615858c97dd45d752bc2fc252d SHA512 e4a5252018b1c5cb8b99a05a6a209c0c43e9e973dd305388fa5fe1ae9eb1653f37c1cee617161f5f1ada8085b1e660ae217707d4f0329f39d04f41e788ce2cf4
-EBUILD wine-vanilla-5.22-r1.ebuild 18747 BLAKE2B 07a0e23a9f700ff7eea5b51526e6dc7b491e3d3638c9f717b92252ba23dada7922793be960a84474c21706e10694206dfa6540d47450fe3b7afd9360cd299063 SHA512 d62fb59a9ce96cf3e49635e853c4c922614091090ac4252ad16b11622b5450b379ff7eb8975e0ba13f5e6cb1aa95b7d0d750c428593cb5d7703bc02d329f082b
-EBUILD wine-vanilla-5.22.ebuild 17601 BLAKE2B 38d18a7743bbc9a229928001dbf598224a76df8d56af2ff5f314dd14961483ae8b9470a6adcfd80bef6b1848420f8bf069545c615858c97dd45d752bc2fc252d SHA512 e4a5252018b1c5cb8b99a05a6a209c0c43e9e973dd305388fa5fe1ae9eb1653f37c1cee617161f5f1ada8085b1e660ae217707d4f0329f39d04f41e788ce2cf4
-EBUILD wine-vanilla-9999.ebuild 18747 BLAKE2B 07a0e23a9f700ff7eea5b51526e6dc7b491e3d3638c9f717b92252ba23dada7922793be960a84474c21706e10694206dfa6540d47450fe3b7afd9360cd299063 SHA512 d62fb59a9ce96cf3e49635e853c4c922614091090ac4252ad16b11622b5450b379ff7eb8975e0ba13f5e6cb1aa95b7d0d750c428593cb5d7703bc02d329f082b
+EBUILD wine-vanilla-5.22-r2.ebuild 18804 BLAKE2B 397fba4da760820c53857d87bdbe351a23995f7fb5bbbfbc693361fcada43546b4382c39eaffc84e356552fdcb6a880b5b3e41ae18ab9165db0e10f4c11e2f2b SHA512 17c8d3c06fee1c6a6b3de04d814c4794ce98d5023841b15c6aaa96c07f591b726f992d9d88ea557612be8580f09f99e9405dde10eaefa1f71a8fba67c536521c
+EBUILD wine-vanilla-9999.ebuild 18804 BLAKE2B 397fba4da760820c53857d87bdbe351a23995f7fb5bbbfbc693361fcada43546b4382c39eaffc84e356552fdcb6a880b5b3e41ae18ab9165db0e10f4c11e2f2b SHA512 17c8d3c06fee1c6a6b3de04d814c4794ce98d5023841b15c6aaa96c07f591b726f992d9d88ea557612be8580f09f99e9405dde10eaefa1f71a8fba67c536521c
 MISC metadata.xml 3414 BLAKE2B 29136302781a2a0979948e0da37cf9d34bf728b3dd7c6973f19d69d61a59804cf13c8e7f21e01ad892bd3b8d028d9f7a0cdab6d092de861e8fc5c73e178dc2da SHA512 5e3b375d5ed3c31556441d7d71e99a862e57c3f8d07adffcfb7ed0c6c9f3dc888c6a17474ddc5c62897149000d6ccebcb5866b3ac6dace781774ab7f1b48e46b
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.22-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild
similarity index 99%
rename from app-emulation/wine-vanilla/wine-vanilla-5.22-r1.ebuild
rename to app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild
index a422ff77cdc0..05ef8ffca0cb 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.22-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild
@@ -382,6 +382,9 @@ src_configure() {
 
 	export LDCONFIG=/bin/true
 	use custom-cflags || strip-flags
+	if use mingw; then
+		export CROSSCFLAGS="${CFLAGS}"
+	fi
 
 	multilib-minimal_src_configure
 }
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.22.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.22.ebuild
deleted file mode 100644
index 226b93efb90f..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-5.22.ebuild
+++ /dev/null
@@ -1,539 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20200523"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:5.1.1 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "EGIT_OVERRIDE_COMMIT_WINE"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir="${EPREFIX}/etc/wine"
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with unwind)
-		$(use_with v4l v4l2)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	local PKG_CONFIG
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	tc-export PKG_CONFIG
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	# Avoid double prefix from dosym and make_wrapper
-	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index a422ff77cdc0..05ef8ffca0cb 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -382,6 +382,9 @@ src_configure() {
 
 	export LDCONFIG=/bin/true
 	use custom-cflags || strip-flags
+	if use mingw; then
+		export CROSSCFLAGS="${CFLAGS}"
+	fi
 
 	multilib-minimal_src_configure
 }
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index b4be31d72c7e..ac71726f7864 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -6,6 +6,6 @@ DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99ead
 DIST xen-4.14.0-upstream-patches-5.tar.xz 79424 BLAKE2B d2c6ec53e02fb306a7d7f7e8e6711f3e0523919d8dfb3e4e4b7ea66b618511c035e88e015e1028e6684bc6486e8e71b52e280c2f52c34357441870cd866b2672 SHA512 218657053c24330b0c9072fa32b9cc9619b6ceed0592114445651977c335fef0748160e89da2194456d4e0761b6314aed7a5f1992fa996c62eb191431b678e40
 DIST xen-4.14.0.tar.gz 39950576 BLAKE2B db4c3e79cfdfb10260d0d14d9d28e8c8bd9bf23f42aee743acf8f560bf4cdb96a425c0df887c70f9755f62680be24bfbe0149e52a4cb843ae83090cd9d6afc71 SHA512 ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0
 EBUILD xen-4.13.2-r1.ebuild 4443 BLAKE2B e84906b185538496d167ec43151f6620d5f5da3f7e84f107f4448bd6f659e82115be913d96c5a2b18e4fde97b69b07061ed80eb383a33c4f526394f58ba45adf SHA512 510dec9a78f1562b4988c5838ecc5babfc5ef12c11a43cc98e049dc326a9b31cbeb9b4ca127519d25541e2ddf04d7bdde6e472e0b8072f23fb052dfa1beffcba
-EBUILD xen-4.13.2-r2.ebuild 4444 BLAKE2B 4e72a5c4c6ae90646b580659574b6e2dd0ad2280a3f14afdc3618597721a2149d9f9ee430d8a633c4be4ab5ccc731f12fab62a3dc029a9a07d43d83210efd2a7 SHA512 6de2b009d6cc5dfb8e0b97deabef4a4206d64d11ff8cc30895fcde819e69e9e7885ebfb4ac0721bb20ca7b71f539250fbed5823c6aaaae5c7512fa768a4406af
+EBUILD xen-4.13.2-r2.ebuild 4443 BLAKE2B a3e56e60f36b284d0241df597669cb2bbec7b4046986e29c2c5ce9d11096e0cc93ed5e4457f40f292b422a14366d71cae8544c99facc96bb240238d5a919e8b8 SHA512 b1913fed2768b75dbb6320a984d13b3821bd6348ad2b31b128ebbb692f504cb836c5a9d57928e799d771bee04e2c1502c487c3c7faacb1869f71748288cc39df
 EBUILD xen-4.14.0-r6.ebuild 4444 BLAKE2B 48f126d1d211c6a1b7d325ea3d6f894ae4d149dd6afe946ef1b64f1a05312ff9f205a026d4eb7f9bd0d197f1a727ee1c2fdcf22d6d4b833a58a7db79c316e304 SHA512 abbc18e928d616ea721d7ffc490db7fc7e04387cdf5771752bd991a165d249b6e8a5ae2946a6f0aea554e4a3639ddb10205f1fd4d32e17ac51fff5a427524fce
 MISC metadata.xml 645 BLAKE2B ad902c521cc93a54b16faaea212f23c7bdf83a9efe19606eca7bf00b49104386dbc095ff30c4287bb79d5fcd073b77e7c1bbf929ee7b025039a50f8238572f17 SHA512 313d501abeb906c360d7965e35a18d9851e38af73a72a95351517c60a1a39553555a0a250f0bee5bfc8f6496312d6e9c70874be267c14edab45cb4841e34c248
diff --git a/app-emulation/xen/xen-4.13.2-r2.ebuild b/app-emulation/xen/xen-4.13.2-r2.ebuild
index ab0f4ed3e7fb..a8f124d31293 100644
--- a/app-emulation/xen/xen-4.13.2-r2.ebuild
+++ b/app-emulation/xen/xen-4.13.2-r2.ebuild
@@ -15,7 +15,7 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm -x86"
+	KEYWORDS="amd64 ~arm -x86"
 	UPSTREAM_VER=1
 	SECURITY_VER=
 	GENTOO_VER=
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 561c839e6d68..7b51b98005f8 100644
Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ
diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index 9f5487274e8d..783600685193 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -10,5 +10,5 @@ AUX aideinit 2949 BLAKE2B 244aaec9a38f19c6a7af706572a896e922215d6321aee4537ef5ce
 DIST aide-0.16.2_p20200614.tar.gz 144202 BLAKE2B a2533eaf0dd6caa82718eaa89878ddc101f64767788eeac3a250ceb584a2c5958ef8a5481b89eeb720e21af07da8f3576fb46d8ee9966fd2361354a35a7eaa6e SHA512 f5f83b8401465471043c60aeb6314f7bcab24c9f962f6ce550445bec8d866a5c8c00eba9e9f157f1223cde58631de139533c7de64fb3c861a5d8e7b5e367e106
 DIST aide-0.16.tar.gz 391009 BLAKE2B 8769d8c6bdf72f307b75f3c1feaa2effdeaead00a0c65ab25bbb50dc6f7c7b53fda4d0a3a54dd5030de1444a34a81c294437d45193aeb8aec7ef0af83a173d47 SHA512 29ad97756e3e2fb21dc332ed03b494a1c73e621266f8622ec80bdba23092a38ee975b97f3cff2330e4c16e64e2f672259eea9291ca706a4009e7399b4e14e6a7
 EBUILD aide-0.16-r1.ebuild 3217 BLAKE2B 584426773393f8bcf477bf01e8bc5a5e3bc4c2570dd7e2c7a6c1f1360a0e88c7db45c9bd5d79a6fe2bd95df172b99c7dab9adfc2f1f8ba94f28d94da83efd19b SHA512 2fcb2cedc8fd85654d00fb96ad66e009417e65cefa1d23f316993305389fd3f7bc49c7a5ba768cc97bfe9b39fde3ad47dfa8c159376954f23f5ce2d99dc35e14
-EBUILD aide-0.16.2_p20200614.ebuild 3831 BLAKE2B 237a0779d9b3274bb7a77b4b38cafc785e719c3f43ba5b5402ed9f65f85dd7f056e57a9b0be395f28960efe1206aa1e58a65fc995cb986539df52f60b41e1700 SHA512 495edc76f33905d2ec5feee96e562c6fa23abf92584e01e5b097e1ad3aeaaec3ab6f197c5fc1f7b2954aea8b7636f854cc8f650940ce64eec8d6622a005db540
+EBUILD aide-0.16.2_p20200614.ebuild 3838 BLAKE2B b4d62f2d763151c53367e512bdc769f6befa959ef29a701709de6b4ba666a48abd3e2ea8079f8d45d6063cba82b17fa6f72e50ecb37570acc8cdbbb335aaefc8 SHA512 8608ff464885243b68dac665a028decd55c5a3d61c4b0c2465edc1d5289a0479c29128770ea089fe5eb60b9dd7310702658a5c241361c73c6c54468c63be71e0
 MISC metadata.xml 819 BLAKE2B ea807e78f806beaf63b28b99d5dd95054e247333612d35ea6004bf4720699d4c5a503ca893e0df172086935dd927c6e165410df74c51949108ee6d2fa5766af9 SHA512 22792dd087461ca8b147db6a03a5198127f19ea8473ce5691d9630e36655365a9dde4377f6d62e0457b65a634e23c0b2852db9dadc7d00c3fcec4a84e21b3054
diff --git a/app-forensics/aide/aide-0.16.2_p20200614.ebuild b/app-forensics/aide/aide-0.16.2_p20200614.ebuild
index 92bf4b34c623..4daf1f2b555d 100644
--- a/app-forensics/aide/aide-0.16.2_p20200614.ebuild
+++ b/app-forensics/aide/aide-0.16.2_p20200614.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/aide/aide/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="acl audit curl e2fs mhash postgres prelink selinux xattr zlib"
 
 REQUIRED_USE="
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index c6cec6e1e72d..11632496db3a 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/kde-l10n-scripts/Manifest b/app-i18n/kde-l10n-scripts/Manifest
deleted file mode 100644
index 3d9983f0f1f7..000000000000
--- a/app-i18n/kde-l10n-scripts/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD kde-l10n-scripts-9999.ebuild 619 BLAKE2B 1ce275421516e2b8e3662a2d9d61634a6bb2874863970ab8ffbcddc5b95b5c54d93f24e7403625997c2bc996ac1177bcd45b0203a2e4323e38f244ba96af5aba SHA512 f4a241d412869b834694c2cc9599cb9c52f80a56da59f1e775655542d94699afceb05657e8fe0d8208fd56f54a586ec1021fd41f6a053f640f011ac9cb422a26
-MISC metadata.xml 343 BLAKE2B ce85098ac5406810060066b49389decf383630311cadc863522e3b4025ab78d4d72af01c234ef48ddfd001813801f6f955385a61d37371f1e3e4584f5a1a7e33 SHA512 1b6e2b61708576ec63383b7479170fdddafdb5aa30f5f947c55df99c9cb365b51e0c271f78243a38699e87d770d911591a908c4337f8760d8f340219cb1f9268
diff --git a/app-i18n/kde-l10n-scripts/kde-l10n-scripts-9999.ebuild b/app-i18n/kde-l10n-scripts/kde-l10n-scripts-9999.ebuild
deleted file mode 100644
index 4eca71e19ee6..000000000000
--- a/app-i18n/kde-l10n-scripts/kde-l10n-scripts-9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Set of scripts to manage KDE translation files"
-HOMEPAGE="https://github.com/vpelcak/kde-scripts"
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/vpelcak/kde-scripts.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	app-crypt/md5deep
-	app-i18n/pology
-	app-shells/bash:*
-	dev-vcs/subversion
-	kde-apps/poxml
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:/usr/local:${EPREFIX}/usr:" \
-		Makefile || die
-}
diff --git a/app-i18n/kde-l10n-scripts/metadata.xml b/app-i18n/kde-l10n-scripts/metadata.xml
deleted file mode 100644
index cf6e8a9090b6..000000000000
--- a/app-i18n/kde-l10n-scripts/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>kde@gentoo.org</email>
-    <name>Gentoo KDE Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">vpelcak/kde-scripts</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 825a158bddfe..5062783a6b89 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/dtach/Manifest b/app-misc/dtach/Manifest
index 13d80ad29c88..139ace8a87b5 100644
--- a/app-misc/dtach/Manifest
+++ b/app-misc/dtach/Manifest
@@ -1,3 +1,3 @@
 DIST dtach-0.9.tar.gz 60608 BLAKE2B 915b3a13cfd86a2e72505c9f8778ebbc9f25db761815e1352c0bc1281aaddcc95a837a880999379c19912fd3980bb77a20711796ef71b06282f1a27a6cc3572d SHA512 28c13dc8c96c16b9c6153a3a11fdeb4a4bc72e84e1f2575043b047cd8e600a47232f29544ffd87d82e2575623ec2e999a26e23e9eac25ec81c7722bdf98cfb18
-EBUILD dtach-0.9.ebuild 454 BLAKE2B 16f990d75606aca3bcfee47a510a3fe88694d13bc084411909b5f41cd5c7b16c0d8882409342671e23c256098878cc9ff5ea4c4e4222e78344cb13da62a9663c SHA512 a1332ed9d6d2bd7425297654b3d2a7dda9acb512f4af262e78318bd14a02416e949e268d2f04d62e54f55103ef435b7725263b0eedd9aa4e31b3d318ff0f39e6
+EBUILD dtach-0.9.ebuild 465 BLAKE2B 8016c13e7c56fdae2b23689f003940f76b1c7dd1284ce960360a12b1463674f54b4503a7ac5abb3a3c8e91e82c49c7c5315883cb36298243d1cbfc72e06dda1d SHA512 64840147c3285909fe240d8216ea6248e9d29dcc0f73d2f9d3690a9958c7a5a507107e001d77408c35ee6fc9d262e496f5be1c41f666d343596c7887a9fb47b5
 MISC metadata.xml 393 BLAKE2B 0a07b0eac6407190f07439b29f3cfbe185450ba5dfe0c4d3988c6d6abfe12c728029bda874cfaef61c48abe6182288e70ceee27d5db22b8eec03b20476db2991 SHA512 39071ddc8ee3913fb6898bbf5ce5488c76f6a7fa5f3f3905359a228d432cc76fe0336c0640d0fcd26c1be97abc220626c4258c5cd1de280a50d033b57d84aaa7
diff --git a/app-misc/dtach/dtach-0.9.ebuild b/app-misc/dtach/dtach-0.9.ebuild
index bf55cf7d2474..976bf60c519d 100644
--- a/app-misc/dtach/dtach-0.9.ebuild
+++ b/app-misc/dtach/dtach-0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
 IUSE=""
 
 src_install() {
diff --git a/app-misc/geekcode/Manifest b/app-misc/geekcode/Manifest
index 67965f8f70a6..fa5e6e92cf27 100644
--- a/app-misc/geekcode/Manifest
+++ b/app-misc/geekcode/Manifest
@@ -1,4 +1,4 @@
 AUX geekcode-1.7.3-exit.patch 276 BLAKE2B bd008224a005aa5554d4932b3d7ecaba241009deed3e633bf787d04546141f64c9e00d3617af20fb9a84b3f304bb2b037c860528919faaf6e7a0a979e5999378 SHA512 eb8161f72166c6c03c9b6a6355a3bc6fda6aa415a3cb7e9b7d8643de9b7a414249a42d5816e191e739a433b6633b146b5058ef43ca959775b8dacf8ed9cb44bc
 DIST geekcode-1.7.3.tar.gz 60617 BLAKE2B 9e848d45054805e21489e59c6e31ba4aa41a557bf9f89754a3423724bbc449415b3033de0383b9e035af6409abfb24c36b5fcb5a25ad90a14602f7d2164b59af SHA512 eca8489dafee507246538bbb8d35cc17c5712571603bad1f470803883cdbaf9658769df77e214704b6a5adec382f76e599a2f6c48ec3759861159ac626131bfa
 EBUILD geekcode-1.7.3-r1.ebuild 688 BLAKE2B ee41bfa3d30a75f59e8af4f0da398a4fb1d2958fe77ab2798313c0855e99cc55234a2cc41a9a69684a691b4e51636f6941400dae1c6faf26bb0b392cf2afc53e SHA512 4cfd0f2ebbe60249bf0d8865470f4dba4326d37e310245bd89731509a051ba18bdecafe95caa6e16ef06e2df98426a8e0fc0104be2a4ddce90c127f604549c08
-MISC metadata.xml 325 BLAKE2B 54f0eab50c63d869f888be5d8293aa90fddb6c3bba3659903f9a3f91e5fb5214ce0bcbe08c72718fc51fcd62ae251f4b999714f2d425c9091a5700e2ca7f59bf SHA512 53919d4488a8dd446a22f6d5017d7ba41d1e510a66be9a24cf20b50a9eb047b2c771518b5bc1b2c5c58b7c34ab6465f80a40cda72594586f23f96c39bf0208f4
+MISC metadata.xml 245 BLAKE2B 3c0714cdd9bae31bdd4066cdacae1b7f6da612dfb694a03268c1229922ea4b9786750624e77844eb39dd5a239a4cd025b7a520551434481dd133e5f12358f051 SHA512 893b63b0ea6d148dc82926eb61cc86db6ec79b5121f65ec56160f7ccea3610a134851cc82e9161a32ff7bd8094ee5c6b8e16060b4642b046a769bcd85dc19b32
diff --git a/app-misc/geekcode/metadata.xml b/app-misc/geekcode/metadata.xml
index 08dd382f3c44..9357284b9682 100644
--- a/app-misc/geekcode/metadata.xml
+++ b/app-misc/geekcode/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">geekcode</remote-id>
 	</upstream>
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 8b644f1a9fa6..328de9280c30 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -9,5 +9,5 @@ AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a3
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
 EBUILD lirc-0.10.1-r3.ebuild 3850 BLAKE2B 901ee4538227ee8fea67cd7f3368d2d1bd1d4d675a08389876f1e5592a66066ad48c81084e3309e1115c69dc9eb07ae5b3f31a766ab6ee421014a72820fe063a SHA512 0b5e2140748d35febd8271ed0edd17fe9b207349f961a6f0ffaebb28d3bc8e5354ffd1306303d68ed8e2fbfc877482586e82e76f47e7e82f83261057afda8646
-EBUILD lirc-0.10.1-r4.ebuild 3906 BLAKE2B 8c6a18dd572de8d0fe9073b10fd3151acfbd3c36a9185cee4dc7e65916a6ad2ee14f321128dcf33454c7301f9d61632993ca5c7685df4a62410b1420e3055bf6 SHA512 5e391f04c611655d859757c9612fa252f63e1ac815fca8fe8e7f687ef0a2de72e6317d2651a986e0d91d9c409f1e1400906bd4d25f10e3fdba23d5eb25142fb3
+EBUILD lirc-0.10.1-r4.ebuild 3904 BLAKE2B 6589e5f9063598d09399b5cd338559b9174dcefc87bd077912c2447695ddc64b8a81848a6d96050b6012fcb4409efe848ffda36d043fad29381c020883c1288e SHA512 203236357b9962596f760a72e6c480cfb3fe561390f7f1549b78f5606c244d0a1aec453e310f0ee4177ad48b6173c709bfcc29a1df94f161b2cbcf8f75f40243
 MISC metadata.xml 818 BLAKE2B 01aa3a8beeeed191a70a2154861022ce2af9fea56e1e3b8d8fc2126b647629823a750f0a64040fb65e376e6ca78070747ff40903521c84fc78af7aa5be45cf76 SHA512 4de2c162a07647f17797f827936626710a56980baebb8596436417aa0501d3b2e44c633c8c298813bed9b9ec12425e5ec89769df33e858f6a86fa328e6e252a1
diff --git a/app-misc/lirc/lirc-0.10.1-r4.ebuild b/app-misc/lirc/lirc-0.10.1-r4.ebuild
index 1c7393516243..ba338c6f35ee 100644
--- a/app-misc/lirc/lirc-0.10.1-r4.ebuild
+++ b/app-misc/lirc/lirc-0.10.1-r4.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
 
 REQUIRED_USE="
diff --git a/app-misc/rox-filer/Manifest b/app-misc/rox-filer/Manifest
index ba26763fc314..3c61c3eb86f4 100644
--- a/app-misc/rox-filer/Manifest
+++ b/app-misc/rox-filer/Manifest
@@ -2,5 +2,5 @@ AUX rox-filer-2.11-gcc10.patch 694 BLAKE2B 4f701a9df153045d92490ae590bd001b67059
 AUX rox-filer-2.11-in-source-build.patch 429 BLAKE2B fdbc342e0f6a7abaf01fe0a2f5411a6aea7a833f2679d9f47a783631443bf2618a4d6be293e5ce14da295713bd7b97af36edaffa3aedbfcea3de513ac1fd455b SHA512 28cb208bc51c500ad766bf832f8098bd44813626be2ed3c50c37d0cff5193e1dc1a4430ec40ee7290befb1f20b4a506f03c8c327760b75e06d08ec646b24638c
 AUX rox.desktop 157 BLAKE2B e13b788f78bb5f3af73e6f9c0e5cc9729b7221cf37a7b1952d78ed9d1f3ba8ada67d523ae08d7280d5152e3e5f0cafbf55e65bbb75d558d4c77b14095ac7fffd SHA512 968b930f97a25c58a0aeee0789161b98b0bfa93978beb0d7e57e40affe45b65940f67b612df93ac64c0c5244de7dbf913b1083cf7aa4a357e929a7f9f4ab366a
 DIST rox-filer-2.11.tar.bz2 1907026 BLAKE2B b1afd0e2df7152bd1160632c0e7eee71c1d3e9140d453f0fafb2d8049b593513db7ca051282ecef2ce06831883d2f057774e3d37175a64d4bd5a8158e4bbb4bd SHA512 2ef5e7a5d6f4bbb825d6f01725ad4149b9cabfb6fe82c33631bb145f5a3c84e345c372b7698170c1ef78b30ffbc4665495cc266da4828cc8b4b256b592b2c50b
-EBUILD rox-filer-2.11.ebuild 2410 BLAKE2B e4eda414d50333d7b3320e71b34591b31753765c237332f7075c555a03e74da7a4825a8e8b193fa895de197c564bebf3d71560c202a6c14109a815a3133e9aeb SHA512 52639330b112b1c0006bdefb285aeb8e192b680af4e4db50e6220934d962dc131498199cbe77c3ad821d2bb0a5b9c8dd8be22224ec8529e263796d29d64f9a24
+EBUILD rox-filer-2.11.ebuild 2417 BLAKE2B a37fb2cca0c083713d534a6de399ba6f1ce1814a33aceb2ddb48a902443ce671e741fc39ad4dde3060106345206a1145fc0ace524983aba1080e822cededaced SHA512 93317bcd067782b840b6c84da8d86a2cbb6fa96e7c9db5e7c02fff11a30c7d1119935862b9a70305c0560da0693dbbaec4710db3db617b2be44ef0699b21f7b5
 MISC metadata.xml 1188 BLAKE2B fb150cdb9a5d058579d48b6c0af7e328693ea8faf80ee0d54272892ccaa9a7095875cae2e09bb8ba72fc6fc1ad834f624230e5f1a1b2bc8a3f88a9ad7f3815c3 SHA512 e4697b62759e1c589a964016a1d18889843e16ada402d7f295fee8077dcef4178c02870f696485079c98d3c18b032a981b6d887741d7e22dd7882d5dec6f9c9d
diff --git a/app-misc/rox-filer/rox-filer-2.11.ebuild b/app-misc/rox-filer/rox-filer-2.11.ebuild
index 966f2750cf96..f85ee85da198 100644
--- a/app-misc/rox-filer/rox-filer-2.11.ebuild
+++ b/app-misc/rox-filer/rox-filer-2.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/rox/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 COMMON_DEPEND="dev-lang/perl
 	dev-libs/libxml2:2
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index 445d5757536a..6759cd60a92e 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -2,7 +2,7 @@ DIST solaar-1.0.1.tar.gz 1195660 BLAKE2B e6cd89b5735e125dd438255a8961b1d5d38feb5
 DIST solaar-1.0.2.tar.gz 1540722 BLAKE2B 66c6f7c347f5eba538d3d48ff1c1137c1c71bf84dfb1a306a94e3cb24810378864066644a82d27eaaee2d80d30bcd30bb71ebe80fdb12363e9b194df9054946d SHA512 5f97b51e7853386311c5b9ff968a72529d55837f7262786e86085e130d219ac22095c20c984e340f619a15b8242f90e66a6c678c5e0c507c261d0430b74eacd6
 DIST solaar-1.0.3rc1.tar.gz 782803 BLAKE2B a4dde7238f2616d98cafafa775050fd0c3a3aaf8a11b0eab333993a9246c321c45ebe4d30adddf82d826e1909a8e90cb0914472ab40f9ed5560d380931aea591 SHA512 845c55865ef93c163bae80dfe6e8e3013363cff1be03b167dcd4f30c541ae16e1828ed6e51c8c77aa8b067e3a75cd8e1980fb8847b308d067a816598f83c8d83
 EBUILD solaar-1.0.1-r1.ebuild 1120 BLAKE2B 8a22d0162004e2661426dea055b69bda82f0848aa9aaf5f3a2de1ec0b4af32d01b0fa5108730f4fed66717ec590bd5712fc7666a04610f8a5fc96291d30ed412 SHA512 a8413ffcd2d4a8348c047fff7b26f1bc3c200c2c6f2648b08195a513acac878fe27e3569f9a970ee38510dbcaba46ede35fec7e55771dc01b20522a99b3efa25
-EBUILD solaar-1.0.2.ebuild 1427 BLAKE2B 9730b21134fae5a9e5422a75a59d048e48acb737c5cbb2bea2ae0b2155f9d087debdbbaf4f20a61ecccef4d69eed75e27873bccca62df31e606e8a9c779cd965 SHA512 4895d4655540ed37c33329078df9a0dbc4387633ef7ea800f0d54854a87e793ac2e51c7808945d1751904a76e5584ab2fd9f3c1c563409d6d64bd2f27799308f
+EBUILD solaar-1.0.2.ebuild 1425 BLAKE2B 54f6845704a63c80ed6df6a5328d8722d4ce920143dd09a20369826e2e3f7042fa7fc0a39e03dabaf8a3dff0f0b22ae97caab2b2c79d5dfd2f1810d4fdd6f71e SHA512 b03044a8b3864fa0e7b85b1b966127332bc76149e44c5fac2f8f915000b390ca2b8e0f8ef0b51d812dc7d2f2611b6d12bbc6128ddc663154f12f0b0bd942077c
 EBUILD solaar-1.0.3_rc1.ebuild 1497 BLAKE2B 219c2e01f7bf6572989ceb1fd8005938ec5abd75160ff649898ef47c0e7ed8dd4d30a4b45c261c7a4929ff92b932e916232f98e97fb4d3d13eacc8ad2d945e10 SHA512 236e5e23e77b2dd89c908dfd1358a5a9eed7a4e6cfafba5d73edbac94c5e86a57d1fdb346e4424649200276cc4f4e8027473ced5c5d7d1d50050c327f27685c0
-EBUILD solaar-9999.ebuild 1284 BLAKE2B 516fe9ad4b43027e0e7c8cbe2eb93cc4beaec67cd973e82ef71d11fa34d188c12eea5e568ae8a469bd31b7211d3ba2e8407d8f6fa38acace4ad9032588e968a6 SHA512 0f59c7ea6fd2c63d65e68d712f0e78dfd741942bdb36e8b00a32b7e8c1486ed2fb93504429e80552544b37461baf3e3b79d84c476bd7f3f78563709de7570433
+EBUILD solaar-9999.ebuild 1286 BLAKE2B 8be09e46e163333a4e088f133798878cf76dd8e7f9fdcd821a5c3f84d819344cb6e6d1f91188470d96c15f312a790e11f43cfd29d0c99bc9e4bbf926a8bee4cf SHA512 f6f8243393790de626e897bc1cb94c4ae750c4960c04446c4c4fdbf13823e6c847bb7c44f291d3c4817108ec4e0afb4be0e6d65f28f8191b0abf29fa62b6131a
 MISC metadata.xml 301 BLAKE2B e1a95f23856b0daa09eba917e05537d4e423ca5d36ef0af029c240cff5186125868c54bf70981005b9b26bc57d5d6118972836ef4ecc1dc73131b46da9106724 SHA512 8af96a19368452eb3396e6d33ed62f4702d82d99995cf09cd55da5d55154e43422f3da527ca2101ee352392af2be5e5a521d254b99682184d68ade9da1196acb
diff --git a/app-misc/solaar/solaar-1.0.2.ebuild b/app-misc/solaar/solaar-1.0.2.ebuild
index f9fa3d13bee0..496c06386ddd 100644
--- a/app-misc/solaar/solaar-1.0.2.ebuild
+++ b/app-misc/solaar/solaar-1.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="doc appindicator libnotify"
 
 RDEPEND="
diff --git a/app-misc/solaar/solaar-9999.ebuild b/app-misc/solaar/solaar-9999.ebuild
index 6b0376ffc089..01b7caa17004 100644
--- a/app-misc/solaar/solaar-9999.ebuild
+++ b/app-misc/solaar/solaar-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit linux-info udev xdg distutils-r1
 
diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index 8b46f0f0735c..b6962e5f795c 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -1,7 +1,10 @@
 AUX 99-space-navigator.rules-r2 461 BLAKE2B b97685a2c3c628bd5a52e66d044d2ef8123c96128ae02ff46c33dffbe9ca5cba63f26ccbbf072872217b8a3a881e65a040b0c51fe91a042867f8a2cda6b6c680 SHA512 6871c629999c5f6c6988709bf15ae2821d8375fe80e3f8271cf285734163b523541dc04e70571a3578eba567e1b04ecb3cc2a57f1fd9f138c62226c07a09e18f
 AUX spacenavd-0.7.1-no-x11.patch 1178 BLAKE2B 79ecf2242c2fa28165f90954c1ae637aa46a95a15d1abe4bda2e999b50ef189c30a8db55c6a9aab4da1667bccf45df0302b204cf4ed16ed82bcf3c2ce69dc5a1 SHA512 19ebad0226fc95aa652afc977d8305cf4a2fa43f7c20a6d461b0f39d3cf307af2819042520f858a585deb407ba962d2758cb5c7ac9ec84b889febd9579ff443c
+AUX spacenavd-0.8-version.patch 595 BLAKE2B 205ef138f85d1b9bbbd3c4f6d46a4d38d59a85bda6f60a154f4e9f63abc0fb4af44b7766321299967c31dbf3e4ca068e624dab576137fb6beed91d30e4412e7c SHA512 8af8e3e7bf02d3d028926bc751c4c4c7ba3de33fbe777da14c7b2324c0fc7542fa7a75f6129aa3771180322bf7c9dae9e2956ea8bd1cc64a7cd2cbfa92f8c1e4
 AUX spacenavd.service 143 BLAKE2B 43621538a7362ccd655ed06517865b0b4f7b992aa6ded4765d8b4cba3a347e260c15d21792d4e0ee3d31cd7817a641cb2f8c42989bdc2a1f20d0fd4521fa2e20 SHA512 1f2fd8bf2bdffe3e52f5e2e53e0643e0d5ad5134bfd636ebc2c98f397da5c87bca3582fd76f9e987fb6ed3d17130196f4eee193998f97e388dc04877277c04d5
 AUX spnavd 580 BLAKE2B 948a29de5edffd17643ba2540b9a787e578e6114cef0d7536120f9a6f0b69e2dedb65a80cd8dc6827ae9f75500d1d13eadc83431927eda159cc3705f53f3bee5 SHA512 460ce173a1a68ab571fb39a0a00bdedcffaee5251037cc5787ecf90054f67333537087b3fabfd4a0e5b28acb5f72a7ef9b2bf50e9279336cdf95a18ecec13ce5
 DIST spacenavd-0.7.1.tar.gz 56703 BLAKE2B 99a918090cf8875e5b5cbb48ceffc383b415d9bbe297e49630c8e48ab78bd547244005b5a91e1bb7abc01382ae332758dfc01297bc8f6fb9a05247330cde8127 SHA512 6bfd76f9187ce77c09cb6ebb73bce45391e675cda51437b647510afef574aa6e3f947f467e03a464e245a5e44f699db1d197a58a06a64a2199686b1ab596517f
+DIST spacenavd-0.8.tar.gz 47515 BLAKE2B 5ab3432220ae44222b72b3fe18df096322031e0e2643798f494a87287e89607370cd15da919eececc714aacee1b75708a365feac5a182c901d63bdf4fa9f52c1 SHA512 8bb0dd2a95c602d23c84750e55ee649e7999bce43607cd09559f36a782780ceb15769bc0ed8e35b56f7c4b0724574830c2c06d4d8853b6f997ed8bba04441a05
 EBUILD spacenavd-0.7.1.ebuild 2344 BLAKE2B c8875709154e76954b675f808f58f59f2c9c8faea230fc236f9d648011d712363abe96516c74c54996d215129e790416de639efdc192920778cf8d9a55994035 SHA512 1e37501840845ca62be2413148dd1dea0c891a66814cdb0a87524747cc546ff2393312a10851bdc4574f45ce256d913148783e30caf1729a1bb752acf29ef1ab
+EBUILD spacenavd-0.8.ebuild 2389 BLAKE2B e509313c88c6d044eef44900df95a367e0f5186ae747e5e637acd22866675efbcb93ee4bfb2d23320bc2bde3d8bf8d871148178a875dde80b5520a76f797c9f8 SHA512 372a90114f1bb0c3b9ba0cd89be1b0ed0fb848dba95c023ac62e1ed7d1762b1aa921c2f5d55fe2507fbab6a76c7f6a922b9762f00be218db0bc88e375b5192f6
 MISC metadata.xml 804 BLAKE2B 88ee8f585c24c42670e3e251bd751d712752c0e9566828c8f00dadfda7d732ec75cf970398cfe73d9e81c3f556d74c48b1845bce4230f2fe524f5a8d7cd7a70a SHA512 edc302270122ef31692806ec2fec3836cd51afcb9eabeaf5f1fb8d66e2ab703eb615efa431b3f78fe6427a6f976b90f769cbd001dfe2832bc2ce9986731e26b0
diff --git a/app-misc/spacenavd/files/spacenavd-0.8-version.patch b/app-misc/spacenavd/files/spacenavd-0.8-version.patch
new file mode 100644
index 000000000000..d4113d38399e
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd-0.8-version.patch
@@ -0,0 +1,29 @@
+From 22056e975ebc0ff9e02c8ba2ffc61f65f272a567 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Tue, 1 Dec 2020 15:49:19 +0100
+Subject: [PATCH] Fix version to be 0.8
+
+---
+ configure | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/configure b/configure
+index 98040a1..e39be6b 100755
+--- a/configure
++++ b/configure
+@@ -40,11 +40,7 @@ DBG=yes
+ X11=yes
+ HOTPLUG=yes
+ XINPUT=yes
+-VER=`git describe --tags 2>/dev/null`
+-
+-if [ -z "$VER" ]; then
+-	VER=`git rev-parse --short HEAD`
+-fi
++VER=0.8
+ 
+ echo "configuring spacenavd - $VER"
+ 
+-- 
+2.27.0
+
diff --git a/app-misc/spacenavd/spacenavd-0.8.ebuild b/app-misc/spacenavd/spacenavd-0.8.ebuild
new file mode 100644
index 000000000000..242921ea9c4b
--- /dev/null
+++ b/app-misc/spacenavd/spacenavd-0.8.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info systemd toolchain-funcs udev
+
+MY_PN='spacenav'
+DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="https://github.com/FreeSpacenav/spacenavd/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+RDEPEND="X? (
+		x11-apps/xdpyinfo
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXi
+	)"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# https://github.com/FreeSpacenav/spacenavd/issues/29
+	"${FILESDIR}"/${P}-version.patch
+)
+
+pkg_setup() {
+	CONFIG_CHECK="~INPUT_EVDEV"
+	ERROR_CFG="Your kernel needs INPUT_EVDEV for the spacenavd to work properly"
+	check_extra_config
+}
+
+src_configure() {
+	append-cflags -fcommon  # bug 708648
+	econf \
+		--disable-debug \
+		--enable-hotplug \
+		--disable-opt \
+		$(use_enable X x11)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	# Config file
+	insinto /etc
+	newins "${S}/doc/example-spnavrc" spnavrc.sample
+
+	# Init script
+	newinitd "${FILESDIR}/spnavd" spacenavd
+	systemd_dounit "${FILESDIR}/spacenavd.service"
+
+	# Install udev rule but leave activiation to the user
+	# since Xorg may be configured to grab the device already
+	udev_newrules "${FILESDIR}"/99-space-navigator.rules-r2 99-space-navigator.rules.ignored
+
+	# Daemon
+	dobin "${S}/spacenavd"
+	use X && dobin "${S}/spnavd_ctl"
+}
+
+pkg_postinst() {
+	elog "To start the Spacenav daemon system-wide by default"
+	elog "you should add it to the default runlevel :"
+	elog "\`rc-update add spacenavd default\` (for openRC)"
+	elog "\`systemctl enable spacenavd\` (for systemd)"
+	elog
+	if use X; then
+		elog "To start generating Spacenav X events by default"
+		elog "you should add this command in your user startup"
+		elog "scripts such as .gnomerc or .xinitrc :"
+		elog "\`spnavd_ctl x11 start\`"
+		elog
+	fi
+	elog
+	elog "If you want to auto-start the daemon when you plug in"
+	elog "a SpaceNavigator device, activate the related udev rule :"
+	elog "\`sudo ln -s $(get_udevdir)/rules.d/99-space-navigator.rules.ignored /etc/udev/rules.d\`"
+	ewarn "You must restart spnavd \`/etc/init.d/spacenavd restart\` to run"
+	ewarn "the new version of the daemon or \`systemctl restart spacenavd\`"
+	ewarn "if using systemd."
+}
diff --git a/app-officeext/Manifest.gz b/app-officeext/Manifest.gz
index 4c05b0598c15..bb4bfea4904d 100644
Binary files a/app-officeext/Manifest.gz and b/app-officeext/Manifest.gz differ
diff --git a/app-officeext/ooofbtools/Manifest b/app-officeext/ooofbtools/Manifest
index f4d92526d65f..9ac1424d9532 100644
--- a/app-officeext/ooofbtools/Manifest
+++ b/app-officeext/ooofbtools/Manifest
@@ -1,5 +1,5 @@
 DIST OOoFBTools-2.56.zip 5256051 BLAKE2B ed78dffff2a2480d2c882c56ed7918d729c794227e909c7e6a115bc8632020b2c33ec9da0f619350b2eacf6ff604f727af9f50b435cd80f2fe952b440ff5f388 SHA512 12bb763a7eadb1aa03d9ed09b5b9754ef4465dba588b79f2399a48709ef408dddbd49ff470c872fe4e41f3da3faadb12eb5a37b31afc1f0f07a0b810110aad99
 DIST OOoFBTools-2.57.zip 5362083 BLAKE2B 81d361839cc5f3282d7d31465561230cdc2965c69cdc9ad3db5d6293a1ec76cb0bf1ec6fc8af706d6c5870beca3fb15fe091583eda127d1de26dd1d71c8e7b7f SHA512 f6cf01b173885eb30d1166753a3ffd357a23db71b517e84713783cbea7b36deb98d586faa0a555d6d7fb21b46e89ee78860407aa28fb7bb1e272a51df570ea50
 EBUILD ooofbtools-2.56.ebuild 774 BLAKE2B 0830f01c76bfb71060d55031aeb1afc93882492c561e1c66335ab05e6d7997f336990e02893d45dfdffa5b2fc058c8ec6f98ee8ab8bfb5eb4beed42adf9b672c SHA512 87ef15f888f3781e057cc9977cce71f7645668bc470fbddf1f770d39f1b615cf131125ba4e0773af9d8f550425f5036b2990090017cda04e0f1e43d0772d5d7b
-EBUILD ooofbtools-2.57.ebuild 776 BLAKE2B 524e7a85cd4b6ab9ea3598bd4ba2fe555463c1efb017fb92b46ffa92637857b932a6db56db1c4a44e44ab0f87bff962e4092241d78b64579e97ad7430b90e888 SHA512 1a7e7cd24bda425ef72eb1e36727c19b2060d67c2ea7478ab097901a72b5bf7690073ccf54cfbe9754f8fa1759887bd303aa06200a091f2740869ad393e61f24
+EBUILD ooofbtools-2.57.ebuild 775 BLAKE2B 03f350583eb25f08178e4c87ca6910d27c2bc412c47f8b1fb62f99d7cc3d254068099cf1555c0d2bdd3c2db79f2cb447433c036c819a6cb816460e5196a5911a SHA512 e72cec18013625b6f3f5fcd040c4fcb6c25edceba62f2a6be5c12bd969d7cf36fa248ab4cc2ab26bcfcd72935bdac9ac16e4bc5f798231a279af29a01573adb1
 MISC metadata.xml 558 BLAKE2B fd01136ef59f107646bfd319657c23cf75cd2a75066a9ae63c1b430b34e5a30b087fb307a5442ad6c40a16f74a81178f35f216c95d264ef584e10ea4c3784c5e SHA512 45b372bbf351cb6d5e2f984fd8151a47f85f398059ef5470afd671fbd1d0f05e6fb987c94a29c263f4e71283c3cccdab5094cce9b78d16221c2e87045aa92009
diff --git a/app-officeext/ooofbtools/ooofbtools-2.57.ebuild b/app-officeext/ooofbtools/ooofbtools-2.57.ebuild
index 942835191ddb..f4218fc78b13 100644
--- a/app-officeext/ooofbtools/ooofbtools-2.57.ebuild
+++ b/app-officeext/ooofbtools/ooofbtools-2.57.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	app-arch/zip
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 9087cbc36d1d..37ad3638370a 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index 34e28d715746..7a546b2742b7 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -1,4 +1,4 @@
 AUX elogviewer-3.0-segfault.patch 1145 BLAKE2B 0511df907edb047ce89966d68d0bc3191e3545ca6af372485601afe7446b812573429e4d4ef4df79fb4cd3104207b3b6482a9ec196250147982772b5b1c4c30c SHA512 98f47e20c796384a04606976bd551562c152877c8c3e41268b785feeee45f1021df9f5dda90ab148949e44b17cbc6160a014f4a0b8f831cd9128dfd851ab01da
 DIST elogviewer-3.0.tar.gz 28349 BLAKE2B 44f3ca5b28d075bb8349450cc817fd8ccdd1d1dc7eb948a9d65ab3b423191eca04cc479b2d6bec0bf6bc7f1120eccd257fdf61bb736919129ee756c2f4bd4366 SHA512 7eb59849a06632053ee0f7d1d76d9848220dbb8ad48d04c80fea5e64304f86c1a99987f525c6df682c832bd8453e07781a5c95ad2dee0539e954400730f47e36
-EBUILD elogviewer-3.0-r2.ebuild 1749 BLAKE2B 81143efacd189a2b8a92e561c468e25d8a09044cc3717df81f084a3fe266db0450695c400259be7f12133872f7d61064abc6e2f8e562fc39d9d724f7d74b461b SHA512 2e83067a40e7ac83846aebef400564b54e3646c65c2137ca9f71f70d30f9205f420481f5d10bef1a93831891072615f1fce1ad022812ddc2a0ca0981060253f0
+EBUILD elogviewer-3.0-r2.ebuild 1756 BLAKE2B 4f01dfe7a52729e8dcd7968bef73df6ffc2111f698e061499ab01edb8abc8d0ecc7778a323862a27440782adc30b9ffd8486fb7e2d2f1e046e1ddd5f5d2ff1e9 SHA512 26039ab11f119432a01c6e1c27cd34da5c4dfde0b2daff2eb0c8af6f565728aa58b73e83dac89d59a5ef8867eca64b97ab23cda8bc81229d350833a2c2c51b7b
 MISC metadata.xml 402 BLAKE2B 4cc6503c5c74f4f0883d2c167bb06515878ad1324931d38d9402b463c774b009d14ad2ec5b8d2611ea361e0793ffa3b4d463e88173f2f08dd0b1c0a988bed44a SHA512 77f982c8b1070592bcea3b91ae6e4c2fd815c5be0a63b7160793f7e7fbd1b1e60c3e3a993da1e7d2933b22ca621d6320955f7ac360b7ed09dc04a149ee32d567
diff --git a/app-portage/elogviewer/elogviewer-3.0-r2.ebuild b/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
index 51a7bfb564bf..66bb904854a5 100644
--- a/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
+++ b/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index 32f53f19d451..473f7a4e59b0 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,4 +1,6 @@
 DIST tatt-0.7.tar.gz 21802 BLAKE2B a0195f253e2777a8756fd7d1f83804bf3a4ca90fdeb07b2f8dc28dcb6f1d1f3c47fd948e0d001103f7972dc8cb8ee45a237dd24b3dc149392aa9841fe3d6532a SHA512 1f2a144512801d50585d40074553049ebd08bc5f084a0623b89d901acb9448657e7f42f2c8da5f613e0b2ff5c3fe59fbada1ad911c9693846923e256a2e97ecd
-EBUILD tatt-0.7-r1.ebuild 829 BLAKE2B 298cb4ff4d32c3e9e18f00503ebdbf1f1131107fc2edb7b57926485db94a48c42712fe1669999acbf0bd43846abe7b4cbc3a788d27a549c6040cdd634b537ce2 SHA512 47ba8c1e5609a4c730673d3e7b1bec78e4d38265522f50dc2985185e66fc55e0b635cc4bb9cf76259d7ffecf3ba30c3bdd156c96c118816691cd90a54c954c9b
+DIST tatt-0.8.tar.gz 22215 BLAKE2B 6c21acb9378045679c4a03badcb7c60638c4007ba19857d7519f68d4d658cd1418e952cf15a64679c6a9b28090856a588e60e9db1abb360d0625a633491deb3d SHA512 31be6573e3d7c9a690e57d64adcbf87983d5dd226afd162c7bfa425847a84705beda530cd5b648ac85cf8cd3907d46ae638bb0ca0d903d8d1968d0ac30703703
+EBUILD tatt-0.7-r1.ebuild 833 BLAKE2B a8fec8789acc64c8e94f986b0637d228aa3404827091fed19f61c9c34d645685d320a233de6fa30a951c649ab4ece90155b9d4d001950887c4f4595425708da8 SHA512 4db44a84894f9d650cfab5069c28b496b33f1309c40a21af7480c2d7627e2eafa2658eb2ae50419b8b0e2a33919d994f27144d744847750a1cedf775b64ebc10
+EBUILD tatt-0.8.ebuild 826 BLAKE2B 9c2fce8a94172ec81aa1d031f55deda27179b12572e458201066976cf3c9b0db7475354db55146cce2b082845ca30edc5fad661eda21ce9382446755917beaf5 SHA512 0ffd58e1a199f71a9ddd16959d1f35480532b6b1efb91d2d878cbc25b56914c1a0491f507e3212d789e68f07df1be54aa4040067761c9e314aba65560eac6ba0
 EBUILD tatt-9999.ebuild 767 BLAKE2B 852ca34ef2163c695cd792dfad21e4a32487b35a729481a31af14d75d0abc8471305f32317ef97bc5844194148b2e9bf3b5b931b86ad730ebc748fc2b2f282b2 SHA512 0478bf9e2c061053ae7b9b1c3a464ed28431ba31441f162d2f67c1a61abdec02b37d8e5c764570df1cb125d555f0dde31f5bfe843959073636531ba8852ec085
 MISC metadata.xml 665 BLAKE2B 74e99880ecd72d4458406ba6264adc9d2e8fad7ce71edfe265c079b79feb29a022c646369139772780c2ad20990e8816716f994362aeed95af84bad74fe0ce4a SHA512 74d566ab626e3c241bf63d6b1279765aed601a3654a727989e5b9e11c3edf1433107100cd9e55d90df9c84a93e3eb361c4563ff36d4c2edcabf44e0c4c7194a7
diff --git a/app-portage/tatt/tatt-0.7-r1.ebuild b/app-portage/tatt/tatt-0.7-r1.ebuild
index 2498b44643e9..59b5f9986ea5 100644
--- a/app-portage/tatt/tatt-0.7-r1.ebuild
+++ b/app-portage/tatt/tatt-0.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/app-portage/tatt/tatt-0.8.ebuild b/app-portage/tatt/tatt-0.8.ebuild
new file mode 100644
index 000000000000..4966a0e29da0
--- /dev/null
+++ b/app-portage/tatt/tatt-0.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Arch testing tool"
+HOMEPAGE="https://github.com/gentoo/tatt"
+SRC_URI="https://github.com/gentoo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+templates"
+
+RDEPEND="
+	app-portage/eix
+	app-portage/gentoolkit[${PYTHON_USEDEP}]
+	app-portage/nattka[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	www-client/pybugz
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use templates; then
+		insinto "/usr/share/${PN}"
+		doins -r templates
+	fi
+	doman tatt.1
+	doman tatt.5
+}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index fcf61723a740..5db3c97ee74b 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 565c6a902c72..80c235e8ab66 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -60,7 +60,7 @@ AUX bash-4.x-deferred-heredocs.patch 1181 BLAKE2B 3afb0e6d6e9b1220133a862bc44c13
 AUX bash-5.0-history-append.patch 1150 BLAKE2B cc3d4c2303b37b14da2cbb3130db0c2fa65cdc7f7f8d0a4413042a898c4c48afbedcca03c9dbfc525ab191ddc2b4258fb976a28830e03490011f89a1361974b4 SHA512 9c2fb93c67a5da1e97b293db4b26469fd6813e2cfc8ffd776042529878b96312644d8dc247887d6171c89c0853d552e9f7d5d2c0b2f3d05c25c15e17e6706999
 AUX bash-5.0-syslog-history-extern.patch 376 BLAKE2B d883d3c3adbf8f4d19ecc3c2790754a7f6972682d1679b07d5bc599bdbfc019ba8ad4d1271ec550b59447db0a02f1219c9e6057a0b1c1c6c52f7750a746a07bf SHA512 c8dd17bdd8ccbd73061a7cbcb7351195e703a2c5fc6faf288ec3721fc6e526d88dd4b2201f87078a92ca134b98214ccfa935f82f585322f72e9a41fd51842b6a
 AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d
-AUX bashrc 3555 BLAKE2B 31b62f62632feb74cfadb5b831dd862eace55a603c24c07b50826070f599b0571962b315f7f45edb1a0dba91d7a36fa2b852215e9071012b02d0869cb6e5ab6a SHA512 4c2fded17c5346222939fac5b0a13913bdc062b93a4963ad33fe41cf00a04860b5006ec4c762acb6ce7e36e83f368d5c3427b8bc359ba6cba73d6114f219604e
+AUX bashrc 3566 BLAKE2B c8013229792e6ece99d08615543d34935b8ef1604cfc48ad651ea64ae60cb39b6d945c46fa046d4fdd453a70eb46d065113defb11aa167f1a18f5b4246363828 SHA512 d7cda4637aa57f6a5500a421b7a0767a7ef9f526cbeb601f9cbe71164628189ca80258402d97074909b1437b65b708f1be3b867d66243022f628f7a0473ac98a
 AUX dot-bash_logout 127 BLAKE2B 8290778aea3426f4c56e5a9e7328faa76f99001fc7ce3eeb3ec26624edcd918d7e946da9a63ffcd0cf0f739b528ccb9e764d448276fe4344b69ef2036fdd9921 SHA512 e0248b5087656a4dd3a4790ed8e6101866b922ccab36b510b3bf408dc0c583e70f323fbad0392e4ea6ca5dcbe73568733e0c0aa9c8ce6b00ff5f72bf3e9fd8fd
 AUX dot-bash_profile 204 BLAKE2B cdb5ece2bea3b47651e2c9ca8d48ef3b0c4b7e2d660632d79edf3cdcea8f5f5a061019739b977538b25f2ace9dcb46e25b30e2d566ea71f6c1ac05388e59c957 SHA512 97ad83696b7eb8b084a53530d1a3e7648722ae4199c91737ceb02b8238e7637b0770731f5140ffb552142311f79b140a041d7e1e5366ba60399b0019f164fce9
 AUX dot-bashrc 551 BLAKE2B e245955936f0e036073e7fe153bd01181ae7206a73b45b0411e8d1a6eb0b7131dce260755eed00d2639848eebaefacf7c13087d4315b17f85fbafa6eba4c9fd8 SHA512 518b62aa2fa30e7d1692847929a6ce8dae4eac93e8b16d223d1ae86f4d5b076bcbe1852c9034f321c013e17502db9f771979957c67f8e8a71ca4eea7bfe9cc1b
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
index 8d9c29738b62..2f3dc7755455 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@@ -38,7 +38,7 @@ shopt -s histappend
 
 # Change the window title of X terminals 
 case ${TERM} in
-	[aEkx]term*|rxvt*|gnome*|konsole*|interix)
+	[aEkx]term*|rxvt*|gnome*|konsole*|interix|tmux*)
 		PS1='\[\033]0;\u@\h:\w\007\]'
 		;;
 	screen*)
@@ -80,7 +80,7 @@ else
 	# Some systems (e.g. BSD & embedded) don't typically come with
 	# dircolors so we need to hardcode some terminals in here.
 	case ${TERM} in
-	[aEkx]term*|rxvt*|gnome*|konsole*|screen|cons25|*color) use_color=true;;
+	[aEkx]term*|rxvt*|gnome*|konsole*|screen|tmux|cons25|*color) use_color=true;;
 	esac
 fi
 
diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest
index 69c06c4e0daf..c5c4edd54410 100644
--- a/app-shells/ksh/Manifest
+++ b/app-shells/ksh/Manifest
@@ -4,4 +4,4 @@ AUX ksh-2020.0.0-skip-api-test.patch 1394 BLAKE2B bcf521012bb197d234b119dc56ddc0
 DIST ksh-2020.0.0.tar.gz 2022880 BLAKE2B cb952c4febe88a3ccf8fd48f511a30a73bfc812ebf0b7a5fe799470b29ee13ca61004fd34e367d836940a88214da2aa05b7cb96f173a1b8d57c8e644c8c3a2a6 SHA512 7d6da3af341a62718d691ddc52e10bdf3b7290d74f1cd01610093c587af47b6d6d04b74b210eb31f93a3559855a5bc5155f9b188d2f8bb4444042c26bfaf1792
 EBUILD ksh-2020.0.0-r1.ebuild 1123 BLAKE2B a1ca7574835877a1354c39ccb6c65c4ae4aba7f7bfdd3c198b641f97174841a46bd6a3dc931808418ff0fa2a93e16d2a9fc11774f1b7d4c24b7f3899a2d6c4ff SHA512 1dc0af0d3469c8a9d106880d7b8e21c6bc48e6629965de6e53880bdca308e63f93bf610775592795c5d5caa844a9083fe8f4ba5fadb03ecb93bb3fb3095a6e0c
 EBUILD ksh-9999.ebuild 976 BLAKE2B 4807cd3805a2f7f05a726019c707c6fe0106b636f0d221f31dd08b62b249df4815cb4bf6c5b0309863e2916a919c53aabcbe4c8efe3e8218655f2078cbb03361 SHA512 09f6498596ea5cf1c9a49eec1d8572a30b27649b0aa3a1eda99eaff959279627db59fd3a694a5929e8075dc2e641bfa65442a1a4819b9f1af5ca174d91bb5fb5
-MISC metadata.xml 1371 BLAKE2B ab655b6d15894748f8125dcc0d25fd15aee57623de8b643793b1ca456025ee35db091b500f91b59ca0801778eb65798162b732778c56b80adff4f0402b299638 SHA512 b74fe4a12ce5868839cd32fe9c4f88c216a0703a3f477b005dcf7b47f697d129c695a011a9b37894c39716b5d47ddc9abeb5bd4946ba6b6849707a73b5901810
+MISC metadata.xml 1292 BLAKE2B 052e6395eec0522017bdae1d6376706e6ecb17f6cc67d938805dfc25e2927f841f91ce220099a8b7ee5a9ed3e727dc40537fb08d33e3020bd8455965c39a99d5 SHA512 282f7ebf3b56e493b89c131ffc1ff153b48cb81513ab7451e1de8d6161e31a8fe528f9da436b0a7a0a260737dba6b383e1634ad3e6239a0a4692dc212e350f14
diff --git a/app-shells/ksh/metadata.xml b/app-shells/ksh/metadata.xml
index 6018c787c35e..c81eecc0500c 100644
--- a/app-shells/ksh/metadata.xml
+++ b/app-shells/ksh/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		The KornShell language was designed and developed by David G. Korn at
 		AT&amp;T Bell Laboratories. It is an interactive command language that
diff --git a/app-shells/powerline/Manifest b/app-shells/powerline/Manifest
index ba920f4cadd7..6d509cb9eb3c 100644
--- a/app-shells/powerline/Manifest
+++ b/app-shells/powerline/Manifest
@@ -2,5 +2,5 @@ AUX 2.7-ldflags.patch 837 BLAKE2B a1a873a898f3090dab586b968a755e1920ab20158237b9
 DIST powerline-status-2.7.tar.gz 233726 BLAKE2B fc7b7d6aa5d8e050af07aeee0aa0b7f6f01b7483ea910b87a7027cd55f726d42e41a008feb07429b21ebbd890b12eb56581b8e47fc30a58de6b902bf14d999cb SHA512 053ab74d250b7d835a5f8ec9cb7da4e890f0f50d31be9bab4b393a85e087a6fc010e58d6b3fa530cf39c10671345d032ca1fa9c0f7887a89fea8a4e69b7f1517
 EBUILD powerline-2.7-r1.ebuild 743 BLAKE2B bd93e5352b00bd1bd73db6e5dc7d6ee85e0f4d30ec05e7b62d54ef79d7ba368a8d560b2d008cb6476716f19133614aea9a6eaf52ec3cd6aa126462c87d4a5bbd SHA512 c967665b40de94391df7a9e33cc20371fc7d2146865d63ec6c9bbb4a6ca0441e8bf16fd09aed8ff28451821471df7853aa8f3a21c3aaf6e4fd74a6abe49757a4
 EBUILD powerline-2.7-r2.ebuild 745 BLAKE2B 1bbe903317cd5777cf3fd949d996e1d5c91fadf4162df2bdd500330ae30a78363a066dd434fdd3e1286723d967128e5d9fc96d7f4c578daea6cbded150d7c871 SHA512 a94f981b1459f581a012cb4fa707a60ac17dd230ed39368fa1387cc91b9227042523c21f39adc5bd560e173ab3765e0ade11677f7a92706e5a4fe7440e0be7da
-EBUILD powerline-9999.ebuild 730 BLAKE2B 5d75497b2323d373e00df5deabaa205d6286363f4181f409e8cecaf614b0bb7ed4c3b624b61fe54f5d94c27307cdf97bd69109e8ba508b62e76a1c9693428bdf SHA512 c08cdb58cc2b88a88860eefdcc03a7894b4bf2765ff0ed23cf257c36c4436e8153ed336838c13035e21334c7571452bb48f4d098b60047100a4add9fd88b1a34
+EBUILD powerline-9999.ebuild 732 BLAKE2B 1b0a6c39a33ac7e9f5f88d5d1500e72718d882d94e5133f7100c8924273ed7a8f02969e970c1d5c9b1484a587d6fed60dc013c2747a7528a847b057d8e464534 SHA512 7d6433001f1c78e32a93bf225d95c4065fd9e59d7916f63d6a53d88da905d1949e3445093b30717d2685927f3162508c72cc5a0b470ee87d511ca57cabfe2391
 MISC metadata.xml 620 BLAKE2B 3c392d83a62425429cc89d0ac8dff925d98a392aa1d84bc0c7e84dd2871ded1566b0b66afe34b201672a51b23650cc2e18320c5e4e98b4b5042099340cae4b56 SHA512 10f3ce6affeed34d2b48a922a64eb2b1b1a628ed9d5e9a78f92eec3b264d633ce75b09e83e2cc3deae074ac27cd9f1bd2adcdb5f77e8deacdcd876d849977f60
diff --git a/app-shells/powerline/powerline-9999.ebuild b/app-shells/powerline/powerline-9999.ebuild
index 52de334811b2..7cdde8c204c3 100644
--- a/app-shells/powerline/powerline-9999.ebuild
+++ b/app-shells/powerline/powerline-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/app-shells/thefuck/Manifest b/app-shells/thefuck/Manifest
index 831a3eaddc18..7442a9dcd821 100644
--- a/app-shells/thefuck/Manifest
+++ b/app-shells/thefuck/Manifest
@@ -1,5 +1,5 @@
-DIST thefuck-3.27.tar.gz 1367120 BLAKE2B a840ac3e8f6807df632948e2fe2789a47bdcfececfd4a9bb0f1836bbaa641501e13c559221b9a2f25bbd93505c8b03db102636e480ece116a42c46f341d5cd35 SHA512 766c589f0e99a9773e74094e91c6a74d00e5be8b7241680ad664ecc3f549b597416bc7a4d289f399ed3a0d9ccad629ed78bb983edc809664c303c687ea1eec1a
 DIST thefuck-3.28.tar.gz 1369230 BLAKE2B 0825ead15eae174b08bc2608ff64e1cd5993484a8aa6cc5cd1f6dbb3a856898e7c77eb9d5f92884f01261cf5cc5b00696c6e706a6553ce661866689e3d94d746 SHA512 6c3edcfff604567a18209bf46aceb662ed4549efd0e3b0daee1abee8a93fbe3ff4dfa260eb74c3d560b3a798e3cc90f911072d694a0d986a09c8581e951421d2
-EBUILD thefuck-3.27.ebuild 974 BLAKE2B 537fbd7a6a6ee6493945050de55f0009c7d79776862a948f0327e17e86d47a5655d44a53490432aac8fa662338acb12a55a06f37057ca645d0af313033daec63 SHA512 0c54bda698fc1f566af0baa4f4ba7c4d8b9a7707033c9f6a47d91f8647354b6618618988aa4c4f92dd6e3aa83380df311be91aaf499c09bea0c3ed5a8db984e9
-EBUILD thefuck-3.28.ebuild 982 BLAKE2B 3c57458864d55a7a9308e56aa5ebd6f691f574f61f0293d6d76592dde66693ed0311f988c1e6c1fc04c23e3256092ce06d26fc08742c6923fa9c8c2592b97595 SHA512 1281b6efee8e596fa1ea4d8403b435b8f8204e7f234ae5fef9f31ffda996d736117a54390846a79ca41ee108da040dcad2b06c81acb66b36d88b7d01c4cce076
+DIST thefuck-3.30.tar.gz 1383210 BLAKE2B 9d6a7ba2712b5cea0146315f5023a104667531928ade93c4aee1f210f06755efb3488b82ce2bc63adf9ce41aec91528bbb6ee4212adb5eca2af53cacf4510a67 SHA512 99b270d0aa535673c09e7e932212af4ded5639fcf30ad0aeedc89a54e94c0a072a37883b1a1a56301efb82ea1c72cf53d4dacf2e83edcafcf4fbaa55ecd35f3a
+EBUILD thefuck-3.28.ebuild 883 BLAKE2B 1da47c65bbf74c13b8f6d157264ad648b72a0d10689aabc1071fba3cd98ca41c6bbf914204893a6b1fbcf6f7b9761fb5b0a0740930683d654f92189fbde02a43 SHA512 77f635736b61b492210cce336756b0b31606ec029b8c2222b8d7850cafe035c3f55ea10f3967f29bf7afe34770922078fe2702daa4e59b3f5c2684d4dde3fd3b
+EBUILD thefuck-3.30.ebuild 923 BLAKE2B 9f6b187c59c6f923e6ba0cf6e60b060ee0473ead550739dbcd00942e535a985d30d42140de98b5517d3a7fb015042234c304bc903220af444b76c2503d47581f SHA512 38bce42971741734026209e84f45a8815b12ceb8d35aa009a03b44dae844faff3add0f896040b030124dec164829c68f5cd1a45c13be12335a27e4bfac52467f
 MISC metadata.xml 438 BLAKE2B d3843cefa84dd13bfae30b161dc6241f2e2f165e5ff67c3b46a02e077a7de95f82eda40535950da12f675abf820912254e9e54231b7d81ff0e3a96c1f8f70f8a SHA512 fddc4c1f47a17601ac2e066d984716cd6ab7c290bcebbc34f991ca59adf4395b072530b012895cfa49863d18884817f4f26e553f6ffb7eb28f9e1161b46edba6
diff --git a/app-shells/thefuck/thefuck-3.28.ebuild b/app-shells/thefuck/thefuck-3.28.ebuild
index d7199bc7ffe9..c55322df315f 100644
--- a/app-shells/thefuck/thefuck-3.28.ebuild
+++ b/app-shells/thefuck/thefuck-3.28.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -14,8 +14,6 @@ SRC_URI="https://github.com/nvbn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
@@ -24,19 +22,15 @@ RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
 	dev-python/pyte[${PYTHON_USEDEP}]"
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
+	)
+"
+
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	sed -i -e "/import pip/s/^/#/" -e "/pip.__version__/,+3 s/^/#/" setup.py || die
-
 	distutils-r1_python_prepare_all
 }
-
-python_test() {
-	py.test -vv || die
-}
diff --git a/app-shells/thefuck/thefuck-3.27.ebuild b/app-shells/thefuck/thefuck-3.30.ebuild
similarity index 81%
rename from app-shells/thefuck/thefuck-3.27.ebuild
rename to app-shells/thefuck/thefuck-3.30.ebuild
index 18cc02e03312..ffcc66f3c8af 100644
--- a/app-shells/thefuck/thefuck-3.27.ebuild
+++ b/app-shells/thefuck/thefuck-3.30.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -14,8 +14,6 @@ SRC_URI="https://github.com/nvbn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
@@ -24,12 +22,13 @@ RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
 	dev-python/pyte[${PYTHON_USEDEP}]"
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
+	)
+"
+
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	sed -i -e "/import pip/s/^/#/" -e "/pip.__version__/,+3 s/^/#/" setup.py || die
@@ -38,5 +37,5 @@ python_prepare_all() {
 }
 
 python_test() {
-	py.test || die
+	py.test -vv || die
 }
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 7b52b708a841..79db766fde58 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index f1f41e6246c0..585464088200 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -3,5 +3,5 @@ DIST dos2unix-7.4.1.tar.gz 711570 BLAKE2B 3dbe33007aa3e2ef47ec3dc0c3165987986955
 DIST dos2unix-7.4.2.tar.gz 727429 BLAKE2B 5ba8aecfe3a79dfe9f4d7d69453fdcdd573c8889b41240c6bce5fea1b7e9e8213454af98f768cb2d199c85684a7d48192ba4bf856a92b867594b52a2209d5e04 SHA512 3fb77561596bafd83f3f7807ce967e58d5a96e5235afe3a4074ae7112297445690b2586bf652eb0b5bd1984fd41a79478355f6df8244561b4167a8a09593110d
 EBUILD dos2unix-7.3.5.ebuild 2060 BLAKE2B 79addcc1d203a536003d9ac775c520f09a3f816898e1c888e5d3305500db1a18439d9503f365e91e2c5379456101c1e090926191d09f67d5eae00c6cd632f418 SHA512 c486b0abc3b9ca00bd4fc0909298ad4340d6b84e949ffe7f61ac2e0c05a9aa47b83a72616d1b53f867f2b51ec04dd44467f988311cd9a11e031ba2e4a4ed1936
 EBUILD dos2unix-7.4.1.ebuild 2080 BLAKE2B 4ee1a14eabb90520cdfb6a163d2bc04f2c3aa7632914e47efc8d5c77e974d2590d422eab6e59cae6e4ce0ecd0723721a640797b8a5b6390a2041cec6f7919cf3 SHA512 71a45fdfd99e9e0ac65b12f81e7f7ff5d15608f82521f24a5bdc17bf439237aa6546e0bdfa8dc6a5e00b3c02344d14f43ea1ab5dbf219c8221b988e1e87f941b
-EBUILD dos2unix-7.4.2.ebuild 2147 BLAKE2B 1bbb99a76ee393c233e796ee51262fe5eeed6e6584d192d78cfc150aa845a085c86919170ca8acd78d18e16312dc1b217b4a3091a3e42b3f80d01efd66ff1093 SHA512 28aa107c6cdb86b274e577fcef12f7e46bfa1965bd0ac4b2e9bd0dd0737813a3bda34f0693dd9afbb0c8a5d577cd99cbf326a68d7598b960bd98644a29e4bf05
+EBUILD dos2unix-7.4.2.ebuild 2154 BLAKE2B 3a270da858e1147072870740055ba8863e95396c083b9a6cb4b9be75df24fe232d033cdfbc84b25bf4514ca7870e4c5a4727ea8987c938959a3cb34d011fcebd SHA512 900eb5aa4b1d43ef2b204a3f657fea14ad6fff4f959d342230058156bbfc15732895dceb9d430562ad9f0b75db34b4633334ae4c8b982913ab7dbe1764722fc2
 MISC metadata.xml 343 BLAKE2B c4023a36777a79352885528afd87e7709255ccf7f02d9ba28e29eb11f6c67c2775eeeec4f2db95b427b94859e70e7cd276984bca828eb872116e7ec33751c31c SHA512 12f79ed9fdd8df3c05110ea2a31123ca92a855cdf9287910802cb4e68c384764cc84c29929376426b23bfe9699574dbbdc2105d82c6e2701aa9fe67079d867f3
diff --git a/app-text/dos2unix/dos2unix-7.4.2.ebuild b/app-text/dos2unix/dos2unix-7.4.2.ebuild
index 591c044b4780..6edbea3b26fb 100644
--- a/app-text/dos2unix/dos2unix-7.4.2.ebuild
+++ b/app-text/dos2unix/dos2unix-7.4.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="BSD-2"
 SLOT="0"
 [[ "${PV}" == *_beta* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index a938ad705ba0..5b5c32dac7ca 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -4,5 +4,5 @@ DIST ghostscript-9.53.3.tar.xz 41368160 BLAKE2B 6b5840a420d7527c7155bfb707fe19b3
 DIST ghostscript-gpl-9.52-patchset-01.tar.xz 3292 BLAKE2B b6ac4f06c149301b07f57a5dd1f4507cc1e6d17ea60132b64177972ca58a29b2f6ff2f034b20b8ac083b60ea999f50ff75b74f86eec0cd73179741ed8a1486a8 SHA512 2498c5f396807a282727a7a9bd678e2008a1e4112722745aab48a12601661b08557c5d49f0a5ee67fb636f8c2b00c737640e894523b904ef3600f66d107999cb
 DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c084318839e1382ffa112461d074411b1f6586a5a9ace37772b144abdda9f742defd077ce937df590d63bd7a2306bad52438949d1036bb7900c SHA512 ab58485df9152bb32c6f0eb25bd45689089bd17ffb0323c54e1977c5f810ec5eb09f358637251c428591749bfb42c6f8489c74d4bd0a7ae5d696eb2346503c44
 EBUILD ghostscript-gpl-9.52-r1.ebuild 5175 BLAKE2B 83b725c22dfae426de0735f8195e6e4477b47d3fff6fb0f3108d344ffee6eba03bdb875078c472a048c2be7ed1f3347cea7e22707bbc1c0c77629ad11a3c5106 SHA512 f242c79f3ac85c147ee9d6ea203b716ebf44170e5574db68fecb04940b2e7c6146631bb2e1a46cf06673d91fc6cad18bf4828ef97af91896815cceb5efba0e17
-EBUILD ghostscript-gpl-9.53.3-r2.ebuild 5037 BLAKE2B 27a37786502df336666206a6afba170fc2f20fccdab41bbba23e2fd3fe91298fb79059ba76bc40db38d831782e27252355b336249ba4be01a1b829f548eca909 SHA512 8bd444fa4f9dcd1f740038828ab09f053a4c03a364832b0bf458760b28ad68d6617c226ecb552c457cea6b340a64f4c338832d826b36cd405cbeab6d33f9642a
+EBUILD ghostscript-gpl-9.53.3-r2.ebuild 5203 BLAKE2B fa3ba693ac1f9a3be75e9104c76e8a359257bd2670036be3f6ecf6b57461703ae31048744b012fc2b5d9fac60d7ba7f3e1c644a028cdf38e96da59a37f211fee SHA512 e18102abeebf13648201c7384595d7fb4d0c0306343ccd0ae6e4a64f3b84cfa8974f417edc324d6f7690d23c1ec3a5ab4eae05ef88a14dfb3e4072569f528be4
 MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild
index 47929e088e2b..54e756c4a189 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cups dbus gtk l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
@@ -156,7 +156,8 @@ src_configure() {
 		$(use_enable gtk) \
 		$(use_with cups pdftoraster) \
 		$(use_with unicode libidn) \
-		$(use_with X x)
+		$(use_with X x) \
+		DARWIN_LDFLAGS_SO_PREFIX="${EPREFIX}/usr/lib/"
 
 	cd "${S}/ijs" || die
 	econf \
diff --git a/app-text/liblangtag/Manifest b/app-text/liblangtag/Manifest
index 6cf0bf70fa4e..bcf417730d48 100644
--- a/app-text/liblangtag/Manifest
+++ b/app-text/liblangtag/Manifest
@@ -1,3 +1,3 @@
 DIST liblangtag-0.6.3.tar.bz2 755492 BLAKE2B fb7b3cf5a4e6c3fabdce110ab208fa9e3537d8144839f2fc9779ff9de928afa416838c5c3c5317438ae0421806eb6ffb2207f6ad3dc02bcbf9123668187d22d2 SHA512 3dcfc20704dfaff05aeecdeef74fa81639fb70f930ebc0895fe4707ecd1d5b6221fe889449772811924d0c38329977c9d5fc751c3accbc272834b29c461f1fcf
-EBUILD liblangtag-0.6.3.ebuild 1229 BLAKE2B 63cef5c98f492b721bbab859090cabd3e99350e2788319dea9c5697aa774914365f0cad5290bb0d276633561f8445c55a1c5289c63ab68f9cda7afaee9259128 SHA512 55b99a2660b0550c34b48283c696a409c2f461d20bba68416e1ed63f51a8fa510a5539bd13dbe26fd02a0e838dc99fafee9e3ccccc84cf39ed7e12768aafe8bf
+EBUILD liblangtag-0.6.3.ebuild 1248 BLAKE2B 2b064305b5c7167f636bb50321a972f6fa7316abf4b1b3625c73b7b0a6fb99cbf8af76eb1c9f5a078a9da4969320c02d84f19b285ecd3e11e2ac1d6b0cd87fbe SHA512 2b7549070b6fce2a845dfc21564b5a0379c657dd4d01b65a6aa1128a50e9bd55eb73494cce508e5765af58a7af2ab360f049c0c932720e5d0b021725e3502a9f
 MISC metadata.xml 349 BLAKE2B 3be7ff388f2fa95c460c034408fb159d9f7f2b17b4634027f73870018e672f330b3b0f9cc96fa372170bf2daa314cb087a9cd5794ab1e373449b4cc0762bda87 SHA512 dc4a715ede23108572522e1e6c7afd36b3c3359fe4145e5a02b45e7fc094f1633fbfcdf0d9c75955f75acb1487e438bb437a85766d7a06e628674447d5cf3d96
diff --git a/app-text/liblangtag/liblangtag-0.6.3.ebuild b/app-text/liblangtag/liblangtag-0.6.3.ebuild
index a9c9bdde4c33..cbc05a8ccc1e 100644
--- a/app-text/liblangtag/liblangtag-0.6.3.ebuild
+++ b/app-text/liblangtag/liblangtag-0.6.3.ebuild
@@ -16,6 +16,7 @@ IUSE="debug doc introspection static-libs test"
 
 BDEPEND="
 	sys-devel/gettext
+	sys-devel/libtool
 	doc? ( dev-util/gtk-doc )
 	introspection? ( dev-libs/gobject-introspection-common )
 "
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 93e794c2f74c..bf0d9ec7701a 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -3,7 +3,10 @@ AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a
 AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc22003d00dda6f25bc992d73c01570a560938e5aef166905c519ea7e4968f8e637b2dc47c61bb1c49cd5ab14fb2076e2a1e38545499 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c
 AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
 AUX poppler-20.11.0-respect-cflags.patch 2797 BLAKE2B 8c37ed086fa823eac8d04e47c04f79afc76c0e6caa6d921b21bb5d99928be9c9bc683126e42e249aa8ccd96470d7ecf9eb1b0d8e749bd85bf4a455bb5d513e01 SHA512 421760c08f351449b7c899e4a04c3d93a26cf914326c58427031d4398f7cd4d2ed68d5ab42f930d663aa4f918fa11534e310ae6a9c005bdb3c9a191a497e6386
+AUX poppler-20.12.0-respect-cflags.patch 5494 BLAKE2B 8107bd3cb374694aea1dbd66cb95258ec568bea0bd00ff02ce9cd074e23dd8f399543d2055578654cdf7db09b46bd051346a596538305af883f9eb45c0916e47 SHA512 700233376a3254e3e5667719f95d00f828850476e3156856068c8b7faeff8c438c494606aa39f5551e998e02dd58aaca63eaaa5faff606f75d9a272631bdbc8a
 DIST poppler-20.11.0.tar.xz 1648432 BLAKE2B 373464ba60ed84863b40eca2e4f99ebc1625ea06f68a1621165675cf46e70713b649f90630049d15c5c2bc59bd0befb437a4039b47e17509d4fcc4fed8586d53 SHA512 c8237e931ef20d939656e2600453fffb12a2beeafb273782b2069aec6e5915d8cc85136982b7eaf5956af30ce00da2faf84d86ffab47f725447dfbb9d6ffe335
+DIST poppler-20.12.0.tar.xz 1659844 BLAKE2B 48e35f092ef29b5e9e2e20f1ade3759b0cdbb13ea843adacaf076407654fa52bcc2f42f8f89e72e7d8c717fde72771d43a6a855b0204d52ce450f2593899d3d5 SHA512 8c035847cf5a0763f02ccea45a8f1f563d94847620354c3c1621b05081600a99e207eadbc87398ed40e0d105c5439826130eb49058fed3abb60f5e4642321a0e
 EBUILD poppler-20.11.0.ebuild 3375 BLAKE2B 0b355ab38e00f5f0ce9fbbb95463ef4b990534e4f60f9923a8d21b5d6e0fa30e40520861ca6681a5fae3986ab0c358400170cb159b5ddc8e87a3cb6a4684156f SHA512 d96627f44264078a1d95325ffa3fe71f8d6819d809ebeea608080dc1e9b73019d3c30c32b216797b4a5a72bcf3c3c69830df75e367ea72a70311fbeb1b324be0
-EBUILD poppler-9999.ebuild 3384 BLAKE2B 53af7b182a6b978219cc2d198956d881c59e9471f1d4696331b78a49b5057717728fd903a27ee38ed3c3a2bf91f4186e6765a6affa09f3c0fc36eca2bd3012c9 SHA512 b2b89c68eb89f4414ce6f2c560519803d2c43c5492b9362e3c972699c4726f12a6b273e3e2e3a5aa868c61e78908f6a008a56b42bc9622ffbe5da62f06b22e6e
+EBUILD poppler-20.12.0.ebuild 3274 BLAKE2B 1fdd72dbc4471b9609f1751fc1715f2e65b3b9bcfae0c3524c4af6cb42e05c8c49cb5dabae79f0367a5f0c90b6b3dce8bcb8690e060dcb8b90af689e87741b42 SHA512 3d440f7099d12ad5e550a75ce0fd31594a973dba00780405658acc6114ed4db38343818ca2f5d2e011cd526be65ca6607704d575337c97bb187fec455fb34fb4
+EBUILD poppler-9999.ebuild 3274 BLAKE2B 1fdd72dbc4471b9609f1751fc1715f2e65b3b9bcfae0c3524c4af6cb42e05c8c49cb5dabae79f0367a5f0c90b6b3dce8bcb8690e060dcb8b90af689e87741b42 SHA512 3d440f7099d12ad5e550a75ce0fd31594a973dba00780405658acc6114ed4db38343818ca2f5d2e011cd526be65ca6607704d575337c97bb187fec455fb34fb4
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch b/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch
new file mode 100644
index 000000000000..4b389faa7d61
--- /dev/null
+++ b/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch
@@ -0,0 +1,108 @@
+From 37f8326557eeb291d78a866d5ff78d79b32f6f8b Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 2 Dec 2020 09:29:33 +0100
+Subject: [PATCH] build: respect cflags
+
+---
+ cmake/modules/PopplerMacros.cmake | 81 +------------------------------
+ 1 file changed, 2 insertions(+), 79 deletions(-)
+
+diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
+index 707e7497..882cf11b 100644
+--- a/cmake/modules/PopplerMacros.cmake
++++ b/cmake/modules/PopplerMacros.cmake
+@@ -79,8 +79,6 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+   set(CMAKE_BUILD_TYPE RelWithDebInfo)
+ endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ 
+-if(CMAKE_COMPILER_IS_GNUCXX)
+-  # set the default compile warnings
+   set(_warn "-Wall -Wextra -Wpedantic")
+   set(_warn "${_warn} -Wno-unused-parameter")
+   set(_warn "${_warn} -Wcast-align")
+@@ -105,80 +103,5 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+   set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+   set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+ 
+-  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
+-  set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
+-
+-  poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
+-  if(GCC_HAS_AS_NEEDED)
+-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
+-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
+-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
+-  endif(GCC_HAS_AS_NEEDED)
+-endif (CMAKE_COMPILER_IS_GNUCXX)
+-
+-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+-# set the default compile warnings
+-  set(_warn "-Wall -Wextra -Wpedantic")
+-  set(_warn "${_warn} -Wno-unused-parameter")
+-  set(_warn "${_warn} -Wcast-align")
+-  set(_warn "${_warn} -Wformat-security")
+-  set(_warn "${_warn} -Wframe-larger-than=65536")
+-  set(_warn "${_warn} -Wmissing-format-attribute")
+-  set(_warn "${_warn} -Wnon-virtual-dtor")
+-  set(_warn "${_warn} -Woverloaded-virtual")
+-  set(_warn "${_warn} -Wmissing-declarations")
+-  set(_warn "${_warn} -Wundef")
+-  set(_warn "${_warn} -Wzero-as-null-pointer-constant")
+-  set(_warn "${_warn} -Wshadow")
+-  set(_warn "${_warn} -Wweak-vtables")
+-
+-  # set extra warnings
+-  set(_warnx "${_warnx} -Wconversion")
+-
+-  set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+-  set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+-
+-  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
+-  # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
+-  set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
+-  # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
+-  set(CMAKE_C_FLAGS_DEBUG            "-g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
+-
+-endif()
+-
+-if(CMAKE_C_COMPILER MATCHES "icc")
+-  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-O2 -g -0b0 -noalign ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g -Ob0 -noalign ${_save_cxxflags}")
+-  set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUG            "-O2 -g -Ob0 -noalign ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g -Ob0 -noalign ${_save_cflags}")
+-endif(CMAKE_C_COMPILER MATCHES "icc")
+-
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+-- 
+2.29.2
+
diff --git a/app-text/poppler/poppler-20.12.0.ebuild b/app-text/poppler/poppler-20.12.0.ebuild
new file mode 100644
index 000000000000..17f47a8d2432
--- /dev/null
+++ b/app-text/poppler/poppler-20.12.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 2005-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/105"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+		-DENABLE_QT6=OFF
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 88fc60ed4b7c..17f47a8d2432 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/104"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/105"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -58,9 +58,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-20.11.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
 )
 
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 3c79c9aa4563..894ad6f1147c 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -3,7 +3,7 @@ DIST qpdf-10.0.4.tar.gz 18465085 BLAKE2B 3b9edc38069d58d43d26b131da755b7921b7add
 DIST qpdf-9.0.2.tar.gz 18168977 BLAKE2B 46b397f0e6a97804c5e8dcbfc9fd2278960d5afd459430c1790bb8f9080062cf661cf186ab386721ed7560dbd4abbea43e4d31914c0636502c5c11096c250fe2 SHA512 275ca81603d53601e4389cb34eaebea1c5d52b310ef28f3375fbeee255a28edf9375f03f31649f580dbc3df73b851a2c8498feb3dd7b30067955571b05c9e69c
 DIST qpdf-9.1.1.tar.gz 18312457 BLAKE2B 0bbfaa782e46a911b20440bcf122d2745dde62de16423307cb02f7f3cd9a4976c79c7f6371322f793abfd8eaf9d5cc4f49b6854e58039595b5a488a2fec98d88 SHA512 008a11fef663a57ca173631f2053988023babea6c333cfe01db0ef955c8cd36d387ed9f2039f55bd5f9ca94c7a8e400461a09a15c5f89e03bc0817fdd0d3d585
 EBUILD qpdf-10.0.1-r2.ebuild 1347 BLAKE2B cf0992aa1050c973626473a84654f718c119ab6400d9c9b26e73909c47033ac6efa647c49c1d286d919cbfbf6ad4a989df0aa2e4a0a0e7bfa71e35c0b0400eb1 SHA512 5bed37858577a8c440ed8f0b5ca03a126c142e0af31b82184466705ac2275d8cd4c0393abd10b1c3a5b46db4abfc3137e08f76fa453b420ae5e4bf8153058b05
-EBUILD qpdf-10.0.4.ebuild 1324 BLAKE2B 829dec1a35fb315fb838f8fdd956d013ca6e1219d291528db6fca90eac4d681f431fd6dab2d72eabb394bda4b50aa46dad122dd1e98d2a8f6df7aff475a839ab SHA512 a1e994d3b83566e8b048474e1ecf249289018c8d31836fa97e9cc52992617e35199e8a6a3185513994b2cd819d91a28426162d9a6fa29e7c5a8812070772cf46
+EBUILD qpdf-10.0.4.ebuild 1319 BLAKE2B 0466872d26273ec4411f067378ce8310f72d029d85ec4039a2ab622cea5ade7be0c7e415cf4529eecaeba9469d2ecc0471027950b2e62bd576c5438a1eef5699 SHA512 4c80bb6fa36cec3d932444da01e24b0a261476dfdfc1c1f89ba07336b60d1ce2b308cc504aaaa1bca951248b6202f8f709f8ad4e431a05535dad1729b879b204
 EBUILD qpdf-9.0.2-r1.ebuild 1278 BLAKE2B a7ddc49812f5307f62c51df2175eea83baa3e029d7f77c049a0533426dc3b81f27bb5ae10d1d8ae19dab1ddc80819db986bf803b2d218355195c71dfeda65360 SHA512 1bcf863d03efb215fe98517fe099e04f464cc14dcd49bd23eede86dc55d38e0428c32b90e654b9412aa899695b7422f1a936ed49d4f8e1d6eb8d552bf9c9d12f
 EBUILD qpdf-9.1.1-r2.ebuild 1212 BLAKE2B 267f67e4b5115ef494996ad283d10f952bf78d405b860bb8c72cb39227236cccff3e122d8addeee35eeb1f285d564faf6cc90e014fa93ff20070b17a8fb5f7e9 SHA512 24c72250383f4bc98e1e7778f04dada81a26c0192166251f0e5a6cd76d7cf46440e62a4454dc3ed69add76d303f6fed21faf24f345edc939b6c30a803ffae7e7
 MISC metadata.xml 499 BLAKE2B 9f6462a9606763352f0c823f877d1a39ffa207a8354e800d64bdb4d7686de8391309e08296adf23ca6b6e5d6fc2150d72ca9b0fed36cd4574e51ae6d04e48341 SHA512 77915adba55eb2b0fa68af06fa30b84c50af0a4a26a3ee6fafa71f9c7a7a307451ab76291dfc87f90479f6a208cb29c8a6c8c7fd0d574455faa15c87f8ea8de7
diff --git a/app-text/qpdf/qpdf-10.0.4.ebuild b/app-text/qpdf/qpdf-10.0.4.ebuild
index d49539fd3d48..a538bb413591 100644
--- a/app-text/qpdf/qpdf-10.0.4.ebuild
+++ b/app-text/qpdf/qpdf-10.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/28"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples libressl ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/rnc2rng/Manifest b/app-text/rnc2rng/Manifest
index 8ecbf881bc20..c672f8e0022b 100644
--- a/app-text/rnc2rng/Manifest
+++ b/app-text/rnc2rng/Manifest
@@ -3,5 +3,5 @@ DIST rnc2rng-2.6.2.tar.gz 17981 BLAKE2B 202b7f540197a5a17367a28524c4ca2b532d9e05
 DIST rnc2rng-2.6.4.tar.gz 18005 BLAKE2B 4725f9a8dfcc5e7ed26c4560d9198939d51376aad8feaa5e592bf28c9014d1abe0e90c47f6aff9ec0d7cecc815660a3a41270c118e4db87030e5a1fa208f3177 SHA512 c26103943ecac440dbeb4db6f913e57c2e4b1f84f92d7e8693e66b6a1e5af051c49ace8172fb94dae2d447ee042e432af15cc578e606452b50ca843d8bd85378
 EBUILD rnc2rng-2.6.1.ebuild 530 BLAKE2B 0d7182953a75186e6819182d7b52c4970f0ebc29b8e5ac1b42a7fc06f338e72e55f7a5c262b6ff532b2507c71bd6ab6fe712afddebe8f91cffb6eea29130a0d3 SHA512 dcc21fc62363aa6aa99adbf82b39e61bc3dbf58fd9d636ecf89143a6e1a4c61f5bca1af8bc363c74bcb2a58a0f33ffbe0b3e618e148737a4af3dca822f081546
 EBUILD rnc2rng-2.6.2.ebuild 520 BLAKE2B 9b089cfc741a24ed785ce109c9693fa0673f083e46645baa2389ecb957877586242479048f9d4f34602520277acab52b632e684fe5ff97f59ab26977a3dc4cc5 SHA512 e789868bb19ba5d2e154fba81fe68dc910357a57e7280dbe59cbad9841e3cae7bf2c6da59a5ff36a4983c5a764d7f055f777cfe6fe30587d30798a71da3e5a01
-EBUILD rnc2rng-2.6.4.ebuild 553 BLAKE2B 5cd45765b64a92dcaba48ad6fa93dc64a599cf43fdbd861eac16effa3a9ce6ab2d16937da2bddc7cd3907609b87cf3fe862858176f49625f885036c255afd39f SHA512 9de12b3dfa1d78614ad58f6ce4685d1904465a18a545affeb27e6ea974aa653d1aeeb9e6f07f75e3ae0427bf6fbe3b9d06d0b9d96b78f685817ff16f58a296c4
+EBUILD rnc2rng-2.6.4.ebuild 556 BLAKE2B 9d7c80a370870d068da8416cac405da5605a094253e6f193bc83301b48bcf7b535272334db47ed05a35cc6c2cb965a91d447639e9704777c45b2372134eeaa48 SHA512 b2f0889add071965fbfb12aa37e29cc25c6e004b473662a1a16c71b16d6c0ddec979b76cb21cbbf654cb0b494b018bfa340f66302a7d673c3c3b7bccbbb604ea
 MISC metadata.xml 366 BLAKE2B eb80555c7d3d419c9a0a0dca27330a2c4db11e2c0fd6d3edbc681733f12b33926842ccfebb2e818087876c92cd8ff17fd0e0a0ce8709e01237b70afa30a40ce5 SHA512 2c981a0862251c7fdb89078f62ed3eded580c221b3f1bbab7e2941b6e247f03cc7d86efb5174c5649b456bb9c6c5890b0664b32228c2c7ea1d6d18f2e6240198
diff --git a/app-text/rnc2rng/rnc2rng-2.6.4.ebuild b/app-text/rnc2rng/rnc2rng-2.6.4.ebuild
index 034398c5e38f..0566e66856d0 100644
--- a/app-text/rnc2rng/rnc2rng-2.6.4.ebuild
+++ b/app-text/rnc2rng/rnc2rng-2.6.4.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+
+PYTHON_COMPAT=( python3_{6..9} )
+
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/app-text/sword-modules/Manifest b/app-text/sword-modules/Manifest
index 8a1e46b639da..cbcfeff3afce 100644
--- a/app-text/sword-modules/Manifest
+++ b/app-text/sword-modules/Manifest
@@ -1,2 +1,2 @@
-EBUILD sword-modules-2.1.ebuild 11963 BLAKE2B 59b7f7f626b46130446e4bae5ac382607200d114cc68a5312ccbdcb4800b1e2e2c7f8516791667aec8489315a1d49eddca9f3fd289128ecf02843c28687503fa SHA512 78f1d13471919b4cc0eece5b4d1ec3213a016149ea5fd89cffb524d500a42f3883665c851190815dcc0c155ac61e208d6d013627ea41b950d012a1094fe0b68a
+EBUILD sword-modules-2.2.ebuild 11993 BLAKE2B fb7977dafa649085c49b66681a47a73ff34e7e3f00f9102d5411a2ccaf864efbb95f2907672a15d90ff43e2d5e81ca187021b51e215092ae2c68514b828fe755 SHA512 5165164dd8c1859c4432f52159d16560c6b0b9c1e69f687be55165f1420ced9bc0cbe8fb60bc0a7b1d1ce5e0ae39617428f3226f6d4e77cac26940347b5b99e8
 MISC metadata.xml 361 BLAKE2B 51316035c5e4197a328d336f328b3b3b777bcd14dfea50f11060624e86ec566b5d4e1bca5f755cd8f165aad8100bcb9c9a8aa12f036ad4df52276a9a16fab51f SHA512 61c6526b5fd049d5c13ee6af9bae3eaabc7151fe45de3ba63869a5ef8f2a4b00a4257c5a8d244f245b4e3f92d47a97a54c83ad03bf0742c1dda143efe392a10d
diff --git a/app-text/sword-modules/sword-modules-2.1.ebuild b/app-text/sword-modules/sword-modules-2.2.ebuild
similarity index 99%
rename from app-text/sword-modules/sword-modules-2.1.ebuild
rename to app-text/sword-modules/sword-modules-2.2.ebuild
index 9d74c11bf8d3..3c794d642151 100644
--- a/app-text/sword-modules/sword-modules-2.1.ebuild
+++ b/app-text/sword-modules/sword-modules-2.2.ebuild
@@ -545,6 +545,7 @@ RDEPEND="
 	)
 	l10n_vi? (
 		app-dicts/sword-FVDPVietAnh
+		app-dicts/sword-VieRobinson
 		app-dicts/sword-VieStrongsGreek
 		app-dicts/sword-Viet
 		app-dicts/sword-VietLCCMN
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index a170699a586b..013cde3a3739 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -4,6 +4,6 @@ AUX xchm.xml 257 BLAKE2B 0b32e654afe5af057c219830f61989e2266d55c726b90cc73795ab2
 DIST xchm-1.23.tar.gz 474274 BLAKE2B de73c04e68b876edefb1d45d9e982bcce6fd3afa06f8704d05fa5cae710d9724ed20ca50be9022570832da9954ba2af141a66e5b3ab02554441c84bac1d6ffed SHA512 c0df4362ff6db8136b20f62a76e7e93185375f6ef9eeeb1001e27ead9806d486332573ba8c3ca1863a70ce6b1d3bcc6d3af48d42add719312774dccfd7d18c90
 DIST xchm-1.31.tar.gz 981450 BLAKE2B c0c1908332f4d76f2c4dcf64ed713ae500d1b2022dedb5cb0df294fcdd1ce87d5144ca7347d6bc70b43af29f047ee270ffe05f1ee8da2dae5a5e0586c342900a SHA512 b5e1e979948d202163265f99357b361bb78371a2cc7cdedcc2d2c78207466c3f8291f720c92405913c7c5b9f607d3951a8bb3be3ece3ba1f408ceeb79199e9b5
 EBUILD xchm-1.23-r1.ebuild 1089 BLAKE2B 58c42b1eb68d2f84a421e511504b476eaf20e4033c54c032c438ec91a01ea3dc5afdc401ee0b15d650c8df1fcedd07a0a146c172f1d5cffcd4d8074575c561be SHA512 1e2ea33bb90588ba970930ccd7ab8f4fc696e03e1088dec1f65da5be8f139627cac104d9b53a6131a2c0ad2efca0747e0d17d77a684762967a688fba98016ace
-EBUILD xchm-1.31.ebuild 949 BLAKE2B 9d8e740984a0d4d52fe62a2731fbe4f7f2a7b822b57516d055e2e1bb7cb16ea813bd3740e1e809d7e371bfb4dd5c528851af266b9fdb62f435bcac752fc93828 SHA512 881186fffa6380bec1321d5d1beb6ba26ddc4bd65ee07f3159ec9dbf54840cd05b2f1ecd82f452ad94f4eb7b8cea22751894bdc93099b0908053c238b0a7a6b6
+EBUILD xchm-1.31.ebuild 948 BLAKE2B 3083b7ae1fa23228fe11f9c96b162a0d0543a26120e0ea033f09ed8b62a7b2a050ab60f19184df04f747c1b1d36e41b68bc62d429d7d7b2a72db55daeb58969f SHA512 ff0dd4a9f3b891f0de01a76ff4f588f5c91cf57e156d670ba7674cf4b0ed45cd1319f50b0a52b03feb4f3d27eb8d981b0d04436e78bd479520b2fc7e41f61e4e
 EBUILD xchm-9999.ebuild 1107 BLAKE2B 735bd0f230d0ea1a8cf34805dccbe600b29dd11fca03ac34dc9c96f96064214667f772a2fb2a67c58cf9a7184688282dab944955df83560426e0954510935e25 SHA512 82a8f548dbae62af0df893eed30cb3b332c1bba1ca1ec3af3a82a1f272fec3b57f159e9bdadfb916f422e822aeb0f55be0563d022b9300fe75642a55d4ea5e6b
 MISC metadata.xml 370 BLAKE2B b7a2c5ee6e02f758f53ae1f67a982d8e3c0ceffed66524c9072801bc3cb803419824ce0a30b59f9dd16cae6381ae3b1a28a9b084c6dd71ab8d68a3a9be36e5a9 SHA512 f926ec5a7690046f0c1e73da64d5ab9eb662491cdb2ad24d44455ee5a4e94693188a3c8c17f777a0da120a44d57ca00f5713f5472c75f44215213ce41aceef2d
diff --git a/app-text/xchm/xchm-1.31.ebuild b/app-text/xchm/xchm-1.31.ebuild
index 8f2536d07490..bd07f774c87b 100644
--- a/app-text/xchm/xchm-1.31.ebuild
+++ b/app-text/xchm/xchm-1.31.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="nls"
 
 RDEPEND=">=dev-libs/chmlib-0.36
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 142cf04dee9e..ee34d8cc0121 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/pydoc/Manifest b/app-vim/pydoc/Manifest
index 3b4c9932be2e..c7e73b18d960 100644
--- a/app-vim/pydoc/Manifest
+++ b/app-vim/pydoc/Manifest
@@ -1,4 +1,4 @@
 DIST pydoc-2.0.tar.gz 2795 BLAKE2B d780265c474081431e43076db9e5bc244677d9deaaa44bbd6ba2c2bdce7e88b8e2f0c6a9e14ca5a3a4bda7925b5c5bc108a34d5d6fecaabe9f0a025774b101ca SHA512 bea2e0dcb82090803b45e0cbccf5ad610a39f22d04c099e5e946e2b3707c9cbd69b85e3f1024a73760d1ff81a0199aeeb3bab20546307676953156eff7185214
 EBUILD pydoc-2.0-r1.ebuild 614 BLAKE2B cd87b0a6112f5bd0be740bcd15c447e88085f01724c9d18e10d3193aed1876bceeb52d0399c6b1e7a9eba22c41533cd858607cd84d2a81fb1275eb5bb900e677 SHA512 401a98cb758108ca8655fc9a930af9c511331f77ad603dcc936ddc3159ed9ffcdb9adaf5e49c629a725c0b9c31961adcdbb7452ea4f9bbe49efd456e78150bb4
-EBUILD pydoc-2.0-r2.ebuild 588 BLAKE2B c84da43bb3eb3d2dcb7d7b0102f77b07fe500c3d2e44850417a5a6962e756341ae22a7372d8763b3198f13a7c67b42150d125d088ff09f07338cf9405fdaa20b SHA512 ebf8f10ec8e24237d26629f77ffb99abcc2ec101ebb7fa97502bd4077b1cde0435dd51784b082696d29dc17f5ffc5bafbdd67695b3466d9e11ca6d8ca8fafa3e
+EBUILD pydoc-2.0-r2.ebuild 587 BLAKE2B a817215623fade2d2a522183f550c599149071e7fec43eba7d8d7b0666e1d52499c8b43ae994852e1ce062cdb8d26807cd954e7e4c3d4500a0b13ccf9bd49309 SHA512 e08582a06da1a149cf830ccc983b2e30c863ca391604c5bcffe0cee757cd4d4012ff41a8ca62990fa45f1a9bc084c7f086c02ac4628bfb5b17e37abd83a317d1
 MISC metadata.xml 424 BLAKE2B cd8fb601b39c8ff1247498a196bf776d70b0765661f866b355675b5d8ac76a713bf007b8aafa503d438ac7fb49295e6f09df9d4b1d9d7fc1cba323fd139eea12 SHA512 b64ab21cb93c8d24a87fc0434baac17c21ef9a4a23d4d2622d6c733a043d84aab2c3cb00acc41edd9c61e8599cfcfddeb50025ea0135f9f10c0f5ee243f61dab
diff --git a/app-vim/pydoc/pydoc-2.0-r2.ebuild b/app-vim/pydoc/pydoc-2.0-r2.ebuild
index 3105dd0dc42a..59f7d369ef32 100644
--- a/app-vim/pydoc/pydoc-2.0-r2.ebuild
+++ b/app-vim/pydoc/pydoc-2.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit vim-plugin python-single-r1 vcs-snapshot
 
@@ -11,7 +11,7 @@ DESCRIPTION="vim plugin: integrates python documentation view and search tool"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=910 https://github.com/fs111/pydoc.vim"
 SRC_URI="https://github.com/fs111/${PN}.vim/tarball/${PV} -> ${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 401c9fe9fb1d..274cee889c4a 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/argparse/Manifest b/dev-cpp/argparse/Manifest
new file mode 100644
index 000000000000..d5b36097fc58
--- /dev/null
+++ b/dev-cpp/argparse/Manifest
@@ -0,0 +1,3 @@
+DIST argparse-2.1.tar.gz 72452 BLAKE2B eece3f1cf6a2e58f5bec99f0223b31ba92147964053d98122099dd806a0ab62c6039ee8741281d1eca28b9d0e3aa02d7d076e8bcc64bbd5dd03c777f8e460531 SHA512 35746e0b526bd4406c954ab315f191abc57b08b48a047f108ddacc7baace406d3ddddb1af23d41caff565afecfeb41dfedd27a08cdba8d11b59dbe7c78b7e9b0
+EBUILD argparse-2.1.ebuild 444 BLAKE2B c1bbcf381c28fcb64dc1e88e69194355c9337532dbc9f20924cf73d205bc3df6b1f898652f45fea25964c23d871435c892014beb5a3fabdc99079fd0003094a1 SHA512 fc87da40d9ec3369807ad62f4784788da50e6d412e34440fb87e59dd2a35e41a21b7df9401c516cbb779629e463af6621a3c2409d943e6c041ff191e628e109b
+MISC metadata.xml 329 BLAKE2B aa44d2af31163293cdea2ee1183d4f09c54e42dd888bf94ba9a9c22c59582a907f4785d2e18391604060b1a59acbfcaad93bf2ef4931ceb61b76ab956c90be31 SHA512 d06aa4003fd790e921a78a2a0f8001147d4240dc8af65ede7bb765bf7204dea903e09646f02134de7e9a6f4e54db36ba08aaa5c66e186bb836d1211ffc818cfc
diff --git a/dev-cpp/argparse/argparse-2.1.ebuild b/dev-cpp/argparse/argparse-2.1.ebuild
new file mode 100644
index 000000000000..a09440f0a8ca
--- /dev/null
+++ b/dev-cpp/argparse/argparse-2.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS="cmake"
+inherit cmake-multilib
+
+DESCRIPTION="AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker"
+HOMEPAGE="https://github.com/p-ranav/argparse"
+SRC_URI="https://github.com/p-ranav/argparse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
diff --git a/net-wireless/dump978/metadata.xml b/dev-cpp/argparse/metadata.xml
similarity index 54%
rename from net-wireless/dump978/metadata.xml
rename to dev-cpp/argparse/metadata.xml
index 825bf00b405a..789b64c13e4b 100644
--- a/net-wireless/dump978/metadata.xml
+++ b/dev-cpp/argparse/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
+	<maintainer type="person">
+		<email>alexxy@gentoo.org</email>
+		<name>Alexey Shvetsov</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">flightaware/dump978</remote-id>
+		<remote-id type="github">p-ranav/argparse</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 3318d9b46c2c..e1b4662fe3f3 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index b93fd15516dd..ffbe7befc0d8 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -29,5 +29,5 @@ EBUILD mongodb-4.0.19.ebuild 4592 BLAKE2B 7e2feeb4abdfdd2eebe27265665576ea7c899c
 EBUILD mongodb-4.0.20.ebuild 4593 BLAKE2B 25a75906f5b037572499b8f5a51bc5df9be6e4e413055c85c340a653809587b9467bb51a6b6bd69d5e9609a062727540b7ca90a71e738958b6d50ae21fb46683 SHA512 661332d0421a768ac8b22d9e5f8bc44c5e7ef986dc2180d3c2163e72190fab3557c378d162a63029c897fa1dc1e1a2e5ed2dde5b22d33e7a84de61fa02a52a08
 EBUILD mongodb-4.2.10.ebuild 4787 BLAKE2B cf0502f0cea2c86387b3ba176a1178f58f5e7c0afd6e804c29ece21b4bcb043456612b2739b7e1faa063a5c850dda9c72705ac55728c3449a8796e5a39f4ea5f SHA512 493750ca11273d0ac744086425fa759059ba45c5580818527f2f669ae4d5f6336b763169553f19ea32f7c6c9f7e611be36e4f3cae5d8d27bf12ea89838760790
 EBUILD mongodb-4.2.8.ebuild 4785 BLAKE2B 882ce4365612621348c851383ea19a20db880a11c4b7eb38ac3e7e4508a231d3c4bfca90615425eb9801cee85885c2cccfa61aeef1c26b5f22c4971cc8f31c5c SHA512 3c3fa9e7698f8853f9310bab8890e8e30c1bbc095eb2ede1f6196accaaf770cf1bec94b1bfaf019fdf727f9f1243f0dc2dfcaacbfd651187e852d4aa171e04ce
-EBUILD mongodb-4.4.1.ebuild 4874 BLAKE2B 1a2f557b5515a9a3c8f858c60f32de615a4fdc6163a0994a16aef5fa936a66937cb753d6b0a80f68478d8e573fc65944eaf111bb27d3611d255f7b0449430ee0 SHA512 da771a1b349f030ef86fd9cb7fd338eedb6a7daae4346ba4b7e38a4cf476207e4b0cecc3b2cdc0534830861c594b6db75fd8ee904bb084aa4f573c779c459c98
+EBUILD mongodb-4.4.1.ebuild 4873 BLAKE2B 238cd0ded14cccbb88e5b0fd9c9ae391bd3c0a17c8aa7f8bfd12f3916a725c576df7cfb4849c0735301d13cb895f86858e5e72b9d7d3805dbc257bdcd7e4b89a SHA512 190549c03ad957d79dbfdaf96be0f9c2b2abeb86159750a4f771345774dbb08037481d0145cf517ecb56ce8051cd7229ae15a94e8a54ce478ce98644e206246c
 MISC metadata.xml 901 BLAKE2B f7fde58679ba05518634b82bf5fcc371897165364fe5b023a2ec161790c869de82b4a3dd769d5e1bb450f99679869b60bb1e35beb8d41c54d3448dfca580a7ae SHA512 48f133d396aa31b992bac5f947e5a262b2d07a1016c6d49fa3c86dabb85981edfa332abb867413826762d88051ff3981cc77c2ec92e992d7a231c3b542336e36
diff --git a/dev-db/mongodb/mongodb-4.4.1.ebuild b/dev-db/mongodb/mongodb-4.4.1.ebuild
index de14d8bf32c7..19f0e9216dd1 100644
--- a/dev-db/mongodb/mongodb-4.4.1.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="debug kerberos libressl lto ssl test +tools"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 1876ea3b262a..ae992e29152b 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -13,5 +13,5 @@ EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1636 BLAKE2B e0e977f956845c46bc99a00
 EBUILD mysql-connector-c++-8.0.19.ebuild 1067 BLAKE2B 8407348e0e4da0ea8acca8ec0caa33a0c2e863c9a95d6951ce500b6306b77687e76ca867eeeb580dc5e9b8a9df3dff7ca0a8cb8ae95403a9a117d50d2dc8d869 SHA512 83d72ab1104a0ebd014d8b3e1f475944f16a18dc4836386e3ebf7b16df547f35cf7db42c586411fcef80ec6273f15a0f9531b197eaecb991a62301d9a9d3ff4b
 EBUILD mysql-connector-c++-8.0.20.ebuild 1070 BLAKE2B bd6b438aa0a660bc19a50695ed77fa5f952aabfb6ff1996244eed5846476bb0c725cf2d4899105c88f1409725ebe80970655ac4f51b7012d1fccc3539a69a062 SHA512 d54363d3172c98ef6d500a336fc98c8d8abdd28e443e09e2ce50e85353c374cdd95739b9d6ab636d4aad3a8647bca1eb99329a761a10ff3ffb2040c1ec3796e8
 EBUILD mysql-connector-c++-8.0.21.ebuild 1055 BLAKE2B 7a85e4631367e2a34989a8fc998d80d87c5b6b0220296e7f2f75121766db9c10f66b8838e633c0fc51b43c8314e3521a7cbc1fc0ed2a6fec87e67a6a18b0e91c SHA512 7661f1404a55a3342d90c26fbc36e0f1dc060301f82aadf4b814eedfdeeb7a9698f05e3ab8c552b1be03490e6a4591ac36ca28a7a60604a98844a9136ae063cc
-EBUILD mysql-connector-c++-8.0.22.ebuild 1058 BLAKE2B efed1a027f679d5b996712167ffc1d9ebda0f41846c4603c613cb6796967e28877a29de56e1dbd0c0b615d3af3634df4ac417ccd4a3c9ad2da944fb0de8d630e SHA512 91439f289265c9ed7b048280ae86990c9768b5b70e3509fb4503ffc551f6b04e0c96c04ad0ce24aa6208d227f9c0ef1ce121c13d335d4ab8f034c46fd202c4c9
+EBUILD mysql-connector-c++-8.0.22.ebuild 1056 BLAKE2B 1e1ab96e6aef2ebc122b6234ade2ae7463b4bd0fe78aa15317e3045246e561e09516b5d08396453cb2f7f92fd4c20ae41f93b0517e1201b23bcff89c958fcfe5 SHA512 293337b5b82fc9dbcfb9af999bfbb3a1bdcd8e30455d9cb24deb827491f84c0f2ad98fa6c6a812c61efa122e26f16c64146552df2b7aa6c57540330fdda52bf5
 MISC metadata.xml 378 BLAKE2B 43fdbbc8d3b6ef99e51da96ddfefbdeaa70ef5fcb2fc6067305f75f75b7ee2fd21b79ca76704d8752bf59ae057b28efb187b063770964246f93fea629b58b467 SHA512 c6e545fb60d306792421ea26a937aaa6aea53d2a4100c9cafe78cf695c9dd0620cf3e770d43ff42749ae42bbe3a35212407ea84edee9af2dcb0255c2b763ddfc
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
index 5abc5913d53f..e72e5f0274e1 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+legacy libressl"
 
 RDEPEND="
diff --git a/dev-db/mytop/Manifest b/dev-db/mytop/Manifest
index 19853e52919e..f0ace263f7a7 100644
--- a/dev-db/mytop/Manifest
+++ b/dev-db/mytop/Manifest
@@ -6,5 +6,5 @@ AUX mytop-1.9.1-queries-vs-questions-mysql-5.0.76.patch 3431 BLAKE2B 4d1d18cd3c9
 DIST mytop-1.6.tar.gz 19720 BLAKE2B c7cd4e75283a52e505e09ee3f1618877832be16154e2d313f3a9a71c53a604f67180c892b13209b85c584db0c67c66461064b9c5c99352685518a65f2d3cefc5 SHA512 672209d828c70fd740a791f2e4dfac1e4c594adff197b8bc43322249f03f6c7b18a750da0892c1519fe29e24b661e41d40cdad3a29b546dec4b3a747155566e2
 DIST mytop-1.9.1.tar.gz 22095 BLAKE2B d0281fce93d9165593d5a94229a5de0d2b18d38b02e69329322e62611b5d9546d08626ea60ea7ede4d6ee88fc7df08c733cb5437fb47c468e0d591d7dde00595 SHA512 e6d38812dd69f5e330e5fe9206abe7e00c9e08dd61ba52a9dbd18a823bb09715832d27fb8db6fe1146d78eb56845cc0a7e2a72989ee56267d6482238fee84bc5
 EBUILD mytop-1.6-r4.ebuild 895 BLAKE2B 86cc5ec6b0b390c1270daef2ead374f51ced6102cd50cc3cb5b4fb03dffdb6843ca705396c5b8d264c6c921b5535ebf41e194eb72b7836f1563748cdcfa3d2d4 SHA512 6e55cb2898e98fc3d363af7ee8c36b232d8c3b1bf5321893b11343a0e60897e135f6ad39d796e4c7872e6a934eb5e4c2921e04c21590a7067b47aeaa4b105378
-EBUILD mytop-1.9.1.ebuild 820 BLAKE2B a6794e446963d37aebcf133c422e26ca5d9ec1f07e68e8baf3290130fe27c201dead9f578f43f19a060afa34d038812005f9d1304751d007b30eb55e962eeca8 SHA512 a2a098a8c9209a26da693177ad26b34e006c1b2ae1a4509b05c61eb35932557d7414c2e26c6c22eda56ef723c6cfe360768a113150d69220299cffe14cab8bca
+EBUILD mytop-1.9.1.ebuild 819 BLAKE2B 875526378cde5b771663733fb81be9d2a63d2ae60178aef424c055c23772365a874566daa0dde3911be2c46c74482b226c2156e4e4fcc4a5d7b573e4e0ff28da SHA512 59e2bc37d7ac1861a21a090c2e493fecdbe68a047686a9e361b98f70fdc04e659470b31253c1d9bb652584a0a481c7a1ded24dcc4789b2c7f12546d77fece892
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mytop/mytop-1.9.1.ebuild b/dev-db/mytop/mytop-1.9.1.ebuild
index e90fb2642861..abf078984e41 100644
--- a/dev-db/mytop/mytop-1.9.1.ebuild
+++ b/dev-db/mytop/mytop-1.9.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.mysqlfanboy.com/mytop-3/"
 SRC_URI="http://www.mysqlfanboy.com/mytop-3/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ppc sparc ~x86"
+KEYWORDS="~alpha ~amd64 ppc sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-db/pg_top/Manifest b/dev-db/pg_top/Manifest
index e146127b16a8..b7f3e56d1ce7 100644
--- a/dev-db/pg_top/Manifest
+++ b/dev-db/pg_top/Manifest
@@ -3,5 +3,5 @@ DIST pg_top-3.7.0.tar.bz2 236076 BLAKE2B 87a29d0237aad48b683c17ba56fdbc4a90f854f
 DIST pg_top-4.0.0.tar.xz 117920 BLAKE2B 5c13fd868804492ccce3b660875602df958f065126f9dc17f45ebcac7961384cd1d3d3313da49832a1219ea7e86ae78cbbdb975467b13b32d5f836f5cd33a443 SHA512 b7a016137495ceecdcf0ac0e95c73b7eca20b57264f7b63b0a38c3f31db742c704ed0094e07f6df051bce9bc26214f5a8f66ced1e923bb66e0c86fff1e2ffc19
 EBUILD pg_top-3.7.0.ebuild 621 BLAKE2B 3f411c73e55bdbe3db445d6cb23de24d478d7edeb18e8657da639f73400655eb1dfd95036f469b014ca8e467b02438640a0495ab60697478896735004f15d1f1 SHA512 b78758656bc4e2a1fa702bf2e03f108aa91c7815db10da22a16ca1e6f8939e443577b82d4458f741c991d8742c5d8ebfbf22ca977a638b9e224d1dc425b61564
 EBUILD pg_top-4.0.0-r1.ebuild 503 BLAKE2B 63696aa64d340b27d60fa544cf064dfaacf1e3f710aa86042068cea7cf30b040779f2b147f250cc7b019ffe74cc0ccd92d539fa5bac9b39dc0711e4b45190f9c SHA512 ada49d5653fd5c2e722f1e26ff1f7a7cc75f0191140b2f2383318baf01f397d484693080e769dc284f4ad92e719646cb25404b80f0a101685122ff268a2d3796
-EBUILD pg_top-4.0.0.ebuild 402 BLAKE2B ec320225f0864aec216f400496be18d09dbbfa5aa0b8d53fb5f0404e8f3958e5d5b72615011ba611aa2f1b3579f3ec119efe8758c09ae762947360f2de44fd68 SHA512 c7d50617778104a838c287466d374549a73d6a581317043e300805fa6f56b7669e40551866b1a8b34f560f34f1cd024a953825dbc5e715a5473812268c6e09b7
+EBUILD pg_top-4.0.0.ebuild 401 BLAKE2B 5df7c89bac799f355746deae2b915d1572b0e4292f062a1dde7f7c99c44ae03141042689b2606964cfc7dc3ab9c4c170d2d91757443391c9024843a71299dfcd SHA512 34d7e8a2e95e14046e8ed55861ffe0bb6b2b837860a03df1163757da75671052d92562354fca5187ef0146e8fc2023cf4a8c3aa74a3f0e980262971bf6a8a4cd
 MISC metadata.xml 461 BLAKE2B e6f8d76b546b6b6b6cb13dc1158f71d20f3c68fc9ecc9b37ccf8d8581ec8699e5faab5bd4b10100a0897f668e04449e8f67622e3e3eeb3fdbc54023af536ec0a SHA512 ef6740e37b9d51eb8d303e393d826c91519e8fbd2fe66930486bfbf16bf3bfe09f1a90040a044428841ed61dd6885eefefa2fc9bc43a08e6d4e2dec4a67ba9fc
diff --git a/dev-db/pg_top/pg_top-4.0.0.ebuild b/dev-db/pg_top/pg_top-4.0.0.ebuild
index f0d4e2ea16a6..28d2942c81e7 100644
--- a/dev-db/pg_top/pg_top-4.0.0.ebuild
+++ b/dev-db/pg_top/pg_top-4.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://pg_top.gitlab.io/source/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="dev-db/postgresql:="
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index e4a97c2fab5e..08bad6964443 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -23,5 +23,5 @@ EBUILD postgresql-12.5.ebuild 13727 BLAKE2B cd7bc2d88bb24546eca15495eb368c1baae2
 EBUILD postgresql-13.1.ebuild 13981 BLAKE2B c99c02c02de0fc3a2cca7a7adbebc142de7467cbaa4056e48365c92eeb435259fe923b06aa209405088fe26d9378e570428bfb50397e13feada03ee3eae0628c SHA512 feeae61aa22cd50615e43a68d3704c5b07fe1fc63815539dc0c74d3ee775e775ea391ab29f4849a23fe86d7bd4173c36e7411dc868e63f12813932d06cb4ec33
 EBUILD postgresql-9.5.24.ebuild 14360 BLAKE2B 5737e94065f6efecdf7d43298c071fedd1281d484ebbf7a77731d3de68e5920e69a36581d6b43634c5d8805724688668cce9d4550e8235e22d85025fb99c245b SHA512 be18fb31727ae3f0796f3a0fd9ff0c272be7fbcd0f7a287b94caa18c781f6aa0be1e36b3a4b926fca8c789405d5ac84af8c55c14198c4aac735f8203c0eb633a
 EBUILD postgresql-9.6.20.ebuild 14593 BLAKE2B 41614372b80c5691822bd59a02f66b93139eebc3f49421237660643b8690baec26c0466b38bca1a502108d220659a01a10ebc45d729412c3dd83bb3ebe3fe8c5 SHA512 a2ffcfcbed1637c78ebae251a272d49b6730a37137aaeb7ea9a9958b0644e958033243a2d8a35a0a9bc5eda5b86a7761fabe8068a44f0f8498c48c68acc15e18
-EBUILD postgresql-9999.ebuild 14055 BLAKE2B 5b0143afed6634552561adff30f858e8ce2af41c3aec395856a13701465fcc0a8c1ceb66526ddc1795bb10976bb31726702fa45acfb65db2ec9199b476271873 SHA512 395dd97cc70928dc46943da16311d61e70a894a53ce436dd068b9df1a54d791c80033dff47c86f5c21183507d65cbc01306d6f06e69ff03ec5bb218d3142536e
+EBUILD postgresql-9999.ebuild 14059 BLAKE2B ea0aa8bae9186e8e09ddfebd40ccfd088bf73cc1ff4d81d350efe8e3affe5e1289a41fe021e4298fc4177447486236ad15fc3c80516913dc79877e33eb8a5c02 SHA512 778ec556a9ed5e32ba7dfcdc6b780bc4042c2a3fc794d49b089da995d78192757432201962e217d1cebc7f92c97f0b97f00ba4e58e1e0b28d966ac71ea798a7e
 MISC metadata.xml 715 BLAKE2B 71b868113676bdbb1996ecc8e3727b0cc16a559c5906e6459a41c330bcb5a5f4b3f4b5c4473a81905713c2f0735f185cd14612c69108b6bb602a7d8a92d6f3ce SHA512 4148c9c11ffaea5d30cd18befb06af914147d41eec4a8f905127f0abc5317ca370a745e0fd51b03c4583efde927fe9c1b3333853e80c2aa3e7677de65cd5d1ba
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index 9b9884bf901e..94e83ea608fc 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit flag-o-matic git-r3 linux-info multilib pam prefix python-single-r1 \
 		systemd
diff --git a/dev-db/qdbm/Manifest b/dev-db/qdbm/Manifest
index 5efa691af8ef..65737f139794 100644
--- a/dev-db/qdbm/Manifest
+++ b/dev-db/qdbm/Manifest
@@ -1,7 +1,8 @@
+AUX qdbm-1.8.78-darwin.patch 1139 BLAKE2B 687d8dc4948fb075ab41a32cb8378da49025f477c23af9be3605f1377fdd8366af4d1225fdf60b597a443054d4cb2b57558bb0fcc7d8b3b8c2e4f84c67590d7f SHA512 45014e917ff16b7295eb7d2d583399779b05f98668418f756710a2e456a86f1366fdcdc006398a19e65465ba1ffec593aa77f398393ea2a543083bf3b7c2532f
 AUX qdbm-configure.patch 5913 BLAKE2B a899d4d281eddbe974afd5969e4766d5f2eb55dfa545e6187003c4bb12f3224ead704cc1b14fd33841c8a9788832763d641ef04b5e49eee307aa71412d1301a4 SHA512 a15c513243f2b4976acf9a27f8572726bbaa7e55c7314228fa9fbc5899454c12d8c7efbf7ab24f1b3af427e64daded8ace1a5e4af4a227cae7fbb436e875461c
 AUX qdbm-perl.patch 1260 BLAKE2B e180ba6c2d57f6d813bbc6ae01ed787f6262a290eb59253b8950ec6f80ed29964e41cd3297b063db62e8c726a8e57399fe4ee52e67887bcaa74fad829b0b372f SHA512 a7356c2f5a4313e7da2524a6276bca5720459858d8619bfd8e6514cd9c1cd9aa1a2f7f0592e5ad1ee8b05e7e34452761e26be351f8e933e79a75cb4d19c862f3
 AUX qdbm-ruby19.patch 10116 BLAKE2B 9a15c5d2e0cf8237edb78e68b2f9fde4868841bcca6abc08a33d110b9f25283e37fcb306c18bcca5495c7e5cedc778e3a2de2fe8414ce46c661a7c40d517cddc SHA512 f3e6c320a600ad3355fc74a333c28fc2dd904a2a52ca91a51f21b3dd14c7527bf312f5040dbc3e4f61d2dbcc0ade185e226333c79f9a04fc05437a156befc0e7
 AUX qdbm-runpath.patch 1133 BLAKE2B 9b1c8c211d8e4075a77a34f3d79ca15cb3d833801777bdb328293047539bdd1a51c08031b3400c11d10732aa7864078ca8db02713a95cd90704e1a9e26f5bd10 SHA512 de8bde4a614617d742131e8025fd661019ec81b803817ef32ffca461b2c8b60c20756f6e6f84d6f23124eed3947ab3573b8c4a05b254f8b4d3e53f0cf7bc8452
 DIST qdbm-1.8.78.tar.gz 1015429 BLAKE2B 1b985d856ff18ddfeb2d779694ba9a76006908b4b2a7509d4e3668aded80e08bbde28bcc24762ec27048cdc01dc84f9872dbfc221e8eea6f1c68f5e81cdc69d3 SHA512 480549c56071bf82edf714a611aef863599c858ed63702820ae0890fd2c0029d1a231ed94a8090c74420dd648bd3625d270a5c078b113cbb86a12ef509e19037
-EBUILD qdbm-1.8.78-r2.ebuild 3403 BLAKE2B 23967de1b107a6f912ca47808a47a9aa4f7b29dba650eb137b4603b40e9e8948380fa191d98333bf8e70a10b97195a919e01faced7256617beb2cf5dfa5616be SHA512 a3f8ff8dbeb8705bd96684d55c04dfa4d835096e44dd4fcd1137f7803ad8bb8d43fdf76c9aac21cc40985e76785df815fac22bcca0283943f698ada4e7d30352
+EBUILD qdbm-1.8.78-r2.ebuild 3707 BLAKE2B f73a6db82c52f8bf986fb90075c26dfbcef5c8a1f50c820707b92cce304801260920050b03eb7d971de3b459aa355d95400f338deeb36fc64aa3ae216a40f7b1 SHA512 3e238150a4108032ec21eaaf4f14d5a8676123a01d1629569f46682572196fa8f9c4c4c20347bc7ee7cf7c380b31797914efc6296523b9b221ab36f5c8026ddf
 MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/dev-db/qdbm/files/qdbm-1.8.78-darwin.patch b/dev-db/qdbm/files/qdbm-1.8.78-darwin.patch
new file mode 100644
index 000000000000..de2d33c4ea15
--- /dev/null
+++ b/dev-db/qdbm/files/qdbm-1.8.78-darwin.patch
@@ -0,0 +1,28 @@
+diff --git a/Makefile.in b/Makefile.in
+index 2fec03a..2a1c3a3 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -52,18 +52,18 @@ DESTDIR =
+ # Building binaries
+ CC = @CC@
+ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MYHEADDIR) \
+-  -I$(HOME)/include -I/usr/local/include @MYDEFS@ \
++  -I$(HOME)/include @MYDEFS@ \
+   -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
+   -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
+   -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
+-CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@
++CFLAGS = -Wall -pedantic -fPIC -fsigned-char -fforce-addr @MYOPTS@
+ LD = @LD@
+ LIBS = -lqdbm @LIBS@
+-LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
+-LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)
++LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib @LIBS@
++LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib $(LIBS)
+ AR = @AR@
+ ARFLAGS = rcsv
+-RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
++RUNENV = LD_LIBRARY_PATH=./:$(MYLIBDIR):$(HOME)/lib
+ 
+ 
+ 
diff --git a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
index 40f5281fa882..1906d48f0204 100644
--- a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-perl.patch
 	"${FILESDIR}"/${PN}-ruby19.patch
 	"${FILESDIR}"/${PN}-runpath.patch
+	"${FILESDIR}"/${PN}-1.8.78-darwin.patch
 )
 HTML_DOCS=( doc/. )
 
@@ -99,10 +100,10 @@ src_prepare() {
 		-e "/^JAVACFLAGS/s|$| ${JAVACFLAGS}|" \
 		-e 's/make\( \|$\)/$(MAKE)\1/g' \
 		-e '/^debug/,/^$/s/LDFLAGS="[^"]*" //' \
-		Makefile.in {cgi,java,perl,plus,ruby}/Makefile.in
-	find -name "*~" -delete
+		Makefile.in {cgi,java,perl,plus,ruby}/Makefile.in || die
+	find -name "*~" -delete || die
 
-	mv configure.{in,ac}
+	mv configure.{in,ac} || die
 	eautoreconf
 	qdbm_foreach_api
 }
@@ -111,9 +112,9 @@ each_ruby_prepare() {
 	sed -i \
 		-e "s|ruby |${RUBY} |" \
 		-e "s|\.\./\.\.|${WORKDIR}/all/${P}|" \
-		{Makefile,configure}.in {curia,depot,villa}/extconf.rb
+		{Makefile,configure}.in {curia,depot,villa}/extconf.rb || die
 
-	mv configure.{in,ac}
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -133,8 +134,12 @@ each_ruby_configure() {
 }
 
 src_compile() {
-	default
-	qdbm_foreach_api
+	if [[ ${CHOST} == *darwin* ]] ; then
+		emake mac
+	else
+		default
+		qdbm_foreach_api
+	fi
 }
 
 each_ruby_compile() {
@@ -142,8 +147,12 @@ each_ruby_compile() {
 }
 
 src_test() {
-	default
-	qdbm_foreach_api
+	if [[ ${CHOST} == *darwin* ]] ; then
+		emake check-mac
+	else
+		default
+		qdbm_foreach_api
+	fi
 }
 
 each_ruby_test() {
@@ -151,23 +160,28 @@ each_ruby_test() {
 }
 
 src_install() {
-	default
+	if [[ ${CHOST} == *darwin* ]] ; then
+		emake install-mac
+	else
+		default
+	fi
+
 	qdbm_foreach_api
 	use static-libs || find "${ED}" -name '*.a' -delete || die
 
-	rm -rf "${ED}"/usr/share/${PN}
+	rm -rf "${ED}"/usr/share/${PN} || die
 
 	if use java; then
 		java-pkg_dojar "${ED}"/usr/$(get_libdir)/*.jar
-		rm -f "${ED}"/usr/$(get_libdir)/*.jar
+		rm -f "${ED}"/usr/$(get_libdir)/*.jar || die
 	fi
 	if use perl; then
 		perl_delete_module_manpages
 		perl_fix_packlist
 	fi
 
-	rm -f "${ED}"/usr/bin/*test
-	rm -f "${ED}"/usr/share/man/man1/*test.1*
+	rm -f "${ED}"/usr/bin/*test || die
+	rm -f "${ED}"/usr/share/man/man1/*test.1* || die
 }
 
 each_ruby_install() {
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index c780c18288c6..5ce1fd694aeb 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index d731c8fd4e35..1a8b67c6604c 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -1,19 +1,12 @@
-DIST bcprov-jdk15on-148.tar.gz 4070349 BLAKE2B 7149be76738ce689ad77263ea08b0741db904a63a40e80d6900dc919f11d5c32283840186edfc7da061734785f087dcf7e04cbe66c0ab0c748c273d81bfb42ff SHA512 5216f6511c2ab280dc5a06a94017c2045befaa23c4ba71e67f20375f498ac2e1706b772440b5f5615cc18a52ce79fd61f7f95d2663202b50f29196dff33cde46
-DIST bcprov-jdk15on-149.tar.gz 4329897 BLAKE2B d2e13099db63bca877c92e60cab5e66119475389aaf1a0ccaa11ec19ee169f9c93fa93ee2c697de1273a61ed38b596e9f316c5edac78c34dbbd0f751988bcb1b SHA512 123b2c7063b8a1fe068571d8227269fd77b6d07163aec35dca2219b5a2e0ad970995a74027cc515ecaa6112ccb395fcc4db6fa323f9eadab2c4d6e62991c9143
 DIST bcprov-jdk15on-150.tar.gz 4629743 BLAKE2B 7ab18e83f90db38b9af9530246806b4d413718531ce4b34b7aefa7189e28ade8a2afd5d3b3dc25c8cb2d5ef23a8c7f8157ac947ae7d0a46356b00ea7dd6d5f76 SHA512 95400c338a65cbb7d1e80c776de41d3d372b4237aee91526a06774c3d4beb735dcfb4c1ed182a12f2ccac8204b9c546863d79eb99723394d48c415fa32b6ee0e
 DIST bcprov-jdk15on-152.tar.gz 6334971 BLAKE2B 5ef7db891c29147ac48689a1f15e907f4a91d15ac63e8f6a031847d92ddad22cef3dff791d4036b74cd39550e9b48b1926033449beca240db2d7ac78510c22c7 SHA512 df769d2647c1c0b535b1f6922df3f02ed7e13c941f8d954256fddb2ff31d5682924fedf2f2908bc09ebd20058413f40a4c2d62190b63542aa7840b860aeab07c
 DIST bcprov-jdk15on-154.tar.gz 6903567 BLAKE2B 12039cc6c7dbe06b74a0be8f9482209590ef134b37ef0bc64e97ee34f10ecd7c185bf1129f471e06347ea647d9b2d2dc5b845e0c1cefb5b99ebbe44442de3877 SHA512 3d3bf2a1d174a40941a99d1ac6ac6696e9866964bde0cb23e987e3fbd51e3dca220e16f609c29ef9e761faac670164fa9cccf90e1e0f795c33a3ce80e2783151
 DIST bcprov-jdk15on-166.tar.gz 9684238 BLAKE2B 68d75f8a8e418310179cac2e3d367f759567da280624ac9868ac265779126fa8b722f4291fe254623d92fc304ea057955180ac29a343ee628d9bd36c344fa2b7 SHA512 522cce6d381a51ff7212aa7fd7a99f85cee972a71e2c37c0dcea7e3c2dd4e44f5fa013cd759a11868dec3b6b4bd4f02bedd31ef2dd9379ce89a0d92ec8df2d8e
 DIST bcprov-jdk16-1.38-sources.jar 1197644 BLAKE2B 758b3c894d648dce357d27f20522f8df9c70e87d83702a4eebf5a96529ba3df7fb65dfd62555544fe5f2757ed3194bccc5bc6d97a074036f8b188d84f1f85a42 SHA512 e8ab0b6f47b9737f19ee548dfc6cf09087d1b9339bc48b599fac05d0eb3b00d355f203787a84ee3a504eff2dffd707237a0cc5e26c64a672a362b9161077326f
-DIST bcprov-jdk16-1.40-sources.jar 1221202 BLAKE2B a046d9ac06ed6087c39c9e2d9ae5bf932727b093b5138f6226a4ebcd95640d7b6b6607cf1bd70e6b7b342b5f4d59c358e35225e77ebe8133e8e81a61f632b4ca SHA512 ed94e54cd7a53b5219d0eebb1651f93201c177faf26724613a520e045987e74c462e7adde491bda5bd092fd651b9a7abef93bfac2fd6f0765fb7651525c199ce
 DIST bcprov-jdk16-1.45-sources.jar 1286663 BLAKE2B da19e2343761f10248f315f6966d071a87660f22fe3e51a35308a3b51f907990ef339f05f0c2367babcb06322ffb4600247ecb22b5a19bba3f5c820ed6fe2d2a SHA512 541b390efafba17c21a25bdf84725fd0f9808555eec9c4db51b0642c348d552417d9ba8d584d54690146f3e72fe3b348ab49f92ca263ea8a7a8f7b27bb7b8e5d
 EBUILD bcprov-1.38-r4.ebuild 1336 BLAKE2B 805b34cea2e31c685e8e241cc39bd81545f5de7421006b12f86b3274a09822c42b16a391c7a9506917cb728126dc80c34c2dfacc4a0f21f4ba26b76e5c685fc0 SHA512 dd26a429c403e8e5af917ee25c3ba56891176fd62455e839a9ca3b5046f88d30b8261cb1126a29f37571f290c3232a1789e145e2384f98ffc41805363f750a4f
-EBUILD bcprov-1.40-r2.ebuild 1336 BLAKE2B 8f2f2010097782f0492da774b38bb53460cde92e783ad1c4f78d5545da20f9b3b79bf849d6b7089f4670cf26aa39ee80eec2c48ce3976fc97763e14add3feeb2 SHA512 fe888f263a24ebdc20585cc98bbd9fb2d32c494d695d2eee3d14aae396bca791d4dd3d93e8f7fb20d3c974f31397012c4f126ee0c31d8a3f60a5b06d67d7488d
 EBUILD bcprov-1.45-r2.ebuild 1343 BLAKE2B 1f4e510474a375d532313eb6c6da68fa8b039ee361103d3c44bbc85061ccfce58979118a3be71e190e7ce68bb6c8a291561952a89016bc8a1f3654ceb901ae6b SHA512 d2c2dd791cdcbe27d98b804bfbe5caf5ee04f0a58568ad9917bc0eee43d9547e01cfcd059eba55b39e0e1cde821e75fcb71c15c3bce0afce9213326490341c96
-EBUILD bcprov-1.48-r2.ebuild 1354 BLAKE2B 118806a94e85354cdbe83fab557ae506625cdce911e03c8d3da5e7f059a04eecd37e691adf8c6f49fb2f526f9c68973ace7c62a6bfc4675e9fcf8d5326d08120 SHA512 f3b31ed53af927df1cf491382fc7297aadca264170de9024f1b1123b5debdf7a22d9b97922dd8e5849fcdd586bf5fc89e6bc2657a0428982a6f2893b58df907d
-EBUILD bcprov-1.49-r4.ebuild 1354 BLAKE2B c60a6a2e643aa5a426b154a39071db242c5361e99d8d9ff72853f6071f78f070b9ccbe8a71964b790601900d46e114836dc9110c6610531cf7708b6be7ae800e SHA512 b12cb9c84fd0a89f91850ba8a5ce9b60af846e70ea911adfa510715dcc4535e277c3c841a4e5afc8409dba31d705da3a545e1fa19a8a47f87475a1d33ff6e383
 EBUILD bcprov-1.50-r2.ebuild 1347 BLAKE2B c242438b0f9a8b1802971c1b44424e76bf6c2c11cf359cef7bcb317024c39c7828d6aa901f309055f8c51a180495cf4c3e9e41a788cab4e0a1ae15c3daa83d03 SHA512 3ad3610ab9b2459797bb1fb864582e9e38f85897982f8b1db0ceccb01a80393968a778f11efe04cd59e9b93c5cad2d684e31ac62cc2de6f12192804c847ef1fb
-EBUILD bcprov-1.50-r3.ebuild 1351 BLAKE2B 3092f94f003db082923aaba5140d7b6b5df3247d67ec8b5237c2bb954132fb72a40daecd32e59667c1c3b03c944de6c11d5863902928e80f70137e0921731a71 SHA512 97e407686a4f4fc58cf1a69876944d57a84c564e5cbd1ff06eb94da65afdb0c0f66a6a6e9a1ba379eef21368e072ef8777d550837eee7e115cf50d6ceb40cad5
 EBUILD bcprov-1.50-r4.ebuild 1325 BLAKE2B fb30ce92623bec2ebf9b94b7e912224ca2889beb20ab18b72e48a5b9e26a1f204481bc58fbf617af97c0d09297769c0ee303a8c2e3cb5f98edc57f880fe0f7b9 SHA512 19f3a18ec7f7394d75a3943783bf5c84c12b539e560b05492b9affbc946551bd4efa51a38968067a703fac93e7e07c0b29c8b317dc104423543c1c68f5a37191
 EBUILD bcprov-1.52-r1.ebuild 1347 BLAKE2B 53b6e67db4ad60cd847a4d4ff23231d19fd158d2a396ee002b91f55a917e5eefc2e1cd9c9c4e5b3dc4b0c1eb0899d693281e0098146de2a448353191092cb50a SHA512 005e608991619786a105699c981c0ac63ae3cd22bd1355aed66693a482b7da25e6474f60dbc11d38c6ab9f8b1202ff3d1b8b6b38f2e404512439b646998957c7
 EBUILD bcprov-1.52-r2.ebuild 1352 BLAKE2B b64efb5bacd2a605e35bb242e4009cdc65009dd023f2bd50f3cf5978b8db4be55f8baff925abb09cd1e0b3245da34f48c44dc733ad47f710f99977a73645309b SHA512 7e070f559ffe303268f20a21b9f3258f983daa367d727ff91757c4fd2dd55c5008bb7e9bd52bb645fc6f369791853cc7862db1b54c98b05aa64effea2be1b0ac
diff --git a/dev-java/bcprov/bcprov-1.40-r2.ebuild b/dev-java/bcprov/bcprov-1.40-r2.ebuild
deleted file mode 100644
index 6ac8d34d571e..000000000000
--- a/dev-java/bcprov/bcprov-1.40-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="${PN}-jdk16"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
-LICENSE="BSD"
-SLOT="1.40"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-CDEPEND=""
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-JAVA_ENCODING="ISO-8859-1"
-JAVA_SRC_DIR="org"
-
-# Package can't be built with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-java_prepare() {
-	if ! use test; then
-		# There are too many files to delete so we won't be using JAVA_RM_FILES
-		# (it produces a lot of output).
-		local RM_TEST_FILES=()
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Test*.java" -type f -print0)
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Mock*.java" -type f -print0)
-
-		rm -v "${RM_TEST_FILES[@]}" || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcprov/bcprov-1.48-r2.ebuild b/dev-java/bcprov/bcprov-1.48-r2.ebuild
deleted file mode 100644
index f3659b9a509a..000000000000
--- a/dev-java/bcprov/bcprov-1.48-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.48"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-CDEPEND=""
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ENCODING="ISO-8859-1"
-
-# Package can't be built with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
-	default
-	cd "${S}"
-	unpack ./src.zip
-}
-
-java_prepare() {
-	if ! use test; then
-		# There are too many files to delete so we won't be using JAVA_RM_FILES
-		# (it produces a lot of output).
-		local RM_TEST_FILES=()
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Test*.java" -type f -print0)
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Mock*.java" -type f -print0)
-
-		rm -v "${RM_TEST_FILES[@]}" || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcprov/bcprov-1.49-r4.ebuild b/dev-java/bcprov/bcprov-1.49-r4.ebuild
deleted file mode 100644
index 3e9043e3333e..000000000000
--- a/dev-java/bcprov/bcprov-1.49-r4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.49"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-CDEPEND=""
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ENCODING="ISO-8859-1"
-
-# Package can't be built with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
-	default
-	cd "${S}"
-	unpack ./src.zip
-}
-
-java_prepare() {
-	if ! use test; then
-		# There are too many files to delete so we won't be using JAVA_RM_FILES
-		# (it produces a lot of output).
-		local RM_TEST_FILES=()
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Test*.java" -type f -print0)
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Mock*.java" -type f -print0)
-
-		rm -v "${RM_TEST_FILES[@]}" || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcprov/bcprov-1.50-r3.ebuild b/dev-java/bcprov/bcprov-1.50-r3.ebuild
deleted file mode 100644
index 08a9cb8ef610..000000000000
--- a/dev-java/bcprov/bcprov-1.50-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-CDEPEND=""
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ENCODING="ISO-8859-1"
-
-# Package can't be built with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
-	default
-	cd "${S}"
-	unpack ./src.zip
-}
-
-java_prepare() {
-	if ! use test; then
-		# There are too many files to delete so we won't be using JAVA_RM_FILES
-		# (it produces a lot of output).
-		local RM_TEST_FILES=()
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Test*.java" -type f -print0)
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Mock*.java" -type f -print0)
-
-		rm -v "${RM_TEST_FILES[@]}" || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/dnsjava/Manifest b/dev-java/dnsjava/Manifest
index 93d812291355..11cf4484d97a 100644
--- a/dev-java/dnsjava/Manifest
+++ b/dev-java/dnsjava/Manifest
@@ -4,5 +4,5 @@ DIST dnsjava-2.1.7.tar.gz 1078980 BLAKE2B 16fd027c6f46463d6b4322bcf88943a3f06186
 DIST dnsjava-2.1.8.tar.gz 460532 BLAKE2B 761e99643710aca3aebc50972504284c388685dee12b3fc1fcbe6e4a8698762833dab725ff61395aee2b0292d0f71004eb2247c899c87d01dcc938e4283d31c1 SHA512 d38be6d52b275906b66468cd375ebd46c0d669de2fd06a50253631589a7dd6fbf4e92d4b20778dacd9f19cd489df013e4d42bc16c935581dcaa370ac9ce3c55b
 EBUILD dnsjava-2.1.6.ebuild 962 BLAKE2B b3f8dc3e517a85315ffc3404ad6123fd60ed6e750474f75562e6a3e33ef9c993aea97407e6c0c6d839f1e2361c59cfca26e97c969479ada26247a9fac4ee8729 SHA512 84d11811efab0a1cc1a1427b9d8118c7ed62ecfcb22c597cb724367c88d8fd7a0c9b520a787aa9416a725a6aa5045f0e23801daba959c4e3ff40c178a12ad984
 EBUILD dnsjava-2.1.7.ebuild 940 BLAKE2B 5d11ec37e36d0f109c09c72623eed086469b11600e6007e4e41a5222fd96f0574cc9f64d002d56ed33052f5e864fbdebba5a5691de159d9ecfe13f1758c048d2 SHA512 f6b7ef4507569a06de4e8813fb57c8881895cebaea134b30802acc4e6daceba308c077c14dfa902a3a569080f96e2eba213f46089dca6786317d4614bb9c5e06
-EBUILD dnsjava-2.1.8.ebuild 946 BLAKE2B 5d495bbdb2d6479cb3dc581708f1e164403a9aa72a7658aed803876dff462c37a2d065726d559bee02bb9b75a1defde04c9bc27a8b4b2c3600283f4d452fe4d4 SHA512 cb50f8513144de9bba8ac760b637edff739775c75b25de0a0daa1d94d4dd24c7286e17c3932577bf5e8ac14a2e2825d50057a035c69c333a41ec92848dfcfe42
+EBUILD dnsjava-2.1.8.ebuild 942 BLAKE2B df32d1809a30995c6f62f072067116b67fcc86ea66d4ea6dc2bbf19d863d4d86a34ebce376aa25b0a5e42829a40f23bbb3c1be2f72277369419170d747d9a87d SHA512 f464b14249068bcb52b3724bd74f4fbb525381af4428d93552993f114988ddbbb7d7e3e451dcfb7514441dd8efa9abe7fd76ce9d7118313fd13b72dc4624bf20
 MISC metadata.xml 765 BLAKE2B 106c05f7c8b1f594e668610ed2e244c395868461cb3cb9908c3956861388a5f37c62363b008c9c1e626b0b191914fe2fa0a03fa8d99dacc4bb7253f9a12b6a74 SHA512 800c2681a0c1fcdfa661d1c1ad996367f88f725e32dac8994b24b3ebd51dad3544c70ddfb009561f7987780cb4237809de3fd58bb642fdd8e1bcd20e239cfdda
diff --git a/dev-java/dnsjava/dnsjava-2.1.8.ebuild b/dev-java/dnsjava/dnsjava-2.1.8.ebuild
index 9cb312e010d2..23356a60dda6 100644
--- a/dev-java/dnsjava/dnsjava-2.1.8.ebuild
+++ b/dev-java/dnsjava/dnsjava-2.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://www.dnsjava.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 RESTRICT="test"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/eclipsito/Manifest b/dev-java/eclipsito/Manifest
index 22884a42bb4f..4edc888af778 100644
--- a/dev-java/eclipsito/Manifest
+++ b/dev-java/eclipsito/Manifest
@@ -1,6 +1,4 @@
 AUX eclipsito-0_pre20130713-build.xml 1101 BLAKE2B 32c21296648965d9c3abbf47d66ef5d8d70597016b7ba1aab806c548a5d66c12de519cc2f6e48b4401eb177593a9f12c2a424a66a62e85a6434d783ca07cd896 SHA512 015ec8415927e31d672a0daf8ca89ceb0c8202f2ac8556583fef44586eedf6de8abafd3e96b85ece41fd7de7b712c9a18c53fd6184c8cf753a63e9d1c02ad7cd
-DIST eclipsito-0_pre20130713.tar.xz 162972 BLAKE2B 193a3b2c4bee39bfb87c49eb8b077804d26ef1f84a1dc2c3546d235ab6fa8f86340c943b1a5ce1044dcd5681751d856a044d75866717a0c976e82c86ae8a1ab1 SHA512 b238692950bc93059fb16df8e6301669583185976ae4f12519d1917a13fea2b53c5b3462f2da61d63025019eee10037a3a96b2ac742545d61b80f2ab7964d41b
 DIST eclipsito-20180510.tar.gz 66661 BLAKE2B 0cd1879314eaf4acfcb26cd37f27c50208263cc584d15cb19cfee4d75b29e925d7840be6f39fdf2b6aa05d26f1497284d2d772f9a42ea81398aeec9b1ebad029 SHA512 420cc4ed44fc80065452b39350625f5621175e0bd2aae1ba38a409134bd92af23b492c01f826234431fec68e09eecdf47d61a06f02338e5998c2c5cad44fd142
-EBUILD eclipsito-0_pre20130713.ebuild 703 BLAKE2B e71d6f0458bb0565509908be3240791427b7b19051344b8a235b3238027003aa0f473dcc2b95b64cfa8b9beb902f62269cabbee9e768b3aa03c13f2a7a9eaf58 SHA512 50905b910ea794b51dcea6f3b9bd36bc65f8b1b9ce30752780b085c2677f596af7836f131b57c6420682fa4929e55485861a8d784bc0d3e7f3b4856bfbfe0cbf
 EBUILD eclipsito-20180510.ebuild 681 BLAKE2B 404b3a40ef34e50257862b090fcfc2e0594973a281093e5c8490d3863ef37d903c90a6173cfe8ff658c498e6584b7f25d0d958d541ac33e0a0e2efac3b039588 SHA512 31e5c2b5aa681cec97f58b15712af417b133897eb583580e751b802acb9f4c7b8f7b4abb11885ea267bc62401aa18cc98335b51e066ae3d2887f37a684dbe427
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/eclipsito/eclipsito-0_pre20130713.ebuild b/dev-java/eclipsito/eclipsito-0_pre20130713.ebuild
deleted file mode 100644
index 6625ce2e9267..000000000000
--- a/dev-java/eclipsito/eclipsito-0_pre20130713.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A small subset of Eclipse core libraries for modular applications"
-HOMEPAGE="https://code.google.com/p/eclipsito/"
-SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-S="${WORKDIR}/${PN}/org.bardsoftware.${PN}"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-build.xml
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc apidocs
-	use source && java-pkg_dosrc src/
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 468259d0e94e..fc0a1fa9f524 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/fpc/Manifest b/dev-lang/fpc/Manifest
index 207c1c162d34..7b0352c5fad8 100644
--- a/dev-lang/fpc/Manifest
+++ b/dev-lang/fpc/Manifest
@@ -1,31 +1,7 @@
-DIST fpc-2.6.2.sparc-linux.tar 33843200 BLAKE2B 1ed51f70e940da9151b2c3fa072a61469b36356fcf3f200a787c44ff468074ad25596afcc3864537f9d31b68827ff7d6d6888715421a570e0a0d107368a41de5 SHA512 9f6ba30680bd51ccb6b627935ce2cc10dfa8671f621d5ef7d7e047b036c48934829e165c3f9bbac61bbccda8b679ee132fc26e41c4f9b66cf30966481eb81f09
-DIST fpc-2.6.4-doc-html.tar.gz 4864530 BLAKE2B 7b0138336709403aee1647a04561e797771eb43a0633a0e23d15feeabd7848891443d550c43bb26a146d421e4bc1a8e095df628b0bade5d065caa03705d00e7f SHA512 c76b15c3c9c47d687bb4760753f605a169c7e76b8b8478dc4e557d0a172f9e7ce7abb24fc1512f7eaa305807a1f4cb0a1305bb02e983f932b02aa9683026e54d
-DIST fpc-2.6.4-fpctoc.htx.bz2 125626 BLAKE2B dca08aa9e0bf0cc62a5966eb886057afcb38e3b0174f277a2e30fe41f8c4aca350dc8b35aa0341d6ce6ed50f9db02b3d91778095941d9e13f52f6617a38d486d SHA512 12fdc2755adfabbda74257b058e00072e5e11925b8e62cf7959b2acab90b3e226b8f51544a127f88fc3cd473ba9794e6c9da4e73c04ced2a0d41994b520cd33d
-DIST fpc-2.6.4.arm-linux.tar 38440960 BLAKE2B 07695cff655e25087654ec1b2e556d43ea2b8ebe262954bef26f11a2d1e6f40469bbaa08c82209279eef4e9807441d58aa6211bcec9248a5070657158bab67a0 SHA512 3a11ebed39f37021201cac8a7e435d7ef3b1110d6893de7faf33651ff9b5a9aa13b6b529b0011132850386048483a55754ed8b1dba7de2e7ba9b2e881e7f0203
-DIST fpc-2.6.4.i386-linux.tar 47718400 BLAKE2B 005014a798457bc4f4f1b6035e36a907ee43dec5949e537e919600806fce0927ad1ec53b8ee77eb66f3c6e089a24896af9b3a1d4ff35fe6449d1f3f313ce9506 SHA512 2c1c33c80553d8a331f4fb35e1b136ab195de9fa03ab566b218a265a64cc75447a697a34472fa9cceeedf1e3acd664fada2cd36d60b319ea43eed7e1f9e57615
-DIST fpc-2.6.4.powerpc-linux.tar 48220160 BLAKE2B 1695c5267bef715994e6dcb14f085d49f83e9ae2976f4d5763df4a8c45bb24fa5ca142841521ee9af1dd7a1b38c7bcb3d1fb3b35bb4c800f5e63878d184bbc36 SHA512 a78b416a6dd59a10ad50c3549956f15fae5962b64d43be1f1d605befd035732cf860146970dcb410080f9ceb2af1a4f798434fceb11be550cb87d41c72be1810
-DIST fpc-2.6.4.powerpc64-linux.tar 53975040 BLAKE2B 2cbbe4756833c66f6889198497356c124b06f6ef89158bef22253d1465cb70356efcac8b35d0ad38c30c14a831efc36e15d01bb653dfc6d455fe0bd19546aa3f SHA512 0e978f68e339f12e2c53c8641c4f0918604b6b970949159dd20c49d65dabb5253d338d180da144eea3c6102a0110c401d03efbd634885220a320fce5fc686b16
-DIST fpc-2.6.4.source.tar.gz 29904088 BLAKE2B c126a76ea656a776a94237803db27a2319b0d93309175465ee2b4a06e4271b83a2079b7864ff642fb150fe8f57f4073034bf863f51c9f3512bbbab3d4e1f1d7d SHA512 653968786b40c69c3703f67cddfe7c501686cc8b3524a045498c247dc36b66a6619e9cdb5bb5ca002fb700ddc0b653f2a4298e92527df46fc09c8a69e8e9c3a5
-DIST fpc-2.6.4.x86_64-linux.tar 50350080 BLAKE2B b678cdd5d89c5f18eee1aaeba7e1d2285f70c9bd97ca9cdcce96302016f40bbc32699bf6bf8d22cab01c6ebfa3714ed7cbb9662fed4eccbd4cbd39d6a8d8fdb6 SHA512 3a993d1f978353a1d68d8ce2cd62748a875b0d0589ed8daf71ebba545b51879b09173e26245e02ac327b5d64932153a7695975c02f3f266642b4ef68e8ff48dc
-DIST fpc-3.0.0-doc-html.tar.gz 5253600 BLAKE2B e7128f5475ac57e82dbd1873ca3978572623dc1d674c05f0c9255e903f77f9cadb0cf1e56d7c4d89cdcf84786fef9c28b6c0dc143950c7a67cc3e21709087c09 SHA512 8a6fb405330eb5d4faa6bc892c7cd8b757b2e7b437e3ce19d85d5b98f702df936e1111e0ba9aac24099d20f6366a3bc8c674e087adbd463e62c2b5c615136486
-DIST fpc-3.0.0.i386-linux.tar 44892160 BLAKE2B 49329eab8765e934c5e0925e533e5bca2f942f179050f18ae06169303ee0284f0b3c72d45fd090290f52c31390865c5dc5974b06f74ffe978fec57ba6247294d SHA512 6d409aaa3827018f27813d7965f2d820e36b725ad8ec3257b89688b0bbf722b41e44ab99495050422b91db71323a081bd60c68f3919d04f17b1922264ec10e13
-DIST fpc-3.0.0.source.tar.gz 38311370 BLAKE2B 77a09431074c9df64ca2de3192966a22654a5d5f344a96351889af75951d1d6f8558dbd8642951ea25dbccf7ef74e320adde3ad5af2d9a5c6e64af30d49b3d83 SHA512 18b91a10320b0c52d0486aa241dbfeb5777eebe040f393f9b3661e8ab27a338b5a8d84c9461d40c6d11b362af2deb014f7c3fc273fc11fee1fc9badf19e18b88
-DIST fpc-3.0.0.x86_64-linux.tar 46571520 BLAKE2B 12e82ac9aebc2ecca1097c6d32baf3108e00a6fa6fc6297220a878d6523086731bb6739c2858114b3352001acb91147550cdb94f35fd6df0def30097fe9a3d7a SHA512 26502cf1dfd2bb83fe860e41cb064ccc5b971d112bf05f95e92089ea71bf0e3aafe659ef4cfc4967dd62271b5ecd3468fedf63dc351944b9e8cb52d662d4a3bb
-DIST fpc-3.0.2-doc-html.tar.gz 5534720 BLAKE2B 0d0dfcd1486dd3627242f008face430d80d74db326b0e67f0876a561be3736092ca4397812c8d382a03a0f7e7b4b77abbcdb5ccde25831bfeda36380f6ad5ff4 SHA512 1334e0bd5fbcc5d06513c9f9b1cd99b9a79782cca6224761d18ea314ba88da79517fac46c7135316f00bbaefd779080406f1b9e6c33ffb1e7b228f0c11618669
-DIST fpc-3.0.2.i386-linux.tar 55019520 BLAKE2B b15c99de6b5341d2e41b0ca2644c67808845c0fcaba6e4b3e2efe8d3f8975268491fa4339d4b2aa244e9c71809860c44dad4a6a5609953cb0182144e5648b28e SHA512 adeba89838eceec899edf54a7655a57551319c59eda9f437aa0b6a76bcce1d3cce691a69f40a9fa57ad5c9064abf514c07b879cf40e87cf55c6e10768deb1b7d
-DIST fpc-3.0.2.source.tar.gz 39841597 BLAKE2B 0c5b51051e478a03edd689a74d759752d11664706e7c117cee68919758ba0bc074b0c288bcd6ba66bfd5895d1e72f2f0c03df3df600d02c1a3b66fc79b58070a SHA512 8b2540af910c31c96c4bf6bc546f7824b2acd9509fea76b5884370d8ebecd836c167a6ef98fac46b16278027cc15aa6a9f63fb72919e3a103408dc16416e43ae
-DIST fpc-3.0.2.x86_64-linux.tar 57190400 BLAKE2B 2d38ad274b51efaf8d07431607c0d4184af6d76628771535c16f9466f1d5619dbce1a6ddc5fb3249c7c2fa7b314435d111c3397a4759c094d51438b0e33c7d88 SHA512 fac103f3bf7fad5af9a435831f456c5dd7b546729f56c4b51b2a6dedceea27b331edf48024b4ec7993e50432332e8404ae63d64913d793e787756413c8d95417
 DIST fpc-3.0.4-doc-html.tar.gz 5658315 BLAKE2B 49f9e6f3848ad1aaad8b1621ffd5d2026590b3eed515b9bebe09c489cdf2d7170fcf7413794daebf3465190f5588317325b81d9723d824ab49c81db796f2f48f SHA512 1ebc8c5c5f213568dd24d50667c7939e00c33796c131db174ee93a4dc36122383e7d803cd280896c603eccfadc5bc3474b1831fa7f3e457a58fb3a045b8c33b1
 DIST fpc-3.0.4.i386-linux.tar 54691840 BLAKE2B c0951c85a3916c29e8e7391408da09abd86898a42159bfd7e637410ecf3e3a3f266a33edb5eb5ad458be92cf1fc7741eb249a512fe817a73a13207e216e0c0d2 SHA512 eee7528a69d5c745981efc90f571542047a5e6b4f1b391ad5341460035da5feffdfc4c38229134d23513239ccb33dcbc95354559e45746f1f6665541c60d0ca7
 DIST fpc-3.0.4.source.tar.gz 40347617 BLAKE2B 0764c92cc379d6e70a3f33368d96244ea0203b3395a5dbcadebe6ef51b508cbc7c112f9bc7bce69ae6dae1fde03bc9e45a1a8ad70ca154cc4dd51bc93cab82f9 SHA512 fc64fd94c39f220bd7531126d6281fa2141aed61c218595a7906a025660b46629a305ff7eb023f5e1359eafdec2dba69aa5405f1bbc3c1182414968689cbb52e
 DIST fpc-3.0.4.x86_64-linux.tar 56842240 BLAKE2B fda488466f409d4f50501ad17edcce2740f0a7e60ac86bbfec235ccc27c619d62d2aab01aa7878ba3e174c35fd46aab98e43eda4528e98fdf3e098330eea9b26 SHA512 085110d0fade11c4e6e79c002522080eb070cebb8ebbed48ca35e3a2dc025df678516e36c7cba5f951e20c0da57dd261d673dda6839ecdf5d88aa8dfe15a56e5
-DIST fpcbuild-2.6.4.tar.gz 55604643 BLAKE2B 5aa9aca60c98c68fd629479fb7e13cd16f3a080f67a2687fa81e7d3daee958f41c6935fec45568dcd9fc03317bc94e99867b9c9cdac9d80e8c25386f08b03a55 SHA512 7c48fb48a3742ffe533a8a172758071c0a1129ffac09231e6969aa1d31bac346dc764598b6ae78dc9d25585a788f6ed4f2b4c39502774d4d3620f09185b807de
-DIST fpcbuild-3.0.0.tar.gz 66934428 BLAKE2B f73e224ccd6229bc4872df09cf776443f262006a73d78151c4ac352d3f1f011885a4b82bceaf64d90ff901f425bfad94fa40f6a1da1a9bd298632ff5acffe7fc SHA512 d010cdc2dd2d4c6efe67cf005d0babb00c2a8ae70942c8b838bb690153ad72e52c0d7198eded7bbde8c77e64d28b2d7f5a220fdcd6117e5991cd11a24369d1f1
-DIST fpcbuild-3.0.2.tar.gz 68407379 BLAKE2B 7cc4ed1e629ae4d078aca9589ab7c8b600856818b92391045601b32c9ab8fc9017ec4715b5bcfb059948337f6fc96447ecef00ba8fabbe8eb656ef9393fcc3b7 SHA512 dfa4865d8166b7903914ac101e48bae9761671a77e37cbfd54c2ee8eb6b2ba0e5f3ac4b55867a2ead79499dbae68cc785db531385c5b77d533945c644a2f6fe6
 DIST fpcbuild-3.0.4.tar.gz 68908523 BLAKE2B b5c3936cf0b803aa2cc71f9c25ded470f207c540a1691cf3c2a9876c9e4eefd5c04f45b9f1f3ca17917b14ba4a90e0f16cc890b27024ff225d9d6bb25649862b SHA512 eedfeb4d25b3f4cb30ae9c8f30e0fec2405ef806fa565933cef7904d512f781730e3f023aea2f908c21250e3ced4f74fa780abad77b560728a88cedf591505b6
-EBUILD fpc-2.6.4.ebuild 4818 BLAKE2B fec6c01db8abe861604d94f66ca4cc33b3ddc39f888614f9fe77c3307e5cf8d751396fcbe839bf1bd12eb00498e69d3bea712de0cbd3f492f25c184cbb144f2c SHA512 a156ae004007332291a50847ec02ad3bd398da21571401ad8fbbc3ec164dc66411ca77edf109de90ce9f3cb6325fde171c522879ea6cb3f251eb9a0747c39903
-EBUILD fpc-3.0.0.ebuild 4228 BLAKE2B a182496b5445f605b00855d0b0da1f9a7f9280b0b8f5cdb9bb25eebadfe4839ca488ed6fc260bafb8d1c2542721cc2922e3be5fce66a1a9476ee191f01ae2bbd SHA512 557e48b626a1845231584e19aa55dd935c889630663416f29f133520bf5e1ae22504c8213eee86dc61d42a676a711b686aca9865100a440295654986f2d6dd5b
-EBUILD fpc-3.0.2-r1.ebuild 4464 BLAKE2B a7db8ce21cfe1c777498e754b276751c4910d87812c0497752d4a305dea3a4dd6ea28c7c8514e711497bc1fc1a6270d28c27bbb2815128f8ab2ed1e39b6f730e SHA512 7ee63fa4801074005b248a192f0905e8d146ab06cc43b797460dce60c1418aac4ac1600bb055c428766c36ee1f28db3ab18ea45ca1313684f2a275ec86b20fa5
-EBUILD fpc-3.0.2.ebuild 4251 BLAKE2B e9139fca9cf0628dde9b7a14da2f1ccae262b7e7486a8d77d1b06381ddb5d0582a89d9dc0e71edda29c30f4a3f9de81192364d130e3f2b2245d14341d354cf39 SHA512 b791aaaf9af69e00559de87f48f3c358ff3772dff3fdabc94c02b57d84265ad5df19b069ccb25a2cf58ef68408668f6720480ca697911f9faf1fd45b7687eef6
 EBUILD fpc-3.0.4.ebuild 4459 BLAKE2B 4e02e29ec7411fd966bd7048ad236d9910a7a137ef3b252673ca3d823780b628832bc926c9462eb88711c3c3a3a919b1fb2b399b01d5d00d6a6f1291e98a859e SHA512 b353563e68ebf3524938f1d9cf4f710067443177051d89de73f97aad729a282134859c5811129c88d7a7e516d4a6169c11c691d3300901a0fc5d8cee387b5a88
 MISC metadata.xml 385 BLAKE2B 0e0d050ec7539e841469fd1b2dd9b834e274c5acf63c6f5b38923271cac205d8680229e08dbcb931ed0b136f45800843ee21df6c7b670346b81ea988f1ba11b4 SHA512 1d1ec643e71bbaf3f38dd0f817aeba74f8871071a429b203b3b3397b114ef09e89cb5f166a08e7027e834f4f2ef6ad26049063a2d633ecbd65754945d0be1c46
diff --git a/dev-lang/fpc/fpc-2.6.4.ebuild b/dev-lang/fpc/fpc-2.6.4.ebuild
deleted file mode 100644
index c257c55db1da..000000000000
--- a/dev-lang/fpc/fpc-2.6.4.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-HOMEPAGE="https://www.freepascal.org/"
-DESCRIPTION="Free Pascal Compiler"
-SRC_URI="mirror://sourceforge/freepascal/fpcbuild-${PV}.tar.gz
-	mirror://sourceforge/freepascal/fpc-${PV}.source.tar.gz
-	amd64? ( mirror://sourceforge/freepascal/${P}.x86_64-linux.tar )
-	arm? ( mirror://sourceforge/freepascal/${P}.arm-linux.tar )
-	ppc? ( mirror://sourceforge/freepascal/${P}.powerpc-linux.tar )
-	ppc64? ( mirror://sourceforge/freepascal/${P}.powerpc64-linux.tar )
-	sparc? ( mirror://sourceforge/freepascal/${PN}-2.6.2.sparc-linux.tar )
-	x86? ( mirror://sourceforge/freepascal/${P}.i386-linux.tar )
-	doc? ( mirror://sourceforge/freepascal/Documentation/${PV}/doc-html.tar.gz -> ${P}-doc-html.tar.gz
-		https://dev.gentoo.org/~radhermit/distfiles/${P}-fpctoc.htx.bz2 )"
-
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc ide source"
-
-RDEPEND="ide? ( !dev-lang/fpc-ide )"
-
-RESTRICT="strip" #269221
-
-S=${WORKDIR}/fpcbuild-${PV}/fpcsrc
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bug 475210
-		if $(tc-getLD) --version | grep -q "GNU gold"; then
-			eerror "fpc does not function correctly when built with the gold linker."
-			eerror "Please select the bfd linker with binutils-config."
-			die "GNU gold detected"
-		fi
-	fi
-}
-
-src_unpack() {
-	case ${ARCH} in
-		amd64)	FPC_ARCH="x86_64"    PV_BIN=${PV} ;;
-		arm)	FPC_ARCH="arm"       PV_BIN=${PV} ;;
-		ppc)	FPC_ARCH="powerpc"   PV_BIN=${PV} ;;
-		ppc64)	FPC_ARCH="powerpc64" PV_BIN=${PV} ;;
-		sparc)	FPC_ARCH="sparc"     PV_BIN=2.6.2 ;;
-		x86)	FPC_ARCH="i386"      PV_BIN=${PV} ;;
-		*)	die "This ebuild doesn't support ${ARCH}." ;;
-	esac
-
-	unpack ${A}
-
-	tar -xf ${PN}-${PV_BIN}.${FPC_ARCH}-linux/binary.${FPC_ARCH}-linux.tar || die "Unpacking binary.${FPC_ARCH}-linux.tar failed!"
-	tar -xzf base.${FPC_ARCH}-linux.tar.gz || die "Unpacking base.${FPC_ARCH}-linux.tar.gz failed!"
-}
-
-src_prepare() {
-	find "${WORKDIR}" -name Makefile -exec sed -i -e 's/ -Xs / /g' {} + || die
-
-	# let the pkg manager compress man files
-	sed -i '/find man.* gzip /d' "${WORKDIR}"/fpcbuild-${PV}/install/man/Makefile || die
-}
-
-set_pp() {
-	case ${ARCH} in
-		amd64)	FPC_ARCH="x64" ;;
-		arm)	FPC_ARCH="arm" ;;
-		ppc)	FPC_ARCH="ppc" ;;
-		ppc64)	FPC_ARCH="ppc64" ;;
-		sparc)	FPC_ARCH="sparc" ;;
-		x86)	FPC_ARCH="386" ;;
-		*)	die "This ebuild doesn't support ${ARCH}." ;;
-	esac
-
-	case ${1} in
-		bootstrap)	pp="${WORKDIR}"/lib/fpc/${PV_BIN}/ppc${FPC_ARCH} ;;
-		new) 	pp="${S}"/compiler/ppc${FPC_ARCH} ;;
-		*)	die "set_pp: unknown argument: ${1}" ;;
-	esac
-}
-
-src_compile() {
-	local pp
-
-	# Using the bootstrap compiler.
-	set_pp bootstrap
-
-	emake -j1 PP="${pp}" compiler_cycle AS="$(tc-getAS)"
-
-	# Save new compiler from cleaning...
-	cp "${S}"/compiler/ppc${FPC_ARCH} "${S}"/ppc${FPC_ARCH}.new || die
-
-	# ...rebuild with current version...
-	emake -j1 PP="${S}"/ppc${FPC_ARCH}.new AS="$(tc-getAS)" compiler_cycle
-
-	# ..and clean up afterwards
-	rm "${S}"/ppc${FPC_ARCH}.new || die
-
-	# Using the new compiler.
-	set_pp new
-
-	emake -j1 PP="${pp}" AS="$(tc-getAS)" rtl_clean
-
-	emake -j1 PP="${pp}" AS="$(tc-getAS)" rtl packages_all utils
-
-	if use ide ; then
-		cd "${S}"/ide || die
-		emake -j1 PP="${pp}" AS="$(tc-getAS)"
-	fi
-}
-
-src_install() {
-	local pp
-	set_pp new
-
-	set -- PP="${pp}" FPCMAKE="${S}/utils/fpcm/fpcmake" \
-		INSTALL_PREFIX="${D}"/usr \
-		INSTALL_DOCDIR="${D}"/usr/share/doc/${PF} \
-		INSTALL_MANDIR="${D}"/usr/share/man \
-		INSTALL_SOURCEDIR="${D}"/usr/lib/fpc/${PV}/source
-
-	emake -j1 "$@" compiler_install rtl_install packages_install utils_install
-
-	dosym ../lib/fpc/${PV}/ppc${FPC_ARCH} /usr/bin/ppc${FPC_ARCH}
-
-	cd "${S}"/../install/doc || die
-	emake -j1 "$@" installdoc
-
-	cd "${S}"/../install/man || die
-	emake -j1 "$@" installman
-
-	if use doc ; then
-		cd "${S}"/../../doc || die
-		dodoc -r *
-		newdoc "${WORKDIR}"/${P}-fpctoc.htx fpctoc.htx
-		docompress -x /usr/share/doc/${PF}/fpctoc.htx
-	fi
-
-	if use ide ; then
-		cd "${S}"/ide
-		emake -j1 "$@" install
-	fi
-
-	if use source ; then
-		cd "${S}" || die
-		shift
-		emake -j1 PP="${D}"/usr/bin/ppc${FPC_ARCH} "$@" sourceinstall
-		find "${D}"/usr/lib/fpc/${PV}/source -name '*.o' -exec rm {} \;
-	fi
-
-	"${D}"/usr/lib/fpc/${PV}/samplecfg "${D}"/usr/lib/fpc/${PV} "${D}"/etc || die
-
-	sed -i "s:${D}::g" "${D}"/etc/fpc.cfg || die
-
-	if use ide ; then
-		sed -e "s:${D}::g" \
-			-i "${D}"/etc/fppkg.cfg \
-			-i "${D}"/etc/fppkg/* \
-			-i "${D}"/usr/lib/fpc/${PV}/ide/text/fp*.cfg \
-			|| die
-	fi
-
-	rm -r "${D}"/usr/lib/fpc/lexyacc || die
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && use ide; then
-		einfo "To read the documentation in the fpc IDE, enable the doc USE flag"
-		einfo "and add /usr/share/doc/${PF}/fpctoc.htx to the Help Files list."
-	fi
-}
diff --git a/dev-lang/fpc/fpc-3.0.0.ebuild b/dev-lang/fpc/fpc-3.0.0.ebuild
deleted file mode 100644
index 8e703c097ba0..000000000000
--- a/dev-lang/fpc/fpc-3.0.0.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-HOMEPAGE="https://www.freepascal.org/"
-DESCRIPTION="Free Pascal Compiler"
-SRC_URI="mirror://sourceforge/freepascal/fpcbuild-${PV}.tar.gz
-	mirror://sourceforge/freepascal/fpc-${PV}.source.tar.gz
-	amd64? ( mirror://sourceforge/freepascal/${P}.x86_64-linux.tar )
-	x86? ( mirror://sourceforge/freepascal/${P}.i386-linux.tar )
-	doc? ( mirror://sourceforge/freepascal/Documentation/${PV}/doc-html.tar.gz -> ${P}-doc-html.tar.gz )"
-
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ide source"
-
-RDEPEND="ide? ( !dev-lang/fpc-ide )"
-
-RESTRICT="strip" #269221
-
-S=${WORKDIR}/fpcbuild-${PV}/fpcsrc
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bug 475210
-		if $(tc-getLD) --version | grep -q "GNU gold"; then
-			eerror "fpc does not function correctly when built with the gold linker."
-			eerror "Please select the bfd linker with binutils-config."
-			die "GNU gold detected"
-		fi
-	fi
-}
-
-src_unpack() {
-	case ${ARCH} in
-		amd64)	FPC_ARCH="x86_64"    PV_BIN=${PV} ;;
-		x86)	FPC_ARCH="i386"      PV_BIN=${PV} ;;
-		*)	die "This ebuild doesn't support ${ARCH}." ;;
-	esac
-
-	unpack ${A}
-
-	tar -xf ${PN}-${PV_BIN}.${FPC_ARCH}-linux/binary.${FPC_ARCH}-linux.tar || die "Unpacking binary.${FPC_ARCH}-linux.tar failed!"
-	tar -xzf base.${FPC_ARCH}-linux.tar.gz || die "Unpacking base.${FPC_ARCH}-linux.tar.gz failed!"
-}
-
-src_prepare() {
-	find "${WORKDIR}" -name Makefile -exec sed -i -e 's/ -Xs / /g' {} + || die
-
-	# let the pkg manager compress man files
-	sed -i '/find man.* gzip /d' "${WORKDIR}"/fpcbuild-${PV}/install/man/Makefile || die
-}
-
-set_pp() {
-	case ${ARCH} in
-		amd64)	FPC_ARCH="x64" FPC_PARCH="x86_64" ;;
-		x86)	FPC_ARCH="386" FPC_PARCH="i386" ;;
-		*)	die "This ebuild doesn't support ${ARCH}." ;;
-	esac
-
-	case ${1} in
-		bootstrap)	pp="${WORKDIR}"/lib/fpc/${PV_BIN}/ppc${FPC_ARCH} ;;
-		new) 	pp="${S}"/compiler/ppc${FPC_ARCH} ;;
-		*)	die "set_pp: unknown argument: ${1}" ;;
-	esac
-}
-
-src_compile() {
-	local pp
-
-	# Using the bootstrap compiler.
-	set_pp bootstrap
-
-	emake -j1 PP="${pp}" compiler_cycle AS="$(tc-getAS)"
-
-	# Save new compiler from cleaning...
-	cp "${S}"/compiler/ppc${FPC_ARCH} "${S}"/ppc${FPC_ARCH}.new || die
-
-	# ...rebuild with current version...
-	emake -j1 PP="${S}"/ppc${FPC_ARCH}.new AS="$(tc-getAS)" compiler_cycle
-
-	# ..and clean up afterwards
-	rm "${S}"/ppc${FPC_ARCH}.new || die
-
-	# Using the new compiler.
-	set_pp new
-
-	emake -j1 PP="${pp}" AS="$(tc-getAS)" rtl_clean
-
-	emake -j1 PP="${pp}" AS="$(tc-getAS)" rtl packages_all utils
-
-	if use ide ; then
-		cd "${S}"/ide || die
-		emake -j1 PP="${pp}" AS="$(tc-getAS)"
-	fi
-}
-
-src_install() {
-	local pp
-	set_pp new
-
-	#fpcbuild-3.0.0/utils/fpcm/fpcmake
-	#${WORKDIR}/${PN}build-${PV}/utils/fpcm/fpcmake"
-	#fpcbuild-3.0.0/fpcsrc/utils/fpcm/bin/x86_64-linux/fpcmake
-	set -- PP="${pp}" FPCMAKE="${S}/utils/fpcm/bin/${FPC_PARCH}-linux/fpcmake" \
-		INSTALL_PREFIX="${D}"/usr \
-		INSTALL_DOCDIR="${D}"/usr/share/doc/${PF} \
-		INSTALL_MANDIR="${D}"/usr/share/man \
-		INSTALL_SOURCEDIR="${D}"/usr/lib/fpc/${PV}/source
-
-	emake -j1 "$@" compiler_install rtl_install packages_install utils_install
-
-	dosym ../lib/fpc/${PV}/ppc${FPC_ARCH} /usr/bin/ppc${FPC_ARCH}
-
-	cd "${S}"/../install/doc || die
-	emake -j1 "$@" installdoc
-
-	cd "${S}"/../install/man || die
-	emake -j1 "$@" installman
-
-	if use doc ; then
-		cd "${S}"/../../doc || die
-		dodoc -r *
-	fi
-
-	if use ide ; then
-		cd "${S}"/ide
-		emake -j1 "$@" install
-	fi
-
-	if use source ; then
-		cd "${S}" || die
-		shift
-		emake -j1 PP="${D}"/usr/bin/ppc${FPC_ARCH} "$@" sourceinstall
-		find "${D}"/usr/lib/fpc/${PV}/source -name '*.o' -exec rm {} \;
-	fi
-
-	"${D}"/usr/lib/fpc/${PV}/samplecfg "${D}"/usr/lib/fpc/${PV} "${D}"/etc || die
-
-	sed -i "s:${D}::g" "${D}"/etc/fpc.cfg || die
-
-	if use ide ; then
-		sed -e "s:${D}::g" \
-			-i "${D}"/etc/fppkg.cfg \
-			-i "${D}"/etc/fppkg/* \
-			-i "${D}"/usr/lib/fpc/${PV}/ide/text/fp*.cfg \
-			|| die
-	fi
-
-	rm -r "${D}"/usr/lib/fpc/lexyacc || die
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && use ide; then
-		einfo "To read the documentation in the fpc IDE, enable the doc USE flag"
-	fi
-}
diff --git a/dev-lang/fpc/fpc-3.0.2-r1.ebuild b/dev-lang/fpc/fpc-3.0.2-r1.ebuild
deleted file mode 100644
index 38a17395ed74..000000000000
--- a/dev-lang/fpc/fpc-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit prefix toolchain-funcs
-
-HOMEPAGE="https://www.freepascal.org/"
-DESCRIPTION="Free Pascal Compiler"
-SRC_URI="mirror://sourceforge/freepascal/fpcbuild-${PV}.tar.gz
-	mirror://sourceforge/freepascal/fpc-${PV}.source.tar.gz
-	amd64? ( mirror://sourceforge/freepascal/${P}.x86_64-linux.tar )
-	x86? ( mirror://sourceforge/freepascal/${P}.i386-linux.tar )
-	doc? ( mirror://sourceforge/freepascal/Documentation/${PV}/doc-html.tar.gz -> ${P}-doc-html.tar.gz )"
-
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ide source"
-
-RDEPEND="ide? ( !dev-lang/fpc-ide )"
-
-RESTRICT="strip" #269221
-
-S=${WORKDIR}/fpcbuild-${PV}/fpcsrc
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bug 475210
-		if $(tc-getLD) --version | grep -q "GNU gold"; then
-			eerror "fpc does not function correctly when built with the gold linker."
-			eerror "Please select the bfd linker with binutils-config."
-			die "GNU gold detected"
-		fi
-	fi
-}
-
-src_unpack() {
-	case ${ARCH} in
-		amd64)	FPC_ARCH="x86_64"    PV_BIN=${PV} ;;
-		x86)	FPC_ARCH="i386"      PV_BIN=${PV} ;;
-		*)	die "This ebuild doesn't support ${ARCH}." ;;
-	esac
-
-	unpack ${A}
-
-	tar -xf ${PN}-${PV_BIN}.${FPC_ARCH}-linux/binary.${FPC_ARCH}-linux.tar || die "Unpacking binary.${FPC_ARCH}-linux.tar failed!"
-	tar -xzf base.${FPC_ARCH}-linux.tar.gz || die "Unpacking base.${FPC_ARCH}-linux.tar.gz failed!"
-}
-
-src_prepare() {
-	find "${WORKDIR}" -name Makefile -exec sed -i -e 's/ -Xs / /g' {} + || die
-
-	# let the pkg manager compress man files
-	sed -i '/find man.* gzip /d' "${WORKDIR}"/fpcbuild-${PV}/install/man/Makefile || die
-
-	# make the compiled binary check for fpc.cfg under the prefixed /etc/ path
-	hprefixify "${WORKDIR}"/fpcbuild-${PV}/fpcsrc/compiler/options.pas
-}
-
-set_pp() {
-	case ${ARCH} in
-		amd64)	FPC_ARCH="x64" FPC_PARCH="x86_64" ;;
-		x86)	FPC_ARCH="386" FPC_PARCH="i386" ;;
-		*)	die "This ebuild doesn't support ${ARCH}." ;;
-	esac
-
-	case ${1} in
-		bootstrap)	pp="${WORKDIR}"/lib/fpc/${PV_BIN}/ppc${FPC_ARCH} ;;
-		new) 	pp="${S}"/compiler/ppc${FPC_ARCH} ;;
-		*)	die "set_pp: unknown argument: ${1}" ;;
-	esac
-}
-
-src_compile() {
-	local pp
-
-	# Using the bootstrap compiler.
-	set_pp bootstrap
-
-	emake -j1 PP="${pp}" compiler_cycle AS="$(tc-getAS)"
-
-	# Save new compiler from cleaning...
-	cp "${S}"/compiler/ppc${FPC_ARCH} "${S}"/ppc${FPC_ARCH}.new || die
-
-	# ...rebuild with current version...
-	emake -j1 PP="${S}"/ppc${FPC_ARCH}.new AS="$(tc-getAS)" compiler_cycle
-
-	# ..and clean up afterwards
-	rm "${S}"/ppc${FPC_ARCH}.new || die
-
-	# Using the new compiler.
-	set_pp new
-
-	emake -j1 PP="${pp}" AS="$(tc-getAS)" rtl_clean
-
-	emake -j1 PP="${pp}" AS="$(tc-getAS)" rtl packages_all utils
-
-	if use ide ; then
-		cd "${S}"/ide || die
-		emake -j1 PP="${pp}" AS="$(tc-getAS)"
-	fi
-}
-
-src_install() {
-	local pp
-	set_pp new
-
-	#fpcbuild-3.0.0/utils/fpcm/fpcmake
-	#${WORKDIR}/${PN}build-${PV}/utils/fpcm/fpcmake"
-	#fpcbuild-3.0.0/fpcsrc/utils/fpcm/bin/x86_64-linux/fpcmake
-	set -- PP="${pp}" FPCMAKE="${S}/utils/fpcm/bin/${FPC_PARCH}-linux/fpcmake" \
-		INSTALL_PREFIX="${ED}"/usr \
-		INSTALL_DOCDIR="${ED}"/usr/share/doc/${PF} \
-		INSTALL_MANDIR="${ED}"/usr/share/man \
-		INSTALL_SOURCEDIR="${ED}"/usr/lib/fpc/${PV}/source
-
-	emake -j1 "$@" compiler_install rtl_install packages_install utils_install
-
-	dosym ../lib/fpc/${PV}/ppc${FPC_ARCH} /usr/bin/ppc${FPC_ARCH}
-
-	cd "${S}"/../install/doc || die
-	emake -j1 "$@" installdoc
-
-	cd "${S}"/../install/man || die
-	emake -j1 "$@" installman
-
-	if use doc ; then
-		cd "${S}"/../../doc || die
-		dodoc -r *
-	fi
-
-	if use ide ; then
-		cd "${S}"/ide || die
-		emake -j1 "$@" install
-	fi
-
-	if use source ; then
-		cd "${S}" || die
-		shift
-		emake -j1 PP="${ED}"/usr/bin/ppc${FPC_ARCH} "$@" sourceinstall
-		find "${ED}"/usr/lib/fpc/${PV}/source -name '*.o' -exec rm {} \;
-	fi
-
-	"${ED}"/usr/lib/fpc/${PV}/samplecfg "${ED}"/usr/lib/fpc/${PV} "${ED}"/etc || die
-
-	# set correct (prefixed) path for e.g. unit files
-	sed -i "s:${ED}:${EPREFIX}:g" "${ED}"/etc/fpc.cfg || die
-
-	if use ide ; then
-		sed -e "s:${ED}::g" \
-			-i "${ED}"/etc/fppkg.cfg \
-			-i "${ED}"/etc/fppkg/* \
-			-i "${ED}"/usr/lib/fpc/${PV}/ide/text/fp*.cfg \
-			|| die
-	fi
-
-	rm -r "${ED}"/usr/lib/fpc/lexyacc || die
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && use ide; then
-		einfo "To read the documentation in the fpc IDE, enable the doc USE flag"
-	fi
-}
diff --git a/dev-lang/fpc/fpc-3.0.2.ebuild b/dev-lang/fpc/fpc-3.0.2.ebuild
deleted file mode 100644
index f8ea1b5b8b4c..000000000000
--- a/dev-lang/fpc/fpc-3.0.2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-HOMEPAGE="https://www.freepascal.org/"
-DESCRIPTION="Free Pascal Compiler"
-SRC_URI="mirror://sourceforge/freepascal/fpcbuild-${PV}.tar.gz
-	mirror://sourceforge/freepascal/fpc-${PV}.source.tar.gz
-	amd64? ( mirror://sourceforge/freepascal/${P}.x86_64-linux.tar )
-	x86? ( mirror://sourceforge/freepascal/${P}.i386-linux.tar )
-	doc? ( mirror://sourceforge/freepascal/Documentation/${PV}/doc-html.tar.gz -> ${P}-doc-html.tar.gz )"
-
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ide source"
-
-RDEPEND="ide? ( !dev-lang/fpc-ide )"
-
-RESTRICT="strip" #269221
-
-S=${WORKDIR}/fpcbuild-${PV}/fpcsrc
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bug 475210
-		if $(tc-getLD) --version | grep -q "GNU gold"; then
-			eerror "fpc does not function correctly when built with the gold linker."
-			eerror "Please select the bfd linker with binutils-config."
-			die "GNU gold detected"
-		fi
-	fi
-}
-
-src_unpack() {
-	case ${ARCH} in
-		amd64)	FPC_ARCH="x86_64"    PV_BIN=${PV} ;;
-		x86)	FPC_ARCH="i386"      PV_BIN=${PV} ;;
-		*)	die "This ebuild doesn't support ${ARCH}." ;;
-	esac
-
-	unpack ${A}
-
-	tar -xf ${PN}-${PV_BIN}.${FPC_ARCH}-linux/binary.${FPC_ARCH}-linux.tar || die "Unpacking binary.${FPC_ARCH}-linux.tar failed!"
-	tar -xzf base.${FPC_ARCH}-linux.tar.gz || die "Unpacking base.${FPC_ARCH}-linux.tar.gz failed!"
-}
-
-src_prepare() {
-	find "${WORKDIR}" -name Makefile -exec sed -i -e 's/ -Xs / /g' {} + || die
-
-	# let the pkg manager compress man files
-	sed -i '/find man.* gzip /d' "${WORKDIR}"/fpcbuild-${PV}/install/man/Makefile || die
-}
-
-set_pp() {
-	case ${ARCH} in
-		amd64)	FPC_ARCH="x64" FPC_PARCH="x86_64" ;;
-		x86)	FPC_ARCH="386" FPC_PARCH="i386" ;;
-		*)	die "This ebuild doesn't support ${ARCH}." ;;
-	esac
-
-	case ${1} in
-		bootstrap)	pp="${WORKDIR}"/lib/fpc/${PV_BIN}/ppc${FPC_ARCH} ;;
-		new) 	pp="${S}"/compiler/ppc${FPC_ARCH} ;;
-		*)	die "set_pp: unknown argument: ${1}" ;;
-	esac
-}
-
-src_compile() {
-	local pp
-
-	# Using the bootstrap compiler.
-	set_pp bootstrap
-
-	emake -j1 PP="${pp}" compiler_cycle AS="$(tc-getAS)"
-
-	# Save new compiler from cleaning...
-	cp "${S}"/compiler/ppc${FPC_ARCH} "${S}"/ppc${FPC_ARCH}.new || die
-
-	# ...rebuild with current version...
-	emake -j1 PP="${S}"/ppc${FPC_ARCH}.new AS="$(tc-getAS)" compiler_cycle
-
-	# ..and clean up afterwards
-	rm "${S}"/ppc${FPC_ARCH}.new || die
-
-	# Using the new compiler.
-	set_pp new
-
-	emake -j1 PP="${pp}" AS="$(tc-getAS)" rtl_clean
-
-	emake -j1 PP="${pp}" AS="$(tc-getAS)" rtl packages_all utils
-
-	if use ide ; then
-		cd "${S}"/ide || die
-		emake -j1 PP="${pp}" AS="$(tc-getAS)"
-	fi
-}
-
-src_install() {
-	local pp
-	set_pp new
-
-	#fpcbuild-3.0.0/utils/fpcm/fpcmake
-	#${WORKDIR}/${PN}build-${PV}/utils/fpcm/fpcmake"
-	#fpcbuild-3.0.0/fpcsrc/utils/fpcm/bin/x86_64-linux/fpcmake
-	set -- PP="${pp}" FPCMAKE="${S}/utils/fpcm/bin/${FPC_PARCH}-linux/fpcmake" \
-		INSTALL_PREFIX="${ED}"/usr \
-		INSTALL_DOCDIR="${ED}"/usr/share/doc/${PF} \
-		INSTALL_MANDIR="${ED}"/usr/share/man \
-		INSTALL_SOURCEDIR="${ED}"/usr/lib/fpc/${PV}/source
-
-	emake -j1 "$@" compiler_install rtl_install packages_install utils_install
-
-	dosym ../lib/fpc/${PV}/ppc${FPC_ARCH} /usr/bin/ppc${FPC_ARCH}
-
-	cd "${S}"/../install/doc || die
-	emake -j1 "$@" installdoc
-
-	cd "${S}"/../install/man || die
-	emake -j1 "$@" installman
-
-	if use doc ; then
-		cd "${S}"/../../doc || die
-		dodoc -r *
-	fi
-
-	if use ide ; then
-		cd "${S}"/ide || die
-		emake -j1 "$@" install
-	fi
-
-	if use source ; then
-		cd "${S}" || die
-		shift
-		emake -j1 PP="${ED}"/usr/bin/ppc${FPC_ARCH} "$@" sourceinstall
-		find "${ED}"/usr/lib/fpc/${PV}/source -name '*.o' -exec rm {} \;
-	fi
-
-	"${ED}"/usr/lib/fpc/${PV}/samplecfg "${ED}"/usr/lib/fpc/${PV} "${ED}"/etc || die
-
-	sed -i "s:${ED}::g" "${ED}"/etc/fpc.cfg || die
-
-	if use ide ; then
-		sed -e "s:${ED}::g" \
-			-i "${ED}"/etc/fppkg.cfg \
-			-i "${ED}"/etc/fppkg/* \
-			-i "${ED}"/usr/lib/fpc/${PV}/ide/text/fp*.cfg \
-			|| die
-	fi
-
-	rm -r "${ED}"/usr/lib/fpc/lexyacc || die
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && use ide; then
-		einfo "To read the documentation in the fpc IDE, enable the doc USE flag"
-	fi
-}
diff --git a/dev-lang/lfe/Manifest b/dev-lang/lfe/Manifest
index 77e499f848f5..9411e0523d44 100644
--- a/dev-lang/lfe/Manifest
+++ b/dev-lang/lfe/Manifest
@@ -1,9 +1,3 @@
-DIST lfe-0.10.1.zip 296228 BLAKE2B 2700f13ad186cf32162dce496b65d4333f66b847790f55a2be16deffbf0cb721736f251621c55104e180e9d6b0dcc03a2eacc2f76afa0c53bb719c6e5588248a SHA512 94719b42ecf6dc5505ea649df00b255b1e901d6104426192f34692e2f7bc85940b96b39fd1bfa00577b63c17e10d8fd51d3de743c02d8ac2263abe2fb47d4498
-DIST lfe-0.7a.zip 216133 BLAKE2B 9cd09684046f932e4ac3c0bfb6c1c7491eeb8586eef09672c5f782cf3fe9e5e6b692f6f63f3667756f5240fc07fd84d94755fae696de3e7ed71d2ccf24984b3a SHA512 f8e8dd080142aed77109deed7627bcd6c9a90d4bddcc2207b5e3ffa0e744c889ac4890d18040e7bde239e1c69c6251819723637a8b9ad9c0cce01787c6e0e1b0
-DIST lfe-1.0.zip 303894 BLAKE2B dca1014664235b959710a1e535e96e496c90170e82dbb810b9715aa11b796ab7f13590f655f1b41e30be5cd9ee1d6b0e78054386958a9aea6a2a96f510b1ff3a SHA512 752ac6b142db95f63ba88ee92de28f846f3a7ccd605eea0da73da24ed0b7b4f0a06fb48697ea6064ccc28dda225ecd01843386085629b6b5465b09df66722bce
 DIST lfe-1.1.1.zip 386864 BLAKE2B d966e483c0490d7c6e48ae53819a0f1f30ea0edd7dcc6c7c3fe82c79ed0e4013d66dde4e74d4369e72fc46076723612f00ccb8d33d912d46dfdbf8e38940f72b SHA512 8660716a73126615bd0cde161a780cc49ba57718afd820dbe891da5e1d9ec2f52cc1864159dcedba1c674ccfef42b9662ec8e0bbfe82c10798527ae0979b8f8e
-EBUILD lfe-0.10.1.ebuild 754 BLAKE2B 90aac540ca4b644e3478e733bc6aae9145b8d7a013e53de059af8d200b1700c6d2227cf88214e75c5c4434087d3afc42a1f621072a684230cf28a1409e1e06b0 SHA512 977c9a701d8b36467684803cbbe13c3fb5997dea92c5de7e432da52af43e6fcf6cfb755ef61f5e5991ea9d4e3668ad7d1af2f114997658f231ce375c043c1340
-EBUILD lfe-0.7.ebuild 647 BLAKE2B c1795a6dd1c21c4d3b5b5dad8ea4c3036f771e56f1e12a17c3a42cd265686b4b6a8f950f8f69c75db714e30e91b9cec4563cf58b5d130d2c65b2f521826b1e48 SHA512 4c55bd5dbea59bd98e544b89f10ac3676ce6d95b088a45b845e59d4487900f780adf8805e4e57c7322297337d4fb7f2fc454bd7b7e1f76caa99868067f1393de
-EBUILD lfe-1.0.ebuild 754 BLAKE2B da0fd9924571e0cc62f2ee927eb26373eaec47ae1f5305930f2ba073287c19931de5839845bdba3e07ea7ab22030451425882a2bbc40aac7cfc97d4065d562d4 SHA512 77a131455692ceefb6310ace009525eeac0469f8105b16885e1a7a6bb8af2386104391774d44ce23d2d6ee9aa6635a882a1fe9ceaecc00da4ee312e3061e3741
 EBUILD lfe-1.1.1.ebuild 754 BLAKE2B da0fd9924571e0cc62f2ee927eb26373eaec47ae1f5305930f2ba073287c19931de5839845bdba3e07ea7ab22030451425882a2bbc40aac7cfc97d4065d562d4 SHA512 77a131455692ceefb6310ace009525eeac0469f8105b16885e1a7a6bb8af2386104391774d44ce23d2d6ee9aa6635a882a1fe9ceaecc00da4ee312e3061e3741
 MISC metadata.xml 334 BLAKE2B 796f5cf618b8a2de81896af38e068a8c26e4681e4034214c713c5b1b450e119f76a1961b1a5097d81a8aeee446b0ffce124908757e59812ab2db0a93f1d8aefc SHA512 ef130013e56ca5d9df4312b106383b5d3d8d889f767ea24125e1a9ab11f555cab661c73ad190c7c0b4d7afd10a1e6d3569282233b4da4a76c7fbf1fc6052c8be
diff --git a/dev-lang/lfe/lfe-0.10.1.ebuild b/dev-lang/lfe/lfe-0.10.1.ebuild
deleted file mode 100644
index f4254db02323..000000000000
--- a/dev-lang/lfe/lfe-0.10.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Lisp-flavoured Erlang"
-HOMEPAGE="http://lfe.github.io/"
-SRC_URI="https://github.com/rvirding/lfe/archive/v${PV}.zip -> ${P}.zip"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/erlang"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	export PATH="${S}/bin:$PATH"
-}
-
-src_compile() {
-	emake compile -j1
-}
-
-src_install() {
-	dobin bin/lfe
-	dobin bin/lfec
-	dobin bin/lfescript
-	dodir /usr/$(get_libdir)/erlang/lib/lfe/ebin/
-	dodir /usr/$(get_libdir)/erlang/lib/lfe/emacs/
-	cp -R "${S}/ebin" "${D}/usr/$(get_libdir)/erlang/lib/lfe/"
-	cp -R "${S}/emacs" "${D}/usr/$(get_libdir)/erlang/lib/lfe/"
-}
diff --git a/dev-lang/lfe/lfe-0.7.ebuild b/dev-lang/lfe/lfe-0.7.ebuild
deleted file mode 100644
index 6982d4eefd2d..000000000000
--- a/dev-lang/lfe/lfe-0.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Lisp-flavoured Erlang"
-HOMEPAGE="http://lfe.github.io/"
-SRC_URI="https://github.com/rvirding/lfe/archive/v0.7a.zip -> ${P}a.zip"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/erlang"
-DEPEND="${RDEPEND}"
-
-#eh?
-S=${WORKDIR}/${P}a
-
-src_prepare() {
-	sed -i -e 's/cp -pPR $(INCDIR) $(INSTALLDIR); \\/echo " "; \\/' Makefile || die
-}
-
-src_install() {
-	ERL_LIBS="${D}/usr/$(get_libdir)/erlang/lib/" make install DESTDIR="${D}"
-	mkdir -p "${D}"/usr/bin
-	cp lfe "${D}"/usr/bin
-}
diff --git a/dev-lang/lfe/lfe-1.0.ebuild b/dev-lang/lfe/lfe-1.0.ebuild
deleted file mode 100644
index bfb8337090ea..000000000000
--- a/dev-lang/lfe/lfe-1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Lisp-flavoured Erlang"
-HOMEPAGE="http://lfe.github.io/"
-SRC_URI="https://github.com/rvirding/lfe/archive/v${PV}.zip -> ${P}.zip"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/erlang"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	export PATH="${S}/bin:$PATH"
-}
-
-src_compile() {
-	emake compile -j1
-}
-
-src_install() {
-	dobin bin/lfe
-	dobin bin/lfec
-	dobin bin/lfescript
-	dodir /usr/$(get_libdir)/erlang/lib/lfe/ebin/
-	dodir /usr/$(get_libdir)/erlang/lib/lfe/emacs/
-	cp -R "${S}/ebin" "${D}/usr/$(get_libdir)/erlang/lib/lfe/"
-	cp -R "${S}/emacs" "${D}/usr/$(get_libdir)/erlang/lib/lfe/"
-}
diff --git a/dev-lang/nwcc/Manifest b/dev-lang/nwcc/Manifest
index dc5d02cbab7d..1ade6ce1a0e4 100644
--- a/dev-lang/nwcc/Manifest
+++ b/dev-lang/nwcc/Manifest
@@ -1,5 +1,3 @@
-DIST nwcc_0.8.2.tar.gz 948656 BLAKE2B d7736f538009b2941bfbb7278b2905225a88d402d2c640568ab2d777572d2b5790383f9e629f0880cd509915ea1005b54d5a1d99a153b482c34904d8f58fa597 SHA512 b399baf16a41ae3782343521fc65b8e94bf76dc0a29719a3addc33881bd0d9dd68170f0e7eb2c79aaafa3ced254fac15847883a38d4a5956280fa5fed10d24e0
 DIST nwcc_0.8.3.tar.gz 954946 BLAKE2B 260ed49d247b7b84e392525db2b61e84a439eab2d0aad2efb93ddef1adf620084a8ec44713bd75216c2f9db30c04715b74d208d45465b700556bda2df6c6fd29 SHA512 f6af50bd18e13070b512bfac6659f49d10d3ad65ea2c4c5ca3f199c8b87540ec145c7dbbe97272f48903ca1c8afaf58c146ec763c851da0b352d5980746f94f6
-EBUILD nwcc-0.8.2.ebuild 519 BLAKE2B febc03cb4d7757210d1a6dd271a104c8209c6e46e58a11ee01b18be48d6541c99895dc27b59664407e1c1606fdd73f1f5031820855e45a586246e3e8876080d3 SHA512 05d71f5d22bbe575e71dc79dd2645acc6adea014528522a5eedd13c89d1518d7be985cdf62fd9d43b087618658b840cfc228e2e3cc4e49259f5e623e76a0fd9e
 EBUILD nwcc-0.8.3.ebuild 519 BLAKE2B b643d368b57894910b5f69a3f7a6e621774b03950433c2b20cf1e4161b293e670772f7ddf5e6b044a4778f92dca7269289c2a51c8db52186ce6a3f044a4470e8 SHA512 7679de83f3a7ab1b639f4e9df2a33d4d99e9c3b3302c4dc477188c246c694f62e66144442971d49a84cfa47fcb2bb416f39a611255ad4805f4626cadda9952ff
 MISC metadata.xml 321 BLAKE2B 2b3e32e0d994ba4483692d7da5a9a61edea07bb2825965cfed717d68351d896bfbeafe0142745a2c235667e605c52e1ae9c8d168e9f2d2414407a9153b33f7bf SHA512 ceb01fe0e057df4185588d4700fec480de1f44de27effe07ae1cd4a414667a6da2bf4586f17afa5601ecb6083d43753664b0a08fd4354a65a0ce55a23b620123
diff --git a/dev-lang/nwcc/nwcc-0.8.2.ebuild b/dev-lang/nwcc/nwcc-0.8.2.ebuild
deleted file mode 100644
index 10d2f3f3d7db..000000000000
--- a/dev-lang/nwcc/nwcc-0.8.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="Nils Weller's C Compiler"
-HOMEPAGE="http://nwcc.sourceforge.net/index.html"
-SRC_URI="http://downloads.sourceforge.net/project/${PN}/${PN}/nwcc%200.8.2/${MY_P}.tar.gz"
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# custom hackery hack
-	ABI="" ./configure --installprefix=/usr || die
-}
diff --git a/dev-lang/parrot/Manifest b/dev-lang/parrot/Manifest
index 29e0e77e96a4..6b1c50045061 100644
--- a/dev-lang/parrot/Manifest
+++ b/dev-lang/parrot/Manifest
@@ -1,10 +1,3 @@
-DIST parrot-7.1.0.tar.gz 4688341 BLAKE2B 1b1f894d0a54a11044ae8069d6f79509f2a0c6c6f66051e0f3fdc9ad8f3177cfde0947965b1586e8dd13cc26047c8987b11030aa8156e6324be2ce061f5fa90d SHA512 b7d261e82934aa84b3d93b2e68b3eb0f13dea684665ca2448a0e2139aa6676c1ff2da1a8056332a7f2538bee6158953be5bceed0ac8a9b277827ec7bcba46cb8
-DIST parrot-7.11.0.tar.gz 4703987 BLAKE2B d832ce0225af6d86877ab775a773971484d1c17c6c517310536b10df05cbf30cba909439e59dda1a14d8688fe3bf0318ea5dc84a552dd3b3e7129ce0b2eb4f9b SHA512 6f321a7d92b43413bc8cf2d2a03378e27de49573968471ad833232f90f0b61eae81626a80be94d84a783153c5beca3ba57c31fcc861b8b3c6cd33cd2d433a19a
-DIST parrot-7.5.0.tar.gz 4693149 BLAKE2B d5e88d5dedb3f95348d7b7bfeb1230251a866be5d4ada46ed5b4b80398227b6351566a07fdb6d7f8866bb69e39dde58b8c3ba707fd2737e70839eab0898c1bd0 SHA512 6c009dec6bdb9f419b20f3bb6c103b16018b27b2ed0094f13c957f66d9735cfc126c15f787d4ce577cd0c6492d61264c35c23d50ab29517b65f00df7c4b4d619
 DIST parrot-8.1.0.tar.gz 4700495 BLAKE2B a90cd3c43be2a6812eaf5a5881cfd97e7011b5b82234c5eaf61e54cba923544a2f2c649387afe55d4e710a1e92ff31b1d32454a230fda6005b40778598f1915e SHA512 f5c4ffeb22a8f4949081ba9d98e3129eb067f6f0ed139248ca1d521570ccbada5dfa69ca2e390868a00ed275780552a5cd06eb271ff14ff753bf8375b7c658c2
-EBUILD parrot-7.1.0-r1.ebuild 2285 BLAKE2B 5a8f77c15036fb9e66ade6ac606ddc62ac4acd4dafb5c9562768a9c9f72c62a0d3748667334b89bf962da3a04c0033e8cd81bb6b27236032addcdb33ca127c97 SHA512 78b68df2f7a3b5772e0d7610825dc5daf2cb9210abdf5da5bbf51a2ee9826f346b2ef43b7fbf61c23ae6357424bbfdd36b4c187448eee925a55c78147c011e8a
-EBUILD parrot-7.11.0-r1.ebuild 2286 BLAKE2B b3d245a4736f5ad225d2ce3fdfe20a90dcff81b65e2ba62945ab11fc551747b6623a4cce1ecb76607e1f2b129963ef6cffe41b223f14a564f43edf6130c32692 SHA512 b46a250f6fa6f684583386002f313b95097c0ac40a326822f340b331c6526747b924b57bb7043fa9c2c7bad28916e602d1ee8e9a8c5fd76ddeb69ccefbbaffbe
-EBUILD parrot-7.5.0-r1.ebuild 2286 BLAKE2B b3d245a4736f5ad225d2ce3fdfe20a90dcff81b65e2ba62945ab11fc551747b6623a4cce1ecb76607e1f2b129963ef6cffe41b223f14a564f43edf6130c32692 SHA512 b46a250f6fa6f684583386002f313b95097c0ac40a326822f340b331c6526747b924b57bb7043fa9c2c7bad28916e602d1ee8e9a8c5fd76ddeb69ccefbbaffbe
-EBUILD parrot-8.1.0-r1.ebuild 2306 BLAKE2B b5e6d9ce521ce294deff577ed109ed437bdcd73b0f7347ddcefdef50dad0829184845022aeaa2332527cfb80efa457ff6ee96b02e0dd00662925000f569516ec SHA512 5b8ea388b28cda1ffdf729b63f55645e4ae2e945920fbb0dcf890e99304395fa689deceeace270c9104c0973166a883000b168b2b41e41ba77b1649fdaa307d5
 EBUILD parrot-8.1.0-r2.ebuild 2509 BLAKE2B 15e333e37e9219ec6184d57cd70378a1efa2d27ba36671da66b7c6419ef72728df8c3a0b9dd4c476a33f0879b59bfa27d5dbf44b486ecf47ce05b68d18d9daeb SHA512 537cd929ac3a8238efd60b35acbbd30eb287d31f3c50de27a85f8fc7f73a1d02155c6445413d108fd94540212765bf83daae4d82eaac69a62a6b511ae4113c53
 MISC metadata.xml 247 BLAKE2B d94a568c950df425b54d5f8ce29c206c221f01e64654597f2d4a0f7bc86ea508797045e3fb6eb14bb8a2aadec08995d877434d85dc9e622fc6207d2df28b23c2 SHA512 9bd9ddeb07e0644027c9a1dca33f0704de6062bc6b17333adde82a177991f35265f90e1b623e3a6288fedd729597921f48e4fda17fb8d402b1b2f3fc73c6d693
diff --git a/dev-lang/parrot/parrot-7.1.0-r1.ebuild b/dev-lang/parrot/parrot-7.1.0-r1.ebuild
deleted file mode 100644
index 4c68d410926e..000000000000
--- a/dev-lang/parrot/parrot-7.1.0-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-# weird failures
-RESTRICT="test"
-
-DESCRIPTION="Virtual machine designed to compile and execute bytecode for dynamic languages"
-HOMEPAGE="http://www.parrot.org/"
-SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre"
-
-RDEPEND="sys-libs/readline:0=
-	dev-libs/libffi
-	opengl? ( media-libs/freeglut )
-	nls? ( sys-devel/gettext )
-	unicode? ( >=dev-libs/icu-2.6:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-	gmp? ( >=dev-libs/gmp-4.1.4:0= )
-	ssl? ( dev-libs/openssl:0= )
-	pcre? ( dev-libs/libpcre )
-	doc? ( dev-perl/JSON )"
-
-DEPEND="dev-lang/perl[doc?]
-	${RDEPEND}"
-
-src_configure() {
-	myconf="--disable-rpath"
-	use unicode || myconf+=" --without-icu"
-	use ssl     || myconf+=" --without-crypto"
-	use gdbm    || myconf+=" --without-gdbm"
-	use nls     || myconf+=" --without-gettext"
-	use gmp     || myconf+=" --without-gmp"
-	use opengl  || myconf+=" --without-opengl"
-	use pcre    || myconf+=" --without-pcre"
-
-	perl Configure.pl \
-		--ccflags="${CFLAGS}" \
-		--linkflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--sysconfdir="${EPREFIX}"/etc \
-		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
-		$myconf || die
-}
-
-src_compile() {
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
-	# occasionally dies in parallel make
-	emake -j1
-	if use doc ; then
-		emake -j1 html
-	fi
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-	dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO
-	dosym parrot-ops2c /usr/bin/ops2c
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/*
-	fi
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/editor"
-		doins -r editor
-		cd docs/html
-		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
-			pmc.html tools.html docs src tools || die
-	fi
-}
diff --git a/dev-lang/parrot/parrot-7.11.0-r1.ebuild b/dev-lang/parrot/parrot-7.11.0-r1.ebuild
deleted file mode 100644
index fe5c23fecbf8..000000000000
--- a/dev-lang/parrot/parrot-7.11.0-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-# weird failures
-RESTRICT="test"
-
-DESCRIPTION="Virtual machine designed to compile and execute bytecode for dynamic languages"
-HOMEPAGE="http://www.parrot.org/"
-SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="opengl nls doc examples gdbm +gmp ssl +unicode pcre"
-
-RDEPEND="sys-libs/readline:0=
-	dev-libs/libffi
-	opengl? ( media-libs/freeglut )
-	nls? ( sys-devel/gettext )
-	unicode? ( >=dev-libs/icu-2.6:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-	gmp? ( >=dev-libs/gmp-4.1.4:0= )
-	ssl? ( dev-libs/openssl:0= )
-	pcre? ( dev-libs/libpcre )
-	doc? ( dev-perl/JSON )"
-
-DEPEND="dev-lang/perl[doc?]
-	${RDEPEND}"
-
-src_configure() {
-	myconf="--disable-rpath"
-	use unicode || myconf+=" --without-icu"
-	use ssl     || myconf+=" --without-crypto"
-	use gdbm    || myconf+=" --without-gdbm"
-	use nls     || myconf+=" --without-gettext"
-	use gmp     || myconf+=" --without-gmp"
-	use opengl  || myconf+=" --without-opengl"
-	use pcre    || myconf+=" --without-pcre"
-
-	perl Configure.pl \
-		--ccflags="${CFLAGS}" \
-		--linkflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--sysconfdir="${EPREFIX}"/etc \
-		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
-		$myconf || die
-}
-
-src_compile() {
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
-	# occasionally dies in parallel make
-	emake -j1
-	if use doc ; then
-		emake -j1 html
-	fi
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-	dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO
-	dosym parrot-ops2c /usr/bin/ops2c
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/*
-	fi
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/editor"
-		doins -r editor
-		cd docs/html
-		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
-			pmc.html tools.html docs src tools || die
-	fi
-}
diff --git a/dev-lang/parrot/parrot-7.5.0-r1.ebuild b/dev-lang/parrot/parrot-7.5.0-r1.ebuild
deleted file mode 100644
index fe5c23fecbf8..000000000000
--- a/dev-lang/parrot/parrot-7.5.0-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-# weird failures
-RESTRICT="test"
-
-DESCRIPTION="Virtual machine designed to compile and execute bytecode for dynamic languages"
-HOMEPAGE="http://www.parrot.org/"
-SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="opengl nls doc examples gdbm +gmp ssl +unicode pcre"
-
-RDEPEND="sys-libs/readline:0=
-	dev-libs/libffi
-	opengl? ( media-libs/freeglut )
-	nls? ( sys-devel/gettext )
-	unicode? ( >=dev-libs/icu-2.6:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-	gmp? ( >=dev-libs/gmp-4.1.4:0= )
-	ssl? ( dev-libs/openssl:0= )
-	pcre? ( dev-libs/libpcre )
-	doc? ( dev-perl/JSON )"
-
-DEPEND="dev-lang/perl[doc?]
-	${RDEPEND}"
-
-src_configure() {
-	myconf="--disable-rpath"
-	use unicode || myconf+=" --without-icu"
-	use ssl     || myconf+=" --without-crypto"
-	use gdbm    || myconf+=" --without-gdbm"
-	use nls     || myconf+=" --without-gettext"
-	use gmp     || myconf+=" --without-gmp"
-	use opengl  || myconf+=" --without-opengl"
-	use pcre    || myconf+=" --without-pcre"
-
-	perl Configure.pl \
-		--ccflags="${CFLAGS}" \
-		--linkflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--sysconfdir="${EPREFIX}"/etc \
-		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
-		$myconf || die
-}
-
-src_compile() {
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
-	# occasionally dies in parallel make
-	emake -j1
-	if use doc ; then
-		emake -j1 html
-	fi
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-	dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO
-	dosym parrot-ops2c /usr/bin/ops2c
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/*
-	fi
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/editor"
-		doins -r editor
-		cd docs/html
-		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
-			pmc.html tools.html docs src tools || die
-	fi
-}
diff --git a/dev-lang/parrot/parrot-8.1.0-r1.ebuild b/dev-lang/parrot/parrot-8.1.0-r1.ebuild
deleted file mode 100644
index 741003d7549c..000000000000
--- a/dev-lang/parrot/parrot-8.1.0-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-# weird failures
-RESTRICT="test"
-
-DESCRIPTION="Virtual machine designed to compile and execute bytecode for dynamic languages"
-HOMEPAGE="http://www.parrot.org/"
-SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="opengl nls doc examples gdbm +gmp ssl +unicode pcre"
-
-RDEPEND="sys-libs/readline:0=
-	dev-libs/libffi
-	net-libs/libnsl:0=
-	opengl? ( media-libs/freeglut )
-	nls? ( sys-devel/gettext )
-	unicode? ( >=dev-libs/icu-2.6:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-	gmp? ( >=dev-libs/gmp-4.1.4:0= )
-	ssl? ( dev-libs/openssl:0= )
-	pcre? ( dev-libs/libpcre )
-	doc? ( dev-perl/JSON )"
-
-DEPEND="dev-lang/perl[doc?]
-	${RDEPEND}"
-
-src_configure() {
-	myconf="--disable-rpath"
-	use unicode || myconf+=" --without-icu"
-	use ssl     || myconf+=" --without-crypto"
-	use gdbm    || myconf+=" --without-gdbm"
-	use nls     || myconf+=" --without-gettext"
-	use gmp     || myconf+=" --without-gmp"
-	use opengl  || myconf+=" --without-opengl"
-	use pcre    || myconf+=" --without-pcre"
-
-	perl Configure.pl \
-		--ccflags="${CFLAGS}" \
-		--linkflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--sysconfdir="${EPREFIX}"/etc \
-		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
-		$myconf || die
-}
-
-src_compile() {
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
-	# occasionally dies in parallel make
-	emake -j1
-	if use doc ; then
-		emake -j1 html
-	fi
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-	dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO
-	dosym parrot-ops2c /usr/bin/ops2c
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/*
-	fi
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/editor"
-		doins -r editor
-		cd docs/html
-		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
-			pmc.html tools.html docs src tools || die
-	fi
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 11a104d4d272..7c7f5b5bf673 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 7c9944170a6a..cfbdd6513ee3 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -3,5 +3,5 @@ DIST Botan-2.16.0.tar.xz 5938644 BLAKE2B a4b7bb48aee0dbf0f8b81a407b6a39707c3e604
 DIST Botan-2.17.2.tar.xz 5940964 BLAKE2B 009df11c9d4379a15a48697554a82df3baffad0fff98af995f9a5b9b3223e4db42837650d41b7081170b07fb70d62ab347c5577ef2480a8f7011b40e1cf1764d SHA512 fa9bd30d02540c4544646971c7b82d3873f32362668d2496b4bc1a92f47d52f75ec9533d5848a7d8e9b9077c7ae2866b55d70d39101c705eec0edf9dbf01d6cf
 EBUILD botan-2.15.0.ebuild 3091 BLAKE2B 2da5cfb879e65537227b0a6d524c30f7ec186a41a3e71797c4a57dd3b85013c10ddb60d8f5ddcadc02418978292be393d71b8fd2bd8521f13578c0234964768d SHA512 6f1bf731cb1a704cf6e40d5bd7fe36ebeb7a3690303f10dde754ffcb3eb0ab47dd2ca04df8d114662df5e35a55cd2292f5d061463d707c38052d3db6e6ecb1ec
 EBUILD botan-2.16.0.ebuild 3089 BLAKE2B b75fc14404acbcc0d1e88278e47283ba0655c318c393deea9b4d26020e7ff45e892beb26d2fee90aec797c34a8c4caa4ca46acd920d434c3f7c89ad3476c6ea3 SHA512 5a8813e00f96d2201dea7bf5c1d10043180a59cca1217b7cdf291c65c1529069e38451b30569c4727af6e548ccdc103c2617d6e6275d703d0ad5835172383730
-EBUILD botan-2.17.2.ebuild 3094 BLAKE2B 155d33762a02cb0737058a8985d17da9428fb521d1f82b66469457475efb94915a45beffbd3f76eb8fbf074ed9ce70e9663eae7f462dd89739e59d8d64566680 SHA512 8569fa59f78203c877a0ac4dfb46e7af807348df2f6ad91b433df32d33e4c76d0fd0e1f50b61a6641bffde39269ed0d7fd0afd4bc64a51084ca86b63060f1f86
+EBUILD botan-2.17.2.ebuild 3096 BLAKE2B 1708642bd29b845938675e193b4dbad68b72395116a10ae4eb918c7bda1a693e9659aa11ff46593ddf8ced6c077e98c454e5a0d6ac16f77bc7f4bb685348a0dc SHA512 27d13a9582cbb9b0a923419bfd4b5eabe4126d18bf0c3b226443278aa9e7c742cf409b002e581636e1dbe6437bd5a018dd7829160fe818b220f8fc46c6247989
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.17.2.ebuild b/dev-libs/botan/botan-2.17.2.ebuild
index 17cef74104b9..c15f5000f25c 100644
--- a/dev-libs/botan/botan-2.17.2.ebuild
+++ b/dev-libs/botan/botan-2.17.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit python-r1 toolchain-funcs
 
diff --git a/dev-libs/capnproto/Manifest b/dev-libs/capnproto/Manifest
index f06b7fc493e0..8e210a8e7335 100644
--- a/dev-libs/capnproto/Manifest
+++ b/dev-libs/capnproto/Manifest
@@ -1,9 +1,5 @@
-DIST capnproto-0.6.0.tar.gz 1199198 BLAKE2B 90db934f8fd2affeef8908a9f8aa955892c8d25d556a76003f7d2e8e5634ea76e3759ace94b3bff42235e6da666e97657f69327ecdf620067e13ad2dde2a8105 SHA512 4882b2e5d1544517348e436600705d18b41fc82e6fc141a934ad960556ed73781c974d4a45f8c949a297edd5c95fb156fd75f1d7179666dc7ab881f98ac9e69d
-DIST capnproto-0.6.1.tar.gz 1720489 BLAKE2B 5fad902bb4221fa872bd52311442a4073c4e58e3d21726f24e06430246f1d757bc4d4e7e122df0a7cd9401ff2c47cb48d1791bb0b7ceda8889a819ac52edc02b SHA512 baea7f867bb789d3bf8cdc9c1a4a0d31cdce3beb7ae1fd9464690a006a86eca841aaac5d86599c2a84a39d62c4d01213b29789c2b7385ad6636fef95fc867dd6
 DIST capnproto-0.7.0.tar.gz 1983172 BLAKE2B d88b5f8e3278f8e3aceccdc459001b99328b0440812352dcb6b54bd11e18aa7fee6d337252841c86e9c3eb1afcdbd99884c965156d6cec37e3c0996c9ec1241f SHA512 a3ea278ded6a866759c0517d16b99bd38ffea1c163ce63a3604b752d8bdaafbc38a600de94afe12db35e7f7f06e29cc94c911dc2e0ecec6fe1185452df2a2bd3
 DIST capnproto-0.8.0.tar.gz 2121249 BLAKE2B 6d4ef9adb026a8ea8bc558bed1f8ce910e9c3b050ad0ac7ebd4be323cc1709a6b08956d4d2f39daee5c6485438f64695a028ea198aaae8a6c366316f10b1a64f SHA512 a3b87d47f4c160c3c72304539c3d2a6836488a50d1014c9f0eb95c112dc1e0f85b3158d26c248eff464205388ea61733c45ba10dc5441e5dd04064ba2c7970e6
-EBUILD capnproto-0.6.0.ebuild 815 BLAKE2B c568f71f4e6be421b7cc1c2c0cf5746c53f1ec0974efe46533441840ba0972b2431e42a65d3d78e49bc6dd3c7e19fa81fbda7b992855eb35460e0659134fa947 SHA512 65b75863b45e512e9dd073e55b3dd4ca8d1b8d2285df8d9d7f7f7cdafec970497ae00b78e2f72a359679db821a766e0dda4056c6fcf6184f8e1107887877da10
-EBUILD capnproto-0.6.1.ebuild 815 BLAKE2B e05f98460b1d6f3cfdf5cc046c555756e579f41ba887b42942230c7e185c0269f43bd9dc0ce10ee34b5c46c1d7999f78b5805523efb61560fea2c8837dccf68c SHA512 1b53b7a5505fdffb6ace4b7075f1abf8cfa3f67c0bf8fa532bfddcbcab7420208cfeb637e36e163a641114a68663f8cde39cc43bd9348af95e9b6cd058031c8f
 EBUILD capnproto-0.7.0.ebuild 894 BLAKE2B 64ad5fe9cf2e65bfefe4e3060ea938e1b7e3d446a9757c4d8fb32622765c7e1ea9ec2b291491de7ba8180c4ce944291cf6b77ef32e1c9f641a67d6f593b9f30f SHA512 1fbddd46b4ad600802041181414d73100b5c75965254993a2bdb840718b9e6f0c1ababae50744e185f42597bf43766941cf5c9ae40eda7d61e45eb52c4550679
 EBUILD capnproto-0.8.0.ebuild 1017 BLAKE2B f5e100336fe454b558167748b3d9a3414119e3a2d832214f61e0f8b16773c95c4722e2c7b72a0707d0ce67f4eeab202225ab65c83fd227a719033ebd713af40a SHA512 0932f147cf4fc23d8d7bbc44038b2e5f36bac217a9ae009a99f3c1afd97ff68e22889d96533a194fc8bd258682ab38cf21d66bf694376b762727bdc3dbd92ad1
 MISC metadata.xml 346 BLAKE2B eab1f05d43ea625945b539ea49039ac08905f9b4e0d6b85ace2c1c31cc7aa6719b15697e75d472afb2900e3810c19c091fee57f900f8688cc3586d713ec4206f SHA512 c3c8f965d691c76d1f31fd9d8edcb1c623eac59b81caf4bbd51a184a6b7f8c74b1c1459c15957341700fe443c18946fbaac0a28b46976fa23cd55c9e57a03879
diff --git a/dev-libs/capnproto/capnproto-0.6.0.ebuild b/dev-libs/capnproto/capnproto-0.6.0.ebuild
deleted file mode 100644
index 367234c1aaa8..000000000000
--- a/dev-libs/capnproto/capnproto-0.6.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="RPC/Serialization system with capabilities support"
-HOMEPAGE="https://capnproto.org"
-SRC_URI="https://github.com/sandstorm-io/capnproto/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/060"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="test? ( dev-cpp/gtest )"
-
-S=${WORKDIR}/${P}/c++
-
-src_prepare() {
-	sed -e 's/ldconfig/true/' -i Makefile.am || die
-	sed -e 's#gtest/lib/libgtest.la gtest/lib/libgtest_main.la#-lgtest -lgtest_main#' -i Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/dev-libs/capnproto/capnproto-0.6.1.ebuild b/dev-libs/capnproto/capnproto-0.6.1.ebuild
deleted file mode 100644
index de5d76054bfc..000000000000
--- a/dev-libs/capnproto/capnproto-0.6.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="RPC/Serialization system with capabilities support"
-HOMEPAGE="https://capnproto.org"
-SRC_URI="https://github.com/sandstorm-io/capnproto/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/061"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="test? ( dev-cpp/gtest )"
-
-S=${WORKDIR}/${P}/c++
-
-src_prepare() {
-	sed -e 's/ldconfig/true/' -i Makefile.am || die
-	sed -e 's#gtest/lib/libgtest.la gtest/lib/libgtest_main.la#-lgtest -lgtest_main#' -i Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/dev-libs/concurrencykit/Manifest b/dev-libs/concurrencykit/Manifest
index d000a6740974..e1a2f54c17c7 100644
--- a/dev-libs/concurrencykit/Manifest
+++ b/dev-libs/concurrencykit/Manifest
@@ -2,6 +2,7 @@ AUX concurrencykit-0.7.0-ar.patch 3293 BLAKE2B a5e67853a4d6c08f8f0d93d528bd93688
 AUX concurrencykit-0.7.0-glibc-2.30.patch 1609 BLAKE2B 1aa8eb4d29ed2ecb52b1fa942eead2e88a97979c331f2227d05b578505df35d9f9549798ebc401632bc29572f0c12351e2b4485471767b70dd3eadcb2ff010ea SHA512 fe6e25a67025c5f4ef9affbd32cb4fe0c29879af866c2b621be004fbbd3ff8b203f7655aca8943bb8303a318aecd387352256b121eab68487fac0a135ad82903
 AUX concurrencykit-0.7.0-gzip.patch 1553 BLAKE2B 8a164f19cdeab56fd9a1099c312bc04209e24e2bc1798da5e56c6c4414b327801f73e6c222e665bf8299c8620a12ebcf73bbf6839075274cdcb759261b79fe35 SHA512 bef714a6d22ee6ae5a8e70befcfc92a254fbd724646832043dce03ce1b4f922fc8c6bf91d9b37433b8849afc5e276ea5d7510fcff6fdd0e20aa650414766ce02
 AUX concurrencykit-0.7.0-static-libs.patch 3170 BLAKE2B 8884eb8cfffdc5bdf864ec29495e8a209befdd8c7318e49bbee15821c42c7a18b0ed8d52ee07b72974318f57785a7867bd47461a44e535102bfc03c650e85af1 SHA512 52ac965f0876cca54a60ea05e1bcee9a72534368646594b55ced604f425e505bdf39b836c3a19fc5fca49a6838866e0fef4c192ff073bdb864f113e41ba87cc4
+AUX concurrencykit-0.7.0-tests.patch 1104 BLAKE2B f85dc6544d31e39ba9cbcbdfc8bd810763dbed231c23683700743fca4e4d80f88f0129c835bf93aabe71d9f2b63a33923a8516d51fc582638e09e6093b9c94d4 SHA512 1dee5e646e02c84c5ec823c600a2e18270288bc066f67b63b7da38126d43fc8cb92c8d466bf8a160e4689513d021c587d9d607e9828dcb6446c5f7df01602663
 DIST concurrencykit-0.7.0.tar.gz 245574 BLAKE2B 14c386eb35c76297933d2935cdfc1cb0d21071d4fe1784eeb27595c2e75a8edc5add349df6795d03372b30711cda4deeb7957bdcfd7e62ba89b254fb41ba6a55 SHA512 509fe5bc1575a6fd646d30fbcd74204ba4683092f154dc1fb55ed6fc17e734e17759bacfc3f42344db4c243ca6b239f7d207cf2ebc609e2a37d7ddfd1bdcc3a1
-EBUILD concurrencykit-0.7.0-r1.ebuild 866 BLAKE2B 58555f7d90f850792dbcef3933cb822b003ba2af724bff6cc0496d2391ccb1fb3127a13f814007f4fea1537875c75776f09355d570d017d7ac55b08f1430e692 SHA512 371c423b9bda8a0aeb793c160f5e4041d4591131dbe2f710f89d64bbc43b5ff089353c84209cd4229278a97f1a0d9e51f809c52036ce97096da8cc7424824d95
+EBUILD concurrencykit-0.7.0-r1.ebuild 898 BLAKE2B 6f441e3dbb4d980e26d7aeef3b01411af1e08cd22cc0dedea756ce1ef400aadd580e1d3c2584a7d0fd4535c5aaae115ffc54452819baa84977fa7534e1b2dbfb SHA512 e68e545f173474ee985ee611861c7415775bc3abd391fc75c6befdaa747075cc5edeaf58fb60de98a07eaae2cba51423b9576e69b9ce7b634a88d2cff33262db
 MISC metadata.xml 332 BLAKE2B 49342ad7a1d20ae0e15f6c3860f7902155b40d5a840a696d3fbd19257c956052775ad3d21da63aee00e2f4d80ebb30653623726a55107df3bb0b90a84a3f5bfb SHA512 894530344acb0eacd5604efe8eb521d83c1eb98274f878832ea38bf39afcfcea1b72e44c37d05e7dadb8a2a38f972e24cbad43d3d23711090bd57f4617c02712
diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild
index 52fdc2f36338..e3b8d4182451 100644
--- a/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild
+++ b/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild
@@ -26,6 +26,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-glibc-2.30.patch"
 	"${FILESDIR}/${P}-gzip.patch"
 	"${FILESDIR}/${P}-static-libs.patch"
+	"${FILESDIR}/${P}-tests.patch"
 )
 
 src_configure() {
diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-tests.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-tests.patch
new file mode 100644
index 000000000000..4d29c6bcf7eb
--- /dev/null
+++ b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-tests.patch
@@ -0,0 +1,33 @@
+From 07835a3d08d96db30393c235f95649e792883d50 Mon Sep 17 00:00:00 2001
+From: Samy Al Bahra <sbahra@backtrace.io>
+Date: Mon, 30 Nov 2020 18:33:51 -0500
+Subject: [PATCH] regressions/ck_hp_fifo: fixes false-positive from #165.
+
+Add busy-wait barrier before next stage of test. Otherwise,
+some threads may enter it and a non-empty queue state is observed.
+---
+ regressions/ck_hp/validate/ck_hp_fifo.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/regressions/ck_hp/validate/ck_hp_fifo.c b/regressions/ck_hp/validate/ck_hp_fifo.c
+index 4454283c..5820f1aa 100644
+--- a/regressions/ck_hp/validate/ck_hp_fifo.c
++++ b/regressions/ck_hp/validate/ck_hp_fifo.c
+@@ -55,6 +55,7 @@ static struct affinity a;
+ static int size;
+ static unsigned int barrier;
+ static unsigned int e_barrier;
++static unsigned int s_barrier;
+ 
+ static void *
+ test(void *c)
+@@ -98,6 +99,9 @@ test(void *c)
+ 		}
+ 	}
+ 
++	ck_pr_inc_uint(&s_barrier);
++	while (ck_pr_load_uint(&s_barrier) < (unsigned int)nthr);
++
+ 	for (i = 0; i < ITERATIONS; i++) {
+ 		for (j = 0; j < size; j++) {
+ 			fifo_entry = malloc(sizeof(ck_hp_fifo_entry_t));
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 80251ff1ed4a..9e09f41ff7b8 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,4 +1,4 @@
 DIST efl-1.25.1.tar.xz 72306872 BLAKE2B 060d729380ba62677307c5346da1786e879c14c4e40f0a3288c8cb81ece08f4ac501d989495b1c3dcbfeb19a86d23130892ae874861de5684c867aef60cb07d6 SHA512 cd281c2299aa6f74f0204e59a13dc254135e6dc40641e0a437c6f5025efe517d415f0915f69e123123319a9bbddb748aec1948ed0b5eb386e028cf45b244bed8
-EBUILD efl-1.25.1-r10.ebuild 7780 BLAKE2B c9c7f76edfd5ff18cf3cee80e06c9f8031038dfb0907f19f0cd25459a280bab6a5134160ba63c0b5020dc0b7a5abc6f0df358ea0255b9a4028e4be98ff985662 SHA512 345af1650198beebf12f7fa73655d20f70bcb2a67ca0b668eee7ceb52dbbb9c24237868922f24cce2867ed5b9639ff0d0139eb12916e5064e6bd2818df7db95b
+EBUILD efl-1.25.1-r10.ebuild 7792 BLAKE2B 32c148c102a4898a1d05e3591f18ce2b9c444683acecbfbdc93f83f0cbefbe3d2886f3046c05ccf24272c0987929907ddd6678c91681286ed49cf376faef959b SHA512 fa89fe6a67979ceb42de07dfd698c690064875a1a0908d6051af9eb565a6ad012c4d29567d616f53f69557730940523f69f34ba6f0211f4b642199645f926f7a
 EBUILD efl-1.25.1-r2.ebuild 7749 BLAKE2B 897961b06badff816a08a64d93f2ab9acfd548ca1bf812324f569cf64b55607cbff55702c57bd8b35dc5ca2086bcf5c64b3fc2ce01339510d8cc69ff727986a9 SHA512 9b6c8106e6027c46b3efc78a43c54bb49a9d785b6b87fe420aeaac8a467b0eabb9e6389d52bf93ab650ce8ead0f7e79a305a298d15383af49f609b63a2458a3e
 MISC metadata.xml 1985 BLAKE2B 5ad17cbfc665a26357c6b8d473d211663224eca97ed9a22c8575122e331b9661118890db1cf4f41e9e0e9b16f157d48da0920026fc83fdf965e4d1bd7c3d1ede SHA512 dbc127099457c88bcc419bd0c415f801765aeb85f010d7de43ea03e9400a7888c33c80f53048bf4edfd34ff95a43ac506026775a7bf11b041adc89acef0ec15d
diff --git a/dev-libs/efl/efl-1.25.1-r10.ebuild b/dev-libs/efl/efl-1.25.1-r10.ebuild
index 2e25e04128b4..fb4e79629127 100644
--- a/dev-libs/efl/efl-1.25.1-r10.ebuild
+++ b/dev-libs/efl/efl-1.25.1-r10.ebuild
@@ -251,13 +251,13 @@ src_configure() {
 	emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
 
 	local bindingsList="cxx,"
-	use lua_targets_luajit && bindingsList+="lua,"
+	use lua_single_target_luajit && bindingsList+="lua,"
 	use mono && bindingsList+="mono,"
 	[[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
 	emesonargs+=( -D bindings="${bindingsList}" )
 
 	local luaChoice=""
-	if use lua_targets_luajit; then
+	if use lua_single_target_luajit; then
 		luaChoice+="luajit"
 	else
 		luaChoice+="lua"
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index b5936796b7a7..c6351ff04fa1 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,10 +1,14 @@
+AUX ell-0.35-add-missing-include-in-dhcp-server.patch 586 BLAKE2B 487fc9d8079adaff7fcb63a34bdc4f5733474c5e39772a1b37638759372aab4996c650ed63fcc7a3f90717076e2d82d75c88320c153d4bc4f740c31a7beda464 SHA512 fcaa34bcf98f440d3aabc05349c5dbd515117f626dded93fe8a77060cc51c9a70e255fa49100b2fde9812c8d1cfb60f1059946285feb5d9ce84854c722fec482
+AUX ell-0.35-add-rawmemchr-to-missing-h.patch 1195 BLAKE2B 2ab70a003b79f10f755ef3c2fa289d913d31387f49aa4e1b6d5bf9c538229801ed2869f877b91ea277f845c196ed04d8bf23a424f5fa08fe78f53ec2f17160b0 SHA512 f1c3c37930892b421ee5e495b80db5deef0d34f860b3c98543a2e230aaffed57129bdf834a18c82b3c31aeb63f1081a9845f70ed243dcd6457c2da621b1168f3
 DIST ell-0.28.tar.xz 474880 BLAKE2B 2c571f952056c9f4e3e8c245b2b57645c4baa2935fdbe758170dcfe689f4db2162322f25a80cc5a7d4d5bded6159d1fa0d583be979a2708d32e61e91d1ced585 SHA512 6c3aef4d403878c0c9b8a1e5e8861656f2abbab19dd275b1aecca899ca615c00aee30e18f194435ec6be859adcffbe3703a79b13508e1e76c2192ec51f7c0cd7
 DIST ell-0.31.tar.xz 478860 BLAKE2B f8f8d109605bf62396da001bd3d9b48fd6b7a6fc94ab890ab5a56fc8afb07a216b884fdf4b624ac8f39c3196de8149c7b32790da03262400aac6f8cd8b3fb56b SHA512 e304cc3bb1355fc0671412e793530503c83b1a036bfa3dd5b0cc36cfb28684b780293dc3d81a5727e0030743529882f71ac28d3c735860f6d46477e8ccf6a6e8
 DIST ell-0.32.tar.xz 479012 BLAKE2B 909c63f590ba45e5e9aabf0e7c5ce1c44ee5b5235472071ec16c4e160eddfd38dc5383103a684c4d43e325e832965cdade5d8465990ed4c2a2aa44b52d60869b SHA512 13712ac4ff7165b749b8e2dcd5cad4cd8170600c3dca7304eb4068ee916c1187207bc24ffa5d64c9d33253d4a8f56c63b627ad0783d5ca38d78f625211fdc315
 DIST ell-0.33.tar.xz 490180 BLAKE2B fc0f558a54bd57d7866c77ba3fdd97e0f35c33fd7ca79f6209c097824b303e69924ee9eb758af3a1881e8e87ac3ad84bea20767cd824cb8366a080eacac8b4be SHA512 4f0960b757c5cae55bf46a10aabb52280a76eda2a2d55ecc92f2a1321b72e936cab47102995597e985072d032f10379fdfc4f56360e535eeac444dab8b171ded
+DIST ell-0.35.tar.xz 506400 BLAKE2B 694df293ce5fd31581cbdd9c2f6f3806a07a23ffb76cf04d6c13f1eebc8af5228ab030f3f1f6d68e1f234c4f1c55a6a1c41e93c41957c19ffc57255e86a78b26 SHA512 a61fc6e8b16627920a24a4bc271549863042ba27489039311009b7e16fe04bb88debcdcd239603cb471b78674a57851ee5ab8ee16229ebdf77850e0945410179
 EBUILD ell-0.28.ebuild 1054 BLAKE2B bee6d203f5a50ffc797fb3f3f6a673e4d969c9de16e47801acbe88a1d61e1f04f9732ed76d6f0e1ab69cc39750d3e2a6af313a2430c0ae811a7192da282e3963 SHA512 c2660929dd05b053400db9f4fbfc234e6c616a63600a0bd4baccd6ef945cb06f326b1975f20e961bcbd39b5337cb96b1bbc9ab555475826d98f6cbe24e1122a6
 EBUILD ell-0.31.ebuild 1251 BLAKE2B d2dc04fd7b6dfaea9e90589b2afe412cbc3606b44b6ab8616a0496b75024238450f913cfc6df03337d72e7bbd082c906b66d464fd15077184ec848b35518320b SHA512 e994f672aef0bcdfa4331fb854378d5e22d6a38b02b9aeadeb92f93eb5b461032f39817ec5d6c21dd356e321d3004436eed81288b92a2804fd3f4071f5737332
 EBUILD ell-0.32.ebuild 1251 BLAKE2B d2dc04fd7b6dfaea9e90589b2afe412cbc3606b44b6ab8616a0496b75024238450f913cfc6df03337d72e7bbd082c906b66d464fd15077184ec848b35518320b SHA512 e994f672aef0bcdfa4331fb854378d5e22d6a38b02b9aeadeb92f93eb5b461032f39817ec5d6c21dd356e321d3004436eed81288b92a2804fd3f4071f5737332
 EBUILD ell-0.33.ebuild 1252 BLAKE2B f89ab50eba3d1ffc74f4a3c2504cf0ff8bcb25fcef7dcd7545019623f8bf05edc57e348b122751fa80d41af6e2d50c82b657ee806886b834b442b56912bc39e9 SHA512 bb5b32fc5d590979d02b0ebc04ed9fb780da0d6ebe5acfc9e36999ede1aeae099705e624a1af3bfb9a2e34cf6028bf1de81b18fb004964cdbb00aa472b3b31c7
+EBUILD ell-0.35.ebuild 1488 BLAKE2B 36bd71c937e34907e03836aa630445b9b9313b2a7638f1c94252856451061f086b5d80a81ebc5698869192bf8fecaec82d2fddb754243cc07dc3fb2db18465a0 SHA512 bf5d7cab1699994851a18d20077abc7c300ef177dafc268c5de8fa7cfd33d2d97bf64f7f28f2aaea200a13be0a07189f25f16dcd7154e472566839a3166d281d
 EBUILD ell-9999.ebuild 1257 BLAKE2B 27e21a66e146c9c55d06dd774124a30c14b5a3c26f571645667ed5660f0bc70e23b1fb27c68a740e6693870b6bbbc62e5eb3d930ae1b7bb5f05464c59d8f8e53 SHA512 cc5ea49eabe2db020d458569fa5cfda3e37602e63706c51772d8af7358a38ab5a8b62e9b5a95ebbc84276f70ceb852c406ff3051d46e32413d9f91e1680ac5e1
 MISC metadata.xml 454 BLAKE2B a0768369a4193ad0aa995290515a1c2e2a99e363d345d33a52933ac274e0c10364801ed20727a78f0d22088bfea0eb833d54f08d4de47790e6e0213a0318ecbe SHA512 583e77bec8ec2bed4e72ae117a7afba7cbe3abd0c3d139227aaebd0f06081faf827356e871494c9fbd16bc16a146f23099729afd80e2583e2bacbda9226bfabf
diff --git a/dev-libs/ell/ell-0.35.ebuild b/dev-libs/ell/ell-0.35.ebuild
new file mode 100644
index 000000000000..707fc0db4ef5
--- /dev/null
+++ b/dev-libs/ell/ell-0.35.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	#remove on next bump
+	inherit autotools
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="glib pie test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( sys-apps/dbus )
+"
+
+CONFIG_CHECK="
+	~TIMERFD
+	~EVENTFD
+	~CRYPTO_USER_API
+	~CRYPTO_USER_API_HASH
+	~CRYPTO_MD5
+	~CRYPTO_SHA1
+	~KEY_DH_OPERATIONS
+"
+
+#remove on next bump
+PATCHES=( "${FILESDIR}/ell-0.35-add-rawmemchr-to-missing-h.patch"
+	"${FILESDIR}/ell-0.35-add-missing-include-in-dhcp-server.patch" )
+
+src_prepare() {
+	default
+	#remove on next bump
+	eautoreconf
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	append-cflags "-fsigned-char" #662694
+	local myeconfargs=(
+		$(use_enable glib)
+		$(use_enable pie)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	local DOCS=( ChangeLog README )
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/ell/files/ell-0.35-add-missing-include-in-dhcp-server.patch b/dev-libs/ell/files/ell-0.35-add-missing-include-in-dhcp-server.patch
new file mode 100644
index 000000000000..788985ccd6fd
--- /dev/null
+++ b/dev-libs/ell/files/ell-0.35-add-missing-include-in-dhcp-server.patch
@@ -0,0 +1,24 @@
+From 6dfff19d4716ba216de1a3298ed0f667d7782810 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <ericonr@disroot.org>
+Date: Mon, 30 Nov 2020 18:40:33 -0300
+Subject: ell: add missing include in dhcp-server.
+
+---
+ ell/dhcp-server.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ell/dhcp-server.c b/ell/dhcp-server.c
+index c983ed4..144e83e 100644
+--- a/ell/dhcp-server.c
++++ b/ell/dhcp-server.c
+@@ -24,6 +24,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <linux/types.h>
+ #include <net/ethernet.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+-- 
+cgit 1.2.3-1.el7
+
diff --git a/dev-libs/ell/files/ell-0.35-add-rawmemchr-to-missing-h.patch b/dev-libs/ell/files/ell-0.35-add-rawmemchr-to-missing-h.patch
new file mode 100644
index 000000000000..2008b27d56ad
--- /dev/null
+++ b/dev-libs/ell/files/ell-0.35-add-rawmemchr-to-missing-h.patch
@@ -0,0 +1,44 @@
+From 3916c1cc32be205e185a8a56de5cde1b9ec60e81 Mon Sep 17 00:00:00 2001
+From: Denis Kenzior <denkenz@gmail.com>
+Date: Mon, 30 Nov 2020 13:00:11 -0600
+Subject: build: Add rawmemchr to missing.h
+
+For those systems (i.e. musl) that do not support this
+---
+ configure.ac  |  1 +
+ ell/missing.h | 10 ++++++++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 1e5ead9..f34add1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -98,6 +98,7 @@ AC_ARG_ENABLE(ubsan, AC_HELP_STRING([--enable-ubsan],
+ ])
+ 
+ AC_CHECK_FUNCS(explicit_bzero)
++AC_CHECK_FUNCS(rawmemchr)
+ 
+ AC_CHECK_FUNC(signalfd, dummy=yes,
+ 			AC_MSG_ERROR(signalfd support is required))
+diff --git a/ell/missing.h b/ell/missing.h
+index 6b9b0fd..2a3e647 100644
+--- a/ell/missing.h
++++ b/ell/missing.h
+@@ -67,3 +67,13 @@ static inline void explicit_bzero(void *s, size_t n)
+ #ifndef SO_BINDTOIFINDEX
+ #define SO_BINDTOIFINDEX 62
+ #endif
++
++#ifndef HAVE_RAWMEMCHR
++static inline void *rawmemchr(const void *s, int c)
++{
++_Pragma("GCC diagnostic push")
++_Pragma("GCC diagnostic ignored \"-Wstringop-overflow=\"")
++	return memchr(s, c, (size_t) -1);
++_Pragma("GCC diagnostic pop")
++}
++#endif
+-- 
+cgit 1.2.3-1.el7
+
diff --git a/dev-libs/fddl/Manifest b/dev-libs/fddl/Manifest
index 4cc15201dc66..5cba1ece46ac 100644
--- a/dev-libs/fddl/Manifest
+++ b/dev-libs/fddl/Manifest
@@ -1,3 +1,3 @@
 DIST fddl-20111124.tar.gz 29608 BLAKE2B 5769edc935c4606cbc9662712ea05ff2cdd44646e36ef71a2b185a9efdd8655fd8ff0c7a0f0ed105cfee44f18c43815984771e7a74a2329adc29f6ff544fe64d SHA512 d9c4f3f4e10b92ffc158a8cd24726ac6f95050256178a17b6d11aefd4b5786452b17ee96e4d4f4762d07c372c248aba1f22cbe2c03cd6b0f709aeeb4d15a0266
 EBUILD fddl-20111124-r1.ebuild 1045 BLAKE2B 96a1e86d085cb91cb66f395f99cdc720fc93b11087bb5aed3dd751e310f4a3ec6cb5b799b13cc835d6f12afe6c4093d3e794d48508ff70ebfe2ffa193d68270d SHA512 457232f89f5aea21c796c777a432c343b8a785b7bbeb54d30ead9f96cd997dd27a66f9bfcaf4cfc7b395d2e22ae0c495d0f6cbf5c7cd88024e0296d145c2dc2c
-MISC metadata.xml 502 BLAKE2B 8e57f51b33a4af821f639d632977dcdb12d9a17a39fca7e0281f9f75ffa2c1e68637d9e85c530c33ed9319b8eb9b866ac70101b331ac1124cdeba84c8aa57ec1 SHA512 ce5ed3d3399e29f100bd0007ca60235678870b5acd0350a7801084e80b98c0b151853f48b740b21936a1e1c688a375dd3695b3646e9c964abd9c523e1aa84805
+MISC metadata.xml 388 BLAKE2B 04fbf4fd05fdfbcdd707e7d365979466d6df42ac6ab1af756263e6b468928c761266b1e949ff99ce83ac9be136bfc74862dff9ae3f766736302ec8e6b80f86c6 SHA512 bb5b6f0a1a76714330e83dbd98c6408326ebeb5bd2abcb89088daa835590a8101f5389ff23c5411af11916d66e24c7292438bdaf49cadd2fd79cb7b25b60fd55
diff --git a/dev-libs/fddl/metadata.xml b/dev-libs/fddl/metadata.xml
index 202a7f4cc6b0..326f93eee087 100644
--- a/dev-libs/fddl/metadata.xml
+++ b/dev-libs/fddl/metadata.xml
@@ -5,10 +5,6 @@
     <email>zlogene@gentoo.org</email>
     <name>Mikle Kolyada</name>
   </maintainer>
-  <maintainer type="person">
-    <email>pinkbyte@gentoo.org</email>
-    <name>Sergey Popov</name>
-  </maintainer>
   <upstream>
     <remote-id type="github">atomopawn/FDDL</remote-id>
     <remote-id type="sourceforge">itval</remote-id>
diff --git a/dev-libs/gf-complete/Manifest b/dev-libs/gf-complete/Manifest
index ce59577631c2..6b2cffd5f5ce 100644
--- a/dev-libs/gf-complete/Manifest
+++ b/dev-libs/gf-complete/Manifest
@@ -1,6 +1,6 @@
 DIST gf-complete-0.0.0.tar.gz 596339 BLAKE2B add52827288d08e8d546787f8bc42554ce8900a21dfdc47e66aea2990aa48604f8a51d573f84c667e2479a03ddb8412c43a0acae745cb1e3e5aed0bfd0dd0a83 SHA512 7942a29b80972fffab15dc86c560345911db5aa976d2c505804d0eff10c9135f674f3511b579e2bac26342ca53a81d323826a1ff1d790836a4650a07769851a2
 DIST gf-complete-2.0.0.tar.gz 122566 BLAKE2B 20cfc2dcf437109f5ed703434c5c383bc910d57127583a4eca6ccea860d0f42c82c93558ba992b9b35d6025d745a8bb39c32ed35809ffc063fa83b11a975e0d9 SHA512 3b0693bf374086417f04cee09dceeb694aafaf7fb3c829b89f303b65634ae509406c8a0de10f57c666b4c78b11043f355bb3c81f95eac061cb16de9db2b71b89
 EBUILD gf-complete-0.0.0.ebuild 628 BLAKE2B 7c3b73a700a367011a1eb16dd47f92caa5b6cda46b4b1c8f3596a5dea16d2824b0171327f66f19efa5178f340abcf2c16569dcb2be6b97937631abb834084088 SHA512 0d3bbf3b76ef8a44e7a8366b04ca609db2612e77f0e4666b320420e0c06e7c60c3092db149603855ea3eb83518a548e6bbac27e47348450467aa9e840b82d32f
-EBUILD gf-complete-2.0.0-r1.ebuild 725 BLAKE2B 2dc03bec72fe8cdea724f4af50d6a6599afb8c34b83ce82fda11e15d1e488ed50fb52f28c94d1568ca64905092505e9eab0cb75ac5a7326724ea7ac489277b97 SHA512 94b29eacadbbc9b8a8f94ce916a5a4c1c48fee798cfaed50689cf22fb18f852599d607a33a3e5376a844b570d4b2bc91549e3603fe5046b516306cde010dcafb
+EBUILD gf-complete-2.0.0-r1.ebuild 724 BLAKE2B 19aa9273c2a103a24b971ae4b50250bb0326a865dd1d13487aa686a5b18341bc8a5b9146dd2ec85bf2b454a91a9d00992cb3ecaf332f192dc301bc4c041a0227 SHA512 47c770f82f67e3f3b865e2e15e9a11d54783371d2baa3d657b0e11ecfc7fe85232bc42fe38181a9ba69acc375172ca7f648d885357cadd8324497845ed23e278
 EBUILD gf-complete-2.0.0.ebuild 654 BLAKE2B 4385c144aa769748612ea4f0a2a2a2f6821e7183f89b313d85d45e45dac34756195795ff8f21d1a70748dbd80524a7559d253ebb1464e1cad9ae71f176d9b9ed SHA512 bdccdbf0466182afd3f28949ac9a9df48a5223489e9c7a9a1843891ce1622411082e3f631531a773a9d40856bc4f9fcec86ccf49151296c8a7b9408e5f6a7b57
 MISC metadata.xml 371 BLAKE2B 57b48284c6902ef89797ac9e63452e3ae6dc0b1cb223c9dbebeba4aa52d4c37f64cbb0ecab23099c68cb1eb9ac675a3fd90bb86520d7fe17505024fe4578abba SHA512 6073568ff06bc2ee07189affd7dd44425d9e028a5dd558d3aa41b6813b123681f4e50cf7a911fed42f342d576088f0be61282748c5d0e067bd664aa5b7acd554
diff --git a/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild b/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild
index 5f56086483b3..a4e5983dfb82 100644
--- a/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild
+++ b/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}.git"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index 99a917878215..9ebc2532db06 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,5 +1,5 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
 DIST gmime-3.2.7.tar.xz 2227048 BLAKE2B 7fba57640038f34bd45ecba1067b6db131705310b62a74da1fa3d575993bbc6cc1dce4e3d219dd42033775e0a90f2b2acc86b1094f96f03a7532eae1b69e63ae SHA512 2c8fecd6eb74c9e956c419ce111bef6280916ea3756a534b6b800a273f0fff260717cda7fefd4bd4c6ddb27973112ec6e73fa971fa74bb9aa04cfe587d45f10b
 EBUILD gmime-2.6.23-r1.ebuild 1499 BLAKE2B 5fa080e22105dedbbb3c948aebdc41cdc8dfacfd42b858173d8044b7cf8f9dfce8f0271fbe27f5c48ba885d0502c64f723228373a39970f63d3a07ad740c01c2 SHA512 cbcd5ce244219de5e7ef7b604a0349df42005dd23a30f5c74ca501b77b035ef01e6d8d9528bb1112f982abd92ff505ea3457bc92fd0f8dc865f1432678f10e14
-EBUILD gmime-3.2.7.ebuild 1576 BLAKE2B 9e225e514c113c70ab51afc18579ede3e9fb95b3d12016febffd426fdc421bad041537c27ac0cb935323c89237d653cb548a28116ca43af522ca4d864ccce848 SHA512 84c7558ec0e9cebb59fb96ca078c75b09de09c951a37686bf36fef64336bec4ccd610f2dd79f7ac0972957ba7522e72db880373544187d3d315eb095d7a4d3f5
+EBUILD gmime-3.2.7.ebuild 1587 BLAKE2B f585b31c393f18caf907174a9185774e8b1b45c93b05f09287254c5492275160b1eddf9fb36162347b4b0a415ab319c5eb863e5585f80cdb36561a2dda5e158f SHA512 21ab58e50bb608b0d5fcdb1dfef2fcde305c9240eadb0bf649720bd714b512f2cf03814f207f64fe1e86fb15b1e677c4e8d318ebb9f059d12ba074b0769cc3ec
 MISC metadata.xml 407 BLAKE2B 6079e838028f6063248e1dfe1b1b720c2bde65fe73512d4749aeda39aa9bd01b5bd047217e51be2ec6ab1050551f6e2f1c1d7162400261c841be312f8538df6e SHA512 0567710e8d8d0a61a0828325440aa243d8517d94767069d165c106fc5d1b96e5f952738874772ef9f28d1a391d3c47939a2ee32ecf3f8321ec00ee81d646d502
diff --git a/dev-libs/gmime/gmime-3.2.7.ebuild b/dev-libs/gmime/gmime-3.2.7.ebuild
index 3475f16747b9..024522bf7067 100644
--- a/dev-libs/gmime/gmime-3.2.7.ebuild
+++ b/dev-libs/gmime/gmime-3.2.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime
 
 SLOT="3.0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="crypt doc idn static-libs test +vala"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 0d8a0374d23e..50478739bd4a 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -2,6 +2,6 @@ DIST libinput-1.16.1.tar.xz 595548 BLAKE2B 497089248c2104ff7784b7d46d8e846047e05
 DIST libinput-1.16.3.tar.xz 594948 BLAKE2B 6fad03dc8ab0280435b89a1049ed019d29e795279273277c9cad4676f484856d2677845ddc1c5102f2430645053a77c1cde48bb32530d4290ade576843a51ded SHA512 cdf87988b24dc0a44b7b6ed3e15e70c7702bf65f1cfe257924967677c7a1f1485011a9e30254ba8962c83885de78f824e7955cedb07322676332d42532ec4a39
 DIST libinput-1.16.4.tar.xz 596028 BLAKE2B ad2160d83bcbdd65383272e0c4b35e35c7b46a6d0c771d7c0188c92b204d57dae73d0820bb93f662f155c1eab19c0195110f5a18a68de890c808925d5c056814 SHA512 a95a3bcf58a9298946d15f4f2fd93dc5807d3042f8797950a1ffd96d3c979b55a764f035a9f7680d0ea400b033698c322eb61a4387dbc280db6110ffd3e137ee
 EBUILD libinput-1.16.1.ebuild 2230 BLAKE2B 74ca4324289826313f0d01cc08308062483e5c4d204f87f30abe91d2eda88b1278fad9b62a4901c1fbf6b749abacb0f5f92e3b7c52708023c6435392244a46fa SHA512 6290bda45e9c91dafe2a38e3d08c5c83e46c88f13ba186184998c41b8d91f884768d5d12d70fc1072763ddce9ba7545e892699cbbc190e16d757ce32c1833c03
-EBUILD libinput-1.16.3.ebuild 2233 BLAKE2B 2561631cc0de0b3d265d7e9a8c7191302319ab5eb7db07580dfcbe1e69195f8e41e7b45e4d6c2f1ea92cbc84fe194d295a0aa69dcd7ae7dac607e6e519ac739b SHA512 3896e372055b6e11d84a29d4e389e6eb2395216ff0ad9616eb34e6ec148e4eebf218cd622bfa64a50be6a11b1c6725fc2a3cfe175407db3fb6b88fa68ed432cd
+EBUILD libinput-1.16.3.ebuild 2231 BLAKE2B e91692d5549b044382f093b34460308d199818923104af2cf9f9d58c8ae29326037a8c3ddbb1e12fe96601f8600cae3e522c810ce76674cae3231165142f2cd7 SHA512 0af90b967a0729be92571009145ee31aa7c19ea7a0c5a9ad4ff77ad921c16eca9fe6702b0007d2b8e1e8d5652e9ce9a10fbc21d0ea61be87a9652d4ba326a0a9
 EBUILD libinput-1.16.4.ebuild 2238 BLAKE2B 71fbec69d0bfddb68e3ad455a8b708a777ad56faa3aa35f5db13a9e5f431b33cc85448c564df453cc626546d0a59fc4b2ca3c42ddc7cb54d87d7b1bc3c712abe SHA512 3c9ab25eea207ef579459301470f5d50e168db887878b2bb841a5eee5231b7b78610ad45c80be26822f5b0a64c2b9037021f8aa669bdb03e002b5ab3221b89df
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.16.3.ebuild b/dev-libs/libinput/libinput-1.16.3.ebuild
index 5b068bf86718..3256004954ce 100644
--- a/dev-libs/libinput/libinput-1.16.3.ebuild
+++ b/dev-libs/libinput/libinput-1.16.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0/10"
 [[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index 2538a0a885ea..5e8733e89516 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -7,5 +7,5 @@ EBUILD libintl-0.19.7.ebuild 2096 BLAKE2B f1d13ca94e12dda5357c4bc11a87c88ad7409f
 EBUILD libintl-0.19.8.1.ebuild 2096 BLAKE2B f1d13ca94e12dda5357c4bc11a87c88ad7409f6cae563c15ced09bd0d99dcedd0e6ae060fdda2791fc6cb08aa591d4c78e448a1f7537405e9f3026d64b4e4a99 SHA512 08610710f1b663df011eece6851d5271fdb7244083aac56df054ad979c98bb618e9d48b650cecbcf47de5c33b68dc511c414496cc11559c9a2c851ec0400eb22
 EBUILD libintl-0.20.1.ebuild 2107 BLAKE2B f7999e94d7a092fac43823798096e030e46738c1ce0eb76999661012c48a93d63b95b879b1f6733afcc6ea8013719ed8103084c72156ea720894e4ea126e4ce4 SHA512 074d8cd9fdaa7b0ecf6be75091be3857f8b040d567f03b448fb6828a8b30051abb0f437b1662899451c72cc6b4f2817dd76547a29ef2e279dcbcefff7cb7e2fb
 EBUILD libintl-0.20.2.ebuild 2109 BLAKE2B 4692a8a6d707bff990209ca6735abe61d8d23b8a61c171762d3317b200f23099c8af19c7692ec94c921543effe2e8995c95159cfcb653ab61f46a84f1bc66b6d SHA512 997f9e19526577f26cd8026733625f0fb4ef29058a3d5cef2a44afe0e73d0419cffd786b31783e248c207e20d80c2716015918b715a3b9b86a71a49a50bef626
-EBUILD libintl-0.21.ebuild 2101 BLAKE2B 2373ccf7895b045e7d50d66bb90ff0c05830833b261682e969f15b8232460cf44d3a935895dfcf6b45d6adf6347123c0e93638d901ec14e75c5236a562194d68 SHA512 c21418ed404924b32f65f845472caa83c6c17feb2d478d3382db05ff89479c9a088995533468a26690a15f6ebb0ec3abbb956676ff1fbbd662f63b6e305eaa38
+EBUILD libintl-0.21.ebuild 2100 BLAKE2B d564119bcc97a2bf55719f1cb753a93ffde8a7adacb3d864e6663699ba1db49a6a042b3f60a07e616a54146ab675c21553dfae56cb4f7730b4c5fe782b1531c4 SHA512 88adc43804e87b4ca93272943d57a2d00ed3ead6eb8144b2125a2cc33dd64decb90faf8fa7f2628a18076d4f597cd651f480e7365549bbf9a9136338aa9ca0f6
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libintl/libintl-0.21.ebuild b/dev-libs/libintl/libintl-0.21.ebuild
index 53bf9aae5f0c..349df2d47e3c 100644
--- a/dev-libs/libintl/libintl-0.21.ebuild
+++ b/dev-libs/libintl/libintl-0.21.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest
index 140aa638c91f..70b82a0e4c4b 100644
--- a/dev-libs/libmanette/Manifest
+++ b/dev-libs/libmanette/Manifest
@@ -1,5 +1,5 @@
 DIST libmanette-0.2.4.tar.xz 38196 BLAKE2B d9bd8817ec03c9414eb249ce50d3468e2eb2dee78ba36b7a1ac9b04d87e1888d086766594109ee8d89fc4f48fea8d6e7949c7fe44646cacae00145b14f416697 SHA512 713686e3fd515a09846def3283a9e687571dfe47357af00f95739b6e888a454ab14c526a11b38c4ad19bdf928fc3b13b8be32612557dd0ecc743efd2cb6e0792
 DIST libmanette-0.2.5.tar.xz 38192 BLAKE2B 0eed86ac8ae5d45be8b80d14aee29f199eff23f879fda99494fa163e03eb265d95146392038cf4657f4256274d65b2a842413a87fa93ec4a5f192da64054a661 SHA512 f72b908c0282aee74a86ce27650d1b6220424e76a830645758a5677b4af6208fbf1c0354cf602c76e097735168cfa3d6bc16727ebb73a14dd650708a0a0deec0
-EBUILD libmanette-0.2.4.ebuild 851 BLAKE2B 6bc522f96aefd019b0f133ba8678441d0da08b353e3d66a86e94f2ee361a5b7a5164249d17450de0d77e4d45e565738481627c93938a86c9256b42ea8b3790cf SHA512 865722a206660bfb0222c6dfae324cafed1645fba1b56f293ee23d863e2c0c46752a8884eb0d350b494496e9ea7c805c5a8a66787a4359b1d26d79d91c163e71
+EBUILD libmanette-0.2.4.ebuild 850 BLAKE2B 5d8418fffc9aa73c67988757a097ea7b796e067fd81257f4b9b2ff958343978fb5dd99859705886189e3c91ce21ba1cdb7556c9f74229751266bd7dd2a3af2b1 SHA512 acaf2a0cdea40bdc4f78f2f83cf5352b7a0eae0e8f7fc0d2ffbf8b8a4d39e18f35cdc910f06a24a806f562f9b977465f8dabc665c13c8942cae5de81678ea7c7
 EBUILD libmanette-0.2.5.ebuild 853 BLAKE2B 41f584636080ac56d20dc2c9780f0cf6a00686b45d6d2dde2c309cf7e27c0764a0c431e46c0faf3d7ef538e3bd2f2fd08dd1241b2100f0ae4940f79fbee33e0e SHA512 103ac11b72f7a137ffa76e02101f15b17e5a9ae133cee53bf6ea524f43fa8aac0bb08c2c1b37b97b82968d5b324a2aa7fa1928abad6999f4e9192475c0127fa8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libmanette/libmanette-0.2.4.ebuild b/dev-libs/libmanette/libmanette-0.2.4.ebuild
index a8fe3de547b1..4b17eeabac40 100644
--- a/dev-libs/libmanette/libmanette-0.2.4.ebuild
+++ b/dev-libs/libmanette/libmanette-0.2.4.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+introspection +udev +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 5b276bbca63a..7da3a24bfd85 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,7 +1,7 @@
 AUX libmspack-0.9.1_alpha-fix-bigendian.patch 444 BLAKE2B bc62193205d7d96b8e2b535236463d0695dfb1a3cc4b2290d172873c11f9d3184550426e10bd1457282531f27a22585365e5b1537f1b9f85eeed4fd31afa5748 SHA512 c2e138e19c7e8b8f90e1dcc35d32f655ccd7a1930eab7a0b49686e9d2be26cefba48bc895ef1ebcb1959c0422e824779f7e31940bbde0c8bfd8a2828c2ad6c3c
 DIST libmspack-0.10.1alpha.tar.gz 963274 BLAKE2B 39bcb3b7ea419d6d00850b70c217c802a2095dd4398038e594ae7c01ca12e71508218c1cfca5ae8b102636ab9517b13d55c1e411b31e87d28aa46331cd0127e6 SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245
 DIST libmspack-0.9.1alpha.tar.gz 494651 BLAKE2B 4543215efbcac9cd2703cd56f2297645463831cc2dfa6b38d87c5f48f39676347bb20739e0e389e021983d910b9be99bfd369fb30d36090f3f72f09532d6bd1d SHA512 4e39c2be8768c5c0b0d0798c9322ff022173f5e05af1636c18541bbc9f58c1ae1af59252d5631340fca601495c5b1e5abed0ad83481387421d2df5efb75cd49a
-EBUILD libmspack-0.10.1_alpha.ebuild 1626 BLAKE2B b927189ca32e2165ea5767e8f4ce8dee5913a1857b23da1ad70bbf11373efc50634a889578678ef96a6eff52e75ff7349dba5bafd6d77b3504ccc2b9498bd2fc SHA512 66ffcad19d658bf34510fbf15791edb710b4cdab9c6300bc67bb33d3ed9a73e4b539f70ea0bab94ab5a8c36de1a8965eddbbc3aac49feea478f0ede375a5e9c5
+EBUILD libmspack-0.10.1_alpha.ebuild 1637 BLAKE2B c9a493cd294f8a7ad550c202289e032567e8a68b2d4e78ccab53b111a872a7258305b2895f0dc1789c10562d0d8fc8d2aab4ef7a87d8a08bdbc3e8bfa6d57134 SHA512 8cb2368af6156b34cee97cd05750cce4c1ec2cc8285e69d17472cfed31e14b61db047c671004dc5d3b7254f3af422c4d5e20745cdb4e6bd018d6e0238cab8518
 EBUILD libmspack-0.9.1_alpha-r1.ebuild 1680 BLAKE2B 38c7a31937f88a905232b0c4eb28a115ee9bf464ea4cb7dbd5302d1720d3fd44674953e75eca05d94ff15727647d63d11cd7649889cbd0ef27f1a24e7e60e449 SHA512 6ea352513bddea74aa92dbe9f95972413d82e9add64755743be29a9b6695b41ed2cad0c523c164c1949b52924a46763424207aab1d45c6bdddb97fa67c426e52
 EBUILD libmspack-9999.ebuild 1604 BLAKE2B 4ccbda9a8108a4b6381a908229c87e5111faf33e67d507f7cf079012842cd135aca9c3fe968e363d213cb6819ff6af01927b745994a6b75248ad6963196fb48b SHA512 2025a1a6422a0703bd3d95611e3917e25ac8797fd88255e839684c5ba5efb4418b493219c278fed94c94b686d4b3995a99b140de4d262d5dfc0ff4dd0c9655e2
 MISC metadata.xml 251 BLAKE2B f8ea69eed31c6ee4eca7ce37a9ee2b99d4139e42e53a0c93441863f1c2eb1148149038cbef9ec91a4c92971077fd6ba8e6ea995a138f8863c06d8ee57bc4f74c SHA512 14f3538a99bd8d32654ef4630d0cc667d55b36b44701791eb42d98f8e958641188915d86c306d68c7c20a4587e53477a3f9e32aeba2e0ba51c63c903391c4277
diff --git a/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild b/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
index 4301f43b21c4..ac019166123b 100644
--- a/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	MY_P="${PN}-9999"
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos ~x64-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index df2aa706eb11..1332315c84eb 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -2,10 +2,11 @@ AUX libxml2-2.7.1-catalog_path.patch 2225 BLAKE2B 9a9c5836e5227e51de05d1e19c27b8
 AUX libxml2-2.9.10-remove-TRUE.patch 942 BLAKE2B bd5272551189d21162366318b211965aca2da947e5bbadaa8a487821369c3f552005de243c4b110392908277144317bd64c86d8641b972cbdb338d7eaf93dd08 SHA512 6abc43b95baa5540c78435654f391858c8e72667afdf00c993907510204441aee4367d1d8a038961e65e9d4d25ac8d0c4f5b7a2ee8d8357737dce5b643898502
 AUX libxml2-2.9.2-python-ABIFLAG.patch 728 BLAKE2B d81b042b5000717d5aa88ac4cebf78749f5a4ef661c227537171c5695d97a16ca75c790c8b540e3481a54dc2d935112b46e0a23509c887e16e3f2886c08f1d69 SHA512 2f801329ad4e13dc70450d41f7659a510fe429b3aa9b66859fed25c4e3d95381d6f253f3a60a54002a16999296d3bd2adaca5e4cca92186492bfc7de3ac84426
 AUX libxml2-2.9.8-out-of-tree-test.patch 1311 BLAKE2B 7b3e7abf273c1ab2cbc42b1fcd4ff7bef365503d8c04b315b0857574054409ac76c367f7ef0c944d448ef3ca84268082f59424758894cffa31a93925a81972c8 SHA512 4b665c7c4bea2d938f7b2021a38f274b9e40dd38c5e2085716cae02c60cd3ff9aa109185e7bfdd38d2724d76500c99da0db0968f634b56f7ef418a7a72ef144a
+AUX libxml2-2.9.8-python3-unicode-errors.patch 1259 BLAKE2B 4425728c1e7a16c3b7faafba02468c01b9b87fe21dc6e2488d56f599573bc442f78386f64477a89c3332cd25f9b5ef3b4fedc47b51915c727a1b8eba06e7776d SHA512 a205c97fa1488fb8907cfa08b5f82e2055c80b86213dc3cc5c4b526fe6aa786bcc4e4eeb226c44635a1d021307b39e3940f706c42fb60e9e3e9b490a84164df7
 DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B 4d5f8aed35d6c0232089e09f22a77cbd25cbd2007c1330538e1c7acc4398ec3ef9023289129677cf5499dbacde4c2f28850ae81acab351d02625d3452aedaede SHA512 a63032d1e85128f637c2b54356aab06a17e31eb1f5facd8fdf88463eb21df6a1d9fd8cc751fa94b8d322fa4f796be4e1d9aa071cbd0826ab31fae46525fde952
 DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421 SHA512 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.10-r3.ebuild 6855 BLAKE2B 1d0f7df5292447278e6a4d69cf8604b7a60a2b55b171c22c76c118b3da29f8b9831d1a0840930c9dcb3bb063bf8451aea163a4a345d3def3147ed716fd50ee15 SHA512 e223d55f9f854497ef3d50cf1caec72e0f4a27513517f275de8838c0e550c9fc0ad0d7f4476b9a1355076df16f1db4c543dab207f88c7c2d93d2a084ca1be0eb
+EBUILD libxml2-2.9.10-r4.ebuild 6934 BLAKE2B 10ea3e8d538755eaa260d1a4ea8e4661349e522169b093e3bf847286ccbc5c9b29041ca6322435fd381252b98b2ffb288b95ffc7f9d771719d26f304bc8b6260 SHA512 84b582b971e08881ee12321c9ab043b81477fab51fffefb1c240532315686f8964ec6d315e67d9ae87e02622c56e5d22b67c08d89e0dd041e507a1b61d9f3ba7
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch b/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch
new file mode 100644
index 000000000000..e87dcdedf88c
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch
@@ -0,0 +1,34 @@
+Index: libxml2-2.9.5/python/libxml.c
+===================================================================
+--- libxml2-2.9.5.orig/python/libxml.c
++++ libxml2-2.9.5/python/libxml.c
+@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+     PyObject *message;
+     PyObject *result;
+     char str[1000];
++    unsigned char *ptr = (unsigned char *)str;
+ 
+ #ifdef DEBUG_ERROR
+     printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
+@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+ 	    str[999] = 0;
+         va_end(ap);
+ 
++#if PY_MAJOR_VERSION >= 3
++        /* Ensure the error string doesn't start at UTF8 continuation. */
++        while (*ptr && (*ptr & 0xc0) == 0x80)
++            ptr++;
++#endif
++
+         list = PyTuple_New(2);
+         PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
+         Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
+-        message = libxml_charPtrConstWrap(str);
++        message = libxml_charPtrConstWrap(ptr);
+         PyTuple_SetItem(list, 1, message);
+         result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);
++        /* Forget any errors caused in the error handler. */
++        PyErr_Clear();
+         Py_XDECREF(list);
+         Py_XDECREF(result);
+     }
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
similarity index 98%
rename from dev-libs/libxml2/libxml2-2.9.10-r3.ebuild
rename to dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
index 916abdd469c6..a6678320ffe2 100644
--- a/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
@@ -93,6 +93,9 @@ src_prepare() {
 	# Fix python tests when building out of tree #565576
 	eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
 
+	# bug #745162
+	eapply "${FILESDIR}"/${PN}-2.9.8-python3-unicode-errors.patch
+
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# Avoid final linking arguments for python modules
 		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index d7cb8fa3337d..b212f4eb24d1 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,5 +1,5 @@
 DIST mpc-1.2.0.tar.gz 840711 BLAKE2B 3609d299623a722ca90d4b04ff64becaaa399a5fa40fbc43a1d027692d8fbe6f4ebd24a3c8ea963963977952d130cd3993887da7b0b0c1613a27a24dd37e5831 SHA512 84fa3338f51d369111456a63ad040256a1beb70699e21e2a932c779aa1c3bd08b201412c1659ecbb58403ea0548faacc35996d94f88f0639549269b7563c61b7
 DIST mpc-1.2.1.tar.gz 838731 BLAKE2B 9cd03c6a71839e4cdb3c1f18d718cc4d3097c3f8ec307a5c756bd5df27c68aa013755156b3b156efee1acabfee2269602c6a3a358092ef0d522271c9c56c133d SHA512 3279f813ab37f47fdcc800e4ac5f306417d07f539593ca715876e43e04896e1d5bceccfb288ef2908a3f24b760747d0dbd0392a24b9b341bc3e12082e5c836ee
 EBUILD mpc-1.2.0.ebuild 925 BLAKE2B e004095824d4c34af521daf27d5d991cf61471e7954f035136455b1210d9ab2cbdbf62512b4508285b3f95f2017007ceb4d773e00ce551c6f38c939d0ec9d420 SHA512 741a78c01d227fee1872eefe0438f37bd7d71c4893b69aaad4bc4726018cd358338a09350f9a6e4ad0d863bc282315fce2094dcd8ad126a3a85356f39253f7f3
-EBUILD mpc-1.2.1.ebuild 926 BLAKE2B abca3fddc5177ad9e8d55c0997152e731c28349616b4590c0bb550144f170328332d8b3bee0bed0ddb61fe8e7214adc9c0d7969f14d3da848a11913a53188fd1 SHA512 e7fb9b92765f9b35a21c0ca37eaf96f11381e42120b9e5bd68aff6a483e49142a4393285ceb7641f6b1b151d5880248e8aa9b05456c3fb28188e18314234b8af
+EBUILD mpc-1.2.1.ebuild 925 BLAKE2B e004095824d4c34af521daf27d5d991cf61471e7954f035136455b1210d9ab2cbdbf62512b4508285b3f95f2017007ceb4d773e00ce551c6f38c939d0ec9d420 SHA512 741a78c01d227fee1872eefe0438f37bd7d71c4893b69aaad4bc4726018cd358338a09350f9a6e4ad0d863bc282315fce2094dcd8ad126a3a85356f39253f7f3
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/mpc-1.2.1.ebuild b/dev-libs/mpc/mpc-1.2.1.ebuild
index 8ad0ab8bcae2..5fa8d2838fbe 100644
--- a/dev-libs/mpc/mpc-1.2.1.ebuild
+++ b/dev-libs/mpc/mpc-1.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3" # libmpc.so.3
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index d34c255c9f8a..c6fbfc651aa5 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -3,11 +3,12 @@ AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef
 AUX nss-3.53-fix-building-on-ppc.patch 1206 BLAKE2B e6189802769197b290fd332ee2b7d074c0bacf47313998117734dafd1eb6a536db19bc8a329944d9fad51a6f9f90f81d98181272e0068bf852fea7ca928d2713 SHA512 859162070aa3c5e6e8be259f5e6648d37a5194a02958310f8caf56ff772dcaa4ebb26e4d754c99608fc7a45b641c5088cccd9e2c7d9c92c5ccc85c6b47320720
 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
 AUX nss-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch 8546 BLAKE2B 25c222f44f714226364dbda760989e7e255ab93a79121238ccce2962c346c37971a8440e8cc16ac5555f78c15b7a1b72e7311a7b7257b254fefe7e9a75d94924 SHA512 79fff678895a5643b34c42a0b0d34299b1b63c19baf0bbeb43fcee6b7f01bb24baf7047261b16e913d39fe9e69a637c7dc2bba0fec9ceedd43fa4f5dcc99f38f
+AUX nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch 4053 BLAKE2B d4a9a30c8cbea3b37d8d72cf87c55485cd12caa3f68daaf9bcfd06e945386191549e3cab6a5c637b7e6ea598bba3c0f2cb86bdf51cae9d860bbb614b896402a5 SHA512 5af11e79e4f395e7037aa50d33db7f4fd2fecfdfe33c38865dcf1bad9de731e6d0d859720e8684b5d5ea194c1e86360428a98553fe5115a069ddd1fc95f4cb84
 DIST nss-3.56.tar.gz 81706176 BLAKE2B 84c3b9fd649ce38ad843725b180982692dcac34e851734813b959734054f2e9ebfad66496de320f46e861381f6d5f52db0cc4c0953f7504b79f6b529b871f173 SHA512 f2eed8252c13b38a4d80a11203136d22a521205f814b6d954cc119ccf8921fcb8f689d919944bea4739d1575e9bda7e13cf2ad054ac91d51e049abe246efc845
 DIST nss-3.58.tar.gz 81846254 BLAKE2B f8e7d0b231916b197ad21706a057d055f8377059d76d4f09aff523cc4cd071a3184f02dc488259df22109b70be7b8a5d5fa7ea2273a830de825cc9a8c95dcca9 SHA512 03d2ab1517ac07620ea3f02dcf680cf019e0129006ff2559b2d0a047036340c20b98c9679b17a594e5502aa30e158caf309f046901b9ec7c7adeeaa13ec50b80
 DIST nss-3.59.tar.gz 82141516 BLAKE2B 74959b14ec42b4628dfc3365af00420cdbd41d202541e9379f6a4448c4496b76307af48c9ec405b370f8770327ce56742b4382f8cd49724b42732ce5cc5b0779 SHA512 8963e846f2ff7222457ae59f042672cf4e44f7752807226f46c215a772fd1cbd65d0ce634da4afb698eabd4eb1c1e78146cc2a089339ada11da03d259c609a38
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 EBUILD nss-3.56.ebuild 9192 BLAKE2B 159708f6fc8c0b2e55404b95bbe688798f3f691ecb6e62a87e9ae32b08c9e9ae6693bb959a7af3232694ee0c97e5b8bef1981156152c17d8ea4a7c121885bfc3 SHA512 56597eeacea300e066177e9fd83d646a0bc5f84e580ac4dfd952ffcfb67ab77f738126b21cae44966d12ec6bb6e9b50f44a8ac9cf2304bb2f95b41fbe144b78f
 EBUILD nss-3.58-r2.ebuild 9258 BLAKE2B dc108ae1b31d12f42c34b1938e99438d4f7c7c62cc681c880f458ee8c90ae7b5e0374fa80528c95b1372489c7537059af68570901a72094d240ddb3860297eca SHA512 34c05b3c3cf11ab13b32c68e859aa23f573f4875be76279c6b814e2f750c7bc5329cc6b180e83b4322debfac5f48e0296af3611a23b83682f4d5e472309c0ac8
-EBUILD nss-3.59.ebuild 9195 BLAKE2B 863b9a0187c0cff4ece023fcc84e90ba4560ad27a59b561ee48b2d2d3866ceea0b7fdfe6ee3ea8865264f98f4b44491f65ce7ef955064cb9606e21eaccb072a4 SHA512 5c5fa7be3f3e080310868e8458b64973f2c849eb28663bc7f7eced5fe8415a06fd5005c676a28eb494d0e7eda32fa05c1f5b3fea275b0fa8d0282e9f5e76e055
+EBUILD nss-3.59-r1.ebuild 9272 BLAKE2B b7d26f3774c79e31054f4281eb33686801369f3ee134e27d7d09aad84dd9ce841f8629470ac2790728fb52aff903cb515bfa4c9426ba1eaf161209f5ab8ef97b SHA512 c780d53c01fbc80ea6e6429ebec1ea56e088887411b898a7b8dd2f79df4ba8d35ba38efb70dff32cacaec5da6e0deddce0b2c2d29c3baea55db7b8c7287d1e6b
 MISC metadata.xml 515 BLAKE2B a63fb05a1a3e1b06f929f963ab0794ec1230e89903fc97a7c7db81a0b3c7b7e8b9277eaa7440f8929738ec0f805d8a8dd51c8262e569fb9be2fa0938b08ad7a2 SHA512 6bec952825416ba0ab8282669483eb75935f6b4a3052e0f78dad911c0246b8d8ce245c86cbd82b292d49338848fa50fb2009fb4a9def1ac8d81bf9a3320cd2b0
diff --git a/dev-libs/nss/files/nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch b/dev-libs/nss/files/nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch
new file mode 100644
index 000000000000..be4ebfe47961
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.59-dont-hold-slot-lock-when-taking-session-lock.patch
@@ -0,0 +1,93 @@
+
+# HG changeset patch
+# User Kevin Jacobs <kjacobs@mozilla.com>
+# Date 1606813429 0
+# Node ID 19585ccc7a1f0f4e9a8d2b9c5ceeb408ea90acb9
+# Parent  f1e48fbead3d9e69500d7aedc1ef6e4bf334f41e
+Bug 1679290 - Don't hold slot lock when taking session lock r=bbeurdouche
+
+[[ https://hg.mozilla.org/projects/nss/rev/0ed11a5835ac1556ff978362cd61069d48f4c5db | 0ed11a5835ac1556ff978362cd61069d48f4c5db ]] fixed a number of race conditions related to NSSSlot member accesses. Unfortunately the locking order that was imposed by that patch has been found to cause problems for at least one PKCS11 module, libnsspem.
+
+This patch drops nested locking in favor of unlocking/re-locking. While this isn't perfect, the original problem in bug 1663661 was that `slot->token` could become NULL, which we can easily check after reacquiring.
+
+Differential Revision: https://phabricator.services.mozilla.com/D98247
+
+diff --git a/lib/dev/devslot.c b/lib/dev/devslot.c
+--- a/lib/dev/devslot.c
++++ b/lib/dev/devslot.c
+@@ -183,25 +183,32 @@ nssSlot_IsTokenPresent(
+     if ((slot->ckFlags & CKF_TOKEN_PRESENT) == 0) {
+         if (!slot->token) {
+             /* token was never present */
+             isPresent = PR_FALSE;
+             goto done; /* slot lock held */
+         }
+         session = nssToken_GetDefaultSession(slot->token);
+         if (session) {
++            nssSlot_ExitMonitor(slot);
+             nssSession_EnterMonitor(session);
+             /* token is not present */
+             if (session->handle != CK_INVALID_HANDLE) {
+                 /* session is valid, close and invalidate it */
+                 CKAPI(epv)
+                     ->C_CloseSession(session->handle);
+                 session->handle = CK_INVALID_HANDLE;
+             }
+             nssSession_ExitMonitor(session);
++            nssSlot_EnterMonitor(slot);
++            if (!slot->token) {
++                /* Check token presence after re-acquiring lock */
++                isPresent = PR_FALSE;
++                goto done; /* slot lock held */
++            }
+         }
+         if (slot->token->base.name[0] != 0) {
+             /* notify the high-level cache that the token is removed */
+             slot->token->base.name[0] = 0; /* XXX */
+             nssToken_NotifyCertsNotVisible(slot->token);
+         }
+         slot->token->base.name[0] = 0; /* XXX */
+         /* clear the token cache */
+@@ -218,34 +225,41 @@ nssSlot_IsTokenPresent(
+     }
+ 
+     /* token is present, use the session info to determine if the card
+      * has been removed and reinserted.
+      */
+     session = nssToken_GetDefaultSession(slot->token);
+     if (session) {
+         PRBool tokenRemoved;
++        nssSlot_ExitMonitor(slot);
+         nssSession_EnterMonitor(session);
+         if (session->handle != CK_INVALID_HANDLE) {
+             CK_SESSION_INFO sessionInfo;
+             ckrv = CKAPI(epv)->C_GetSessionInfo(session->handle, &sessionInfo);
+             if (ckrv != CKR_OK) {
+                 /* session is screwy, close and invalidate it */
+                 CKAPI(epv)
+                     ->C_CloseSession(session->handle);
+                 session->handle = CK_INVALID_HANDLE;
+             }
+         }
+         tokenRemoved = (session->handle == CK_INVALID_HANDLE);
+         nssSession_ExitMonitor(session);
++        nssSlot_EnterMonitor(slot);
+         /* token not removed, finished */
+         if (!tokenRemoved) {
+             isPresent = PR_TRUE;
+             goto done; /* slot lock held */
+         }
++        if (!slot->token) {
++            /* Check token presence after re-acquiring lock */
++            isPresent = PR_FALSE;
++            goto done; /* slot lock held */
++        }
+     }
+     /* the token has been removed, and reinserted, or the slot contains
+      * a token it doesn't recognize. invalidate all the old
+      * information we had on this token, if we can't refresh, clear
+      * the present flag */
+     nssToken_NotifyCertsNotVisible(slot->token);
+     nssToken_Remove(slot->token);
+     /* token has been removed, need to refresh with new session */
+
diff --git a/dev-libs/nss/nss-3.59.ebuild b/dev-libs/nss/nss-3.59-r1.ebuild
similarity index 99%
rename from dev-libs/nss/nss-3.59.ebuild
rename to dev-libs/nss/nss-3.59-r1.ebuild
index 37ab7c58696f..82184ff8a710 100644
--- a/dev-libs/nss/nss-3.59.ebuild
+++ b/dev-libs/nss/nss-3.59-r1.ebuild
@@ -40,6 +40,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
 	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
 	"${FILESDIR}/${PN}-3.53-fix-building-on-ppc.patch"
+	"${FILESDIR}/${PN}-3.59-dont-hold-slot-lock-when-taking-session-lock.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index 180202723a57..b99dba98e053 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -2,5 +2,5 @@ AUX fix-popt-pkgconfig-libdir.patch 519 BLAKE2B d31d6d121f745f208c743aed94c07134
 DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
 DIST popt-1.18.tar.gz 580569 BLAKE2B c9c42eb12aa21764cde5e9b4a8b30125b547ae690b4d9d0d40b45bd3c1f7ae0b09d5086a588cf37e7bed71fe770ff840c0fd40ecf4ce5b7c1e874b938b6e0324 SHA512 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5
 EBUILD popt-1.16-r2.ebuild 874 BLAKE2B 881c6fad5ba54ce1d2fb79035fc4820adb5f863fc0f5f045481c51b089fdc528b1ff43546f59ed67e918dd8a93a3102db542e928fa58bde91904bbc1350a26b9 SHA512 dea4a0fb8a4a121ee6d2591d017e431095532e76dafb00abe6d2e07584dc626d44eb7fee0124942af9e1d811e01565dd1f9d5db7615c9f1840fabd2fa08c1337
-EBUILD popt-1.18.ebuild 943 BLAKE2B 466e5b7d19afd631656c45df1f0a4b5f8a005da83471a8cccde123ef52fe5dd68dd94b4fd2a996a6e4f2b2b369951059408c419ee396e5787317650c7cc16a50 SHA512 cef4a05181b9def83db96a1ffa02dd102dc207500f79a26270ed7353fd4d95a07ae28073d3883af1b0b9151f6221b506ea45880f2b066c259357b5037807604f
+EBUILD popt-1.18.ebuild 1079 BLAKE2B 05ea397c999d232e7317fa37815c42547dc7c3281409c62267c40e6939cdacafdccbeebdaa611f462ed3e0771a1431ca17f1a56923927b671ed3baf2e9f0916f SHA512 c9d53be850cdc09fe0d09bb48a98c22f0ba4f7a70a5bfefd4fd42a056239ccaafa4ce000a3be2f7fda64ed125c2c563862cd9f70ae89029de4982602bae12ac0
 MISC metadata.xml 347 BLAKE2B 1b9847aceced4a814bc94e483d32082dd6c2dcd4b99c48c8e2cfd062cff0d2f1a0fc102a7b7c4ba3f620db6837d61a880b0cdd395c7e19348acf0e2831640d6a SHA512 ab5ebecf77f7aee7c2de528a7e6b84dde079d33d020fa910420001b6a8dc63ca6c014f3d4122794d7e9099e3d7d53de60338a4fbca563a90fe6a5d2747f50d2f
diff --git a/dev-libs/popt/popt-1.18.ebuild b/dev-libs/popt/popt-1.18.ebuild
index d4da266cab41..695f3cf1db4b 100644
--- a/dev-libs/popt/popt-1.18.ebuild
+++ b/dev-libs/popt/popt-1.18.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest
index b6e283d0d789..f471478930ce 100644
--- a/dev-libs/rocksdb/Manifest
+++ b/dev-libs/rocksdb/Manifest
@@ -1,3 +1,5 @@
 DIST rocksdb-6.14.5.tar.gz 6396476 BLAKE2B c5fc6e9e306ad428285d2c42958804ff403e14fc6b0c2f1231f49197a98937c0703422e1c14f357fb2b3c138fc038ce46c57cce1d184e4babec3c094b00e5180 SHA512 76e4a5b8a7061e42e9d010d04204429a446c857b29a199456db1f207a4849bedc98c7368346b87fa3a69ee5a3d68abedc943248b960273194a9e71634c767258
+DIST rocksdb-6.14.6.tar.gz 6397194 BLAKE2B 43ad8e7e9fdf0c6c75ff03370f2107899bbcef9fd34630c85408abcf208a8213f5e24ea50407bd6a719220b6c29b9ba29c121e94a5a2701f637b17ccf50b90a4 SHA512 609f407b0b2810954541ad8ebad5c754ebfde5021f24ee4b3f1544a5335252c06cbe2b282562e3d084bb9cbe8de239668fdedb2d2d726056c31cf9463db08fe7
 EBUILD rocksdb-6.14.5.ebuild 1129 BLAKE2B 610fae9d9a28165b39d0150c9c8d89a3d5823ca205281a53ebdd6177e11d25271b5be974fbe1cbe952edab01a0339a1103cff272e0ea84c8fc568d180b371519 SHA512 e89a24818264ea44121a8a512f581d5354987a918cd17eb1b4be767e6d3f746d538caeae5a19286c00a3cc7f906679d36213280cf265946951aef0c8645f941e
+EBUILD rocksdb-6.14.6.ebuild 1129 BLAKE2B 610fae9d9a28165b39d0150c9c8d89a3d5823ca205281a53ebdd6177e11d25271b5be974fbe1cbe952edab01a0339a1103cff272e0ea84c8fc568d180b371519 SHA512 e89a24818264ea44121a8a512f581d5354987a918cd17eb1b4be767e6d3f746d538caeae5a19286c00a3cc7f906679d36213280cf265946951aef0c8645f941e
 MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-libs/rocksdb/rocksdb-6.14.6.ebuild b/dev-libs/rocksdb/rocksdb-6.14.6.ebuild
new file mode 100644
index 000000000000..9f75944b679e
--- /dev/null
+++ b/dev-libs/rocksdb/rocksdb-6.14.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Embeddable, persistent key-value store for fast storage"
+HOMEPAGE="http://rocksdb.org https://github.com/facebook/rocksdb/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	dev-python/zstandard:=
+	sys-libs/zlib:=
+	jemalloc? ( dev-libs/jemalloc:= )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/gflags
+"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DFAIL_ON_WARNINGS=OFF
+		-DFORCE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+		-DFORCE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DFORCE_SSE42=$(usex cpu_flags_x86_sse4_2 ON OFF)
+		-DPORTABLE=ON
+		-DWITH_JEMALLOC=$(usex jemalloc ON OFF)
+		-DWITH_TESTS=OFF
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use static-libs; then
+		rm ${ED}/usr/$(get_libdir)/*.a || die
+	fi
+}
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index 8c4fb1497067..89a27bed653d 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -2,6 +2,6 @@ AUX volume_key-0.3.12-support_higher_LUKS_versions.patch 917 BLAKE2B a637ba7d776
 DIST volume_key-0.3.11.tar.xz 484936 BLAKE2B f7bde79d290617a82de60a2105b6374dd03c2203804e3748336c8d09fbf749bf47157cf5e6b856477475d0074f3e4475dc85e0765308d60b9c6d0525685f73ea SHA512 b9da00578b31c96231ebde55fd91c9aafbd663e541c560460fb6c3305e1a0e1fb3115a95682dc4713027d084e14ffa39d638653384a18d69f5dc892fc4855a97
 DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
 EBUILD volume_key-0.3.11.ebuild 883 BLAKE2B 08ea62d2a68987cca931a9c561787d3594764b6b9ac452f45d71c5b7a102eba24807ed878a6ae8aa79a3d4f4efc9baceed974d00f2c0e2491a4de90d43e8cf3e SHA512 6a67cab22720560ceb03e54bd4d4614dc5f3ab561a508557df71465d375f4ab4c9a5bbbb096570c2e52f4e6c8197f9addf288488e1aeaceb3dbe6c3020b0f78a
-EBUILD volume_key-0.3.12-r1.ebuild 975 BLAKE2B d3008a2bdc868297cf8c40c52a0908b80b667195aeedac9ac7b9fe3666f398617c95f79094d69a5fd5946552e31a8a18762908b22eed5d06d2a8680d769a649b SHA512 4903d03944d47ccae8d4cc39f0ee262db47eadd09aeb264ef530c1df7fba477647f826884b3ae7e6eca5e4a6981addcb76f839c18607e44a54d7b509642c6c00
+EBUILD volume_key-0.3.12-r1.ebuild 970 BLAKE2B d67585ebf9a4894e19ce0ec696da45f906bd74f0c92b7dba10d948d01ddd362a9168fed175f6f9ee18ae315b2b1218565ccf999c45849f809f2472d3d0168021 SHA512 95b326c9339cf4f50c9a160d0c09f20f8d00ed3265d30d8283511f13524a5e1a71ffb5895e61a5ca0e3905fe1e15a8d64ab49c2745181978e6a626671a48659f
 EBUILD volume_key-0.3.12-r2.ebuild 1050 BLAKE2B a728cf5978b592976ece161d05e1d20a502beaf31668ade53125dd42ed950f856adef9ce4d0cace156dd55f4a5e211d29c5a0fd1ce6b25966313962995a9bff4 SHA512 093b7b8e1eea57b0452acec1992c53182d221fdd5cb40df3f4730746d8021d8b12ea3c279de57e39433a56174232a32728d5117a53a8c5283331e325afee4d36
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild b/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild
index 2a6dd33d0884..b54ef1708782 100644
--- a/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index b24f841a79f1..3dc32668c7c1 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -2,6 +2,6 @@ AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f
 DIST weston-8.0.0.tar.xz 1094904 BLAKE2B 858f892027f2f41687deb699770843bf962b8fab06bded4f9018ded01d87e2dc3388e371921229887d45f6c9c9e981ae5b28ad473660b9acce9107c7a63a14d5 SHA512 74853b0c9cabbabe942a2d057b65e4e97b48dc5f4df6d7b9ffc10ec52bc787009b12b900be6b426551902b920b7308baa967b7489761641dc9c31cf90440950c
 DIST weston-9.0.0.tar.xz 1555212 BLAKE2B 6c5feb3959ebe894861c6dc0817633b23e8518baf1c359c2967f111c071e9d4f166ef1421ad6465b036b3f1c485cab5f442476e7a44e3ec722cff576dea73852 SHA512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90
 EBUILD weston-8.0.0.ebuild 3660 BLAKE2B 3a0d81693f81fc132b4ffde6d5b13f77c2e7c61b0d9518523fd2106559708dc23f5b4be8158fd1417e68d76837f21b835818b01bedf6ac757f5fb064339f0347 SHA512 c17c246ec8b0a1159bf45747b58d8e063c939223c37b23a92242ad6649f97b1e16f8c6ff3a15bb50ef7b5679a907daa266c7f794bf63c7ce2c2a0b60e816c3a0
-EBUILD weston-9.0.0.ebuild 3716 BLAKE2B 537fe56673b83e0c843be35ab95b1e154570a1bbb02a9cbede05e119de27e5e130fae91372c1c239ca5b77c762eb26db6e0c9e83523202d98e0aefe97f19ab45 SHA512 bd8b946e7dc6488b9f7586cdb263e64bf4bc87fc9936d635b79df9a27929fd621a26f1e2e918f2924bc3e11e7a0665934229cb5f5334503e1c02553fac273ab0
+EBUILD weston-9.0.0.ebuild 3718 BLAKE2B b72e130caec955fca9a896b3c653df1f047d7a10b858f3759c34f9885f63d991c4c0889138c2fed1ceba575924273cdcca20f4df8c4f0fb955e956bd9ca6188d SHA512 144f62271d7c30ada9db349b2f7b467e7de9f64f9c38824dcdd859648b559c435a41fc8df2ca3058141763bb651206b44da607879cc4499e9f72bcb6a63d4749
 EBUILD weston-9999.ebuild 3716 BLAKE2B 537fe56673b83e0c843be35ab95b1e154570a1bbb02a9cbede05e119de27e5e130fae91372c1c239ca5b77c762eb26db6e0c9e83523202d98e0aefe97f19ab45 SHA512 bd8b946e7dc6488b9f7586cdb263e64bf4bc87fc9936d635b79df9a27929fd621a26f1e2e918f2924bc3e11e7a0665934229cb5f5334503e1c02553fac273ab0
 MISC metadata.xml 1484 BLAKE2B 0cf0554d570059077eedaf579dc65651c715a80520d89633cf1979af25014fd7817d7e4ded1d7bdbbc77346e58d026e6371cfec91f710abfdcdc5d360eec60ef SHA512 63e012a64c88b3c2aca3a5f109d468e3dd5e856b1bd42ad2a803e2881b0962f499f8b201e99e940f04b09a3618e9f3594ea2e8565b204cab4093030913222900
diff --git a/dev-libs/weston/weston-9.0.0.ebuild b/dev-libs/weston/weston-9.0.0.ebuild
index 097c7f0c70b9..c01d4eda03b4 100644
--- a/dev-libs/weston/weston-9.0.0.ebuild
+++ b/dev-libs/weston/weston-9.0.0.ebuild
@@ -16,10 +16,10 @@ HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/waylan
 
 if [[ $PV = 9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS=""
+	KEYWORDS="x86"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 1166b7d2cfe8..4d28a788b05f 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -7,5 +7,5 @@ EBUILD xapian-1.2.25.ebuild 1849 BLAKE2B 976319adb17d73cfb5aff1c29c7febd4c50b9a3
 EBUILD xapian-1.4.14.ebuild 1797 BLAKE2B ce7eaab77ce89e4e1ca4c5bcdfaafdb88525dc4cc1dcaa830d63ae7ab378ad1ae8eed60fa35760c74a48ceb282fc024c601fc6230bea8f94373313ee6f97409f SHA512 0f7b6d5b74f3ecb5f7a5a3dc9f7ed3e32e32254ce0c940e7de70259322191fe030cb9b1ba043ac4ce7a62dcc62f4d204cebf3bff71edfed15cce6c42cd121a7f
 EBUILD xapian-1.4.15.ebuild 1805 BLAKE2B 5cd7b053f147e4813c5465c556f02f4c790f99ce032a1cd9a436967a43d7336da8134fef307632e6e24a8fc7582a7af8dbd197039889f6e348a2a4a250de89ac SHA512 4dda1f50d9d5908be95344dfdb2049381befdde663e17cefe0209a628fb830bea5183fb637013188f938be74fd3c70f6d33bf5c072669cf357a2028ea63172aa
 EBUILD xapian-1.4.16.ebuild 1805 BLAKE2B 5cd7b053f147e4813c5465c556f02f4c790f99ce032a1cd9a436967a43d7336da8134fef307632e6e24a8fc7582a7af8dbd197039889f6e348a2a4a250de89ac SHA512 4dda1f50d9d5908be95344dfdb2049381befdde663e17cefe0209a628fb830bea5183fb637013188f938be74fd3c70f6d33bf5c072669cf357a2028ea63172aa
-EBUILD xapian-1.4.17.ebuild 1799 BLAKE2B 578895100b9e628a46e82a58d0296015a9445372279a828cd32d1809a131c50ed7b31b5f5fd3a3e2d6c1dc75452d3d5b46869e9380f6806912a6c641f6ed08e4 SHA512 eaf3342493bc89367aeef080e71228290001ac78ba2b5b1ab1f56d9d5128880168b24c5f8810733e2092606613ba19889fe085014b4354cef52088ab1c51b8db
+EBUILD xapian-1.4.17.ebuild 1810 BLAKE2B cb4ba92cc74ce5915003765f2d4b692a1aa5833b7e418a237f64af27e6ff6d1d69ed259c0f8300ab73d918141c10c5079e526b131e90dd0baa8079b0f0a9c193 SHA512 e5813e4ba610d664cc35ce85cf6fac026f7cf98d0b0f0d47c6a1ca04f42c50d8be10d26790ab8913a91e840d8f91c574e0d54113bd9f9fcb1900e7e9aa80e0ce
 MISC metadata.xml 934 BLAKE2B 2117e395836430d6d356b226e9b4f487141974aa36c36be8505a9e077cbaed2af0c77097be9f2426940b717f2d56200cac6715da50e95c6d6aa1c9db84c0cee7 SHA512 dd16bbd4e60c8ba983524471d0933d3578e932d982777ce04bebfda0a1cebe67be9de76b11b85240f719b24299453c1051bcc6149ec8e2476337249c309cf585
diff --git a/dev-libs/xapian/xapian-1.4.17.ebuild b/dev-libs/xapian/xapian-1.4.17.ebuild
index 7e15ee8d1093..014458b80acc 100644
--- a/dev-libs/xapian/xapian-1.4.17.ebuild
+++ b/dev-libs/xapian/xapian-1.4.17.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index eea8ff763ce0..3338a08a9959 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/lua-argparse/Manifest b/dev-lua/lua-argparse/Manifest
index caa2c8330f05..40f34c1e54dd 100644
--- a/dev-lua/lua-argparse/Manifest
+++ b/dev-lua/lua-argparse/Manifest
@@ -1,4 +1,4 @@
 DIST lua-argparse-0.6.0.tar.gz 36712 BLAKE2B 88882738453a894db68ef93557d870393eaec1fb2bf39b110bd2691678d26be64734d07c7f01f760d9c1d031e530707449ff2ca54a5cdd428cb8da3b1897a7e1 SHA512 7efdfab8ec563a9e7eddc7aff760fd4d3605df2896939af3f2c80e5ed4d4e5ba45a7815057e15446d242351a6fd139d6b8da802fe318d4a4bcd69918fece53d1
-EBUILD lua-argparse-0.6.0-r1.ebuild 1149 BLAKE2B 76a7482ee0faf569658097d6320bdf59ae5b6b76934e38be58a2c99fbd694950576e1adad222428ca71200b835ec4482f5502ab711be156b53cefe7361560a92 SHA512 270fc4f26278d07eb29e2df4618cb8ba187c9c5fa8ba8870b89c6f905562a1cbf1cdaee589fe4d7677b1bf113a964e6c11419b441fb4217cf21f90594e757486
+EBUILD lua-argparse-0.6.0-r1.ebuild 1146 BLAKE2B 382c785c1617758670b6879803f474b6fe6f4703455275d646786a98e8904b816d0720faa7974c8cb203138c6e57a4e393f3c1eec69df6e7491948a6e8d1180c SHA512 cfe6dec3245b0ab8cbc0b089efcf1e8c25c6423968e41d9d2045e86f5bf6f2f9a0cd77ff34e1fb5aa5688178668a231355e3702ee1a027b361fe19babcd2339e
 EBUILD lua-argparse-0.6.0-r100.ebuild 1138 BLAKE2B ada852b0d22da5c1dda57dca8042d65312785550c4e1e4210178f04f695d1a2e0eed1c89ffae1ae0b94167aea1a9b4b95325e51fd806e69c7f8d8bd4d48e5388 SHA512 b89d6782f57a4798b0efcf209853c9e9d9cc9c820f5d307260ccb9f84dd1475c27a554722a60d01c14cb9da6096fffd5b4f619d8040c8fee4436a073a7cfbfe4
 MISC metadata.xml 861 BLAKE2B a185dce4492228d1c0ec03fc8a089d78eb4403e77065f0da15e5630e84a795deae30cf7659f57f2472f27f2e49b019b0cf8fdee12e6f269c386e1f3b37171060 SHA512 ad9a84be1da77dca8025a79c4b4390cbf8597e9eac7e0fbe3cf0a195d143a0e18363f7f5a7e2045adc7f6872d99ba13ff8bc19c12390235d9bcc1933dc8a581e
diff --git a/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild b/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
index 3792ecb4606d..62d48b6a7ca9 100644
--- a/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
+++ b/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mpeterv/argparse/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ppc ppc64 x86"
 IUSE="doc luajit test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/lua-cjson/Manifest b/dev-lua/lua-cjson/Manifest
index fb73a0212ed6..f07a0d22a892 100644
--- a/dev-lua/lua-cjson/Manifest
+++ b/dev-lua/lua-cjson/Manifest
@@ -1,6 +1,11 @@
+AUX lua-cjson-2.1.0.8-lua52.patch 3588 BLAKE2B 989bd667dd62cf7b39c0188c1fcf94d6890e9839c662e75782bba26faf9fa35c7def97c172c74ec8cb3eb07a0413aa66e7b860d07c2caf459be52ec37450dd1f SHA512 9f16ae9d7885d835252a49208e00199ee8d4bf10790a9b2e696026171831b4a579938ecf7f980631f3fccee55f1d000212dfea80d1ebc22743550847d43f1d26
+AUX lua-cjson-2.1.0.8-sparse_array_test_fix.patch 1084 BLAKE2B 3f6e439b54602a8fb07badb87bd53ce8affbb53f7434a32677b1de0cfc92b6f9f75f21a7c09763649c5cbadf59a8647d704cce1e0e98207e72bb696c9cb8ddbe SHA512 31358192ecff4a06ef045cf8b3d8f717e65674752e1ae70a8e87a487e89a4819448285c537ef5393b05bbb285a0708be37bd7dafa9b8bacbf4bb0e8bdd9fdb67
 AUX sparse_array_test_fix.patch 1643 BLAKE2B 6967eefee4a1bf3bdf14f7c2cd56814642adf4321007fc3a9b7f5e4022f468006e8674e6832d3a5fe1ef995b360de6e60bf738a6c3664f78d80d1000380939ae SHA512 597a4eeb180177ccb72f025b9abefe339b845ad188cd6287036905ab613aa36df24f0b51a515bb1718a0286e64b5b12a0cb8864dea2203b69407f9bc665ce393
 DIST lua-cjson-2.1.0.6.tar.gz 76820 BLAKE2B 1056fefc8d9c802e068e1e7801cc1eb3a0279371ab72e4e8517e22ad68224dd4892f4e4cbfe0a407af71f1008affded41d7bcc05d89c4ddb0c437d93d67708a7 SHA512 71d25f4ec82641d56e33e13c0ecd8c60186b3c4faf3d30de81706d1305d4e61691a1e84210462942674e50ca2ff19e126cb04025d9645d5d26ef3b3b0e46f64b
 DIST lua-cjson-2.1.0.7.tar.gz 76949 BLAKE2B 9189890f24885191001e79cf0f48aaee74026572eda3e767b0e5e63d44634156fd2b972287cb23e243b3fd0f44f8e87a1fcb0c0b8e26197c63e5e0ff30cb3a94 SHA512 c66fbb608dcd1b7daef8c70ad9a60ab442bf8b851b8d8c5e3b11854ab476dff115e2eef31f171a40ce364778682ce351114caf36c995521ec589bd9dd94415c5
+DIST lua-cjson-2.1.0.8.tar.gz 77211 BLAKE2B 227171576318939ab48abe26e87fa905cf9a15e6ff44065c0713b6a6fedac571f1dbbb88526b957836a4368e71c4d19a748b2a3250221572f580f1d32ccf50a0 SHA512 577278ccb58a23ea56ea9ad34c5fb0a07c13c6691a3b666f58fa6427bca269aaec26271d7400dcd253c922d1bb0b3b322915a2ce139880c1ed4c1d2c15437580
 EBUILD lua-cjson-2.1.0.6.ebuild 1051 BLAKE2B d9bef905dc69033611379de72f7216e1766c659d4e0c12ad7875857bc8af1991b874880130acb0ef9e150a8f2028e1a94327727cbbe1bde3d9a2f477d37dfbf9 SHA512 e9d21719becf80e547404c1a28f2cc07197fff512df92b8535a91889dc5d57b0b95d7b5c744d2e11c6dae38f34934b0bdaeddeb59ec32fb8e1b49857f05d7771
 EBUILD lua-cjson-2.1.0.7.ebuild 1051 BLAKE2B d9bef905dc69033611379de72f7216e1766c659d4e0c12ad7875857bc8af1991b874880130acb0ef9e150a8f2028e1a94327727cbbe1bde3d9a2f477d37dfbf9 SHA512 e9d21719becf80e547404c1a28f2cc07197fff512df92b8535a91889dc5d57b0b95d7b5c744d2e11c6dae38f34934b0bdaeddeb59ec32fb8e1b49857f05d7771
-MISC metadata.xml 678 BLAKE2B fa30839c521f01f875cc3eb8d0a4904975306436464e475acc0aee9acc2f856fc8895444344acda575a69be8d9e35a25f1bd8f4efccb0f174621f54aaa5e1775 SHA512 d4ed2bdea1df6a8ca3a0d4d1405f2e2c1ecd38d0229d6b5a3264c4ffabc4487a52e558fd56cf2903ff7ada9a7cb7204245bf5288a0834ff520a111c814b1e0a2
+EBUILD lua-cjson-2.1.0.8-r100.ebuild 2011 BLAKE2B 5aafff2cd5201a5db81f1ba16f22f2a7e60a8ec94f352231d34fa0ff04b63f0e90b0714f42084ee9bfbdffba27f045eeec21319ac586b95833ebf17b7b9646de SHA512 08abb466a3e4fdf7a07ac8e64d9c86f76a99ccad21b7cacae3c13b1db0c09b832c1017589423dcfa2fc20ad1092982ea9c525d9703cd94a5be793adbb1a68fa2
+EBUILD lua-cjson-2.1.0.8.ebuild 1660 BLAKE2B 601d00a060462cafbc1107947387fd73c9ceefcb1aa8e901e16ee63d526192459ec900bdcea19a8f25aae3c87d53915c6a846bbaf5cc564ae15f14f0a352ca6e SHA512 2cacc3460386d732aa9be52ba12a165166d0634a2c8e74bf26c6dba156eccefe060bbe9648256c2dd7b1c0e664e4ccf5b2d3f1ed979ab9b565a400478c78ec0a
+MISC metadata.xml 779 BLAKE2B 605a71234ea6e3f8eb770b56cdd725cdc244b643c9676afa4552b3f2ef24d6a1c6d96c0468768b16412a8bbaf5ba29b177a57aec6c7a3c006f16da955d952dd7 SHA512 be9492a64cd4be16f395ec49aa031fed8dcddf844df243cd8456452f002098a2cb47ce1e99dffa0843661986ec5352f4feb749578ee5a63a8b47624c3ffae022
diff --git a/dev-lua/lua-cjson/files/lua-cjson-2.1.0.8-lua52.patch b/dev-lua/lua-cjson/files/lua-cjson-2.1.0.8-lua52.patch
new file mode 100644
index 000000000000..8f8c98243f1f
--- /dev/null
+++ b/dev-lua/lua-cjson/files/lua-cjson-2.1.0.8-lua52.patch
@@ -0,0 +1,143 @@
+From e8dddaf2c9c370f3676441304955d81543c5cceb Mon Sep 17 00:00:00 2001
+From: leaf corcoran <leafot@gmail.com>
+Date: Sat, 21 Sep 2019 17:31:38 -0700
+Subject: [PATCH 1/5] support lua 5.2 with LUA_COMPAT_ALL
+
+---
+ lua_cjson.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lua_cjson.c b/lua_cjson.c
+index 2a69699..83118b1 100644
+--- a/lua_cjson.c
++++ b/lua_cjson.c
+@@ -36,6 +36,9 @@
+  *       difficult to know object/array sizes ahead of time.
+  */
+ 
++
++#define LUA_COMPAT_ALL 1
++
+ #include <assert.h>
+ #include <stdint.h>
+ #include <string.h>
+
+From 2b3c3c866701a0110a6ac50a9bec9f23adc2956e Mon Sep 17 00:00:00 2001
+From: leaf corcoran <leafot@gmail.com>
+Date: Sat, 21 Sep 2019 18:01:05 -0700
+Subject: [PATCH 2/5] support lua 5.3 with LUA_COMPAT_5_1
+
+---
+ lua_cjson.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lua_cjson.c b/lua_cjson.c
+index 83118b1..9d25f7c 100644
+--- a/lua_cjson.c
++++ b/lua_cjson.c
+@@ -38,6 +38,7 @@
+ 
+ 
+ #define LUA_COMPAT_ALL 1
++#define LUA_COMPAT_5_1 1
+ 
+ #include <assert.h>
+ #include <stdint.h>
+
+From 639c4a38bf0b1bddef4bfdb22bb6a3f8493cc3fe Mon Sep 17 00:00:00 2001
+From: leaf corcoran <leafot@gmail.com>
+Date: Sat, 21 Sep 2019 18:18:27 -0700
+Subject: [PATCH 3/5] Lua 5.2+ unpack support
+
+---
+ lua/cjson/util.lua | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lua/cjson/util.lua b/lua/cjson/util.lua
+index 5d80106..48fa33c 100644
+--- a/lua/cjson/util.lua
++++ b/lua/cjson/util.lua
+@@ -1,5 +1,7 @@
+ local json = require "cjson"
+ 
++local unpack = unpack or table.unpack
++
+ -- Various common routines used by the Lua CJSON package
+ --
+ -- Mark Pulford <mark@kyne.com.au>
+
+From 9163dd3c431bd7ab45bdb218c32c8c9633ddf2cc Mon Sep 17 00:00:00 2001
+From: leaf corcoran <leafot@gmail.com>
+Date: Sat, 21 Sep 2019 18:43:47 -0700
+Subject: [PATCH 4/5] Lua 5.2+ maxn support
+
+---
+ lua/cjson/util.lua | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/lua/cjson/util.lua b/lua/cjson/util.lua
+index 48fa33c..2405257 100644
+--- a/lua/cjson/util.lua
++++ b/lua/cjson/util.lua
+@@ -2,6 +2,16 @@ local json = require "cjson"
+ 
+ local unpack = unpack or table.unpack
+ 
++local maxn = table.maxn or function(t)
++    local max = 0
++    for k,v in pairs(t) do
++        if type(k) == "number" and k > max then
++            max = k
++        end
++    end
++    return max
++end
++
+ -- Various common routines used by the Lua CJSON package
+ --
+ -- Mark Pulford <mark@kyne.com.au>
+@@ -194,7 +204,7 @@ local function run_test(testname, func, input, should_work, output)
+     local result = {}
+     local tmp = { pcall(func, unpack(input)) }
+     local success = tmp[1]
+-    for i = 2, table.maxn(tmp) do
++    for i = 2, maxn(tmp) do
+         result[i - 1] = tmp[i]
+     end
+ 
+
+From c390998582b959389d0fc039743c96e861902587 Mon Sep 17 00:00:00 2001
+From: leaf corcoran <leafot@gmail.com>
+Date: Sun, 22 Sep 2019 13:43:18 -0700
+Subject: [PATCH 5/5] use macro instead of header defines for Lua 5.2+ support
+
+---
+ lua_cjson.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lua_cjson.c b/lua_cjson.c
+index 9d25f7c..718a5b9 100644
+--- a/lua_cjson.c
++++ b/lua_cjson.c
+@@ -36,10 +36,6 @@
+  *       difficult to know object/array sizes ahead of time.
+  */
+ 
+-
+-#define LUA_COMPAT_ALL 1
+-#define LUA_COMPAT_5_1 1
+-
+ #include <assert.h>
+ #include <stdint.h>
+ #include <string.h>
+@@ -105,6 +101,10 @@
+ #define json_lightudata_mask(ludata)    (ludata)
+ #endif
+ 
++#if LUA_VERSION_NUM > 501
++#define lua_objlen(L,i)		lua_rawlen(L, (i))
++#endif
++
+ static const char * const *json_empty_array;
+ static const char * const *json_array;
+ 
diff --git a/dev-lua/lua-cjson/files/lua-cjson-2.1.0.8-sparse_array_test_fix.patch b/dev-lua/lua-cjson/files/lua-cjson-2.1.0.8-sparse_array_test_fix.patch
new file mode 100644
index 000000000000..e031672dae33
--- /dev/null
+++ b/dev-lua/lua-cjson/files/lua-cjson-2.1.0.8-sparse_array_test_fix.patch
@@ -0,0 +1,31 @@
+--- a/tests/test.lua
++++ b/tests/test.lua
+@@ -10,6 +10,17 @@
+ local json_safe = require "cjson.safe"
+ local util = require "cjson.util"
+ 
++local function json_encode_output_type(value)
++    local text = json.encode(value)
++    if string.match(text, "{.*}") then
++       return "object"
++    elseif string.match(text, "%[.*%]") then
++       return "array"
++    else
++       return "scalar"
++    end
++end
++
+ local function gen_raw_octets()
+     local chars = {}
+     for i = 0, 255 do chars[i + 1] = string.char(i) end
+@@ -292,8 +303,8 @@
+       json.encode, { { [1] = "one", [4] = "sparse test" } },
+       true, { '["one",null,null,"sparse test"]' } },
+     { "Encode sparse array as object",
+-      json.encode, { { [1] = "one", [5] = "sparse test" } },
+-      true, { '{"5":"sparse test","1":"one"}' } },
++      json_encode_output_type, { { [1] = "one", [5] = "sparse test" } },
++      true, { 'object' } },
+     { "Encode table with numeric string key as object",
+       json.encode, { { ["2"] = "numeric string key test" } },
+       true, { '{"2":"numeric string key test"}' } },
diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild b/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild
new file mode 100644
index 000000000000..c7ff3172c0be
--- /dev/null
+++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="A fast JSON encoding/parsing module for Lua"
+HOMEPAGE="https://www.kyne.com.au/~mark/software/lua-cjson.php https://github.com/openresty/lua-cjson"
+SRC_URI="https://github.com/openresty/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+internal-fpconv test +threads"
+REQUIRED_USE="
+	threads? ( internal-fpconv )
+	${LUA_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-lang/perl )"
+
+DOCS=( "manual.txt" "NEWS" "performance.txt" "README.md" "THANKS" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.0.8-sparse_array_test_fix.patch"
+	"${FILESDIR}/${PN}-2.1.0.8-lua52.patch"
+)
+
+src_prepare() {
+	default
+
+	# Don't install tests
+	sed -e '/cd tests/d' -i Makefile || die
+
+	lua_copy_sources
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"CFLAGS=${CFLAGS}"
+		"LDFLAGS=${LDFLAGS}"
+		"LUA_INCLUDE_DIR=$(lua_get_include_dir)"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	if ! [[ ${ELUA} == "lua5.3" ]]; then
+		pushd "${BUILD_DIR}" || die
+		cd tests || die
+
+		ln -s "${BUILD_DIR}"/cjson.so ./ || die
+		ln -s "${S}"/lua/cjson ./ || die
+
+		./genutf8.pl || die
+		./test.lua || die
+
+		popd
+	else
+		ewarn "Not running tests under ${ELUA} because they are known to fail"
+		ewarn "See: https://github.com/openresty/lua-cjson/pull/50"
+		return
+	fi
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"DESTDIR=${D}"
+		"LUA_CMODULE_DIR=$(lua_get_lmod_dir)"
+		"LUA_MODULE_DIR=$(lua_get_lmod_dir)"
+		"PREFIX=${EPREFIX}/usr"
+	)
+
+	emake "${myemakeargs[@]}" install install-extra
+
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.8.ebuild b/dev-lua/lua-cjson/lua-cjson-2.1.0.8.ebuild
new file mode 100644
index 000000000000..2b1199417496
--- /dev/null
+++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.8.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A fast JSON encoding/parsing module for Lua"
+HOMEPAGE="https://www.kyne.com.au/~mark/software/lua-cjson.php https://github.com/openresty/lua-cjson"
+SRC_URI="https://github.com/openresty/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+internal-fpconv luajit test +threads"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="threads? ( internal-fpconv )"
+
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( dev-lang/lua:0 )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-lang/perl )"
+
+DOCS=( "manual.txt" "NEWS" "performance.txt" "README.md" "THANKS" )
+
+PATCHES=( "${FILESDIR}/${PN}-2.1.0.8-sparse_array_test_fix.patch" )
+
+src_prepare() {
+	default
+
+	# Don't install tests
+	sed -e '/cd tests/d' -i Makefile || die
+}
+
+src_compile() {
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"CFLAGS=${CFLAGS}"
+		"LDFLAGS=${LDFLAGS}"
+		"LUA_INCLUDE_DIR=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'includedir' 'INSTALL_INC') $(usex luajit 'luajit' 'lua'))"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	cd tests || die
+
+	ln -s "${S}"/cjson.so ./ || die
+	ln -s "${S}"/lua/cjson ./ || die
+
+	./genutf8.pl || die
+	./test.lua || die
+}
+
+src_install() {
+	local myemakeargs=(
+		"DESTDIR=${D}"
+		"LUA_CMODULE_DIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
+		"LUA_MODULE_DIR=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
+		"PREFIX=${EPREFIX}/usr"
+	)
+
+	emake "${myemakeargs[@]}" install install-extra
+
+	einstalldocs
+}
diff --git a/dev-lua/lua-cjson/metadata.xml b/dev-lua/lua-cjson/metadata.xml
index 5b6408370bec..a4d07bda238c 100644
--- a/dev-lua/lua-cjson/metadata.xml
+++ b/dev-lua/lua-cjson/metadata.xml
@@ -5,7 +5,11 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<longdescription lang="en">
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
 			OpenResty fork of mpx/lua-cjson, includes a few bugfixes and improvements,
 			especially to facilitate the encoding of empty tables as JSON Arrays.
 	</longdescription>
diff --git a/dev-lua/lua-utf8/Manifest b/dev-lua/lua-utf8/Manifest
index 8383debcfe7d..927faf8456bc 100644
--- a/dev-lua/lua-utf8/Manifest
+++ b/dev-lua/lua-utf8/Manifest
@@ -1,4 +1,4 @@
 DIST lua-utf8-0.1.3.tar.gz 41830 BLAKE2B 72982c7ec8d8837e391fa6bfb689c1e9f4a7746d0cbc058556f06027b4af00c936036f87baf58f45e1169fd3ea7e6d8174629d5a7279205622cf0710971ca29c SHA512 d0abe73fecbfeba36083c135d77962d953ad9e431721a2557669c912a2703e31c46f84f2ee9ee4ac966a5bcc88d4daef930f8d2d8e72106fa61010509c183e29
 EBUILD lua-utf8-0.1.3-r100.ebuild 1483 BLAKE2B b6a26a8189ccd3827be307d6be311fad82860c47c168cf382174933ed479071f359b046080fe4870076d87b7aeab3ab14c908749cc608d0dd17dc721065df19a SHA512 3c5666cc402e5f6fe71de35209d0ada6bb81ae1bd23d1c1bb753cfb76728c64c00fb4b755faed5c26fd52dd67348f3bd0a715f46db8d41a37862229865648e4e
-EBUILD lua-utf8-0.1.3.ebuild 1351 BLAKE2B 34fb71ba3103051e3a16e6f1985643bdfb8d2967039456ef053393799a619719e0e9e32fb70fd3bbb4c33caafa98182928f5e63eca74f3488b0d67a520c47d21 SHA512 cb16b1bc5d11ab71546fdfec2525e203fd7fb78e0c24f249d8a60572e03a92e00ce3e5220378755060af5da55812710b2576218f2d344bc97a3aa6d4d6e5b2f6
+EBUILD lua-utf8-0.1.3.ebuild 1348 BLAKE2B 5a9090462f62f59396026eb56a547c610f88d6cacc0f64b547895b64363183f97e82d256f97ab25a0609d07640f9a59526d094a3bc4c195e69a560488cb37bdc SHA512 ef55045adfa1b32972d88b1231b43964cb8f4e19f18a2102ab38b068a5ad8a01e397d6309322338a6ca72da155fa33a1a623d1decedcd86cbb563ddc0f9cec74
 MISC metadata.xml 750 BLAKE2B 95215f3aed5389197a071e67411702a07102387343c568c02b48ada5b2f3c0f01b99bb895bd4f11e2c558fc7d352da1afece2b46ea6d63edbfa322ccc7c651cd SHA512 cf8fd4d207d9827fb1a7349f89fa0faf0d1ad38989ebc29dabde5dcee73e718183655a1b8c9f0074f16ea7878bd1d4dbf7e53f65f5003946fddf901c9568d4cd
diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild b/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild
index 6ac8dd788d93..0955c5894c44 100644
--- a/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild
+++ b/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN//-/}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ppc ppc64 x86"
 IUSE="luajit test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/luacheck/Manifest b/dev-lua/luacheck/Manifest
index 007b5ef6ed44..d9290410cc5c 100644
--- a/dev-lua/luacheck/Manifest
+++ b/dev-lua/luacheck/Manifest
@@ -2,6 +2,6 @@ AUX luacheck-0.23.0-disable-measuring-performance-test.patch 446 BLAKE2B 42c83ec
 DIST luacheck-0.20.0.tar.gz 132693 BLAKE2B d485ef841c00241023a9cb9bd0e1f994da3b5e79dad01281e0203e1561f788f8d1e8db97910d3a82ab3daafb3dceef1fe2897beee9f16e71350fdff27eba7fe0 SHA512 08b1a64849b329e6ad71b1d7011fac0833de068641270adaa009e9a17139968ab73add3786a508a8787ce1fcfe1f028a35b5434221e4f1f62bea56833e0e65dd
 DIST luacheck-0.23.0.tar.gz 158201 BLAKE2B c0780143a335b1deb7725819dbdac03446742fd459eed5a6de0cf3de5576f3be5379ff7086348b8880eba70dd5f7a1e719e9a09fdcc70abc293e1636f575ad57 SHA512 d76e4b22f1e9d868a8531ad51fb98607e5bfb1fbbd55053105d9978ba6c0455de99202c53d4e199733ea997863b26527fb84e7e9717209fd588f1d02db9db028
 EBUILD luacheck-0.20.0-r1.ebuild 1057 BLAKE2B 1505be0b11667f9f6799fd1ce6429d79c0086370dcdea86edf2dcfa4608fb6b482489dae8eee12f9446cb9b7bd3f87ea782c73e3b81bca45264620e2386f340a SHA512 970f2604a98b7799dbef9eebab8519bf3d3c331a8c4e734ec7bf419dd847c6eb04d490e05360bef9e8d595a77cd2fa8f0a23c8befc940f2af3c6ab19fab87ecf
-EBUILD luacheck-0.23.0-r1.ebuild 1245 BLAKE2B 419b4998592a0a6b66ae6890e2ab68510c718ecd8d9472423861f461345ce7d2c25c78a12e4c5834650b12a3a28aadf6eaab017fc2678393bd7e04fcfdf25477 SHA512 39c2fdcb5f5fa5aa5ab0e2bbcfd98bebfc2649b9c2cc13a687704b709a46c0c1d49b14986ff9a5cdba151b1e8f25ee27bac2f3a949cd441ae2579d567833cc62
+EBUILD luacheck-0.23.0-r1.ebuild 1244 BLAKE2B 261cb0bcbc4f11ea057a16476601cc50a6a51bdd48c8c07057c2048fdbdd0be9e99a7b14831ec90caf75e00be68b4580b83aa61011129470a3cc09e5c5edd4f6 SHA512 5cfaac15060ae241da5e88da0617e0a24f2348fe889ca1f394178ff65c8148a1eec037f1691524124ed28875ee18615e083faa0aba61be03e2636ca015d4071e
 EBUILD luacheck-0.23.0-r100.ebuild 1233 BLAKE2B 0f0c4a4a006df2c9060edfb516f39523165f057b43fa2fa133344993a7221b1a247fe682893c858b7d31f21f5b81a6cbfc5049aa88b138c445832db2d144cfc4 SHA512 cbddb5dd61591e2caae6d78f4a4b5cf04625b809f7e0717cbdfa8f4cab311426bdba711e6d215f5d5f61c4959a6594e269279d5506ca185c84ee65498a019677
 MISC metadata.xml 829 BLAKE2B 76e2e67f3ea5dc70f37a6f3e54a6afc12de689026de589b9d644766c443b62cd66068db5c56d3e63312920adb1d2ecb74a1b2515c4f36790dda650a499a81589 SHA512 c27495f97fda460389d0cc74fa97839ea0837f62997ca3e1b5ae4b70bb7d78f15d81012fc151c1c11ec00079e2ebc1121c61bdd86cbaf137e7eeccf5207e63f6
diff --git a/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild b/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
index b77c92185f5a..7b73feeb8b9d 100644
--- a/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
+++ b/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mpeterv/luacheck/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc64"
+KEYWORDS="~amd64 arm ppc64"
 IUSE="doc luajit test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/luacov/Manifest b/dev-lua/luacov/Manifest
index 6350be172825..9ab280a300cd 100644
--- a/dev-lua/luacov/Manifest
+++ b/dev-lua/luacov/Manifest
@@ -1,4 +1,7 @@
 AUX luacov-0.8-fix-makefile.patch 681 BLAKE2B b3f81e28207a97a774a4da75723d006ab043bc4363757ffee44e7b456b44e5ce31e8dcea5dc6f5989595ebef98f4c546c5ae64dc52be7dbc3e2243f9bcad597b SHA512 603ac926108e30d511ac0fba66576fbbf7b98b468bed1a0026addf6f0361b38e41b9d967f983b3a8147b853055538e2ec2f87efc896542e87b73073bc0a881ba
+DIST luacov-0.14.0.tar.gz 49571 BLAKE2B 2248fc00e1af0a1cdec923bbe6150ae682cc1ba814c77f21bc86269d723ea80542fb48fe62980de2527040598b7b9c87f92f146d6c62abde06651fa6733c75c5 SHA512 44ea158ce597f705d80b9768676e401804daea91b9c2afb146a8d25aae612e895e4f42a29c4b7b3438659c596fa500af5d23b66b7f3477459747ad06ca9b7ffa
 DIST luacov-0.8.tar.gz 33613 BLAKE2B 942c47de25dbd53de445e1ed1fa924f1be278da4c3b134e4a603f4a5ab5090f87d762c48163cf82ed9bab585e35b0528c330b3dc849e0043ccc96532107c8a94 SHA512 03d6ee519a570ff0430bcc32f547b9beb01691bd8c7ad8655e78d732223c6c25e4a63d816fd99640568251b836d5e3cc736bd5d780f5ecd3986d855ed5edfa11
+EBUILD luacov-0.14.0-r100.ebuild 926 BLAKE2B ae2b4f00201d9a4d17ffabd7ea0d070fded35bc937a8104a4fd9c197911be780cb1c1026498bc9f5d02e4d85b1c4014ea6fa9b4ea4013bbe9bdf9839289672ca SHA512 85d48dead19eca935b1953c3765ef71095a59c05bb3dfee2ee1d4c024e68e9312fb47c343ea0834ac6adab6e8278e0f0f9daba055c10a3f49808a6e6356742ca
+EBUILD luacov-0.14.0.ebuild 918 BLAKE2B ba1ac686f6c27cd20c60305d033871a32ced04a14568d964c0e0218ded7bdde382bd21c3dd27708518f3d7a5394305c369313830f59d56c9c597d2a751dcf28e SHA512 dffd8fe81badd34b30f934f920db250d5de56ce9ae4c41d3ce79b1ce0a0e588f0394dbc13c5210bd5edeb581984ba71f5a08ed14a0127ab9b698d00a3a092a84
 EBUILD luacov-0.8.ebuild 747 BLAKE2B e10a473a15575943822d8991d1e3a1181f28cfa49e4fdcf433fef147ff412214685fdcd209b6da9eef7e677ad15002a22e1755454a0c86d6213a2ced860bd232 SHA512 e81255d4b67320c740e3365d06d2bd5e4f3325f01a294f65b6dcfc3af4ec07a8538870729f612178239659904566e2274995ee8fe613db57c3353f7ac81711e5
-MISC metadata.xml 333 BLAKE2B 44004b691534cc3e6c3c15893c4072e1d6f6b75efcb60e4b878623905bfe4f58f2d0937dda4d0a390e0cf1180888110a95e8d73dd6c49e12c403127be1ec80f5 SHA512 def342f3921b136c3707595b1fd7065a439c682afc0f26e8cf5074bfad07436e35e7cbe572f1d87d911916991263545348d8c68e9e035789fa3f241710ef7431
+MISC metadata.xml 444 BLAKE2B df7d267a7898a881b15602c91495029c54b064d8a3415ed44d404cad9425ed78269470f632df654291838bfa10e0f34a3dc0deec6f3bae979d6495ea4b4b14c1 SHA512 d9238e357035e46dbb66af1ff1a7a5e1c552b31f5c9cc526183dea163637fb94058a1345cdf73682d49494d9eb9995d802c4b7bcbac54787dbbe6c2a5de42ae1
diff --git a/dev-lua/luacov/luacov-0.14.0-r100.ebuild b/dev-lua/luacov/luacov-0.14.0-r100.ebuild
new file mode 100644
index 000000000000..9f9d91d40d6d
--- /dev/null
+++ b/dev-lua/luacov/luacov-0.14.0-r100.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua
+
+DESCRIPTION="A simple coverage analyzer for Lua scripts"
+HOMEPAGE="https://github.com/keplerproject/luacov"
+SRC_URI="https://github.com/keplerproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-lua/busted[${LUA_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+HTML_DOCS=( "doc/." )
+
+lua_src_test() {
+	busted --lua=${ELUA} || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	insinto "$(lua_get_lmod_dir)"
+	doins src/luacov.lua
+	doins -r src/luacov
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	dobin src/bin/luacov
+
+	einstalldocs
+}
diff --git a/dev-lua/luacov/luacov-0.14.0.ebuild b/dev-lua/luacov/luacov-0.14.0.ebuild
new file mode 100644
index 000000000000..ab0c2bbc60d2
--- /dev/null
+++ b/dev-lua/luacov/luacov-0.14.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A simple coverage analyzer for Lua scripts"
+HOMEPAGE="https://github.com/keplerproject/luacov"
+SRC_URI="https://github.com/keplerproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="luajit test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( dev-lang/lua:0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-lua/busted
+		${RDEPEND}
+	)
+"
+
+HTML_DOCS=( "doc/." )
+
+src_test() {
+	busted --lua="$(usex luajit 'luajit' 'lua')" || die
+}
+
+src_install() {
+	dobin src/bin/luacov
+
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
+	doins src/luacov.lua
+	doins -r src/luacov
+
+	einstalldocs
+}
diff --git a/dev-lua/luacov/metadata.xml b/dev-lua/luacov/metadata.xml
index 772969c18c24..09de5599f7cc 100644
--- a/dev-lua/luacov/metadata.xml
+++ b/dev-lua/luacov/metadata.xml
@@ -5,6 +5,10 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">keplerproject/luacov</remote-id>
 	</upstream>
diff --git a/dev-lua/lualdap/Manifest b/dev-lua/lualdap/Manifest
index 4313ab8e63fd..70b16ed6468e 100644
--- a/dev-lua/lualdap/Manifest
+++ b/dev-lua/lualdap/Manifest
@@ -1,3 +1,4 @@
-DIST lualdap-1.2.0.tar.xz 12380 BLAKE2B 42bf8633a5ccd60f6082b8729b9ba77c8f5486a7bab6cf727fc011856fec244de9f0fa96dd53c23a3fb5932a1670bbb621739c965618671c2c856c41e3faffbb SHA512 02cd3089dc6ca1f60957fa4733dae3cbfb2e13c25b068ddeb51b059701278eb86e359d56a6ef1df28cf514193311323255b36ff036bafda9fcbae0676d90a238
-EBUILD lualdap-1.2.0.ebuild 480 BLAKE2B d7f2260aa801536ec51588632cb09200d7e1c36569224e6670f2fc2d23f673e31fc3243e1446f2459039072fd2c191e3651a73fe0eadb4f449127137ce5afc30 SHA512 0f4f9b83bf358463ed1d9c6484487bd70467ad72d2bacc25dfbb22a9d6a69732673c0d0856c05228561c74b894223cda9459f9eda67826a726f6d6fe3a0e14c4
-MISC metadata.xml 356 BLAKE2B 0f578759801098220f27f47d45f12ffaf8b354c28323ac8fecbc38a52fd69464458eade8a95884093fd68e3c4dccc1e7a26c12c9a8a36a374cd8b7d63647988f SHA512 7d3ae5848accbb89d176bad4960ef96272151ff2b6ae02c1f32608216a19b461a9bcfd8c27a7ea755ef531969404e1e8865b4d9e81c8d292e2e482419d9140d5
+DIST lualdap-1.2.5.tar.gz 85920 BLAKE2B 14015fe258fa391e08fc9b6bdb7a71dae10fbd84636cc3d84c446d67f9d0ea925c0086343a29ce21b81f77c87da37040560c631cdf3df7c8d3c255e5913fd985 SHA512 4fbd7bcea2e55a3b165a7316e4f6c45aee22506915c4cc204d1b5006adbf95611ebf4558c1ef1511f90d7142571cff37ea24952072dc7ecb13bbbe06aef32e72
+EBUILD lualdap-1.2.5-r100.ebuild 1445 BLAKE2B 83928ee3e5d1f7fb97ac5687c8d01a4c22eb8422d9de089492dc8b217a009e6610d8c1104f90d98f1718e75bcdcc3b4e8d9ae52c90652710606051c0c8c93994 SHA512 3b4b758d7a9b1bb436b2bdb59de6f8f7804217b14edefe9575ad77610cf729e8ef0b07f2cb5ac7987a88b00e2dea35eae90dc8b2ea5445c463a98d524e13d148
+EBUILD lualdap-1.2.5.ebuild 1292 BLAKE2B 6a7d2f6dbdcab3305591b316ed8bf5d52bdbd6c46dee9b543cb49c04c53b4c32b504553ee0e60e31166d8f1a38036891bd9f336cfa84a2955992a9a0d3de3e2f SHA512 d6d0cb3ae13eb7b562b515805b3bcc5bdf1fdc17b50aadd000bd8fbb2d6cf4363d72d242ddf944cd05d93620e3e5dcbea5a5d0c8499767e4c4865efc4d8cb5a8
+MISC metadata.xml 547 BLAKE2B eac91a6aa0723c8442142daad10af992c7142bafbe29f9ec748418b49eac2dc4bbd034ae4994026238eb8f7339f9d86e7c823f3c33a54a4fbde13e8f2fe8ddff SHA512 d893b983ca2b1bba4de32a90f9b0df79fdb30ee937d978ae506b2c07c7ae6d9d0d8c4e9ecbf09f6e2b4d54e95bef8482035b63672a41119e30d74244674c3f10
diff --git a/dev-lua/lualdap/lualdap-1.2.0.ebuild b/dev-lua/lualdap/lualdap-1.2.0.ebuild
deleted file mode 100644
index 38007f295ddf..000000000000
--- a/dev-lua/lualdap/lualdap-1.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-MY_PN="LuaLDAP"
-
-DESCRIPTION="Simple interface from Lua to OpenLDAP"
-HOMEPAGE="https://git.zx2c4.com/lualdap/about/"
-SRC_URI="https://git.zx2c4.com/${PN}/snapshot/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND="dev-lang/lua:* net-nds/openldap"
-DEPEND="${RDEPEND}
-	net-nds/openldap
-	virtual/pkgconfig"
diff --git a/dev-lua/lualdap/lualdap-1.2.5-r100.ebuild b/dev-lua/lualdap/lualdap-1.2.5-r100.ebuild
new file mode 100644
index 000000000000..af582b86b150
--- /dev/null
+++ b/dev-lua/lualdap/lualdap-1.2.5-r100.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="A lua binding for the OpenLDAP client libraries"
+HOMEPAGE="https://github.com/lualdap/lualdap"
+SRC_URI="https://github.com/lualdap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="
+	net-nds/openldap
+	${LUA_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+HTML_DOCS=( "doc/us/." )
+
+src_prepare() {
+	default
+
+	lua_copy_sources
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LBER_LIBDIR=/usr/$(get_libdir)"
+		"LDAP_LIBDIR=/usr/$(get_libdir)"
+		"LUA_INCDIR=$(lua_get_include_dir)"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	pushd "${BUILD_DIR}" || die
+	LUA_CPATH="./src/?.so" ${ELUA} tests/test.lua
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	# Workaround, as 'make install' does not create this directory
+	dodir "$(lua_get_cmod_dir)"
+
+	local myemakeargs=(
+		"DESTDIR=${ED}"
+		"INST_LIBDIR=$(lua_get_cmod_dir)"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/lualdap/lualdap-1.2.5.ebuild b/dev-lua/lualdap/lualdap-1.2.5.ebuild
new file mode 100644
index 000000000000..9d530b5b471e
--- /dev/null
+++ b/dev-lua/lualdap/lualdap-1.2.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A lua binding for the OpenLDAP client libraries"
+HOMEPAGE="https://github.com/lualdap/lualdap"
+SRC_URI="https://github.com/lualdap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="luajit test"
+RESTRICT="test"
+
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( dev-lang/lua:0 )
+	net-nds/openldap
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+HTML_DOCS=( "doc/us/." )
+
+src_compile() {
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LBER_LIBDIR=/usr/$(get_libdir)"
+		"LDAP_LIBDIR=/usr/$(get_libdir)"
+		"LUA_INCDIR=$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	LUA_CPATH="${S}/src/?.so" $(usex luajit 'luajit' 'lua') tests/test.lua
+}
+
+src_install() {
+	# Workaround, as 'make install' does not create this directory
+	dodir "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
+
+	local myemakeargs=(
+		"DESTDIR=${ED}"
+		"INST_LIBDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	einstalldocs
+}
diff --git a/dev-lua/lualdap/metadata.xml b/dev-lua/lualdap/metadata.xml
index 485a025884ba..aa61238027f4 100644
--- a/dev-lua/lualdap/metadata.xml
+++ b/dev-lua/lualdap/metadata.xml
@@ -9,4 +9,11 @@
 		<email>zx2c4@gentoo.org</email>
 		<name>Jason A. Donenfeld</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lualdap/lualdap</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/luaossl/Manifest b/dev-lua/luaossl/Manifest
index 5dcdb72f8d80..b317fa06449e 100644
--- a/dev-lua/luaossl/Manifest
+++ b/dev-lua/luaossl/Manifest
@@ -1,9 +1,4 @@
-DIST luaossl-20150727.tar.gz 355486 BLAKE2B 81907c3a3f565432eb2d2b17db48f381496837924ce999a58a4528a46b1b43fdd7b14041bab2a4536c89a37c6f31926f353d1bb1997e9ffd57ab6e2cfb83b6ef SHA512 de565ff7b9ac07493e771045b05902dd64e8b6c458180dd03d08cf900067d1b9cb88385c69dc29fb45774e4ec36b563cab705b34d37cec2f5cc792cf4f7b5049
-DIST luaossl-rel-20180708.tar.gz 455381 BLAKE2B d57e27638e6aee44a94f85094bab9161f0b87bdb379863fdef4517a1cb3415f4ef7e62967ee1e3fa2dde4d5629a24d732dc8ea0fd2ea54ccd84f69c4b18e2c57 SHA512 b2a73a7e7ace9a01c8c5a26603107f7741de88de32c393ed9134b70d55278c81d48e357955e671654825de282449b9570ecdc6a4fbcf4890439c0200ba471338
-DIST luaossl-rel-20181207.tar.gz 472294 BLAKE2B 1dd991cd73a432b7f8918d391bd3cbea98d77d4bd6390815840e3c7f63e98b9bcca6d9a4841da663ba7ecaa19880a4f3db4fce09d47d103cfd85f8d920efe84d SHA512 e5412c115d0dda3b3f2446ffd9a8d9b78be3800e834d7a43ec2cde16e56798fe2467d91add3ab8030321e6bf1a12349ecd5987dd88216ab0d7ba4ff451f0fb91
-DIST luaossl-rel-20190731.tar.gz 350324 BLAKE2B ff80f8ef69472eb0bb908d292f906d4d2be30b6350b04ecc4b4f6414aa6c6d44109a99187d6a89519d60b23ff9259bdda48bf0e51032785abee2002611037033 SHA512 09315deb0c40b59230d80262906cb9f067660242315544179ec5df57a028b088c56a4bb0b944e5975bccf86d521901eae36006c5623ec1159cfca94d05fb6890
-EBUILD luaossl-20150727.ebuild 1008 BLAKE2B 13aa6f30dc48ce88bea032225c5e82eb9bc7b98b692a9fe4554bd71c17e8d5e7b86a79e0adb50cb79ca06255da7185b7f2b1e1ac730ffa66ae39587475ee07b8 SHA512 76e0a12cf036ed3ca5c26248d6263540f4924469a42dda5ff48f1f485f1abf6de5714613f75a5fcd6bcb3b35030c45c1f35dcc17ad91b47f1c71d1b2cfbe4cd9
-EBUILD luaossl-20180708.ebuild 921 BLAKE2B 7124683a0b21b71e8785ab8517012a9750a366afcb9eb5f1b82d5917fff5527499369ef7ed4891165e42a18fb09bd83763952d778b92db46838bcdb2dbf5276b SHA512 587d420d87f6b4f27e3267eaa12a96d5993cf557a43ba06f603a9acbe04231837368c6dedf0929d6025cd886981ccc120eab5c86517e509edb312d112ff78e22
-EBUILD luaossl-20181207.ebuild 918 BLAKE2B 7a5c045918ede1bc8e78cb196995c348a52de086ae2328f0684ca7fd383ad55a86379581be2e590e2f072ad766cf74c7f0cc8f853fd5b51422bacb66ba6cae58 SHA512 d8964fe24ca6c5f54f0d03b7ae597f2a427c4e0787d99f4b18f9c3e60709b9150d0047613389409d9e79b295dc50c49322c25894b7b7f6f08625633674c2663e
-EBUILD luaossl-20190731.ebuild 918 BLAKE2B 7a5c045918ede1bc8e78cb196995c348a52de086ae2328f0684ca7fd383ad55a86379581be2e590e2f072ad766cf74c7f0cc8f853fd5b51422bacb66ba6cae58 SHA512 d8964fe24ca6c5f54f0d03b7ae597f2a427c4e0787d99f4b18f9c3e60709b9150d0047613389409d9e79b295dc50c49322c25894b7b7f6f08625633674c2663e
-MISC metadata.xml 446 BLAKE2B e11f955abb7417868998af974278f1aeacfcc45c99727f9085958f1947873911a6c52e049782195fcc143336ac4359ac536797f3348df75295b64b48cafe759a SHA512 31b5c084ab50a3864d5bb189e55181a43d7ff2a2ff45738e00d5d863819ad2405b778f93caa12d9f62015e321252bcd1fdd776b7ff3a6299c58fc5cf74f6d547
+DIST luaossl-rel-20200709.tar.gz 352960 BLAKE2B f4cd53937d7a9c724ab9f2f6a13f1da8fa54216f01fe2af7e65cf7ebdad1f8740491ba1fc6bcc2bf4ac377bde0d2e370433e76a5105c6226e0d9745e12bec0ea SHA512 324175f65e9d292ecb1343cfa9e111f1fd17f15e67037bd705d3db95d32b859c039a6e70620d649f446a8e7043a125a75c64de1714f0fe18e077fb9c017bea34
+EBUILD luaossl-20200709-r100.ebuild 2061 BLAKE2B 991969ea28952c0fff852fd570e30526fe8f45921402fa7216b8c6cc84bc99944f66c3c05ac7ea3c8cf6882319db8cc78c595102da3184c53b26e410077bfccf SHA512 4ea06e95a0396768ec6d48d6088655b0c45ab94a2e4f2664d86870cc436174f9b0fb5b5ff88e9f15b77ef10af2ea216f668b96c122a7f82d87a28d6a4bd0920c
+EBUILD luaossl-20200709.ebuild 1648 BLAKE2B 3e10f52e51b01e4aafb2728cf2db2c9bea00abea959fd24a82bb290e1124b8dc56944fecff656c18b91f5362b5a683845935452fe6d625f2976e39fff5056bbb SHA512 cd6113d4cf648e6d2f05d83fe1c5f5b067606ae1fd7cb90fd8dbf4eca1abcd2900ba68d39df7e156f60d129125e1ee98c63ee8d87acbd906b704fc03c2d28bb1
+MISC metadata.xml 557 BLAKE2B e42a835d0d6ed6481cd2be9a1c102c949f1d4a01526eba3c4634e3d28f9aa9d1ef67e0d82601c19869e7bf8db08167d3207834eb01d56111c50b8934102a8a0f SHA512 ea4a1248a41fa80097fb715819eec012c1e0b0f020397e548579d56e3ad2eea6a606b82d60a2df5c6acca7a4dbd91138cccd379fa59c1c9325456852eb4d018a
diff --git a/dev-lua/luaossl/luaossl-20150727.ebuild b/dev-lua/luaossl/luaossl-20150727.ebuild
deleted file mode 100644
index b0a610625a0f..000000000000
--- a/dev-lua/luaossl/luaossl-20150727.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Most comprehensive OpenSSL module in the Lua universe."
-HOMEPAGE="https://github.com/wahern/luaossl"
-SRC_URI="https://github.com/wahern/luaossl/archive/rel-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="luajit"
-
-RDEPEND="
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( >=dev-lang/lua-5.1:0 )
-	dev-libs/openssl:0[-bindist]
-	!dev-lua/lua-openssl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-rel-${PV}"
-
-src_prepare() {
-	local version_var=
-	local engine=
-
-	use luajit && engine=luajit || engine=lua
-	use luajit && version_var=abiver || version_var=V
-
-	LUA_VERSION="$($(tc-getPKG_CONFIG) --variable=${version_var} ${engine})"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" prefix="${EPREFIX}/usr" openssl${LUA_VERSION}
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install${LUA_VERSION}
-}
diff --git a/dev-lua/luaossl/luaossl-20180708.ebuild b/dev-lua/luaossl/luaossl-20180708.ebuild
deleted file mode 100644
index fd7565276080..000000000000
--- a/dev-lua/luaossl/luaossl-20180708.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P=${PN}-rel-${PV}
-DESCRIPTION="Most comprehensive OpenSSL module in the Lua universe."
-HOMEPAGE="https://github.com/wahern/luaossl"
-SRC_URI="https://github.com/wahern/luaossl/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="luajit"
-
-RDEPEND="
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( >=dev-lang/lua-5.1:0 )
-	dev-libs/openssl:0[-bindist]
-	!dev-lua/lua-openssl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	LUA_VERSION="$($(tc-getPKG_CONFIG) --variable=$(usex luajit abiver V) $(usex luajit luajit lua))"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" prefix="${EPREFIX}/usr" openssl${LUA_VERSION}
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install${LUA_VERSION}
-}
diff --git a/dev-lua/luaossl/luaossl-20181207.ebuild b/dev-lua/luaossl/luaossl-20181207.ebuild
deleted file mode 100644
index 300a08cda740..000000000000
--- a/dev-lua/luaossl/luaossl-20181207.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P=${PN}-rel-${PV}
-DESCRIPTION="Most comprehensive OpenSSL module in the Lua universe."
-HOMEPAGE="https://github.com/wahern/luaossl"
-SRC_URI="https://github.com/wahern/luaossl/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="luajit"
-
-RDEPEND="
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( >=dev-lang/lua-5.1:0 )
-	dev-libs/openssl:0[-bindist]
-	!dev-lua/lua-openssl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	LUA_VERSION="$($(tc-getPKG_CONFIG) --variable=$(usex luajit abiver V) $(usex luajit luajit lua))"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" prefix="${EPREFIX}/usr" openssl${LUA_VERSION}
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install${LUA_VERSION}
-}
diff --git a/dev-lua/luaossl/luaossl-20190731.ebuild b/dev-lua/luaossl/luaossl-20190731.ebuild
deleted file mode 100644
index 300a08cda740..000000000000
--- a/dev-lua/luaossl/luaossl-20190731.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P=${PN}-rel-${PV}
-DESCRIPTION="Most comprehensive OpenSSL module in the Lua universe."
-HOMEPAGE="https://github.com/wahern/luaossl"
-SRC_URI="https://github.com/wahern/luaossl/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="luajit"
-
-RDEPEND="
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( >=dev-lang/lua-5.1:0 )
-	dev-libs/openssl:0[-bindist]
-	!dev-lua/lua-openssl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	LUA_VERSION="$($(tc-getPKG_CONFIG) --variable=$(usex luajit abiver V) $(usex luajit luajit lua))"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" prefix="${EPREFIX}/usr" openssl${LUA_VERSION}
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install${LUA_VERSION}
-}
diff --git a/dev-lua/luaossl/luaossl-20200709-r100.ebuild b/dev-lua/luaossl/luaossl-20200709-r100.ebuild
new file mode 100644
index 000000000000..414c31fe69cf
--- /dev/null
+++ b/dev-lua/luaossl/luaossl-20200709-r100.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+MY_P="${PN}-rel-${PV}"
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Most comprehensive OpenSSL module in the Lua universe"
+HOMEPAGE="https://github.com/wahern/luaossl"
+SRC_URI="https://github.com/wahern/${PN}/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="examples"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	dev-libs/openssl:0[-bindist]
+	!dev-lua/luacrypto
+	!dev-lua/lua-openssl
+	!dev-lua/luasec
+	${LUA_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "doc/." )
+
+src_prepare() {
+	default
+
+	# Remove Lua autodetection
+	# Respect users CFLAGS
+	sed -e '/LUAPATH :=/d' -e '/LUAPATH_FN =/d' -e '/HAVE_API_FN =/d' -e '/WITH_API_FN/d' -e 's/-O2//g' -i GNUmakefile || die
+
+	lua_copy_sources
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	if [[ ${ELUA} != luajit ]]; then
+		LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))"
+	else
+		# This is a workaround for luajit, as it confirms to lua5.1
+		# and the 'GNUmakefile' doesn't understand LuaJITs version.
+		LUA_VERSION="5.1"
+	fi
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"ALL_CPPFLAGS=${CPPFLAGS} $(lua_get_CFLAGS)"
+		"libdir="
+	)
+
+	emake "${myemakeargs[@]}" openssl${LUA_VERSION}
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	if [[ ${ELUA} != luajit ]]; then
+		LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))"
+	else
+		# This is a workaround for luajit, as it confirms to lua5.1
+		# and the 'GNUmakefile' doesn't understand LuaJITs version.
+		LUA_VERSION="5.1"
+	fi
+
+	local myemakeargs=(
+		"DESTDIR=${D}"
+		"lua${LUA_VERSION/./}cpath=$(lua_get_cmod_dir)"
+		"lua${LUA_VERSION/./}path=$(lua_get_lmod_dir)"
+		"prefix=${EPREFIX}/usr"
+	)
+
+	emake "${myemakeargs[@]}" install${LUA_VERSION}
+
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	use examples && dodoc -r "examples/."
+	einstalldocs
+}
diff --git a/dev-lua/luaossl/luaossl-20200709.ebuild b/dev-lua/luaossl/luaossl-20200709.ebuild
new file mode 100644
index 000000000000..0de911787f22
--- /dev/null
+++ b/dev-lua/luaossl/luaossl-20200709.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-rel-${PV}"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Most comprehensive OpenSSL module in the Lua universe"
+HOMEPAGE="https://github.com/wahern/luaossl"
+SRC_URI="https://github.com/wahern/${PN}/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="examples luajit"
+
+RDEPEND="
+	dev-libs/openssl:0[-bindist]
+	!dev-lua/luacrypto
+	!dev-lua/lua-openssl
+	!dev-lua/luasec
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( dev-lang/lua:0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "doc/." )
+
+src_prepare() {
+	default
+
+	# Remove Lua autodetection
+	# Respect users CFLAGS
+	sed -e '/LUAPATH :=/d' -e '/LUAPATH_FN =/d' -e '/HAVE_API_FN =/d' -e '/WITH_API_FN/d' -e 's/-O2//g' -i GNUmakefile || die
+
+	# Set LUA version
+	LUA_VERSION=$($(tc-getPKG_CONFIG) --variable=$(usex luajit abiver V) $(usex luajit luajit lua))
+}
+
+src_compile() {
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"ALL_CPPFLAGS=${CPPFLAGS} -I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
+		"libdir="
+	)
+
+	emake "${myemakeargs[@]}" openssl${LUA_VERSION}
+}
+
+src_install() {
+	local myemakeargs=(
+		"DESTDIR=${D}"
+		"lua${LUA_VERSION/./}cpath=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
+		"lua${LUA_VERSION/./}path=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
+		"prefix=${EPREFIX}/usr"
+	)
+
+	emake "${myemakeargs[@]}" install${LUA_VERSION}
+
+	use examples && dodoc -r "examples/."
+
+	einstalldocs
+}
diff --git a/dev-lua/luaossl/metadata.xml b/dev-lua/luaossl/metadata.xml
index 8056c7be9898..be7afb66eb72 100644
--- a/dev-lua/luaossl/metadata.xml
+++ b/dev-lua/luaossl/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">wahern/luaossl</remote-id>
 	</upstream>
diff --git a/dev-lua/luaposix/Manifest b/dev-lua/luaposix/Manifest
index 8dcb9c3c0164..1c378808217b 100644
--- a/dev-lua/luaposix/Manifest
+++ b/dev-lua/luaposix/Manifest
@@ -1,3 +1,4 @@
 DIST luaposix-35.0.tar.gz 178091 BLAKE2B b2d2ca01f18f0e98b45008919fc886e05d2cad034c84e870900c33891dd5867d9bc7aa8deae06c3f3f0852db902c1e766e693162b32ed474eb710b379bf9e3ed SHA512 4bb61892b78d9e59418a9a6360b9f611fb9b5438b9261a2c6672f053a1b21dfd9a2060b8d2f0d3eac6185773cf84672c1769c081c4ab53d2ddae2232e4a9269b
-EBUILD luaposix-35.0.ebuild 1267 BLAKE2B 12cefcfb60eb5bdc13a789587fe8d8911c8ba59f89c80ce0959f98c7a0896c183f1a39bcb7e4f14a57e11240460fcf7804da1f82d8d2ece70123fa447174c7fd SHA512 85649949f8bd79602e1d79ac17e654c2f47d7246725d7763286da0dc538e50d3fc00e9c38995c59d4a9c9952576635979f83babe4e1ed53895036380cdb81ae5
+EBUILD luaposix-35.0-r100.ebuild 1598 BLAKE2B ec756a70b9ca70aa714d492104139a7d1bb00f2473dda0db2d97ba1d6337f12f4f5843d3325a66c17957026e58841f4019b006e8d21e8d7f71ce81cce2d71503 SHA512 3ae67e8ebbc85787b301380c169a1c80b33cc9783ce3b640166e05e1c62d7e24233042f09b8c9cb3e63a19f814c832071789170a2302a552afce2b074ea9876f
+EBUILD luaposix-35.0.ebuild 1266 BLAKE2B 49d1d6db7709ae309d926c96ddbd75b2e60aa49005c256dacb57813399e81bbe3350694f308b62b097d723c5f696c1093ab28984e9ea16c50c7eded815a1d2d3 SHA512 a8048912aab2aac73f0f21e56c7fc3a6a05af3d97dc14472ffd92ce50c94d78d80ca87ddd3fed41b4c4bf54d1908c767155c84750d018f1e660c3f5f522a1b21
 MISC metadata.xml 474 BLAKE2B c2297ba4eae7fdfaf22dd9f93fe1f41a48ed085a3493fd30dc23e186bc89c5b6f0dc535fad0e15af24f8d9498c38ee8e99f7fafae0ac2969d91cca96fefe4ba6 SHA512 b0acb936e00d9668b5cad5478243d3067677ee015451cc06d0a7165a0e87035d23347f8dd40f481088be178d0ca6d06486b8984910021171903a37be970519e4
diff --git a/dev-lua/luaposix/luaposix-35.0-r100.ebuild b/dev-lua/luaposix/luaposix-35.0-r100.ebuild
new file mode 100644
index 000000000000..7881ac5e4801
--- /dev/null
+++ b/dev-lua/luaposix/luaposix-35.0-r100.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Bindings for POSIX APIs"
+HOMEPAGE="https://luaposix.github.io/luaposix/ https://github.com/luaposix/luaposix"
+SRC_URI="https://github.com/luaposix/luaposix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+# Requires specl, which is not in the tree yet
+RESTRICT="test"
+
+DEPEND="${LUA_DEPS}"
+RDEPEND="${DEPEND}
+	lua_targets_lua5-1? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] )
+	lua_targets_luajit? ( dev-lua/lua-bit32[lua_targets_luajit(-)] )"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Temporary fix for respect LDFLAGS (#739050)
+	# Fixed in luke 0.2.1
+	sed -i -e "s:c_module,libdirs:c_module,'\$LDFLAGS',libdirs:g" \
+		build-aux/luke || die
+
+	lua_copy_sources
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	./build-aux/luke package="${PN}" version="${PV}" \
+		PREFIX="${ED}/usr" \
+		INST_LIBDIR="${ED}/$(lua_get_cmod_dir)" \
+		INST_LUADIR="${ED}/$(lua_get_lmod_dir)" \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	./build-aux/luke install \
+		PREFIX="${ED}/usr" \
+		INST_LIBDIR="${ED}/$(lua_get_cmod_dir)" \
+		INST_LUADIR="${ED}/$(lua_get_lmod_dir)" \
+		|| die
+
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+	dodoc -r doc NEWS.md README.md
+}
diff --git a/dev-lua/luaposix/luaposix-35.0.ebuild b/dev-lua/luaposix/luaposix-35.0.ebuild
index 06ef159c1e90..efcbfd7161c0 100644
--- a/dev-lua/luaposix/luaposix-35.0.ebuild
+++ b/dev-lua/luaposix/luaposix-35.0.ebuild
@@ -12,9 +12,9 @@ SLOT="0"
 LICENSE="MIT"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="dev-lang/lua:0=
+DEPEND="dev-lang/lua:0="
+RDEPEND="${DEPEND}
 	dev-lua/lua-bit32"
-DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
index f485a038a802..9fedd341725a 100644
--- a/dev-lua/luarocks/Manifest
+++ b/dev-lua/luarocks/Manifest
@@ -2,5 +2,5 @@ DIST luarocks-3.3.1.tar.gz 241636 BLAKE2B fd34d7a233bbf1c5f224bd04886a7f1382d63f
 DIST luarocks-3.4.0.tar.gz 244013 BLAKE2B 873c315ca3616179d20d665ceb09b8549c6f007d721581751bb4bb27d147547a52f5be1458541f9c0f936fcc3659c1d8eb253431ee0cf12530f3bef09aa838a3 SHA512 111ef93cbc4c0d79fdb26d9696b76e6b9e7fb1e30029db43feae9622cc6dd89991f1a62f87af0ca11f4043cb0d445ec73c5edf53e1af5f0d9bc4f756d4c18151
 EBUILD luarocks-3.3.1.ebuild 896 BLAKE2B 0d69942e098d25a6494381997dd13b147a53f989ae10d36207e4343b34e57ed4c3c0ed559d19b67015caf4481cc0ae711120830eb9025240f7783970983617f9 SHA512 c9e6eec54c82a24995235b5fe8d40848ee80ba62de7514f94146f6e13c6b7bbff9678e6ca7ae469213ff660da8433903d6606a03ae3999239b5bdb10ec6a863b
 EBUILD luarocks-3.4.0-r100.ebuild 2076 BLAKE2B 342b6a19174d1bdebcd91b27fb6db6ac9c7b606181b4d821057e843711923d9ad731cb2fd696c36a6e74ab1a1ea1134b7ec216ccdc0bbb6647e06437cbd2068b SHA512 d5bae0105cd8ad25330cbfa6333a412dda924ea423c342a4e285f47789cdf23b4edfb387965b34d778b38d99239b681f64af788554549e821d351eee625e0eb9
-EBUILD luarocks-3.4.0.ebuild 1452 BLAKE2B ed44a4756e659f0bff11017878c93ee6425ac5c1c000da8432c1ec5dc2929ea194a99d3ebce415f8b8b979218f7b2abf511d0a96932fc44fe6877b604e10eb88 SHA512 0de5e1a24507697ffcd029ea8a689d4d00ffec6eb0c015de5fdb6cba3c01dc4654bff7f0d098bb0b97dc96cee97109b0ec2235bb05ea8bcfda030cd34ec6f18f
+EBUILD luarocks-3.4.0.ebuild 1763 BLAKE2B 269eb6987e0089696b0546b6a3ca8092d30dd40486c5affe3ee3b9a07e0cde71da1d6b4b9e900e1b5a1dbccc4fb8e856315c169c0f7475cb5b023d6d22b7293b SHA512 a801da10bd0ee9e37c162c682b72708ce5489ff790500260a86339b72ea57e8cc4e8a25a20e0020558c21c4c0618957da0c0f5e5efa84a112f7a7ab22b6fddaa
 MISC metadata.xml 724 BLAKE2B 690486dab66b070c7ec5f7e71db2cced3d1c191acbbcc3d86bc7b4dcb90796c5b1cb712a4cad42462dc9bedecfd5de330b02447bd7ccf89b89b57905871a555f SHA512 7d8d58c931e5134bd261a05539d3d2e54648fe538a4c65397b78be325feeb4da04d93fc1ff81e2d3b6fd062cc2d94f8cf9958865ca968c1805fc915bcf287edb
diff --git a/dev-lua/luarocks/luarocks-3.4.0.ebuild b/dev-lua/luarocks/luarocks-3.4.0.ebuild
index 1740df35645a..52063734ca52 100644
--- a/dev-lua/luarocks/luarocks-3.4.0.ebuild
+++ b/dev-lua/luarocks/luarocks-3.4.0.ebuild
@@ -37,6 +37,15 @@ BDEPEND="
 	)
 "
 
+src_prepare() {
+	default
+
+	# If 'dev-lang/lua' is a new, fresh installation, no 'LUA_LIBDIR' exists,
+	# as no compiled modules are installed on a new, fresh installation,
+	# so this check must be disabled, otherwise 'configure' will fail.
+	sed -e '/LUA_LIBDIR is not a valid directory/d' -i configure || die
+}
+
 src_configure() {
 	local myeconfargs=(
 		"--prefix=${EPREFIX}/usr"
diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest
index 17da023f6ed9..bdd9eb503fee 100644
--- a/dev-lua/mpack/Manifest
+++ b/dev-lua/mpack/Manifest
@@ -1,6 +1,6 @@
 DIST mpack-1.0.4.tar.gz 46382 BLAKE2B 5092830e1a970ad96686ede4d96833a210543418cb23f218ba774bfd724267344f9e44e367490bb33dae8023e1145202ea6e457be7753a426eae990df906547d SHA512 8e40a562faf8b62137dec0733cbb9006fa7054e5a47bdd128fb4dfd676fac4e4385a23c3d908a4ce2edd65d673db25916695fa74bc08c5316b0c80e571a7442c
 DIST mpack-1.0.8.tar.gz 15616 BLAKE2B 06593296d1d36459127bf35eaeb37c894a0c0c6ccff0969cd0a82bee1920a715801db26f0ba0bc54a56399d07efc262666ee4ce79878288a5c0221fd27febea1 SHA512 6d21cc6bbdee583a1d808742991459e4b1796f347b2f4eaa747b576f5bb1ca989123339120e43246bac859c20e6f46ac57116ce9f135157256fecbd8cf817f75
 EBUILD mpack-1.0.4.ebuild 1058 BLAKE2B cc907ec09c79aaf12c09a39f88ad39edbb23b128ae0c0e90d83ecd862072acbb82fd5252f8188540788371d4bf231c64172dcca4a4836cb913cc4cd264cbc966 SHA512 94dff8c1f5154e50653cc58638902f716990175e2d579e4ac5aa866638f252a5b4a3f616037dc183f8592b7785d28b7b9912ded7105fabc4feeeeecb6f858d87
+EBUILD mpack-1.0.8-r1.ebuild 1646 BLAKE2B 82b3ac2ad31ad02c6fc770fae9c3fb37c62c607e4faeca0a06e31599eb58a6c110df7f4c6f7c6a494c55c0e7cef46cb97c94433a144f90b361214643fc648ba2 SHA512 f593c80b3b275e9fb57cf2ac40920ed8d1d724ffd88b4fa6824c56a532abff174d61d968e5e86bccbf3214b05f463cf34614fe22acd07d3da31ecf1e1903e5fa
 EBUILD mpack-1.0.8-r100.ebuild 1776 BLAKE2B d9d38dfc62cde85a87e7865e52ceff66762b4878e2a8e9d363d73162f4881e274652f99b86fd5ec7b2e72d6a2d6698e88a2a09268af958a607236d357f493947 SHA512 689bad3022e350a3e2de2132ead2bb2d139ae3a492cffb68353f139b855d1cdc1540b8bd684173b35ec40db8e8e1772dfbb93f6967643169fe622f6e88aa98e9
-EBUILD mpack-1.0.8.ebuild 1646 BLAKE2B 8ec3db8a0404d37cf7f144d9576dc3a9a2a694faf807a0b716f8efbfd97bbaf4e8db04a890f04d24183d095cb5e3d3f2947febe59ca24879ccb45414b9ab9bc4 SHA512 5f573705d84ab310abc535586c389319f5fe368f9630094046a35606dffff74d36c8613e625f41b05b86c2e1ca133dbc9648cb254066fba5283546adca214e59
 MISC metadata.xml 336 BLAKE2B d2eb682d5c161942105aea7b4d1801cb98478b9c19876563ea921cf0cedaaf04a02cf756c8a5f595d52e710436e6f73e2dfe3acc10a4c9cd080415f4e1bb305a SHA512 a1ab89e3b9f01ff9112240a0a9ac945ed7391e98f5dfd4bd1ea518e0f228ae09109cd8f39fc29b36fe6ecc252dca7e0819693ce35be564421684de705dc8a4a1
diff --git a/dev-lua/mpack/mpack-1.0.8.ebuild b/dev-lua/mpack/mpack-1.0.8-r1.ebuild
similarity index 95%
rename from dev-lua/mpack/mpack-1.0.8.ebuild
rename to dev-lua/mpack/mpack-1.0.8-r1.ebuild
index dd44907c3fd9..fdd916f2c070 100644
--- a/dev-lua/mpack/mpack-1.0.8.ebuild
+++ b/dev-lua/mpack/mpack-1.0.8-r1.ebuild
@@ -20,8 +20,8 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/libmpack
-	luajit? ( >=dev-lang/lua-5.1:= )
-	!luajit? ( dev-lang/luajit:2= )
+	luajit? ( dev-lang/luajit:2= )
+	!luajit? ( >=dev-lang/lua-5.1:= )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index e117cb3a96fd..3e92e8b82838 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/biniou/Manifest b/dev-ml/biniou/Manifest
index abe417b122de..1f8f2efc89f8 100644
--- a/dev-ml/biniou/Manifest
+++ b/dev-ml/biniou/Manifest
@@ -1,9 +1,3 @@
-DIST biniou-1.0.12.tar.gz 24262 BLAKE2B c7dd3ff0d7cf47f7c464cf379fa1ac84e11c284399730c55d803d0da1e5c10ed0b974b51705d22e0a29513bf7a4774139720aacd7094a52685b6d7bc17067ad8 SHA512 df729e4064f6726efa409ceb5e6ff1987923d9cd28339d6e1c4c185a07c0738b027cafba33a139483eeb8f88e58f66fbb6a57d8e748e7355073a7622fb4d7a07
-DIST biniou-1.0.13.tar.gz 24327 BLAKE2B 19a69665805b917c9bc02ad459c8a98b8cb64f707f3664e863d5315fd1444e0cb5545549220494dab136287cf4f8ffab8d5246a2068bb154c2ea10553b63737d SHA512 2fe109e83260f546181dd26ea175d2c4f63d0f6604c6d26fa44ee31925ba1fdaac0139a436cd0271a31294de9cd8ea65f8dde0981403c652d31de721ef696788
-DIST biniou-1.1.0.tar.gz 23432 BLAKE2B 601e160c828c32f520c7cd18d5b3ca1abfe629dcb53250d83e9dc658dacafcb7f54296b5c9604dc38b8a95acbaf64d79d283d82fe345391e593023d7dfbc2933 SHA512 755e3dcfe2a967c08b86db5a7dc917f75713611f5deb64b4fe3499aecf8e698813a1d0620eb78aa1e77c404719936c5ef5088c0c394c02fc2d7fe2629e985669
 DIST biniou-1.2.0.tar.gz 23611 BLAKE2B 01f5afada666d23b74f31cf12b5f578f3622c85311d7a1b6eb319843beac4c3ebe8e8e314a47ec14ee0ef6f5c1a5b6dd849dcf24b0c3cc8a38ca6a54d89e4c4d SHA512 04c04c2dd5e3e1237106db257567ba6900bd94759b07b02ba2e0d9209d1bbdc9ed629864e06d44a8b61f72d46fbcc7a0ffc86f82feb223d9d99ca41afc625fab
-EBUILD biniou-1.0.12.ebuild 677 BLAKE2B f801ddbd349f5e051babbd7dcdafcc61495829fa36815c62139537616b0a6ba2520d32a11ae33b29e17676968cec4c68eac0ab727ba63b21d294e891692f85c3 SHA512 e91e497852f5137da68d66231278788935070dbce74391d5f88458c72e2f7d78e3d77db5a79678eddd3edfedda11f6e1629061c0f810d87decc101421a0654a5
-EBUILD biniou-1.0.13.ebuild 677 BLAKE2B a4a411760d10d59f4fd13ea058ac5c13d0b5207d080634a93d4c891f04602ddb0c6e5235426b4edf71a868c9a85f2ff4f3ffaefc5a1ec6b43f9755830ad29c88 SHA512 7da0d42ff932c302a3d6e37626fcee4d352604769d7cff94734084318c208aebb753b4911cb142f421c12ae8c6417368bd15e729c1dafa288043b00b3f2fbce8
-EBUILD biniou-1.1.0.ebuild 732 BLAKE2B f64f5a8ad8cf933c1866426cb035f52e0f61a43177dd00cb73b5ba427374cf08ed458421c2300b536892dfd04090227133d53abd3e7b345bf1c20ef56298ec5d SHA512 911cd2d6d7b53d34b9907b83b32b0824f3708d4dfa5a53fb3ec666efc91c089ac5b0fb8956e735e8f05e5be3991217c03c35f9e9fef45fb680dca54d3d4a7f84
 EBUILD biniou-1.2.0.ebuild 732 BLAKE2B f64f5a8ad8cf933c1866426cb035f52e0f61a43177dd00cb73b5ba427374cf08ed458421c2300b536892dfd04090227133d53abd3e7b345bf1c20ef56298ec5d SHA512 911cd2d6d7b53d34b9907b83b32b0824f3708d4dfa5a53fb3ec666efc91c089ac5b0fb8956e735e8f05e5be3991217c03c35f9e9fef45fb680dca54d3d4a7f84
 MISC metadata.xml 246 BLAKE2B 293edb7a04720164c7fe980b83a53e65fa0537bf20ee28f065f980b1a474ff468f2b7c4adb14c80b691080a801bbbc9095cb24fa4102ce10d57b0ac47d67ffa7 SHA512 d922d11e07aa5d95318b09b38f66979151ae05272a7f202e87a03ebc7df9fd985468cfdac2188e04b27e31a69c03d63b59f2682374430ad3d0dbdc7c909a2e1c
diff --git a/dev-ml/biniou/biniou-1.0.12.ebuild b/dev-ml/biniou/biniou-1.0.12.ebuild
deleted file mode 100644
index 81346198c7f1..000000000000
--- a/dev-ml/biniou/biniou-1.0.12.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="A binary data serialization format inspired by JSON for OCaml"
-HOMEPAGE="https://github.com/mjambon/biniou"
-SRC_URI="https://github.com/mjambon/biniou/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/${PV}"
-LICENSE="BSD"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt?]
-	dev-ml/easy-format:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake all
-	use ocamlopt && emake opt
-}
-
-src_install() {
-	use ocamlopt && dodir /usr/bin
-	findlib_src_install BINDIR="${ED}"/usr/bin
-	dodoc README.md Changes
-}
diff --git a/dev-ml/biniou/biniou-1.0.13.ebuild b/dev-ml/biniou/biniou-1.0.13.ebuild
deleted file mode 100644
index 221435a17637..000000000000
--- a/dev-ml/biniou/biniou-1.0.13.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="A binary data serialization format inspired by JSON for OCaml"
-HOMEPAGE="https://github.com/mjambon/biniou"
-SRC_URI="https://github.com/mjambon/biniou/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/${PV}"
-LICENSE="BSD"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt?]
-	dev-ml/easy-format:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake all
-	use ocamlopt && emake opt
-}
-
-src_install() {
-	use ocamlopt && dodir /usr/bin
-	findlib_src_install BINDIR="${ED}"/usr/bin
-	dodoc README.md Changes
-}
diff --git a/dev-ml/biniou/biniou-1.1.0.ebuild b/dev-ml/biniou/biniou-1.1.0.ebuild
deleted file mode 100644
index 6a9705355a2a..000000000000
--- a/dev-ml/biniou/biniou-1.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="A binary data serialization format inspired by JSON for OCaml"
-HOMEPAGE="https://github.com/mjambon/biniou"
-SRC_URI="https://github.com/mjambon/biniou/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/${PV}"
-LICENSE="BSD"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt"
-
-RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt?]
-	dev-ml/easy-format:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}
-	dev-ml/jbuilder
-	dev-ml/opam
-"
-
-src_install() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		--mandir="${ED}/usr/share/man" \
-		${PN}.install || die
-}
diff --git a/dev-ml/cairo-ocaml/Manifest b/dev-ml/cairo-ocaml/Manifest
index 252bd9f18b36..70fc63a89309 100644
--- a/dev-ml/cairo-ocaml/Manifest
+++ b/dev-ml/cairo-ocaml/Manifest
@@ -4,6 +4,6 @@ AUX 0003-Fix-FTBFS-on-bytecode-architectures.patch 1135 BLAKE2B 90847d27617c1c63
 AUX 0004-no-automagic.patch 1041 BLAKE2B 8cc95aabf25e768cbb03ea608b74a45aa36f7e86f72da7875bb19973512165a1e6ece9f80093ec887e49ffdbd86df23ae585317d2f65b791c186335b86fc2b50 SHA512 53bfa4cbc40b3725fa40454fb6e8521f21aaf61135dd6da1ec9fd3f1df256ceec1901022aa70dabd568c0291e37008b7c122d1d654856a13fe632f3bf2c271b8
 AUX ocaml406.patch 830 BLAKE2B 662bc72ae0f51e6b6b11a475930847fb18a34c1a812c758b0d00fe156a0b1872dd0eb3d590a3be744ef7c4231aa637571631f0d3d61e9401a1b2164a8434e6ac SHA512 d2fc42aaaac76311cc78ee5c53df6e4c029534f424430465f18acb57988169ea240af2c1d08d84fefd5c8e64e5342e8e721e72eab2e1cf240507fcf0324aff72
 DIST cairo-ocaml-1.2.0.tar.bz2 44483 BLAKE2B 49a8c811100e3167a8c32ca87a0a6c256862d276c3703082b944aa55f8def7b56d478c0ed44b9d7f5de9194603b688daa5e42949db00417b71daa7376e17410b SHA512 5cac319cf27b94d31e955885ae89b40342c2ae4ffd1aca7c52366f7c3679185f74e513e0c73bd01260f89da29d43bb420dadd059fa1cf5509997db8f935704b4
-EBUILD cairo-ocaml-1.2.0-r1.ebuild 1952 BLAKE2B bfcd8312395d9f90f096d9caae515a772bcc9919ae0b8445ec4200d6dd3fe61cf435a5d28170f5f72135d0b6c2dad8bf66203f0a50c68425e733e5a0b3c8d8a3 SHA512 b0d0c3a46db06aee8b1ddfe94643fa22888bee2a1a5c85cef24c4536c81880d38f82fdcd7194ca482e9f4aafe9f2a351573f976264b08a46de75c3e84b2dae82
+EBUILD cairo-ocaml-1.2.0-r1.ebuild 1951 BLAKE2B f2f5d85f5ca53294fefcaad7ea08c45a3b6926ed3484a6cdfd9da01ec6d8f9cb57e8de938004b44ac9306959cf2e15649773ba93d5241150f957c72b0d24396f SHA512 05a793768810c7a114f73672e1e7a58f384c1a0a834e588700878eb41d989d50276ed822775d72dd3904a001be3ca192fbc8b86bfd6e305e5a8b604e5e225780
 EBUILD cairo-ocaml-1.2.0.ebuild 1896 BLAKE2B 50549894df7f733d386d7611fa9adde2325e20acb0731adc5b1eb760c385f6292acb0ffefabcd2a0bece62c7de481997fb1dd937f68fdc216d90b92319f5dfe3 SHA512 b1ce1ed398e94271e9a608b1abd3d3be2543065111c1d6826e19db71022f3b898de1c97d524884a460de9ba841b4c7074f68561d353c5142cb2bb7b83d569707
 MISC metadata.xml 572 BLAKE2B 55d9ae52f939a260daa0e05c073fb0e574a44383414e04274d58ded73bc68ae6713039ed1f51998a307c166313d93755066a9d06f7fea3525a154de856854ad0 SHA512 7ca7f4c88e7343d1ac5acbacef33cde7a437c5e70df3bede08ee893c7bea317b444585f4d4e9e010509b2ebae9586bbe5d94a5229f656b6ce996cabb895a60d2
diff --git a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
index 1a9969c60bee..19eead630c6c 100644
--- a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
+++ b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cgit.freedesktop.org/cairo-ocaml/snapshot/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples gtk pango"
 
 RDEPEND="dev-lang/ocaml:=
diff --git a/dev-ml/cppo/Manifest b/dev-ml/cppo/Manifest
index 79663b93b1fe..ced0726276e0 100644
--- a/dev-ml/cppo/Manifest
+++ b/dev-ml/cppo/Manifest
@@ -3,5 +3,5 @@ DIST cppo-1.5.0.tar.gz 26963 BLAKE2B 4118637bd8bcfc2edae4c7bf0d839b82ba3402c2f4d
 DIST cppo-1.6.6.tar.gz 28667 BLAKE2B 57510ff824265065d4c4ba7d3da4b9aea389e005de4f2e73c1b43b230082872be0118e0b40d6c2951d4017210522a06eb089ab5cbb18fb48d29b87736fa59055 SHA512 80b0d7a5f0f5b7d9d62ddfb204ebf5e3216c2926ba7f667b9ef10981de6a51cd6d670b7062769bf6fbdd163c1c8fb5426a74c31234ddc03ec94a75645bf469da
 EBUILD cppo-1.4.1.ebuild 695 BLAKE2B c7dc10a7114ce9b7ada88cca2e5364c7cee6e045001ce27c7c1dc0c0b9bb7ed1bbff96e17125d20d12da189b819f01bb0e6e35f996cb404d2ec51e294c9ea5ff SHA512 2848f76920077d4ebd0ea45fcb12328357d01ff1e4cfd96a2f748a996b940e4b31b910b4f76aed984db211592e19b5ef642fb9f1246d7041197e6b7eeec23bd5
 EBUILD cppo-1.5.0.ebuild 999 BLAKE2B 00c8f29088141900ed6606151fd1bfad75ad0ba17511fce651bcb24f8b7db5922554b40ecc7c9c96642e07532680511628aab81949de3ddd480b7942ec0521b6 SHA512 58870cc7de903b2951df2ca9535775c7b3c021880997f57f50dbc0104c1086de872f4cf86e008c104379b672d7893ee626c8891efffccaa43ab75ad61042b504
-EBUILD cppo-1.6.6.ebuild 497 BLAKE2B 579e2d339de1786e0defba300c0d30dece96d21d44fe813f9e121f480c2186bf4aee4d845ad3fc0a17178b071cff217fb58023beae8418f6f0a0b62a6c84c545 SHA512 e6ad33b04604b17c1684568ef1d8676ab1ac813b0b5db8bf4bfc620d6c2d18b6b6bf653c80a7363b560b6b3cbeedf93d42dc35e84dd5d1f1ecf60f6a888f1573
+EBUILD cppo-1.6.6.ebuild 496 BLAKE2B 3c88ae84970dea9f55672efa9f5f4dc10a1b3cacd50fd511a7fae00245c40b848de48776f2abb848997496fcf1fb5c8c2fef5282c62ddb6af1704884df269bc3 SHA512 47cc4ebd9ef64858a1599bac23386192d3d47fe01d7ea57aa5bbc5830d868b17361435c3834bbe51beeba5ae321d8b2d64f06fc43a8e7f3f0a62ed6ae3a314b8
 MISC metadata.xml 329 BLAKE2B db38b8af799a1c79d09897a4b45d36bd7924ceb8d9d1875e2ebc91b293d9cb03bef31992be9eef9cdef96d543b78fd3410da4cea94e32767888120a8da4e6bcf SHA512 5ac7d5d1a4e3c856de0b3ffe653fab70e88fbacdf3925ce1a357d77e84d30d627632b5266093dc79b548cc4aa507b58ef22311c36403fa6f4a11bb83b8a3935a
diff --git a/dev-ml/cppo/cppo-1.6.6.ebuild b/dev-ml/cppo/cppo-1.6.6.ebuild
index 9abdedf45cf1..f19e034346dd 100644
--- a/dev-ml/cppo/cppo-1.6.6.ebuild
+++ b/dev-ml/cppo/cppo-1.6.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.t
 
 SLOT="0/${PV}"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 IUSE="+ocamlopt"
 
diff --git a/dev-ml/csv/Manifest b/dev-ml/csv/Manifest
index cdcd38297b0f..83a4a4f5bb59 100644
--- a/dev-ml/csv/Manifest
+++ b/dev-ml/csv/Manifest
@@ -1,7 +1,3 @@
-DIST csv-1.5.tar.gz 83642 BLAKE2B e07303a4be8c4e75964b4ecc38da59de288e12b433ecb4a5d5450b21411b2343b38853cdf2737516185867d2f3963cc374c9ec34df96332b5844bbd850fb7c89 SHA512 1c8af0ce8abd8a5710115c194eee34928399964447309ee974665cf427396def42bca4f983904bfec706f7944aea419a87bf54bc6c379cb8b7372be801be4126
-DIST csv-1.6.tar.gz 98194 BLAKE2B 1c7975ec92bcd63cdeee369e8a3507b6ef95cf646cba2f5498983a18098f8147a26d7ae57a37904a3f1cc21085e7f2f2ffc9ec7bca836d6edc31a45d2de4c0a3 SHA512 689dae2dd57ec914ca1dd5e3d34ebd352aabb7d5da8933aa6c6fc9c6ec84dc538d1df8a1c46f3e172ab09e5917e9158be76afb2423ec8a92eef489ac5dfd5175
 DIST csv-1.7.tar.gz 45160 BLAKE2B 2f51f927d9099382a227e20471e60075f8796d7753152e266c121f705e4dab7036659937630302f152cd8f28d6db1aee3d5c72c339a45477292ee03c4bc461ab SHA512 cbe3d316e6f99318b3958bbfba3308225e709afb481a333d314adb66c20683171c23ac0565fc8d8e936b9dad13b9330b5208340b9fc671b4ccddf3a7d8b82b3e
-EBUILD csv-1.5.ebuild 517 BLAKE2B d03abc8fea95c38094dca18547eb57c188378a45250529cd0073e9dba05e39ce04617e8bb3e264b6cfce7d2d76386173ba83e61ad3754231e056337e3b1227a7 SHA512 cfcd84f23bd246fc5e225dbf02d81b1ef091f1af8e193689ec07bf69fed40585a81a4f4b97a72f91ee2246c37ea823a5be4ddeb002ef4564a5e6b51631677de9
-EBUILD csv-1.6.ebuild 629 BLAKE2B b0262894ce7b05662b24293efcb2cfb420d8afd820467669cb8d8677680f01a023645ffa680e4283af463cc599c838ba15d206c5044cc6ae658a0d1b50e3e012 SHA512 03093fca7d3c1e1d0391c4365cae27c2f68e4f12b86a625d426ec8112f5e44485adba2b3c332f6afc57c7b92c3c717e83aa4e261b3c659dcc9e3c22e7c8e1580
 EBUILD csv-1.7.ebuild 737 BLAKE2B 5a7e4901f97dff8c2f4c5d25b8ecc6b872bde2c5e57302a726820a7cb7bd8bc86975ee4a541dc6a4ec550e4d7ff89a27e490b59523468797d61f3630abe871bd SHA512 20e561d88b7598be72c68870d38fc16b73d41f8c56563bd906917e4f5683d3880976ac35bd873c8082664c75b0959ad485676b8030aca822c528be3ed75d9598
 MISC metadata.xml 349 BLAKE2B 1e8e0b12edc39e2e71831655c46dc0a197cca25030b60a61600a021f0c1228a0bc7afb4829afc48c9ac874ac5730d2d59b4c1a29cbb4c95a4551e0ed828bd266 SHA512 143b12e66cad9bf4c9586e9c7a95743522291d8d99c1880b9ef580b4dfbdbe9b6ca81ec15694de5c764348a42a6f193ca9b499c8e6a43ccf3a4c4ca05dcd3011
diff --git a/dev-ml/csv/csv-1.5.ebuild b/dev-ml/csv/csv-1.5.ebuild
deleted file mode 100644
index 29be7c1a8b6c..000000000000
--- a/dev-ml/csv/csv-1.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="A pure OCaml library to read and write CSV files"
-HOMEPAGE="https://github.com/Chris00/ocaml-csv"
-SRC_URI="https://github.com/Chris00/ocaml-csv/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-DOCS=( "README.txt" "AUTHORS.txt" )
diff --git a/dev-ml/csv/csv-1.6.ebuild b/dev-ml/csv/csv-1.6.ebuild
deleted file mode 100644
index 1d0efd903991..000000000000
--- a/dev-ml/csv/csv-1.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="A pure OCaml library to read and write CSV files"
-HOMEPAGE="https://github.com/Chris00/ocaml-csv"
-SRC_URI="https://github.com/Chris00/ocaml-csv/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+lwt"
-
-DEPEND="lwt? ( dev-ml/lwt:= )"
-RDEPEND="${DEPEND}"
-
-DOCS=( "README.txt" "AUTHORS.txt" )
-
-src_configure() {
-	oasis_configure_opts="$(use_enable lwt)" \
-		oasis_src_configure
-}
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index 0d6468e54bb2..1a2fc20c8db9 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -1,5 +1,5 @@
 DIST dune-2.1.0.tar.gz 1170295 BLAKE2B 16ee2c34e0183bd255d23410f70001ca008b8e82815f93ad727079da00b8592d219e7664c93bed7b97b3a1e997306d60672b7d6c45fe6dae7371b4025df06722 SHA512 24afb44e458f819dfde3775b76c3ccf43f3fa5d8ce9a14ee9bf6658c1c116f95659c21a9ea208e5711c844fabc661cc434070bce6c9307154d506b6599ffb57f
 DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
 EBUILD dune-2.1.0.ebuild 684 BLAKE2B 4b50322912687fb84f6636dddde7a61b89c4147a9a92c8bb03619adab13a23098473380076e84c2e1e5ed5c8f7c8250ee21c4ffc749433847216c272270a5756 SHA512 e9543ae6e8e26cea642dd709242076b6860ac584df7fdd005bc73fa441b551f566f64611008bad1d9875b2c09c5e941c71eb08df158d8e0a0359d8e7cb889b4c
-EBUILD dune-2.7.1.ebuild 757 BLAKE2B 8ed26b2b82bbca95ec0410ffe888e83edcb8efe7e12d04939ee231293c11703cd7178e6016c1a5593b2036d842765752e1df8574474132facc7129531b80a414 SHA512 5c1ca1ef3971b5efbb5c58dc96427ec8cb6e08ab953342b36c31d15f1d599d0400b42fc3cc1b670758da6a9b10dd1dc6687b1068cd005e3b711c6f00357c05ec
+EBUILD dune-2.7.1.ebuild 756 BLAKE2B 78e980285ca87f0c86ea64e1f668593b570fabf1f191af30d79482a4f70011d98daf9f32066927fbee6226f6a73f43dc2b5a2298a4ef4494fb18eb31ec80385f SHA512 7feb68bba390cdd98b903e1eb49b62ec448a987d98714821fa7ae28397d82708cf2d5ad59ec868d9c31ad5431e9eeecff49c2731d8a09bb92c249fb3281eb957
 MISC metadata.xml 319 BLAKE2B 65741bb0181ac6f6fb28019dc60386a5d47a2071131d8496adb14af1eff40000b59b2410acdf8ffa14fd4ad1d0bd6efacc1c67f68c162ed10e847a00db457aaf SHA512 8178e2c48fdd360ab7860dde1666bd2d0d0223f51275c58005aaab2d14946d4bb1e1e6be55a74d98afd6ef0acac515e2ebd0f7f44adbc9d2d7efbfcde641bd65
diff --git a/dev-ml/dune/dune-2.7.1.ebuild b/dev-ml/dune/dune-2.7.1.ebuild
index c66681198140..6600ef28fb46 100644
--- a/dev-ml/dune/dune-2.7.1.ebuild
+++ b/dev-ml/dune/dune-2.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="test"
 
 DEPEND="dev-lang/ocaml"
diff --git a/dev-ml/easy-format/Manifest b/dev-ml/easy-format/Manifest
index 99e97e9a7f2d..0b34515988b9 100644
--- a/dev-ml/easy-format/Manifest
+++ b/dev-ml/easy-format/Manifest
@@ -1,5 +1,3 @@
-DIST easy-format-1.0.2.tar.gz 13679 BLAKE2B 5f738e521ef8eb59edbcba92f599328ab6f5e497075d8144335191835906832ecb4e4a8c6233c65f6f7aa7c4105aadd1dc1e269ad59a2c3237c54af8b3856e41 SHA512 bb12c13b33a725f4a15616672f7a268398b50e6f054575203f1d26c49aa04978564233fa9fb88eec8b701d7fecbbaeda264422e8c31a60a52d0d8e64bfc5898f
 DIST easy-format-1.2.0.tar.gz 15632 BLAKE2B 0bf20b87050330e90f3ef5cbe47470049ddc470d22357240f6b0ddd75138d3297935306c071e4355f02ed2fdd01a3155461e90a91df1346fa33180833db77b57 SHA512 375849b1ecd2e37f4b32d1ee12197a95856b17a47e3eb06a7e7320a82234c241156c3c8bfb18ce17bbe73b93d31d755675478860505470aa7ab866277a99603f
-EBUILD easy-format-1.0.2.ebuild 634 BLAKE2B d97bb030ba1a078ad8b8398de74cb20a20c566eeef1c38435487df3dfb4a64bae60db26877215d989d8192c6bc8ce14cd375e13f714aa54f54f9028e33188609 SHA512 7b317147f087ed422fd6c138ed281da1317eaf8d00be1b2e17208e451907736629f43ca72c7908112f24611878dadacc934138420355dc4d62568f7a24507e66
 EBUILD easy-format-1.2.0.ebuild 667 BLAKE2B 29a46d20176330c80d0d9bf7132bec4eec2ce7c0bf54f0eb41759336aa0737b00b7fd0ea737154f20058eb5dfb443aedfd15c38e5b1b198bbf3ce51870625f80 SHA512 f21275174e49404dcccef768d41925edf46040147a246760e12fe851444d1ec75117d83d62b499100306a96eb0ddffe37c6d3f6f9f9c8cd171790bd388540559
 MISC metadata.xml 251 BLAKE2B 74ebf46bc822086f29fdbc1ed4b4ba867ef18b43a8d0cddd7d12d8af90eae16f1ebcd58d6aec1c6787fde89b239805fce3453a655a967f71ba7bdf076f94b57e SHA512 d66a84be5f4853c868e485056636f04c4f6db8aaf57c0d4050239f2b6b10c88ecd8f0076043ca4603dc72c834d6cb656eeb3a963e62bed03b63ed2ead2d7a972
diff --git a/dev-ml/easy-format/easy-format-1.0.2.ebuild b/dev-ml/easy-format/easy-format-1.0.2.ebuild
deleted file mode 100644
index db163f33fd49..000000000000
--- a/dev-ml/easy-format/easy-format-1.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Pretty-printing library for OCaml"
-HOMEPAGE="http://mjambon.com/easy-format.html"
-SRC_URI="http://mjambon.com/releases/${PN}/${P}.tar.gz"
-
-SLOT="0/${PV}"
-LICENSE="BSD"
-KEYWORDS="~amd64"
-
-IUSE="examples +ocamlopt"
-
-RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake all
-	use ocamlopt && emake opt
-}
-
-src_install() {
-	findlib_src_install
-	dodoc README.md Changes
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-ml/extlib/Manifest b/dev-ml/extlib/Manifest
index 7591a676d56d..d33fa8228aaa 100644
--- a/dev-ml/extlib/Manifest
+++ b/dev-ml/extlib/Manifest
@@ -1,11 +1,9 @@
 AUX extlib-1.7.7-no-git.patch 283 BLAKE2B 2cfc23016472905c9dfb28615bce04d607a70b99da69f1ed198c8cfdd677c1dd3d8b8a6756328bf35dbd59f81c7be143a5f5864110adca56cbc2dce8384d597d SHA512 b0b04d0fb6af94d7f54751fd00ab48101fb45d47e2230358edc956fd4d6fe04ce59b8aa6857fc1b07bb544fdade01eca6213de064c7d54b59f02e8265aebfb05
 AUX ocaml405.patch 1539 BLAKE2B d61c8398986a66664810684870351856ca94318a82d07194908c570aefc9b2b3196b95f651717b058e95b853e1862c3a27218afa71a809f766b908cde3e9cece SHA512 664c9b840b77d08095e03dbd398f6af3118237fbffe73499bc2b0ee0dc8e40311337e65f3e0e95b2f87dddb9e75b18d27d2b712b314f725d97fd537f2ca23e52
 DIST extlib-1.7.1.tar.gz 85397 BLAKE2B f2e924f651cc43ca29914c95400a26bfd062ecb4e7379d169533d394497215906b56e8f57ba29358965f0b8c125c33dcb9a0a95c09488404fd348261d075457f SHA512 42ea1be22a57ab31e5857df0c4c0f98a07e1b5958b34181cd5ab7c83ded112c208315d22cd3dd178d53e75ca109a70cb47ae479e95be8c47ea2087b1a158dc4d
-DIST extlib-1.7.2.tar.gz 85934 BLAKE2B fab7f5f99be414a83f46144bc8f2f54aeb545ef9041b62f227f9dafd267a3f8608b94388ffc39903b069ec7d481b4da8a6a2e9aa289c68263613cf64aa6a45e0 SHA512 d9f34f5bbd5e94a8dccc5bdbc1ec0e5015608675469c4f513461fa587a5eb7e1398542388fd885d7656591ca85ce30c0e2a9ee26b9722a9dd65189aac35d64ed
 DIST extlib-1.7.6.tar.gz 88068 BLAKE2B 32376c09728ec7e7d762888ad706641b94bcc976f2e1f42f246ba79fe862b60df7ff924e1e22e89333d8f2e1d999deb71eee481c3c5919aa5d1e02731f64f323 SHA512 3065e2474fb0e480ed076aa1156584a4a6c839cd5d9e59f341e41113abb1736241354aa7ee7cb492967698bc392969522fd5bf30d1ad7f94754c4e10f376afa8
 DIST extlib-1.7.7.tar.gz 88870 BLAKE2B fff84524ef227718d3908c5b65f4b781360cebc0dca3a8862aa11ea671499b45192c5106769e104d396118e3cdcd904ddce06df784f8fd0eadb7a2372ca3df94 SHA512 088a6c5bbe6530cd60e2276dc02592b69ad7ad685b752f0544c54b6246b8131238c6423ce7bfc81fe3ad1766f605ecf52fd3888d55cca63e22c947afedf610c5
 EBUILD extlib-1.7.1.ebuild 887 BLAKE2B b557faaae9bcde92b59e99bc5a38d864131c23ab11f76b4351d12efb6a4c6c982047205ed093dc4dc764279318acfe2c85af89dda7000c93b61bb34eef21f879 SHA512 fcdc98d7e67b566ccf1c37c87eb8f155bf07295ef2c446012919765b8838bc933e5aae030b7f8d820fb7422dddf1c61901ff1cb71655a4fc81d2c76761580e45
-EBUILD extlib-1.7.2.ebuild 836 BLAKE2B c28451604b7317f492deebaf48a52198eb80f1d2602fcbe3803371b419fa6e593710dafaf7a863ff642117941ea6c853d2a98a552eefbb0b9260ad0d91876753 SHA512 2886cdd93555e6bf52bc2bca917d420da8cf0e04dfbe52aacdd87080d3d1e72d16f0d822bcfeb36d89f7a2405fc5006962d1a67085b09d30b4a0012ddab4b4c3
 EBUILD extlib-1.7.6.ebuild 844 BLAKE2B 1aac975321754c837889f58a9899ad546ed04790bfe697aad4e65058a85d6c47ed997f5f72fc4e13064635bc4acf4e4a6ad07fce00e32080b4e6176b7080fe31 SHA512 57c1ac05e1456012a35518ad52709e806052e4cd06b22c150852cd8fb7113b1a1504c9fd18add5f1cd366966b040bf298d7ae75ffa74eb3ea2494342cb3f5887
-EBUILD extlib-1.7.7.ebuild 977 BLAKE2B 76b981e3a62136a75ba6766dd451eb9d0455f1c4d2b589d19ff390581ef631112f65b3b100b06e8cdc5197091a1f785ea4da75f79f7635c8b2dc709f336d4700 SHA512 49481d39ddb6392173c13a21e32a8b28b0c5ae8e38419cd661d51930e98f1bc4834ce3d6bae29bf33f4fbc3f13bf102d1e15f9d90cf37b92b2bac32ff7103776
+EBUILD extlib-1.7.7.ebuild 976 BLAKE2B 43cf3dddf72d9577351ff67cff43edc09f84cbe49d99ff839deb07d47ed7eb462bf18c6be46a8df7c732d5f5276e3a6b27fd03b5f646c6ccbce5751c8311416e SHA512 64c31c8bc5853df86961f945c22db372e5f3f353a0a214da36d1382df39ee4fdaf268e356bed856094b547ba0542705e2ec391c6e28dc3ec9fbaf7fd7089ae1a
 MISC metadata.xml 384 BLAKE2B 5cf5e456304e88b37a2a9635fecaa5536bb2bd58eda884676f93545969a3361eee4a0c94750352eef6fc7c63117391f58fb4a8bb9eec18ea8eb3dfb3c2f017de SHA512 88ad9b420b173c120be33305275c08becbce8c8490421cafffc1ba64131b27ebd88cfb8b1951d2e780c9eb93b45c38f9de83f2a134812edc38103e28f05f5f05
diff --git a/dev-ml/extlib/extlib-1.7.2.ebuild b/dev-ml/extlib/extlib-1.7.2.ebuild
deleted file mode 100644
index 87f06dc98481..000000000000
--- a/dev-ml/extlib/extlib-1.7.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="Standard library extensions for O'Caml"
-HOMEPAGE="https://github.com/ygrek/ocaml-extlib"
-SRC_URI="https://github.com/ygrek/ocaml-extlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1"
-DEPEND="
-	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	dev-ml/cppo:=
-"
-RDEPEND="${DEPEND}"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc +ocamlopt"
-S="${WORKDIR}/ocaml-${P}"
-
-src_compile() {
-	cd src
-	emake -j1 all
-	if use ocamlopt; then
-		emake opt cmxs
-	fi
-
-	if use doc; then
-		emake doc
-	fi
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	findlib_src_install
-
-	# install documentation
-	dodoc README.md
-
-	if use doc; then
-		dohtml src/doc/*
-	fi
-}
diff --git a/dev-ml/extlib/extlib-1.7.7.ebuild b/dev-ml/extlib/extlib-1.7.7.ebuild
index d7b78f03ebe2..92911d10b10d 100644
--- a/dev-ml/extlib/extlib-1.7.7.ebuild
+++ b/dev-ml/extlib/extlib-1.7.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ygrek/ocaml-extlib/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc +ocamlopt"
 
 # See bug #704146
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 90af2339bfc3..8e023fa8d803 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -3,6 +3,6 @@ AUX externalmeta5.patch 562 BLAKE2B 0618a1691472c3248f63f157f2ba36d886a7b34b1813
 AUX externalmeta6.patch 546 BLAKE2B d0d5f75c46704b280ae4480ffe2ebca097adbc457c845615721888b45612da1a8e71b41bd6d8d9dadb16cdffa35108fc87a3dfd32313fa96d92f0021817e0112 SHA512 c112b7d44101e483d408c56dcd0d2524208b6e95b65a09dfe01f8ad6d09a20617020f9174cb4631473bab2550fec151329fb5e8d0e2e3378991f1ab88cce0301
 AUX externalmeta7.patch 527 BLAKE2B bf4a4aec02096766f9741705fbf99201c742abc992ddb05c143378d7bb6d0b79f3c3541199eb5a81142fa1b317980646c3fe12528f792cbfaa7762f024bd88d1 SHA512 61c1e03e5b0d021f2cd7d013bed54edd610edb48cf9f6c063d3542abea2d2fc811c1cf7284b54a584491064dee8dd4e72656ba90a63c144586f40705b8443a1d
 DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
-EBUILD findlib-1.8.1-r1.ebuild 1671 BLAKE2B e6d133cce2b4fb5eb9778803acef80b40d2dd1443c5a50ff28b8ee65afc65cdda0dc039b81ef2a9b659eafacca1159e710ed316889108740e83b76983e8e78f2 SHA512 5f386020aeaa48d8e87a8bc1e236cdd6a4124f7d449bedc2a04697dd2ba23f58a0db50dc6dbfdfda1eee359655f045b9168c2ffa6fdc1ff12b5bb1bb22aa1849
+EBUILD findlib-1.8.1-r1.ebuild 1668 BLAKE2B 84307716d465e5d10b0df3f37ddd5a7533dd07bce02827d7c5fa2fafd1be51d26be90f4cccb78c1add70d00865fd812380a7cacd9445973ee7695f2272ed212e SHA512 e94c9836cb19b1eb59b33f7570b9104d697d73ca6af00d3a0986f7823ca726cc6106bf6f124aa9955e283bc9810ad85f32186345357f03438936f6d54323ca59
 EBUILD findlib-1.8.1.ebuild 1681 BLAKE2B 3e4cca14ddb76b0dc5dcc5f2d94ca4bf4b7e8cdd26696a5b104434195a2b73fb43bcf27338ac7444a4d80ce58cf868d3d309bf1fca59b54d4b30aa398e27a9d4 SHA512 f2de64a87a1f859c2840a849246934052baad12cce4708eb592d63df20915569a6f69c87b9936c3951b2c856d42e50ab3ade8f2182197deb9631be14150e0862
 MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/findlib/findlib-1.8.1-r1.ebuild b/dev-ml/findlib/findlib-1.8.1-r1.ebuild
index 861df812337b..6880e1c5c7a4 100644
--- a/dev-ml/findlib/findlib-1.8.1-r1.ebuild
+++ b/dev-ml/findlib/findlib-1.8.1-r1.ebuild
@@ -13,7 +13,7 @@ IUSE="doc +ocamlopt tk"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND=">=dev-lang/ocaml-4.08.1-r1:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
diff --git a/dev-ml/iTeML/Manifest b/dev-ml/iTeML/Manifest
index 50f9e2c4d217..b3b12a757d3d 100644
--- a/dev-ml/iTeML/Manifest
+++ b/dev-ml/iTeML/Manifest
@@ -1,7 +1,3 @@
-DIST iTeML-2.5.tar.gz 33750 BLAKE2B 362dcbd0a2e44842832ec5e2307eb2f291013344e80b791f1e2c3e5ffc43633f67c7e736ad3a6545197467700d043649080b5f8889b55e460748f769ca7f404b SHA512 b8a2f842f0076bdf3f30a71983f686b931ac3f7fde73ad83041dae1d33d8bca2c7695b71dcc53ef942fbdee7422e2e4d22994f69b70d54e2b4d62bc1c64395c9
-DIST iTeML-2.6.tar.gz 34822 BLAKE2B feb7a1d7973f1710b245cb5d859d443b4c30a6128137523659768864cdd23eb18606a2b6d418d9fb37784bf2fe53fc45a4558e1565186e2402574df560a4afc5 SHA512 6c42856d8a8d6b9e76002fe94e4be0db2a108c4a033fd3d19849772a6c1db9b792beb960b0ac02973d40dc9dda4c4cf5ba13ae9f05534798cc3ccc283f8d3567
 DIST iTeML-2.7.tar.gz 34866 BLAKE2B c3d2df6901ca1c5a804b8e5becf2960f6de10a0edc88fab86fadd39ec25d35143d5ccb3765a1bb5e4d55f28d1dc8942085b964b343dc1f8622ea4438b842e9a6 SHA512 477b55332ab4f733bb225fb15741e5129314fc857900715851027b132fd87f169f8d402987762bd9a07e0a644b1d2bbd49e2f21de7cc23edbe89ff8b3f2bda65
-EBUILD iTeML-2.5.ebuild 616 BLAKE2B 8701d46e53561cfefc823af98c8912fe061321c7a5444c83757f7a2fea634f81124d4209a59cadfb5df9588bd9fc29285628932192fd39c826df85e1b0607b19 SHA512 201b4767bae5d86e8ee937f557b69396c97315f44c181803bc5aa8117fda265cb0eefdc3cf13cac6f6828a16040479ad9a03dbbd497877b0e44f65f7325fc8ea
-EBUILD iTeML-2.6.ebuild 616 BLAKE2B 8701d46e53561cfefc823af98c8912fe061321c7a5444c83757f7a2fea634f81124d4209a59cadfb5df9588bd9fc29285628932192fd39c826df85e1b0607b19 SHA512 201b4767bae5d86e8ee937f557b69396c97315f44c181803bc5aa8117fda265cb0eefdc3cf13cac6f6828a16040479ad9a03dbbd497877b0e44f65f7325fc8ea
 EBUILD iTeML-2.7.ebuild 616 BLAKE2B 8701d46e53561cfefc823af98c8912fe061321c7a5444c83757f7a2fea634f81124d4209a59cadfb5df9588bd9fc29285628932192fd39c826df85e1b0607b19 SHA512 201b4767bae5d86e8ee937f557b69396c97315f44c181803bc5aa8117fda265cb0eefdc3cf13cac6f6828a16040479ad9a03dbbd497877b0e44f65f7325fc8ea
 MISC metadata.xml 256 BLAKE2B 09b9dfc51aa2ff66b4244c86b7fdccb3a6eb2a84e5f4f57d304b977d4c192ecf2f7c088eba60fae1bd3b7cda7ebb7c233684eefa11a531cb4641b23799142f51 SHA512 50e99c06648a84ac4e070680dfbe717e801f0b4f89e26517bd202e36b0d62cb9ff1fa13caa5a049ae32ee765a57e72f9f896a63006b959dbbcbfb4e23ab32da7
diff --git a/dev-ml/iTeML/iTeML-2.5.ebuild b/dev-ml/iTeML/iTeML-2.5.ebuild
deleted file mode 100644
index 7047a3ea4d8d..000000000000
--- a/dev-ml/iTeML/iTeML-2.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Inline (Unit) Tests for OCaml"
-HOMEPAGE="https://github.com/vincent-hugot/iTeML"
-SRC_URI="https://github.com/vincent-hugot/iTeML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-ml/ounit:=
-	dev-lang/ocaml:=[ocamlopt]
-	>=dev-ml/qcheck-0.5:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
-"
-
-src_install() {
-	findlib_src_preinst
-	dodir /usr/bin
-	emake BIN="${ED}/usr/bin/" install
-	dodoc README.adoc HOWTO.adoc
-}
diff --git a/dev-ml/iTeML/iTeML-2.6.ebuild b/dev-ml/iTeML/iTeML-2.6.ebuild
deleted file mode 100644
index 7047a3ea4d8d..000000000000
--- a/dev-ml/iTeML/iTeML-2.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Inline (Unit) Tests for OCaml"
-HOMEPAGE="https://github.com/vincent-hugot/iTeML"
-SRC_URI="https://github.com/vincent-hugot/iTeML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-ml/ounit:=
-	dev-lang/ocaml:=[ocamlopt]
-	>=dev-ml/qcheck-0.5:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
-"
-
-src_install() {
-	findlib_src_preinst
-	dodir /usr/bin
-	emake BIN="${ED}/usr/bin/" install
-	dodoc README.adoc HOWTO.adoc
-}
diff --git a/dev-ml/lwt/Manifest b/dev-ml/lwt/Manifest
index 740547c9f57a..ad08ab9e4ea0 100644
--- a/dev-ml/lwt/Manifest
+++ b/dev-ml/lwt/Manifest
@@ -1,8 +1,4 @@
 AUX lwt-5.3.0-ppxlib-0.18.0.patch 13548 BLAKE2B fa89411ea65421eb8f8b7f7f782817c27f21d88a12a95a6a8a9d858c6e6665d2a79432ec237daf77d594ba11e4ef1e71921779084055e8df695b696f81b6ce06 SHA512 cd5dc33e0b3366445ce491efda7ff55fcf7f628138fc8213dfa8a7d425d44fd7b312d9008ff1bad5216bb8179bc0e41e5844d1826237c3c26f657d7ec5410671
-DIST lwt-3.0.0.tar.gz 285864 BLAKE2B d14f8f8a9e71a61c57bd7c208575849667dab4a4770b56a0d94e93024b22be9b7d88d10c0fa24eb8060b67c75e72c2c8bbfa0362f3aa815c76c93575225ce056 SHA512 270a6dc2fc58950380eecf72767782c72a5d72226f4af0e9a4f9b0e70b788eeb1d2727348ab8da4411ee59374a19524a6a793b14a26fe7051d51f987ef0e42b8
-DIST lwt-3.1.0.tar.gz 285309 BLAKE2B ffc3a416491d4c7b7e7c0da67b48d9eeb5b7fa50e3637d4f0cfcd1689b75626b48c8dd6d91e87c93022047809a3774683c41ce620e07ee4d3e1409185e7f8d16 SHA512 0b2269e53f2e8a57e1ffd6f237c6b22de39a3b6b0d57276c7cb9371392aabc9fb6364b2617a6408ed0049ed64f71de0c540209cf83ce43899fd025295342eb0d
 DIST lwt-5.3.0.tar.gz 298152 BLAKE2B a39494bf98fcca07bf4601a742f4bfdc1ea2a67e2babbab650c41d2df58296a859520509ddc080af9c4d55be76439b401174720765fb942586d7c866f80cc538 SHA512 9922c19944595b0c07da8e1bbdecb2cc7c5a7edcdc2224215efb819d9c735da8986388a2446bd0762e28533f5d9d386970f07a4f1b0d14255c6743f3a1d16cb6
-EBUILD lwt-3.0.0.ebuild 868 BLAKE2B baea13b202122c9d836d6e86eb814f46b3009b6d5f04b1648a958bf05cac881ca5e45316613b987f3e44e21f04f4366e74489e6bec6403e9a89c7d4cbacf5a4b SHA512 e803b0f9b9d97209a68cbed575b3b8b7bdd7031839e74f1ebd78c16c4729c10df202cc1e54d3291e977c093a11927a5049696897c84055e89dd267124b610971
-EBUILD lwt-3.1.0.ebuild 1194 BLAKE2B a1ab34b8cdb6dd4ce5d859363505c885df31da5e4999269d6d7f695ef2e5612acabd9c4d6203aac550ab7614773e82f579333385621b95f79fa71d69078649e7 SHA512 b974e3c33bc9b63b15929bde88a2ad34d50048a14d9a8437180752355d43ef6fb38f62fc006f0c46b3001ca9dd4a8bab79c2fbea883876b15dea36b40298224f
 EBUILD lwt-5.3.0-r1.ebuild 804 BLAKE2B 35260bf4191d222cd53fdf530ff198a9168ad901f6af4ed43e896e32ac8afcd499021fda7e87f0e83bf66d48d89ae7c12b2595e4b92dba6dd077d893cdaf9d9a SHA512 cb3171bd8b8b5e1e9fec7eea46d2b05385feaffdf8b32f65fc9a67940973ea88336ca304d900a8b8cad6b704d386ca52d7f1ecf4426dab7e4ee6c78d85d51394
-MISC metadata.xml 534 BLAKE2B 04d77728a82e759ba24f80a4d02c289da849979c93fc6af3d60824eba4a18fb53eae33a4e5c33a6c4c0cd2ce0bc1d325bf86bca38f6f5cc4ffc4c339db6f3de8 SHA512 eb3f2fe064427ae98a683d5508134fafe1364a172cfef215a886209c3b6967f4e575a14e00ea8c93efcb20e742f0312780397cdf99eb56ec151ae30c50f0a072
+MISC metadata.xml 320 BLAKE2B 30af4a959e49cc4dedde3ee8144ebcc7358c245d0f66d18ada370d682d4b4c971c7c3c4d15e0f796aae6ff13a923e18017058bfdd73db6974973b88447311b26 SHA512 02ebc0a053f10df606e161ccb91804c8e3bc9ea34cd7c24158820aa31689f12d8297df58f56b8bb24d23e7cd89b87a198ca726130a2021163b59198e8f3ff135
diff --git a/dev-ml/lwt/lwt-3.0.0.ebuild b/dev-ml/lwt/lwt-3.0.0.ebuild
deleted file mode 100644
index 5b3a44a3d1b7..000000000000
--- a/dev-ml/lwt/lwt-3.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="Cooperative light-weight thread library for OCaml"
-SRC_URI="https://github.com/ocsigen/lwt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="http://ocsigen.org/lwt"
-
-IUSE="+camlp4 +ppx"
-
-DEPEND="
-	dev-libs/libev
-	>=dev-lang/ocaml-4.02:=
-	dev-ml/result:=
-	ppx? ( dev-ml/ppx_tools:= )
-	camlp4? ( dev-ml/camlp4:= )"
-
-RDEPEND="${DEPEND}
-	!<www-servers/ocsigen-1.1"
-DEPEND="${DEPEND}
-	dev-ml/cppo"
-
-SLOT="0/${PV}"
-LICENSE="LGPL-2.1-with-linking-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-
-DOCS=( "CHANGES" "README.md" )
-
-src_configure() {
-	oasis_configure_opts="
-		--disable-glib
-		--disable-react
-		--disable-ssl
-		$(use_enable camlp4)
-		$(use_enable ppx)" \
-		oasis_src_configure
-}
diff --git a/dev-ml/lwt/lwt-3.1.0.ebuild b/dev-ml/lwt/lwt-3.1.0.ebuild
deleted file mode 100644
index 58c19493d7b8..000000000000
--- a/dev-ml/lwt/lwt-3.1.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Cooperative light-weight thread library for OCaml"
-SRC_URI="https://github.com/ocsigen/lwt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="http://ocsigen.org/lwt"
-
-IUSE="+camlp4 +libev"
-
-DEPEND="
-	>=dev-lang/ocaml-4.02:=
-	dev-ml/result:=
-	dev-ml/ocaml-migrate-parsetree:=
-	dev-ml/ppx_tools_versioned:=
-	libev? ( dev-libs/libev )
-	camlp4? ( dev-ml/camlp4:= )"
-
-RDEPEND="${DEPEND}
-	!<www-servers/ocsigen-1.1"
-DEPEND="${DEPEND}
-	dev-ml/cppo
-	dev-ml/findlib
-	dev-ml/jbuilder
-	dev-ml/opam"
-
-SLOT="0/${PV}"
-LICENSE="LGPL-2.1-with-linking-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-
-src_configure() {
-	ocaml src/util/configure.ml \
-		-use-libev $(usex libev true false) \
-		-use-camlp4 $(usex camlp4 true false) \
-		|| die
-}
-
-src_compile() {
-	jbuilder  build -p lwt || die
-	ocaml src/util/install_filter.ml || die
-}
-
-src_test() {
-	jbuilder runtest -p lwt || die
-}
-
-src_install() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		--mandir="${ED}/usr/share/man" \
-		${PN}.install || die
-}
diff --git a/dev-ml/lwt/metadata.xml b/dev-ml/lwt/metadata.xml
index 876bdf620f96..5b7d7469f26d 100644
--- a/dev-ml/lwt/metadata.xml
+++ b/dev-ml/lwt/metadata.xml
@@ -5,11 +5,6 @@
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
 	</maintainer>
-	<use>
-		<flag name="camlp4">Enable camlp4 syntax extension</flag>
-		<flag name="libev">Enable the <pkg>dev-libs/libev</pkg>-based backend.</flag>
-		<flag name="ppx">Enables the ppx syntax extension</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">ocsigen/lwt</remote-id>
 	</upstream>
diff --git a/dev-ml/lwt_ssl/Manifest b/dev-ml/lwt_ssl/Manifest
index 46fad6450a08..07c01063e6ed 100644
--- a/dev-ml/lwt_ssl/Manifest
+++ b/dev-ml/lwt_ssl/Manifest
@@ -1,5 +1,3 @@
-DIST lwt_ssl-1.0.1.tar.gz 48964 BLAKE2B deb6b48ef0249f7ab5c9bbb4507ce7be048c547c8aeeb9421a96cd1215c4292b6a4330ee6c6aeaf6ff092e7eaba0ef7f689ff0de2e97ff68b576cd27084719bf SHA512 429e2ee6b45e53b8f3347a0ad02531fa3ee6b3842dbf6475cf079a214f3a59bbb25f3c1c882ff32f01263711db034cc8900be827e27e6a8b0562812e4bd8e52d
 DIST lwt_ssl-1.1.1.tar.gz 288603 BLAKE2B ba22a078597c71ed51142c91d215c339f5ab9aae3a4f94f8111985ad76fba7faf60878ed3e549d79983130d8203531326c408a2f18e0f902e6171b383f26abda SHA512 207ccf8ccde13d88eb58d4ff45279f7cbde90ed5c20a941e7efa9501d9c1b8a71d7655178960c826bb52c6403c348faa5053cefc0ac197ad690a96daa55d1a32
-EBUILD lwt_ssl-1.0.1.ebuild 504 BLAKE2B ef321f8a4271fcf3bf6b25eab17cc8557f27cbd78ed3f4bb921fb5091ca15ddd185ee830b82901762fad8ebfb0a534754f4d6c802cabded54e802ea41e6fff09 SHA512 6a026b3e8137a1f6684f6107bda5bfd82971bbdd621b72d69654ca5ec7c388a65ca5d8c3b36c10bdcb8ee7282f79917a6fab637b1c54ca145f0652994492e25c
 EBUILD lwt_ssl-1.1.1.ebuild 583 BLAKE2B 3170c488278b51305df94063b52d8b8f2f9ebb3bc05fedba7b0f3cd43e9a140f7ef16a87a36a198b733ef2e7fdecbc75441af1646c4c27e235a00b9ed13d3d5c SHA512 92868dbc53e3d812897745fcdca855c7f51e31870f9b647f47a8406df4a2230ab46f6e49447510558109b85abfacf8e5fd68d6a9ef2e01e45b0b71ff4e3f38a2
 MISC metadata.xml 243 BLAKE2B f4f8ba5087618a3e022e6c8a81bed9e79da719beb13e41c3f1c91961e7e18afac544c6039f176dfbbcc78149311d5631ef1469abbe1e832885c5e738effeac87 SHA512 a4e5b8654e590aae9cd003aa9ff9470deea7790d90b0d057c477c4b78a8d1fe5dd26bbcae47f1fba3fefe4a98181d2a5e0cbd35cf16b0ae07200df3184e92798
diff --git a/dev-ml/lwt_ssl/lwt_ssl-1.0.1.ebuild b/dev-ml/lwt_ssl/lwt_ssl-1.0.1.ebuild
deleted file mode 100644
index 72aa5de96791..000000000000
--- a/dev-ml/lwt_ssl/lwt_ssl-1.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-
-LWT_VER=3.0.0
-
-inherit oasis
-
-DESCRIPTION="GLib integration for Lwt"
-SRC_URI="https://github.com/ocsigen/lwt/releases/download/${LWT_VER}/${P}.tar.gz"
-HOMEPAGE="http://ocsigen.org/lwt"
-
-IUSE=""
-
-DEPEND="
-	>=dev-ml/lwt-${LWT_VER}:=
-	>=dev-ml/ocaml-ssl-0.4.0:=
-"
-
-RDEPEND="${DEPEND}"
-
-SLOT="0/${PV}"
-LICENSE="LGPL-2.1-with-linking-exception"
-KEYWORDS="~amd64 ~arm ~ppc"
diff --git a/dev-ml/oasis/Manifest b/dev-ml/oasis/Manifest
index 2c28427116b9..0b13d2c77f95 100644
--- a/dev-ml/oasis/Manifest
+++ b/dev-ml/oasis/Manifest
@@ -1,5 +1,3 @@
 DIST oasis-0.4.10.tar.gz 394732 BLAKE2B 6347e532d595e33a3a62f63669625d6de0081e8be90568a0e9f334b9745a40ec2593e7c79d21174f3119728c4831393efff0a3ab6d1aeadc594a0f96e5112a72 SHA512 c173a3a774d13a7cb21ddb44f89dadef210d331ab5f3a1e7ff1705e815572f70e22815736cc3f3788b6d8f784c21a309b45c5bf5e984e583b31931847bf107fd
-DIST oasis-0.4.8.tar.gz 389565 BLAKE2B 50103f261fd4c9d11fea1d7c26abc047fd0f30ab17b871672cb1ce0a89fd47d378fd4f31d48f1a6835361ddb74761a0ad9fe4bc5ca514e470a4cf3594f30c762 SHA512 e0baf0f048647c25eac5472db0d2a22d0fcaf85fe61ebd88ec5a101c20d4916ecfa9d10fae069ba4479abb22b90c44f18312b9252727a8c7c7de4aa2d8d72663
 EBUILD oasis-0.4.10.ebuild 929 BLAKE2B 209e79c20f72fa4d77d16902238f73ea21fde215ed6cfa5119db83f4f4e672487f7236fee789ed571eeec9ec2c1acc30659741c3a38d065d21edd3a6e5d588de SHA512 f365a3a72680932b46e8bd3a571ffadb3514695a4ee8cfd7eada809517ee5d0f90a9faee90a1fd229413bfe505b7e5d285213253a14ad12c62ba10caa4bfe585
-EBUILD oasis-0.4.8.ebuild 911 BLAKE2B 5f7975b80a4e218901304a2bda5e5d7e16cf47a8f3df90b58b12f6a856ff6490e348cf109307e2cdc8f5ea3e3b8e7563dabe2eb1cb4cf937391d123f5657ee80 SHA512 c9c84df7e4068a3ab9915c0bc4c3d1ccf6b6593a83916c12e4c513c4dff16a42fe57b0e6a6ce9541461930f07059dc33262a95baff62e274675862d8e23af7ab
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-ml/oasis/oasis-0.4.8.ebuild b/dev-ml/oasis/oasis-0.4.8.ebuild
deleted file mode 100644
index f4b70d1c6f47..000000000000
--- a/dev-ml/oasis/oasis-0.4.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-MY_P=${P/_/\~}
-DESCRIPTION="Tool to integrate a configure, build and install system in OCaml project"
-HOMEPAGE="http://oasis.forge.ocamlcore.org/index.php"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1669/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-ml/ocaml-data-notation-0.0.11:=
-	dev-ml/ocamlbuild:=[ocamlopt]"
-DEPEND="${RDEPEND}
-	>=dev-ml/findlib-1.3.1
-	dev-ml/ocamlify
-	dev-ml/ocamlmod
-	!<sci-chemistry/oasis-4.0-r3
-	test? (
-		>=dev-ml/ocaml-fileutils-0.4.2
-		>=dev-ml/ounit-2.0.0
-		>=dev-ml/ocaml-expect-0.0.4
-		dev-ml/pcre-ocaml
-		dev-ml/extlib
-	)"
-
-RESTRICT+=" strip"
-S="${WORKDIR}/${MY_P}"
-DOCS=( "README.md" "TODO.txt" "AUTHORS.md" "CHANGES.txt" )
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index 596fdf23b0dd..501d15aa5605 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -1,11 +1,5 @@
 DIST ocaml-ctypes-0.11.2.tar.gz 203564 BLAKE2B 2a8c0ee8f8dcd78c3f93b506e92f2c3476c1505d8b58be9273405b4c198500d8e5ff4b0689f76599cc3e92ebb1f5db685c025e2f6a29f590ef21e36c4ac4c3ed SHA512 f3d75e9e596f68438733090fea8c675624c3b186a77c3adf1eca8f12cc2da336f0f5b1688c2ee788726e873bbb0c4dce1d237d53d1637d78e4ad6a8eae1f912a
-DIST ocaml-ctypes-0.11.3.tar.gz 204959 BLAKE2B f3863e29d355479f9306c39786d56839ab05a119dfd5a64de1a784d71e8d931d5fad0f306402aadb50bc5e8147ab7668ac026b5bfbbaff2b6530d7a33f9f38cc SHA512 e7698954a6b683869a1482af8fe1bbeb5ccf693c2bb8583e2c19c5da92ed2730466e373c6f53d9ff9f09c2bdedf102da3f76b75511d7f9b7d266ac0765999f94
-DIST ocaml-ctypes-0.12.1.tar.gz 199686 BLAKE2B d131bb8ebe8448c6d252d32b6a6de2e555f4c7802bec0da83f33ac402d1fd1c73db9abb97fe9f7065fbeaddc782c0976bb05ef6ee6aa80e20b46074a48c343c3 SHA512 801c66395d843c9e410736a06ab5e03bbe22851a364dc9b9444f49dc133e0f5e0b7a1c31e88de56d23a21817cb35595a1b6743c430c8c1a689b7ae12adc8856f
-DIST ocaml-ctypes-0.13.0.tar.gz 200959 BLAKE2B 9f7274099924bd5502fc8115a1e5ed32f9b56902ce284f5530710c948d6d735a2abfd30affa5f1f7803edb33e062c288963946846be29977af87f19f47dd0fbe SHA512 ba2e4cd77d42cf032d823e26f94a8cc37d81ac12bafd40c5d61685d66c97e18996a286dd8d486c94ad4a34e4214e55104e6283158962871e7f0722b2144f7a7d
 DIST ocaml-ctypes-0.17.1.tar.gz 208101 BLAKE2B b9fe6632058a670c988ba9f1ae81b75aa5373de7231cef04d5e2ede61a44cbaa0324c04197a0a202847599a9bbe7dccd18fd3279f3f351493aaec4959caf3ada SHA512 1e197009f7e6b29b43944f757e987934337ebfa11bb2ff2ca8ba3ebc607e37cf1259d07a90d7faf4b91b49ee20d5c65357ad305f34ada0a8d336a3904233150e
 EBUILD ocaml-ctypes-0.11.2.ebuild 670 BLAKE2B 058d2278336a8fc5092606079078d2e7a19accff917bcb4679f700e5e5d07f71d4fa47079ee18a3d0b1b54bcc06f60f966aad047f44d1295edb9aae9df2b3c9d SHA512 d48415b9c30c6d63ba61c2bf98cbb2e459be1a412196c038caf9657914a8e579584f0c8eb22352c03c2f2f26c343ed3f13f2186be9f801f537a3b87f0f26e6b0
-EBUILD ocaml-ctypes-0.11.3.ebuild 673 BLAKE2B ab176999bacff4f722fccf3f38f007d2184a6e7d24ba23c242a12a79823f75ededec6d304de5d1ab8655f359a7864dc067e2ff362ac4a95481c5eb01c8e490ae SHA512 012872b8c32374e385a7d6725c4be3d1312c8a0f285264e03230f5164a49d61d78c56ef505ff8175e7e0f08e71a25ed4222f06dcc7f74df63dcd160ec95a9ac8
-EBUILD ocaml-ctypes-0.12.1.ebuild 710 BLAKE2B b5907498008fc21e9533983ba7b26ad5ced78ab269ef3bff391508bb1bda16ec6df97bef51842edef9aa7c57386c804b0af2ebda22a47253d86d1e61257e3704 SHA512 d56e928abe3e46637a14f837865a02a1083181ce8627d635ebb313db28ee65094e73e87451a18be45df72f182d4bdd37e10c40f386e31f4a8b201539bbf1cd29
-EBUILD ocaml-ctypes-0.13.0.ebuild 710 BLAKE2B b5907498008fc21e9533983ba7b26ad5ced78ab269ef3bff391508bb1bda16ec6df97bef51842edef9aa7c57386c804b0af2ebda22a47253d86d1e61257e3704 SHA512 d56e928abe3e46637a14f837865a02a1083181ce8627d635ebb313db28ee65094e73e87451a18be45df72f182d4bdd37e10c40f386e31f4a8b201539bbf1cd29
 EBUILD ocaml-ctypes-0.17.1.ebuild 805 BLAKE2B 636c3010c16883fe96817333884885db7ec0ddd885b0c7c9eef5bbb74fdee5606b6cefe2146d0b1c1edf9cd6524270e0c6b6bb730d8c09244db6e6a8fdb9abad SHA512 47174c36c496511138f40c935c615937c3ea73bf0cb0fd6e25742b072b6a97ddb4aa47162f2950ce616e80afa05e0051e163a7842e8289841b9b094233fb6365
 MISC metadata.xml 331 BLAKE2B 7deaed237d1fd18b923d5a0dee3595a7c59f35a0a4e900c417d52fad7d659d6db8b1f36d64a859df6a7770c401b9d8054f51a93dd6fdb738a34a82d8a7b08620 SHA512 35d5acf562fbf2745c71984f7bd26c5ade620c55b23a76a5b443a401a5484a3c58a74e1ab9ae0a0128b2a16c43f661f69e98cb886a3053cfc581ac618ff5c896
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild
deleted file mode 100644
index c1ff54bb429e..000000000000
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Library for binding to C libraries using pure OCaml"
-HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes"
-SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.02:=[ocamlopt]
-	dev-libs/libffi
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit )"
-
-src_compile() {
-	emake -j1
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	findlib_src_install
-	dodoc CHANGES.md README.md
-}
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild
deleted file mode 100644
index 17a54dde7978..000000000000
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Library for binding to C libraries using pure OCaml"
-HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes"
-SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.02:=[ocamlopt]
-	dev-libs/libffi
-	dev-ml/integers:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit dev-ml/lwt )"
-
-src_compile() {
-	emake -j1
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	findlib_src_install
-	dodoc CHANGES.md README.md
-}
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild
deleted file mode 100644
index 17a54dde7978..000000000000
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Library for binding to C libraries using pure OCaml"
-HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes"
-SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.02:=[ocamlopt]
-	dev-libs/libffi
-	dev-ml/integers:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit dev-ml/lwt )"
-
-src_compile() {
-	emake -j1
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	findlib_src_install
-	dodoc CHANGES.md README.md
-}
diff --git a/dev-ml/ocaml-dispatch/Manifest b/dev-ml/ocaml-dispatch/Manifest
index 74c1d5b9c1d4..aa2ee4a1922d 100644
--- a/dev-ml/ocaml-dispatch/Manifest
+++ b/dev-ml/ocaml-dispatch/Manifest
@@ -1,5 +1,3 @@
-DIST ocaml-dispatch-0.3.0.tar.gz 51453 BLAKE2B bd7965396a82a9f767abd05079496a5e0c1f12c3fe02d8c1d79b41db10010eefd89edf3351d8d05f132f0df3c3ab79533902a98752e571bfd09d4f2798f1db57 SHA512 0f09eae45a2ecae27d07e247b6a47f307e074342e337e7be262f5183f77090f0aef81fb5c0bf499732bd0a711d4d51775cbcea5e463011f43a1777582d78806b
 DIST ocaml-dispatch-0.4.0.tar.gz 7554 BLAKE2B 9bbe102df8a27642cbf54ad876caa276ba966ca3b19af53ac8f957799d0ca98b030c0d5ec055cc2868b2c374d71371c6e91ef0b89f4b5a072fbe2c47133df919 SHA512 d5318bda4079c21820fce5b21d178ed88fd0535a5cdc559dd6ceeb4d06ffb08456ee5aec1e56efd40b6d4f456f7d5c7eda17dc728666e6514dc936898b605b36
-EBUILD ocaml-dispatch-0.3.0.ebuild 764 BLAKE2B 646d1d85f42a526e3d40a1fd8a9f421fd40353f56fb4ef57c7b4935b346113ed13408291adbadd3e02a6514781d424f71bc3737621256d71c82069e2a3523208 SHA512 27e4714792648b99cf1ca4c317f4b25c67dba6f0b64be21e2b51f4dfce49594d5a2625e5299840dac9b3022272beef6a5e50411c18fcebea11cb27a4b7499a01
 EBUILD ocaml-dispatch-0.4.0.ebuild 878 BLAKE2B df6b567c81a3e6900d2322ab682fa0228afe5df1506d723baf460dd5a818e78532e1aec1987807080acd7d75dc259ca33100559718dae418134e4269cc9dccc9 SHA512 9edfe64ab8ef95608e7ea433e60793271b3ff6bc69bf10b8898aa69086cefb36dc9908be0a6562ad9c36ddeeed11b788b29188504f3e52b5199f21626b224b71
 MISC metadata.xml 260 BLAKE2B 2c01e02fd97a8fccc0f705d85be842abe3f587a45f4bbcf3b41ffcbff9ee2c2848847009b15b004ddca8abe84d35fbea548fc6517d8efead224c614483c4976a SHA512 4dcbfb971d15698777a531e300a4d78afe937f01ef4db0cf253830b377794662fc4d1349cc17b50045342b63df4348e81f44de7636ce86ff76904b880fc98d41
diff --git a/dev-ml/ocaml-dispatch/ocaml-dispatch-0.3.0.ebuild b/dev-ml/ocaml-dispatch/ocaml-dispatch-0.3.0.ebuild
deleted file mode 100644
index 0056e666f79f..000000000000
--- a/dev-ml/ocaml-dispatch/ocaml-dispatch-0.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="Path-based dispatching for client- and server-side applications"
-HOMEPAGE="https://github.com/inhabitedtype/ocaml-dispatch"
-SRC_URI="https://github.com/inhabitedtype/ocaml-dispatch/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="javascript"
-
-DEPEND="
-	javascript? ( dev-ml/js_of_ocaml:=[ppx,ocamlopt?] )
-	dev-ml/result:=[ocamlopt?]
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	test? ( dev-ml/ounit[ocamlopt?] )
-"
-
-DOCS=( "README.md" )
-
-src_configure() {
-	oasis_configure_opts="$(use_enable javascript js-of-ocaml)" \
-		oasis_src_configure
-}
diff --git a/dev-ml/ocaml-expat/Manifest b/dev-ml/ocaml-expat/Manifest
index a5f87e393f78..d8f05c8d1ce6 100644
--- a/dev-ml/ocaml-expat/Manifest
+++ b/dev-ml/ocaml-expat/Manifest
@@ -1,7 +1,4 @@
 AUX ounit2.patch 672 BLAKE2B a47afbc8d7c33483a8a732252f7a7a624f60364d2c055097a0af8f97b7022b09b297a4022a02317fd6e4843bd3f66a875feb8389750cd3f332560cbc38834e5b SHA512 5298115ef79f2d59cafd1c0d09e7dde8649dc16a7a84f77965078a62f76ee2d9348e10d0e2230efdd89c3ecf4cc59ba3fc7b3d5de4f2a428641e8a67a47dc220
-DIST ocaml-expat-1.0.0.tar.gz 58149 BLAKE2B 0bd99a8a5eb8f4fe1a04d1d53edc5dc662a51ae880c5297de9dbc93561896e5c3acf3db4b7edc5122a328be4c17fd924a66a2e0e08c9bd74aac704257f5dc569 SHA512 217d602ac8fabf7713dcd8fd274206b81ff467402a9bca5b15b13f3b1d68e8e5f2c2970adeafb2378c0993b39c7d98a420dee07f30ad9eb88fd40665a2f98897
 DIST ocaml-expat-1.1.0.tar.gz 58318 BLAKE2B 137bc65c5c867180ba547de17041bd0f588da395928e92eabef45cdbb76a1d139d7cd0d80d33337e1fbff92c9fa3cab2339c0f340f50f467b8fe7d64cba10b1e SHA512 9407f91f5007d6835643719294d4e4907bfc40464d054911591ce80c31d173ddcc7b06157a19c0d3ddd78775806242dc68aea7847e588ca9fd1909def1df4d23
-EBUILD ocaml-expat-1.0.0.ebuild 823 BLAKE2B e79e689a1a2629aca38ffedaeba67a24aa45981e797648a50e0a9ef10249637a7c857820b4a3979529dce3b8820c5d85b64c9d4ed8b92a412b59f7c6421c5a59 SHA512 94bdbf2e30b52b0782b3f89a58514058c2d46049cf6045d431382b1d4c79d7672f1c9b0febd73a7e8c7fd9a19eca2166c073749767c069529e171e3e05a50150
 EBUILD ocaml-expat-1.1.0-r1.ebuild 906 BLAKE2B 0dae8b0ebabef5a8c84d85e1151e80fb271254f530f0939e6ebf988db9ca05b6605786fade5e50fe8c136dad436879f28e370d8b5d4eea79ef706262d1de94f0 SHA512 8a8cad1130b20d3467aacf86c53011c37e5710bb52dcf18a4721989b6a98c382b5c9b53722b2e2a08126329f7385b3fa10645da3162c5a28f8bfeef834e32016
-EBUILD ocaml-expat-1.1.0.ebuild 823 BLAKE2B e79e689a1a2629aca38ffedaeba67a24aa45981e797648a50e0a9ef10249637a7c857820b4a3979529dce3b8820c5d85b64c9d4ed8b92a412b59f7c6421c5a59 SHA512 94bdbf2e30b52b0782b3f89a58514058c2d46049cf6045d431382b1d4c79d7672f1c9b0febd73a7e8c7fd9a19eca2166c073749767c069529e171e3e05a50150
 MISC metadata.xml 331 BLAKE2B bab5b5dec6ca651b9ca68b86fbc7512bfeeb15946248234814bad8acf17aabb785e6bd23a645e205adb1c97907da43ea4dc052233c0f5b699551cae30eb77fb4 SHA512 da512352ddbdf8c8a274706656b4611e918089d0c970dc68d6ebc95200ba0900c5bfe3f7d5454d87ef7ddd5ec0e45b2da2aad531c2c22998ac0d5798fbd62d64
diff --git a/dev-ml/ocaml-expat/ocaml-expat-1.0.0.ebuild b/dev-ml/ocaml-expat/ocaml-expat-1.0.0.ebuild
deleted file mode 100644
index 73386d528fc7..000000000000
--- a/dev-ml/ocaml-expat/ocaml-expat-1.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-IUSE="doc +ocamlopt test"
-RESTRICT="!test? ( test )"
-
-DESCRIPTION="OCaml bindings for expat"
-SRC_URI="https://github.com/whitequark/ocaml-expat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/whitequark/ocaml-expat"
-
-RDEPEND="dev-libs/expat
-	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
-
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit )"
-
-SLOT="0/${PV}"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-
-src_compile() {
-	emake depend
-	emake all
-	if use ocamlopt; then
-		emake allopt
-	fi
-}
-
-src_test() {
-	emake test
-	if use ocamlopt; then
-		emake testopt
-	fi
-}
-src_install() {
-	findlib_src_preinst
-	emake install
-
-	if use doc ; then
-		dohtml -r doc/html/*
-	fi
-	dodoc README
-}
diff --git a/dev-ml/ocaml-expat/ocaml-expat-1.1.0.ebuild b/dev-ml/ocaml-expat/ocaml-expat-1.1.0.ebuild
deleted file mode 100644
index 73386d528fc7..000000000000
--- a/dev-ml/ocaml-expat/ocaml-expat-1.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-IUSE="doc +ocamlopt test"
-RESTRICT="!test? ( test )"
-
-DESCRIPTION="OCaml bindings for expat"
-SRC_URI="https://github.com/whitequark/ocaml-expat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/whitequark/ocaml-expat"
-
-RDEPEND="dev-libs/expat
-	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
-
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit )"
-
-SLOT="0/${PV}"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-
-src_compile() {
-	emake depend
-	emake all
-	if use ocamlopt; then
-		emake allopt
-	fi
-}
-
-src_test() {
-	emake test
-	if use ocamlopt; then
-		emake testopt
-	fi
-}
-src_install() {
-	findlib_src_preinst
-	emake install
-
-	if use doc ; then
-		dohtml -r doc/html/*
-	fi
-	dodoc README
-}
diff --git a/dev-ml/ocaml-fileutils/Manifest b/dev-ml/ocaml-fileutils/Manifest
index c5c40c464143..57e8552aba16 100644
--- a/dev-ml/ocaml-fileutils/Manifest
+++ b/dev-ml/ocaml-fileutils/Manifest
@@ -1,7 +1,3 @@
-DIST ocaml-fileutils-0.5.1.tar.gz 129639 BLAKE2B 12f4b33eb70caf3a106e87a484411f31d6924aae68c964350080698b723b39c7bae236d5a732a0546cd6a52b4215c9ddf2b46da613c171a1ef384ef5eee3d5fe SHA512 e2f60d16d9c25f43ea6bf5fcdf5810ae1722ef30a37e9ffcb6302a87bf3aa89777f3e3d43860258fb7c284861df1eafb4e5e2b6bd3f8d78d347ef8d139e460e8
-DIST ocaml-fileutils-0.5.2.tar.gz 129676 BLAKE2B 2534c28d134b297cf9f7838c6f33f6fe4a7fde6875cf7ae15990b1d2c2fd53be425ce8b37b6836642b26722fa0042f741e91d1c32211a2618e5f80345b6c63cb SHA512 264282c54ff693686ca9e60f371038f8ea9bce219d04556297dc7b6028c9f65c5a03b7cd263c3519cb212e29665200db1c95c88874bb2cb3d7b610e3b832018d
 DIST ocaml-fileutils-0.6.2.tar.bz2 43060 BLAKE2B 20828875a25b1a9d2a41bf495cda00b0ac753efa20111b32a9d2ca439a56e9f07bf0953d16ee9148cf065e204fa1d8d624eaa89f6f4ae7e1613fdaa7cb44fc24 SHA512 104c7389832f22ec189ce6f1596144b28dcaeea7d23d5b19d369c44e54326e97fcb7b4f4c4a8d2965523e63b35b594a1351b7e630dde590871efe512fe38853c
-EBUILD ocaml-fileutils-0.5.1.ebuild 657 BLAKE2B 28f86d8927fa4834cdba0f3fca82e24d13d955dc6981010df27adaf20e92557217aa948f95a7c8b88b23602ea937d3f7122f9ad86ad04f781aa8484fdac86777 SHA512 31e36c96107f42ffe22818e45dd370fcbc18e966634aa120cd65698dd1a4e9b099f207477532a44d973142a7feb39078c1b43479561d3768c4971686faf433c4
-EBUILD ocaml-fileutils-0.5.2.ebuild 657 BLAKE2B f20ed4dce9dbd67e30f42c9e16941fbb6f540480f08402332074e95e5ecf9cc8f87f55d7effafe9fadc4856cd82bb4540a6e44e1998a226672aba712eafdb948 SHA512 9af55239baec33eaa231aea5d70cc4a9ac9bf5154c97ac40df43c80875550f18aa0b62600bdfdf4380e11c6afc85f9f985c2c24f20189430f76e34f257e9ca88
 EBUILD ocaml-fileutils-0.6.2.ebuild 649 BLAKE2B b3203abdd1edf69d46658ee97b4f52228d872d244c2c077b62f0875a3386e7c962ff444e5fafbcbc092d70ca05040eda5add67bc4417a2ed2678809894247a16 SHA512 a5d04dd27e325283a3513d73ca112989c81004209d06a3dd68b6f374ae7c136db315dbf17496660d94a2adcc4fd0373d2652f8b4b41330d277ee0bc9fd56db8a
 MISC metadata.xml 799 BLAKE2B 412e5e86cf787c2a3a63eff243337e4f8e54abee3d8cf0491e90c4e2e0cbdd2e5c4d452ec87b63cc0ad8d23286283eb1f17b295c422100cf412fa74ce99318d3 SHA512 c22647ffa2dba7aac8d3f401e6124e0acdc02526fb53ea35995ccd22984715a09d6b558097b9385c1c2fc31ca75a20864e22b0fd9ea9a6113620b31bdde7a691
diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild
deleted file mode 100644
index 6b5395fafe13..000000000000
--- a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="Pure OCaml functions to manipulate real file (POSIX like) and filename"
-HOMEPAGE="http://forge.ocamlcore.org/projects/ocaml-fileutils"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1651/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-
-# Does not build on 4.09+.
-DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
-	${RDEPEND}
-	>=dev-ml/ounit-2.0.0"
-
-DOCS=( "AUTHORS.txt" "README.txt" "CHANGELOG.txt" "TODO.txt" )
diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild
deleted file mode 100644
index d0082d821707..000000000000
--- a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="Pure OCaml functions to manipulate real file (POSIX like) and filename"
-HOMEPAGE="http://forge.ocamlcore.org/projects/ocaml-fileutils"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1695/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-
-# Does not build on 4.09+.
-DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
-	${RDEPEND}
-	>=dev-ml/ounit-2.0.0"
-
-DOCS=( "AUTHORS.txt" "README.txt" "CHANGELOG.txt" "TODO.txt" )
diff --git a/dev-ml/ocaml-hashcons/Manifest b/dev-ml/ocaml-hashcons/Manifest
index ee390779d930..645ef1d15dc7 100644
--- a/dev-ml/ocaml-hashcons/Manifest
+++ b/dev-ml/ocaml-hashcons/Manifest
@@ -1,5 +1,3 @@
-DIST ocaml-hashcons-1.2.tar.gz 19775 BLAKE2B 7bef506cb7de3177168cc582245f8e2ece3ca7e9da78985ff604a32be675bcd36901ed920c7898aa0e3087251494f425c164cd1125485549de0bbfd867bdbfa6 SHA512 167ed8d74c5080ef14af0ac1232ea16faee3f0e09e0a65cd72447266939ce7ed5416f4cf6a3021e5ca8215726df129d3f05c9e0c12dcd36f845b060fd93072b2
 DIST ocaml-hashcons-1.3.tar.gz 19495 BLAKE2B 0d29a529fb1d6953e7294e3992e6f41c094e8b4ea607ed4f2f0d97c558b2c9a6e8703de0aca06727b845ad3f3989ef99c634e248f221c95fbffc2321cd73e961 SHA512 fd194d48a3231e72ca8bf3d324e5e1f6442d965da9149973a1763cf70aa82398805fa00648bdd12de3d3daada8e90bdc575c73886f949b5183e79bea75beadc8
-EBUILD ocaml-hashcons-1.2.ebuild 856 BLAKE2B b294fa9c408a097a29e15d9f9716261388e46fd804050f0919cc6d834fd86bdc3a25fd11bb0ddbc620ae1224060a6143c55a7dd0723ea6b7745ee4db183e92ab SHA512 7a0ff44d93330c4ecdd7cfc0f28ec595944d8b917ec427b9ebd09a6fc904fbc02aeecb7012b911f2200cc03abc790af421927b0f04ee3e3adc1e5061cc45c182
 EBUILD ocaml-hashcons-1.3.ebuild 856 BLAKE2B e8d2f6d399d40ca83b447c7c5a18ba8ed34c5d0b5b272852119ff8352dbe9111923e732a3ae5d01c33be478efff7e3c9174e6011f7216d149ae2f3807aefac38 SHA512 4b0f2ac976990f2086bbb37f8168b3756ec0fd845483db3eae2ca7f3c7ee7424ba6bdbb14b33b31dbf434654c34fe66cf9d14ec00aa4f833c8b2df8285523714
 MISC metadata.xml 259 BLAKE2B 72d093b371aa2735e9f81201fb32b5fe3e6ae2e3074c86be4e6f85c026d6a81cbeb3a82ca72ac6dbfe4ff3785e5661843b32d8f859ce50fad3823f218fed84c5 SHA512 ee8ee05e2b4f71e1e2b73d210db65707f53606f2943406f41a12759a4d024bd4cfbfc6f8c8e6ddf37e199adb10b7501aca1f2dc6e6704590221e50bec20bbeec
diff --git a/dev-ml/ocaml-hashcons/ocaml-hashcons-1.2.ebuild b/dev-ml/ocaml-hashcons/ocaml-hashcons-1.2.ebuild
deleted file mode 100644
index e2f3672faae6..000000000000
--- a/dev-ml/ocaml-hashcons/ocaml-hashcons-1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools findlib
-
-DESCRIPTION="OCaml hash-consing library"
-HOMEPAGE="https://github.com/backtracking/ocaml-hashcons"
-SRC_URI="https://github.com/backtracking/ocaml-hashcons/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt"
-
-RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eautoreconf
-	sed -i -e 's/$(OCAMLFIND) remove/#/' Makefile.in || die
-}
-
-src_compile() {
-	if use ocamlopt; then
-		emake opt byte
-	else
-		emake byte
-	fi
-}
-
-src_install() {
-	dodir "$(ocamlfind printconf destdir)/hashcons"
-	emake DESTDIR="-destdir ${D}/$(ocamlfind printconf destdir)/" $(usex ocamlopt install-opt install-byte)
-	dodoc README.md CHANGES
-}
diff --git a/dev-ml/ocaml-sqlite3/Manifest b/dev-ml/ocaml-sqlite3/Manifest
index dda8496f8c34..3d158298cded 100644
--- a/dev-ml/ocaml-sqlite3/Manifest
+++ b/dev-ml/ocaml-sqlite3/Manifest
@@ -1,9 +1,3 @@
-DIST sqlite3-4.2.0.tbz 22167 BLAKE2B b5f874f592fb7873060d3f33b82ea9282fe0a04aab8683f5355a96b0a7a78e19daefc6d3f72b9e796dcc718347f8b13bc210eb4a61622cf12460b263bf088c86 SHA512 3221ba03eae64c59c3ffa57271585a1fe76848504d56edf33e953fad270929ba300b5828788f6cbb3f145acf743ad51bc019d151ac68472f6dbf7ab43263ae86
 DIST sqlite3-4.3.0.tbz 22498 BLAKE2B c57d8edbc0897229cb415d48efb02ae41dff1d87fabc667a40b984807c5c5885201dca3d7f523872435b7e18b450c15707212eeeafc0a75f1ad28d7e7671b4c7 SHA512 f09d425830ac24ea835a403bc51d257c265b6e77b1dce01367c715545cbd98f3ad2694e6dfdbc7491d590aa809c0313329e81c9614228170f90197f2a94200c9
-DIST sqlite3-ocaml-4.1.2.tar.gz 76879 BLAKE2B be02c4df79f78b69e859fc465242e3e513d0b557364614e4fe73f78b6020e77fd971f274e45e4d2b79c99ea6e110358dc23ab2f79183915e242244b9ff6a6de8 SHA512 880f82fa9eba06114695bda56305245d2d9062f8136db85675463e97fbb8aee210df310d8d65d78e9eb1f882421581a97c4b7f20a790881f699b4d494be066f5
-DIST sqlite3-ocaml-4.1.3.tar.gz 76989 BLAKE2B d5f5e5c91faaf7308c47431d2f5292952e5c6ddf8854897aa2d54946b312bd3321f4ec6ecca7455778707b082e7af676ac50ab5b16686176623058c082973cc6 SHA512 59865b4c5d99d319ee6f5e1ecb8d71b4c07bd7f77876fafb73d3c882dbf434b67313f4caf7762f2194dc819f75af9582dd4df002f0f68cb8690996b857c08a1b
-EBUILD ocaml-sqlite3-4.1.2.ebuild 654 BLAKE2B 5c0b2db9006c9a9514bc133008040a8548e5aca09c61b4876922602b40cd60bed234ae8d45c1d5a52b1aa45a7f5314a3ed68e0941e47378696f638238f2acb7c SHA512 8ee84ebc3a3f4956a3a7c4afd38af5e21150fc1fdb4390a9a49d5d6853197a61ecc132cd5a5759fd3b394a0b70a5e50349dbce145d734023a81524ac6e2a8521
-EBUILD ocaml-sqlite3-4.1.3.ebuild 654 BLAKE2B 5c0b2db9006c9a9514bc133008040a8548e5aca09c61b4876922602b40cd60bed234ae8d45c1d5a52b1aa45a7f5314a3ed68e0941e47378696f638238f2acb7c SHA512 8ee84ebc3a3f4956a3a7c4afd38af5e21150fc1fdb4390a9a49d5d6853197a61ecc132cd5a5759fd3b394a0b70a5e50349dbce145d734023a81524ac6e2a8521
-EBUILD ocaml-sqlite3-4.2.0.ebuild 709 BLAKE2B 201c0c0eecef1094d0a1bf8b5b0648e65701feb78db814218ad8d4eac4e3acec1a93fe84b1131e5cabdc24d5eeaa7089c2a36db9c14ff2fd33c72ef354bebce9 SHA512 5bdf0c57b4f9e77a312d95226eb244b5865f2c17468a294b25fb9a126ff323809d8d89bbabec8492aaaa0df699b13ed1e84c5a1d5e258815b232d477f9e844d3
 EBUILD ocaml-sqlite3-4.3.0.ebuild 709 BLAKE2B 201c0c0eecef1094d0a1bf8b5b0648e65701feb78db814218ad8d4eac4e3acec1a93fe84b1131e5cabdc24d5eeaa7089c2a36db9c14ff2fd33c72ef354bebce9 SHA512 5bdf0c57b4f9e77a312d95226eb244b5865f2c17468a294b25fb9a126ff323809d8d89bbabec8492aaaa0df699b13ed1e84c5a1d5e258815b232d477f9e844d3
 MISC metadata.xml 322 BLAKE2B 943cead5c3010411a8507ac09a05d88a413db06c3fac3967ecb6bde0bdddaa4bb9a7ea081e31e6382c805e3c437f64d26b254b0a630a963021c0507ec51e8526 SHA512 c3844393c1910c1982d20a00e04727028be2cf63a33daa48fba4ea13068cfd6b1d3d175446185e82ba3753880c0559d4b4ed0542243e55908569f603e2524c10
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.2.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.2.ebuild
deleted file mode 100644
index b815ace156b1..000000000000
--- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-MY_PN="sqlite3-ocaml"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A package for ocaml that provides access to SQLite databases"
-HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/"
-SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=dev-db/sqlite-3.3.3
-	>=dev-ml/findlib-1.3.2"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" "TODO.md" )
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.3.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.3.ebuild
deleted file mode 100644
index b815ace156b1..000000000000
--- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-MY_PN="sqlite3-ocaml"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A package for ocaml that provides access to SQLite databases"
-HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/"
-SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=dev-db/sqlite-3.3.3
-	>=dev-ml/findlib-1.3.2"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" "TODO.md" )
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.0.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.0.ebuild
deleted file mode 100644
index 8cc25ff20034..000000000000
--- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit opam
-
-MY_PN="sqlite3"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A package for ocaml that provides access to SQLite databases"
-HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/"
-SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/${PV}/${MY_P}.tbz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-db/sqlite-3.3.3"
-DEPEND="${RDEPEND}
-	dev-ml/jbuilder
-	dev-ml/base
-	dev-ml/stdio
-	dev-ml/configurator
-	>=dev-ml/findlib-1.3.2"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	jbuilder build @install || die
-}
-
-src_install() {
-	opam_src_install "${MY_PN}"
-}
diff --git a/dev-ml/ocamlmod/Manifest b/dev-ml/ocamlmod/Manifest
index 9de99005b224..7d09d6a179fe 100644
--- a/dev-ml/ocamlmod/Manifest
+++ b/dev-ml/ocamlmod/Manifest
@@ -1,5 +1,3 @@
-DIST ocamlmod-0.0.8.tar.gz 48985 BLAKE2B a153b172b14216b8e69a51c47a25cd796e6bb2adb5d0c45dac49a5bab8e99f0b8511e5e1818abe2bf86ea5280b9b1c19aa21db23ed686387c3414c0df6f2667c SHA512 beb64c109c241965f33a60b4868f5215e6c112742a3be214d3b7a0503b9d29494c0453fa5f2551bbc1975cd4b123d0b917116aeeba968d2a7d2c6fb9651a64f4
 DIST ocamlmod-0.0.9.tar.gz 55025 BLAKE2B 26be662e814543b65a2fb293732257a803c0cfc544550d0339617ff3c59ce1cf44f2330582e6eeca313cf8e25984d7cbfc4fc1c1a3b830fc490a16551961974e SHA512 cf0d3671cf8fa83bdbd0e4b47888a50f9eab24691c71685c0612a9a8efaf36ba9fa66cee604c928a71f2d8da40b35453d2f2d3619f73141aba0f46de3bd97537
-EBUILD ocamlmod-0.0.8.ebuild 526 BLAKE2B b54898384d33a3b0b9e4a8d58aadfc0d56543ffd9dbd28ea8fb935d6bde8c1befc832f8c75866368cd54ea30c83197d1e6ed0f0419816a32310713574ce754e7 SHA512 6d1ce92fe21cccb2fbdc6bd1d3ccc95e6217111808cf813c447b866c51671ece77c12ee5523f3f76175286bd1bbd09ae76802b5484a5ce34998241bb6df7538c
 EBUILD ocamlmod-0.0.9.ebuild 522 BLAKE2B 7302c193286a7b8fbb9a0e60c19beed36d1861455fe6a2dd5ef3d7a51575c6c01d4ca520b257675a5039ed3bd8bc7ec5033a69cc9918977528a4ab21810bb2d6 SHA512 bf07f93cb0c37debc23040b2c7452e7400b39c09324a4fd619181174ecb2e7b8d6ca1ba4b852dc2fed734904427daa32ec1bf27ec1866d31180f93aa69263fa3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/ocamlmod/ocamlmod-0.0.8.ebuild b/dev-ml/ocamlmod/ocamlmod-0.0.8.ebuild
deleted file mode 100644
index d8a4b5c50ad2..000000000000
--- a/dev-ml/ocamlmod/ocamlmod-0.0.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="Generate OCaml modules from source files"
-HOMEPAGE="http://forge.ocamlcore.org/projects/ocamlmod/"
-SRC_URI="https://forge.ocamlcore.org/frs/download.php/1544/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-#	test? ( >=dev-ml/ounit-2.0.0 )"
-
-DOCS=( "AUTHORS.txt" "README.txt" )
diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
index b0c4347f64f0..f8c95350428d 100644
--- a/dev-ml/ppx_tools/Manifest
+++ b/dev-ml/ppx_tools/Manifest
@@ -1,10 +1,4 @@
 AUX ocaml404.patch 2031 BLAKE2B 02341fa3b292d713995f95d76f1b47970b9ff34d8b177212074c0a3c027aff1d0f27a0e3e7f03b8131904a28d285f9cc4b7b795e62327ad2da7c29f1b74240da SHA512 507bda106d25a92718aae1b0e95103d481cbe18624f80a59af6b3e884594c1d18b0c15b51f014b1af39b09a5264272f92ee8d18dcca37e7595964f85241c141a
-DIST ppx_tools-5.0.4.03.0.tar.gz 17209 BLAKE2B bd51e5b2482a9eab09bf9a02ac0231fa7bbc721d54a932e6cfdc1d719c106eca0fe90563b636601110e796fab439f6c6d7fccd5d2920f5bcb3c115f622d90381 SHA512 d1867b084885704757f390b6f6ca8b5d7702f0476149d99ea227f98230ab35d57f5c4aa779881231a0a77cfd1861255118fa2551a49ab85553f63e9aab9baae4
-DIST ppx_tools-5.0.4.05.0.tar.gz 17893 BLAKE2B 0902f53ef19338396cf2a2319a4c2d4b7bbbfb66bbfd0fb2290c29ecebcda02ff90d2f0d0221b08d027c41c863c2bc0a02c50363d83474864c08e619641b7ad6 SHA512 33b4420500a2b5880e770f8fdf2b37ef08e52ff84f96f955c6321492de906568979feccb1b2b477b1117619ba28edd8d3e0f178c5684f0dc43c6ed56266c4d64
-DIST ppx_tools-5.3.4.08.0.tar.gz 18590 BLAKE2B fac872d113ab1bf9135357dea47d468924e16a1a038b64152d5ebb27daa69a8c2d906750146157954f4d95769535f4a93c1ecc9582ca0313d601a06606196c00 SHA512 817e2688d60f013fa42ffa263cfcc15cfae820240d2e54dfedf1f4a4191f9b9fc365a190cc7eeb9082ed72fbf3c94d6ba72c38c7db3e2bcac49a17ba590d71b5
 DIST ppx_tools-6.2.tar.gz 46150 BLAKE2B f8af2a1eee81d5a1e73ac606ab79d285c8c226533bcf715ed22386aecfaf51260fb9a5075d270675f1b601cb174b68d8c85556f418031a7b6bda06c4376fe443 SHA512 fc3943c69901ef46843355c3482d5a1481d05ee94fb0a344ec04101059a02cbaa76fed5742cfae82730edf378f2e140d859a5cf590653f85359255d451f07dc8
-EBUILD ppx_tools-5.0.4.03.0.ebuild 807 BLAKE2B b71640ed43baaf8afaa8d841d78461f3f66cdade8f22a93aaaac04093dda070d2b0512a8b6ebfc7eabd400b70c852155db5101bdd5c3ab6b46561f0a9db3ae99 SHA512 f231b7ad6f417b2635b7cd1dc765717398074aea040011e25caf81bc25a46e214f9e653dcb33759bcefaa8b359b08f1e37cf2b42d78c5575f3a2563e7810f287
-EBUILD ppx_tools-5.0.4.05.0.ebuild 708 BLAKE2B 58acde9589203a439a9148eb7373d32f8852efb9aa3cddc2d5b74f73e357614767893adc7ebae38b913e698181e295ca7cb8dc0b6b33f85a84422bb202ea1c01 SHA512 457523621d33361f16fe821025b90c7c29ef2b007f85c9ae7156a036d67d50b894e05c3284434e4d1495df2c0c1a4cd7f5c00434b3204644a758486ae5e3d1a4
-EBUILD ppx_tools-5.3.4.08.0.ebuild 651 BLAKE2B ea64e3cb4c471e62f145ee3e79a3554579d07eaf7b6159c37c36f9688de786076b0a056eb5c301265bf561e4e17023ee5730414b68ebd60e279b7bb687fd0e1e SHA512 1cf8e5cb010eaf775e88fc0a39648bdfffacfd3b4e21538a2d5800fb3724576b2dd31d94319f43e3302bb4c8bfdcf871418a609375732469f87bb3ae6905a278
 EBUILD ppx_tools-6.2.ebuild 502 BLAKE2B 6a1d63c8438455ab861e9442642d4f74aae65669791c74e9ac821e532fbcff27e0073a90a4bc787dec7e5ffaa19bec2aeded22c525fc68905567ece9007d8826 SHA512 28057bdec60fd7213fc656a77d780035049188fd7b98e9d45c7cfe0e35a045a9ad2199ec0701b6f317493fa6c35d33187015f8473fb6fa839de266e3b3f52367
 MISC metadata.xml 330 BLAKE2B 52495fb4974c24c4cc083ea661dc08c13f4bcee587270fd157cc92d14a2abdf0272fff8f521cb010a893e47b44ac311fa06275b7ecabeed8a212495206460cd0 SHA512 1a3847e8e4675cdbe31ca7d176ac94ddb9ee3584d2b5dfc09798071a7bc10ca92bbe0e759684025563831b5e8b2f11bc51728a8b5422780c50a756e00d3ea7c5
diff --git a/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild
deleted file mode 100644
index d0acc2b9fac0..000000000000
--- a/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib versionator eutils
-
-MY_PV=$(replace_version_separator 2 '+')
-DESCRIPTION="Tools for authors of ppx rewriters"
-HOMEPAGE="https://github.com/alainfrisch/ppx_tools"
-SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt"
-
-DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}-$(replace_version_separator 2 '-')"
-
-src_prepare() {
-	has_version '>=dev-lang/ocaml-4.04_beta' && epatch "${FILESDIR}/ocaml404.patch"
-}
-
-src_compile() {
-	emake -j1 $(usex ocamlopt "" "ARCH=none")
-}
-
-src_install() {
-	findlib_src_install
-	dodoc README.md
-}
diff --git a/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild
deleted file mode 100644
index c2a93387105c..000000000000
--- a/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib versionator eutils
-
-MY_PV=$(replace_version_separator 2 '+')
-DESCRIPTION="Tools for authors of ppx rewriters"
-HOMEPAGE="https://github.com/alainfrisch/ppx_tools"
-SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt"
-
-DEPEND="=dev-lang/ocaml-4.05*:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}-$(replace_version_separator 2 '-')"
-
-src_compile() {
-	emake -j1 $(usex ocamlopt "" "ARCH=none")
-}
-
-src_install() {
-	findlib_src_install
-	dodoc README.md
-}
diff --git a/dev-ml/ppx_tools/ppx_tools-5.3.4.08.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.3.4.08.0.ebuild
deleted file mode 100644
index 7e9d0206f344..000000000000
--- a/dev-ml/ppx_tools/ppx_tools-5.3.4.08.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib eutils
-
-MY_PV=$(ver_rs 2 '+')
-DESCRIPTION="Tools for authors of ppx rewriters"
-HOMEPAGE="https://github.com/alainfrisch/ppx_tools"
-SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="+ocamlopt"
-
-DEPEND="dev-lang/ocaml:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}-$(ver_rs 2 '-')"
-
-src_compile() {
-	emake -j1 $(usex ocamlopt "" "ARCH=none")
-}
-
-src_install() {
-	findlib_src_install
-	dodoc README.md
-}
diff --git a/dev-ml/qcheck/Manifest b/dev-ml/qcheck/Manifest
index b4286850b0d3..1ff60ba2d33f 100644
--- a/dev-ml/qcheck/Manifest
+++ b/dev-ml/qcheck/Manifest
@@ -1,5 +1,3 @@
-DIST qcheck-0.6.tar.gz 255625 BLAKE2B 9b0e2f6c134a6c4eca37763f1ca41dcacdd8755f5ffe1b7afba2a5384edac4c9881c6849d6f6da005afe2aaaa46f956e50a5a3d00f6fc57fa1866ca486121c12 SHA512 e4298f00c49febe36ae64f287e032081bb2d7713d9412db95441d6b84fb3030f45d07519369ba00be81615a737dc45a246d609772b318084a2b2a28e77e05e1c
 DIST qcheck-0.7.tar.gz 257935 BLAKE2B a885635e555a7442f0ad7687320e3d9f45897b9167ba4ac12baf632bc60e1eca207ae5ccf4b57ff36897e418f5ef4e781f9f2bf674ec16cdab140049debcb6c6 SHA512 3082029a09d5efe3af0cb8fcd0bd08f11dd1066d5bffc6beaac16c7244b07286b3ae93931e699f22c977ad4d6ba050dff69b133ce3492455d6932a9e0cc304f7
-EBUILD qcheck-0.6.ebuild 513 BLAKE2B bc38ae96008c9439a04883c1b18ebcef1e140ab8870733ec77d1217d674e823cab19176dbb047b3f6c9737eca71dfedcf2fa89ecf54199219aeb2c429df62781 SHA512 552045e6b2f6aa1bf80ae2d212aecb37bccb7424244451d8e1fa40c95c2f92e6de493be2bfab6999dd421c210f1d48ca1358928e89e607411b6911f0d008d87d
 EBUILD qcheck-0.7.ebuild 508 BLAKE2B d34f2f30a4322595035caf15db5a5a2e77f7816f833323e7207ac7f6eb9cea7587e2a4781c90d116161b4213c57b0c93ebafd67cedbbbce91d06188824db2b9b SHA512 0cffa1892c54378a9a2e1d74cde0ce167eeada2f0995bd409daef8bfc411e45723803b567c1e0a1036a15a338033cd46d7a178e1485ba6bb269ad90caccf4435
 MISC metadata.xml 250 BLAKE2B 56876e7e1d60959facf42b1a20761dbc738d7c794accadcbd0b56dbda43096d418f0fb5b76315bafe70fbe18c68e9c61229828a7a7122849c8d8c39b73a117bf SHA512 6ce7321f0917a67a97a262b1b96967c39e0131752ebca6813695e2916f27e8d534546e7cdc974a39fc10dd0b3e3b2178f016afdcbf63f51c6ea6f3e84e02d9fc
diff --git a/dev-ml/qcheck/qcheck-0.6.ebuild b/dev-ml/qcheck/qcheck-0.6.ebuild
deleted file mode 100644
index e74600712cf7..000000000000
--- a/dev-ml/qcheck/qcheck-0.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="QuickCheck inspired property-based testing for OCaml"
-HOMEPAGE="https://github.com/c-cube/qcheck/"
-SRC_URI="https://github.com/c-cube/qcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-ml/ounit:=
-	!<dev-ml/iTeML-2.5"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild"
diff --git a/dev-perl/File-Next/File-Next-1.180.0-r1.ebuild b/dev-perl/File-Next/File-Next-1.180.0-r1.ebuild
index 78b02898668e..0192ce2174a5 100644
--- a/dev-perl/File-Next/File-Next-1.180.0-r1.ebuild
+++ b/dev-perl/File-Next/File-Next-1.180.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="An iterator-based module for finding files"
 
 LICENSE="Artistic-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Next/Manifest b/dev-perl/File-Next/Manifest
index ed7347c2748b..068c105c0a58 100644
--- a/dev-perl/File-Next/Manifest
+++ b/dev-perl/File-Next/Manifest
@@ -1,6 +1,6 @@
 DIST File-Next-1.16.tar.gz 17914 BLAKE2B 36e12dbc05830b622d4b77db803b63e2b1ef679a346634f13b40ab8d6b4a3f5ff2a43b6015930bc7e3fc3cd29829b8a0d76ce7ef2f3e1584699a9c70a23fd48d SHA512 42c812b8927a18e1f01758a2218f37f2079083117763b41adcee1eb4947b36b1379405707304b948fddd4640e2c34070f4dcd0f217fb60b7ba765efe98be8ad3
 DIST File-Next-1.18.tar.gz 18286 BLAKE2B bac27a198bb8c8fa887b09fcc9f7473191e236da62097fd93759b34c436676402da3e65c89e18eb30ffc6dae0fda3bc7b4b750c5483442af345b8e89ee3760d7 SHA512 951ad995b40ddda359a10ba2d7e19622059da03e7aaa3411e2e887633fbf7720554dc3f98ad581b245b2ffb51ea79f7c5eedecf6e943359eb407df0f9014e627
 EBUILD File-Next-1.160.0.ebuild 734 BLAKE2B 006a754f338e8bb446d2cf452a2ec31a5c624ef508ef8178ef9b244a500f2a5348e7d8d3fb168b5db9f97398e2d73b68cbd49a34d919f7dee3a240a5c5e9ef35 SHA512 2983b5b1c6931bda7710c146b78a5440a0f37b1a1051c784458007829f6ca397bb68fb3eecdf843e9f54aa71a1ce9c371fbabacf224768f449142e61e866ce13
-EBUILD File-Next-1.180.0-r1.ebuild 778 BLAKE2B 17c92f221aad083ba18f47b15baff2991c74e869b334deed30c0ae61c4ec507ff5b8117a2e6c4522113cd4327392c1adf8d101e319e9f1fd6e87f86e666b8b0d SHA512 0ebab307609efd347ccb822f44351f2fc29fc320a486259939494e27188c7f28b59b6ca66b28e19d6976eba56a22121bf19755a6821ecbd3ea82178159c1dbbe
+EBUILD File-Next-1.180.0-r1.ebuild 785 BLAKE2B 43240931663f545ca46ac08bd5a61fcde3b582f5a5f35f9ce18f834c6a4618acb4cfac6f359f98fffd48f258949d9f27d01589aab58146794353f200cea4a74f SHA512 e4e947176e8e0433ad0cecd0f08bc1e91dd5e05302bdaa98690f3d56004b755b18cda1a29d75a0c2c4ef0e672ba99fc79317af5c1c70586ec872ff5556599299
 EBUILD File-Next-1.180.0.ebuild 734 BLAKE2B 2cae16a550708a712e85fdfd93a74b4ae76f7224c4d7b95ec8d9c1ef9b444336ceca558519d5c22c61edf9f815cc5e6b9a1136a51a23be62dcfc2f90c38eb154 SHA512 97a8779b736ba56c2283ccd98be390240084db8c4840221a451e7aa582ae2046ce972e54d8bd2be6aa669376b2a522f5634fa982f474bac6f90bb7bd1ba8f69a
 MISC metadata.xml 390 BLAKE2B 7ecd469524dbb58fd7081047a9aefd0c90fd58a3014558b7e7dd0eb73eec885ae8a42637f7e7d8f0e3fbe0ee346f895f3ff4da4ce16ac784d0e6f7dbb937ab73 SHA512 a740a52a19cb7cee3aacf7861638fe9313bef7d94961ee7281464ac9e6669ae568d1f9689b73af21cd7bc620a0f94672ca04227605c7e5b8041c31a51c1c8b1c
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 574429d9d3d7..d6af7d5f3cc7 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 0a81c750a966..d0efc46ffc1d 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/doctrine/Manifest b/dev-php/doctrine/Manifest
index 8f2c16bd8137..ed945aa07dd6 100644
--- a/dev-php/doctrine/Manifest
+++ b/dev-php/doctrine/Manifest
@@ -1,9 +1,5 @@
-DIST doctrine-1.2.5.tar.gz 659173 BLAKE2B fd703eb52d209548dd44950cdb23c2e3298e044f9387acadb2edc67bba79dd9b0a60fdf9a98d46e8078415c1e0ff21976323a6df1ab9f798ee475690ce50d4d8 SHA512 c72f4e829a92b011af0bd96d2f8a780c3106afb57a9677a21aed683473ff00aebdf7143a276c7cc70f1b142196968b5e2e5e1f744dba5c8ae1267b867b4e0310
-DIST doctrine-2.4.6.tar.gz 456426 BLAKE2B 775c14750954ced8728c220dee6ca41cbfa66a7c34b00476f6941d5681302b1f10cc8dfa5e206780bb3b4b5d0e591b0e770de182340c6e7a881d3c4ca3f5795c SHA512 d7aeb58e8c76df384a472df08618a058b70f2b8499de6a3157c36bde125ab32c7bf4f80d1e6d880502ccfed2db704f3218a6f1f1ecbf603cc828e2a757c366b5
 DIST doctrine-2.6.1.tar.gz 554462 BLAKE2B 3481a1e7c8acfb0de5c4aa64aa32d583e8f01b2175b2957ec8aa0ae29c962e7482ae1d36217aa765fc38198dc851cbecb5e8ee24829f9e335ad4d18bec3bb1f5 SHA512 f2ca1df4a1da814a0047d2da76da0df64ef704e8f5b2464f2a546e61e615d40de9508c72543ae5574188882dd2a3917d8205ec194c63d7b264257443cdfd47c8
 DIST doctrine-2.6.4.tar.gz 558995 BLAKE2B 789a9d3e5c53a19e9e9d6dc24680888e0703a51cf22df052604bdee0b5148edd5153a625528dc9cf7cea9e5b245c7c73153efc8a05e3f91150536c2d4bcc2243 SHA512 7f4ed67ff5a3921da5e630e51987ceb3f896824baa0db6065c1a17f0389c363c4ee149298335ce4eccce37dbb9e1572caa31196d0e67251a5ea72d449471eec6
-EBUILD doctrine-1.2.5.ebuild 555 BLAKE2B 1f4aca307534c7d6d1154fc072e8a41ee7784b616454caac7f7d76002fc441a6e9214c9a51a95e6c0c4f6530b1a1fa5d8f3fdd9ec29877e4e612a2899b105c79 SHA512 2fe2c0712b7591360e004d952deea9fd9946d027cf10e00ae2f180772c505d055a7e7bc9c1e7010c6af87196ac58a7dbd1387141a9eff8fe33cd933791fabc9b
-EBUILD doctrine-2.4.6.ebuild 531 BLAKE2B 7a4b5fbe31fd84083473455ce554f4f60252b383e517428a6c268e84c2646434ea5f933e38e9c2da17edc2206331da72d933874ece96f47a6a8df98315f58a0c SHA512 7d4f306bd2978ae62ca4b0d1746ea33d3bc5f39f01e031b352fc723e2ae77180a3ad7ddf7682f546ce6e0f38d1352ecec171d4cb2c7bc451f9d297868f8cca8f
 EBUILD doctrine-2.6.1.ebuild 672 BLAKE2B 288f877b15cf75273ce1de0df0d64030ff17f5a68da6ec74808ded7b1f98e8b6c42326b0be0285e5f21413b72a6091ccfe6427ca0fbe4e92b55c131680924c0d SHA512 67ac1a18dc3e145497acb0ac6e7ad95c7806d22feac227d7111cfaa2923d761594eb57daa731e2cfdbc86195dad17d469fa9881e703d5a2d041194ffb12e14ad
 EBUILD doctrine-2.6.4.ebuild 663 BLAKE2B aa1e7b8136ae1bb1dad744349e9cd936a43ada78de5fa226782c869f7009f73f04f1315855f471cc4ddb977fb8e1dad4b3ec7fb8e82c29e9b68bbf2e9c742396 SHA512 e440413eec4e57da55bdedaf308b5d68e5f90d5d3c34f50e9697fc147744232065ea4fdb8aa0d60d89a28b47d1149c9211c352bec0e8628509834d7e11bd97c9
 MISC metadata.xml 332 BLAKE2B 34b5c4879dbbabaf08883df45cc3fbed8c8c9e4af84defb70af64a25863914320e637f2fe0d388c21066b55921edf68cec06d0fb24de4464bb785a63d7cdcc72 SHA512 44f05e8196f20572f12f8ced92fdc76a78198ada035dd4eff11d37fea991aefd35364b07beb3abb213b63c900e7b9ed2b3e23f4d32fa0680928a342e0a5df8db
diff --git a/dev-php/doctrine/doctrine-1.2.5.ebuild b/dev-php/doctrine/doctrine-1.2.5.ebuild
deleted file mode 100644
index bf2faae0288f..000000000000
--- a/dev-php/doctrine/doctrine-1.2.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN}1-${PV}"
-DESCRIPTION="An object relational mapper for PHP5"
-HOMEPAGE="https://www.doctrine-project.org/"
-SRC_URI="https://github.com/${PN}/${PN}1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/php-5.2.3:*[cli,pdo]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php
-	doins -r lib/Doctrine
-	doins lib/Doctrine.php
-}
diff --git a/dev-php/doctrine/doctrine-2.4.6.ebuild b/dev-php/doctrine/doctrine-2.4.6.ebuild
deleted file mode 100644
index 5184f5a1812f..000000000000
--- a/dev-php/doctrine/doctrine-2.4.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN}2-${PV}"
-DESCRIPTION="An object relational mapper for PHP5"
-HOMEPAGE="https://www.doctrine-project.org/"
-SRC_URI="https://github.com/${PN}/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MIT BSD"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/php-5.3.2:*[cli,pdo]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php
-	doins -r lib/Doctrine
-}
diff --git a/dev-php/pecl-yaml/Manifest b/dev-php/pecl-yaml/Manifest
index 2c4e36e8dfe0..643cd9cd7024 100644
--- a/dev-php/pecl-yaml/Manifest
+++ b/dev-php/pecl-yaml/Manifest
@@ -1,5 +1,5 @@
 DIST yaml-2.0.4.tgz 39071 BLAKE2B 3a5dba0f6a16087909f4673543d64946e5929a5ef4cc616df6a4225aa2d274b2b5492b00ab0e95ed93f808bc2a4dd0a2f6d60c8c2ded078af35c4499042488d6 SHA512 138e5b4566800fc7d624baf71bc585d6d432755046e598ae9f4099fa565727e04d79bb171289a53eb9e5daa416ffee1b0fb4967c84976ac6cd6fc01b0a05fbae
 DIST yaml-2.1.0.tgz 39439 BLAKE2B 76cab7fe0c5cf4140b70dc86333a6a79c6f1684cef9e609b905d626e95cdf5542ef0a95a4e3b7e6b663adc81e240515c4d23b5f029c5519fa88e7178762171b9 SHA512 3731ca2b84e80599d7fae4f58efdd11e9920c672ea6e62ff6b0d57d721d3f6f12ca86efe88f63c324d4ad2b73d6947a21f6e5a47263538ca0d5e822b8fc7b8bd
 EBUILD pecl-yaml-2.0.4.ebuild 1112 BLAKE2B 84a00a78f00c4a74bc1dc305835bd03452d9631e2644f72c4324e2f94cbbe5d1e7b24a8be62d4156e4a1bba9b0c55492867c122d06b024d187ddde0873f2f43a SHA512 b97fa3b263b1492eeb08c2d3f643d19f560e022b082f23fc38028e9e321ef25453ec8b3c3856335bc2122694e2ec5f66019606253428a268969e6f568648d90d
-EBUILD pecl-yaml-2.1.0.ebuild 1112 BLAKE2B 5794d333cad654ad56e0d65012a5425f62f274e44fe48d62e0a07553e871d2d3f87fd52385230c07698b1f86ccb71ff93b7ca8f7c3fc8ab7c325e02994ac2a89 SHA512 741b903df7feaad91b84c28fb680611ae9df3f7192dcf83cfbae68c53f6997906a24bd4e4106298cbefef0d6666f2fa03d20da12dd35eaa184054c33fe7553b8
+EBUILD pecl-yaml-2.1.0.ebuild 1119 BLAKE2B e0a9917aadec20e3d1935d8f20aaf2acae4de355dc313c1361982cf9d38a43b1f167b2188a12719969a4189735f50e25c0b4622f13b53ec6de92bbc961453693 SHA512 68fe1fe61366c1ff174f67048428a8fabaafc2e6514331cebf32e2efc9b103dcfe6a723204cc87c8a77f0212890e74166d7bcfc03e5a69dee74808596c8e6cff
 MISC metadata.xml 238 BLAKE2B 1bb4abee8d968b36a69efa8f634c2d2e4422f5ac0611f123cf9794f1784e155a16cfd98ee209c16a745a58ddfa85d134c68a22bb5bde264c35ea285caa2d4d9a SHA512 560ff28e3776267c429b8d553d2dfc8991fa8d5845af5937c46ec68674d2b3c5cb922e557f43fcba113a70d4b3b5a32f39fc1fbed38de5781c7504fd526430cc
diff --git a/dev-php/pecl-yaml/pecl-yaml-2.1.0.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.1.0.ebuild
index 75dd43747a88..c9fc1d4dc0b6 100644
--- a/dev-php/pecl-yaml/pecl-yaml-2.1.0.ebuild
+++ b/dev-php/pecl-yaml/pecl-yaml-2.1.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/yaml-${MY_PV}"
 PHP_EXT_S="${S}"
 USE_PHP="php7-0 php7-1 php7-2 php7-3 php7-4"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
 LICENSE="MIT"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d911c2f5022f..04b3293e8756 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PySensors/Manifest b/dev-python/PySensors/Manifest
index 8dfc942e8ccb..2a7bec5867e6 100644
--- a/dev-python/PySensors/Manifest
+++ b/dev-python/PySensors/Manifest
@@ -1,3 +1,3 @@
 DIST PySensors-0.0.4.tar.gz 10599 BLAKE2B be3a3692a846e5339758eff4f4396dd15bf96b3d20bc40df45436ce58381ac87503bca190fa215121506ecf9ce5175b254d93142ee881c4d5b8ef8e045854659 SHA512 8e6b2beee9bf282f073618c0b45e53330ce82c9fc9c6565a3c6b5f812231421c8c6e15ccc4fc92cda67ed08df5c482577d4a34720c920dbba7604f2b7c3ba21c
-EBUILD PySensors-0.0.4.ebuild 462 BLAKE2B e1c013c2a5e93b637495409f82a79228e07d06084d9214be9c746e9880196c0f5a7aab5147513461ed5fe68c00576332b1d56d6155b40f9cc686cd50e6683999 SHA512 92a4e6ab3ebd1600d5ebdc13b55036253026b9eff81876acf35ca53530e30577fe7894a0a81809001e7aaede9ea85a5f82c9b08a53c8777d624a057cbca6b783
+EBUILD PySensors-0.0.4.ebuild 463 BLAKE2B 1209d444045e56c9db03704ee8a5fd30f28ba734bfc872844e66a8f2c9e10ad91f5846edb3aca9e91b7ca4fd885151bc8d9b88cccc1e0bc2287549ba513847c8 SHA512 925a157475798ddb047ba76873a311802237c5b3589fb20b8585171f7c3ba356db150ec3a5d017001f1decc4ff4856dd21a6456a801d1a04a234248a025ff121
 MISC metadata.xml 437 BLAKE2B 42315c93aedaf44d9ecfda30cabe8751e9fb8ca2621dbfcb434fda1581a5d6ba415a025c37fbfe1b03de8121bd4248aaeb6159e6850d08c692d6b729953dfb81 SHA512 63f7823890f90ae6049539ba3b15ddd3beade8e75ade4b06835ca7f04d64f1744e752eb2e7bd2b66e9cde29a4a1e79467a0046bc01ea34e50c1753b4a2ee811f
diff --git a/dev-python/PySensors/PySensors-0.0.4.ebuild b/dev-python/PySensors/PySensors-0.0.4.ebuild
index 1ba53eaf6a5b..0a25d34c3153 100644
--- a/dev-python/PySensors/PySensors-0.0.4.ebuild
+++ b/dev-python/PySensors/PySensors-0.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyUtilib/Manifest b/dev-python/PyUtilib/Manifest
index ae45c87db14c..baec564de05c 100644
--- a/dev-python/PyUtilib/Manifest
+++ b/dev-python/PyUtilib/Manifest
@@ -1,4 +1,4 @@
 AUX pyutilib-5.6.5-tests.patch 1413 BLAKE2B 8cfb6abadbd0c83adccd69cd18dd85aa2c58ad6d8610de0912397e626704ff6921ed54869c0ea2e7dd1567070e5061fa424d7749236cd2e8321d17a6b60ad4a8 SHA512 00d838e4eab285e7eaa1fe802abd1fa22f3a662fd10220cc3811fab6d9025dcb327811e13ee13f2102ff1ff2b8b132a10c32cabfb94080940dec691b6a890298
 DIST PyUtilib-5.7.2.tar.gz 1566034 BLAKE2B 913c6576b39f14c19e2e633c36ade33fe812c77a37374c7c14d2fb4384ca38f68efd55209d70e96d9a78fea2fcf1cf83423680d0787da2d03cab88e59a208b96 SHA512 d9d7d890cdb524bb055885354784f2af01967164ce88cf3b144ccffb0a855ef34243fd518c58193517ecfc50f3c2e3ca333f026951c1ab0b38ce181ecf9e7750
-EBUILD PyUtilib-5.7.2.ebuild 1211 BLAKE2B 8b25f0fa1950408f0eac3d29d3cc524761317610bd425d201401f9f6671267eee5ec2f9ff3f8e2fff2ad8bbb51cbe50d426be0163b73b5c009f776cdad058b1c SHA512 2b01f24cf47356d370ffe838c31f2711cd8b4968bce5fb15b841015ed252037e0667eb8444be3889ef237c6ddad882a59e20887b63277289a50c527f0cf139fd
+EBUILD PyUtilib-5.7.2.ebuild 1222 BLAKE2B 4d756f15158cbd6051e3f8d2bb26e97483486600471c845f4435da1922cd9b7220fbed6ed36025c093007395ba741d4100879541d989216e85a1134584d5bad7 SHA512 4834bb4c9e12d69781e615861abeeb061d40076802faf9e66452ab788299d549b2a8488b04ae2118f3aa052db23a4eb346b5bea72548d1691bb815316b5ed024
 MISC metadata.xml 338 BLAKE2B e8be381e5e42a081be3637b77a9b5356dd7d74d0352976badfca62bdf7b65c04554552703b3e12e169ec1c4b57d07cedcf75387a0fd65a8177213f0de8bffa9c SHA512 b3e03151085bcaa51e2108d7e69042523148aaba924415421323d53005c1d047103827ed99bf064cda4f02cc313b3ff4e5fc681bccb5f1f23a82b40a744ed9bc
diff --git a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
index f8845c0ef4e9..cba7050bd716 100644
--- a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
+++ b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
@@ -36,7 +36,7 @@ python_prepare_all() {
 }
 
 python_test() {
-	distutils_install_for_testing
+	distutils_install_for_testing --via-root
 
 	local -x PYTHONPATH="${PWD}:${TEST_DIR}/lib" \
 		COLUMNS=80
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
index fc7530fe42f2..4a673160bc3e 100644
--- a/dev-python/asn1crypto/Manifest
+++ b/dev-python/asn1crypto/Manifest
@@ -1,3 +1,5 @@
 DIST asn1crypto-0.24.0.gh.tar.gz 641322 BLAKE2B eb30afd0d2579f44ee4f556139357dc7622691bdc2067df913a4412cd3dca8372b85d84e3a3cbef6ba83648bf4ef55d7e8614992e2abb019301c92d24b15a926 SHA512 426cc380903b4dd7aadd7b831e3a11ee3442c961a33b856d4aa8d9060e829f2e0ad905a60c4d6504569718fe2cee01d9be31628c89ef030bc34281e381c898e8
+DIST asn1crypto-1.4.0.gh.tar.gz 672812 BLAKE2B 7545d424c244c04c2639df45e0bb56c50de95d0a7ee1e56933720dd7215c2be2608ac7889e2e901785592592e9ac6cb116fff3cd00536903c392a9e3912fc08a SHA512 989e4e0650252c29477d71263549b99f2c51c87f0768c20264b3de65f32edd8e7922e8af23bb1a7e29567a4ad8c4c5d596cdf7db3c766352c7f19d4f93361cd0
 EBUILD asn1crypto-0.24.0.ebuild 842 BLAKE2B 235a01eaf99cd9287798da84adc85568f6063c21e8630ca271af6cc7173a56347bccd1ed33751af9e68a069b89bfe5b3d56f23bb87f7cc725ff6249c672509ab SHA512 8d1223fdfead57bccff66c0b6a6f2518999254774ea189e65caed7f4db80ddc2a77fe7322408ae5ad703171c745aedd6e658a5581863f99e335f91c259b05ae8
+EBUILD asn1crypto-1.4.0.ebuild 748 BLAKE2B 4c4b27af4da53ae0d83ada5df21829db4b448808fb2218adb8d080df71b3710a3a4748e5ff38c94f06777841914566e66a7346533d398d9bdf03dd8ab5f98cd2 SHA512 cd7e39e83aa036d4f86a2c9fda79d5588be6e84443610656433adb30d8458da3c6719b4b7d6d15fec98f3f9c01560839ad3adb8e54fcfeae5cd3f0f3ddf9142e
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/asn1crypto/asn1crypto-1.4.0.ebuild b/dev-python/asn1crypto/asn1crypto-1.4.0.ebuild
new file mode 100644
index 000000000000..9803ec895c27
--- /dev/null
+++ b/dev-python/asn1crypto/asn1crypto-1.4.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python ASN.1 library with a focus on performance and a pythonic API"
+HOMEPAGE="https://github.com/wbond/asn1crypto/ https://pypi.org/project/asn1crypto/"
+# pypi tarball does not have tests
+SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_tests unittest
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index eb2834c3b882..b384793e297f 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -4,10 +4,12 @@ DIST aws-sam-translator-1.29.0.tar.gz 805869 BLAKE2B 89054fa7e2488b53daf73a78ae1
 DIST aws-sam-translator-1.30.0.tar.gz 810821 BLAKE2B cb7d13162512f793c33f617290d36ad78d2410ad225835ae175192b7e57ae29745a247e08f9b34a158837aca57a4f30bcb9f90f0c4b902ef238ba4e99a0f80ff SHA512 a521994bbbf461a7a28dc8861a751e9495c0684c7462bb5da6459dffbc69917291f2ca6d0480a6dc0264d954c37fccff8c9b3691992d2fe082ce981d31af21da
 DIST aws-sam-translator-1.30.1.tar.gz 810865 BLAKE2B 2039e0724d05f7f9d8372b149f04427e0bd1a8a9b503e6dc49ee76cb4e7678d8f759317c43922d190a2bb55a446feffcbf448cdbc9343538b5c77d81b5545e5f SHA512 8fcdf0843f52c8424a78540cf2a9c3922070bcd34a2e0001a17b89b19b471dfbfc4fcd48211b80292d2f7b76eb2881152c68c4d4b56499ab38942c025226d49e
 DIST aws-sam-translator-1.31.0.tar.gz 813078 BLAKE2B ae87944bcfe7481db62c0556e1f20defbe5890bebd9b6bc8fe4f597b1ff463ec6382384832451becf5a49361149102a31316ca83e5933d12e0e7e18c9861b9c9 SHA512 fd2b775d2127cce9d78cd3c7ac4dd19f88a94be474f94e4db2486dc96bc88d9a3f621a80bd6dd0b9d70a42df32f3a9164c234a44ce69f84913aa6f4c59ae3682
+DIST aws-sam-translator-1.32.0.tar.gz 817649 BLAKE2B 34d606bb294700dac1d3385d173d737d3259f460d0ead302521eb4e2660d3781c49ce5db71e1721245068efdac03eefcfe8963d4915d1e1c60fd783880a95bc9 SHA512 e4adce238434983c56b69960fd673db88edf5b3e4f9356ca4dae508f5a7a8e6bbd3c84050ee606e1fbd578d8f58c5d8196890187e058b7ae2bc8249dbb8ac0d4
 EBUILD aws-sam-translator-1.27.0.ebuild 1300 BLAKE2B 653b444030665f83e9f4bab75995548e0438674ec88268fcb7cf7264b814aaf84f87268b955026a4adc87860d84c55a972bc00ffda181fddf6fec17b1296245c SHA512 1e458ca29205944eb9f970a715ba570fbfc1bd7993756fcc23b00a8ccdfbbab6b1d204781eb3e5891119978500e0c09cd01f74ba76ef7910ab27b0df27861d77
 EBUILD aws-sam-translator-1.28.1.ebuild 1302 BLAKE2B fc7ed0f3c8e070e6c0d43707f8cf760b06e353bc7bbbe2d04683f2bf0cd36ddabc3735192acdb929e934e22b0d883cedd802883c7c9495fbd153c7223ad883f3 SHA512 71cae066cdce8976c9efd7d0c5c764c8ebc3afc4e28ce545e1cc67172e9c53e81addca9cb0242f7b68c2e701f90c2c54a7d1e4696b07f2c090b8bda4ceedd672
 EBUILD aws-sam-translator-1.29.0.ebuild 1302 BLAKE2B fc7ed0f3c8e070e6c0d43707f8cf760b06e353bc7bbbe2d04683f2bf0cd36ddabc3735192acdb929e934e22b0d883cedd802883c7c9495fbd153c7223ad883f3 SHA512 71cae066cdce8976c9efd7d0c5c764c8ebc3afc4e28ce545e1cc67172e9c53e81addca9cb0242f7b68c2e701f90c2c54a7d1e4696b07f2c090b8bda4ceedd672
 EBUILD aws-sam-translator-1.30.0.ebuild 1302 BLAKE2B fc7ed0f3c8e070e6c0d43707f8cf760b06e353bc7bbbe2d04683f2bf0cd36ddabc3735192acdb929e934e22b0d883cedd802883c7c9495fbd153c7223ad883f3 SHA512 71cae066cdce8976c9efd7d0c5c764c8ebc3afc4e28ce545e1cc67172e9c53e81addca9cb0242f7b68c2e701f90c2c54a7d1e4696b07f2c090b8bda4ceedd672
 EBUILD aws-sam-translator-1.30.1.ebuild 1302 BLAKE2B fc7ed0f3c8e070e6c0d43707f8cf760b06e353bc7bbbe2d04683f2bf0cd36ddabc3735192acdb929e934e22b0d883cedd802883c7c9495fbd153c7223ad883f3 SHA512 71cae066cdce8976c9efd7d0c5c764c8ebc3afc4e28ce545e1cc67172e9c53e81addca9cb0242f7b68c2e701f90c2c54a7d1e4696b07f2c090b8bda4ceedd672
 EBUILD aws-sam-translator-1.31.0.ebuild 1302 BLAKE2B fc7ed0f3c8e070e6c0d43707f8cf760b06e353bc7bbbe2d04683f2bf0cd36ddabc3735192acdb929e934e22b0d883cedd802883c7c9495fbd153c7223ad883f3 SHA512 71cae066cdce8976c9efd7d0c5c764c8ebc3afc4e28ce545e1cc67172e9c53e81addca9cb0242f7b68c2e701f90c2c54a7d1e4696b07f2c090b8bda4ceedd672
+EBUILD aws-sam-translator-1.32.0-r1.ebuild 1339 BLAKE2B 95524019b5fd9ff5ab6459f321e8a13f454dbede355276127ea42502e7e383144e6b505285a93cc938432fb2dc503ae30ceaf828bd88f13956afe907ed154e14 SHA512 3fa1966be9165babb235e535e8a0b2999207b2ca671fdebf9e90b8de1d51676e1b98bea7a01d2a6b72c3d0d8c3bc815835650c12b179d3f441c72e61c4a8c885
 MISC metadata.xml 610 BLAKE2B 687fc6be648204f31de275e8cc2da9cc11e74a1f91a5474e0df5f163202f998d92e6f15847eccff364da46b4b7185017dbabc2c3016d4c1dd2a5f873f04cb1d1 SHA512 770b2f5748d6b6edc1be7c546035854cb4a0bf851f214b811867f376d5e260011f6542f6e43a80d2465e93f23cb912d61af385ceeea17d1e117f5f4f13a298b0
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild
new file mode 100644
index 000000000000..ac4085528bc1
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/"
+SRC_URI="https://github.com/awslabs/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/serverless-application-model-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dependency
+	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
+		-i pytest.ini || die
+
+	# don't install tests
+	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/bashate/Manifest b/dev-python/bashate/Manifest
index d2aa68b28214..f3f8c742b1d5 100644
--- a/dev-python/bashate/Manifest
+++ b/dev-python/bashate/Manifest
@@ -1,3 +1,3 @@
 DIST bashate-0.6.0.tar.gz 30980 BLAKE2B 5b210edaa44a0652a03f30a641a072dba1482e1ca3b42c6b7140a52349ddb271f0137373a4d2f364032c22c176d6caf14be2635038df8a4e86585773d17a1f97 SHA512 bb64d8de0143bf2662497b1571ce654f4ceeb7d1dea3f625705b609ab70ed3b4bca6266c4eba7c2e7d99a1520fb9566a4a4daefa34c9c16538537b446c1da255
-EBUILD bashate-0.6.0.ebuild 684 BLAKE2B b2f740eb54bef3b05302f7b25e617b323f187b0a8e74b0943b57a88a094a872a20a6e910570aac90c6c008ae456ab31fb6ba3300516494bd929a9f995cb7c0df SHA512 adf850b67a4777dc4b80dfa28e8734bce225bd016e98f46f5cfe9c4c00c0ac926faa9980e39d68514e39739ec32eb5fa8a2f7a62a4e82197463afe1f662e34d7
+EBUILD bashate-0.6.0.ebuild 687 BLAKE2B 37f482e4546908809ef70dc5b3ab9176693d93a0a0310498bd85fc85d0aa6c30db839cc3462be73f9638806fd8c1abc72a8f841eebab0d9b71fe2eff0c16ed89 SHA512 1810f78fb729a4cb62a2df2a79a6b8f8567f08c85434d8e8f37f38d6c610d467b053e77f7c68520e3b4d6ff0a83afe12a6ef67e0e18baa827de85a969989c61e
 MISC metadata.xml 431 BLAKE2B 5584ee417afcf244975299d7ee769137b41956f60aa7b273d593aad8b9e1a05d0624d820870648a56da0ee816366a03b59e31ab27113cda02ddc084237c850c1 SHA512 1b7b1ac3b3de9dc163ea84df81645beb10790b3b192baa16b49fd977d9cc1c37794cbdc846d995c54fa1eaa9d04ec02149acfad07011bd273dc6693652c77860
diff --git a/dev-python/bashate/bashate-0.6.0.ebuild b/dev-python/bashate/bashate-0.6.0.ebuild
index 7ca3926ad713..e5ef34a22899 100644
--- a/dev-python/bashate/bashate-0.6.0.ebuild
+++ b/dev-python/bashate/bashate-0.6.0.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+
+PYTHON_COMPAT=( python3_{6..9} )
+
 DISTUTILS_IN_SOURCE_BUILD=TRUE
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 1d2bb476ea5d..12bd84d6541a 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,5 +1,3 @@
-DIST bitarray-0.8.3.tar.gz 36292 BLAKE2B a9e55e5f8e8257759ae8b6fb5e817c76ab9da6cd73699d492e111a9237e08718b4de22f20d97d1f633075228c503697e6faf032cceee01aaaeb4ef041fe39a4c SHA512 67e634fba3672faf986117534e9260566b7596c7fddc67d7195fce4c9cc13bf491f94b6d25005143aee1cbbfbce168be0c7a833bc1f293cdbb30149b29855372
 DIST bitarray-1.6.1.tar.gz 55299 BLAKE2B 14bee64a133fdf3d23bd557244fb25c54a223a786108d9f1bdab25d5d0942c1eba01f6997d7d6392b9885ef6be702dc73bb3b00c9c668480b74d7415c77767a2 SHA512 ad0ce244dfeaa571821b704968ddc08bea16dac94428a4571a599153704a4bdda5d7135c42c81ede655d48455378bfff7292a91fe49724bd5a6f48bb436a9fba
-EBUILD bitarray-0.8.3.ebuild 555 BLAKE2B ce5f61620d418aa3b3e6cab6a9afff028f5fc90eed08dd39637d3cca982eb257b5493646a4eb440ae069c0445ba9f3d7db3e7b44aaa5be26e7d0df89aef25359 SHA512 eabe42fd8b77684d054ec93cd67db1a50b283442c451e56177cdcccfe8b57351f1477c5de9ce3c3ac3365c992d172af8ac0be0dc3a368c8a01b8a839803fa982
-EBUILD bitarray-1.6.1.ebuild 556 BLAKE2B 16caff5453f58b4b449fe9b561af5507cc322585b3bf40e4ad74d41bde1e6610cda56a4a83f14e79e951a8bad76cf36f4428445abf1cf6e99260a55874474a26 SHA512 3ad5b3e4c12bf1c842f58ecf267d76e99ab47be86292090f71f0eef4838d960a45f6ec876d0494b2a89d9037e5c1cd92f2a8864717a72fbb1f9a01b062b02ed0
+EBUILD bitarray-1.6.1.ebuild 554 BLAKE2B fcf67d89d331e4fc0910fddf46231e46d77a0b4bcfd90b8e08bdcc964387f7691474f227e16f4b624995d79c269f908a78d6466f2325a5ccc55e9451aa3d17f5 SHA512 b8ec4534fb75de2555b727bb71ae23090db50e74274d98e8c07dde53d0c75f9d02866f97730601d4e4a5d13f52bf81d0e3fcccbf07fba481b9ebade14f9de0e5
 MISC metadata.xml 1194 BLAKE2B 2d94554cb381fb5e6f7879f55d282e3fb8f6868218390082cae0da4e10cca819ceea30ab180b143ec04d3cdc7d34a506095cd0bd8c521e32228bc6f3b177a12c SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d
diff --git a/dev-python/bitarray/bitarray-0.8.3.ebuild b/dev-python/bitarray/bitarray-0.8.3.ebuild
deleted file mode 100644
index d48bb41085ce..000000000000
--- a/dev-python/bitarray/bitarray-0.8.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="efficient arrays of booleans -- C extension"
-HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
-SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-1.6.1.ebuild b/dev-python/bitarray/bitarray-1.6.1.ebuild
index 978daa9ae578..bcfc5c710420 100644
--- a/dev-python/bitarray/bitarray-1.6.1.ebuild
+++ b/dev-python/bitarray/bitarray-1.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/blurb/Manifest b/dev-python/blurb/Manifest
index 3932ca6d2ac4..0712fefbdcaf 100644
--- a/dev-python/blurb/Manifest
+++ b/dev-python/blurb/Manifest
@@ -1,4 +1,4 @@
 AUX blurb-setuptools.patch 522 BLAKE2B a035fc3282d11845219a442494de83e385210421bcb45edf6780bf93d7cf43c2f3995394f862425f2c0e897357e8f187c07a2ff3b0dbc2aa9c932bfdfd83e69a SHA512 51348af10150ac288df6e4cc2d8c573b43432e18014234b4a68672518f02ef968dd26c4abe8d59dc8d6c64417cc86e770a5295635fa88356c526a580c201c581
 DIST blurb-1.0.7.tar.gz 21248 BLAKE2B 931a0db30447f5a41c956f15dac2bd967efd8a85d4837782e02af24edc31dec03d3fab27f22db1dafe334dcfc79b133cf99092fc28b59c190b1182d1f897e0bb SHA512 d84fdc0a7ecec1207a58a748f6d33343504d0b090166c91b05e9b3c2eb125fff890194539204386bdc7a1e0a595d2cb80d54d873045941491d26ca85cb55ac98
-EBUILD blurb-1.0.7.ebuild 576 BLAKE2B edc974b31f11e92ed68d5fdf545584b2b6e05c73ff4a1bf29fdd6e1d355d4826ddb3cedf0f9b8b3b0aa7d152b811eeb54e3944327a4d58ad3d2ff7dc2f24b512 SHA512 9adc2e0cc9a415e5a9d25bdbe46ad5bef052d4241c339b61f011903decacb527c806578e1e02f7e223e9fb2d8434339639d7cc962dc0bf46d152d5aa25ada735
+EBUILD blurb-1.0.7.ebuild 579 BLAKE2B ddc76c2da55edcf8b4dd289663000a378e44f157eece20ce504a58715a26da323437657cdd7f41d88850fe915190b9a7bbfdd418d36fa9da0ddcdeaa339a3813 SHA512 9d15a10254a3ba048c6ac97176ec48f672477948e9f129285d0618c012307dffa7459a623350887a7189d86133fb1383a3c35a7041341ddc6597f509a78f6f29
 MISC metadata.xml 976 BLAKE2B 0d391aee3be51752f3cdb2406bacbc4a0bb45bfbebc3b2bc67b788af647faf92bf1308fbc9f51426d4c540f8e89edc8bb6f5c967000a56e40b134270ac8336bd SHA512 611315d86b3ccbecfadc3c38be45e0322221a0f1065d5d59d717a33fbf66f510274b6cb772ca3468ec76e21613ddb88cb547dc3a4e7b50d638c3fe811ed61abb
diff --git a/dev-python/blurb/blurb-1.0.7.ebuild b/dev-python/blurb/blurb-1.0.7.ebuild
index a74c72cf82e7..1fcf11353aea 100644
--- a/dev-python/blurb/blurb-1.0.7.ebuild
+++ b/dev-python/blurb/blurb-1.0.7.ebuild
@@ -4,7 +4,9 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7} )
+
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="Tool to create and manage NEWS blurbs for CPython"
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 4826c26f430a..6884a9195254 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -6,6 +6,8 @@ DIST boto3-1.16.22.tar.gz 339781 BLAKE2B d6703055d57f9d3486218efc3014439a1ca1335
 DIST boto3-1.16.23.tar.gz 339889 BLAKE2B 0a41c084beba187a89ddf8a743c6dc4f3663aebae035468a76967e4b732abdad496bb2f0a516b5af76affa18f99d4c1a3405d0e152fb41fb1fae22a6728542e6 SHA512 942b0a540cdd6ed744bc1b4285ca8d9e3121193a59717fa247431d232f25cf042625abf82709cecef20611feb68735415be2e3187ebd4e6a1efd7488c0db14ff
 DIST boto3-1.16.24.tar.gz 340133 BLAKE2B c1d195d5c6859686b2cbc9cfd772e43b6a052b138d792b896f0fea1b25eb1667d26f09369f6fcb2bfddaaaf8f994f14d2a6e6456aa098af5dbb6ddd8df503118 SHA512 55582c76ffd1d6f3d021c7ab89b6a93ea3bf3597312957497de4c8a226657414271385224e2808aecaa90b0e48f21b7fb8a62462df1cf26f142a7ecd5064f55c
 DIST boto3-1.16.25.tar.gz 340338 BLAKE2B 1ad36d77c3b1e6e67dbd8148b995d4299fceb1fa6993d0bb7d58f432252be13383fba00ee7199bb4a855d98264598c5a9cfc0aab3c8a5416a98e93b3e729843a SHA512 1e7a4d72735137b19a4b1e6f2621c33bf1fe9af860cc37021206f2eb422061092a00cae0e25f9ed44b74ef6fc01b48ba6f3e047c664085fac5dfb880dee3e620
+DIST boto3-1.16.26.tar.gz 340309 BLAKE2B df2c193b5e40f52381a4214fd5c6db9dcb0f32e3bdedf78b1ea16d166b9831c06b871809d1f0673bb3cd2838cb1f722a18a4c25a8c21fa20e5f7c14df9a7efb3 SHA512 1063702783e07a4e5a5ddce3611e57e993c284a09c026dab8af56be7a7a8ac157da2b636b808f58f0aa7940f90a7e36e439b8497713d4f95964dda13684b3795
+DIST boto3-1.16.28.tar.gz 340709 BLAKE2B 3c5520531efbb5e20f679f28f4c60964a7be38a0601f73dc0fa5ab3e2cb96939d985c1ebc20869b3fd2f556e9da836fdce4d92377fb9168eccd13cbcffd7c8c6 SHA512 72c10598560ad8d227250274fb296f11e6a1c417f8430221fd8a85e920c8a783be77193dd83ac53dc5000c2ea27c8ff626a5ef3cdee0a467237e732dd6442cdd
 DIST boto3-1.16.9.tar.gz 337905 BLAKE2B ed01e28fd7e62e5e5028307c93f92004bfbecffa77bc2ba1d6574b92ec2c515d910eb5107ac5ee03e0aca909f97f379aa65b5f839c8067634fa69266c58de33f SHA512 7343b8432788ef981819f91fe2ba27c4ec3947d01ff55914f7c89607250ecf60db2da8d25c8a2c7001ef546a9abed4cb744c5937ca09497aa1a983049648bd5e
 EBUILD boto3-1.15.18.ebuild 1353 BLAKE2B acf7d5909ffe2c1b58d3c2438b8ce995f98e092b2a76977674ad1c0491b4e2093ea53d8a1cd45b225e3577ed28847b60319a1a682d1af74c71acde7a822c4da2 SHA512 fc2ac14ce0c1ce9e7ccac46bdc9fde2e84687a7c634a784cc0ac7e99556b84f4ef3d2d27e546c445b687b93dcc293b63a5e3716ae645b01a60d8550fda591c4c
 EBUILD boto3-1.16.16.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
@@ -15,6 +17,8 @@ EBUILD boto3-1.16.22.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44
 EBUILD boto3-1.16.23.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.16.24.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.16.25.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.16.26.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.16.28.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.16.9.ebuild 1353 BLAKE2B acf7d5909ffe2c1b58d3c2438b8ce995f98e092b2a76977674ad1c0491b4e2093ea53d8a1cd45b225e3577ed28847b60319a1a682d1af74c71acde7a822c4da2 SHA512 fc2ac14ce0c1ce9e7ccac46bdc9fde2e84687a7c634a784cc0ac7e99556b84f4ef3d2d27e546c445b687b93dcc293b63a5e3716ae645b01a60d8550fda591c4c
 EBUILD boto3-9999.ebuild 1350 BLAKE2B 32d6cf48455240fb127d359f94ab09e45ec78655fbd63a5a1f29cd5a2b3de2941599c7d7068abc186b6e25baf13456b5e52958879871a5a8fc338b87e087fceb SHA512 58d3f3b2a1c04252e9c7527ccb094ec7ca41c9191de1aab85b4f6b2c6babe0c95d43f189031d2c8d1da2b35689d3ece1c27cdced6ecdec596a286893e05a5f55
 MISC metadata.xml 668 BLAKE2B 0fd93bc75c34b2348e49e39aa58d6404fc0bdeac1129a1c5644262973b08fc3f9afe371fdf9ee87ff00fd0aaa18b86bfbdbf86394434661b5253ae9b5b9dacd4 SHA512 ab5ea5b31b95ce548c12ec80f2261b98fb0e51b34218c23bafbe7cc0ac792b0680b5886062c2a016bd58ceaf1cdebc7fabade37edae756851895257b1ef1fc59
diff --git a/dev-python/boto3/boto3-1.16.26.ebuild b/dev-python/boto3/boto3-1.16.26.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.26.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.16.28.ebuild b/dev-python/boto3/boto3-1.16.28.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.28.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index c9f54b3e85b9..0f3ce423b3ad 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -8,6 +8,8 @@ DIST botocore-1.19.22.tar.gz 7073938 BLAKE2B 41ec38e7abdff5e6fd4530dd39522a13d10
 DIST botocore-1.19.23.tar.gz 7090433 BLAKE2B c5b6801e169b7c0325b33b005be0e4096442d5f9e09e7223d6668cdbd7a68b977284b4e660be5dfbf30ae661202691866dff2b3b1639d7467b3ff21ed6c90702 SHA512 9e984c48109f17126e380b0194e998c65ef02cba83ce3be6b3398a5913a41e23607779c82b90814d8193abdeb3a6cecedb443a6fc5d8d6b7ccb68ed0a0e0bc37
 DIST botocore-1.19.24.tar.gz 7111127 BLAKE2B 61f368b4e8dad8d3a03d2a73cef68f7971bbe3a2173c55689eeacc166a983c8986039f62222884176f05df13002e31868ca498664f46452362f289bd44d8df2c SHA512 42ca145f9e47b61715c816add725758dcf617c663dcd0beee29e66a28047d3bd7908ce10b7614afe9111a539e74f436286b876c107bc3591f5689619939a4551
 DIST botocore-1.19.25.tar.gz 7125010 BLAKE2B 18c03d1e61beb5b92fa958cbd6ad10d6048b51fd6b244187cfd27be0b3a0132bc2cdd0598d933cfde62a5f9cf92d2ddd2a0b7e269ace6e3319a3e37af2037bc9 SHA512 0cc4b015957330fbc5654b33953943c845c955a8fabb7b33672d496d68fe0e8783b1ba3254695bcdb7fa4b3775464f5c09af04e09931e38ba95710a6f0aa8320
+DIST botocore-1.19.26.tar.gz 7124956 BLAKE2B 6091c9536de9a3171a2327ca1d1531799fa28af48870e37de8251b42a947a7f26881ee787964cd95a070acdcb4f3b634a816ab74a519b72287e61ad11aadeaa0 SHA512 bfdf3ff4fce1463fd1cb6fc2f8a97782d68388668b6dc3ffd0a0a3fac3d0f6b7da645c0a0d2d9183096c44b8b99dc2a0a9e1a29a7bc4b7ff0cbbbc3fb066f191
+DIST botocore-1.19.28.tar.gz 7208608 BLAKE2B eab5731c530747421186c3e24cc0cb0f5b120b37e4a4d587a5ec0b118d138ff13fb9608bd028a3182aa353f188f56f0c2a05c918aafc8d79eaa87ba89d5b4265 SHA512 71de40c171b1aabdcad159b2e6817740e793a29eda99c6cdad28643bc444a26fbcd7594d927bfbe031c4e4c8b74826ba51efb37376f5a70d8a2591c524a2301a
 DIST botocore-1.19.9.tar.gz 6972834 BLAKE2B 3407c056c7995cc1ccb1b5b4c5b3a6254e38672b52e7889a7a022520283416e4dfcabd05c8ca0ed78e4624c7a20c9f43bfde87a76d7a72660b4c95256e4f9ca4 SHA512 8433f22ae7652e524a82da8d2ccda48da9eef44788333898b7526335d57a7757b80754f0d5c6a2c84ec3bde2ec9fc7da5cf872cbda7286f620b4f4878fe9a583
 EBUILD botocore-1.18.18.ebuild 1485 BLAKE2B ce1c4bcd1ffbe79d297935a669cdd3d888509e755b30ac19ae4f9eec6bbaaa7621cdf105eda31efacfb3ff053f74c172b31542022635e74312f32477a71611f3 SHA512 d21d2cdde75987519bcee104c049784d63a9491c2f458e78c05a4389b5add29960b5f3acaf1e2e27cc6efb590a8463fb329ace052a09e5c33200f45f1f18a6c7
 EBUILD botocore-1.19.16.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
@@ -17,6 +19,8 @@ EBUILD botocore-1.19.22.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2
 EBUILD botocore-1.19.23.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
 EBUILD botocore-1.19.24.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
 EBUILD botocore-1.19.25.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
+EBUILD botocore-1.19.26.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
+EBUILD botocore-1.19.28.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
 EBUILD botocore-1.19.9.ebuild 1494 BLAKE2B 46144609fec0e6664898d9408afe9e31590c90653c092f160c4d2ec369f3b1189d49b94255dfd6fe3ed1a0390418d7109c87c6aecc341781eda27cf8da1a451d SHA512 fb88fed5c0e0f117547952237e4e097d52fb3009ccb2fad160d35061aef86ac88a6d0cd2a59ffc20c746da35685bf475f336f5a47ac55cbb625041003a486d6b
 EBUILD botocore-9999.ebuild 1606 BLAKE2B 15b1624c806724dd4cf8f86099a4f9049214ab9c0afa47f0211c0a5f66fe37b6ecc03db5448bfb3b4764f8eda23e19ab9f37bbe1461837bf0dccfae7da17faa7 SHA512 b5e16cf97b370e96e814c413d80793684a1579d293bbaf16b435de83af274efb299dbe42fb824c955b28099c50841c46124c8212bd539861ff01b278e6a7ee3d
 MISC metadata.xml 717 BLAKE2B 6b5923518aebfebb4ac5de56ccc51b6d665b81870d4cdd915265ddef063db42dc9b0a4814c8cec71b44cb1aec7050797f6e2ec8f2a499b6c2e16d9cf312f7fb2 SHA512 fef7663fe63c373d775e419b5b5cfc63a896adf32a177e856c42ebf1c7574b3956fa989c30428d9ce69b19ecf68e553f19885fef46cbcaf7b434e27b15022b54
diff --git a/dev-python/botocore/botocore-1.19.26.ebuild b/dev-python/botocore/botocore-1.19.26.ebuild
new file mode 100644
index 000000000000..ca40b64d111f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.26.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.19.28.ebuild b/dev-python/botocore/botocore-1.19.28.ebuild
new file mode 100644
index 000000000000..ca40b64d111f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.28.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index a75d02211a55..b304cbc8bf8b 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,3 +1,5 @@
+DIST bpython-0.20.1.tar.gz 223953 BLAKE2B b26ee6e4d41609e9a04a013d90f4ae7f598ba28028d9982a77aa7f11887a60c39855e875ae004b416e375b0c906e066a22a18f0251d2e7192d690fe03afe51c7 SHA512 ff69b175afbb1f050f1aa481966bbc32580b3d113a886f49a97fa8f01e3c8c0edf2c0075785fc61ac616168c97d61ee7daeed85d0b08f1317fb774f7ad6bf439
 DIST bpython-0.20.tar.gz 224127 BLAKE2B 6b7334f6657e27eff3f48468ee4eed64b69f9ba9ce92881a28ff57a5d5e60948b30fca689adc7a3aac088d2aa1316bfd43509f4f8d80b4822e8990f2753a2059 SHA512 13c04bd9b9ce0bd1b3775295e249e0505abe3be6c601dc9d90455863fd8bc178abb3fe98b05586c6298ea9308a6b062907abf2979b37b08e4341439b0311a565
+EBUILD bpython-0.20.1.ebuild 1294 BLAKE2B 36afcc9534b3b5d5e5ac2ff568b9d5857aefdbe43032609a5834d0259d1be6f9fb3ce9f528e6881820248dc2cb348791598c0d997a8317b1962d596271e0bcf4 SHA512 99046d683bfe88df4b2cdcb4157ef1818de37a325623e9fed919ee037f4bb772bf2367e5182f78a3eb12736d6fa6a714eb078e1ae354a47342ed2a6846a682ec
 EBUILD bpython-0.20.ebuild 1293 BLAKE2B 78f1b53f228bd067c3c9c8c2af79a6df96d9623f3e531a7334295f2ac54038e4ee2072d3db971bd943b325130e524c949fd116812903a47bdd781a4b4e4bfd66 SHA512 82c75f49d3b0d3edc3f46c0454a1941f13f5690faec16fc9cc76b76fd7afe8f381f7e0aed9ba746ec12dce417b0d4d24658c512aba0e40eec7c9c008f22b80ef
 MISC metadata.xml 551 BLAKE2B 624afcce3174b99f96cb51a1e103cd96576746627e6b3cfab98cfe65624de7d3edb8c6412b6fa1e2d0fc5b03d998e0d07cbe036de9601a804fdfd2bae2e4012e SHA512 aa2eb7728bbd2760c3eff386e27c99e2dbb74ba105647f8408b01537e2748cab8207cee751fd6bbccfd5a7eb99212a406f5ce93ab55a0ed5d9bce7ade1836547
diff --git a/dev-python/bpython/bpython-0.20.1.ebuild b/dev-python/bpython/bpython-0.20.1.ebuild
new file mode 100644
index 000000000000..ecf0abab267b
--- /dev/null
+++ b/dev-python/bpython/bpython-0.20.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
+HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/curtsies-0.2.11[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	"
+# sphinx is used implicitly to build manpages
+BDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
+
+distutils_enable_sphinx doc/sphinx/source --no-autodoc
+distutils_enable_tests unittest
+
+src_prepare() {
+	sed -e 's:test_exec_dunder_file:_&:' \
+		-e 's:test_exec_nonascii_file_linenums:_&:' \
+		-i bpython/test/test_args.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/brotlicffi/Manifest b/dev-python/brotlicffi/Manifest
new file mode 100644
index 000000000000..977febbf385c
--- /dev/null
+++ b/dev-python/brotlicffi/Manifest
@@ -0,0 +1,5 @@
+AUX brotlicffi-0.8.0-remove-dict.patch 5333 BLAKE2B e68065d06c072f61b0115925706e1476ef58d4217635c2d29e32a503cc0a98a2b55a9155f8bc189659b986a8bc7ca213b4b1f1405b0379e3f2813db50b5b949b SHA512 8e1acde07e98c609e295d0c2408823de026ffdfa88b3a45880ab5321b5293ce19791000bc5fd0d37ba96ccecb243151ac52ac2beaa2447ca912ae21d5a4a711c
+DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
+DIST brotlicffi-0.8.0.gh.tar.gz 21997 BLAKE2B 5e817e228ce01cd7a831c59cca5bab3e851d676f1daa5efab8f61a203c0854bcc92605c88896dff5f4ce27fc880718da5ddfcf02a3bddbbd7b2e18c33f1e77a4 SHA512 fd0c64b400d3b48e0e2d113b4d75e32a2b33fd99505c7661d6d51ba9aedf5cc1f58be09bc90a5f1f7e3424addef2b54cc085a41e6291c87d53dd7d4e8fc7eb4e
+EBUILD brotlicffi-0.8.0.ebuild 1243 BLAKE2B 3376f22606e1efa919418b94d1da2b600a4449fb48b3f8a3d2b9226f1cfc9fb82b3ed937e29fa7dc4837f1800d9923b3e19c6b0222b7d2c5d60490c6df0eb3fa SHA512 436c8a3bbb6859950080eef9d4efb6260f0118b04ccd734096a11a12f4ec565a89f76f42a9edf67ef709806ca79b20e8c4b9021fcb806aa2504d0677a9a54397
+MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild b/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
new file mode 100644
index 000000000000..a41420574ec5
--- /dev/null
+++ b/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+# Commit of the Brotli library bundled within brotlipy.
+BROTLI_BUNDLED_COMMIT="46c1a881b41bb638c76247558aa04b1591af3aa7"
+
+DESCRIPTION="Python binding to the Brotli library"
+HOMEPAGE="https://github.com/python-hyper/brotlipy/ https://pypi.python.org/pypi/brotlipy"
+SRC_URI="
+	https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/google/brotli/archive/${BROTLI_BUNDLED_COMMIT}.tar.gz
+			-> brotli-${BROTLI_BUNDLED_COMMIT}.tar.gz
+	)"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	app-arch/brotli:=
+	virtual/python-cffi[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# remove custom dictionary code that isn't supported by new brotli
+	"${FILESDIR}"/brotlicffi-0.8.0-remove-dict.patch
+)
+
+src_unpack() {
+	default
+	if use test; then
+		mv "brotli-${BROTLI_BUNDLED_COMMIT}"/tests "${S}"/libbrotli/ || die
+	fi
+}
+
+src_configure() {
+	export USE_SHARED_BROTLI=1
+}
diff --git a/dev-python/brotlicffi/files/brotlicffi-0.8.0-remove-dict.patch b/dev-python/brotlicffi/files/brotlicffi-0.8.0-remove-dict.patch
new file mode 100644
index 000000000000..bfb1b61b951b
--- /dev/null
+++ b/dev-python/brotlicffi/files/brotlicffi-0.8.0-remove-dict.patch
@@ -0,0 +1,132 @@
+From 0fe3dc70240ea62b56861ab830f9ab44644b18e5 Mon Sep 17 00:00:00 2001
+From: Seth Michael Larson <sethmichaellarson@gmail.com>
+Date: Sat, 28 Nov 2020 14:36:59 -0600
+Subject: [PATCH] Update libbrotli to 1.0.9
+
+(stripped down to removing custom dictionary support)
+
+---
+ src/brotlicffi/_api.py          | 21 ++----------
+ src/brotlicffi/_build.py        | 25 +-------------
+ test/test_simple_compression.py |  8 -----
+
+diff --git a/src/brotlicffi/_api.py b/src/brotlicffi/_api.py
+index 49da0a3..8358d3f 100644
+--- a/src/brotlicffi/_api.py
++++ b/src/brotlicffi/_api.py
+@@ -95,8 +95,7 @@ def compress(data,
+              mode=DEFAULT_MODE,
+              quality=lib.BROTLI_DEFAULT_QUALITY,
+              lgwin=lib.BROTLI_DEFAULT_WINDOW,
+-             lgblock=0,
+-             dictionary=b''):
++             lgblock=0):
+     """
+     Compress a string using Brotli.
+ 
+@@ -124,11 +123,6 @@ def compress(data,
+         based on ``quality``.
+     :type lgblock: ``int``
+ 
+-    :param dictionary: A pre-set dictionary for LZ77. Please use this with
+-        caution: if a dictionary is used for compression, the same dictionary
+-        **must** be used for decompression!
+-    :type dictionary: ``bytes``
+-
+     :returns: The compressed bytestring.
+     :rtype: ``bytes``
+     """
+@@ -141,8 +135,7 @@ def compress(data,
+         mode=mode,
+         quality=quality,
+         lgwin=lgwin,
+-        lgblock=lgblock,
+-        dictionary=dictionary
++        lgblock=lgblock
+     )
+     compressed_data = compressor._compress(data, lib.BROTLI_OPERATION_FINISH)
+     assert lib.BrotliEncoderIsFinished(compressor._encoder) == lib.BROTLI_TRUE
+@@ -255,8 +248,7 @@ def __init__(self,
+                  mode=DEFAULT_MODE,
+                  quality=lib.BROTLI_DEFAULT_QUALITY,
+                  lgwin=lib.BROTLI_DEFAULT_WINDOW,
+-                 lgblock=0,
+-                 dictionary=b''):
++                 lgblock=0):
+         enc = lib.BrotliEncoderCreateInstance(
+             ffi.NULL, ffi.NULL, ffi.NULL
+         )
+@@ -271,13 +263,6 @@ def __init__(self,
+         _set_parameter(enc, lib.BROTLI_PARAM_LGWIN, "lgwin", lgwin)
+         _set_parameter(enc, lib.BROTLI_PARAM_LGBLOCK, "lgblock", lgblock)
+ 
+-        if dictionary:
+-            self._dictionary = ffi.new("uint8_t []", dictionary)
+-            self._dictionary_size = len(dictionary)
+-            lib.BrotliEncoderSetCustomDictionary(
+-                enc, self._dictionary_size, self._dictionary
+-            )
+-
+         self._encoder = enc
+ 
+     def _compress(self, data, operation):
+diff --git a/src/brotlicffi/_build.py b/src/brotlicffi/_build.py
+index d2a2d85..45dccb6 100644
+--- a/src/brotlicffi/_build.py
++++ b/src/brotlicffi/_build.py
+@@ -93,20 +93,6 @@
+                                                       uint8_t** next_out,
+                                                       size_t* total_out);
+ 
+-    /* Fills the new state with a dictionary for LZ77, warming up the
+-       ringbuffer, e.g. for custom static dictionaries for data formats.
+-       Not to be confused with the built-in transformable dictionary of Brotli.
+-       |size| should be less or equal to 2^24 (16MiB), otherwise the dictionary
+-       will be ignored. The dictionary must exist in memory until decoding is
+-       done and is owned by the caller. To use:
+-        1) Allocate and initialize state with BrotliCreateInstance
+-        2) Use BrotliSetCustomDictionary
+-        3) Use BrotliDecompressStream
+-        4) Clean up and free state with BrotliDestroyState
+-    */
+-    void BrotliDecoderSetCustomDictionary(
+-        BrotliDecoderState* s, size_t size, const uint8_t* dict);
+-
+     /* Returns true, if decoder has some unconsumed output.
+        Otherwise returns false. */
+     BROTLI_BOOL BrotliDecoderHasMoreOutput(const BrotliDecoderState* s);
+@@ -205,15 +191,6 @@
+                                           BrotliEncoderParameter p,
+                                           uint32_t value);
+ 
+-    /* Fills the new state with a dictionary for LZ77, warming up the
+-       ringbuffer, e.g. for custom static dictionaries for data formats.
+-       Not to be confused with the built-in transformable dictionary of Brotli.
+-       To decode, use BrotliSetCustomDictionary() of the decoder with the same
+-       dictionary. */
+-    void BrotliEncoderSetCustomDictionary(BrotliEncoderState* state,
+-                                          size_t size,
+-                                          const uint8_t* dict);
+-
+     /* Check if encoder is in "finished" state, i.e. no more input is
+        acceptable and no more output will be produced.
+        Works only with BrotliEncoderCompressStream workflow.
+diff --git a/test/test_simple_compression.py b/test/test_simple_compression.py
+index 45c322d..a480587 100644
+--- a/test/test_simple_compression.py
++++ b/test/test_simple_compression.py
+@@ -110,14 +110,6 @@ def test_compressed_data_roundtrips(s):
+     assert brotlicffi.decompress(brotlicffi.compress(s)) == s
+ 
+ 
+-@given(binary(), binary())
+-def test_compressed_data_with_dictionaries(s, dictionary):
+-    d = brotlicffi.Decompressor(dictionary)
+-    compressed = brotlicffi.compress(s, dictionary=dictionary)
+-    uncompressed = d.decompress(compressed)
+-    assert uncompressed == s
+-
+-
+ @given(binary())
+ def test_process_alias(s):
+     c1 = brotlicffi.Compressor()
diff --git a/net-wireless/openggsn/metadata.xml b/dev-python/brotlicffi/metadata.xml
similarity index 76%
rename from net-wireless/openggsn/metadata.xml
rename to dev-python/brotlicffi/metadata.xml
index 1570f891c6a3..7f4f33c6dbc9 100644
--- a/net-wireless/openggsn/metadata.xml
+++ b/dev-python/brotlicffi/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
index d883031b0279..3ca9378c71f0 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1,3 +1,3 @@
 DIST cachelib-0.1.tar.gz 9844 BLAKE2B 7281a3851281c2babd3d144db0e22270e5c196eaaf62f975844f9972538e571a36a855f8a0209e2f38d1a962dd52d0d7fcefa1f6d3b97c3f5dcd119585c7ade8 SHA512 8ed41a14f3bc36393ecdce7dcc0023ce954900f4541463cf08b823b6c11a28532812c9873d32991f023986ed2ded39a560ee556447bc6d4c3e45c3d4d749c2b9
-EBUILD cachelib-0.1.ebuild 512 BLAKE2B 0336430628a0e65bcb177476712a79b22a3040cb230c67212da3be02cb05abce70ed1617908a7d234503765e72bee84498ad09a35bcfc57853057edaf5df3245 SHA512 dee39ae092535c2ce7477bc48a38b922495331e7a63d08be867209c91dc52d6f80b542275a88e642b9182eb558f901a8a1aa333e9335e184a0bee696bfa74800
+EBUILD cachelib-0.1.ebuild 514 BLAKE2B 961ffbb12e6519db3dbd82a95de1ab625f9debda020cccf764d43eb4b5faeadf6d79dac36454cd5df09905c5348ca90e6cfc2b3f13ff667a1f9f1288812128a7 SHA512 ed4a688be97cc84b8bef52aa8c92fafe28b60e64c2a4e86815b0f93c6f2d7eb61e84b5bb0d1be8b433c138a07c15d963498d7bd3183aafe766f4600c4fa603da
 MISC metadata.xml 348 BLAKE2B 548d0e9474e9d2c42f0c4d0fb60d0cf53053fb7d4b2b62dcef25c0d1dac802b32af0af53189c8dea4b57309126840efd38a4fab3fc79000f782b82c9927b7a4f SHA512 b602b68d9c5d5fc239ddd37449d0edfb2909c8a8a5fd45c51c669a390149c107af0d5b198d65ef34e5f83aea1f225b8f136d693460abfa6ae27bc57232ca17cb
diff --git a/dev-python/cachelib/cachelib-0.1.ebuild b/dev-python/cachelib/cachelib-0.1.ebuild
index 582e8a51439f..2600a37d15cb 100644
--- a/dev-python/cachelib/cachelib-0.1.ebuild
+++ b/dev-python/cachelib/cachelib-0.1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
diff --git a/dev-python/casttube/Manifest b/dev-python/casttube/Manifest
index 552a6ccdb91c..eb693ce16b05 100644
--- a/dev-python/casttube/Manifest
+++ b/dev-python/casttube/Manifest
@@ -1,3 +1,3 @@
 DIST casttube-0.2.0.tar.gz 3760 BLAKE2B d4e37fb0e98f2e9197e7e1a78b45109d0319f9b4337ef86d0dcd5797e703960162432990b9c4d26796ce5cc957179023044b86a9b07c8e581d13373889c6c824 SHA512 0ab69a92d49a9095c0adb70fec95011447d1f2a57e7642504d2ab4f19fc5f93b09db0e5d277bf7876311e5f26067a687bde58e3aa12469dcc6778486fc19c836
-EBUILD casttube-0.2.0.ebuild 524 BLAKE2B 489b7f9b235d1a09621092ab2f3b546edc968944bfa531b26022aa3afdfdc791eeb5721ced4ba3cd8f501c6c1722bd17b218bbe6da604f6ba42e0943043f3ce0 SHA512 28adadfa6a157353446927d56a1572cfdadcc8e86f3bf78f1ccc0b5f048cfab5eefa2717cb98c4bc7e51b4292952a04f8bca2814032a5b1879cf5cab3bced325
+EBUILD casttube-0.2.0.ebuild 520 BLAKE2B b0f9d8916b2ea17da921bf7c4aad414700e170aefac6dbe74dfdabf143f7c8bcb74cf973611189774f32081200fa0bf4b788f7f3f679f6bcf72d88ba510e8470 SHA512 d916acb4b9995af0214d96ea1135ca98d3a4ef577ae04f1b021a6fddff42b813e0be4dec53903cf9586c1f1a9683893ebe6100c6dd2678114737cd02ea0d72f0
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/casttube/casttube-0.2.0.ebuild b/dev-python/casttube/casttube-0.2.0.ebuild
index 6d11275e5628..92cc28c48a42 100644
--- a/dev-python/casttube/casttube-0.2.0.ebuild
+++ b/dev-python/casttube/casttube-0.2.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="casttube provides a way to interact with the Youtube Chromecast api."
diff --git a/dev-python/cbor/Manifest b/dev-python/cbor/Manifest
index 02cc8acd9315..a6edd8ab5dcd 100644
--- a/dev-python/cbor/Manifest
+++ b/dev-python/cbor/Manifest
@@ -2,5 +2,5 @@ AUX cbor-1.0.0.Fix-broken-test_sortkeys.patch 1621 BLAKE2B 37336807f72b9bef9be36
 AUX cbor-1.0.0.Replace-deprecated-logger.warn.patch 4012 BLAKE2B 443f5a7bf3b30b8b3b313321c01cf48ffb09326f38f524c45dc2cf33de497097d8276f7f4add58b981fac6a6322c8ae5e0919ba854912af3babe4906bb4a4be9 SHA512 02b8bae3c269808884d9c6f23e3ff429f6e11b6ed3d41da0f2e2c3f69569af434aacd9e6c9115c65869b499c32d7cddc20de5a721d89ea7e7ed9c669348ed276
 AUX cbor-1.0.0.zero-length-bytes.patch 361 BLAKE2B 5422309b2a1f40e6553107380548396cceaf142f09eaa776d415690e71bbd5c7d6899a2c38e43ee479a539995e4c1a3816467d19a9ecfdf084915a6047f20e4e SHA512 cc1d11a5e8169271d3a35a41f850e62de8ebab0d3e2e23e480c3aef08c2a77a4670173523564c8c3abb3f021565acc088ecc3a0e4957c0ccf4a7e0a41c7aeddf
 DIST cbor-1.0.0.gh.tar.gz 25541 BLAKE2B dc5491235fee79ad15a8b92aafef2a690a407dfb98792e88b2e87fa7c354277b997ac314dc38279168f50c52f922de4bfe330b860126d4c5b836c019b05a1aee SHA512 88471b1c9c9a4128a4098194e17a4322ea2a01624ae1ffa9c33e433da31a089c45f4b64472d36620797488a451c16771c213b2b9a9ab711232c6658da4cd310f
-EBUILD cbor-1.0.0-r1.ebuild 1444 BLAKE2B dc3e777968a65352072ac789d1e5b067fb7b6be532c58ae461dbc587959b002403498ca40fcad5ef0a6310cc9b44eb3b55775ad508aac05653e31088a42f5ec5 SHA512 58312bf09df9f6c5984970a9971f882b610dab8e40abb51bca36d8b09ab84522b3e105586688e22b415eee2901ca5c0e1d06c1d0240e22cf3cb6a010126e837d
+EBUILD cbor-1.0.0-r1.ebuild 1249 BLAKE2B ab226d978298590e6bd4ec1dae1156655c4ea7da4bd110178de30122a2f558970916a31b0c1e377a5bc999876783a81a6eda753b75403910e0a1058800bc9d75 SHA512 499c9d8c55e64871fbdf9c1851339ad6457a5bdeb695aa8e0f69e6fa8d61e10ec407be6359efabf0b3f2b5028820736aeafc66009d72d59bee30ffde40c6460a
 MISC metadata.xml 999 BLAKE2B 46bdaf98ffe5045cb76897112d80887e3b96f6f87b864cc4af8217b918351e37e87a06d36f2a8028a69f75198904228b275243bf6947947218ddcac67e4d5626 SHA512 c79ba66b6fdbfc112de321697eaacaa6c2f5ca40cdbeca4c5d606e3b0c76371bb64d0e62270a3c1315ff058f5f66b5515a214f8e1e4214b1213790262f24efb1
diff --git a/dev-python/cbor/cbor-1.0.0-r1.ebuild b/dev-python/cbor/cbor-1.0.0-r1.ebuild
index 28ec5ba34fcd..cb0dcf6748e0 100644
--- a/dev-python/cbor/cbor-1.0.0-r1.ebuild
+++ b/dev-python/cbor/cbor-1.0.0-r1.ebuild
@@ -28,13 +28,8 @@ PATCHES=(
 )
 
 python_test() {
-	distutils_install_for_testing
-	PYTHONPATH="${BUILD_DIR}/lib" \
-		"${PYTHON:-python}" cbor/tests/test_cbor.py    || die "Testsuite failed under ${EPYTHON}"
-	PYTHONPATH="${BUILD_DIR}/lib" \
-		"${PYTHON:-python}" cbor/tests/test_objects.py || die "Testsuite failed under ${EPYTHON}"
-	PYTHONPATH="${BUILD_DIR}/lib" \
-		"${PYTHON:-python}" cbor/tests/test_usage.py   || die "Testsuite failed under ${EPYTHON}"
-	PYTHONPATH="${BUILD_DIR}/lib" \
-		"${PYTHON:-python}" cbor/tests/test_vectors.py || die "Testsuite failed under ${EPYTHON}"
+	"${EPYTHON}" cbor/tests/test_cbor.py    || die "Testsuite failed under ${EPYTHON}"
+	"${EPYTHON}" cbor/tests/test_objects.py || die "Testsuite failed under ${EPYTHON}"
+	"${EPYTHON}" cbor/tests/test_usage.py   || die "Testsuite failed under ${EPYTHON}"
+	"${EPYTHON}" cbor/tests/test_vectors.py || die "Testsuite failed under ${EPYTHON}"
 }
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 81f52719e23b..49f5226076e0 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -2,7 +2,7 @@ AUX cfn-python-lint-0.30.1-tests.patch 621 BLAKE2B 7b4d457c56f32799c0da0e1e1f655
 DIST cfn-python-lint-0.39.0.tar.gz 5096885 BLAKE2B 50fe41b1dd533c10a011d4729e78241d0153389cd9eda2c887181b62341d5ff38eba223606c2f9e725dfb1a6c934b5f044a236fb2044368a413d434eefd097c4 SHA512 d48116aeefd996943aa1408c76574ec137e96447c7b8950bb1726ff00819611ad6179a8af820ee4d16f493455cf55110e90b78b6d4325036e955529dedf7807f
 DIST cfn-python-lint-0.41.0.tar.gz 5192401 BLAKE2B 1f4c491446b552272cb9fea46d9d07ca559a4ac7526730663b0824d3ba631a333128ca45b2dbbe637286b0495d0198c45ce19b662bb1448125c919ab4fed57b1 SHA512 3ece6a39666dee395c78fed8e23d9228ec7e0cca67d9216b709300bccf48605903252202cb7d05e7c9b9122be11ed4ca39540aba891359633f1772af72a73fa6
 DIST cfn-python-lint-0.42.0.tar.gz 5307120 BLAKE2B f54c4ae7fcefa6b56714a0cfdf89d9fbce20078daac0784c6169dfbe1a110da699e37b526f306ed9734504fb3387c660ccb997748579b65afe01438124361383 SHA512 ce2e6a0031e3d67953da6f5dc96f0b155f1a1144bee75a8a476490eca69fdb700c8a3d6fd89b0afa4c8d724956e5f86bc48417035d7c94f3eed00abda47f9931
-EBUILD cfn-python-lint-0.39.0.ebuild 1455 BLAKE2B 8fad045ceffd2d4f2bb6861d71cd4e8320023217bf27b406736d347b4d5160b263b1796b4d50425cdbecff14846638c339be68fe1ac3451ebd452db938742742 SHA512 a19f7a67f1c8811e10cdcce49142ddd9360464f28fb0a9fbfbd7eafa94012cae6cb0eb757e3a010adfb29f3471395fc72fcc23b91422f8315a505cf629e169d4
-EBUILD cfn-python-lint-0.41.0.ebuild 1457 BLAKE2B 7806e53e56ea8376013c4f137134ddba64a4795b17bb7ffbc1f96eb4c77320fc623bb1e8bf95ee0e80e02acb5b53860362d646973fe54f1990dc03b9c8b878e9 SHA512 e7a88d7294729d399888b8c5aedd06a2b324c35fdfcbd6406f165a005587729c20820589205086c99d11f21e7700b7ba693a0a1b1c9d4840ed482887e2a8fb92
-EBUILD cfn-python-lint-0.42.0.ebuild 1457 BLAKE2B 7806e53e56ea8376013c4f137134ddba64a4795b17bb7ffbc1f96eb4c77320fc623bb1e8bf95ee0e80e02acb5b53860362d646973fe54f1990dc03b9c8b878e9 SHA512 e7a88d7294729d399888b8c5aedd06a2b324c35fdfcbd6406f165a005587729c20820589205086c99d11f21e7700b7ba693a0a1b1c9d4840ed482887e2a8fb92
+EBUILD cfn-python-lint-0.39.0.ebuild 1339 BLAKE2B 0493cbc1361e663531bb80becb0e09edb3e5d8da4fa6258748e68061ba6765c1e324894000d8c5daa110680714d9ea045ff79bba27b3218e65a115ec1d0750e4 SHA512 75ff46b3bf5265045fbddb5fc0621b900767c999a03abcdc4bd3925b391927876c98431fd5bcb4199e261fde46cdce73dd555f795e7e37419a0ee800be461098
+EBUILD cfn-python-lint-0.41.0.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
+EBUILD cfn-python-lint-0.42.0.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
 MISC metadata.xml 596 BLAKE2B c9937cb001e177c18c65bff8b70940d241e54f58aae3818071510f1c73540fcac6c532c8700b4904d4e2c9382f8a5288a2cb8745e174b8ac0a4edfe114d78ff5 SHA512 40c20431d8132ee97311a23bba87d6b408297410573c191f8fc43282bd156884adc25b6ceb6f2168d3456d535c4d82fb3473dd9025bda276f6aad829f68a8e37
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.39.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.39.0.ebuild
index 64b6dd0c57c8..2ee32af274d3 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.39.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.39.0.ebuild
@@ -33,7 +33,7 @@ BDEPEND="
 	)
 "
 
-distutils_enable_tests unittest
+distutils_enable_tests --install unittest
 
 PATCHES=(
 	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
@@ -47,9 +47,3 @@ src_prepare() {
 		-i test/unit/module/maintenance/test_update_documentation.py || die
 	distutils-r1_src_prepare
 }
-
-python_test() {
-	distutils_install_for_testing
-	"${EPYTHON}" -m unittest discover -v ||
-		die "tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.41.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.41.0.ebuild
index 8fdc39d88ec2..a83123122bcb 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.41.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.41.0.ebuild
@@ -33,7 +33,7 @@ BDEPEND="
 	)
 "
 
-distutils_enable_tests unittest
+distutils_enable_tests --install unittest
 
 PATCHES=(
 	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
@@ -47,9 +47,3 @@ src_prepare() {
 		-i test/unit/module/maintenance/test_update_documentation.py || die
 	distutils-r1_src_prepare
 }
-
-python_test() {
-	distutils_install_for_testing
-	"${EPYTHON}" -m unittest discover -v ||
-		die "tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.42.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.42.0.ebuild
index 8fdc39d88ec2..a83123122bcb 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.42.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.42.0.ebuild
@@ -33,7 +33,7 @@ BDEPEND="
 	)
 "
 
-distutils_enable_tests unittest
+distutils_enable_tests --install unittest
 
 PATCHES=(
 	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
@@ -47,9 +47,3 @@ src_prepare() {
 		-i test/unit/module/maintenance/test_update_documentation.py || die
 	distutils-r1_src_prepare
 }
-
-python_test() {
-	distutils_install_for_testing
-	"${EPYTHON}" -m unittest discover -v ||
-		die "tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/citeproc-py/Manifest b/dev-python/citeproc-py/Manifest
index 369cca5702fe..5bfd989058ad 100644
--- a/dev-python/citeproc-py/Manifest
+++ b/dev-python/citeproc-py/Manifest
@@ -1,4 +1,4 @@
 AUX b1a5f925527093b0b5c11507f379a908e3354820.patch 1339 BLAKE2B 0dc159ac56179f13c528a13ad617d1ac52e65b4cc9be59bf6374adcb1ce787ffdc960bc70cc5dcd6287bd9bde4157f0ed1bb1511d2021a476ac61ce9428c2dd1 SHA512 477fc02354cacc75bfc341257caaac23501381c1e233a84a1e0973c98eba350c7cfa1a15503130f3059c0a239c20d5bb5fbde40b754785581c287fadc0183701
 DIST citeproc-py-0.4.0.tar.gz 109786 BLAKE2B 8d8520ad10a9db7b7da1a2febcc594750572a562ada3944e41dd42321a3b9384828ad17e671307b5c4affeca2ec4a3f8e97eec650dad7005323ccb2913ef43d5 SHA512 bdc09a6f632a13cdfa757710c0d137ec73fe590bd01e049847fe013569231426bc72b318133fa34c96c5608b7a30058c27f4cd3d5fa2ba4b0760527b877992d5
-EBUILD citeproc-py-0.4.0-r1.ebuild 555 BLAKE2B ad28b068d55eb21688e9c260f43dd36fdc6724cd69fc8d2db8a84b1e008d3da5c3603f06413ea5f91609b0646eddd3e593088c1dfd5abd20aa232ff8d69ec8a2 SHA512 e7433fddf346c7d2915530911fda4668d1f00e9f879f0a403e5aec5713840fa5055f1e1d37c31a1e810a1c6490746f5d02e2cae7b59a9889ce883c34447a2f9c
+EBUILD citeproc-py-0.4.0-r1.ebuild 557 BLAKE2B a854b244b5f1659717aade1ddba80c7d2fca674ad27a1d7a493b7464832466ecfa2b696354ffe1837a74d08a00263cf333b18e8333f94c9013159762acc0fa10 SHA512 15c444758ac64c71729afecb31119cc6708c7a29f67f7af910e9ccbd3d0b8410c10d1e3e850f8c40a5e48b10346443c04ebaa5104e06d8ab9817f1df3a98b398
 MISC metadata.xml 433 BLAKE2B f512298eb65cda00ae88968b103a176640dd993d5e1815a1b414167f90014a74957b2043f7177d3f9ffb7b58cabbfae42cf06894e3247ab65d6ce11ec362477b SHA512 375292332cd82155673005e0a0d189120fadacf98e81f181b9540f40915147e895b7ce5fa3bcf1e924c08619944b65b28745f9b76ee520877abf3c6d94a690fd
diff --git a/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild b/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
index 567344095393..0077a97d0547 100644
--- a/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
+++ b/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="Yet another Python CSL Processor"
diff --git a/dev-python/click-default-group/Manifest b/dev-python/click-default-group/Manifest
index 1bba01f83e14..bd9e461d65a6 100644
--- a/dev-python/click-default-group/Manifest
+++ b/dev-python/click-default-group/Manifest
@@ -1,3 +1,3 @@
 DIST click-default-group-1.2.2.tar.gz 4753 BLAKE2B 919e3921ef3c6723b92cab8433032237af4e5583084badb6cc53d82971d81aa910ae6553deefea2ac46067d2618bb8f6d2003f0b2c4ced04acc5b46588012614 SHA512 6f296d154813e0c3dbf8e435c4c1b4394f51a000320c5585aeb78b81f30fe15bd27a8aad0fdbb71fccb88dc3083682519f1dd06572c8d5c35639fb9c3acf73fa
-EBUILD click-default-group-1.2.2.ebuild 636 BLAKE2B bd6746ecf03373153f8a1514202520eb5e92b1d7a093e14c5ea3bea581313380534f8d3f853710ba33e1b6522de8185cb8e478e7d18d54acf7ce09c5b56452f9 SHA512 e393412c8cfa0e79978839371a24426d9859fc8b072e830294b97343623794fc6a9bbb467da0a4c08cd2f0170b004ecd6c6c96728ff419af6cea86922b6cc81e
+EBUILD click-default-group-1.2.2.ebuild 647 BLAKE2B 928c43065d026aafd9742e982aa11156f3436081d29a8a70f7e0e4168757ed48d90f17a6d646cbefba324f44547c78436bcf0c9682de8b6bd3351dcdf0d5077a SHA512 db2d18fa6fbf9bc577670e49a0ad5283f8565b9a10bde0a0b4ec744a157d8dc4f7ea2d0913b1fc83b7581f74b609c6c6607663c16305073d2cd3ff1e380b4b43
 MISC metadata.xml 322 BLAKE2B 8a78490ccdc4b51ba871eac8ca74b0e342ed41d8d91f8a4b7c0c824b6447be791604c71f1f59d5151686931a34160b5f5d1979b2760e4aa533b45033ce3d09c9 SHA512 c90048e0f2c412a4d44e289cada3350df7a74a8d87f09b1568085183a37fa6895163fa913f4a3917c34e314a81fedac06d8c24304b1cf619c3489275a2ef1417
diff --git a/dev-python/click-default-group/click-default-group-1.2.2.ebuild b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
index a973e932d905..64f5eb42e524 100644
--- a/dev-python/click-default-group/click-default-group-1.2.2.ebuild
+++ b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/click-contrib/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 6679d65268f5..99ffbcf95dd2 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -3,5 +3,5 @@ DIST cmd2-1.3.8.tar.gz 643320 BLAKE2B ca9eb089c4d1a5922d3f762e9fe118168349c807b7
 DIST cmd2-1.4.0.tar.gz 660494 BLAKE2B 1a7d5efef704cf3011affa99303233ad9d16e09d16bbe9319324599e6d69b1a664556e9ed406f2a34bfc6021a6d1607a44fd4df9cedbd6688826e0bfe8d91b77 SHA512 1f35e9773578a1d2ea1255cd697754b126c1e90486e84319c0f86ee409ed22bfbc267ff1d3b9af1072985337c9cbc51eac4e288281146d9c20b54c8b364f1547
 EBUILD cmd2-1.3.11.ebuild 1235 BLAKE2B 52cfa28ff67f559ed4af995bc77dd001c6f8f0c6239f70c52eca0077f1547b13c871b93b45fd1e3775bc7c8c5747fb9bffa47497cd7a6093d96351d6af5fea9d SHA512 9fdd2a70ad330ab564cb36ae8ad9727a893a0a67d5159b0e5fe8d893cf0889049e5256522b138de8ec9e2a96493600075814f77b139dad80c358e888c3688b57
 EBUILD cmd2-1.3.8.ebuild 1231 BLAKE2B 94e7f09cb9e2fc73c5e831ab193be8a723cc66fba42dcbdbba7f51e2733f6b736ba6117366a81eb35fffcf80329201ad4a1280ea1dd189ee3b96c926c268c2b1 SHA512 4a746cb023b3ce7afcc383bfa1a4abae0e5be4b0bb3ea90649e474fecb2a16b7c7767b636a3c8ab7150ec75c3d2dba80a07e055720d7f900020a5ccfb6f10879
-EBUILD cmd2-1.4.0.ebuild 1237 BLAKE2B 6ba444387e36ebcc11511c30b0f8cf9577ed63744081deb292a411a2ca195b1c58200f496841390305945d6f0bb31cd993ee98f7ea992e2a51c3adf0cd157f57 SHA512 6ad20be1300967b792426b458dfbb8d7578edf96e8dcc4e592188a62a3e997e2b869bdf04009dc367ebdd53a40ff73d020e3d0683f378263efb5b3be51dd8254
+EBUILD cmd2-1.4.0.ebuild 1137 BLAKE2B c467d24e0ec9fae72f2b91f64a40752c82500e15b2bdcbeb8abaf4edae92ce5eeab2e3a23794b84d2f605af7b3d73f21258e0a7ed7918b1e014796a460ae8485 SHA512 6cbb1e031fea9e97e3414229edddbf3b6b309dd09595258a70effd7e5b2b81956368c3310b23a5a001b4e97251125d460755630c786b9c48ff2586c959f880a9
 MISC metadata.xml 521 BLAKE2B 0246c37d4e3d54c54b632fc75eb51b0b6e1ff3fcf6be8218a958c9483fb0248bfa3238ed31ab9631f41b12bdef71704649423bd2b44a322ec0b4cfb20a6026f2 SHA512 6a94c23d403d07e6d8e980e4c11ed1a1a0de4707417d60b539a4acc50312d1a9604d9d7ee55dd232c51c8fa6fc24f10bd28e9cc80e2a6f143086da448f78f924
diff --git a/dev-python/cmd2/cmd2-1.4.0.ebuild b/dev-python/cmd2/cmd2-1.4.0.ebuild
index cdd3428887c2..aa46d05c5c4d 100644
--- a/dev-python/cmd2/cmd2-1.4.0.ebuild
+++ b/dev-python/cmd2/cmd2-1.4.0.ebuild
@@ -41,8 +41,3 @@ src_test() {
 	local -x COLUMNS=80
 	virtx distutils-r1_src_test
 }
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/configobj/Manifest b/dev-python/configobj/Manifest
index 0f7837c8edc4..f9867f0b0852 100644
--- a/dev-python/configobj/Manifest
+++ b/dev-python/configobj/Manifest
@@ -1,6 +1,4 @@
 AUX configobj-5.0.6-fix-py2-tests.patch 1494 BLAKE2B 5c52aca50d606c0fa3fef6d2fb184b3d21bb45ca39c4cb5893aa67b06e46954110b4a2109fb1592931a1947b56b12a80a575baa54ca7dfbeb1981bb1c610137f SHA512 ff87d2b54a47cddb9dd77d43a3028805f98c76e7a0c9529d40fa2d936c8b23ede24931f2066665d0b6ba30db6f62ac4871605c6b89c4842eb93847eb2d6e1e8c
 DIST configobj-5.0.6.gh.tar.gz 143664 BLAKE2B b554d0aec903aecb55387a0164cd6f8d442e9fc1ab231ce7f7123e7a5041e07a86f5f7bf70492ca93fcdc1bd3caa5b855c427f060842e3b4a7524afbcc417a76 SHA512 326eb86e362f281ebf07abcb1cf7616abb270c482eafe842371cda8708245ca5e8262f1644b7164664ecc10e9004ed061c9de18cd233a657d4697dbc3ba3c59d
-DIST configobj-5.0.6.tar.gz 33248 BLAKE2B b58a22fdf247f1c3022108e24abb4de55620ce75f6aeb5f269f008a5668e07b8c1d0c49e4059d7f4c4c361d269ead39c3784377635c7718f92c2381e69c56cb5 SHA512 f253fdd0bc3fcd37f56c9ceb28f5c8c739b0861e099b07a3929645907c97b2261f0529850a95c1a42507846f72d88a0992fcd1e1d6fa8654dc713d120f769963
-EBUILD configobj-5.0.6-r1.ebuild 758 BLAKE2B b8866bb68237c6c7bde282b03d408b0df9ff0254771224d5737dff6641311841a398cc4b0294a1c0f40abac514401e860a31155383e071c908647ac1dcc0640d SHA512 10729b9a22d7906af0a67930df6fd40f628fb216132dfd25a80053bc11c0d7b9d46e6682294fc063da897cf9fe49c62ebf9322acc915bdb31f0f2a43c3f06ea1
-EBUILD configobj-5.0.6.ebuild 981 BLAKE2B d6fd8c2cb300a411006b6ec0d5cb654b191d2ae0cc6076a177c748ba03f66533baf3e617524c3388d3235aa36c2fc3443dbcacbc1dfae9dfbd771b2d19abf941 SHA512 1911989a71c0235b0389acb6d2c354c2f75569c10cc99325d84f1d03ffa72292d9e099a7af11a9a59d4d9c51f92e38ffd36d7d778c7484a8f8d31c1c09cee305
-MISC metadata.xml 663 BLAKE2B e4c20390482c920c99164449489636bc0ce8305f38a96673898743a79bade7b6c09d6c9cb0fa5f7df84dd3791e7b78ac0e685e2c32dadfde1c44ad48f427a655 SHA512 c8c5d8bd7b5efd97310af1bc9dc172f3623f01b45b44c20ca33f92ad0d09845bcab10e6afd704df1188a747660ee4e7f519a55dc40ca5945c189611740e9c480
+EBUILD configobj-5.0.6-r1.ebuild 754 BLAKE2B 82a68c39645e5339d8bfdef3b86458cd7dd8b7efbec2179b6774d8f8834d2de77e10acc17d6a646b724af4cd217d5067acc4d958a3c316de06433046a8e42249 SHA512 ae2494e72766dc13b42d25783b6ce2fdceb7c305cb6c3dabbdcfa1660c7a2ef990fd9fd832d74722e0f834e5a382e8c67863c91059851cab9581e231c276c3f7
+MISC metadata.xml 688 BLAKE2B d4a4e54b638c6d5011dda8858341b089eaa20b6d92566586d95ed407b7d94d80a4272426fa2904176e084df92b0606c957f16bb6fa4692848f2044d5ba206386 SHA512 653fec16eb0773050fc60e0df5b8be0311801495f4fe109d6346319a24159f78af614b1c587f0521be47e0c608373289e6bb05dec8284ae01cbe55c52c34d780
diff --git a/dev-python/configobj/configobj-5.0.6-r1.ebuild b/dev-python/configobj/configobj-5.0.6-r1.ebuild
index 4eef2f3e92d0..a7c732eb2cd4 100644
--- a/dev-python/configobj/configobj-5.0.6-r1.ebuild
+++ b/dev-python/configobj/configobj-5.0.6-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/DiffSK/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/configobj/configobj-5.0.6.ebuild b/dev-python/configobj/configobj-5.0.6.ebuild
deleted file mode 100644
index 41c7ea7f06d3..000000000000
--- a/dev-python/configobj/configobj-5.0.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple config file reader and writer"
-HOMEPAGE="http://www.voidspace.org.uk/python/configobj.html https://pypi.org/project/configobj/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# Not to install un-needed _version.py
-	sed -e "/^MODULES =/s/, '_version'//" -i setup.py || die
-	sed \
-		-e "s/^from _version import __version__$/__version__ = '${PV}'/" \
-		-i configobj.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" validate.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/configobj/metadata.xml b/dev-python/configobj/metadata.xml
index 6d4c52e673c5..a315e8346053 100644
--- a/dev-python/configobj/metadata.xml
+++ b/dev-python/configobj/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <longdescription lang="en">
   ConfigObj is a simple but powerful config file reader and writer: an
   ini file round tripper. Its main feature is that it is very easy to
diff --git a/dev-python/coreapi/Manifest b/dev-python/coreapi/Manifest
index 234ebf1372ec..9d7f2d845104 100644
--- a/dev-python/coreapi/Manifest
+++ b/dev-python/coreapi/Manifest
@@ -1,3 +1,3 @@
 DIST coreapi-2.3.3.tar.gz 18788 BLAKE2B f7837d6a0430e6617a2589aa84a209b3c544a913773bc4388c3bdef7348c83577e1b216e83c14736b15174ede840ae297b050eba551b4fe22d784e4d51677956 SHA512 5a66cf9613a9e11046577684b837f48e17db2285d14a51a77aa47eb945eef72a9ee0525b7b1b1c57fddec102c144ce56430ed5a95717e77d906d0b617dce708d
-EBUILD coreapi-2.3.3-r1.ebuild 598 BLAKE2B 998cd11e473eed824b9d91784dc4d64a86281118be03358a3b6c2adb50fd313a8fc396c0edf9641863dd969517b74420d7a52baa041f26903520e213226cb347 SHA512 973e4d54b14f3442bee47e457cc6e3ec31eea7e1dfc1c27de4c9fef7854130da8c780e615b7e2dbdcab83254396d9b65af975a25842ef48589e7c165bc00d220
+EBUILD coreapi-2.3.3-r1.ebuild 594 BLAKE2B d8364d0e2b591386f4fa38d34aca08ec7e20d3c76ff5a38769cfaa805d27afcde89201d6e821891bef8f4635005504013f5f919c59c218ecf68c49db6cfbae6d SHA512 0937fa52366a22cf238d89bdd5c8585b403f2ae70ba698ab3fb5d0f16fd2eec1afdd16970884fa53a2b13af5ff65dcd0c742d6481b50a52a16ecd2e2a0fe0006
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/coreapi/coreapi-2.3.3-r1.ebuild b/dev-python/coreapi/coreapi-2.3.3-r1.ebuild
index 61a0d757cfe6..b8f32cf2ee23 100644
--- a/dev-python/coreapi/coreapi-2.3.3-r1.ebuild
+++ b/dev-python/coreapi/coreapi-2.3.3-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="Python client library for Core API"
diff --git a/dev-python/coreschema/Manifest b/dev-python/coreschema/Manifest
index 64c0f16d89bd..a26cdc992b93 100644
--- a/dev-python/coreschema/Manifest
+++ b/dev-python/coreschema/Manifest
@@ -1,3 +1,3 @@
 DIST coreschema-0.0.4.tar.gz 10974 BLAKE2B 8bddafea9eb82140cdf2b2cd40ffc31dd4a0457f8ca216986807657a5021f7a4319f1e3db27caf7d471f8617f6f0c3a6d79ebfe7e0285bc9a6627f93d6efa760 SHA512 21a35b29cd0bb96dacaeeb0bd0faaaa4ee8875bf9639b431b59f17c41ee4829173932a6b35760caa3b46a0ec39ca173fe896b26b740fe97df36943270bc2bd3d
-EBUILD coreschema-0.0.4.ebuild 457 BLAKE2B 648eed117503ceeaa99b9b867b882301d48f3649297a65984965632da9961e3bc578bf01f13bfc69ed38f66cf9845ead12e6955173bc33705489a0bd41a32a12 SHA512 4b5b8ec09494fb3b9f0e4449eb5b2f349377dd4c4eced2b63fdb2973445a19469e4745b535e455cecb07bae0e049c13208d6860b3e3560b1dbae7a3da3dfeb78
+EBUILD coreschema-0.0.4.ebuild 453 BLAKE2B 52f7ef51e08091555cffba36308199f7caa0a28a41757b0e7eb72f8f56e327d6440cb81ff4060d629e7c709bdf3ad8ed747b42552715605793152939786049ba SHA512 101f09818320b42b0cc385951e2ce18e00c0b3e15bde42248edc26e2a1de54e497d27afb8533939ccb3b581cb60c005aad30670820cdea8dd235fcee78d02b9f
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/coreschema/coreschema-0.0.4.ebuild b/dev-python/coreschema/coreschema-0.0.4.ebuild
index f402f85a12df..ba5eb3d7d97f 100644
--- a/dev-python/coreschema/coreschema-0.0.4.ebuild
+++ b/dev-python/coreschema/coreschema-0.0.4.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="Core Schema"
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index be2d30339170..e8abb3de1c1e 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -2,6 +2,6 @@ DIST cryptography-3.2.1.tar.gz 540994 BLAKE2B 667f09ac81423ecdc84c8646f0d02ee3a2
 DIST cryptography-3.2.tar.gz 540815 BLAKE2B be4edd5d4cd9564e8622284ff9b1d3a7cc7d6e46cfa790d8e1cfa1ce389c5d628e39b056dc5cba3b94ab3fa45603df73a7b4ebd9d1c70fc88c457780f6616311 SHA512 0096e6408b5868cc0b5e6f67945e4200bb943a00ac803546048fa4d332f81af4a224b2d67b911ee8da1ad086120935d7d557fc70a739ecffb22f408ee9b8d09e
 DIST cryptography_vectors-3.2.1.tar.gz 35168164 BLAKE2B 77af3be0dbd7393da7cd59600086041b78fe20339018a637fc1cf3600c7cd08cf2e565c79ccb47f4719a4b0f01cf2ab2db00c025805443b333dd7fdf3aa835a7 SHA512 44ff756a6ece9700f7657f8ba92417e95bf273cf500f1dab2141de5b2af6e61840d65c37b766abd752c76025ead1550bfc7b7340ce5774c75fd0bb8ac768cdd8
 DIST cryptography_vectors-3.2.tar.gz 35168065 BLAKE2B ebd915eee9b91bd61445bcb442d3052972b1463132b8e63343832baa27c25566e22ca9f50c9d4ea73cb12185f9228144eaac4bf5cc68a3bd79f347fe2d021adc SHA512 bb0d00c8a66fd328ef38b0008519856a14d35b6fd634a6f67ea5530775d36538fbd326326c3f0cd962b1a008c21f2aded4d733f97bc12577679ed8be67b858bc
-EBUILD cryptography-3.2.1.ebuild 1938 BLAKE2B 423a0b0604b3111f7ec8e4569409c57f8b77f90abc85a54002af42798f682b1022ca2a671c939bb05569aa4327a25f2954802ae1b68f35b5e487fc0a96b8008f SHA512 729579d28855469758b49c9fe619d91c98cae969b3e00b2da38f2da3c201bfd7a49070ddfedef921d1b84d5def71291ae03a9d73e58a68b6d57463ea06c3e026
+EBUILD cryptography-3.2.1.ebuild 1942 BLAKE2B 2872701d3b66af19dc2825cee1e27f950f5cdfd4900e3ba25bde668b1a088a8968d3bb377ca67591f3275eaa2acefd0b673df3ac58e44cee039cab32bcbb9e83 SHA512 4c45006b80c4eeb826303e3f70e855796164d88e732af05052d9176d21327f14122f120cabca616b21543a725eba6a8449f431832850c5e42acdd5c8f716305f
 EBUILD cryptography-3.2.ebuild 1597 BLAKE2B ce9b411af9b2e2fcad65d7f017e8b36cbb6a032451fd8c75b036af869ef1342d5fd3bf7b36faf16a4070dc2f5a3177212322c6ef32111785db4bb8103f39b8b3 SHA512 37ede133d250d4c7eb0d0044a3943d2a963f9ed2b173bb2e4bafec10f88e8dd0ef20086628fdd526af90128d08888a035876e83464686b125d0282f2ebf549bf
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-3.2.1.ebuild b/dev-python/cryptography/cryptography-3.2.1.ebuild
index 72bc0fbfd3a1..f6ebc6c81528 100644
--- a/dev-python/cryptography/cryptography-3.2.1.ebuild
+++ b/dev-python/cryptography/cryptography-3.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-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 ~x64-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 ~x64-solaris"
 IUSE="libressl idna"
 
 RDEPEND="
@@ -50,13 +50,13 @@ src_prepare() {
 	default
 
 	# work around availability macros not supported in GCC (yet)
-	if [[ ${CHOST} == *-darwin ]] ; then
+	if [[ ${CHOST} == *-darwin* ]] ; then
 		local darwinok=0
 		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
 			darwinok=1
 		fi
 		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
-			src/_cffi_src/openssl/src/osrandom_engine.c
+			src/_cffi_src/openssl/src/osrandom_engine.c || die
 	fi
 }
 
diff --git a/dev-python/ctypescrypto/Manifest b/dev-python/ctypescrypto/Manifest
index 81687b80f262..24a448a14bf0 100644
--- a/dev-python/ctypescrypto/Manifest
+++ b/dev-python/ctypescrypto/Manifest
@@ -1,4 +1,4 @@
 DIST ctypescrypto-0.5.tar.gz 44667 BLAKE2B abf24a4a5dc5ea1d977427f781e44433aaeac716b4f1f8d6f23e7f8de7debae75cfff80e72c369b64b8b9299f4b058763d42c5f21cd499f9b5689481afa5a538 SHA512 96ca12145be503a5b343d936cde172039057e5a2308fb6f6f65e14fe859d4e98d93ffb996849e391cf0c474425ee6243fd4c7998b088938a21456965d135188f
-EBUILD ctypescrypto-0.5.ebuild 1060 BLAKE2B fdc8fd0dcc2a07f20c236be62eafcf5cecd5ffc5e60f4670882357f7b6d365e0265e366a1ee40c65fd85631ee6e2541e2908642e8528abde65054f1a280670e4 SHA512 bd37608cfa893aa1e7e4dcf27b22f3c2fe3fc3538f799a99a9ec413843ddad4f4df8c9fcc1b8843200526190e93970d6a957f626987ec58502a6b6fcc265e485
-EBUILD ctypescrypto-9999.ebuild 1060 BLAKE2B fdc8fd0dcc2a07f20c236be62eafcf5cecd5ffc5e60f4670882357f7b6d365e0265e366a1ee40c65fd85631ee6e2541e2908642e8528abde65054f1a280670e4 SHA512 bd37608cfa893aa1e7e4dcf27b22f3c2fe3fc3538f799a99a9ec413843ddad4f4df8c9fcc1b8843200526190e93970d6a957f626987ec58502a6b6fcc265e485
+EBUILD ctypescrypto-0.5.ebuild 1061 BLAKE2B 54689d9590433ac8b85563a6a18fe90b0e4ce8d8670065b2c323f8d223d380a18ee2ab1ad11d8f50ec2fc84476c4e60fe134891caa9f1da4d7e307cc4c269b3c SHA512 9d9d04f71f22b567ffffb3265763f20a14a7ac33997b0d4b343ba7ebdcb6b1ee54e8d59f93efcf9468c3bd04b96c5831f0385105f2c192550652deb6b9007979
+EBUILD ctypescrypto-9999.ebuild 1061 BLAKE2B 54689d9590433ac8b85563a6a18fe90b0e4ce8d8670065b2c323f8d223d380a18ee2ab1ad11d8f50ec2fc84476c4e60fe134891caa9f1da4d7e307cc4c269b3c SHA512 9d9d04f71f22b567ffffb3265763f20a14a7ac33997b0d4b343ba7ebdcb6b1ee54e8d59f93efcf9468c3bd04b96c5831f0385105f2c192550652deb6b9007979
 MISC metadata.xml 425 BLAKE2B dc5497a725f4d7ce3118e6de7090649851ab489289173a21a687aff121ec731a4713c726aa462f54da58801dd9f53787ce480d93f657e0a4c48b69874b15202d SHA512 a0c956fffdd8fb67922d69df4b687537522c50aa685c5689ccaf216d789d00f2221ec1d3789f75dbedd5d204fbd2089cee03c7aef1db0fa3d43a7c88c7b77494
diff --git a/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild b/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild
index 26427d4300ee..96f10907bc1c 100644
--- a/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild
+++ b/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild
@@ -4,7 +4,8 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6..7} )
+
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ctypescrypto/ctypescrypto-9999.ebuild b/dev-python/ctypescrypto/ctypescrypto-9999.ebuild
index 26427d4300ee..96f10907bc1c 100644
--- a/dev-python/ctypescrypto/ctypescrypto-9999.ebuild
+++ b/dev-python/ctypescrypto/ctypescrypto-9999.ebuild
@@ -4,7 +4,8 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6..7} )
+
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cursive/Manifest b/dev-python/cursive/Manifest
index 388abddbce64..712fe8569715 100644
--- a/dev-python/cursive/Manifest
+++ b/dev-python/cursive/Manifest
@@ -1,4 +1,4 @@
 DIST cursive-0.2.2.tar.gz 43065 BLAKE2B 2c007b357c3cd1d560f74958b78d157c97301b8c2e15ed50ff340950eb4abb8baac078865bd82a3222a22505862a78a651905c843b6b0ba4662d653dfdd5f369 SHA512 6c97f8f71b016ee57349b8156543c8ca41c29c3f234ea60967b96c09fce2cea4b36b9f92996c622bd9504d4a71893903e8d5a8ab50e089fd37bddb8095f4b9d2
-EBUILD cursive-0.2.2-r1.ebuild 901 BLAKE2B 4477ba05023cf591e9c830b9af892b7d45763ed4bffa6476edde4cd11cd8eb88e05befcc557d9c63079db57f09cc5072afc4f7d34e69b61b9e577adc49361f2e SHA512 a5d2525ff820f7a6df85abcace17d03065233bfa55a0b76018852a776666fdf2502020550871fe6ed7638fd8a25d996328a38797fadafaeaa3a971ddeb3b24c4
+EBUILD cursive-0.2.2-r1.ebuild 899 BLAKE2B 91d3d57242fcb960425bcb302f894f9fd9ccfe56c72e60b761afde1c97d269fbdb8891b90759a5af155f8c456b90c8c41a7205c00f7b2bb2d27e2714d425a9bc SHA512 8f24e1cfc7a070368af503304e35b21bd62a0ad621ce330416b7ac50bc3ec054a585b3a41497a88f2db8218c1a6f096e9d3c544759943b8a81a0d60dc69c1013
 EBUILD cursive-0.2.2.ebuild 899 BLAKE2B 8019e27fa31e3ef0fec1731789af05dd3d170675d1499f34c663f11b3ad40e1314cd0fc07f5683216826cda3bc6a70cad5d2c5321074d3cccc99332732c347cb SHA512 6053ccf5d7862db54b9e1e0a9576bbf4924b166d6de5355bdca75206eeb4174c25ab25713f07ae5266c153b7d71731b14ecaf77a38a8b01dfd6f55189119ae10
 MISC metadata.xml 531 BLAKE2B 2d1b19c291e6497c949cf9ea099b5246733eaab4a91fcd7f5a4801d3fd48caf6ca0d1c90f6235778057f417d70e47586de3e0921b455ea9e40d76efce7230c5e SHA512 32918281cadbf14c3310426a34593638198b873cf03550fbc7b5f4233385f6cf58fcfd7c2b44606ce243d6618a15c9911938037cf42b8ef05538324b3a569638
diff --git a/dev-python/cursive/cursive-0.2.2-r1.ebuild b/dev-python/cursive/cursive-0.2.2-r1.ebuild
index 737826a40925..254e2bb45b7e 100644
--- a/dev-python/cursive/cursive-0.2.2-r1.ebuild
+++ b/dev-python/cursive/cursive-0.2.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index 041cf04bcc59..417074b88441 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,4 +1,7 @@
+AUX curtsies-0.3.4-typing.patch 365 BLAKE2B ac2f34c7185273fedf546faebe88f3abf7d6d69482f7da875c5979141532d4c49e80c31d1aaed6e32b2e3a8a4d53f526caf0ce83335fa41d325421c04ef01295 SHA512 510474b8cc9b35cbd50e1c993cd9c919bd951b3321a6f2d62e1797968344c506159b1ea2735c21033e39414fcedfa2917f4572019b9c9b2fb263d0e1153d6c93
 AUX curtsies-typing.patch 330 BLAKE2B caee67d514f926271fcbe498a06cb811ce48035317b23e03e160405e0d4209a95579e70c7bbf1d4d5926af6d24e2016dd51aabfeacc796f9e32649b65c269cee SHA512 6f13aab4de020c39bbbe531e9fbbb24b419d7dfd8a982d04748ee067254a52087ffb04189e05428abfe6e8f163a25541bd5f0681c660bb550ccc84865d03f6c0
 DIST curtsies-0.3.0.tar.gz 47120 BLAKE2B 51d6bf5686c275690c6b906e7eba642aebd54dccb106463a9b1733e2174fa26a30b8365a17d6cfa18244fb74693364a3aa5184a17f2460425a57fb8912d6bcaf SHA512 b1fc09a4e9aefe09b878a5c710ef86c90f93895a8ed40b40a3c13b24a2dfc1fe771ace11c20e3fed4fcdd0bed8b9615ee3c2bcf200fa34fbfb895a4a7b57b14c
+DIST curtsies-0.3.4.tar.gz 52733 BLAKE2B 5345005e1a650fbc94db29464f26c9cc615509a64f6287f3d3c9ca69b063e6adaf6af95e292c1bee3a2290abd6b98cd0dcc3a01405b4ab63ee5db4f8570b6e51 SHA512 5f65af34f6dd13491acf65311516ed90e57d99f681032ab6b4753710953f5285b012a09de6c56d28ccd5bc942c9886076f04287cddf955ba424205a5c44785b2
 EBUILD curtsies-0.3.0-r2.ebuild 685 BLAKE2B f07f481b5bb42e2fd63ea3be553a39289f57f75d325d5f96ab58904a2106f2d51f865bfcbbdb9be7cf6a810d3fcc70abff80369cb33f053eb31f1852941d6942 SHA512 b9a44eca87130792ce8388552e62275cd1cd6d1b4096a4ac79ab71795d8e7b2f2ec43831c14a654680a892a0077632f7c02aa0bc55a661ffaf37451667d57a98
+EBUILD curtsies-0.3.4.ebuild 686 BLAKE2B 30c120db37aa07b33e08e54c3a17d2ec0e8514db764624008a47a58a9dadcb94367419236f4a0b14f43bf9cf0f9cf6b4b61eff0e16b478286ff3e02e9c27045f SHA512 3120030777161f5764ba9752435dcbf1b8696c30c5cedbab6461b190d2bc9d4caecc8369549cd1bd76008138f6336eac52f93b396cd12f207ca8e832eea36ea5
 MISC metadata.xml 387 BLAKE2B bdddb5521d99066f5585c1180d4cab02d11d48f1118f2548bd0d4889d83d9c59a4fde4d018950b34c4e930c33b034439d500fe21f861ee139a8e5d997cce73a8 SHA512 c5e6232c1d85452c22de8bb1b112abe47881e3d0c4fcdda8b7e22ac7544222b63b48becaa225d40ce2a3025966474a0f9bae126f0348b1ada65c1447921dc714
diff --git a/dev-python/curtsies/curtsies-0.3.4.ebuild b/dev-python/curtsies/curtsies-0.3.4.ebuild
new file mode 100644
index 000000000000..b1c99e6f7988
--- /dev/null
+++ b/dev-python/curtsies/curtsies-0.3.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Curses-like terminal wrapper, with colored strings"
+HOMEPAGE="https://github.com/thomasballinger/curtsies"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
+	>=dev-python/wcwidth-0.1.4[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pyte[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests nose
+
+PATCHES=( "${FILESDIR}"/${P}-typing.patch )
diff --git a/dev-python/curtsies/files/curtsies-0.3.4-typing.patch b/dev-python/curtsies/files/curtsies-0.3.4-typing.patch
new file mode 100644
index 000000000000..d7488a9b4b31
--- /dev/null
+++ b/dev-python/curtsies/files/curtsies-0.3.4-typing.patch
@@ -0,0 +1,9 @@
+diff -r -U2 curtsies-0.3.4.orig/setup.py curtsies-0.3.4/setup.py
+--- curtsies-0.3.4.orig/setup.py	2020-07-16 03:17:08.000000000 +0700
++++ curtsies-0.3.4/setup.py	2020-12-01 15:39:28.331241501 +0700
+@@ -27,5 +27,4 @@
+         "blessings>=1.5",
+         "wcwidth>=0.1.4",
+-        'typing; python_version<"3.5"',
+     ],
+     tests_require=["mock", "pyte", "nose",],
diff --git a/dev-python/dataclasses/Manifest b/dev-python/dataclasses/Manifest
index ba62e49574f8..440bdb6b01c0 100644
--- a/dev-python/dataclasses/Manifest
+++ b/dev-python/dataclasses/Manifest
@@ -1,3 +1,3 @@
 DIST dataclasses-0.7.tar.gz 35690 BLAKE2B 8d3c60d1e2ad4c9ceb3c502fa74f8fdae75717e52c698984b6def96e867cae633864de711856a69992df6a207617d17d7116f5e0daa7d757076dc8b97d7e0e9b SHA512 ff921237a99bac21e091ff253824eb07eb09be7e7ec02b869da9c68c35141fc1bee526b3d2942963bac7762827438ea8fdc89fa72404991b78d1d063a3c18661
-EBUILD dataclasses-0.7.ebuild 556 BLAKE2B 1449f4c16e18f3c6d21faac4a1287f4c567a9ea9130a57650480e098e3ac7d4ca5393fc12a5a9aae3029a3e647f026136cae4dd7f22c16c16d0f7eb6dc4a6f9b SHA512 a469bd8882d370e37569545b0323f0aee81119a1babdaf8df1b4adc1fae0e444ecb32f445a02100f828c82b2370aacafd584eee02721815f36ba8490ed38ba89
+EBUILD dataclasses-0.7.ebuild 600 BLAKE2B be311e320300a648b571bbc6f29c36bc39cd6f81a0861e9b0aec9925bdffcecdae80b923f930a1e31c5c15ef65440c196efc3203ece64617e84c1abd60fed15d SHA512 46aa89d7d826a0823a0b286b2eff609d0818fbe97df9731a1aa68411c92ebc797b959d2050beb018d2b048cc90b1858dbde948ea30527dc7a155dd78964b6e9b
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/dataclasses/dataclasses-0.7.ebuild b/dev-python/dataclasses/dataclasses-0.7.ebuild
index 195170403189..41fa5a59aeea 100644
--- a/dev-python/dataclasses/dataclasses-0.7.ebuild
+++ b/dev-python/dataclasses/dataclasses-0.7.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+# this is a backport. do not add extra impls
 PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
@@ -15,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 
 src_test() {
 	cd test || die
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index bd4559616551..3d2639eae5ac 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -12,6 +12,8 @@ DIST Django-3.1.1.tar.gz 9250616 BLAKE2B 220c53873a70bb30f0ea9b48a70ba71b2de517c
 DIST Django-3.1.2.tar.gz 9387482 BLAKE2B 77e330b4b42f85ef416e90a2690c6315f2a8d30b5705f64b86f62daabe3ff60b24d9fcf8a1276e7425e5cf0e03833a5ca601d15dc3e1aa32f7b5d7a9792302da SHA512 39115e942c26c9af27c4079f590e15caa86cc5c0e012873d7be23809e39de178b2dd935919dee21bbee153bccb17463abcece1db3b1f7dfa95b7b55879488876
 DIST Django-3.1.3.checksum.txt 2429 BLAKE2B 7184da75a1da2c615c78a892c8331ff4abfec86e1ae93f8a74c836988d97ecafbbadaecffd352904c01b40a840a80f4d24e8b48f2570054a2349ef6c58bb43e3 SHA512 ecb1de139b05e697253e0b09fd15b692050be647cceb30d8f1482613d0c3393a3017460aabd7ff71ad1de2a8c70cc9276525d7a2a9285540a052805c969f55d8
 DIST Django-3.1.3.tar.gz 9253273 BLAKE2B 9284b637ea39e028ebabe44de50dacfe6a89621fcc5eea73b7f470fc998faeb361da428be8f3f3e349f25b8629b5a350f3a5b7c35ea50183b285daf63d8944a7 SHA512 0f49316dc61a299a257313c27051852e948337491047bacb2221c9c753a5cf4bafb2ed686311ad5345dd3045260331afccb013c21503891538340225a469d1ad
+DIST Django-3.1.4.checksum.txt 2466 BLAKE2B 635ddd40b542890aef29f53df0fad172e48450081f57c72042a71bb5de654b1d1f5f7ce0c588b1070a203e1d4afe3a1ed19431dd23a2a67cd510d4072c79a00f SHA512 729b771008489bbf0563002e438ef88abb2a14b2c29f307cb2db9c75450f30ac8bd4920bf0493dbec06b3640fc0d4b6817e8a054af1028ad065bd321c761a6c3
+DIST Django-3.1.4.tar.gz 9392125 BLAKE2B b583442de50c358e70a49b9ef557d43211e6faee17933a44012dbb9f0dac3ccbf0a91e01a2b8b798fff7ae05100199e9e9c94a81748b41ea13e49d12bb510617 SHA512 02cfaabb25e5f932dcbf659faba2f0afe298e4bee4f510f7adebfff181bdd13c3a0b08e8ce379bcc59326d904be8699db4ce31065d93566b93cad758365207f5
 EBUILD django-2.2.16.ebuild 2398 BLAKE2B 50de7688181404a9dac497283f011fa96e4963b4e3081531ad0adf47fc32d3878902055447d073163bd948cc349594f9a51289ee98546c957576d2a2ff8ab47c SHA512 603d21991b904244584703729896554b91f71e49e5c3220cfcc5b577e8047afbf49d6c64e273b8b44ceea0dff9d1a21dc945730d746d2eb7c163ad08aa64e193
 EBUILD django-2.2.17.ebuild 2776 BLAKE2B e02000489e63101a17bed98c0a9efe21f78b1626f547dbc83583177ad91fd901ad1b57cefc75766065c95533be5ca8a0b6d8b79b1f9d88cfd405d63f4904403f SHA512 cd03b69e7b41762d75f7424c9e65ed06ab0e2a9ba356b5136ce1fbe1adbab25147b68ad922015960de48768554c71ca0feb3545cdbc15992949df91be5ea5e6f
 EBUILD django-3.0.10-r1.ebuild 2550 BLAKE2B 89648d1fc5de29c8a7e985763c1e167f5f97599225e42675678378e64cec83a4bc842c0c8381e511cc7f9fe6e795e45c0cee2e063e18072cfddb803d072002bf SHA512 437a6688b766a5e5fe7b9f5eb8875a174cbf0e8e9dc65b73f898abafd370763f4828b2f60841d6b5ba4de1a3f150518e4d168941890004cb8a2729046623568c
@@ -19,4 +21,5 @@ EBUILD django-3.0.11.ebuild 2928 BLAKE2B 0c046c236971ffe1c3b7a11d44b498ea1881fb8
 EBUILD django-3.1.1-r1.ebuild 2557 BLAKE2B 9079e6e834e4708427a133803c2caa1496ba5151734f8ce918f35e3f68fc70e8a527e87fdda29e0772cd4abd8a8874fc284cd2aa0957ec42ee532b00927d5441 SHA512 2cd024c9b8cbba267bef2b81469a0fb4378f0cc3535043bbc3d688fe47d37ffe6d5277cbb43721de2b9d67002defce396797eb17954c36d52a3d2c979b96b05a
 EBUILD django-3.1.2-r1.ebuild 2559 BLAKE2B 4ac70317a83d02b60704f4ccab979ebbedf4c03d83aa0963eee5c9365017bccd85918b1ff9a025e6607c0d45bd81cefa3d8e53d57f40bbe3b5170b74d1d48998 SHA512 227cc4568c914ef8743433cf7a094da80fabb4de446f01ac779af8cc86725d5e5d358c69aaeab4e1a77a590a7ee69d30915a7ab15037003079ae62be064c6273
 EBUILD django-3.1.3.ebuild 2946 BLAKE2B cd3728de4bbb6d9cbd2a8087a44c17c63db16ed53cf03b5dfd48396ddd471c863ab34338bd2ed9b5c85e9d070cd12ed690607cb8dbb005bc831059090888a15b SHA512 35009a53a06693be34cdf0f020fe793297a0a63dab1fedc8d3f54acf9ffb0866523f75f9218ea450437e44d7732d6fbf3926966430245edaab0651c4ae85a741
+EBUILD django-3.1.4.ebuild 2741 BLAKE2B a162732837c1810695e69d76774684348a8f7be3a005979ee40a85c72a54c51f57708cb45293aeac699de8b46fffd7e8d7009eab02cb55b2f01617eadac05288 SHA512 74b80f16e5a1845f7d3456e7d1e5f23c15899d367c58185124e92aba0ffbdbad0d8e392b7c6e761e1e11b77cf1f25429eb279f3d26d2409acfd8d6cf7962b0a9
 MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-3.1.4.ebuild b/dev-python/django/django-3.1.4.ebuild
new file mode 100644
index 000000000000..6e2cded2dbc8
--- /dev/null
+++ b/dev-python/django/django-3.1.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/asgiref[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+	)
+	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	elog
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/dns-lexicon/Manifest b/dev-python/dns-lexicon/Manifest
index 89b526c6565b..c483731a087f 100644
--- a/dev-python/dns-lexicon/Manifest
+++ b/dev-python/dns-lexicon/Manifest
@@ -1,3 +1,3 @@
 DIST dns-lexicon-3.3.4.tar.gz 147008 BLAKE2B 14e0bbba48b8340ecb274c122363aef6490de539ea2c1ce7a4ba4ef19eaa69271ea22e28afd700dba0a1060b01211f8ac9a1081e21973f07abb9ca057638241c SHA512 274a1a4ffd1d767623723b6e9aee1e9f07022f3985cbc15f75cc410f477e1dcb7a674fa847119bdccab7332d058f77ef85771bd7bcdadbe2dd9483415a365a6d
-EBUILD dns-lexicon-3.3.4.ebuild 643 BLAKE2B 482cdfa80094a42397c3232f497d84cd9884274d880583fae02d9bf3053cee3ec3988a2c9ad6545fbe1d3ac6a9f7144c6ac48675766fd1e8b526d186b9f55a0a SHA512 589e5a6eb6b05963526e15f818e33f8948fce2ed7b13dae7aa45676ccb184db33a746082d9313e5ab08385635c5dda75bca39800c9ec878ae9fd71a1247a9bec
+EBUILD dns-lexicon-3.3.4.ebuild 625 BLAKE2B 527e1aeb36729244cc7a84ec9eaf1dd3687f1d3f09bd56850383748ef84baf9aec0dd2c91e88d688c6a3b7ce730369fe6b524e9fc76e06eb500185991b6423ec SHA512 8c867ffe6b5a9426315dec2699e9e52cba19788398db8939ea6c8ca0fb4aa7f49f65da6316ee982dd0694dde345e0ac1f40c8f0024ba39cac17431f279452f00
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
index 572094e0ff2e..46b078b018a0 100644
--- a/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
+++ b/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+PYTHON_COMPAT=( python3_{6..9} )
 
-PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
@@ -15,9 +18,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/tldextract[${PYTHON_USEDEP}]
diff --git a/dev-python/duecredit/Manifest b/dev-python/duecredit/Manifest
index 90a2bed49161..e6387de6a0a9 100644
--- a/dev-python/duecredit/Manifest
+++ b/dev-python/duecredit/Manifest
@@ -1,3 +1,3 @@
 DIST duecredit-0.7.0.tar.gz 66131 BLAKE2B 3f32c1a4e62d4650d6914f4e124907170a50d63900fbb009b870b3f9c9eace27b76500e655cb74caea0ce22cfadd62f81a84a438c1cb82092502661f1d4e0c03 SHA512 a32ead3e0710323d5ab3283a3b2d1cb03e03bf925f78fdb3b5182079851127b8b674492bd402667e57ec113d1ec05f9c3490642f8d0fba6a8f3ddfd706a052c1
-EBUILD duecredit-0.7.0.ebuild 537 BLAKE2B 01bb53735f1c8685d7783930ed654e1eb6422c3f5160fee99a37b0361178e64f263a2fbe1cbec59bb9f46010068a8e7dad0fdbe86f908c65ca1dbf61b5c49665 SHA512 a53dc1a960579476201a6ba3463b5b5eb42378e8341f4de84b37a0e8d349f2fd76e95ca9e2d62517ddf1e2ec444c44676018f12d1df12b5138d013dbab4e210d
+EBUILD duecredit-0.7.0.ebuild 573 BLAKE2B b0da60446db9923e5bab708e7ae1d391cb37fe9d3d4aa6987959bfdbce01bf45ad0aa170f24f9ddf8252c05453e77fb3c6870c471e6819d6354bbf3ceb3a2ea3 SHA512 3ef87ab8b89e585903e70f61305349545b3aca179be4fa81f12ba2b0894c14ce90fec6e1907d43b1fa9a19f7b343c074285148e523751b7baa1c12183f7a961b
 MISC metadata.xml 433 BLAKE2B a1c9500ec6e84b027e6d0f2ec09d5a3b1a51818858401099e047a68b37fae0be7ba2d0b91b0ebe6509d992aa4617cd1a61b5b07a72e0935286e669853a7ed578 SHA512 7138c51966df35d8cf946b13e66b45eeea22e9d89aa899b14523bdd1b6871b3d78e1d2c8d76c989fa27adf0d1b8b5245c7b5ff3c735ad5b0d8466deb12ee26ec
diff --git a/dev-python/duecredit/duecredit-0.7.0.ebuild b/dev-python/duecredit/duecredit-0.7.0.ebuild
index 7e4a4de6e9d5..dc34504d06e3 100644
--- a/dev-python/duecredit/duecredit-0.7.0.ebuild
+++ b/dev-python/duecredit/duecredit-0.7.0.ebuild
@@ -3,7 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
 inherit distutils-r1
 
 DESCRIPTION="Publications (and donations) tracer"
diff --git a/dev-python/extras/Manifest b/dev-python/extras/Manifest
index 06bc435ea8a2..2623759126be 100644
--- a/dev-python/extras/Manifest
+++ b/dev-python/extras/Manifest
@@ -1,3 +1,3 @@
 DIST extras-1.0.0.tar.gz 6759 BLAKE2B 341bce7f172afeb9e2a5179ab392d396920dc8ec2b9a6e734daf8668c7f329d9a64de6f3f90b70f8e42d5e111ef196315341c0bb0f347f13ba4974d970695fac SHA512 510c796628f28db90bb96c7c9ba5fc9b2b950d2968e219efe67f3899bbe7ef68fe5de1494f8fd640f13a1ccd329e7dac9cd38aa965ab1e07c4cd287c04da50fb
-EBUILD extras-1.0.0-r1.ebuild 668 BLAKE2B f7e63d21c37faa0151fe1b196d003fe5e789327ef916bbd8e29a1cf6a2546f9c6861f4208501252a45b636af8e9441de866bc382e6aea15fb4bccd343d344694 SHA512 f0582cd54c11afb623d41bf74f5109eeca9d1750ef1c9937a725e686f8cc79c066d781b5f72027c927aa778afa32b3f5f3cef56abb8afa44e1fb567fd2acc6d5
+EBUILD extras-1.0.0-r1.ebuild 679 BLAKE2B ba6c36fd06ad73c53106f8b9a7c6233f33c59caf59de24a1a86fc5f9a481183b48396333ecf97ef6ccb2666874e59c0c958a9d6a4ef683e27d5221340e670532 SHA512 fb72b90146a6a165e637b43cbae0efea934ac9e633c907567eaa387a6d612d07df02811b79d14e776bc6965796dad746776c0ba7858ffdc9b835a1f4834d77c7
 MISC metadata.xml 381 BLAKE2B c7f141d44f01d1f5163cf4f55c03f5a939f575297bfda8a6b5c59442372314cc637cd83f1f0b2fa4c21f70266bebb5645468afad0d747f8e15df689751b89545 SHA512 bd91400e2886a9f79e973f16fa5a84c6b3d38a3fab45db89bdc5f930e7bd8adff02fddbb9f8fcc72199dad32881a355b046c5cdc2c16e679a46c1bc9e08c3e02
diff --git a/dev-python/extras/extras-1.0.0-r1.ebuild b/dev-python/extras/extras-1.0.0-r1.ebuild
index e871b1cde293..110cfb6465b8 100644
--- a/dev-python/extras/extras-1.0.0-r1.ebuild
+++ b/dev-python/extras/extras-1.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index 1f337a156128..81bcd91fa08c 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1,3 +1,3 @@
 DIST fasteners-0.15.tar.gz 17898 BLAKE2B 58da6de627024f6b50d2f35caddfa126ee5d45ea89e16c5f14f7c42fa72e47ca9f98e1f46806b6f5e06401b25132e89113043806db1b13c2d0a095a09aa9aa69 SHA512 756f2ee8aa82ec6fd548d6e4320123b7c0bede834d4e58ff9031e004a8d9d0c23f7df4026ec4195799baa459720ca02d69a981a4aae54713e190a71152f2df9b
-EBUILD fasteners-0.15.ebuild 603 BLAKE2B a6ab8687f84f7309d283e85407189563e843c2539e5da1bcf675357c0a6b693f39775dc0294b80344a6f0dbe4ebfe13f153425c43777fd1f7bb84605f2ea2ae4 SHA512 7bc8f19e619e16baadc1ffadf3fb0d92d50307b8a677e452fa980d6245ffdeeeedd23098bf5da49dabec65b89534e41b0b87f71766469c16cd919ae377f9cacf
+EBUILD fasteners-0.15.ebuild 614 BLAKE2B 8aca1a40bd8724948f5418c72998fc7c1479ad3e7422cb0fab7cb23b8e1128faa33e72b9a8be5a0a7968bf3e6e82ad3dd6d79cb3ab229e62116011d107155fb9 SHA512 f1ce8e3fc7c14fe1c3aad7805ba1677a7e5e44a3663611a83caf31f4a2812758a2d197d77f12f7fa6b10f8b13ae3aa4c3031dce04b2ce36725e66411aa9d51ee
 MISC metadata.xml 509 BLAKE2B a2ecd43c854cb670cc29c9bb6e663a46d33334f3e2ff45963730712eac8eb7b9059445dc798a73f89eb2c9e66c5de1caf9b6f4193df5c0552e8176355a325e0e SHA512 f72b52a24f4693ba6d534aecf039a616be7bd5efc83dcc76c8eebaef95edd247192c784caa7b001224786071e5dd3dec59758be0717330a71c4afb7718bc68b1
diff --git a/dev-python/fasteners/fasteners-0.15.ebuild b/dev-python/fasteners/fasteners-0.15.ebuild
index 3237207f37fa..9be92e0a5829 100644
--- a/dev-python/fasteners/fasteners-0.15.ebuild
+++ b/dev-python/fasteners/fasteners-0.15.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 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	>=dev-python/monotonic-0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 162186618e6c..3d1d90846475 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -2,5 +2,5 @@ AUX flake8-3.8.3-pytest6.patch 1883 BLAKE2B bd4eb8f184636bfbc33b262df8c5612402a1
 DIST flake8-3.8.1.tar.gz 157166 BLAKE2B cc8b2dc11f78a6b9c62662086cc190a29a0a4e5a228d4823de8e2f3f327cea3e5df4db220faf9cc14fa34e3825b7d1e4fc4ccf9d1205b437903f327f3ebfa7bb SHA512 f73a306be7d8e5bc48dd9d6d8f8cdee07a90c6c38ee7bd37a21f4be23f1812e4a1e214cc75ca1a324f40e750312b5d7ed573ff49d673f9a1f33aad188b108add
 DIST flake8-3.8.3.tar.gz 162305 BLAKE2B 7211c9ff99ce2e8e3094e6a7a1917ee1b3d61902a45408b9c84f077097af8d1b0571e27209ed78409c9931ff53fdb660f81d1886773b8ef74ceb0bd3de60420c SHA512 007158ea5caf60ff84e935f1b74a5f746fba00991c8808395ff72126dc1a8c8e135badc6f1f383027349076b8f3e146e9d0af27b6e24cdf97390463fd69ad940
 EBUILD flake8-3.8.1.ebuild 1370 BLAKE2B dea3b7d66efcbb3097ac81e75cd0d76910ea424fee8017e7ae9cde2804858da1f0476a422403b00b17d476eba997afe96b393fd119d25d209ff2e43b72a337f4 SHA512 ea4e8d513f18033b12ee674a16328d41dad86590706623987c379871249b54ffb2527bca1ef0a8a5c5ff661655cef6a7cc9113573d2d4d498472de9568c1a9bf
-EBUILD flake8-3.8.3-r1.ebuild 1374 BLAKE2B a438c019c4bb40f6ab77ea264fe5ac3f25326b907e5570f1639e42c73f29dd5271df3e50113c05f5b40d7eaebf189bb1dbf8f41915e35b50d01f8f89980ea6fc SHA512 22b97188d716bc35c01f5fc67e1eea63fae685a6aee48a5873ac4e79d55018bf6cb9daabe151a27ed051f334130708597b64861eee0877386dd006c35c741907
+EBUILD flake8-3.8.3-r1.ebuild 1226 BLAKE2B 549255d94ed090a20f31068c4709ff19ccc66fd70470ad7403ba281900ea8f505edbee0ec7b2320c4b144ac8c967f48e0345e1a3dc5f6bccfb3247db4fa8bc70 SHA512 aac42be022e9423175fa2ff193349d1c05f2c85e53074017b3185d213cdc84cbcaba79e8e0fbcf2cd88edfbd56dd22cf7a9ef461c1e65e4395a3148bebc7756b
 MISC metadata.xml 398 BLAKE2B 5a71d80adb94073494d12eb93722d21593a388b4f4cb47ad8ce1e8d053f24d1597c36743e720dabbc023f9318039b45b0b1ddc22d86455394b72789ab0c5e988 SHA512 823dbd0877b3ac042e5c51f260cb0f3d3490383a4975d7bf2267898cad7e3366a693be270d2eb9c8dcea8b7f66d1e6a3343b7a4be5c1b8f0fff8ffe514952e5a
diff --git a/dev-python/flake8/flake8-3.8.3-r1.ebuild b/dev-python/flake8/flake8-3.8.3-r1.ebuild
index 55e6d64f8d8d..1bfc0de53548 100644
--- a/dev-python/flake8/flake8-3.8.3-r1.ebuild
+++ b/dev-python/flake8/flake8-3.8.3-r1.ebuild
@@ -38,10 +38,4 @@ BDEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}/${P}-pytest6.patch" )
 
 distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_test() {
-	# Otherwise some tests fail if the package isn't installed
-	distutils_install_for_testing
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
+distutils_enable_tests --install pytest
diff --git a/dev-python/flask-cors/Manifest b/dev-python/flask-cors/Manifest
index 729c63023067..af02fbc64db9 100644
--- a/dev-python/flask-cors/Manifest
+++ b/dev-python/flask-cors/Manifest
@@ -1,3 +1,5 @@
 DIST flask-cors-2.1.0.tar.gz 28038 BLAKE2B ecba951b0bac645088658ea5dc4947c0eaf9d0adb8f0f70e3a3f68337e008cb04a5efab3cb8139aaddf380f9b59c2524d33a5c5ac851b98446dadff9aa82fc92 SHA512 235162749485588e9112a52a833a43e68ad1737997628dc51cc30358d01837f427ba33872ecb1fff8e821b84c3de0a15a1c89c57f2407ef0cacafae9ca354640
+DIST flask-cors-3.0.9.tar.gz 29222 BLAKE2B 5c13218728c1741c455efedcf46af0b7e2c765e41ad256eb52413f06544d6d0d1d755ab336bc4a2a44627665b1252246073acfd201622604db825dbd7e2501ed SHA512 1b80b4dbc928e076c8c415f4514877c2e44e5b658b200178dc9a63b3342e46a7da62eba80d6703cdfd6ac74302aae2ff072531a587e7f04e5c1715d8b7592654
 EBUILD flask-cors-2.1.0.ebuild 1697 BLAKE2B c1d7d414617e548225909389fabef7f00dde243aa9918117f1f96a2241c17b734b7471f83db098f28e693bb2ad6c7b18c958c8d5dc8214ad3b80d7ef1b0b663c SHA512 1934e08be5cba963a226b4d37e237bb1e3da8d184b69a36c51e0b5430f7be39168715557e1c960650feb02e6127d72099597e10523ae4e8fe064487e141e6f7c
+EBUILD flask-cors-3.0.9.ebuild 805 BLAKE2B c1471251ec869a17ca175db36addf0f80c2d577a460bc48ae236908ce4924c6e49098c3915d55b4085300bc5f22e5ca716fb35b0b7007b9c95ecb26011118954 SHA512 af234fd526e2467e0ab5c46c0de177c8ae7c634c895c5b1f4ce4bb85a3dfb5010f58d218f76b06823b0da804b795a68d20dc112f51f113846fac0a31b88cd8b2
 MISC metadata.xml 514 BLAKE2B 255de178f7bce4d4b4678199a8edf799c2a07bd79c8c518bf28a056a2166169864c3e70315d80a09db14ac15a858cc759f5e401ac9808dc5d7d3f2b1c8495dde SHA512 d91e721a0f45e423cb947f5943d9d0615a17f84401c365584ef3eb2b157259f5bf978a10c90e690a52d49f4160c1991f9edfb26e74768686200149f50a15a443
diff --git a/dev-python/flask-cors/flask-cors-3.0.9.ebuild b/dev-python/flask-cors/flask-cors-3.0.9.ebuild
new file mode 100644
index 000000000000..08e262b9ddc4
--- /dev/null
+++ b/dev-python/flask-cors/flask-cors-3.0.9.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/wcdolphin/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/corydolphin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
+HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors/"
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="test? ( dev-python/packaging[${PYTHON_USEDEP}] )"
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
diff --git a/dev-python/fleep/Manifest b/dev-python/fleep/Manifest
index ae65eb80b47d..e745e873986a 100644
--- a/dev-python/fleep/Manifest
+++ b/dev-python/fleep/Manifest
@@ -1,4 +1,4 @@
 DIST fleep-1.0.1.tar.gz 6547 BLAKE2B 75ede77464e32404b3e1229adc9484d1d44b33323ed18f4be5275ffd1c8f63863459f46ff9cbf4f90d0e1387c0e5c967cce13ac8f6ce65710709dd227c04df89 SHA512 ba56f3a6c99f4c793e9f5c4ec04f7a96effabeadd92b18aeb7689a75d8504ccfca086db635d33e358ea9f67887e904c141e259ce2e9b9f3ea77f9e24c1b0eb27
-EBUILD fleep-1.0.1.ebuild 502 BLAKE2B 327699b975965519ac0deeaa68f49bb3bf0ac26382be8f54e340b28275395574258f44ca392b517140b739a76d842d82618dec3cdc24788f8bc11071beb8457b SHA512 396492cfc0df32ba3d55dffdf056064f03052785c3c7f597c05c13ef09a13f71dc94fa00c42d6a733297785fd95adc342c1f1b44a118c43e63a6df9028b1d9f4
-EBUILD fleep-9999.ebuild 502 BLAKE2B 327699b975965519ac0deeaa68f49bb3bf0ac26382be8f54e340b28275395574258f44ca392b517140b739a76d842d82618dec3cdc24788f8bc11071beb8457b SHA512 396492cfc0df32ba3d55dffdf056064f03052785c3c7f597c05c13ef09a13f71dc94fa00c42d6a733297785fd95adc342c1f1b44a118c43e63a6df9028b1d9f4
+EBUILD fleep-1.0.1.ebuild 502 BLAKE2B 7f0da9c6a7cbad2640fa1f1cc36ec0131b3890f6fab205c1650d84d009f2f792390b5f01dae9e841a6638304c86792372c9f794bc600efec39fcc96855b175a7 SHA512 c4c6fdc97e7bbebcebbef9d0c54f769f581f0525dbf033d937f5b9c65e0f1564a585ab3155945b2a89e287dc83149449be6485008990a70e177ec5fbd1ee8dcf
+EBUILD fleep-9999.ebuild 502 BLAKE2B 7f0da9c6a7cbad2640fa1f1cc36ec0131b3890f6fab205c1650d84d009f2f792390b5f01dae9e841a6638304c86792372c9f794bc600efec39fcc96855b175a7 SHA512 c4c6fdc97e7bbebcebbef9d0c54f769f581f0525dbf033d937f5b9c65e0f1564a585ab3155945b2a89e287dc83149449be6485008990a70e177ec5fbd1ee8dcf
 MISC metadata.xml 326 BLAKE2B 165baf53562230ca992f549f9eb81ba297244f399f1c76356ac7b1e7afc0ff979a3bf923c43ce3f85f8ef01599ff6a7a1134758e4aa3052451024bdcf748982a SHA512 47fa850b90008ba48db395a4cee9b150da6d201b829f3507d39577e4f2d3296beeabf3515557b7816bad6c23c75c8e395fc00e62dfb3e6b27dc172d94eddfbbb
diff --git a/dev-python/fleep/fleep-1.0.1.ebuild b/dev-python/fleep/fleep-1.0.1.ebuild
index 41bf60a740cd..97acb64e66ec 100644
--- a/dev-python/fleep/fleep-1.0.1.ebuild
+++ b/dev-python/fleep/fleep-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/fleep/fleep-9999.ebuild b/dev-python/fleep/fleep-9999.ebuild
index 41bf60a740cd..97acb64e66ec 100644
--- a/dev-python/fleep/fleep-9999.ebuild
+++ b/dev-python/fleep/fleep-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 751fbc86f26b..ead72a81fc13 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,3 +1,3 @@
 DIST fonttools-4.1.0.tar.gz 2253792 BLAKE2B 470207d74404851aa111142ad8541d45820ded0212029867c289f2e7741d4b41b4ac824f65555a23d4f3dcc974428537cd319a8787bc4d80f2fb67561a21d1ee SHA512 3d9485cd34b5ea3dfdcc26474e0b21a96811b84eda16341c39165aea72bb09c3cf3360a069b316ae6575a399e26f6518c199180caec7bb959f245ced7ca45e3b
-EBUILD fonttools-4.1.0.ebuild 1338 BLAKE2B 8edd03ef799bed4f83fd76d2df8a926efd2671a44ac339fb714917bfdfb44bdc92989d5b8bdb90d7be0e5720de4d2ce7e2597bcda89bff71cdbd99d363872654 SHA512 e31487f501e901aeceb1bab1db9b672cf112e79e0158065ec81a3661cdab5450345179a0563e68aa423b9ec1930a4523dd9c3383ee8b0c6730fe6e3ba59e372f
+EBUILD fonttools-4.1.0.ebuild 1349 BLAKE2B a36ee83a8282e64ae3778d135763839c3437b0e773789e58bf4d5939c709b1820072a1b55579311ee16ed475524ec463008043a22d0b57f0164e80366ad929d7 SHA512 34854c5dc101a1c5603e33383aa98921119a80c39128a57c4feff30f3f3176ded94c60ece1916b132f9668c5fc1194ebc5fe64e92f2721abbfb66607e3d16f2f
 MISC metadata.xml 447 BLAKE2B 7dcb994a336f5f5f918ab6fb2f1c3132fa888bc95c99b34995066f5d798992928234aa3d232bcca533e9741e9cd801d3ec4074859eebe5b3576938c45335b780 SHA512 efa90bcc7d9966f5b0509c3e125a6bca894e261a86a094d6538c2fbe20be54bfef4d0a55e9e7aa954bb619af9c62714f15b8f4a4a686291ccdf06351c8cab7a7
diff --git a/dev-python/fonttools/fonttools-4.1.0.ebuild b/dev-python/fonttools/fonttools-4.1.0.ebuild
index f15fbef58011..ed570808dca9 100644
--- a/dev-python/fonttools/fonttools-4.1.0.ebuild
+++ b/dev-python/fonttools/fonttools-4.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 RESTRICT="!test? ( test )"
 IUSE="test"
 
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index c50423ec12c4..a0c38071fdf2 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,6 +1,3 @@
-DIST gast-0.2.2.tar.gz 10294 BLAKE2B ad81309b1dd938a07f0cd39c21d4f89af6d902c136b8fe12afc5b26827c778f12561e06c66648a5b672b1c9d9eb79b3dfde7cad0acf8c7099451841b67c0daf4 SHA512 0be9b2b66b7815153e6f294b4db6b028c321d8a94d97c89d89b026df73e0c95dc2ee8af5c10f2eee51cbfb94af4b5a0da8a682896861870b98dec4c6c59a5dd3
 DIST gast-0.3.3.tar.gz 13760 BLAKE2B 0298ea81d3d133f8305fc6a7cf020213a75c2dbcb09c9648e533b8c2c58cf3e3f363448f905c8295bd34db0023be6dea00de0d901bffb1d55650773f7acc0135 SHA512 36869a5e0976223a5a82be8bf25a01654896f4de70affe0fec5252104ea6d1fea3eb8c5153530fcac8addc47b51535b02e3920a0e82aad11ba1ca8350cd11341
-EBUILD gast-0.2.2.ebuild 457 BLAKE2B f3bbda9a508e4807d87edcb71cb4b69ffa29ebceb6ddfe20e7302b3daffd4c64e3bb3f7d0d6aab72d0dad774eddbbda3703985295a5c59036b5c85ac3961902f SHA512 cfe70fee53cc47118c63e3436789d37144ad954ddeba13141996373b47df254ecadd531ed6e125f793f7b80b6f2efc6fddaaccb95dca6e1641b313089400622d
-EBUILD gast-0.3.3-r1.ebuild 459 BLAKE2B d7b7a5e46c65631bcb48dc61f3b1c1282afed3cefefb247d7185a6fdcbdea4402a4754893f5a51576159ed55d0e17e801dfc5f778067cddb2479a0292b9ee01d SHA512 7cac1089a9e5af3c30d471b240fbf44e79574978f48784f6ac22e1b500e4d0017a1c9e340bf6bce8d16ea974982d6b8232bf24bb513040027b41360fbfb13b91
-EBUILD gast-0.3.3.ebuild 458 BLAKE2B a2523227e20e5c3964df1f21107b3019034f41bea585ec67a3a1cbbb2e41c6610401f1647555b446abe5b18bea1e47d7b57105d1b3d8926a3bffddf9e6e8c1ff SHA512 4c4033f429bfb159b621c290c34eef7b667e163716805ea2bc928b879154dd8ad9281642ac15792f15b4f50a7efb1d267b35667aede0f68f72418f6e5b3e5507
+EBUILD gast-0.3.3-r1.ebuild 457 BLAKE2B bc80d69bb91ea33f956ceef9ddcc20ee258556f4a8751fc61acb471d164f1704622db8c10a1cef1f21d85874b7768c89a3ffe101381e5a79371409ee9eac71a5 SHA512 1ceea0475fa38aff597cf8281e15865619ed998238111a8769718470aefbc4bb0a7e9cc0eab4ab09775af53201a230d489ea7f8815f488331d75dc0ea58b22b5
 MISC metadata.xml 484 BLAKE2B d3b8be13b37bd1a2ef98b2f164c901cf21c8b73ef9b13914200c85ea26eb07dedaaca66b008dccde88dfa1bfcb733e25aac9920704625b87ce0a11a04e02b489 SHA512 5a3d09427a29d39047f396c91ad544a6cb5568f2af06216fcabc1aa12d9e4d34a71cda272d38667d8fb0114d54971626ad3de0c9d71a708cccd825ea1d7e2504
diff --git a/dev-python/gast/gast-0.2.2.ebuild b/dev-python/gast/gast-0.2.2.ebuild
deleted file mode 100644
index 3d51556cad8f..000000000000
--- a/dev-python/gast/gast-0.2.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
-HOMEPAGE="https://pypi.org/project/gast/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/gast/gast-0.3.3-r1.ebuild b/dev-python/gast/gast-0.3.3-r1.ebuild
index a2d5b861bc85..a586568d9b31 100644
--- a/dev-python/gast/gast-0.3.3-r1.ebuild
+++ b/dev-python/gast/gast-0.3.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/gast/gast-0.3.3.ebuild b/dev-python/gast/gast-0.3.3.ebuild
deleted file mode 100644
index 1a3aed50379c..000000000000
--- a/dev-python/gast/gast-0.3.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
-HOMEPAGE="https://pypi.org/project/gast/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/glance_store/Manifest b/dev-python/glance_store/Manifest
index f06bfd86cf18..85aa0024fd98 100644
--- a/dev-python/glance_store/Manifest
+++ b/dev-python/glance_store/Manifest
@@ -1,5 +1,5 @@
 DIST glance_store-1.0.1.tar.gz 185244 BLAKE2B 4841bf9db07df06fe4f0dedc9f06e6aa768118aa363946b3145c90f7d58f452c3b1f419bd3545681161481d88566922f8c3f4eb0612c77a0679729fc460d6169 SHA512 77144f41996e8fcc7b5ec3e4246305e6887082a8f62a84c73d0b546c9f635e8f43b95e45a5e3303e504c01ed3608de6358398eeffee226f640035df2f792dc8d
 DIST glance_store-2.3.0.tar.gz 212933 BLAKE2B 69f54fbb44de0e6e9608e38cf0b43ee6fb7df7758d19b6dee6f15fb00a25ce885610ef9c779d2138c08f5d3a28760121ef66edade0b23619685d5f985433247f SHA512 59499c1fa8b596faba0918219b76e5e7d51f6c7e94d14b99f28b2a9f87b456e638bd42fe33124ae9507043a975db6e5b5762e5979258db35b772f41a08d59be6
 EBUILD glance_store-1.0.1.ebuild 1650 BLAKE2B e1fa2f9adb22fd6f1ebf87fcede37ef8f88088348cb740bc21b665fd8fda0de1a4d8b9c22bdc3f264c27b0f077aed2f9c784d37f3ff77a85821fb0fe2ee5b329 SHA512 9976022de10c8f91491e61ec4d3ed3658e58d8ed53b988afab7ebf8efcd8cea1b2c5bf6c2e0f8207bb7c1d3e6810899cfd72a1261aec16f88de63fe7aa3a8d65
-EBUILD glance_store-2.3.0.ebuild 1659 BLAKE2B 2e869c3d8616a444b3becbdb560130f42e396c8d96d2cd6dac3403426b4c0203f7bde7a2d75b79d2ad40dda8b606026d63ed840071ad0c6550a96aa4f7945f09 SHA512 2761eab8823c91c2eb12d4ee0f6298acf0d4ba7b728a12e4a553ecc54f8a90922f0cd9546e81fea8d4c4e97565c0987e835d7644a58c0232ad064063850c6bc2
+EBUILD glance_store-2.3.0.ebuild 1657 BLAKE2B bda7a23b7de7f5f5a77e4a9649dadf4b310ce19cd98b03513f5bcc6272f383af6ac8d09bb62094144579f9de789b9997e83511743aa432dfd55a3aa0dff58665 SHA512 7de10ac9d197e23b527671ecce5ecbca10d29ff6f26be7a7bff1003c045a8eae6a87e7548d1574dc5046b909679026f093388b4e4d7eb571c646ac7cb28a2906
 MISC metadata.xml 756 BLAKE2B 446a0d4e98d1ceb702e5414c1f2b5b3d7dee58a853779df1aba88d917e24c5699f30b9b88a26b4e28393bb0b7f6e0e86db4fd6d63f1a9e06f9af707936f9c01a SHA512 7f2f27c0d280555cd49b177a1a983a544a40f9edf4b303c2000afbe1ddcaaf8a60dd693c0945c98bcdc15d7e1d0d0ce8a3b40183a54fa4ddc8972da796ff99c8
diff --git a/dev-python/glance_store/glance_store-2.3.0.ebuild b/dev-python/glance_store/glance_store-2.3.0.ebuild
index 36beee1e75fb..de6fca8ec603 100644
--- a/dev-python/glance_store/glance_store-2.3.0.ebuild
+++ b/dev-python/glance_store/glance_store-2.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="cinder swift vmware"
 
 DEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
index 340a0eb58f80..910d79ff0679 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -1,5 +1,7 @@
+AUX httpbin-0.7.0-brotlicffi.patch 1378 BLAKE2B b8a4ed9df72c8e031e8ee6fe02d1c8372a6114948de59ec0890e288cb2d52e5d08c4358648fdca4ee8319eebee05c4fe4dc2ed9aef36432f40bc82488b7fa7c9 SHA512 dd3538ed6373df0bf1bf648e2253fdc79737aa2abbe8780da0ad088d0438e266a4fa6e873e18a6b50fe56f9dde109f2a2755975740d990084f7b9ea1e4b2a95a
 AUX httpbin-0.7.0-optional-raven.patch 841 BLAKE2B bdf8cd94706b08d6706349ad471212fbda7f78e7125378073e4db43af352b26778706b2c61ca51f6c1c44aae4fd250432793e0ffef463102324ed39069da20bd SHA512 757bbe80463b332571e9d6e2e3266d2db3df519a180a7d3840b6f4813c2373382519e322547feb522c59ec3893d4721e42463d8231b4f5904725b9547af407bd
 AUX httpbin-0.7.0-test-werkzeug.patch 1108 BLAKE2B a7118afed382eeedcfb3e8ff9a31b31fb80c01cf97f19948f9d208d77289f829d3ef24f4cbdde74cc87d2d640b61a51994292fcdf5058f94b8768fd4c37a3cc1 SHA512 3556b921a6daed3dc561d78912b41ca9a3cea1274384f849bba1d7cd7e7014798ce5c9e93491351ca5225e26762be03c73cd0d09c60c90b8a55ff6e6ce0bf81f
 DIST httpbin-0.7.0.tar.gz 92613 BLAKE2B 59252df1d4d0ef853ec65263b472d3ba6c597336d844f9b457f2d0a009048d4222f715a7f6fb120aca00fa641d1687e302036dc151bd2fd67ba98cf5fc47a63a SHA512 82e80058b58943637e9f8191764cea79bf7a6e40f36069f9b5d3f908585dbef20a03ef070d1f865d350920b6e874a93a48a544b05c14ff4911038ec2c20f6f63
 EBUILD httpbin-0.7.0-r1.ebuild 1082 BLAKE2B 63b7219c6e200fa6e846f38d337c54838f3cb1438f89d2976332bdce5172d25b348a9b8df3391df8ff74d19696623745de99e8d73978e64e0f612f68e9c34fe5 SHA512 dc27b9cdcd2a7004e5a84b401540b2a4fdd4bf91e4bfa4dfe7a5dd5ec7d5a2841c6a3ce195d4b1117c558acb1d7c3a898a8373101bf3e058e11d1698d173aff8
+EBUILD httpbin-0.7.0-r2.ebuild 1166 BLAKE2B 9fe55948cd14b31b5a116bb56352949a351ae65b8b0deacaff379745fed562a71dd0ae7097d6883fb17ed10614862ecb51d2ac74903a4b97200933fe07370994 SHA512 8570260967a8c6bcfb5df151813bdc0f6f15c5f219b495d655430e730c30e5252b884d87b4ecb518a460a234312be7b81159fa91eaaa14eb59d38943ffd38afd
 MISC metadata.xml 525 BLAKE2B aece3687c440aa7ad57ca9190e68fc3ee5deffdd79c1c20cb04333c64846273590e3ef3f0c2c5adf8db014b2f15281353cae4b8b9dcfbacca895714cef911441 SHA512 d3d076dd201fe1c920d4b753999bb20bce792e266a5b9d035128a8718be819642acb6141640857b6d740222a839d5a995b0f3346f48c78f0276a5cdfef702bd7
diff --git a/dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch b/dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch
new file mode 100644
index 000000000000..f74474a70aa1
--- /dev/null
+++ b/dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch
@@ -0,0 +1,43 @@
+From 69d1e62e69b7f886ebbb41b8e9aae62e76adf375 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 2 Dec 2020 10:42:52 +0100
+Subject: [PATCH] Replace brotlipy with brotlicffi
+
+The brotlipy package has been renamed to brotlicffi.  Update the imports
+and dependencies accordingly.  The major advanage of the new package
+is that it no longer collides with the Python bindings provided
+by brotli itself.
+---
+ httpbin/filters.py | 2 +-
+ setup.py           | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/httpbin/filters.py b/httpbin/filters.py
+index c6268b6..4deeaaa 100644
+--- a/httpbin/filters.py
++++ b/httpbin/filters.py
+@@ -10,7 +10,7 @@ This module provides response filter decorators.
+ import gzip as gzip2
+ import zlib
+ 
+-import brotli as _brotli
++import brotlicffi as _brotli
+ 
+ from six import BytesIO
+ from decimal import Decimal
+diff --git a/setup.py b/setup.py
+index 7f9956b..8e17ef3 100644
+--- a/setup.py
++++ b/setup.py
+@@ -34,7 +34,7 @@ setup(
+     packages=find_packages(),
+     include_package_data = True, # include files listed in MANIFEST.in
+     install_requires=[
+-        'Flask', 'MarkupSafe', 'decorator', 'itsdangerous', 'six', 'brotlipy',
++        'Flask', 'MarkupSafe', 'decorator', 'itsdangerous', 'six', 'brotlicffi',
+         'raven[flask]', 'werkzeug>=0.14.1'
+     ],
+ )
+-- 
+2.29.2
+
diff --git a/dev-python/httpbin/httpbin-0.7.0-r2.ebuild b/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
new file mode 100644
index 000000000000..c498e61cfdb5
--- /dev/null
+++ b/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP Request and Response Service"
+HOMEPAGE="https://github.com/postmanlabs/httpbin
+	https://pypi.org/project/httpbin/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	dev-python/brotlicffi[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.14.1[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	# do not import raven if it's not going to be used
+	# (upstream removed it completely in git anyway)
+	"${FILESDIR}"/httpbin-0.7.0-optional-raven.patch
+	# fix tests with new versions of werkzeug
+	"${FILESDIR}"/httpbin-0.7.0-test-werkzeug.patch
+	# use brotlicffi instead of brotlipy
+	"${FILESDIR}"/httpbin-0.7.0-brotlicffi.patch
+)
+
+distutils_enable_tests unittest
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index a9694778accd..9c3be196a416 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -15,5 +15,5 @@ EBUILD hypothesis-5.41.0.ebuild 1803 BLAKE2B 04eac62c585b02bf721763309619d61eec9
 EBUILD hypothesis-5.41.1.ebuild 1803 BLAKE2B 04eac62c585b02bf721763309619d61eec9d526f332323daabe73e8a9829bbf6c2939baf751a196cae120134dfe68bde39e1567795ad5668cc718489e2a3e3f4 SHA512 0ff2d839e09d54bf1ec046f1de9cd29a13ba75d57ea6334a4aa812fba61b15e805596e92ca9a825ae482cd6528e94115bb4cc92e1a5439e691f4e23ff961f7ff
 EBUILD hypothesis-5.41.2.ebuild 1803 BLAKE2B 04eac62c585b02bf721763309619d61eec9d526f332323daabe73e8a9829bbf6c2939baf751a196cae120134dfe68bde39e1567795ad5668cc718489e2a3e3f4 SHA512 0ff2d839e09d54bf1ec046f1de9cd29a13ba75d57ea6334a4aa812fba61b15e805596e92ca9a825ae482cd6528e94115bb4cc92e1a5439e691f4e23ff961f7ff
 EBUILD hypothesis-5.41.3.ebuild 1944 BLAKE2B 72798f2e7d9f5c52c18d9f5628288deadbb2929cb81ce1ab260a6c310bb0a1f081f6f7bf057bc6c7b764ff4294d6c4b8631a352e10fa556d070f0ca1154c357c SHA512 87d5198bc9245a8d971ec781269090288b3e4a86318675fd2d28905e7f97eec43d3e493fcd1a06a1e38bff3807f776cf5b4681e1e14daf4eca862e953512d8b8
-EBUILD hypothesis-5.41.4.ebuild 1944 BLAKE2B 72798f2e7d9f5c52c18d9f5628288deadbb2929cb81ce1ab260a6c310bb0a1f081f6f7bf057bc6c7b764ff4294d6c4b8631a352e10fa556d070f0ca1154c357c SHA512 87d5198bc9245a8d971ec781269090288b3e4a86318675fd2d28905e7f97eec43d3e493fcd1a06a1e38bff3807f776cf5b4681e1e14daf4eca862e953512d8b8
+EBUILD hypothesis-5.41.4.ebuild 1862 BLAKE2B cdaa3bf24e368400cd344062972fc1713ab451303bed278b184c118e8466c3eb374477a4d0edc308e38897029fddd5e28c3b299b2083d97ecfee47ab4a24dead SHA512 23e82dd82c4c393819cc97e70e21362c7c7e456bec93c640fe0a8dd8d4f915255d213053a990a900f41d9db96d1a0df39e1824eaea7c2bd14648c35ada68bfec
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-5.41.4.ebuild b/dev-python/hypothesis/hypothesis-5.41.4.ebuild
index 30e83a217730..7cd8e4bcc527 100644
--- a/dev-python/hypothesis/hypothesis-5.41.4.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.41.4.ebuild
@@ -48,11 +48,7 @@ python_prepare() {
 }
 
 python_test() {
-	local -x PYTHONPATH="${BUILD_DIR}/install/lib"
-	esetup.py install \
-		--root="${BUILD_DIR}/install" \
-		--install-lib=lib
-
+	distutils_install_for_testing --via-root
 	pytest -vv tests/cover tests/pytest tests/quality \
 		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
 		die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 9eef194d249f..689609820232 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,9 +1,9 @@
 DIST importlib_metadata-1.7.0.tar.gz 29233 BLAKE2B a8cd97a384ab06201025fcbdc401fb25788c2eb1dd4f1697ca00e79634cbce32b984cb8a7c2aeacfb0871f92857d08f3ce9c3ae43d698df7401db91add07b6ca SHA512 31f7cda6a1149ca2040032945b19b55d2e97ef8be67db1423c2c2cbb79da3dead46338f3c9eb03b46f9202fca08ed7bf388adc25d34903ddff4b2873c8a89aba
 DIST importlib_metadata-2.0.0.tar.gz 29289 BLAKE2B 4ec24db057006affe1dee20e021a47d385770b1aa905db4ff4223d59f19b53dc85c21475875074664a84a0fb6994493735f5e098d38f938816ebc69dced7a40d SHA512 3f789d717f04f7649dd4a75895669b4f9b875671937035c1c76bd089504afff8c2ba5bfb6a91096ba29eccadc88dca98ea1da5107772fd2053541db15c52b16a
-DIST importlib_metadata-3.0.0.tar.gz 28858 BLAKE2B b1d4c7dc8a1fbbd66223c32afcbf43782b42b32ecb41d1fc7fdabb93c0c8ea3797f99c5b98fa5c0fad3b176bccbfd8716d72ed85a15f8ee8d0969c5e48a62478 SHA512 c5e8f79af1f0aaee1c768ef5640c65a76154544d7e900a11d01724e8ca30007ada80fd710e808e66f35dbc9fcf678824eebc5b92ffbc3d5a04e7f8f5aca0368a
 DIST importlib_metadata-3.1.0.tar.gz 29246 BLAKE2B 2144e10601e089e26e1d85269ed067d505de8ca86071524e038e87850420f42701b36fad5e1fe01529230333d5f23e0882f17a279bacfa39da335f3d968987dd SHA512 24d20d7658c2d15d2207d3660bd181016a16d0a2e3c86b8e86f7f95baab18f01f1a8753942d15ab648a40431bfc6db7d5109339575ef1a50802403eb580baede
+DIST importlib_metadata-3.1.1.tar.gz 32217 BLAKE2B 85155574f554146d89fedbaeffa5b5842c5c76f98d0f8488a019cded9fc7e45323b31a9cb612f81c379feb822a0e5a44f86566510c5bccaa344cbe10ef8676e9 SHA512 a0a3fc0c4cb08ba5676ae144a2176e9b2e02d122a09c1be67fe0c1e1c8304aeac4f624fa060898b20f99f67f9cfee2bdf1177d82cd12e5879edfa268e02cdce3
 EBUILD importlib_metadata-1.7.0-r2.ebuild 996 BLAKE2B 2e04af2cd739c2f896b5380dd73625c88cc76150bb8ad9ed1f73a71d253132e6afb272263dcb38383965f620e97696ec57eba41e72aed3673dd140a8e2411dd4 SHA512 1d5a62e708c34147dd3a25f77565c1ab4298ed0c0915f4c056cc7199edc854e2d86aff18dff6e5028ec3f03c03e697525d7c06470d0f68e652d3bb62e1152ad1
 EBUILD importlib_metadata-2.0.0.ebuild 1050 BLAKE2B 6657fb32eb94f02f06e5e09c75cf824278b45d8e9411da2eb5279dcc60c7a3be5018782380a44ac12e6c0421346815f0dcf2d9bfd2af38a57e5e5c842c98363f SHA512 990434854cc236cdf4eb6b44525007dd385985783d7e7387eb6c9d0dd0455c9afc152a30f51e932ad909fac3cb5e46c3b34b250705b5f86d1212255b35b6a5fa
-EBUILD importlib_metadata-3.0.0.ebuild 1005 BLAKE2B fb89a4c5ad0415927835120e6c7e5148f8bba72a4048f5190d00669c58f11309a0a2ed053bf4503a47bbf1d46cfea6cf5181f34f7304a475a0066e131d9bdbcb SHA512 7af82a4d41487d952ba44483db56e6e3e3693fa63c7f7f01fbf543999b7b86c496d845b467d82fcb1885d8350e0fded115c8864b8164d180eef6ad7326f877fe
 EBUILD importlib_metadata-3.1.0.ebuild 1016 BLAKE2B 59cf223d538c76d04291195d5c6af921dcce936eb936a168114ef20df8db04cd84eb2adf5e743d0d57d8095b87bc9e1e6fa4e1ef5acad670ec27e017a81880cd SHA512 7dbbd757b1c9ef77646cf095b4b42c03b1d397dea0cb74216b381c03870f9de536b529e8513d41b68def070ded09704530f20feef00724ef875a7c351362e9d7
+EBUILD importlib_metadata-3.1.1.ebuild 1044 BLAKE2B 455410110f0f1e17d7df2cdbb64364b625d3b4140733f33be55d77deb16c0e2c21a4e816924b603bfa87c76c5294954e2996e252f31f04f5a311326f58c26dc5 SHA512 001f3af3e0133c3149755e482322cc5c91bfb74f578adfd165273926b94f22747c217e8e75ea4cae87918c6ba09bd4c11d236e722b1cb552823c301f2700163d
 MISC metadata.xml 645 BLAKE2B e0d506f3cb5304b3cb14bd546c997978bfa70d77b16abd318c8e733ae90057b4dae2533107c3157a53df21b9f3046be0317c62367b3de26cfb245f4bf572ae85 SHA512 054fdafb3815ca9fb34178219c48ce5779f2ac8a700112d470fbf3bfdf780a6d98e0f30b6b0c7d6bc48cb12bda304dac01eacfa45d06964da704457311402679
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.0.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.1.1.ebuild
similarity index 89%
rename from dev-python/importlib_metadata/importlib_metadata-3.0.0.ebuild
rename to dev-python/importlib_metadata/importlib_metadata-3.1.1.ebuild
index a04ab9b239dd..2b7899349c9c 100644
--- a/dev-python/importlib_metadata/importlib_metadata-3.0.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="dev-python/zipp[${PYTHON_USEDEP}]"
 BDEPEND="
@@ -26,7 +26,7 @@ BDEPEND="
 	)
 "
 
-distutils_enable_sphinx docs dev-python/rst-linker
+distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
 distutils_enable_tests unittest
 
 python_prepare_all() {
diff --git a/dev-python/itypes/Manifest b/dev-python/itypes/Manifest
index 2e304067ab1f..fa8bc2f86e35 100644
--- a/dev-python/itypes/Manifest
+++ b/dev-python/itypes/Manifest
@@ -1,3 +1,3 @@
 DIST itypes-1.1.0.tar.gz 2188 BLAKE2B 5b24790944b130530d4bb3f0ee266c897ebf7946a37133535622f823cc66bd2d2aba838170769b326d706fb123ccd1f4ed7aea8e877b9fe0a9d19692e0c9e0e2 SHA512 fbaf82a82e0685f54eb98bdea722cf9fa230881d1940e2a74306972eb9f99958cb0cc62b858c340b649e092262793b83dcf76d11d36d04755ecf05e7a2c77d81
-EBUILD itypes-1.1.0.ebuild 423 BLAKE2B 75f52c4b1ea7eb167af4d04ae4eca6a1c25569018b791d4dbae54661a06b8ef3453567c4212cdae19bd86b4db5cbe71f24ec7c4f47488b8dce9f259d3b7fc863 SHA512 55d17e54537ce87bb0a75c56bcdc8739dcf3c3def62a5d9467cda344975d3d22f12196d3039de535e171d47681b1097cb285e35ec03a9d2fb66a30283208f4b9
+EBUILD itypes-1.1.0.ebuild 419 BLAKE2B 68d4afd7fb1abe48be428cacfe242a4fe3fce365a47fdb68c92191ba7ea8dfb0854116929e1c88ad2e342f69596c4c1e8f430652f7d28ac796558b82b4de1ff8 SHA512 b77011c8ab0220224aa0898b45a4272332508e198ed8fbca34a8e96ac931e75c52febf587567c6556f12a9e52e9bfbdbebd93ebae9c70e0900f538ed70a1549e
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/itypes/itypes-1.1.0.ebuild b/dev-python/itypes/itypes-1.1.0.ebuild
index 76e5dd50b66a..49a1f431da60 100644
--- a/dev-python/itypes/itypes-1.1.0.ebuild
+++ b/dev-python/itypes/itypes-1.1.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="basic immutable container types for python"
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index 79011caea80c..048e06f821f4 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,3 +1,5 @@
 DIST josepy-1.4.0.tar.gz 54174 BLAKE2B 67117e7399422d0cfe2c47f9e5ed11a3b93617e673cf9ab1344334f7f11f0c884f45202e8e5e65ebacc00f527becfdbdda9ea246b8e96ba15e516bfc2fb33ba9 SHA512 a5038a4bb42c5a55d665a551743a976b209c24d8aa368d2b6acf0957e953bd4044d9dc41bf9d460283f44c14b7dd7ce2a860563fe107663d4a4deba0c7834e40
+DIST josepy-1.5.0.tar.gz 53979 BLAKE2B e08b3d7a9ce5b123ec8731de27bff63638e68a052f2e6c8715c77f6e4ea644eae1c8200d6d2135853f27eb8caa2e24a04cfc563bfbd01884eb247fcdcc4c9d4c SHA512 39ace649ae4fcefee3eb7fa749001645711de39dc17fd47f1ebf52981929e21bee9b6316d09c61b5478d3d652afc0659e7d5110d1e222e8dcbdc2bb831cb2d8d
 EBUILD josepy-1.4.0.ebuild 803 BLAKE2B 6b676ed68e693c54940d95df787de0c7c2159b71d303032aca5fcf1c97d1721183ca5538fa9cc2dc407c409608e38e9d8a9bbf9fcf33fdcc8e2e70fb543be36a SHA512 b532c2ef85e85b7bb05f5626c5ab2f7118d3d1c45037bc4e621cfcf0110e2af839c0a886206485762ecd451dacc729d3c3c93e4a657a4e230e36c1824cebeb30
+EBUILD josepy-1.5.0.ebuild 805 BLAKE2B 33a425040e9da1de093813064ca138ec2ee650dcf7719c24e29b191c74fe475d84ea7b14ca95bbdad8894bf3d71e411242ee2532b4943188f1608281408d83ea SHA512 06dc270383dbda9fe3062f7022c0d561a8e0c30bc48f9091c14932bba383d6600b47f3d5d8f4e5de879a62f505e174fd6a4bc6cda23f3afad1ceb4f030b51a5b
 MISC metadata.xml 719 BLAKE2B 658dee515235de05c2e9bb0f806feac685ca20ac9950982503eee109cc110ab84c2959542c2425803e38d5925eb95bb04c53daf21f6d8aac478a7f76fdef92fb SHA512 8fd99401c198b6a0a5d440d90daf80e085e16bd7d0872b1794338bdbe23ee31893346486e57d6c6ebbc892c7d9ff4351d9254d54726bec5cecf5510468a6df99
diff --git a/dev-python/josepy/josepy-1.5.0.ebuild b/dev-python/josepy/josepy-1.5.0.ebuild
new file mode 100644
index 000000000000..5acbb31edeab
--- /dev/null
+++ b/dev-python/josepy/josepy-1.5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="JOSE protocol implementation in Python"
+HOMEPAGE="https://github.com/certbot/josepy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Remove coverage/flake8 options
+	sed -i '/^addopts =/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index ed2ce3dc8721..41510e7e0ca3 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -1,5 +1,7 @@
 DIST jsonpatch-1.26.tar.gz 24440 BLAKE2B 345831bd9a9fc1902d0959685ed2dbbc0bf04d191bbc78567d27283e9ae52f7e22f50e9f400461300d1c3388712afa51d4d6a2ddd0a06dbc0a1b576b02bfe807 SHA512 1ab25c8e091cd0b772062a8c448fee4772081d8bd715489b2f7a76e4c0bdff8b26dd38b26c3037cf9bdf8780b97e62a20b6a5bdc43f43af16fdae51d1291bf52
 DIST jsonpatch-1.27.tar.gz 26599 BLAKE2B b3481b4dd01d4fc6c2ad129141fb2b72d53d04744da54c1e4c989b2869113c15862d1ec5c84390758ad495ac36a9156f0e7b730ad091f96f6cb42fe96dde7fcd SHA512 297ca02d114e6b199bd516f69dca147fbe309f0a1b031046859271720645322607236f97b489c242575f7e1ad3cab0c68b1b7f11894c5af82be24013e376c0a4
+DIST jsonpatch-1.28.tar.gz 26829 BLAKE2B 1dee89500be23c49e5d7fdcaacb05da7ea089b691e133c5187c9558d378ae3714ad7fc6f164d0b7eea7b3cf1afefa39b7748a4637b0456051fab086e0e8f15d0 SHA512 2884cb95307cb607c8cd80e688491b4449f953e43e5b232d4d57d7249c590652ecae0856806ade6bf2807a04180e992fd2cdf61590ac058d573d653382bf7a28
 EBUILD jsonpatch-1.26.ebuild 841 BLAKE2B 5568878443867eeb529b3c513dfb9d31c924588ada8af0f5430e9fb25b6b3253ce69e82d81695fa98ab0bb7caaf99e9df1246520d34ee9f7c294974f64df349a SHA512 780d8d1a2e30a13df1c792a4b2cea0f970e8d3ab26e8692f8a2d1a0fcc8bd484472c10346b7d61c7cb3dec825615dee5cc478bd68e0fcbea9d7f5de90e0f58f7
 EBUILD jsonpatch-1.27.ebuild 845 BLAKE2B 10f66c19b9c2bf4c0bd578a05d1489fef2f1cc9d6e3d4d79cc9cc6106697026a842e5c6f0c2cbc98f398415763c135bfcbf5ad6d05bde0c7eb7a20f89a0013b9 SHA512 1bd8aa5beee9ed0da82d288c8c28d1a9700299825dae5160eed09b05b6f48eda41cc6382391d993152df62b40fe072742c80e198253f5f360aff30d846c281bd
+EBUILD jsonpatch-1.28.ebuild 845 BLAKE2B 10f66c19b9c2bf4c0bd578a05d1489fef2f1cc9d6e3d4d79cc9cc6106697026a842e5c6f0c2cbc98f398415763c135bfcbf5ad6d05bde0c7eb7a20f89a0013b9 SHA512 1bd8aa5beee9ed0da82d288c8c28d1a9700299825dae5160eed09b05b6f48eda41cc6382391d993152df62b40fe072742c80e198253f5f360aff30d846c281bd
 MISC metadata.xml 704 BLAKE2B 774410010ca5fff3237e4864e88e19fc80bf705a166d2d278763a047cc37d2b7cef314e3c96185a42a97d32693ccd27403b990ee59acc2c30be6a8cb22ecae48 SHA512 2e2dcc4a81bae9412ffa008ed17010d1a06505a9f6be59a3c45dbc0e6b9f25f627f25f3c7ec64753e39e10e56c62ad0bb2b28c648e677ce14179678793f036e8
diff --git a/dev-python/jsonpatch/jsonpatch-1.28.ebuild b/dev-python/jsonpatch/jsonpatch-1.28.ebuild
new file mode 100644
index 000000000000..7b86861b301e
--- /dev/null
+++ b/dev-python/jsonpatch/jsonpatch-1.28.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04"
+HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
+SRC_URI="https://github.com/stefankoegl/python-json-patch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/python-json-patch-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( ${RDEPEND} )
+"
+
+python_test() {
+	"${EPYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
+	"${EPYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
+}
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index c82cfe1d2034..1b43d0178afa 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,5 +1,3 @@
-DIST kombu-4.6.8.tar.gz 406196 BLAKE2B 43ddb45e7e6a5bc1aff55867a816ebf7a1afed68bd41d9d74b6179a45d951ac4a4f0f687bbaebd23cf81b67fe2b81d47498b3e25eead0822e16d9acbb436338a SHA512 65b4ebb283ae380388de5d9f8fdc1ec0f41a9910744906b23eb150bc62ecb55ae6d65bb96ad31d8a033f26c2a8dc386939fced393866b6467e77a9760dfa17cc
 DIST kombu-5.0.1.tar.gz 404428 BLAKE2B 89d4c2daf70c3dcd0a990c8f045074780f2d4f13f39899c0ab3b73b473948469746cf8872aaa8565f5c4b071bf18ff510cd565e8f9b6a3735a0bf1d0af55e9b6 SHA512 aa5d35b7753f5ec8d95512c322fabf0163628b9afbd228faa2be910a1cd4ea3236a7e43485e17650e1aa9aebae59a91a2b0bdc1950e4e4c622b499a4ae29ea0e
-EBUILD kombu-4.6.8.ebuild 2368 BLAKE2B 8626497de01426d473a5784a31515b4b3be59c406aa5d7b2b6490de2b4bd8f2404c2a6b1b63c4f1c679e9d70e62268b7ed4cf71083d20ee73674fffe1a320534 SHA512 9a6918db2a8805061f5b7469258ba528135da5a5c009c04978bfc75a76d689c5f2fd8c006db6ed14518ff95d9bed598746511cd18aa89b5fbe8e161c83a3c94b
-EBUILD kombu-5.0.1.ebuild 2413 BLAKE2B fe70b4d51580e42a6cd54a11632e005acc03337c3e68d67ecb7f172b838193f93fff2112704163b7aa99653e9364ae3a31c065c185e7c38d42b67eebf0535dc0 SHA512 dffd5c990013ff739812a09c706df439d6cfaeb212d6fc581cf593a2eb9a0dd02bc6ef381ec013fa0a377f8a32c840ece00012d9a7c30363611f53c3d81f0c4e
+EBUILD kombu-5.0.1.ebuild 2411 BLAKE2B fd75c9569d0122d2e7be230ca114a5fd8cdf00a17723062f6512ff69182d9d2aa2422110ec90c6950dd58921901c8cacdd922ca15f0600a914e9b55af6bf0203 SHA512 7ae55e46441cbb05c983b897ede2c2ba6edf7ac9ebb89af07b6dd305679f7833b520ec20af1872e1efb139187ece41bf38bda2f3879600846fbf71b083b7947e
 MISC metadata.xml 699 BLAKE2B 895ddd1afe0b826cb3ae4e279b2bd12eabeac29c68104aa4b819b412a66bbad8fc0da49dcf8aadb779573247094f8a6ea60a18c967b6385515cc2fd6420a3622 SHA512 3d1f92614be2f17ef5188d0d987d17721db7af60d27cd9901ddc8adc96c0b7523afa26210e36789bc8a9096994be7cebd7df72f624610f11b45cf4aea6e56cc7
diff --git a/dev-python/kombu/kombu-4.6.8.ebuild b/dev-python/kombu/kombu-4.6.8.ebuild
deleted file mode 100644
index 3fb47be86b10..000000000000
--- a/dev-python/kombu/kombu-4.6.8.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="https://pypi.org/project/kombu/ https://github.com/celery/kombu"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc examples mongodb msgpack redis sqs test yaml"
-RESTRICT="!test? ( test )"
-
-# zookeeper backend support possible via dev-python/kazoo
-RDEPEND="
-	>=dev-python/importlib_metadata-0.18[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-2.5.2[${PYTHON_USEDEP}]
-	<dev-python/py-amqp-2.6[${PYTHON_USEDEP}]
-	>=dev-python/pyro-4.76:4[${PYTHON_USEDEP}]
-	sqs? ( >=dev-python/boto3-1.4.4[${PYTHON_USEDEP}] )
-	msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )
-	mongodb? ( >=dev-python/pymongo-3.3.0[${PYTHON_USEDEP}] )
-	redis? ( >=dev-python/redis-py-3.3.11[${PYTHON_USEDEP}] )
-	yaml? ( >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )"
-# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-20.6.7[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}] )
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/sphinx_celery-1.1[${PYTHON_USEDEP}] )"
-
-# kazoo is optional for tests.
-# Refrain for now, no established demand for it from users
-
-# Req'd for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	# AttributeError: test_Etcd instance has no attribute 'patch'
-	rm t/unit/transport/test_etcd.py || die
-	# allow use of new (renamed) msgpack
-	sed -i '/msgpack/d' requirements/extras/msgpack.txt || die
-	# pytest-sugar is not packaged
-	sed -i '/pytest-sugar/d' requirements/test.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# Doc build misses and skips only content re librabbitmq which is not in portage
-	if use doc; then
-		emake -C docs html
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/kombu/kombu-5.0.1.ebuild b/dev-python/kombu/kombu-5.0.1.ebuild
index 60d86b72d311..25a13582c429 100644
--- a/dev-python/kombu/kombu-5.0.1.ebuild
+++ b/dev-python/kombu/kombu-5.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc examples mongodb msgpack redis sqs test yaml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index e2081488e19a..28e27b8ddf01 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -1,3 +1,5 @@
 DIST llvmlite-0.34.0.gh.tar.gz 210438 BLAKE2B 832ec28047a51b2874a0de5885445b9d77942a70f86620dfb0b25ff0b17395b6009d31d5e9f27ddf02c19ae97bd5b325fc49227fdc0499a9f5fa3bde44e6b564 SHA512 5540df4ebad835e294c00cc09ab1230a530566f563f751f890752f6e22f7b2a04aedcbb53dbbb8e323198d05c80bc9699b593d919eaf1af60fa6f94ff6f50bb1
+DIST llvmlite-0.35.0.gh.tar.gz 228089 BLAKE2B 5cee01244552cfc1c2ba979709170484ed253f52c5c47a4a254bf7d26c935ff0d2a858b7a7f4ec7719644495383128adab11a1287849cd426b7997da4a59efeb SHA512 345b6321277749a169cd87e152261ef499edbf18d18ef7085017c111f2892eac0241529cfae9c6eaaeb68cdb4d726965ed03b4d5a836501dcbdaa73d3c0796fd
 EBUILD llvmlite-0.34.0.ebuild 1354 BLAKE2B 0479672c088a56c7f27bb2a7cd615448d456f5db3e042ce608ec1f12dc69b4fbcb95db79efc8783c9333d6e52672ba7abecfc3b68accc5bd15618003206fb660 SHA512 97248a6a08962e07dd5dce71bf52eb75c76630d634d9e423ed02b1bd6dc178b24bd38fc5f1436edb563a9475555218f39cb84bf086ec82457e5403c6714903b6
+EBUILD llvmlite-0.35.0.ebuild 1358 BLAKE2B 30c83734202847c4e5da441445bac1c17928d011c87eee2d966d42b924d853529d2cc94f260a955d4a4570944f9e437c785ec1e8c8832c656567fdeb90d7275d SHA512 8775329a09c3ac903be72b4d3e329ab2971eda6596687231a096e0942daff6c78d15d66a68b8334a5fe5f647ef67d6ef4e7aec69efba466f61a53a4f8bf63170
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/llvmlite-0.35.0.ebuild b/dev-python/llvmlite/llvmlite-0.35.0.ebuild
new file mode 100644
index 000000000000..3fa3c11d9cb7
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.35.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 llvm
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="https://llvmlite.pydata.org/"
+SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.gh.tar.gz"
+S=${WORKDIR}/${P/_/}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+LLVM_MAX_SLOT=10
+
+RDEPEND="
+	sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-libs/zlib:0=
+"
+DEPEND="${RDEPEND}"
+
+python_configure_all() {
+	# upstream's build system is just horrible, and they ignored the PR
+	# fixing it, so let's build the shared lib properly using implicit
+	# make rules
+
+	export LDLIBS=$(llvm-config --libs all)
+	export CXXFLAGS="$(llvm-config --cxxflags) -fPIC ${CXXFLAGS}"
+	export LDFLAGS="$(llvm-config --ldflags) ${LDFLAGS}"
+
+	local files=( ffi/*.cpp )
+	emake -f - <<EOF
+ffi/libllvmlite.so: ${files[*]/.cpp/.o}
+	\$(CXX) -shared \$(CXXFLAGS) \$(LDFLAGS) -o \$@ \$^ \$(LDLIBS)
+EOF
+
+	export LLVMLITE_SKIP_LLVM_VERSION_CHECK=1
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 5c6956fbcfd9..8afea1d43032 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -2,5 +2,5 @@ AUX lxml-4.6.0-tests-pypy.patch 17417 BLAKE2B fb4c8452f1401c5d617ebbb3a944772c4d
 DIST lxml-4.6.1.tar.gz 946461 BLAKE2B b1ea8e15af1130b9f9683614bbc2480ec5008ad697f70536a332c1faf4bda4aa9525b2ef5d82d32c415c91e47ab54c7b3cb644e9a2933517946c3fc8ab7ec7c5 SHA512 3cc917e7535ac1be3db8939f72846313267c8b1f0adccc92a2155a160ed7299d0def718bdae1379e42398ca1b959b1130505597febca00f02cb87c8666f1f1c3
 DIST lxml-4.6.2.tar.gz 948652 BLAKE2B df6ec7e183df48c0edc6cce0fbdd6ab78eb8d1b7e8fb81a76bd9f4a24f05923c757d5b21f508be9be50c7bb187927c4e3a66146d480f2d40efc05388d26d3bf5 SHA512 81dcf5cade7b05c0e831beae7cdfbdb21e876fa55b23da98b89cbfa7960a4737efc13346ea3ade22a2448f20e036173cf5e32d43df6656c3231bfba07981f9ed
 EBUILD lxml-4.6.1.ebuild 2237 BLAKE2B fb05a57bbe17e7fa4f6f0e0aeb666ceadf4cbc3654ef331f3548cc5916900a3692d3eb748a0284ab053d91e6691a568d703b96c9a446b035413d617b9bc6608a SHA512 5bb200f0e1759dd660fe9fed714add77fef4c883eb804f40b0fd623f3c2de5d394b0dded79f39a78f5942872a1168cceda43690635cd764317eda196deec8fb6
-EBUILD lxml-4.6.2.ebuild 2240 BLAKE2B 645bc7fb20df3d9aacf01b19f47b1439cf267598aadd863eeb482fec180889a50e49d527bfa3270d94e1b0b9f5460a2d3d984eee6b0ca24914ff182900f0dc40 SHA512 3f13479c4d004431540354cce7b6f1cc23982b6b130f0d21a22fdc4ca312ceee0fdecbb00054b7a447017d2f7d715d459abe27159854533889c6ded7b73d573d
+EBUILD lxml-4.6.2.ebuild 2238 BLAKE2B ce9cb5cefac6fbd5d9134dbb0feba1df75c073d5a11f75a13350c5b69fa3e08bb887140dff16d2cda06bfb236953e3b571edd353410b9e71f08ebf56dff748db SHA512 11e9d14e9ce917bc64112025dd0a595cbc21a252cea4b89dba919267170456c58f3fa256cff986e76c870d98e232a386615424d63ced1441b95bca8b225c15cf
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/lxml-4.6.2.ebuild b/dev-python/lxml/lxml-4.6.2.ebuild
index 6e8b07cf7538..486b81aac0c1 100644
--- a/dev-python/lxml/lxml-4.6.2.ebuild
+++ b/dev-python/lxml/lxml-4.6.2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mediafile/Manifest b/dev-python/mediafile/Manifest
index 53efff1ee4ce..a4fff88bec85 100644
--- a/dev-python/mediafile/Manifest
+++ b/dev-python/mediafile/Manifest
@@ -1,3 +1,4 @@
-DIST mediafile-0.2.0.tar.gz 509689 BLAKE2B f79da210a74d55c4709b6fbf08a0675f445001ec49d042fc4a1101def07068bebccb155e770c5cbe8d051d7f101a213e9fcefbcb9590a650de99cfde837a965c SHA512 0fa79f77e0ac9a021b569e78f0edbe8cc63308ad8c89526d8e15dee455a284cb90d29b51aa476287e306717315c3cff290634fc6e4ac0b1726163dd922ee3b0d
-EBUILD mediafile-0.2.0.ebuild 981 BLAKE2B 8ff43c3b8a6ca86eb34b567f8fd06760c5c10ee6189c7f35b7625569ee25e30f41cc5d80bb399e1275172762b579869ff59af6676189cce04256fd09b478ddc7 SHA512 ed45b8af622a2744e3baa9f048eae6c3cf8de732097ca133cef00dd8bf40a4a93f4ee1d1a1bcc6cbe27235009b95ef493616ef6b07709cd82e8548b72a25c2cb
+AUX mediafile-0.6.0-wavpacktest-fix.patch 391 BLAKE2B 6ef2b9f82cdb7c261c5c56d86f6087402799ef4fdc0fa8f58c8309de43e9f2b76b8883507b979d5fa7559b16eb3cf32496d0f1a4136ce2ffa9a30fd8aefea4a8 SHA512 76b1600a96d8f2b43cd140b067c12a6846cd8ca83827d5ba2a922fde6412cf4189a0848ec3bbdb14cb94e3f6a73936e17bcaf9b5e95c1f494209391344987e3f
+DIST mediafile-0.6.0.tar.gz 509351 BLAKE2B 5b8d97be6bd7becd44053d2d1b855252161779d5a01e8fea29443db0b3f524ba3b58dfa372b48451da76672ea5fdb521cd8a2a5c6c110d37e637dcfefbc0842b SHA512 7fd7d8a1d53311c22835041c39413d9dc7e1b4d8afc94a8c578aa4de7f65361f6c998062bb1b2804cae1f672c6b8e7c109fcc3e459e2266b8f19a0bde8673945
+EBUILD mediafile-0.6.0.ebuild 1080 BLAKE2B 4b6ca786140042b80a5231a0017292d0072afdee6936e90d0fa37a4bc9429316d99daf746623c17275c1762e5a1934f95f42d33258f67bbd328f81181f6ab837 SHA512 b005e0d0ed3d5df47c31aa7cd1697e2775c3824ea3f42a930af1655b88401b8d7a8450d77d6b320cef706f6e348b32f655300c7326d880b993af0fc322abac4a
 MISC metadata.xml 535 BLAKE2B 8972f54007dfdf2efb711cdb2239d4bd932e55604781e10d63d128097b3708ef0c642460b0ab77c0917acd7177074e60e8cbff0c29274139fcfde1747ce16359 SHA512 d3ef291f2ec776e1b231a7e253fe890ede924f42b2428b21708774b349365ff2718aa4ca3e3acde61d2982f14368377cd359842bbc110da320e1ddde360b2dab
diff --git a/dev-python/mediafile/files/mediafile-0.6.0-wavpacktest-fix.patch b/dev-python/mediafile/files/mediafile-0.6.0-wavpacktest-fix.patch
new file mode 100644
index 000000000000..e1427b1eb914
--- /dev/null
+++ b/dev-python/mediafile/files/mediafile-0.6.0-wavpacktest-fix.patch
@@ -0,0 +1,12 @@
+https://github.com/beetbox/mediafile/commit/d2fc3b59f77c515b02dfe7ad936f89264375d2b4
+--- a/test/test_mediafile.py
++++ b/test/test_mediafile.py
+@@ -907,7 +907,7 @@ class WavpackTest(ReadWriteTestBase, unittest.TestCase):
+         'bitrate': 109312,
+         'format': u'WavPack',
+         'samplerate': 44100,
+-        'bitdepth': 0,
++        'bitdepth': 16,
+         'channels': 1,
+     }
+ 
diff --git a/dev-python/mediafile/mediafile-0.2.0.ebuild b/dev-python/mediafile/mediafile-0.6.0.ebuild
similarity index 87%
rename from dev-python/mediafile/mediafile-0.2.0.ebuild
rename to dev-python/mediafile/mediafile-0.6.0.ebuild
index d7bb592f915a..a3cd7fdc59e9 100644
--- a/dev-python/mediafile/mediafile-0.2.0.ebuild
+++ b/dev-python/mediafile/mediafile-0.6.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 inherit distutils-r1
 
 DESCRIPTION="Read and write audio files' tags in Python"
@@ -27,6 +28,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-wavpacktest-fix.patch"
+)
+
 python_compile_all() {
 	if use doc; then
 		emake -C docs html
diff --git a/dev-python/neutron-lib/Manifest b/dev-python/neutron-lib/Manifest
index 4f5c92e46212..6647d222723c 100644
--- a/dev-python/neutron-lib/Manifest
+++ b/dev-python/neutron-lib/Manifest
@@ -1,5 +1,3 @@
-DIST neutron-lib-2.3.0.tar.gz 444674 BLAKE2B f572c58f21034522ff0d30ebabadb19aa291ddb257757bcc25fbec24d46206ea9b44d36d547f454b43bc1fe611be4046fd186837e64b8cc54d681f301bc6494d SHA512 c2b0b36474d0a83c3720639b107100292dd65ad80986848b4c7a9e4304832ecae2342e451bcec68e21232901259d7b7d2a3a6f1b232d70014d262e6c7b594a80
 DIST neutron-lib-2.6.1.tar.gz 453572 BLAKE2B 6b79394a91cb7e6efcf66c0c8bab3b722de9a5408182472fa9dfe26b4a6c630889fc9aae0f7f0bab4917eaa830cdb230788d9a3520b4b8a526dbdbb361e0379b SHA512 d2da2b0d73cb5accda8219ced9fb68344a2c75d98a0d33cf5d52e703a8ea0afb3c6bb0a85445e453b512918f1c3fe7b97fa1a587a648e6731205b421c05319b0
-EBUILD neutron-lib-2.3.0.ebuild 1938 BLAKE2B 783d99d9a8b53a142e7bf0f148e69248d5f5c8c048199fcaef308c911fb89b1d341c6921378d45b312ce8cdffbd064e66e68321079cce4a4a39547862982e330 SHA512 1af9fb0f697a07658cdae45082a31dcbbd087e389c6e4c8a5d328a283d70dfbd98aa3781d6a3de554ce45b5cc0da816ece80b2a869bfd56919a4c65fbeb224ac
-EBUILD neutron-lib-2.6.1.ebuild 1973 BLAKE2B 68d9e6e6dd923050c6374a41a4f1c16988ee5ccb5ce0b6896154fba1e64f83ad113813360c4dc0066053c292517bf25740b661b0122252748a34fbc0db8840a6 SHA512 4378ddb8093302d3c056be10968109ffefcea4d8f9f10af6add6fcf64cb5f832933689bebb5d13e44f1ecbe1cd54b53b1668f77caa04c36cfd4cfa4c035f5329
+EBUILD neutron-lib-2.6.1.ebuild 1971 BLAKE2B 1ed9006a4a65790bb41b0f3502b0b8a2162c80dccaf07c00e02ae0b2cfd25e5e5c10c653b0f976853a4bb23eef6c5af37481805eee1b4d0be39b9e9d3f4225e4 SHA512 ea512f2e59a0c714b7924109b14cf845edb245e0e43ceb0a0308aeb0512dd409582baee692d739b3c0097c043437c21debedf83ecacbe77c1f696d846ca91ce1
 MISC metadata.xml 413 BLAKE2B 658517cb94e25afd7f2c548c4510272b3b34c6bd288fb2c210556b905160227b17fcbe1e5a6f0c0fa90ed33a4f709d7c0c55f16462880e6d9806f181845df056 SHA512 d04274afc2cfc3ef4ea7cc385eb5e6c5f3b4b06f42d66be6c6f11b8d64f992486a3f47c40c568c86ffe367e2a122b4416e0df676971af43e4e57f4b84e556bdd
diff --git a/dev-python/neutron-lib/neutron-lib-2.3.0.ebuild b/dev-python/neutron-lib/neutron-lib-2.3.0.ebuild
deleted file mode 100644
index c043b621eb46..000000000000
--- a/dev-python/neutron-lib/neutron-lib-2.3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Neutron shared routines and utilities."
-HOMEPAGE="https://github.com/openstack/neutron-lib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.2[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.4[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.37.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/neutron-lib/neutron-lib-2.6.1.ebuild b/dev-python/neutron-lib/neutron-lib-2.6.1.ebuild
index b8db7801b5e4..5b7271263894 100644
--- a/dev-python/neutron-lib/neutron-lib-2.6.1.ebuild
+++ b/dev-python/neutron-lib/neutron-lib-2.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nose2/Manifest b/dev-python/nose2/Manifest
index 185d483aac7f..271abcc985db 100644
--- a/dev-python/nose2/Manifest
+++ b/dev-python/nose2/Manifest
@@ -1,3 +1,5 @@
 DIST nose2-0.9.1.tar.gz 152411 BLAKE2B 39f2d992e5cab4b9e5cd4401ea9285884eeeac7d2e126b5aad5582186efa0f325139480a446950019e91a376b5992fea106064e5170c9ea7961f128b895a335c SHA512 48cfe3956a3cb696e344ea03e5e0ac8d52831b8272b7cad2bdee34681d1e4e7968fe9da9b71cc9db40b6edf289509c2af766e73611f3a6f23ebd5062f4d52c9e
+DIST nose2-0.9.2.tar.gz 153381 BLAKE2B 9339a31b664561bd86817a969a64a3d80dacdda3ed25bc0a0b6531812e56c7e2bfaadcad3712d8af1a7ce585e27ff6de54428667e44e7c6b0003db5d52703971 SHA512 9af69f0cc9db2e8ef37d2c4ea4fd2d661a38df73fc984d261a1c7c39fba07e44afdf494f0939362b84a03e80c3d93ee75c9352ef333616bf8ce6e6f019b811fe
 EBUILD nose2-0.9.1-r1.ebuild 869 BLAKE2B 5f63c8827e7e60adff75f12143284fe71f8a7377f5be24fcb6726630396f2a234a4fe848aa8d79edce794c03448600efd950cba54e982991de350f487b87fb54 SHA512 8fc0a02c36123e9b0df6d88334148fb5d22a866d69967ea11b7d8c037481c03df89bd00a70f6c052784dc4e82233d9c5500c24ad2b321f1e90aa6566fca1d7ff
+EBUILD nose2-0.9.2.ebuild 878 BLAKE2B 6af2612a615c9b7af5faeee33a50e81097b8cf0fbdcec9263ea61dfee490d9528bbf19b51d0fc4ecebe1371e2f3e0ebbcad3658e77818a66b9a6f50a34503776 SHA512 2588f1f8b63358ced8367ceb4baaa62c9c9080e8cb9a4332914d49487c4d0cd1b8f351c1388a1f6ab4808d5c7b85006fc8311a811801a9d6dd8a4013273b4dd2
 MISC metadata.xml 245 BLAKE2B 3add0b4d7a53d7fe522e4b78a567cf1a8b1fe89d9abfd8fd5ccbc70104ccf52b15c4081cea951454752df03f43de328c975f280a42f8b248e83fc37a89716fdb SHA512 1ecded9f7a627a77dd609108d3bb95d70fea72e3fcc70436a6f0e54abe609bf9553644a8aaf2333e1aa0b14095768dc8f5d35b510173ccb194f4f8ac4243e33e
diff --git a/dev-python/nose2/nose2-0.9.2.ebuild b/dev-python/nose2/nose2-0.9.2.ebuild
new file mode 100644
index 000000000000..87db50c78a37
--- /dev/null
+++ b/dev-python/nose2/nose2-0.9.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Next generation unittest with plugins"
+HOMEPAGE="https://github.com/nose-devs/nose2"
+SRC_URI="https://github.com/nose-devs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+# Failures need investigating
+RESTRICT="test"
+
+BDEPEND="
+	doc? ( >=dev-python/sphinx-1.0.5 )
+"
+DEPEND="
+	>=dev-python/coverage-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.1[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" -m nose2.__main__ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index eea16fcaf5d1..1d2534c8bf83 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -10,6 +10,6 @@ DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58ef
 EBUILD numpy-1.19.0.ebuild 3726 BLAKE2B b7ff98d3782d037656a810490a46f8d6a1f9ffa407577b910fcc7a06ce900390d341a06213c5f8d3b6073c7b20053f151f65636beccb07cb055e4dd5a965cc9c SHA512 36ef418f6e17a0cb364bb0f5cef4890fdb84d3a2b748733e35f576574a84cdebfb1e086b8764aa6a14ab887d1730f12cd7f6550a70a792d942622b7ed8602407
 EBUILD numpy-1.19.1.ebuild 3734 BLAKE2B 39e3d88c8f374fc7c6a3bfaaf71c33ffe711891e6bfab8074ee7bf65d39bcc71b1452397f770c56bd4adbe84ba994c5ae14e52eb0b7b3c89b06623eb271c3184 SHA512 7468e68b5e4c1e0a85566a1ecfab03127a06998b34a548202cc78be181219c90dde824a150293464d942ee6a8051d67815c7b968ccf9f4f351198ef20852a561
 EBUILD numpy-1.19.2.ebuild 3734 BLAKE2B 516cb3fcdd3d26da409ef8bf3522f8638ecaf4e02fff6025311d3fe874f114e95cfb88a0b167c4058d214aea6d805ea6b914d574e2af90b859901b94dd109832 SHA512 4e77f799e2600998180438b6cc6f7f3a224f5b342f78cab23bce5abee59b36f16e9646829a3ef9f3bce7daec6eaf8a07625369924b87dd4829cd0f7b60f26e9e
-EBUILD numpy-1.19.3.ebuild 3739 BLAKE2B afd4b66e8fec65f66172291b11620ee52eefa6e3cf634050d8562f034a5b07968ac07b5eb4a48f6cfe99ec4f858488bd054b912448214e77feaaf55aca8dd938 SHA512 768b468b25d2b713034b1e66cb95214886f1539b889b7f38890f6428a23082f187e78c46b0d9ebb8f15c80d47e933a061b00947cd064376c218777a72aa19e01
+EBUILD numpy-1.19.3.ebuild 3735 BLAKE2B c31d8e345d3d094c1bfa09247b5ac5777d9f0698c190014a41efa7b8bb5402ee5424652d4df3c6a6881b0cab9200b372a494be166466bf67e2827718214958cd SHA512 0286772f8bedfa6e7af408a7cdb63dd28408b5d6d415c413009fdf971463e7ae20a065a3f6073191c482824e75ed7bd25e7bc610b6baf74820e87492fabf7f25
 EBUILD numpy-1.19.4.ebuild 3741 BLAKE2B 3d16e9b26a02dc4c6a5a0d34bb5734aa73e161e198cc7e4311de287676c9b4cfd1d4fd982fe6572c71553d284be16978c06f5b170a9674dc747c3c99eb3728b0 SHA512 984cf6adc67ae4dd627ce0209522080f84a12cabac4c809fa17589e5acf1cc59060753d3a5f11cf3e5139904e3b8eeff2aba3f3490ff4551da23d0551756c235
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.19.3.ebuild b/dev-python/numpy/numpy-1.19.3.ebuild
index 923adc30db68..c02078636b1e 100644
--- a/dev-python/numpy/numpy-1.19.3.ebuild
+++ b/dev-python/numpy/numpy-1.19.3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/os-vif/Manifest b/dev-python/os-vif/Manifest
index 7966f378303e..a36ccf29e652 100644
--- a/dev-python/os-vif/Manifest
+++ b/dev-python/os-vif/Manifest
@@ -1,5 +1,3 @@
-DIST os_vif-1.15.2.tar.gz 88591 BLAKE2B 0a272332b238590f9a0cb5a457babe8a26b97196370c0e0f4c1e4d89e814e424dcc5f0e2786cfed3729bb5608434507966ab22d9c68b90e7deef0767381a8cb0 SHA512 36d7ff16fa5b7cecf738d9e867657ce7ff416a514cde2796306d2e21a1ae1985528dfcecc95498a24fcfc16687cfdbc898550520ac6e17d202ea554e8d8c7b1c
 DIST os_vif-2.2.0.tar.gz 88781 BLAKE2B 99cb3337cc8b67fc6977e284f2e3370b47ff9346752cbe99fff65fddec80f8dbd0ca4d67527a0afcfb0e35fa8e42084a8e45a0dcb7ba66a1046ff32c752e5702 SHA512 eb06e0fcee7f061670438f81098f69c6d480d5f901c7dc8f0e38f4ed1494701c7711444907abba989d577230fc05d863697b7b813099fe1fb1820b25de677901
-EBUILD os-vif-1.15.2.ebuild 1406 BLAKE2B 4953125fa71b7fe0a5f2237dc384aa0b60f44ca1ef8df572c0cb83341c221f7b6c07d4fee858e06d704c121731eced3f0413321e4cfd2ef3afaa2b7415c314d2 SHA512 13481f3bb47f1b454f71b27e92e43203e291ae42d467924f394555bdd060a0c2e878e7d554f36686aa697620d23ba7527e6c14cb4b08fc57ee38e08ee7de4e19
-EBUILD os-vif-2.2.0.ebuild 1203 BLAKE2B e69def0404edeb6aed83e7cd8090109f8da803ec2cb8bcc2cf0f0a30045551f404420f622757a172eca9ceab18587783f5ab25f493f7faf475bd7573dc338ce3 SHA512 4b9b136a81149a91d24ebde6a395d93f372832586d07221243f0e42fe0f9f86bc3e76fa2f2fb762a56de234228e61d2f5392f1ad9678aaa95d7c116e216ff949
+EBUILD os-vif-2.2.0.ebuild 1201 BLAKE2B 0c0c4e7c855da384fa664a04d71bfa3fb8bc54f3dbefb3c13d3798f538d21f56d7baf2b8656a30b83afa37b3b9be14b3bae16ac2dd8f60b84c1435a12d41ab4c SHA512 bdf57324b37ccca700945c71ac0f292b349cb17a7681743cd541e0ec62bd06debd6d6112a51d65e284c7d561ec19da95a164a70ec255738bc3d76230b6271616
 MISC metadata.xml 403 BLAKE2B 8ecaa24247dde21adef589cd2cc3cc755a43e24b98ee766f02fd8559b671b918cba49f7cf4fec82e05761899f1f23732fcaa5a685ca438137f5752d1691bab79 SHA512 c911ab128071c7c64ea08892d197864801f89dc8192cc947d9c79145ed0a82e01aefe45d78cf116096f2b0eecafe10d184b00efc90d5f0aadb785969edb11bb9
diff --git a/dev-python/os-vif/os-vif-1.15.2.ebuild b/dev-python/os-vif/os-vif-1.15.2.ebuild
deleted file mode 100644
index c39f1e165e71..000000000000
--- a/dev-python/os-vif/os-vif-1.15.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
-HOMEPAGE="https://github.com/openstack/os-vif"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/os_vif-${PV}.tar.gz"
-S="${WORKDIR}/os_vif-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/ovsdbapp-0.12.1[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	sed -i '/^pbr/d' requirements.txt || die  # pbr should be uncapped in stable/ocata
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-vif/os-vif-2.2.0.ebuild b/dev-python/os-vif/os-vif-2.2.0.ebuild
index 66f17c9dcf39..3aa9f655c6ca 100644
--- a/dev-python/os-vif/os-vif-2.2.0.ebuild
+++ b/dev-python/os-vif/os-vif-2.2.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/os_vif-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index f73c673b541f..b1ff61f9e3b2 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.messaging-12.1.1.tar.gz 255540 BLAKE2B 54ab60244090d3602de9395ea4f6ffa4bfa78783642aecaf7bb37db62c1a5cb63d69c612d2d1085ef96611429a8c7b337ac1849d93ed857a2cb51bbae6265ed2 SHA512 0f55f2c21dfd5f83efbf53f8c0cfa65d8572166662a183998c896c61475a38c47ae6e2376c5a153049d2f91e3321d6a75accf4de4ef11b4ec8626b448c0637a9
 DIST oslo.messaging-12.5.1.tar.gz 256120 BLAKE2B 73ed3c8fa356d63d3641626e823a87dbbfc238f9136371aa81c1b7e6be327c2f93d22bb0de4aa0906972bc2e8e0f09047cae06d2b96ef24a3c062d644ba34f68 SHA512 ad29c8a80c1f423b91d0725e8ce85015feaa8db33c911626a90c5efcb5d9c1bf55711b610e3bed4a63370627cce86f48b50658605344d1ade503673c8415de65
-EBUILD oslo-messaging-12.1.1.ebuild 1665 BLAKE2B 158d297eb479ee1e5285f0767d33276e801e8e1c919ba478309e83c5b2d21c54becafb67be46a33bb746936cbd025e31b44ed3ac2a4325dbc36abe0b660914a9 SHA512 d34237c79ce7655dc18561dcfb510cc0b95bf612d7be0da66e33be4390b7dcf3d65bf17a2c462eafd37d7cce11c8bf55559da8b6fc803fcf58c1d1ca9f39f27f
-EBUILD oslo-messaging-12.5.1.ebuild 1514 BLAKE2B 6ed5a7071a8ef0203dae65376db5f06faf3bdcff077ebf43d802cad66fc72db54d241c9ae246665f16d0a786d667552c31539c16549beca6c1b6d4cb59a2ff99 SHA512 39550dd1a0c67f825fe79fef666dc8672fbc65b8cc03a56cc7090bac8c415716e902eca7936d6095c6b84c8be3531aaac1ee8b803028f13e4dd75729726ad435
+EBUILD oslo-messaging-12.5.1.ebuild 1512 BLAKE2B c2aa0911fe81f8d20c15a9b9ec673dad638c72391a07464bc4e8056c4a71e1d91eca990d12fe57f9e6e6febe4f39bd6ec77cd1330848a6ff2a156b171ffb113e SHA512 fd49347ae3d442827ebee05b3705e4fb7dc644c280d6a62487dce56a803d715600c1d92f286a5a043e63563c31581a6d134d4a5ebcb2220aca39d7b71032da40
 MISC metadata.xml 473 BLAKE2B 4a509bf6918118dd444bd8e6f3b1f89652fdc08a5c2cf975d8bd1aeee4c615356b611df28d85c3ce5a8fc16d4c8fc31c97bf6bf9b00314bb91f69d31fa68237e SHA512 a9bc655b7837297edc633e0b135ffa873659058b29b4ba6c7dac8e370f1fa672f9b0fc825908d81abf3f1884a3b080c6de63e8d6741cbf50069dcd6221701fd5
diff --git a/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild
deleted file mode 100644
index f3a9989e9c84..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.org/project/oslo.messaging/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.37.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/kombu-4.6.6[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-12.5.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-12.5.1.ebuild
index f8d32ac4e969..d8a9e436950d 100644
--- a/dev-python/oslo-messaging/oslo-messaging-12.5.1.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-12.5.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.messaging-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index 07f1747274ba..358ef6192d8b 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.versionedobjects-2.0.2.tar.gz 152102 BLAKE2B 6b7d19d0a17d895e65eaa15ccf4fcbf71dab10ada019ba9c2d7701ba8d7b3111542bb5be6be9d4ebe9d659c4b74f6d406a354f9e1f5990983ad36c6576ef8e80 SHA512 0c544ef33c213f8823a7ec9c2714d3053e9db0a6bdc69f8c41654c0117a2f2b43c94bc6dcd2d6f98c8447e85694382be5df9d57fe21b4718cc811d9589582f66
 DIST oslo.versionedobjects-2.3.0.tar.gz 149912 BLAKE2B 0a4636e35832a5d6574d35956d6d2c894db1972bf5d8859174b0e05bb1d613776d3a1546f2f523acd882f89d7dcd3675c29f3b415b02e419b381cbf4867afa3c SHA512 57078411f765b5b6d044f4f87286a2ab07a4dc1d3f3e247a8887d10b1c68a2fc40e4635f490ecab4041af1244d36cdcedafc0528ae842e1c5fa5434c08b2f4ad
-EBUILD oslo-versionedobjects-2.0.2.ebuild 1302 BLAKE2B dc1763bcb1c10a66d363f3868fabe0b68d2ab28cb73a37800bceb1063b509c97186dc9887ad50a9642a007acd581667ec7a55e33ee448224c3b8e1d3b8f39b9a SHA512 28f2a9f2ba4f930846249cb6a52c106c2c5000ff4777deeffd6ee79d923249b7a92b3a439c08ed77a4aaefca8f6a17b702e67d3ee4713cb9f04b3e533bf9a727
-EBUILD oslo-versionedobjects-2.3.0.ebuild 1325 BLAKE2B 7fdf109037ba0ae4901c49c49d050d31e9dca72caa4e7e71f1113679c4fd553cec6ecda4e11a70f6740841868a52180874b897a9886d3e28997939c0a41254ab SHA512 130326a63363b74c5d740b7a8f760224b107015849819aea1502a6aac13eced2eb696b8cd40ead2772bf1842000077c0bf9508db243833bd162028302be9d236
+EBUILD oslo-versionedobjects-2.3.0.ebuild 1324 BLAKE2B 46b17ea2a9b176d3b7da2cb775486932797bcd886477f6729adc1cf488cde9411457eabd94390c9757c546047993ee21dc47a1d4141c4001b8468017c5c72805 SHA512 0b919bcd6574d467ff858f11c11d4ac1a07ecbd2f84f5b74428f4fbbdee4ba0f2457cb5ed1632aac44d671e71ebe3b7df727dd87960f87da466ba35f9d1c2d8b
 MISC metadata.xml 362 BLAKE2B 892515fad3ac8c18b630f358ec44dd94ef3967315289e793904e89547b5ef93278324964fdae7fdf75511f2e2436f922c8792530002ea3a14e3c7c6621d1bc43 SHA512 66c7e8731fdca9cfdea72226a747f94b6622c63a88ef610417125b2fed3bce40964fd3516e3072c6976a0ade84c3e8ef1901258a018c78948ebf04612b9959ca
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild
deleted file mode 100644
index 2118dc15f719..000000000000
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library that provides a generic versioned and RPC-friendly  object model."
-HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
-S="${WORKDIR}/oslo.versionedobjects-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.3.0.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.3.0.ebuild
index 8b9b123b0efa..25b372c7ee1c 100644
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.3.0.ebuild
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.3.0.ebuild
@@ -7,13 +7,13 @@ PYTHON_COMPAT=( python3_{7,8} )
 inherit distutils-r1
 
 DESCRIPTION="A library that provides a generic versioned and RPC-friendly  object model."
-HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
+HOMEPAGE="https://docs.openstack.org/developer/oslo.versionedobjects"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
 S="${WORKDIR}/oslo.versionedobjects-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index ead94f028b18..963c05679ac1 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,4 +1,6 @@
 AUX pikepdf-1.8.3-test.patch 1383 BLAKE2B 18ac2e4ad4fd2c1e6db158ecd87505ef3099a5053d3d4b5b96a2b1179eeeb77218ba0582e1f25975f5f94867220fd382c82ca960da404154ea67008cd389ff82 SHA512 6db05c94c09f5474f53bd2dd77b0ebdf6cecb4cf00ae5c344b1795bd81379f072856c7d06c05630d40c878ba2fd9b09c918d0f6fe364b54fea720638135caf0c
 DIST pikepdf-1.18.0.tar.gz 2351789 BLAKE2B b33b69f57fcd5293814ac880376627b7184ca632e09f668fd274eae6b3640d97699681597470c17abe00ec334ec894a073cc1a1eff91ffa7df572ef78542b429 SHA512 9a04fe6ce145a6f28a180261ac004fc0ce3c525c4e9e7c5eb4bb7dbf8aaa6d3e6f726cec5d20033a5aaa60b793666df52c20f13c8ee7c0c3266fb8e557d69c18
+DIST pikepdf-2.2.0.tar.gz 2363761 BLAKE2B d1a8873a2c41e280dc2880609424742f4454ee226ee30469df067ddf0f5ee98ba6ef2965df75e95c2576e3813bdea7cb6bebfc7a1a7d05696b9da8ec67ef981a SHA512 e80874ece09ce6381079f705ab031b121917485d0968578aeb07a83b70a14bb46d549498357acc4df62b51c33fd75a87f65b74ef64464dcaebba3ff84aaa1843
 EBUILD pikepdf-1.18.0.ebuild 1523 BLAKE2B f8f6fc655068e411e21ae4dd2f77e99e5949a9c3d6e50227ea6e48101e5453ba5e2266d261ded3b7dd7d3cad8861c912127c5b80978287505e6d885cc01ed8af SHA512 6c38de65f8d9b7c18edbd664f428ed67a3db2ab64cf30f1a624db1b79c368459b6d230452289cbc18bf9db69ba03da84568c838bec38b221b9ed3f972a4729c2
+EBUILD pikepdf-2.2.0.ebuild 1934 BLAKE2B 044a8dafecdeafd3856d3b17865251d486d5f149b899a9808fad0eb16110675d09c3775877880a99bb8c0365b6346e4077ff6518b076e14b8fbb2fea07a3f02d SHA512 9c762e61ab53eea09dfb2bd550e3cba855925dc02004ee2bc96d32a2fe986c793b864b73605f27e07711df9241117563040aaa13b1574141550d043e0f64fc6d
 MISC metadata.xml 579 BLAKE2B 010d66d2d00284f744a85bebf5b916e77efc7f46f880886815bc677007ae0f71b5f19b6caf6cc49c05e1e9ce13c954876e8d13b988a533af2fb68de147e6911a SHA512 3f41579208b5354e6361d6cd1f035bf0e5819fd90575e15c684cf501ca33bc14b6c4a7b70040cd5f44796a8ca58810535734787ce84ce8183d0cadc14d6c1f01
diff --git a/dev-python/pikepdf/pikepdf-2.2.0.ebuild b/dev-python/pikepdf/pikepdf-2.2.0.ebuild
new file mode 100644
index 000000000000..39f8d8d20e67
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.2.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/qpdf:0=
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/wheel-0.35[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? ( >=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		<dev-python/hypothesis-6.0[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		<dev-python/pytest-7[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-2.10.1[${PYTHON_USEDEP}]
+		<dev-python/pytest-cov-3[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.28[${PYTHON_USEDEP}]
+		<dev-python/pytest-xdist-2.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.8.3-test.patch )
+
+python_test() {
+	pytest
+}
+
+# When ipython and matplotlib will get python3_8 support, we'll be able to add
+#
+#IUSE="doc"
+#DEPEND="doc? ( dev-python/ipython
+#		dev-python/matplotlib
+#		dev-python/sphinx-1.4
+#		dev-python/sphinx_rtd_theme )"
+#python_compile_all() {
+#	use doc && emake -C docs html
+#}
+#python_install_all() {
+#	use doc && local HTML_DOCS=( docs/_build/html/. )
+#	distutils-r1_python_install_all
+#}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index d30e2306e52f..064400bc4eb6 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -3,5 +3,5 @@ DIST pillow-7.2.0.tar.gz 39125407 BLAKE2B f49015922c34473590740c9fa63435f85f9a51
 DIST pillow-8.0.1.tar.gz 44614653 BLAKE2B 0f8ec178e92a57a55d575fac61779d39e79ff18032a02ad93aa6eca1211436342944b1a5bbd29979b52f0e2df756936ade4bf637ac3c153b5dda5838b58087ac SHA512 41b4ea786990c834f77ad06b64f465bc8f3a65911cf14bb05f452316fdf504e5e49b2bb50a9346f207187e79f83c5b6d310d703d1588f678b606584b1f27ce6a
 EBUILD pillow-7.0.0.ebuild 2638 BLAKE2B bc13ea32fd5b0a25aad6c976bc4776ebadddd6fd778126e0995391e684bab49aac9c8681face6a2ff9663203d820de77a9c18b895ab6ccf48862ad153cc01225 SHA512 a709259b589008d5e745b6011b10f503db7664fd9e52b858e3c45ef91e428b531bf461da9962a2807a5c0058980cbb7b70e0a22b84aa624ecf9690075c202ff0
 EBUILD pillow-7.2.0.ebuild 2694 BLAKE2B 0c5ac7be9523a70ef6b0abda1bbaa1183fde635e608d76b0b99216256d4d63288ece9f9901176d2a405969143f86aa524e09f7a23fc64c53de01ab785e3b6ab3 SHA512 21573a1826123c84025e9706114f6cef7f6c21a8c88237957b23d0e05425ea477e468738af1cc8379e3b4e322d3f1c81248fc70d835dc333f90f7250c58c2ce2
-EBUILD pillow-8.0.1.ebuild 2618 BLAKE2B 3e4314d1bd9c26ea9149e24af9fb695f902b7cb27346eedf9845b166b3ae425a0d9fdb179a6e7aaa427031ce0025c6a9b46217c5ce3d51061cfd158588145129 SHA512 4ad5cac597df00fa08e757d5a15f66b32478621abfd885fcf343e04b942cd8166cd8f0c9ebfd5dc4fb9789d4d5c284d5a169fea175f0b59c163894ca262e091f
+EBUILD pillow-8.0.1.ebuild 2617 BLAKE2B 2618fc049d31b67bd4c06f7b1d83b4cb2dc4f7172b89e0e4a1f21605a884cdfb1f9a16754bf8a259bf2510581a559d9209d7f07c5cb2bbf7272a721c7e094dae SHA512 2b0e20de8daa9794c87bcb6961e6d6fe1b5fd9b5acc51271e29596655f9a9085dc546032a2f366193dc21ff514f4a3bbf3562f6739a08062ef5991517c8a0455
 MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/pillow-8.0.1.ebuild b/dev-python/pillow/pillow-8.0.1.ebuild
index 17084a5fb118..562ba1c9251b 100644
--- a/dev-python/pillow/pillow-8.0.1.ebuild
+++ b/dev-python/pillow/pillow-8.0.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index 808b3e3f1527..17c20577d4f3 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -1,3 +1,5 @@
 DIST plumbum-1.6.8.tar.gz 309449 BLAKE2B 4112cb99852ebc7e4465ec54bf35a1352ff41a7ac084d3561d23f6da62fb1b25fa65a1f6f118564a677e6b6fde57b52f964a07fb71cae40b7d831ceb1505738e SHA512 2e834b6024ed1892eb91ede95f70641288a76911d58fcb24edaed59d3e54afa72e0533b4510896ecdd5077f70d4d60d9ceb06510c3e6d469afb1befae1961af1
+DIST plumbum-1.6.9.tar.gz 311240 BLAKE2B e5f833a5c762f3e78e5f47649306c7c29e6276b3530ff45fc0c12cc4efd3bf89bad2b6b7f77e4b3e3a0a47671f9b607e667aba8f654c28c05be570e0a7491a07 SHA512 f165f4905ec34cfe072f61fb28b43021ca44c0c3cb1e505faa04332d15920d832bcf084782683c4950113e30a3fa29734846b3b6f31604e1a635c9c125e38ef1
 EBUILD plumbum-1.6.8.ebuild 521 BLAKE2B ee9fe1cf0899628d5c9195355836682f6ade18f2f0230cc9db7ce892f3ac263d3402181437d16d6b979660ed55ddb13b1c5905885bba6cccbbdb5f0cbb6d313e SHA512 c4e477bc89cb1156dfe1e777e4a230cb143fec85a693ccb0163b7189ec870f70dfb3333b0f8f96411110e104c92bba05097aed2517f807bbb3d153d477e92810
+EBUILD plumbum-1.6.9.ebuild 522 BLAKE2B b8813fb0f75ee81d04f5476f5bcd2bdf715a3fdac8a3887502de320659cfd26180c5037935a1a69b69e9438025ca3a57c6e04f155d497d7a40645e6acf39b1e3 SHA512 ee20200dca6055fdec185554e4b4ae95a3261e61b3634161f4a27f3de61b610810c910a27b7d48f564a18f725d30c658bab0e9369d2369a67beed52706ff5439
 MISC metadata.xml 728 BLAKE2B c0f017b6d1dd00480dfbf37aca4f0326fab5f1bcb2c822709b1151521723450528c87873ca098af4f1e7909bb8434451da0d7cbd1ca1494aebffe932f3f8f498 SHA512 1dcf9374ca209dc5ae11fdcc58c9c7493b77be98d0d3d80953e2d0886cc1ba053fa5ebc05bcd4d5b14dc15a070b3df2bdb8c7056cd482bb21cb9901b372cd402
diff --git a/dev-python/plumbum/plumbum-1.6.9.ebuild b/dev-python/plumbum/plumbum-1.6.9.ebuild
new file mode 100644
index 000000000000..f92c5a0cd1be
--- /dev/null
+++ b/dev-python/plumbum/plumbum-1.6.9.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="A library for shell script-like programs in python"
+HOMEPAGE="https://plumbum.readthedocs.io/en/latest/ https://github.com/tomerfiliba/plumbum"
+SRC_URI="https://github.com/tomerfiliba/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index d9d6a5389d33..36b1a9b6fb48 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,5 +1,3 @@
-DIST amqp-2.5.2.tar.gz 117788 BLAKE2B 6a6990aca0a43a0c546198b999d0d3680d6c44908e144f81bd8266abac4d2d9b7ea4c65bbf969310f1236970ebe0ef5ed44cc558109ba1f680348e3ba2789e83 SHA512 c540ce39c06bb947e55b4afc56567d5fc5a82b65a2f7e2cc1f769f96da74f788d14e1e9c02852a259a4980c36a4524f07166686c0357f96219fd9f8612a6159a
 DIST amqp-2.6.1.tar.gz 119956 BLAKE2B a575637ca3d39ef8577035ae156f09b87dfb053757cb78b058fcb4f23759707084297e12941c766783e99898c486ea8eca968842464223ea46f42a4e4495c0a4 SHA512 e2c628cfe8075a3014a9fe991ae3e6f49198db2ecd46dd48f980730da692e4d25d9f055b1ccd4743917fc38a8afa69a5902a64275f8f45ef68113c6756f3a17b
-EBUILD py-amqp-2.5.2.ebuild 1473 BLAKE2B 72e985ed942780de340e8e89367411a7df62ffbd1ea7e058304a24814b4f854f2f4f6302642ba84cf688310be29c3c43a48a613e3a1d510ed577dba87a270128 SHA512 3d639b81f1f0d59a1e43853f4878e495e6269e5a826e69c00963bb4aca0f80c2e2dde559de0d83c1d9fe6b13cde0b0b7ff061cf67bf46cfc49a0132bc86d19f4
-EBUILD py-amqp-2.6.1.ebuild 1513 BLAKE2B 16dc72c5dbb4e5831eb7b8fae890ce2a0442fe9f174715300a1127658bec7ac5517854a9511ba4d4263597c44d6f701b7490f18b597ffdb7d9f96a05c3d996e5 SHA512 b059dbbc6903328536d07c2ee12506b24b2e2ee598b9d791c04a4cb6c7950d77ca850e10e8726d284871b4db77afbd4abc2ddf5fc7b1a85a5a098a3dff3fd5fd
+EBUILD py-amqp-2.6.1.ebuild 1511 BLAKE2B 1703fbf5771a262eb1d3c5cc4a918515fd4cbac511804669bf4debe5bc89ff7ed744dfb5f422f59fb6ea6358e719786dbdb7d76e22bd7877f4b936f5b7088b80 SHA512 9c44523c7d6e49a60677973422272fc2e6e224ad062ae073911d84de47df786f8a0b77df5ccdc9920bc41d2bc8c4d2cacfeb7eff91249aa1f8be07ff10666070
 MISC metadata.xml 504 BLAKE2B 4b09bbbde836a690c540191860b0251f329f39f9650df8c0246dcabec3c2444f8f0734a6acd4bbbd17e3f276d6bcba195326a07f19b4a43451257d526dd9796b SHA512 069eec0fc089186f692bd331463d8f6e452545cd0bf8f48e1fba4169c49674b3187a02e0ae25689f2033a65365fa7d3086d23affdb1875cf320a5cd36d9954e9
diff --git a/dev-python/py-amqp/py-amqp-2.5.2.ebuild b/dev-python/py-amqp/py-amqp-2.5.2.ebuild
deleted file mode 100644
index 22fd77713035..000000000000
--- a/dev-python/py-amqp/py-amqp-2.5.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="amqp"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
-HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc extras test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/vine-1.1.3[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_celery[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-6.0[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# pytest-sugar is not packaged
-	sed -e '/pytest-sugar/d' -i requirements/test.txt || die
-
-	# requires a rabbitmq instance
-	rm t/integration/test_rmq.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use extras; then
-		insinto /usr/share/${PF}/extras
-		doins -r extra
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/py-amqp/py-amqp-2.6.1.ebuild b/dev-python/py-amqp/py-amqp-2.6.1.ebuild
index 29b61f57bf43..1a2d585c4bac 100644
--- a/dev-python/py-amqp/py-amqp-2.6.1.ebuild
+++ b/dev-python/py-amqp/py-amqp-2.6.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc extras test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index af2c6f72a3de..e6dbd8a50f6f 100644
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@@ -1,4 +1,4 @@
 AUX pyalsa-1.1.6-no-build-symlinks.patch 682 BLAKE2B 046f4cffa0b08a32360356d82384148b805544b6f05e44ec329bef2299b67e46c68401b800761e9dff2141b22bc029a55fd5cf01cd5cdb533303aef91a2bbe0f SHA512 fd3937df5a69326908da942a8926e10221bb85693c863cc06ca363ca8fb07761173d2b51113615970887442d8779b2e9ff468b927b078acf52620e944b71b779
 DIST pyalsa-1.1.6.tar.bz2 39797 BLAKE2B 3a23dde67ec807d09b2e9ef0f893b8ec2f5902b0fa88f0f02f8127b7a5a8bdf3fa09397dd01ae1cafbce6b9c733a0eca65fda3cd6fd18e533dd4fbace284caa3 SHA512 6c6aee1ad32c2208ab3f91defee5651cca8bb414479ff80e8a1bd6791ec1df2218a61dd8e7c01f95bd5d51807776034ff96cca2b935e9e4e23d13b6c3c40a0dd
-EBUILD pyalsa-1.1.6-r1.ebuild 635 BLAKE2B 4db5cbd9be0c8284c8630d7a787c13789e0ad2eb67801dbdc48a2956e9c6bdc1171027cecac79feaf5589ced5197623fdbf89f06e647856adc16e0558fdeb661 SHA512 ff301a493810864a723ae32ef25df51a8044d3913361a49f587a75dda942eb5668e40becdc905d3613dd56df35395e7c07de6a6021efc6e5e64ff03f040133cc
+EBUILD pyalsa-1.1.6-r1.ebuild 642 BLAKE2B 144e50cc121b434ad4ba5bebd070cb913aaa207a01a72276942e384a842bd43b89d67ea952a5b146383f59a8f8a59abd4410c3cf1717202607e692f0030fe067 SHA512 262f942a68943ddcef3931b27015b42cb89769cafcd9e8214958626c3459a71e778da31fa3b81185373e77b8f123f844567c7a2e6855f0955aef54fa1fbd2f8d
 MISC metadata.xml 349 BLAKE2B 743c640ee72b49353f6b3b19b958609dc420f187753d9e63e292c9cdfcb6c183092953dd16c3cf0f91ee13df04b9f12a2a9893a56cacad2c70535730294d6af1 SHA512 ef94ac2639e61234b2140a6dae1683f99c3c8bf564a37d22e54612340a2d0147037e590ef8f6c639914df05684f3d62ebc96a9e2176cab82ba85e5d87171ec58
diff --git a/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild b/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
index c3ac63d15799..2bcb27be8646 100644
--- a/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/pyalsa/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/alsa-lib"
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 28b387a18203..c83f6a4366a6 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -3,7 +3,7 @@ DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B a4d04c933fcad244d32bd512ef8717e60ec923f
 DIST pygame-2.0.0.dev10.tar.gz 5567274 BLAKE2B 7d78f260318cfabeb33f1073ae210f890d2f772e3ef302f243cca67724c6012355644ba60d4cae6de72db6dd61d320177deff6ee83dd355ec4cc33e841b565f7 SHA512 4cee7599fd8a6d31ddd66bfaad3bbb67cb167c1ae339f37e83322d810fea8746e81a191c224a0eeb6cc43a64bf1730ff0886c82f1a4f642e2e656ca9a837bf9e
 DIST pygame-2.0.0.tar.gz 5522621 BLAKE2B 49773979af53595d3ff2db1a18e4bcd217e26db3ec28d6129d2a588f23a1bd5326fa79fab32c25aa796738cde0e68f5741bee58f62432e86f89cd49ee17a8f14 SHA512 3f65924d0e1d2863b84118a4e468b521a289e2cf174405c6f3ee2b2a2ed399cde7f9f310d57c4166351f84caaea02dd7408ee852dbcee7c205bb2955b6078fda
 EBUILD pygame-1.9.6-r1.ebuild 2295 BLAKE2B 682c814c2c6471f81bf7f4304ef056fe96651d5f08dac9c89e8801ec30eb88c0779cd7425bdb492f888886a9f1058ce999576b62120bb0fbd707efd48805f5e7 SHA512 3a8461dc43baf4970d3bdd1dfa18b2993f7d19858436b562c6767016cc64850a4efaa80f121e87b4ab9badd5db0f1c994e563ceff61b6f53511a3b1475d6ce8f
-EBUILD pygame-2.0.0.ebuild 2078 BLAKE2B 335022c652d050e93984fd7e1ec83d86bcc5c981915883b994dbc7186573f92e4cfe6a47e5674792b200bf36976eb4a1d4c1a3ce311d01a1df8e26c44d0826b8 SHA512 62634815ce97906a8742fec6c8e3b1d444e8253899712e444e3a521d68198cb6eb97df57cead16a0042773fe3ce42b8d3f8d8608dcdfd244a58393576ac4b8a6
+EBUILD pygame-2.0.0.ebuild 2074 BLAKE2B d2c44c2be2f39e04f88c5bded248b1ef79d568962a99cd3928521aee39ac735b6d0971afc438817cce47133bc363db7b5a0b9b8f04301b191674ac507011f8f5 SHA512 f01647e5d470537ec933eddce6dca6339cca42321150f2f0ff437bcfcb6f59c85bf9b7aad23ed0306217c2aa6cdb25a1c9c1a5210678624ca0630473b87e0680
 EBUILD pygame-2.0.0_pre10.ebuild 1911 BLAKE2B 1b9feec06c2cad0101e9a966dc9f52d3ea1e879cb425c021ec637e2dbc8f2cb8226d573bd99bd7616d0dedf99a3dc982c405effbd55a271f63c84f23f538d923 SHA512 e08204ab6ec0f7072b175d384c8fe2609e1e488b9b6215d0f4604431f619fc6d6d6e7f21aebdac3b206e9d8f92394b9dbf4fdcf0bf07764d9df7e412938302ce
 EBUILD pygame-9999.ebuild 1737 BLAKE2B c854247d528ccf4aaee3c348d16ee9148d2de2624080e80e233d947249719b1d3f16d0898703a1579b725fabc369679a2a3e113da4ce6af9f64fdf2d7dd983e7 SHA512 c3ff68bc1c97aff762c5b66507f1ae159476a55cc9b7395841c462769109a105bc961cac9e5f7284223d169c0afbbdd305a533b06ecf2966e7c0c07b4833096d
 MISC metadata.xml 408 BLAKE2B ae371ef164069765d0964da714a83c9898ddc190ac295c5ad5bbb6a3c45db5aa415d84ff21dbaa510e5c9852397e6b6b389684c54b67d83d675afd9b3d9a697e SHA512 a6e06c0bed59d5157166577a2dafa53f28a310c56f251bec36af077a79342c6f954fa63a3fa8d3546ca03cc9358e75eeb1ef04c6e0371e43e0b7bff51ffe35dd
diff --git a/dev-python/pygame/pygame-2.0.0.ebuild b/dev-python/pygame/pygame-2.0.0.ebuild
index a43bd4b42236..487b86f99f2b 100644
--- a/dev-python/pygame/pygame-2.0.0.ebuild
+++ b/dev-python/pygame/pygame-2.0.0.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc examples midi opengl test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pynvim/Manifest b/dev-python/pynvim/Manifest
index 24bb11909436..7c61543ff84d 100644
--- a/dev-python/pynvim/Manifest
+++ b/dev-python/pynvim/Manifest
@@ -1,3 +1,5 @@
 DIST pynvim-0.4.1.tar.gz 52340 BLAKE2B 4efddfbb8d1eb10aeb53b77f665d6ee186f697cc9cb6b3be2001468755a80b0a3bd4e105fda498e1310be9f65da3a0a8b12209c46a7122bb70f860c0a91c12a0 SHA512 78cb343ad02603a0d1c8f56079b46a9d341d8808a19112e758e5299994fe12a433cd61a4dbbaf0d5ffe00c676bcff844a53e910093efb862ad48cc4b4326f7de
-EBUILD pynvim-0.4.1.ebuild 667 BLAKE2B 0a9ebbfb2783d30ca57a161a36251b652c440fe02449515f505e43dfffd71052f5a4b11366c62739f1da9ccbc2b506ace742b6285c339caffd819cf503fb46e9 SHA512 bf989a719c18238d2a84275eb479a2f41d8884aef6f2826e5af78eeeb9a271adc86c5a9dfb9985e58137f334256d5885271973ef3d77c28f711e05cf886129bc
+DIST pynvim-0.4.2.tar.gz 52809 BLAKE2B 0bc2c3b509b602d7c46df9c54e867d1833bcadc792d5e1b27e45d99a57c33ff531e85841d8cbccdcb104892a994fcd71ac1c6ba2e86b4785cf890b1f8445d577 SHA512 d24d18fd158b318396cbd4e4ca3a0a304cb12b6790b84fc5f78bbb4aaa4b325d0fea6e281ff3cb27efbec0130d193d4871806750f6d1b792ef8a3558b5c37501
+EBUILD pynvim-0.4.1.ebuild 669 BLAKE2B 37adcc208e8a7ee5e4a439d5984e232971f02d09cc14630a5ee1a52d3ffed855dad1160c998458f8821b4ced49dc0c305ce434ca384c1b7eab1b8762e42dc6c4 SHA512 6eaa32d656e76544982044fcf8c34173d199d337996d648a389be618eb912ba95fde5f3255871843b0757195d745a7a017ac7d6ab04464a0615b936bef15a15e
+EBUILD pynvim-0.4.2.ebuild 670 BLAKE2B 50e011929299c752c2119b40808327702a08a09af4b1ba2d7aa8e245dc3d4641ac223ab17344c8b775f57d0525293124ce872d0a0470c04bb7e0517b7e55e60d SHA512 fb855ed4dd380624b71e3e174decb7f0406a068afa16249621b396d52b2b14c75caa94a44b453641aae74b424fd9444756651cc46df2f29fa5655f638e213205
 MISC metadata.xml 344 BLAKE2B 0d15c0c8d8736a7622e98357e02c92eabecb22c853cba110c893b8cb681f0d7a16534329ffba68639e0a2455cd1321601dd56dabfd17b10ade3e23545aab6579 SHA512 32963ee9f09db1c9edef5a1179cdf0974b62c05d714636faf8f677db5f3205333d64eaa228ec2d35475a7efcb744759a857c6888dd055766118a19a288415e52
diff --git a/dev-python/pynvim/pynvim-0.4.1.ebuild b/dev-python/pynvim/pynvim-0.4.1.ebuild
index f1b7eb1ca6f3..6c577ac3185a 100644
--- a/dev-python/pynvim/pynvim-0.4.1.ebuild
+++ b/dev-python/pynvim/pynvim-0.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python client for Neovim"
diff --git a/dev-python/pynvim/pynvim-0.4.2.ebuild b/dev-python/pynvim/pynvim-0.4.2.ebuild
new file mode 100644
index 000000000000..d52a0bdabdcd
--- /dev/null
+++ b/dev-python/pynvim/pynvim-0.4.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Python client for Neovim"
+HOMEPAGE="https://github.com/neovim/pynvim"
+SRC_URI="https://github.com/neovim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+	test? ( app-editors/neovim )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -r -i "s:[\"']pytest-runner[\"'](,|)::" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 76e45216edd5..967373a68efb 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,5 +1,6 @@
+AUX pyopenssl-20.0.0-libressl.patch 1021 BLAKE2B b2158cc4bcde97221d0c18204020f1cb5331a3c38826ebda16bdf8018b038a87bdf1ab4aa81cd2c690b868411663d4a6303eecdeb6743afb60e956512e1dee34 SHA512 aa2ea27211fc06bbca62ff78305d69b9fd9f0cf5d5318f956fd9b386f378b33cf99f7596f35c37343404940d9fe7f9734efcbebadff7a98e5f0f650a71bc84a1
 DIST pyOpenSSL-19.1.0.tar.gz 160510 BLAKE2B e6e39f860221a2696aa3fa32ac89ed48e34b18e4accc366a86264d943a15a1b00ba1a0d8349550d1775d25836aa5d214e1e3fe4ec0a9c0f6d5ab00cd9fede633 SHA512 4acd96f287d72eb11bd812697d28cd6eb6a96a4653248b65f967187830a6b17cc1254775a18a3405469f3d45abdae6f02d165f2f35f035f3174c2826fba82916
 DIST pyOpenSSL-20.0.0.tar.gz 173786 BLAKE2B 3fb1e90e20b3e083fc93f6dc8a54fb54e15ceb38c4d2e84e2d7d68bb56f9e3828cd264e3554f25465e858687e74a7f20b91216fb7a0b4b2c656ea86423cd3442 SHA512 26e8a64d53a35434ad4bf5ef50ed5c37d7b92b0db971a2103dcafea56a0b377d67333af630a31405a97cf2cffddde320907b4950ed336a8321391854bcd2c50a
 EBUILD pyopenssl-19.1.0-r1.ebuild 1395 BLAKE2B 29ec3a4e7ca4ac8c60f6227046e80c136e12db62d493619e852cdd657a332543806e48915ee0b9613258427230e9b696d07d2295bb0ed80c837ffc5cfba91aa0 SHA512 1620336ea740370145277b48c4836d5b8d9e2c4f5d476d29c4c321194ca04adc04d1972d4278309b8dac65dd6bb8da0a1b14cb6e3689e41c3be88f8fd5a50952
-EBUILD pyopenssl-20.0.0.ebuild 1402 BLAKE2B 2ca98de775ce7d213f38ebf58ae0ade0f1afab3132b034bbaedc351436e3ca3b895e948e7238b3b0b5dfc7e0694ee2c2444ea3639868409d23ba6b3b22b4ee75 SHA512 907ca7f0a92aad565cc76483cfecd6f689162ec5cef244eae3c3e29641d08d3291b2a3046bc4b22fa9da9ec5e89ccfb9436d31282ccf0056695ac1240255f23e
+EBUILD pyopenssl-20.0.0-r1.ebuild 1449 BLAKE2B dec6086e443725609c7bf5a583c65a006a5cb14a711677e8bf96f29452d920766042a16459cdc23314f3b586d3f25ad8425e84ada6c4cb8864bc5899fb55de29 SHA512 fdbd12bdc40ab48f3fe7fb0397523ba0543efcc604e7c53c34705dbf7874940859c7a7215de8292dc3f219c1c0da54415536df2cd0168e96f48251267c61088a
 MISC metadata.xml 481 BLAKE2B e25a44e19e9e7fb701742e1c4916a41a777efcaa046b8147510fc8d9d021cbaad9fb887d8df6769b91006acdc9418df6cec4ba20a78fdec88d26b7cc4ac5c2f0 SHA512 d568654867ca274e7c67a9b30a7f50e739309a22d78c3c1f06f4216a224b00e3a05be022920614befaf96a65ac55782966c9a1fd0ae88c806acc559af307ca38
diff --git a/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch b/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch
new file mode 100644
index 000000000000..6e9c7847fcea
--- /dev/null
+++ b/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch
@@ -0,0 +1,30 @@
+From ecbd275386e5608f0f90d3536506d7f50026ffe6 Mon Sep 17 00:00:00 2001
+From: "Nathaniel J. Smith" <njs@pobox.com>
+Date: Thu, 1 Aug 2019 21:23:51 -0700
+Subject: [PATCH] Support openssl <1.1.1
+
+Upstream-Status: Inappropriate
+[https://github.com/pyca/pyopenssl/pull/861/commits/ecbd275386e5608f0f90d3536506d7f50026ffe6
+was accepted in 19.1.0 but later removed since the upstream dropped
+support of OpenSSL <1.1.1]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/OpenSSL/SSL.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
+index 6f785fc4..55211511 100644
+--- a/src/OpenSSL/SSL.py
++++ b/src/OpenSSL/SSL.py
+@@ -140,7 +140,10 @@ class _buffer(object):
+ OP_NO_TLSv1 = _lib.SSL_OP_NO_TLSv1
+ OP_NO_TLSv1_1 = _lib.SSL_OP_NO_TLSv1_1
+ OP_NO_TLSv1_2 = _lib.SSL_OP_NO_TLSv1_2
+-OP_NO_TLSv1_3 = _lib.SSL_OP_NO_TLSv1_3
++try:
++    OP_NO_TLSv1_3 = _lib.SSL_OP_NO_TLSv1_3
++except AttributeError:
++    pass
+ 
+ MODE_RELEASE_BUFFERS = _lib.SSL_MODE_RELEASE_BUFFERS
+ 
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
similarity index 96%
rename from dev-python/pyopenssl/pyopenssl-20.0.0.ebuild
rename to dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
index b09f1b1bdec6..0e4a096a48ac 100644
--- a/dev-python/pyopenssl/pyopenssl-20.0.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
@@ -37,6 +37,8 @@ DEPEND="${RDEPEND}
 		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
+
 distutils_enable_sphinx doc \
 	dev-python/sphinx_rtd_theme
 
diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
new file mode 100644
index 000000000000..2507fac50528
--- /dev/null
+++ b/dev-python/pysimdjson/Manifest
@@ -0,0 +1,3 @@
+DIST pysimdjson-3.1.1.tar.gz 3286141 BLAKE2B f1fc63ffcaf524f23112438a8669caf4b4ffa0190bb20e2b851f61dfae386fe02bff1746dd4e68499bdaff3420d41401424fde1332222fe49211d32e09fdcab8 SHA512 9b1080d70f06e5a6d6467769a8146f642adee2c08391a87dd86eca9b0eb7666d9fed47a83d991843b07c2b96906dbf0ccacf2425bfc3ce4cb22731e03b12122e
+EBUILD pysimdjson-3.1.1.ebuild 504 BLAKE2B 3733bb66dbcbd2ff4933d3d1009b0b2736fc516b499241531d2753051dd1d010cd132e9a266aed13d941654fd88423c3f2cfaf2c5addf3522562ad47f5d0d607 SHA512 ebcd7fe618a659baff81943f829024d7579ef21c4ce12271543a7a7685a8a01bdfe285fa79e6f30601dac08b594bb46d176c2821d231fdd9464dff7ff1aef338
+MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/net-libs/libosmo-abis/metadata.xml b/dev-python/pysimdjson/metadata.xml
similarity index 61%
rename from net-libs/libosmo-abis/metadata.xml
rename to dev-python/pysimdjson/metadata.xml
index 1570f891c6a3..cee379b15409 100644
--- a/net-libs/libosmo-abis/metadata.xml
+++ b/dev-python/pysimdjson/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pysimdjson/pysimdjson-3.1.1.ebuild b/dev-python/pysimdjson/pysimdjson-3.1.1.ebuild
new file mode 100644
index 000000000000..13cae8be7e39
--- /dev/null
+++ b/dev-python/pysimdjson/pysimdjson-3.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for simdjson"
+HOMEPAGE="https://github.com/TkTech/pysimdjson"
+SRC_URI="https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/simdjson
+"
+BDEPEND="
+	dev-python/pybind11[${PYTHON_USEDEP}]
+"
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 5868ddfc668f..b8a8c32faa26 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,6 +1,8 @@
 AUX pytest-cov-2.8.1-disable-broken-tests.patch 763 BLAKE2B d36ec8acb8329cff8619f22cf485d2161d3ddda7740eea7f1516b5fee6e70bc597b1ca5ac79514be06eeccbd22a458381282622404152e7a41def6af3c3b15a4 SHA512 fc301e116072b7d77864f51a973b20274034569015c198fa8c05efa09d5863bbe9534d1ee1d2170a41485f914f4006cc6818332df76292aecb7e229cd61c7a63
 AUX pytest-cov-2.8.1-latest-setuptools.patch 1247 BLAKE2B 24ac573f41ea6beff690330b26900e99f7454bbc74bb868246055bbd5ed9385f7fff9e72c4222c855dcfcd06e1cab6ac322ec9c085c3b3fdbb12137f8f64455b SHA512 699c4e0e5e3f0b8b145946fa319d19be4ddd42ab7f565af875ca37df0aac222d2b0af50f13ee52f19cf01c9e799a8b7e60ccf114b59530731f820c91311b1b5a
 AUX pytest-cov-2.8.1-python38.patch 2522 BLAKE2B c09196ac945cd4b00acd75e45987be12ad1c8c251b679135fce1c2356d58396bc11b986f6d65ba0b946f5008eae70dcf18ceed68ba1ea50cb39bce303e710912 SHA512 3bd1fc80cfc76bdf643ed00bb59ecee1ceaf3c838f851cd65f844a5297ea33ab514ed441a5807ce6424ac461b10b629a8b6885851cb80336c5836c5f72ca6271
+DIST pytest-cov-2.10.1.tar.gz 56822 BLAKE2B 45eba205a2c6687882445d3554cedc04ad556854f5eac8eb0fab7fda84cdf2736b034dfdceb664293d1add153a5271403eb94585a863676ccfef9ab09727d165 SHA512 2dd575141754a417f34b414ba7e07291c273abdc63a6b7dc72d317c6ec10076b83c2ad78eeefdda7cee1fd6f56932d838602da4dd760a1c0d12095be94c22568
 DIST pytest-cov-2.8.1.tar.gz 47661 BLAKE2B 590fd50b69d01a71b20982d8cdbed0698ebe24c290d791bb44c96aa1aaaf77cf1f379d565eb775864c6945facf6d271115236cb44b95e4a4c9bb7cc6fd591acf SHA512 769a17c2095dbe990df148a0105c9e3dc88ac2265ac77ac31448dab6abf6d8cc0d54f5c6ff01fd708bd38700bfea93f57d3bb702bd9bb0a708257d094b2376ec
+EBUILD pytest-cov-2.10.1.ebuild 1396 BLAKE2B eb6d91beeebb87a89f7af47630e53b52e663568bc711c6117beddb534d73c65652e6799ccec1de6639de9cb5018d686db5ce105bf4a3c1cd048b356699e3cbae SHA512 26fe1a217e12c41ba5a830338b0a0d525e21767d199d1cf0f60efc8497094a42007aa435e02dffbafd849be2139d70bb31a9fcef0a1f0667394c447718a65702
 EBUILD pytest-cov-2.8.1.ebuild 1381 BLAKE2B d94212fb13d2e1ab3f1f79c2a6025d64f6f514ae9bc7703dfb3359b5f47a560bbfcf2821055578a28c16e41db98c05d4ca0b5e9def8eab5a499cd3904d617dbb SHA512 40ea68bfc2c03f70161d08e367abd29a86e173504511d1e53e53d31f5aa4718a59ae32db3d0d5337349bf14bcf3db2f79952f07bd36048394d724fea087763db
 MISC metadata.xml 476 BLAKE2B be2e8759e98061a26e63e9431f2d62f5d66dcad8d1e82c88c53bbcf129511a3e443cb0332ee27ad450740b719d164d4feb3f6e176e3541a58cecd34dea96d9a7 SHA512 380f75130a29a9b4408eba5d9dce8e6a2bae7ed25fe337ca1f7ec99e941f06063ea088a71b3c1c5fd3e0b617fec676dc52e4f76b8b270485aef7993969712e3e
diff --git a/dev-python/pytest-cov/pytest-cov-2.10.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.10.1.ebuild
new file mode 100644
index 000000000000..3b5c7c30a5e5
--- /dev/null
+++ b/dev-python/pytest-cov/pytest-cov-2.10.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for coverage reporting"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+	>=dev-python/coverage-4.4[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/fields[${PYTHON_USEDEP}]
+		>=dev-python/process-tests-2.0.2[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+#PATCHES=(
+#	# Bug 597708
+#	"${FILESDIR}/${PN}-2.8.1-disable-broken-tests.patch"
+#	"${FILESDIR}/${PN}-2.8.1-latest-setuptools.patch"
+#	# https://github.com/pytest-dev/pytest-cov/issues/365
+#	"${FILESDIR}/pytest-cov-2.8.1-python38.patch"
+#)
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-py3doc-enhanced-theme
+
+python_test() {
+	distutils_install_for_testing
+	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib:${PYTHONPATH}" \
+		PYTEST_PLUGINS=${PN/-/_} \
+		pytest -vv || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 289f60f54446..12ad8abd7f9f 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -2,5 +2,5 @@ AUX pytest-xdist-1.34.0-pytest4.patch 1839 BLAKE2B 6f16b51b8b8415390d66b5763afe0
 DIST pytest-xdist-1.34.0.tar.gz 66151 BLAKE2B ac5274e32b3ef6b72113efd4300eb6946a977e0e202d3383abcdbc022126b7806edb326ddc16abb1219e22eb091e06a9c39fce3031aaf5943d4ad653a47af142 SHA512 69e9877ee0268d71d7c0ca202ccc46b3ba1a9271f0e6e4ac4b76602833f9b7012364eb6924ae994e76c1d48d63adf1702d4c5e6ed5b75c52ac7ebae958210e24
 DIST pytest-xdist-2.1.0.tar.gz 66332 BLAKE2B ac3c19a32bb9153537edfcf55bc656011661cf0d166da1aba969055a398616bb5782534a12ba354175be722c070fcfb2013d58405048814a3d11434a314e38b8 SHA512 85c69d8e649a19de5639738eae4cb213dc7323d96883ec82f39ab51a196346edd9fadbaf97f9763ac0dea104bc123d521264a39d2701878edfa76ce7e5bb347b
 EBUILD pytest-xdist-1.34.0-r1.ebuild 1036 BLAKE2B f576f44fdb55876e9cf7ccaec9ce5ffeede2095111a48f2455da590cc4c053ffac094b21baad142dc9ed54c654af423b29c4f7719dd32ff49da2d2f149e666d3 SHA512 3dc96e04f982a62f24f9ab9b2748dbd1a97c486ae3feee09b2e6fbd1ae4af6910455c456537453fa48d3cb85e03ac09acd7d26512a054e3aff83b5dc28591f62
-EBUILD pytest-xdist-2.1.0.ebuild 951 BLAKE2B 13e823eb0e3cf6f9127a83aae3930fddc017480118c00da6e8d55f11cb24f4ff4adf016689fe0e4e31190076f75a9aa923fa798c6a85d75a21c91522ae3037df SHA512 ba729fe545ee36876d42f9525c9274d1fdf46c4727e20ea76d09e88fb4d34ff673a546760523c9d23d4a3a585fa33e0b1d580be01c72dd02ae6be0aa7a0cbf13
+EBUILD pytest-xdist-2.1.0.ebuild 1147 BLAKE2B 5f8b2db3dda86e53857ae6155e4c13ec868f744b9113c012ee961cd651584f010125d3ae3539deb5b3bab106397211cea17de81f8c506e9d1fc7e2cc50a4f7b7 SHA512 c9ac3c5c1d0e4d728e0edaa5ae122248a0c6d7ef426573e50274385b0ccca14feb3dc4a1112e00f11a23bf8529a036430b8f239cfde386d0c9cc407dd19ba5a4
 MISC metadata.xml 453 BLAKE2B 9480ffb520fafac8b32ec407fb065a89b67c085c7474032528e6a7489fdb26d288228cb75a502e407d92f0e53283bda58c2632e552d4daf65d37b78d33b3598b SHA512 13ec72148a023c16de4b51f02f8a34f5a29ba26bae56aebd8a89ca7a90f249126f92096d138d41d770eb1053618e58679211f468e3136f594514a936f414b265
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
index de9789a944b9..27e096bc9919 100644
--- a/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
@@ -32,6 +32,10 @@ BDEPEND="
 distutils_enable_tests pytest
 
 python_test() {
-	distutils_install_for_testing
-	pytest -vv testing || die "Tests failed under ${EPYTHON}"
+	distutils_install_for_testing --via-root
+	# Skip a broken test
+	# https://github.com/pytest-dev/pytest-xdist/issues/601
+	pytest -vv testing --deselect \
+		testing/acceptance_test.py::TestWarnings::test_warning_captured_deprecated_in_pytest_6 \
+		|| die "Tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 7c26d087148c..505f191dd726 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -2,10 +2,8 @@ AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a
 AUX pytest-4.6.10-timeout.patch 1297 BLAKE2B 3a5b4005b1aff72b17a366283e692bca19ebd952ef1d5e10f6c702962cb20a83fec48cce5fb0cc35a8da47df2370e85879bf01b9e95f4c271d2d3241f9ea9545 SHA512 f1d2270644e43dfc2ff31ed900456c5707ea19a83447ab80a4d3013e44db36f726676917156930385547f8a75bdbc8835d46d7e6f3301fd51f187c281a5425b0
 DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3f22e2f3bf853c643c5c8bd38f307018579299b700d90034a826db73a3e569857d6d6f7ac6646ace894b35a39b SHA512 6fddf4944bd9fab83024aa2d338d54aaf3d164bd5c7f634357376f3b0d2dab6a43d784e7fb567236c2d2f029151c5d9e2cb36c22e9b551c2c8823c52a2246e9c
 DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
-DIST pytest-6.1.1.tar.gz 1084076 BLAKE2B 61eb5efcffbd5a623c7021e37bbe908522fcfbf42ac56cb45fb7e10e0cd30e845bb8a6c563e86bbff47fba1f0db72f1451eb0bf86862b7e150e29be6a2e80967 SHA512 fc61028a01187f6161061a0c2fc392dd719586780a49eec037a72878de00bc33a81c1bc0e2be01be52b30c7eeea2c590d1a4ec08cb14a955bc624478118889b0
 DIST pytest-6.1.2.tar.gz 1084943 BLAKE2B cbdf29c54118b5daf699f11fb674d37d5972a163a7a53f42f6ddf9224e2d8d9e84b9a88106d5a77e70f470ccbffb15c2cf9a939be69bc0a2cab1fc4c76054562 SHA512 6335e994c5273881c8d1c334fe6bfa9cd0a3e5c251f3d6a9332f7f7c1427e6560ff48d8f235b307ea5eb53491072daf30c41f566bb67b304354fd88d286c61b1
 EBUILD pytest-4.6.11-r1.ebuild 2473 BLAKE2B 4a5edd72d94553b553730a5caa2c17c25826a5be58bce6273d39d2a010a70c1fa1f8acb0751c3fe5185883a94da31ecd7e772f606c82d8d99b639804bd49d5d4 SHA512 da60063475df3b7e9e531b234e486bcafe7c1e926f58f7ebaa8e38cb02233629160aa20a9b665fddb83e50f52b0b46702b8a80e65195af4ff7b3e939927db9cb
 EBUILD pytest-5.4.3.ebuild 1940 BLAKE2B b17bc0f3efe70c149ee494d2528f8e16a839c4cb2965378ab6c8b37e3c1b295bab253edd8410f6f2a69cbeb288d6299898320d387330e2d7b5b31418e985a0d8 SHA512 d99fa3064053e3ac99fadce4b23749e16dc2d9e6658f3ab07b1e68c1885d9fd243f4ab4f5462e127b9afdbb957bb498c41126ce79164a31cb2accbbaa1f4b7e9
-EBUILD pytest-6.1.1.ebuild 1638 BLAKE2B c43166fa602717e4e88285aa5066bae519e881edd4aa4773d8dd9d1edccbf45b3778921b46a2e02fddf288cf3eacfa26581da70d49a3ea7e23643eda167da36f SHA512 252999b9f78a253bf152895550ed60a0c69b66a9de6309b8a98c4f5de42e04befbef39f65ee24f9d59def9a668363e4472f806eb3bbff5c2b5a3dad1c447c1ab
-EBUILD pytest-6.1.2.ebuild 1656 BLAKE2B f7c0cde785cb6eeaf085916a50b4448116e5b05733a771682de619253b827ea157d25e0936c576807281c196f9f1ea568b088089a7c7feadb74c7668399e087f SHA512 3baf9e0cf2a554ca9d352e7fef25a15b625483e1142755f0f5f64bf39e1eaa4d214128cbdd7f466deeb1aaa59b288a96b51d2e9b92711c50de58e7e910ffaaa7
+EBUILD pytest-6.1.2.ebuild 1649 BLAKE2B e304fcdeab06477c09cb57fe7188009ded59ce1a05c5faf2821b1a5442db6ea7532484585665c0b8f82a9184bcd453b897e0c0daf58e326e6da370cfdfdfc8ec SHA512 b2854fae34ea981927f7e5e7611b50ba3bd2271648d300d7c1a27065edf0702c10e65067b890caac9f24e4b4b5d876d97fd545a332311ce5224c8399b29994a1
 MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/pytest-6.1.1.ebuild b/dev-python/pytest/pytest-6.1.1.ebuild
deleted file mode 100644
index 80ac5b35a8fe..000000000000
--- a/dev-python/pytest/pytest-6.1.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1
-	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-# flake cause a number of tests to fail
-DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-	)"
-
-python_prepare_all() {
-	# fragile to warnings from other packages (setuptools)
-	# little value for us to run it
-	sed -i -e 's:test_no_warnings:_&:' \
-		testing/test_meta.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	"${EPYTHON}" -m pytest -vv --lsof -rfsxX ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-6.1.2.ebuild b/dev-python/pytest/pytest-6.1.2.ebuild
index c10d175798ea..83746d2c0f00 100644
--- a/dev-python/pytest/pytest-6.1.2.ebuild
+++ b/dev-python/pytest/pytest-6.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-augeas/Manifest b/dev-python/python-augeas/Manifest
index e61e958b935b..72840a9a5350 100644
--- a/dev-python/python-augeas/Manifest
+++ b/dev-python/python-augeas/Manifest
@@ -1,4 +1,4 @@
 AUX remove-tests.patch 417 BLAKE2B e3a0e4b3fdb42b395fa336461f84feea4dac252399ff266231121a48e659fbfad671d318e9a3212f77939f7e609b3df71363abf8f9f2450e087479869731720a SHA512 3b399e3e85cf12bc5ee2db3d53594b2eee5ba8809bfaa950738730194c2dab16c8b776100b009bdbb520020b0ae276c8b13291139dcb1d48e0887bec72c80679
 DIST python-augeas-1.1.0.tar.gz 93657 BLAKE2B 21d2713d8e11552cc7f0191d2b8f7805b223f5dc9478b89b39dcbd325ab354cef0bfc0314852dc2b071b3b061319b4e27904c0514eb6d6ffd4e39cf7ca33d1f9 SHA512 34e4e98219b9146ef843d94c2e854e951a9b7e81409e603e77e7defdbb8765c013a2c869a4f5db2244352ca35656e18667a0210dd24099cb3e4552a04b23aef8
-EBUILD python-augeas-1.1.0.ebuild 597 BLAKE2B 86cfcb6c43334384b822d56beac8fcd4aed16e67de136d4a1d38cc6193e2cc2808925f7b86f07ea96b22973e90633951c808e12be7e3941f33312ff67f4704e1 SHA512 18c5f8536d439c954cfd8635f497b10dbd09b96370173d2ee7ceecad15a7aea9d067d67b9a59feb72fc355dc101880a2bdfb39514ffe3649e16eff9923021e87
+EBUILD python-augeas-1.1.0.ebuild 601 BLAKE2B 4ad01cbdbbb0d5fcb31cbb5def61e8a2e4ca1de934b1bab73d9082b74b735fb4bdca52f6efd12b2c3ded7af303876bb0229e5fd6b271fb00d13d5c60e88264f0 SHA512 434774a92c0e9c25a88ac13326c015aaebae8a8113d377a14709f53f136bdd96ccbe7f2bda976d374cdd612fb60fe6b5d28ded38234de9e52c483fcfb18a4190
 MISC metadata.xml 422 BLAKE2B 32ea953c135e9cc5fd7fbee8f5371975f0ec23cdb87b257d87d8b969d7d725232db169a65ece36e1d9765906c8dad54f63cc47ee61d554ff18550b403be1f498 SHA512 613157be0df0ca791d4ceef9caca1d0e1724716125321b9672778e984b9b87070c05af2322a3d45969e6211a3671c4e0383ba699f5d5854ab491d5c6113fafde
diff --git a/dev-python/python-augeas/python-augeas-1.1.0.ebuild b/dev-python/python-augeas/python-augeas-1.1.0.ebuild
index e66ad08496e3..7a50ebec958c 100644
--- a/dev-python/python-augeas/python-augeas-1.1.0.ebuild
+++ b/dev-python/python-augeas/python-augeas-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index 6fed71af40ad..434dbec34fa8 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-ironicclient-4.1.0.tar.gz 201589 BLAKE2B 654e5f328676cdf44446cf12725821e65036e963be6be47c7bf390c87dde28df5a2d7673e52397797587d135dd89eaf0382ac724e5ff75ed07af1930d7754b44 SHA512 d2e8536ae91493e724c6f93acd8c85069a888eb11c9084519010e4a6ad96d7d507991c99301e9c9620240291d9f947b67455551d68aac3f126ea6a578e217658
 DIST python-ironicclient-4.4.0.tar.gz 205165 BLAKE2B eac0eea383890d9d9d70594300df5d8771217e0ba226a38da38544e715487c12d3fcace07651b84e180ee0601ae6bb3c17b6ed47130bd009ed351f1e4d270d64 SHA512 8d9325e464804503a504bbcc3211f0e6f50d4a1cccf652960d1020e1cd0141f8ac67ebcbab37ba7af417679fef3f25d5aa48b9e8134fffbc971cff34446fec3c
 EBUILD python-ironicclient-4.1.0.ebuild 2458 BLAKE2B 148111fd8fc0ad6781f2e595d05addf590aa7fcbf80ee0983a2304bd2369c3f1f759c419152280ebe114a52205df23c72319562854bde6c1e7fe0156e9e8bec1 SHA512 205faaf2021bc77e78fb2e6e2c886c74d35e34067a3beb12026cdf3c4b80aa5c3b9816ab54936d52edaebfa6c9ee4e2f5b70871b39702b675c828ad332d35fc2
-EBUILD python-ironicclient-4.4.0.ebuild 1259 BLAKE2B a0957e04eeff93fa9c6edd167d4ff637c6d26eb57cf3e046b9a88bdc5f45579918afb367892a130df88d306161f2d94edab07fa27c9639545df84a18e6cb27e9 SHA512 341b974ab40c0a02149af3d30bec95707cf7369966e5559ecb214e1dbbe5041fb0ba219698984e932714abe1b4c664329570db0f4c3ac0cbf05d054babb061d5
+EBUILD python-ironicclient-4.4.0.ebuild 1257 BLAKE2B 9bec91ba14e553c6498dd07aa118567c970bf8036dda77de8f063a749457d10834b8a53483314e8efd836f52f637d5a6530564b31a91050d9e850465d8d52862 SHA512 5fc841eed7954e0fd072edd23712a47aabb5dfa39f24867a5ec7caeaeab0b7699af201f4e306f7637afa11f27580e61150228cc5fe07b33e950eee1543c07253
 MISC metadata.xml 336 BLAKE2B 6994a6390d135ffa40d25d245d370e770d58a88d19e5b17e09adf2d675054f9294860323e1a0025031937a89213ed157cfa760bb7c9e7bb337bf163f18956d94 SHA512 fbefb91dc86c550661a0289a04cbb1b3c3893637f57ac2c6d0b4d813b4938a7d599ebb87b3e2c628d52746638f0550da2209a0440a27f12f315ac88714822529
diff --git a/dev-python/python-ironicclient/python-ironicclient-4.4.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-4.4.0.ebuild
index 8a1e68c5f2b9..bde053e0c425 100644
--- a/dev-python/python-ironicclient/python-ironicclient-4.4.0.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-4.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-mimeparse/Manifest b/dev-python/python-mimeparse/Manifest
index 31bc737174a8..fc7e7215ffc3 100644
--- a/dev-python/python-mimeparse/Manifest
+++ b/dev-python/python-mimeparse/Manifest
@@ -1,3 +1,3 @@
 DIST python-mimeparse-1.6.0.tar.gz 6541 BLAKE2B 15de86feddf892ee4599e0fe7c113a93f343d5b8afc09725263e2fcb3869f8f152612b9f30dbf68279aa95e2ce8f6ba9d4dc6e8e2b75366a972dcdb705220742 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e
-EBUILD python-mimeparse-1.6.0-r3.ebuild 573 BLAKE2B 2f592bb593d0454f475c2ab0fa99ec173af6e3827ac7e8e8f845c3486828cf5f68b3339acdfdb13af5d5b38670d53dc215aac393fe2fb2bb0849e9fe6c548c8e SHA512 494848b00bc9afbae6b77591b7f4c93938c78db836db0775ef2924de68426e0d22bda1953943f51ee69a17d0be304909125fc7fea460e405583dbbe6958a3a37
+EBUILD python-mimeparse-1.6.0-r3.ebuild 584 BLAKE2B 3921d7a0777cde65885a391fdf8b9e11d1e4e3782398ace5a68a463bc9d9ea2da7763697a39678078d56e412068e92c418bf9e0f475546beed60920894828d7d SHA512 48a7e28733ddbe929554a78dc522e8e179331c2b5b658ac12e7604f0bdc52dd9e07b71b1858a95a07374bbe3bc9ce60af7a734a77b6e1cc3b8fc65ae55da776e
 MISC metadata.xml 419 BLAKE2B 83547a7d24cf4a47a5c32e83aec0fc78f286d0f92252e637a1542d5d9a1d011c6b68c4ef4fcfae376edfbd82a3970673f4f50abe8272560fd14640f7537bcaac SHA512 9a18a36d9e0b85be5f1bc2ec6f8279089e4e5f73b5d77c634b2bc2ca0b39b29886f7e0b4665d4570772f2a1ed68a8e393de80ad0fa5d97145f2bac6366f08b0b
diff --git a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
index db8e5fc6a1d8..08aed71f7cd3 100644
--- a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
+++ b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/python-xmp-toolkit/Manifest b/dev-python/python-xmp-toolkit/Manifest
index 66485237de0e..02b3191ffdb0 100644
--- a/dev-python/python-xmp-toolkit/Manifest
+++ b/dev-python/python-xmp-toolkit/Manifest
@@ -1,4 +1,5 @@
 AUX python-xmp-toolkit-2.0.1-test.patch 397 BLAKE2B 059d415194f4544de5e4f6bfcbc2bec466b14e72e46792ac762115dd8b33bcd87ebfcdc9412695bd5b75483ac6e82024c083725ed73713c1bad100c30f22448a SHA512 f70eb11fe5b46ec0fac9a4a5c56a7a5b9dc75427b53e8159ec873a74afde23ca4bf5940b185932fc566a10f8a47d2ff8e56fa514eac1b06c94135cfa7070747b
 DIST python-xmp-toolkit-2.0.1.tar.gz 3576384 BLAKE2B cbe73d08d101d0d44c368fd1f1c6f1c8308ece5ca26f164f78312d901fb5d0387a5d2a6519d527b3625d11e338df5c366bed8a7361ac822ac887ef8be3a74948 SHA512 46f83b03574b2d742f6c6efb5b94a549068557ad6338e74fc62368c265d05f0b66a4dd36b17cd51b39f7b6cfbfb1210d54cc44c69e9a9e3da3392ee5f11de3bd
+EBUILD python-xmp-toolkit-2.0.1-r1.ebuild 1084 BLAKE2B 1bcd913e4b4b1305a238fb27f532c2673a848067ba50005bef578c412b2fca1f48f9a7df986f5d5983c3a6681b84c6e717af2bd3d81b8d009d089c5525f518dd SHA512 80a4042f9f426f217ebe3de3175209325cdfd7f93728467c285ae3f59d40c5d7dcb64511a3d125352e25ee19d52ff0454803b73a2c0c2495d89b6ec349ee3552
 EBUILD python-xmp-toolkit-2.0.1.ebuild 1085 BLAKE2B 7127d2dd254433a846302392537b60cf8feeb19f3c71354c3f03f38a8447adc0063d68a00caccebb843681618ea80f7aabfcd6016f60e6847d2376f318fa7643 SHA512 85cf382a90321433bd60f4eff385de18cb77902a4bf4e015b2dcb92f9c78ffd3f449f0e697ce3c42b0875841a5fbfefbacd936da5b62220bc37c9b8921c3bd66
 MISC metadata.xml 416 BLAKE2B 5ef9300ed19a8ed256dd6c6958c2350526d5946893c3346cc17550d15754030315cdae84355872f64e09e890a4dd2da5742f8ded5945e3d4fec2f569cad075ac SHA512 64943f03cf1585d994471560ab50e7f2cfb7c7b2f234fa38b6dcbae004987741f4f2faaa728c2570fdc7b776140d68c0437960118ffb3067b03a67de90656935
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..b6bc67c87c0f
--- /dev/null
+++ b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/python-xmp-toolkit/${PN}.git"
+else
+	SRC_URI="https://github.com/python-xmp-toolkit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Library for working with XMP metadata"
+HOMEPAGE="https://github.com/python-xmp-toolkit/python-xmp-toolkit/ https://pypi.org/project/python-xmp-toolkit/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		media-libs/exempi )"
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${P}-test.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index 5823515e790f..c4b74c7fcc86 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -1,3 +1,5 @@
 DIST pyusb-1.0.2.tar.gz 68694 BLAKE2B 8910d9d6d7abd8b0dddf725ad9cc745ce5b06f69a4824a86ed9783918d0fc88d438674852288654964c4555d8278f22d3daab679149c64ea8a6fd3dd2f1cf284 SHA512 6a264b796e17612004196a7a526a7c6df99feac9062f8354540221016411a78a65d413731aea2fc1206ed5ea2b84787078898b9ca3754164f1dfe2a9878b75a5
+DIST pyusb-1.1.0.tar.gz 78752 BLAKE2B ee541afedca7d5dca345c6addee2702ccb7408bb9a2d8b23fe1eb47f067a93309599894e364c0bdcef3e5348bd13cc39f240257efd4664679017f61b87853217 SHA512 0769670e6ebd8b31f2494258eca5d6e470ad3cb17663cc14b8b3a8136ea24caa23f86d81c60c501b88a9bc94b0de6a45aac43c6c5f140e65fd03a589b4d18179
 EBUILD pyusb-1.0.2-r1.ebuild 816 BLAKE2B ebc26592a0d2dc6f4c633203c6c5187d7ba9969720a5ab46ef3fa5d5210aa640a0997b805f0b95c23034984c6b7f733a33adbb88e56c6161d8d69f94b630b749 SHA512 8b80c67d2000d1d36dcd6e4b1398ccc5018390b1d46d2059376e5c4785a90848cd09b08d73a549c48752865904094c3f0c37471bb1674f71ba3760d9961fba6f
+EBUILD pyusb-1.1.0.ebuild 685 BLAKE2B d9615265f004d4c3a2531c356167b6383253359d32458681e1c625da6095f1966a01bfbe77af9e09576b23f85e50f708aea0597063c1a81be3de206ece0c3d40 SHA512 0f0bef72330e27be40aad67dc9d8e266850b62a9ad36fcce54daa57077effa078bde14e9a92e79a70f0745680d333bd33d095e9435ed3fe7b2728449964b6a31
 MISC metadata.xml 359 BLAKE2B 44a04e5fad69cdf343bb324f0367a1b52ce7443d4ef4c6bcd1e7742ac0cb9c6eeb8afc5b250d126c2bf4472c9fca2cce7f9a12a7354372bba8351d0489972e09 SHA512 ac428041984c13af0492c228514fcfabb00d98645b97ff78347c4fee2813df292f52ec9c37dd00392eff6c306a18513bec6d4c883cede2ff31f18c2973bff494
diff --git a/dev-python/pyusb/pyusb-1.1.0.ebuild b/dev-python/pyusb/pyusb-1.1.0.ebuild
new file mode 100644
index 000000000000..f329f17c2418
--- /dev/null
+++ b/dev-python/pyusb/pyusb-1.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="USB support for Python"
+HOMEPAGE="https://pyusb.github.io/pyusb/ https://pypi.org/project/pyusb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+### This version is compatible with both 0.X and 1.X versions of libusb
+DEPEND="virtual/libusb:="
+RDEPEND="${DEPEND}"
+
+DOCS=( README.rst docs/tutorial.rst )
+
+python_test() {
+	cd tests || die
+	"${PYTHON}" testall.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/requests-file/Manifest b/dev-python/requests-file/Manifest
index e55df62af0b0..5af65373158d 100644
--- a/dev-python/requests-file/Manifest
+++ b/dev-python/requests-file/Manifest
@@ -1,3 +1,3 @@
 DIST requests-file-1.4.3.tar.gz 5252 BLAKE2B 18b533a7619f46c1d01d0cabca2137592ff614c2a33ccbe227d4f3ea2e4854b7ecc7973d56b15c72d980d03df7cee38fe4216eae35f5803bbbdb7845f8e3e5ec SHA512 b92294a11c9cc13beb5df598b636d999e0fcd46d05b775bbb69667f066d24ccf55b5af2135aec8d69c0096ca64e13bab3c3da64bee00f0c12edd05f43430d80c
-EBUILD requests-file-1.4.3.ebuild 522 BLAKE2B 72fac7b363ee9de61e98b46048a221c06ff436336a7dc14fd0cf7ae8b8c4d982c01dc2b469793ab93d9fb813c917e11e42bda341927dcb356916d4acf8b33d5b SHA512 566068482ed65384721a8e4dfa1a71f8f5e89c874da074670e699e57f94ceb19d19cb0653355c06642ac349210d609b9a61ca6ba55dfd23e8039bf325f0bec8b
+EBUILD requests-file-1.4.3.ebuild 504 BLAKE2B a1ef6fdc88986bca7087daa78aa31956893ece1b6c715b61fa8f0be76f61fa876e90abca2b475b89ec6daaaabb7147eb74394b075cd17752bb2e3ba7b0b81880 SHA512 7c72d27cf3be88e94d2440e9fe75e683b0cc68da81296496e954424f3d7c689a3177a35b1ddd6a5823fd5fdd2e173198a0773767b5eb84148b731128846fe90d
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/dev-python/requests-file/requests-file-1.4.3.ebuild b/dev-python/requests-file/requests-file-1.4.3.ebuild
index 44ab0065f579..87270485b515 100644
--- a/dev-python/requests-file/requests-file-1.4.3.ebuild
+++ b/dev-python/requests-file/requests-file-1.4.3.ebuild
@@ -3,7 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="File transport adapter for Requests"
@@ -15,9 +18,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index bcab3df10ef8..d567b80a1a1b 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,3 +1,5 @@
 DIST rpyc-4.1.4.tar.gz 1251969 BLAKE2B 8d77d6c80fb69d96847878830c8fd0b8333223b8a2f13389de250bea6c8d9fc79477ee9ddd738776c1f1fdb4ed6d9d349a2d5cbdf3dd4486fe9b11113df0fedd SHA512 50b146fa07c213ad51cc3ba5e29264e5c16a6061fb109b94b9183582399495697c73c38e6e4958989a90080a88155bb140bf8e1ca43e0c6fb1f72eda2795d71f
+DIST rpyc-4.1.5.tar.gz 1252268 BLAKE2B 3669b10e7b9dc28feec33cb8472e74087fb31801564fcd9d9230f88a44dca8c7100a6134ad5c0e4974b8252e6c2f8d33877550facfe5f6c21d8a388e38c9e9f7 SHA512 27f67c7e7bf6f1e94815b3124f300da5f1317e7b454280953d85eca8c7146afc33937ac66a1bb8ac2344b73532ae232b190a647ef90aa723b8b5173b96877454
 EBUILD rpyc-4.1.4.ebuild 525 BLAKE2B 3f7c2ad7f390bccc52cc9311523565e56989b00be475f2577c3c499b1f8c7b67caf8dbc1bf8318b25a6c4e3bb7b23fb6fee8a81d3ab3c088994ad114f69a977a SHA512 9bc70196fd12ac1483397fb901ab04c5e9a1b4607ab8f5393314759ddd1196e3ea967e4410e869c9888b81c25607acf604893da0e207aef0c8e36c9888149895
+EBUILD rpyc-4.1.5.ebuild 526 BLAKE2B c901e812d13e6f6682b867aff0f847de111e9deea828a5c0faa84cef92ad9ff47651131e2fa72dd8e17e3db238fb5588e627d4bedf3d5eb943886ef15638b736 SHA512 8abb54bc947ffced70c416cc5dabc7d5a60fc092d7a5550a89ce9a8a4987f02bc338a3a6dab0b0dd14a0df0596bd6bbbe3c6dd0676be217f347392a8d9c088e5
 MISC metadata.xml 519 BLAKE2B bff6efbebeaa170cc6f51bb81a8401dab34bd7e9ff6c0f4419099904601bfa1170ca7c191ad0da665176662ce8fe4ebdef911b8abe04280d74924865d4e64264 SHA512 797220200ee9ec3d52d30f89e719394f548b8b030390aa8834cb7b1022ad1b1e7b0b8b2dd3a4b9aa4e0b95494330c21276597287132ba3254a333a0ae51f2670
diff --git a/dev-python/rpyc/rpyc-4.1.5.ebuild b/dev-python/rpyc/rpyc-4.1.5.ebuild
new file mode 100644
index 000000000000..98438a3833b6
--- /dev/null
+++ b/dev-python/rpyc/rpyc-4.1.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
+HOMEPAGE="https://rpyc.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/tomerfiliba/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index d1350d556c7a..a90cb0eeaa98 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,5 +1,3 @@
-DIST rst.linker-2.0.0.tar.gz 12861 BLAKE2B f52ddab3c8119f0bac64e294e4a5a3cc50916f19f49ca1ca4983d8b5d2bb5401c6accb5873df38609386e12fcd1cb02b867f3633edd4d10606a98936e96e62eb SHA512 ea9fa95de66c95dc384c888446512be66b180d0d76e99fe7a6b8f8348436d4be959d3d567fa521d9fc925b537467a4fdf05f9e9d17f7a6df4aafd6dfd323e4fc
 DIST rst.linker-2.1.1.tar.gz 13492 BLAKE2B 0f53f3110c4a54e7eb36787ed08f81d0ce551174251203b7184ccbcc0153ee450e8e8927e8989b572b929219b1002019f49167482d59956ad96a54360317f998 SHA512 c49e6b3de41636184f75941d8fa258c2dad3d13a7d82b6221a10f583ada228a96f56abefce7840f93cbae8512332b69430601961cc396f3917b912e369b2b1b9
-EBUILD rst-linker-2.0.0.ebuild 1304 BLAKE2B 3fdfa210eed10fdfb45cb2ec50ce12c82e89ce683d397294f85bbf08c9a56becfb3b4cf4d8c86a31786d0108400466302bca1d7b2d902128916a4db669b475ec SHA512 bc9cf9c4d2483feba77e728ddbac88f1ecea073679de347f49c1ff2ec9aee9289d5638a437613aacfe2e65847ac9094f45614efc72a952703f86eee0699b7b82
-EBUILD rst-linker-2.1.1.ebuild 1240 BLAKE2B 4dc59f2680c9507a20c8a6c5efa1f00218f2dcc47230d43938c3d2e53ce2380c8a5425c99bf407c68e480e3e25cdee27db98cab81c003a6ae4bc2a23fecc2620 SHA512 f0b7d911fcb5f741cab83ceb79b9040099e022d1763500114e7f00fbbadfdf838e3b99ce17ea30fdea40227af9c72029ccb96bbaf9c875d4c56cb15621f9a5e9
+EBUILD rst-linker-2.1.1.ebuild 1234 BLAKE2B 445571b79d57e2c897c53cfe21c8a827ce9752806dc0e42c21155053a4bc0c0f84a0cb52ab4ddfaf6392fa21746b854bc7e325d8662b8471e3a650d993c02e61 SHA512 bc626086b06f41718b410aeb9a6e46f450e74cb3de2408fde2dd167b5b35b302a84365f438e29ad3709f2344b3e7cf4e2e19c615eae63529653aa96d578c2bae
 MISC metadata.xml 464 BLAKE2B 553b3e9fd8b0a5df09e6ff044ecc6724c155bff6ea5ce21ceb1cbf919e1dee65122f8902921235a40b20baf656a54861741633dfa853405785d8ceecdf0c37b3 SHA512 cb0e45d357d9134fda6c859885350414a04ba45d8a5bbf4424f3f4311f0e662aefce70238434392d8be98b0d7ecb6c470f6725935143e88e09463ff3f0519f02
diff --git a/dev-python/rst-linker/rst-linker-2.0.0.ebuild b/dev-python/rst-linker/rst-linker-2.0.0.ebuild
deleted file mode 100644
index 0b9231d4e01d..000000000000
--- a/dev-python/rst-linker/rst-linker-2.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Sphinx plugin to add links and timestamps to the changelog"
-HOMEPAGE="https://github.com/jaraco/rst.linker"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/path-py[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.4[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-distutils_enable_sphinx docs ">=dev-python/jaraco-packaging-3.2"
-
-python_test() {
-	# Ignore the module from ${S}, use the one from ${BUILD_DIR}
-	# Otherwise, ImportMismatchError may occur
-	# https://github.com/gentoo/gentoo/pull/1622#issuecomment-224482396
-	# Override pytest options to skip flake8
-	pytest -vv --ignore=rst --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/rst-linker/rst-linker-2.1.1.ebuild b/dev-python/rst-linker/rst-linker-2.1.1.ebuild
index a38a43049948..58ae2cff97ac 100644
--- a/dev-python/rst-linker/rst-linker-2.1.1.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.1.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 3b49f469d417..fe73386a2f8f 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,7 +1,8 @@
+AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
 DIST Sphinx-2.4.4.tar.gz 5966973 BLAKE2B 727a75eb4ec33beadf80b22cdd8dda02a53f4da4aea10ee18ecae658a69a9bb797f83b0d11b41b8405bf18b2472ea7fd501bea85382c20c5f2a9d5b14a032428 SHA512 cd35b7ebdf4eb41fb3a58706333ca4328fbf9b37999ad1bcc751f9769f0a294464e4def019a403fcd2204ca963ef641c35c957a4145eb50af07573d21df8c74d
 DIST Sphinx-3.2.1.tar.gz 5970067 BLAKE2B 6158d31390c9b07aa3abcdc4eb7ed827cf2160192a2c53ad845f07d5027cc4bd65264ea1114e78e06f9652a8788a8d0e992a8988382787a05bf507a73618cd96 SHA512 3f0f49036a44938abd470c2f825a0eeeeb818daf3dfbb3bc5c746b64305b5fe66c1c34d9703eb9420b2b347247c122825ddae1b6c28c88c249206151f39e3bdb
 DIST Sphinx-3.3.1.tar.gz 5979919 BLAKE2B 4eb9d8c9dccfd83690252ad6be05a3e69006e1e801bb0b37b77fb6ccf998f3a2fd99a90eba890cfb2baa5545ac0c2734fcd72d602fc2d1091e6754337f241b34 SHA512 bb1fb0780b741c0162ca014cb996dcdaac06985d14b6cc645a835679d7cf2680912784a815a027caf3fe902f721f9707bc9e9daaaf2c2d43051d31fe00584f78
 EBUILD sphinx-2.4.4.ebuild 3644 BLAKE2B 28df6a37d7fab6255e893501fbc4a45f427f1928f9e77420806f8eb2bcc2b23f05d2d5eb2b9a04258913555f1401c94c968811b270f4c3a0085340bd7e334ff5 SHA512 f6332488785a0c6795348b76db72a80e3bfc839a3ded793e12ae185941ebbba062f91c10f7dc8aca111bb951f62dc8f86fdd946a80e7253dbd14735dd5d6648c
-EBUILD sphinx-3.2.1.ebuild 4773 BLAKE2B bacbc635f142bc61e76c00929168ced40cccaf6b15820df46a6ff2e70d2074e187a5b3e01be15d94a27eaa7dd23ea5bd9527f53a463498e44a0e8de1e46f1c09 SHA512 f5b8f731a48271b1500697161af150f5027078e1f1dd1024295b6705118ed1c6c4f7d578982ea86f3f5861cc58b906cdd3b95ae41890fc1971c683d415394388
-EBUILD sphinx-3.3.1.ebuild 4782 BLAKE2B d9a7915fa8a5dedb1189c4f8584035f99534fd5a61c934ba930b6f845c55b021425751756741ffc643eaa954bdb19598b3c87034c67db398271a66ac3e8046ff SHA512 5395467362b25affdaf8a6c99fc1b46f8d8071e6f24c114d5ac460ffd149549498ec64e0745d3f7bb89fe72041ebe029f98289d0920eafc7bab831bec3707d0c
+EBUILD sphinx-3.2.1.ebuild 4828 BLAKE2B 7b7b7103673f03d554c61924c50bd1bed09dfb78cc7b3d23eaa6e3c0b2380b18ee7b806063e920d34da3c3ff5b9d03379622830f67f409c98c29e52eccf9bcde SHA512 d18730f233d138a351e6e99da00d9ce289dd7decf98a5ce365055dc9d200b0c0360df25a6a7873b65c9b9efa22790688c0351eb30ec35f4ff4270889766b8c82
+EBUILD sphinx-3.3.1.ebuild 4837 BLAKE2B 28c764dcd0dc3e2c730280a379bfaa0ebc10a2e3ded11e42a4fa9923784f60015cdb33cdc89e815c4e221cb832719995928376c9af879bd35460db53be3183fe SHA512 9c52b6e44aeac8f8917eaff0609d54bd32e5b588bba03c341868196bb93f9e0dea80c97f041b31161b5aaf01de901a62c1a3062ee795483ada5a010b725613e2
 MISC metadata.xml 510 BLAKE2B 878684f285906bb31649cb244f7af0e62ce854d20d260c269c0f1764f142adff08ce690fd778e3932181fa62947a2fa5521ee76c17871d15f73783dbd7730388 SHA512 496e3380982af69d59b05c94b773ff6e9449023e6b9bd314876e952fc54dd23db4a09ad24dfddfd752656445c71631503ae898ad778ad1702385057b047ebaab
diff --git a/dev-python/sphinx/files/sphinx-3.2.1-doc-link.patch b/dev-python/sphinx/files/sphinx-3.2.1-doc-link.patch
new file mode 100644
index 000000000000..0c1b2ad7d98c
--- /dev/null
+++ b/dev-python/sphinx/files/sphinx-3.2.1-doc-link.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/728810
+--- ./doc/internals/release-process.rst
++++ ./doc/internals/release-process.rst
+@@ -97,8 +97,8 @@
+ * ``set PYTHONWARNINGS=`` and do ``make html`` (Windows)
+ 
+ But you can also explicitly enable the pending ones using e.g.
+-``PYTHONWARNINGS=default`` (see the :ref:`Python docs on configuring warnings
+-<python:describing-warning-filters>`) for more details.
++``PYTHONWARNINGS=default`` (see the `Python docs on configuring warnings
++<https://docs.python.org/3/library/warnings.html#describing-warning-filters>`_) for more details.
+ 
+ Release procedures
+ ------------------
diff --git a/dev-python/sphinx/sphinx-3.2.1.ebuild b/dev-python/sphinx/sphinx-3.2.1.ebuild
index c46ed0085541..4e64e33c3b6d 100644
--- a/dev-python/sphinx/sphinx-3.2.1.ebuild
+++ b/dev-python/sphinx/sphinx-3.2.1.ebuild
@@ -62,6 +62,10 @@ BDEPEND="
 
 S="${WORKDIR}/${P^}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+)
+
 python_prepare_all() {
 	# remove tests that fail due to network-sandbox
 	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
diff --git a/dev-python/sphinx/sphinx-3.3.1.ebuild b/dev-python/sphinx/sphinx-3.3.1.ebuild
index f29129962d65..1d28fd613269 100644
--- a/dev-python/sphinx/sphinx-3.3.1.ebuild
+++ b/dev-python/sphinx/sphinx-3.3.1.ebuild
@@ -62,6 +62,10 @@ BDEPEND="
 
 S="${WORKDIR}/${P^}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+)
+
 python_prepare_all() {
 	# remove tests that fail due to network-sandbox
 	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index 0381babed25a..2dcb977779e9 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx_rtd_theme-0.2.4.tar.gz 1392456 BLAKE2B daf2365d74823465a73ea37352f0a8e85f196ac9c89006e79610a2981b1a266e523865c3b6f7866fa9e77a856c5a6fe001a2eb114dcb252920b19231eade9709 SHA512 865b09febc1c289d47a8be3f3d7caa9d2a4715b350e2e2d058855831321a6f870e8339b2ef22eafc2b9fe72ad48f96b8d2fda4bc032c5f8dcdf23f314869cfbb
 DIST sphinx_rtd_theme-0.4.3.tar.gz 5391190 BLAKE2B 6e08e079378c023f160fc3b858544bec6a295b256564d91c49b9ed8b5d2ee87bb2f21a30239f99fd2463840d194fde820c84ccd8e0b908f96fb7e5ca0fd9e6da SHA512 44b9309ddd041181542747c70b6e180c07aaf8cd7ee9e4c7eb9e3948685b8bd578e815c022bd991cc7f4bc7d02bb3c7a6d213e5d0c2e8214aa85d50b73e53853
 EBUILD sphinx_rtd_theme-0.2.4.ebuild 530 BLAKE2B 24792fa3bc71996a62c4a6ffff9f13e821b3840c4f69837424be49ec310b6c9aba88603cb117646499bc53c545ea222c42549ffc2a6e685ab56d551757f1147a SHA512 db6eca3195cf032522a5efa413f2009133af06f9290aa6d04d6a5e624253eb761b40af9e2206cb20c5f131c48a9efe083a8d4efac9f9c425afa995bbaa575ebd
-EBUILD sphinx_rtd_theme-0.4.3-r1.ebuild 638 BLAKE2B 9145c3379182469bc44c44b96fcd1e72a5e4fa29c46742b67e661d6f74818776f1fc14f4d04173411eb018696e89e9ba966def1665062cf72034a751f1b82511 SHA512 f208083aae0b2a89e34359c8498a88bac0ca119f5d2273e13b84db0fad0472a8afb8d0f890718abb0561e7b633ec24e881229d0853872b02fd8926694b76bd2e
+EBUILD sphinx_rtd_theme-0.4.3-r1.ebuild 649 BLAKE2B 03d9ec0b0cc2928c8694399330c27885d250e67b80bbf8a6f4336c30ffca6cd9f4b06ca9f11945d394f2be1007de1fd4425aab400efcc2728c58959d9e86e7f2 SHA512 cf3eea64595b37d8e09c22cc838104c81352ff088c2767bddec4fc3146454f1ac58ffbf80c0430018c9f20385aee03d4957094d1c9a04f1718cbbbd929aad491
 MISC metadata.xml 418 BLAKE2B fe6864764dcebdf3a58e27839031a1559f626bf9e978b8a3d0b4821e8b97fcb705e9d4efd113c009e810a2a8dfe0ff541904a28ce090ab4e1f275302771a244b SHA512 b52facf796826029a795da70e00eed180c79c8b5bb4ea9ba7f95e5afa930debded9b2003c3dbf5a622deed093cab47a657142e567f2e1b639afac53e23e4ab04
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
index 13ba208b1fab..1a929b05072e 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE=""
 
 PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sshtunnel/Manifest b/dev-python/sshtunnel/Manifest
index 81439a8969c9..c15a9547c28b 100644
--- a/dev-python/sshtunnel/Manifest
+++ b/dev-python/sshtunnel/Manifest
@@ -1,5 +1,7 @@
 DIST sshtunnel-0.1.4.tar.gz 48330 BLAKE2B 5fdc5dd602274a16025f250fcc3a36453a17c921f51367cac0cb0ef36be6251f687b53b1df6072d1e32456a5c0fa5ec6d2fd8e5d4874977a641a6c9ba81ac57c SHA512 c228fe79cf5172c950777a40b27ababd42a31b7aad8a8472d55a2b3babf5aa4c5308799bb271f33f0e943c309eb9adedee321045a03324cb5e30a385178751ca
 DIST sshtunnel-0.1.5.tar.gz 49345 BLAKE2B dde497296ebf84cd34a485ac82de3ca138671b4b8ad2d2307a5e40dc0bb9c6a6daa8c8f3888db942133a9a0fb5321c240c5f2db7c93baf824c9cefaf361ef7c9 SHA512 ae804865a83bae8443cff1a73b168ffb8aac0c5c4fa6c7a5e142f4f95b4eef34bc7674588fa8797fa35b2685016828bcb137f4102e84ea15089671cf64503d17
+DIST sshtunnel-0.3.1.tar.gz 51392 BLAKE2B 9cf5c0e1f12489e482abf73e74d1a59bdc619b5248265add15744357ef49bf502e013b9d4494efff27e45817e0728f2cee3629f5cf21ba9849f564e84ac9c4a9 SHA512 5c24243cae959cf38f2cdcad4351950ca3abd1c6d289829b6603cd8e93b8d61480c4c7b3607bb38615854825c0bf08890c2362f79104c8bae7f9bf8e0931aa85
 EBUILD sshtunnel-0.1.4-r2.ebuild 517 BLAKE2B 3d24f8164a062e965819996c9468a17a7952850d9bafc47413a785ffa6e24e1564df8df41b71c135080293cd1bee46fc9f2e30caac06030644a495f6798eaccf SHA512 0a5c5fe99ef5f29534ec7bab70403db6aa26811dd6caabe8894b954d6b3b732294004a6e70703e160a3300f13795158acf479d53580584153205f2613f06e05a
-EBUILD sshtunnel-0.1.5.ebuild 559 BLAKE2B 133acbaba8fcc00863909fd91acc12d5bbed9ebd896b4d865d005a678428ed513619aeceb968f0c9f4f72b9446f479c38dd69ca9f0ad1dfeb029600d69449ab6 SHA512 1d6397eaba1c1e4d856ff3546d8968986c7a1e96d8a8aff015fc31263e8e53754f0a6f5ad7e0de06621f480ae9187cfeee99b15e1d1cca0f1b6c057ebfb11b27
+EBUILD sshtunnel-0.1.5.ebuild 576 BLAKE2B 5f4f68150051b949aa4b13922dbe07ed79615e33ef020eb2dae9b37808d2c0a18a7a25a938f43a3a31b12f5e26450881cd147f5797ecd18cfec83996202b549b SHA512 b7f0e4825f559b41805c8f2a44300559637fd34df306bb8dfe77e41b394feb1cdf1dd9a4718b22e71c330ea3e2489bff9ace89ed3325fb6cc02033a65f19ef6c
+EBUILD sshtunnel-0.3.1.ebuild 482 BLAKE2B 554d6e677c4758cebfd7cb7997fcad3349084bd3ab7c99165d95269df16f426d4b8f3fdb86d8575e00b727fb2d232dfe619a3f7a6f4234b03bac04a7c3e78776 SHA512 6ccf2379f98311a068ae6ecf79687d03a829c1bb079165f345e09bd4f2f1112a927e92ad30d9736d39a700e947d087bccd44f221c0e219cd436953a6519c63b4
 MISC metadata.xml 277 BLAKE2B f1f50c34f6cd6f4e01a299e2fd72bd63dcb98f1aa4c61bf2325e26b4eac35add9f8de3303ad4cb80418729c098f5341f812148f5fb708605f756adaaec0a2f38 SHA512 1eb2a8563fe03e2174183b9f546541550d2a1689f5e710ce75a6840fed412c5244391584d30986a08624ac9a7ff13170231bb4811cd08faba475f1bbf50cf768
diff --git a/dev-python/sshtunnel/sshtunnel-0.1.5.ebuild b/dev-python/sshtunnel/sshtunnel-0.1.5.ebuild
index b20a6d1ad096..147851ff41bf 100644
--- a/dev-python/sshtunnel/sshtunnel-0.1.5.ebuild
+++ b/dev-python/sshtunnel/sshtunnel-0.1.5.ebuild
@@ -23,4 +23,6 @@ DEPEND="${RDEPEND}
 	test? ( dev-python/tox[${PYTHON_USEDEP}] )
 "
 
+RESTRICT="test"
+
 distutils_enable_tests setup.py
diff --git a/dev-python/sshtunnel/sshtunnel-0.3.1.ebuild b/dev-python/sshtunnel/sshtunnel-0.3.1.ebuild
new file mode 100644
index 000000000000..2f97b87074f3
--- /dev/null
+++ b/dev-python/sshtunnel/sshtunnel-0.3.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Pure Python SSH tunnels"
+HOMEPAGE="https://pypi.org/project/sshtunnel/"
+SRC_URI="mirror://pypi/s/sshtunnel/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="MIT"
+SLOT="0"
+
+IUSE=""
+
+RDEPEND="dev-python/paramiko[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index b921bc2369fd..22bec9778f26 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,3 +1,5 @@
 DIST stevedore-3.2.2.tar.gz 512174 BLAKE2B 60061f04cee8b4ab1c95ab7c02083abd15a623970168df379c82860bb2ea9b27171f5862851eb194c88001b02878eacab4428a76cbfbe528e7246b3e492abfe1 SHA512 1c3f81157b16af800c1caa971f063c50638a70eced582dbcffafaf7d9bbd4e402f75003fcd73b3cb85940bbe9027bac24e37754ffcacffb06d133e938e07ebcf
+DIST stevedore-3.3.0.tar.gz 513293 BLAKE2B c1eee40a451fd6cad033a618a15cb62e65dc4ead8d2dd9eced4278cd11b1daf0f6fefdba2f2fa8dc1a63b6c525b1a3cbb87c8db12945e7412ed76318ee42592b SHA512 4fdd13c08517aef69700566fc04fb26a29b5a72f73a476d656d134b0d99229a8cf0012d9f1ae4565ffab6fa30e745a013d96da8eff00f8316ae1b5010e4cfbb3
 EBUILD stevedore-3.2.2.ebuild 1119 BLAKE2B a542b4e9dba2e54def5cb10ad288ab2c77ba602c52d455ee7ad1435660423df4b81c0d8ef3663a07a6ee0e99fa9509566f61ddbb4046888d67a676046c3cca3f SHA512 9d2cf7d8898db0692176b1b7e6813ee3d9831510156931acca77901ad5743579cdc52c3c4e97c7d3c662b33e4a3f1076ba4f4655d06ed16370ea6c3a46864833
+EBUILD stevedore-3.3.0.ebuild 1091 BLAKE2B 856270458128189581884685eb74cdbc6f0c7aaa29d112f8faa81bf089ccbd3f2e52de3fa721dade6ef865a947a59a810ef9c88db67497bf9931455605c44480 SHA512 5314cefbe430e37afb01bc38e174c813b54dc99bfe6e04562048604e4b1661c43c3443a54ccb77d3d11256154fc57aaca525b3a139db45075944a374bc6b7c48
 MISC metadata.xml 521 BLAKE2B 6ac47530dc97a775a197bee97ee62ef419c402a134cb6785ba953a9efdd94bf0c4a79f01dbb7142774e9be25087334efbed7ad1f00b68544cdff9de8807078e5 SHA512 549144ae7c90fffb566c473e7301e3a461b47911cf7d2b1c03b5d0a39b1508f3462365e0ab27f5638d08c677556c8d2348a33b5fa018c68a5c64b2965a545fd2
diff --git a/dev-python/stevedore/stevedore-3.3.0.ebuild b/dev-python/stevedore/stevedore-3.3.0.ebuild
new file mode 100644
index 000000000000..794147a53879
--- /dev/null
+++ b/dev-python/stevedore/stevedore-3.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage dynamic plugins for Python applications"
+HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx 'doc/source' \
+	'>=dev-python/openstackdocstheme-1.18.1' \
+	'>=dev-python/reno-2.5.0' \
+	'>=dev-python/sphinx-2.0.0'
+
+python_prepare_all() {
+	# Delete spurious data in requirements.txt
+	sed -e '/^pbr/d' -i requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/testscenarios/Manifest b/dev-python/testscenarios/Manifest
index 6bc8ed2c57ad..68b94be7656d 100644
--- a/dev-python/testscenarios/Manifest
+++ b/dev-python/testscenarios/Manifest
@@ -1,3 +1,3 @@
 DIST testscenarios-0.5.0.tar.gz 20951 BLAKE2B 154915281456aad3353e144ffec8404514622fdeb8d2129ba530d3d5a02814599c2fead9dc25ab4904bad68b2892a435f9cbbcde92503d71477624bbec154f53 SHA512 f08b868babf504482369c5cb945d3e95bca1cc00f92d5013f6898c488051be0c26dc49aaabcef362aea45450a8d041d9826fb6b5c848beec013fb102d6935521
-EBUILD testscenarios-0.5.0-r1.ebuild 872 BLAKE2B 81350b1d4f65b636bca8a90e36b359d1ca43ab35c70ae943ae7db4dd6da7f91ad4c745dbe01c3c984b8d12592dc02181dabfc5bd10e4b1a9395fd54fecd9b52d SHA512 23b566a14bf5353efdaef703477be27d77b5f7fc7748ee654392e295936cd4dd98150a636f3352833ca0388a2a07f7070180aa1d5f34729aa00a59e5662b7114
+EBUILD testscenarios-0.5.0-r1.ebuild 883 BLAKE2B fee6ea768d51760040ff23717b5540c1e94530b258e15cbc63038f72838197d3ad7f99a0c6ca8f7ef231cf12edb1bcefd3f197d2bd870257c3cdce0ec8ad989c SHA512 535cd5603a9c1f322a073e8a2542f8022d89ec26e9562fb556d88038594fafa6547117d334958e2ac32b8a0d877ba1db5bf902189bebe2e7baa869c1d2a695be
 MISC metadata.xml 979 BLAKE2B ab0d7bfbefdae5ba546ff15669d1caec70e59bf398e6e2ae329821bb141aced038cc946fc309b79a0348051352f7d758e24c081348d6a7e587fc326df14dda09 SHA512 f043d2244673a34d80a88f07c79ac199ad6b2509c3af7a7e934c94330bf745e2dbfbf78fb7f38508cdb1968a87e30cea3e346aad63eb93f94ca762461b3d20e4
diff --git a/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
index d8cb4ec3455b..1f9874d77b65 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index 8c1bc1d11de9..7e3d17ef3cc0 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -1,4 +1,4 @@
 AUX testtools-2.4.0-py39.patch 4816 BLAKE2B dc5198c0c8baab37ae645d97cb93c860e737142b691d00f96e35574dd0e77f8a163d4031a4b96aa9f28664af1a3a58552565bf5d887cef00c72e13ba9c3b3ea9 SHA512 a554d49e74f43269a847d767611f86fda655fe9ca27cf182c91975702b6928b4161e12d78283113b88b4d50b9fce240cd4fbf236e884e8b92698bdd512c42598
 DIST testtools-2.4.0.tar.gz 233032 BLAKE2B 8b0559039bfc5e18dfe8d70cc10f6e43ad2e1fbebf7d20d9c6c876c5672a6149064f558150d8eb09f569b82983ffe67e06143b14a1d8869efcc585839d6216ae SHA512 af26e163a4caeb207a554b19f86c7892ab5ebe904c144d85273464e880cd18a991c70a77ff817aefb15768fa38f382e9ed853cdefb212dc697b24072e17535c0
-EBUILD testtools-2.4.0-r1.ebuild 1238 BLAKE2B 530a67fe023f4c492eb090ac9f2241f57689a4bd1e69e0b9f30abd02858feeb190c876236397aa75631d79b8ca3d8171561b7d78c9a17e6375ff5cd5828d7e7d SHA512 8aef3f46cef4a3a085064f2adf13a104623797c1efc79a76dda5131cc4ba04fb4b34cb5f6b8b4182001a12406ee256ab79c4994a78bae3928f370dfefb48e6a8
+EBUILD testtools-2.4.0-r1.ebuild 1249 BLAKE2B d7b7a0feb35695b235f6f12fea54c76a7e9574e0719144a0f8297a4b5b5b7cff9f2d01736282d1826fcb4c48f15b39dd4413481243c3ab1357b4fabcb33797e0 SHA512 4823cdaf0478587a68f367801b15ff9d6e82697b5fb27674a7c8f43adacb0ec993ed4a523127b38ec2f4194c3b6c040be3915d6d2320ad8d74e8b127c76cb56a
 MISC metadata.xml 579 BLAKE2B 60320e15f2101c115cbd946efe6a2c8cfc12645a005bb9727f5c4fb7d28d91081f2b96b6120ad9a36a7bb6af61d7110afb97b7985306dea3d57427af834a8112 SHA512 c3c8805d1a8d7cc406104548d1d89ce8074ef989a623b5190da1cc1bbe9ecb8e6f181a6c05e5c74b87bc3a3fc27c6713642070f34d4961e385a470820ceda0f0
diff --git a/dev-python/testtools/testtools-2.4.0-r1.ebuild b/dev-python/testtools/testtools-2.4.0-r1.ebuild
index 3907a8e97079..ba14ced54848 100644
--- a/dev-python/testtools/testtools-2.4.0-r1.ebuild
+++ b/dev-python/testtools/testtools-2.4.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/tldextract/Manifest b/dev-python/tldextract/Manifest
index 6fd384324b3e..d72f8a8f8e12 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -1,3 +1,3 @@
 DIST tldextract-2.2.1.tar.gz 54538 BLAKE2B 0abfb1982d0b9e9cd767bc64db289da8bf2f58b599eaea7e703adf36934dae0d052170fa9a8205b8ac0b441d8f1ac75648ccc108515586b0bcacf2ecb43fef52 SHA512 db4f14e514c0e68f85f28226343d7ec91ceea2843ee01c9a2950f0972f365bf343640e07cfb118aff52bab975719be71d179fc6b3bd4da7eb62a47b62747cc0b
-EBUILD tldextract-2.2.1.ebuild 642 BLAKE2B beae6ccbe289e32c6fe8ecf52ef7d37c4228f1256254140d0284b8c6a546d1dd97d218fdd66d9a1e1586d4eb1ac90ca8c07698cbb22d4f2f74ac6c1a2b5e3bbf SHA512 6ece98cd41135fef99b48585c58ede32591937eb1788a970352f6e2d2d373466f9ba5e4906bc25c951ad42e7c630b6d39edfa8f1a1bd505fd9f94d7754de28e9
+EBUILD tldextract-2.2.1.ebuild 624 BLAKE2B 9feb2ca725e50ebdfc41aabc06d7d4b27cec0eefc3a0634e1dd7121a118d0934b390c12ab3b11aae095f1675dd2d5f7c815aaa91a2f8f72aba8a91a8dd206a0a SHA512 e51652f7b3d0bd7c3386fe9550416d50c7282179638db4abac9d0422036841cb89d8e81c7eec993f04fd94ee94ab6c3f246bc70bea3f8bfa6a18a28492f9e316
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/dev-python/tldextract/tldextract-2.2.1.ebuild b/dev-python/tldextract/tldextract-2.2.1.ebuild
index e47d3e81ce18..24f681f3e558 100644
--- a/dev-python/tldextract/tldextract-2.2.1.ebuild
+++ b/dev-python/tldextract/tldextract-2.2.1.ebuild
@@ -3,7 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL."
@@ -15,9 +18,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/idna[${PYTHON_USEDEP}]
diff --git a/dev-python/towncrier/Manifest b/dev-python/towncrier/Manifest
index c145d7a2a02b..4325fd8fde3a 100644
--- a/dev-python/towncrier/Manifest
+++ b/dev-python/towncrier/Manifest
@@ -1,3 +1,3 @@
 DIST towncrier-19.2.0.tar.gz 18089 BLAKE2B d1e17e707b90089b19d9eedebd898b71fcc9a582cbae0166650a6bd52a8ac6bb3921a458a6d2c10e5930b92230ddf5efc5a428646c464edb6eb4bfc06949e217 SHA512 60999446c4ae404fb54ea6282a862621d49f62a2488d31eecf8fed9dd7afa6e01f4feac6e3dd26b882ee75f747424d63d05521e33b5f6b8df7059ce32dbe5c4f
-EBUILD towncrier-19.2.0.ebuild 916 BLAKE2B eb1ba99a589b9937a055442c210724baabe6bd90bb2f334a08e25bee97c5d4b85601e382eeb6f5daeb1ee07b7a53a0cb934fdc8e734e8eee66191eb7efdc8871 SHA512 4ea04e215e46e2742586bbbb24335cec4f721f5dd4eab0c3e2f8e2837a15b230dd20d948293e43de13cfa1efbbb903aa0ba9ddf00615f48415e6df8fc40484c0
+EBUILD towncrier-19.2.0.ebuild 927 BLAKE2B 3839cbf38048f9fb2bd805967aa09d54536b2bcb508ee817be45fb29fe6e404caf86b922d17b86b1995431a0bf73514a25ae13e7c713a234f1db998c76fa81d9 SHA512 8fa1dde5b44a80d73e06d7e83d70f48fae5adee0bbd7a76317973057237c3f1da64d707fa2cdbe5d23bce63c548beba0c4cfb7dd17e6c38e209e85b9e120be49
 MISC metadata.xml 312 BLAKE2B fb9710abb0c693626d09df383f38a85e69b165f13f76aac9ba46da772e04d2679f4898dab39ed4d383854a4338713c24a389b7ac37b797eb78388e696c8191cf SHA512 4f75330d767fd48bd21128ea81256aa5c5031e0898eb07889a5ebf4c2275e7af174e715500a0724428bf8ef5d8051d29d2a489fdcf557b19a88d294b4c85e5b2
diff --git a/dev-python/towncrier/towncrier-19.2.0.ebuild b/dev-python/towncrier/towncrier-19.2.0.ebuild
index 7057ea9ac92b..9fafe23de3be 100644
--- a/dev-python/towncrier/towncrier-19.2.0.ebuild
+++ b/dev-python/towncrier/towncrier-19.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hawkowl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 44bbc8b70a12..1e466c32a26c 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -11,5 +11,5 @@ DIST Twisted-19.10.0.tar.bz2 3118485 BLAKE2B a0d532b67177aa017e463bf823d7842d4f6
 DIST Twisted-20.3.0.tar.bz2 3127793 BLAKE2B 2e85fc3ec26d89e563c9e79a5d2adea81ff1745d18f0f92b8d45ae3729fbddf09998664257880372c7a4caeb5977c5cad7c863596b8c27ad7890275cead9f763 SHA512 1b850e5fc21a3630ead4c2cc3622c16e78bb3be38ab11d021779b7ce3d3c30acc4e19d79c7791a5fce6c5c6e09c2baa349901dffe952de67dd98eec419846365
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
 EBUILD twisted-19.10.0.ebuild 5779 BLAKE2B ff2e99dab9506621df1f30a47435a3bba2e689e26722fb1b6fd110e063422f5e5cb9250de71e7acb528caf22eb3ec9022cd790e096acf93fbebe37b27fa22fe4 SHA512 cf4a6b161e4958e0de605d271cfa3b84defe1cd2703e692b79cefc5c98b19fea2d1463837d7554655165795e161d59aab26751997df3efb08cf4e975b847fd89
-EBUILD twisted-20.3.0.ebuild 5602 BLAKE2B 4df15170dd2ee5d93582b65c7e7a550a093adc7ddcf0289aa0249809726419ab3429cd96e8e5b5d99a5d14575f7526f04b2cd4cf5ab1a2171537462a0719768d SHA512 14c3feccef79b0b21ba520376effa36dafee9239b61e0cb067d7f6e00bca6a0d79a112b12f854854112e2c931e669e346cdb3bd2a03bd6755b84cfa5acffc6aa
+EBUILD twisted-20.3.0.ebuild 5613 BLAKE2B 6e304e7da39dbc7a026081d38a0ee3ea94eafa323a83b12f01fb5218a4f9734957920f720ded4f846cd2c2666745935e5b2e69c3707fb157387675663e603498 SHA512 bfa57c9bcbe77156dd8fa07ab1b84f0b98bf0a4be7bea0a8e11045b5bc69bb6387f6deb900a915154a8f19059eae277f5340804da1b0fd7d9abbf44393ae4e86
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/twisted-20.3.0.ebuild b/dev-python/twisted/twisted-20.3.0.ebuild
index 7cfc88b3bb76..4f823da65ca5 100644
--- a/dev-python/twisted/twisted-20.3.0.ebuild
+++ b/dev-python/twisted/twisted-20.3.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
 SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index ce87121dd9a8..70d93a478c29 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,3 +1,4 @@
+AUX urllib3-1.26.2-brotlicffi.patch 1909 BLAKE2B 4e65bdba60b451353eef07f2c21b8c08f93952e31a1bb285507e337aae2e0a429d38902ceddfb9ce223a7b2ae7a91a6d375fa5f9abb3b9bb7bc66ea208745f90 SHA512 530c0660e0a134b22b6ca11f6b13ebb001a8ef3a23319044aa11d8d40d9b27d3671d3c0b455f3547fe4605c990084a0c5082a8ce853628c22d8c3dc4592318ad
 DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40189561fa0ea393a8a2515b24da9a2a383aeec35b55bdd2a9954d3d585450d759548358ed91ecfdb9ec03d391b6 SHA512 9939e9e7c4da30b5effb334969cd835c9d0404a136761098203c699570aab02e63fb3f1b4ab680def0bc0906fabe5f0782ab94cf3095ff10ccf9b3c371653cf2
 DIST urllib3-1.25.11.tar.gz 260300 BLAKE2B 06bd2107bad479e36c6474f95567c3ecb119d18b193b358df9e345e4d09392366255b21597b26fbf2374220b921cc2117a1972f88021c3a6ebac3844a319acbe SHA512 58f77edb9ced62cbac7b0baf2651c07f9f413267f103730ee25f08c5d4d0bf52a2ace02f58841bcd55652db677c7a1dc9a756681e7e32d590bc69d8b93e8f173
 DIST urllib3-1.26.0.tar.gz 291709 BLAKE2B e750bcd28c6205cb8e7f12c2a1c6123d48979877b206914fc122f67ff6cdf3e16e5d7ee0ffae1f4af40f028075f9592cdebf8856ca7e29b541283a8023afbf0d SHA512 5e5a78486cded9a378532a094818cfcaf6ec621d3aefbffac4c78f130798ee06f08e47d14f3d154274a502c8c1e3963a12d65030ba6109108ed786202637bd42
@@ -7,5 +8,6 @@ EBUILD urllib3-1.24.2-r1.ebuild 1703 BLAKE2B e1804f51aa6a97428113bf331bae402b83a
 EBUILD urllib3-1.25.11.ebuild 1881 BLAKE2B f2a921171089005271e27668bd1c48f67443dbe116319da9f43fec2b235045b5ed5ebd5f4349aa0c48e0f45f9b11b7ffde5a1ecfcb8d1c675b2ca95cd578c8cf SHA512 11762392c093a018d44cdfe6b31ae885614e326e61f81461cc22da982d1b98713fbf9597c20dad9ca8b04fb7568c8aa1e1abdabeb542abe9ebe13c8f565a2440
 EBUILD urllib3-1.26.0.ebuild 1890 BLAKE2B a25bbbeb8323df1d49b70a64693cae36153a7d7b8a1c146fe3f61db1fc402ec2ee119ca98da4c7d564c2956b3b1bd9c8efa55a86c84d5351397e64e0c737059c SHA512 40d5958b457670f4e37daa87276ff82a83feeb3cd611fc0b847960c3a339ca3d1860dfeac9fc00628eb2e63e09827a7b022e85f1685419d7e46184689a5465d0
 EBUILD urllib3-1.26.1.ebuild 1890 BLAKE2B a25bbbeb8323df1d49b70a64693cae36153a7d7b8a1c146fe3f61db1fc402ec2ee119ca98da4c7d564c2956b3b1bd9c8efa55a86c84d5351397e64e0c737059c SHA512 40d5958b457670f4e37daa87276ff82a83feeb3cd611fc0b847960c3a339ca3d1860dfeac9fc00628eb2e63e09827a7b022e85f1685419d7e46184689a5465d0
+EBUILD urllib3-1.26.2-r1.ebuild 1825 BLAKE2B a3bc60046df89ddfc65f3beefa400a03c8b4d01bf9c8b95defea674e5637469323e8310b2cd893973bc13ed3d97cf42076a2a6f07e8e15a9cc53f618ee46d885 SHA512 1393694dd64fd19f4b823cbad68027e65a96402c425ae2c818a74f1b4b466af48f0450a73711f30e6c90aba2e4eb2e5394341ecd7f95aea99e9c903a7ff86d6a
 EBUILD urllib3-1.26.2.ebuild 1828 BLAKE2B 3a27af42833ea21292351a0d1fb903f5a5da4d270028a2ea5034932e416b4b6c1eee05b3f73515c5b8635d7154f4829c23fb1e45a1379e0005470db96e593cb8 SHA512 89b717a8434b6833994381b095ece61ae7cd89cfa70c68441ae3119cc1c277f6718903f19c6ae36fb8ed3bce40dd308a81e28edff90ba78ba46385bea079d1f5
 MISC metadata.xml 548 BLAKE2B 47edce866bd0c727c4b945630c97f2944c34f8e81c43bdbe57e28c4859dd3e681c64eb2d3b75101ad41c85587890ddbc819a2fd04188331dd5fad23a1d9d0ba9 SHA512 014f625e8de5ea3f00628fe360db47dde9dc82efd0b11218b4118a20b7638bd4e6ac14253888073740c0dca4a19a196567cc2af1864d52f3e1c959389c77c9d2
diff --git a/dev-python/urllib3/files/urllib3-1.26.2-brotlicffi.patch b/dev-python/urllib3/files/urllib3-1.26.2-brotlicffi.patch
new file mode 100644
index 000000000000..b7cbf9bb7e9e
--- /dev/null
+++ b/dev-python/urllib3/files/urllib3-1.26.2-brotlicffi.patch
@@ -0,0 +1,65 @@
+From 14bcf7004a143f7a6fb2df9a48196a113d531f50 Mon Sep 17 00:00:00 2001
+From: Seth Michael Larson <sethmichaellarson@gmail.com>
+Date: Tue, 1 Dec 2020 20:09:32 -0600
+Subject: [PATCH] Switch to Brotli C bindings for CPython, brotlicffi for
+ non-CPython
+
+---
+ setup.cfg                   | 3 ++-
+ setup.py                    | 5 ++++-
+ src/urllib3/response.py     | 5 ++++-
+ src/urllib3/util/request.py | 5 ++++-
+ 7 files changed, 16 insertions(+), 18 deletions(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index 90b79d8c5..31a465b58 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -15,7 +15,7 @@ requires-dist =
+     idna>=2.0.0; extra == 'secure'
+     certifi; extra == 'secure'
+     PySocks>=1.5.6,<2.0,!=1.5.7; extra == 'socks'
+-    brotlipy>=0.6.0; extra == 'brotli'
++    brotlicffi>=0.8.0; extra == 'brotli'
+ 
+ [tool:pytest]
+ xfail_strict = true
+diff --git a/setup.py b/setup.py
+index 2d449b095..02071aa58 100755
+--- a/setup.py
++++ b/setup.py
+@@ -109,7 +109,7 @@
+     requires=[],
+     python_requires=">=3.6, <4",
+     extras_require={
+-        "brotli": ["brotlipy>=0.6.0"],
++        "brotli": ["brotlicffi>=0.8.0"],
+         "secure": [
+             "pyOpenSSL>=0.14",
+             "cryptography>=1.3.4",
+diff --git a/src/urllib3/response.py b/src/urllib3/response.py
+index 77b6ffc16..d277120ee 100644
+--- a/src/urllib3/response.py
++++ b/src/urllib3/response.py
+@@ -7,7 +7,7 @@
+ from socket import timeout as SocketTimeout
+ 
+ try:
+-    import brotli
++    import brotlicffi as brotli
+ except ImportError:
+     brotli = None
+ 
+diff --git a/src/urllib3/util/request.py b/src/urllib3/util/request.py
+index 6cbdad9b4..64d40641d 100644
+--- a/src/urllib3/util/request.py
++++ b/src/urllib3/util/request.py
+@@ -11,7 +11,7 @@
+ 
+ ACCEPT_ENCODING = "gzip,deflate"
+ try:
+-    import brotli as _unused_module_brotli  # noqa: F401
++    import brotlicffi as _unused_module_brotli  # noqa: F401
+ except ImportError:
+     pass
+ else:
diff --git a/dev-python/urllib3/urllib3-1.26.2-r1.ebuild b/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
new file mode 100644
index 000000000000..2345ae630e33
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.26.2-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="https://github.com/urllib3/urllib3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="brotli test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep "
+			${RDEPEND}
+			dev-python/brotlicffi[\${PYTHON_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
+			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
+			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
+		" python3_{6,7,8,9})
+	)
+"
+
+python_prepare_all() {
+	# https://github.com/urllib3/urllib3/issues/1756
+	sed -e 's:10.255.255.1:240.0.0.0:' \
+		-i test/__init__.py || die
+	# tests failing if 'localhost.' cannot be resolved
+	sed -e 's:test_dotted_fqdn:_&:' \
+		-i test/with_dummyserver/test_https.py || die
+	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
+		-i test/with_dummyserver/test_socketlevel.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x CI=1
+	# FIXME: get tornado ported
+	case ${EPYTHON} in
+		python3*)
+			pytest -vv || die "Tests fail with ${EPYTHON}"
+			;;
+	esac
+}
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index 10fbcdf7e38c..daab1441ad06 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1,3 +1,5 @@
 DIST wheel-0.35.1.gh.tar.gz 63563 BLAKE2B d1432a638b91e821cb9b9fc748567b9ad18bbfd4737cee915ee3e2c585c4758e79bcf163edac56a09f9e356d81a057214c8e84c5c75b45505c67aa761e97fe3f SHA512 34cd6d1a649842abd895418c0183e68f44e228be905041e1dd8562987fbab8aa617da9b78479cb8d56fb6bb8714ec1085b87640c385bfc933e215f6e33ccf55b
+DIST wheel-0.36.0.gh.tar.gz 65186 BLAKE2B 384dea20a6fdc2e9cc581c1e30814ac84285b8ca2ac5588fc837a1e27add493dedd38ead643776d1353a98cafa45a609e9655168fd09944cfe016d99e357fcd2 SHA512 1f851dfc18fa96d67bb96c61eec15999c46ea77c490173b71121810480f3c30f2de770a2e6e0712d04f35c91fcadbb276b05968e2b5db76dea882929f555f983
 EBUILD wheel-0.35.1-r1.ebuild 944 BLAKE2B 4cf6332485911a9489b814b08ae7ea2aca18bd0bfe18a61e51695c378f97912fa4533976deb51957a1f54bb2b66fc9f329baee1ca7f4d6daf95fd537e7f51f56 SHA512 8b7ce4b5d935301ed4db5bb472ef63acc2916cc9b8e94b9c274da90bf195a0cf0b69e35beb14a2607e73ef9120de1f52db53adb5159afc943963dbf83adca022
+EBUILD wheel-0.36.0.ebuild 953 BLAKE2B db3de512def758b1d13d0ead789f4d2b9cdb113a8196db40606af8800f6e08b05ef0d3afbf47fa05aea430e1886d857998e50d1466d0979aa92ea87faa2a2b24 SHA512 9e0e4c053c4d5a4ab40f2555b693131c596a1704812f92cb836154a6fcba50e9e7cbf04eb55c62f9c3478f05a7bdcab659685666ed350ed5bb25647517721f88
 MISC metadata.xml 332 BLAKE2B 6c674dc3f3401ae851af12ce14e50ddfe100ffcf26caf3bd49dd93a19433d8c190fe3aabbeba3280f4eb96fe1856d58ce2a5b7c24ee15dacc4593d0534fbac9d SHA512 f0e8a4870fdc46f2a8cdb719832a7d1e108283a35f8f1a2756259c8823480509f9fdfdafdb59d9f0ec2f38c2e78ea6e2937ef5a086408e5e7aeb43b951e0c9a0
diff --git a/dev-python/wheel/wheel-0.36.0.ebuild b/dev-python/wheel/wheel-0.36.0.ebuild
new file mode 100644
index 000000000000..3878e8e58efe
--- /dev/null
+++ b/dev-python/wheel/wheel-0.36.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A built-package format for Python"
+HOMEPAGE="https://pypi.org/project/wheel/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed \
+		-e 's:--cov=wheel::g' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	if ! python_is_python3; then
+		# install fails due to unicode in paths
+		ewarn "Testing is broken with py2.7, please test externally"
+		return
+	fi
+
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index da2abc744ca1..98f636e5dacf 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index abb1f0dac5e7..391104b6d9d4 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -3,9 +3,11 @@ DIST listen-3.2.1.tar.gz 51030 BLAKE2B 1c7df3910c856c472f42417d51449f04d56635f0c
 DIST listen-3.3.0.tar.gz 53387 BLAKE2B 4e68e0789fde26c43bdeaba3742d1e3ca6f573441ed0b71f54ca85712c39727cb5dc4975b06a6ce52ac2e7049588442a787c7deaada7e162076af5a514884f1f SHA512 c3a4df6293429962c6412b16c7bbabe0244e1296a6bd5516397699f8770793cb7f7dfac78f74593183c2312eb8832f4ab7a650ee29722c7e4e1493faace1b726
 DIST listen-3.3.1.tar.gz 53470 BLAKE2B 6dfe8074883cbced8f7b707414309428b16e755e6652106cb0525dbee0a7596ae1b57b22e8dca665294d9a23de6776738ecb527ea8467fa6c0ff5a04ecdd04f6 SHA512 fbdd743eecd7be5431e7a698d8a00b17f0889975292b1eb798ab8fbddf997aaeb296ee13f846481bc68fbcd512e91f65296792829557a1d420a422717bf1e8a5
 DIST listen-3.3.2.tar.gz 52911 BLAKE2B c9a086a37def00b6d48477a3ebac9735ceb4dd08c122555e45223dc60a382d313de0aadc86c853f1c6f3b91d82a7f5dfb5b2bacfa19fd7768ef6aced8ae0e4d0 SHA512 9f9f04138c836872370fca766fda0f8305c953ab2ee06790112692d5c19529b0c16b9cccd492003778972aca700dbdcfcb111b23f22c2c3ba5252dbeebb21e07
+DIST listen-3.3.3.tar.gz 52994 BLAKE2B 95831a65a75cae28b767696bbe5969cd7115657fa56e01701f3b17d5bd727a053cbac16928d8c7c2a19ad24ea3c99afdadd1e9ebbae0a66d03a511ded7d32734 SHA512 73ad762086e7961e45f1245e5aa32c738824736b7d373c31565832c3acf25f91cbc9c25d7bdffb27cf953cb2b2bb37adfddcc6888f3a1b317f70cba75c2ce67c
 EBUILD listen-1.3.1-r4.ebuild 972 BLAKE2B c8062f42d923c5dfc3b352bd14c96a5afc6d79b1b4756a3fc0e6792f89179e454bcdbba2d2697433b33180c0edbbb503a81a1b252109ea8a3cc1b7c7d302c8f8 SHA512 31c83048aee128b6e90303e7eea9f8fc16faa0814db329283a58adb9dcac275efb1586814a5ce999f0525fe7829130dcf8bd2fdfb32e5efaf197517400bfe444
 EBUILD listen-3.2.1.ebuild 1208 BLAKE2B fe6653f617c1f0caf4c4cb39ab27977acd22af42ac1ecbdd03be705918050d4b973eb6410a1eb1e484a2ba90c51c2c9ca6d18e0d259d160c911e41d7916e680e SHA512 6c54b1af911554bd2c91e94ee7b6e005715fffa9b31594a270c7b49f819bd38e427b9fd376c2d027bf97400d67bc49688487166de0597a47185cbafddb1e1549
 EBUILD listen-3.3.0.ebuild 1202 BLAKE2B 3cc3d6fbcceb441f1686b9e63068ff7a023037a8bdf3a3fc9d7c3dda0f62946f35d8d5a2349a2c7931f41f7f12ddcf568dd3ff1bcca7cb28e435eb4608be95b9 SHA512 a26d23061fe17642f5f85173bf4e97daa912dde4bf100ee8f12268975326dcca07599534101b7f24e0f66034108eea4f53b7afe4d1d386e0f3e88e0d0ff4b8de
 EBUILD listen-3.3.1.ebuild 1202 BLAKE2B 3cc3d6fbcceb441f1686b9e63068ff7a023037a8bdf3a3fc9d7c3dda0f62946f35d8d5a2349a2c7931f41f7f12ddcf568dd3ff1bcca7cb28e435eb4608be95b9 SHA512 a26d23061fe17642f5f85173bf4e97daa912dde4bf100ee8f12268975326dcca07599534101b7f24e0f66034108eea4f53b7afe4d1d386e0f3e88e0d0ff4b8de
 EBUILD listen-3.3.2.ebuild 1202 BLAKE2B 3cc3d6fbcceb441f1686b9e63068ff7a023037a8bdf3a3fc9d7c3dda0f62946f35d8d5a2349a2c7931f41f7f12ddcf568dd3ff1bcca7cb28e435eb4608be95b9 SHA512 a26d23061fe17642f5f85173bf4e97daa912dde4bf100ee8f12268975326dcca07599534101b7f24e0f66034108eea4f53b7afe4d1d386e0f3e88e0d0ff4b8de
+EBUILD listen-3.3.3.ebuild 1202 BLAKE2B 3cc3d6fbcceb441f1686b9e63068ff7a023037a8bdf3a3fc9d7c3dda0f62946f35d8d5a2349a2c7931f41f7f12ddcf568dd3ff1bcca7cb28e435eb4608be95b9 SHA512 a26d23061fe17642f5f85173bf4e97daa912dde4bf100ee8f12268975326dcca07599534101b7f24e0f66034108eea4f53b7afe4d1d386e0f3e88e0d0ff4b8de
 MISC metadata.xml 338 BLAKE2B aa66734c1150c6a7b21e1c018d4303311955fb6e1eadcdfe16c3ca514b3aad663e4c16399a75b091e614ed87a86b6958577771e040700e01590447d33bd77dab SHA512 f4035107afc1bcbab797e116a0f39e49c9a4034f838878ad448efea9eba8d2fbc4db074db73871550a42c175c9e36a220877d2ed50580828c3180fcc50913288
diff --git a/dev-ruby/listen/listen-3.3.3.ebuild b/dev-ruby/listen/listen-3.3.3.ebuild
new file mode 100644
index 000000000000..7120fbcdf848
--- /dev/null
+++ b/dev-ruby/listen/listen-3.3.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Listens to file modifications and notifies you about the changes"
+HOMEPAGE="https://github.com/guard/listen"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+# Block on other packages trying to install a /usr/bin/listen
+RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
+
+ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
+
+ruby_add_bdepend "test? ( dev-ruby/thor )"
+
+all_ruby_prepare() {
+	rm -f Gemfile || die
+	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
+	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
+	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
+}
+
+each_ruby_prepare() {
+	mkdir spec/.fixtures || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	rm -rf spec/.fixtures || die
+}
diff --git a/dev-ruby/nokogumbo/Manifest b/dev-ruby/nokogumbo/Manifest
index 1b6566fd31de..644f3a2a3f83 100644
--- a/dev-ruby/nokogumbo/Manifest
+++ b/dev-ruby/nokogumbo/Manifest
@@ -1,5 +1,7 @@
 DIST nokogumbo-2.0.2.tar.gz 295558 BLAKE2B ce52794eb3359ad34234d8f5faad4aff7c197326f6449a09a2264cb1a3d920886377f805e055980224644223d31a6621300c583a04f48ce8a8abe275b2614470 SHA512 fd115e072d2763ff63c46dc6f6117bb841b2c2ac28df0180d44a581a2a46f0b7b90ec17ae1b629e3e7c2f8a2cade53031cc118c8a946bbfb7e9e8600efefd67c
 DIST nokogumbo-2.0.3.tar.gz 297394 BLAKE2B f1afcf516c5c47b15c8404e8c218af1f2ca0bce022fefacb39842527be7be38cbaf9d2fe0572afd8d9c1893a82428b903ccb8d4506043f766305d4d43aaf066b SHA512 b44af7394f0b2c7159b34ead2aa15e39cd08348c1e3d7c4d9a2830c0920ae1a0d22ff9ac32db8fa1bd69c8ce55bc4a32069572944b53ef0d743f8a40560bcb47
+DIST nokogumbo-2.0.4.tar.gz 297809 BLAKE2B f55a08417fe46b9cb4e89ea032deab7f4ec8d4c4d377ca87fadfacf12f86fbea6c61de087e88d5de4ab29656276b014b1619ea7d83dae86aac671306ac0b989b SHA512 188ae188bd33969b7282230e18808e52363075723cef21d268af7ad1cfb2a0a93a8cc595297f467a32f475a47249f316836ea40c587f337f35ea57bd60d0699d
 EBUILD nokogumbo-2.0.2.ebuild 1313 BLAKE2B 04c8964173737ea1618c7b13b196b5571438e3520cdb9c9025e23b79621bfabdb72349282426d9ebab2b5726c35a0a9768379240cd3609fbf737c7a06e62f388 SHA512 1ec8d25f9955da8d3eb849d9308504700a8d2d6b92e065a18f659164c149c4d0d91b42f43f56c0a8f43ae9fdee08a37b59e08805405cac1f60365036c93e9207
 EBUILD nokogumbo-2.0.3.ebuild 1306 BLAKE2B d9089f43ee28b13b4bfa374c58609bab1df7df9fc2e14d8e6eb372c5e61102aad1bb4f989df80e23cf603697f067ff0d60bc90ac5fdd4bbe946a132a148b26c5 SHA512 fffb9620200f009ac055e3c0d3437402c2e34f59b10078b9679b11530faae71b3f583bc33309809ad3aa7d4cd980a6617555c14de31943c91bede62b5e330ccc
+EBUILD nokogumbo-2.0.4.ebuild 1306 BLAKE2B d9089f43ee28b13b4bfa374c58609bab1df7df9fc2e14d8e6eb372c5e61102aad1bb4f989df80e23cf603697f067ff0d60bc90ac5fdd4bbe946a132a148b26c5 SHA512 fffb9620200f009ac055e3c0d3437402c2e34f59b10078b9679b11530faae71b3f583bc33309809ad3aa7d4cd980a6617555c14de31943c91bede62b5e330ccc
 MISC metadata.xml 341 BLAKE2B 56d3bff8ec2e7b01a76edaba7633edf4388b00976deab109ef3e34112f35878bfa81de9a32a2aacfdef5f3919fb0210a6c824c4d1242686eccaa7237f783b176 SHA512 652bff94a0b5050f6d8dffbc1dd2b0008202c9f6fd19aa44a148a53c7ed9cc78b8ed64ca4c548f60643b58954f1e344bea0a5b9fc28cd381daf2987ccbf6c149
diff --git a/dev-ruby/nokogumbo/nokogumbo-2.0.4.ebuild b/dev-ruby/nokogumbo/nokogumbo-2.0.4.ebuild
new file mode 100644
index 000000000000..43462c380e47
--- /dev/null
+++ b/dev-ruby/nokogumbo/nokogumbo-2.0.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="nokogumbo.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Nokogiri interface to the Gumbo HTML5 parser"
+HOMEPAGE="https://github.com/rubys/nokogumbo"
+SRC_URI="https://github.com/rubys/nokogumbo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Contains a bundled and patched version of dev-libs/gumbo.
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.8.4"
+
+all_ruby_prepare() {
+	# Define rakehome in scope
+	sed -i -e "1irakehome=File.expand_path('../../')" ext/nokogumbo/extconf.rb || die
+
+	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/nokogumbo extconf.rb || die
+	sed -i -e 's:-Wl,--no-undefined::' ext/nokogumbo/Makefile || die
+}
+
+each_ruby_compile() {
+	emake -Cext/nokogumbo V=1
+	cp ext/nokogumbo/nokogumbo.so lib/nokogumbo/ || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index 5d02284857c1..8c33f4311a69 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -1,13 +1,9 @@
 DIST regexp_parser-0.5.0.tar.gz 80554 BLAKE2B 7890e6850e3ffbb927c5e72430ab29e6aeec4f8684eb56f4153414aca62702faa57f48887618e84b1d087e2ba366ec9d6b2e92200cc34472b7bbb5a8b0043415 SHA512 0d1c43fda01077b9b3d9c28ce9cb01772f10817e42d9c0ff28e6ea5cd059ad4869b940498c6a4e77d4fc6acb6ac0aba293ae67dd012650cdb58989b90868be16
-DIST regexp_parser-1.5.1.tar.gz 82482 BLAKE2B ff1746e52e786e273923dd222ea8c8276eb1e4ffe9bf899068160dec229784709ba679983c1e43736c128ec094861174bd43e0aceea704ee2d38aff4a53e6775 SHA512 4856fbcac800083b417880c30b5d6a5ea445bb85950bdd7898f368bfa2d44b01b1e2058b279f1640cf1cf4d7b28e225d25bc2d356d2c4a7c1be0a2c621dd3827
 DIST regexp_parser-1.7.1.tar.gz 83865 BLAKE2B 1aab4f5c4d399ee48951a9fa9f24fef14073ca5267ec29e5011880274d2749a7a3d1f5cb2a6a5107d5c848537367e1f725a6de9bb9af8803ccc8ccedaac415eb SHA512 fda810bc18039484725df5c6092b3d1b31f398e337cbace253cfdfa934274902f2dcb4e64c4fd0bb24379c79ea2976383313c1a5cd4ad246ecb7eabfd1a47d64
-DIST regexp_parser-1.8.0.tar.gz 85071 BLAKE2B 1d9f60617372f872e8b372bbee0f808d060add768094d53bc05ef2f4757936fcfb4772dc0a2ba59630884b339a3c66d34336cfa05825f4ef53427ddd3528b9d7 SHA512 bbf2429c00c214288869b77641e44d04591c3917ceeb9262ae8638c0731b020bead4a7b11d397ef2e1a26752c660addcc46fd94a4e557766d230de71b99a9501
-DIST regexp_parser-1.8.1.tar.gz 85379 BLAKE2B 341f16b6fce9654984c9fbab589ef0991d50f42e935558da2741e2dcbfe8cbc21200fd2233abff2907a1bd44c5b350b41a665ef4f993591b92f31d3280a24ba5 SHA512 6642dad18313e10856d86bf3ecd2fc5b0927698ca8e37f17745b755088f750febf2c05fd098e99b87543cd90f944ae0d9c4c03452048d2b44b4b1fb68e986045
 DIST regexp_parser-1.8.2.tar.gz 85592 BLAKE2B 55333dbf59606d1f203c84cc3e712ddba9551be492745f2a0ce9ca8ba56e9a6eb1aee0c9d3d5079114c65747746f6ef4df3cbbf5a917562f413ca3426fd16efc SHA512 8192ee4334d2da13af5552eccd4fed82b24ed57489e3e0d8d083e8cf72e52fa185c2e007e9adf1ec6e59b0cf4e4055eb8def28d5cc94cc7a9ab7981d14f8e727
+DIST regexp_parser-2.0.0.tar.gz 85985 BLAKE2B 6d206de85e85cd5f3f472f6b2cba49bc03aa43fc246af145188c2ebfe3da1c23e0b8b5d307d8902662abcd220b3c7a439825ada2012a09fdfffd9c390865a0d3 SHA512 a896f81988c8fb8074e05abe6c9723a314b147ac2098d11324842b79a8b74ae3a8237ef1ec0f80cadc223c13b06fa0ba231013ffdcd00710381e5c2fc7ebf175
 EBUILD regexp_parser-0.5.0.ebuild 878 BLAKE2B 065940af48ce7c93836019f0a9325e04db4e0ff31f0e9af6a13a637e86ced811bb38cd9c70b971e244df857e1d40b2ed2049fc0321a82141c43478822cac8b04 SHA512 c91492b8ea59137258d941e79659f1f511621c0d7da8af6e6c13aefa39f5473c2881e0893b68a56b428ce8da9a135e20371e4d5e0c6d5fc6996e6a77af5c22e6
-EBUILD regexp_parser-1.5.1.ebuild 878 BLAKE2B 58e808a45e8bbd6421b73cc5887b75ed6e925701a5d60b9fb76bcc1e59bd8c0d573cfd188f77ff2afc98e300ab615babff5901fdbfe70fcda66a370ba5e722bb SHA512 2942957d37008a42e954a1fcbca7f901837b9fbc4d3929687f3fd89b4d0463f33e1be6b37094efd4f539c2ddec96fb27d3a83fcae48b7044f5d29a7851f13113
 EBUILD regexp_parser-1.7.1.ebuild 876 BLAKE2B 82bacee65732f0f87c38e5f0e6044efb35e628f512de34a1dc55e866ebef3e947c0289c5aaa168fc136b5042e2e8e2af9aa23a77e5acccba5c8899ebd41ad5b6 SHA512 eec1e3db2f3bb6463ca114977281a0f50d5360eb8953e986f7f99a8b7694d817aeefe073e88f23bac4f7fef4eec2be516f457c4fa4d60b2c33dc6bb8d5ae1403
-EBUILD regexp_parser-1.8.0.ebuild 877 BLAKE2B 280b725889f7112ba258e523f8c36b353436ec11563cb5823b908d0b309bb934bb9ca46fa665d68ed7c3c31fa4484b0e2d2f1451c64d4ea503ccfb25e7bf6bde SHA512 d0e2b1d06970975378e50b0ae3bab15d803f10ddfc3cbc1912dfd962eeba4947d3213fd44ce44d859a7741ea4dbfe67b192c258751df06fa61422431281fbe8e
-EBUILD regexp_parser-1.8.1.ebuild 877 BLAKE2B 280b725889f7112ba258e523f8c36b353436ec11563cb5823b908d0b309bb934bb9ca46fa665d68ed7c3c31fa4484b0e2d2f1451c64d4ea503ccfb25e7bf6bde SHA512 d0e2b1d06970975378e50b0ae3bab15d803f10ddfc3cbc1912dfd962eeba4947d3213fd44ce44d859a7741ea4dbfe67b192c258751df06fa61422431281fbe8e
-EBUILD regexp_parser-1.8.2.ebuild 877 BLAKE2B 280b725889f7112ba258e523f8c36b353436ec11563cb5823b908d0b309bb934bb9ca46fa665d68ed7c3c31fa4484b0e2d2f1451c64d4ea503ccfb25e7bf6bde SHA512 d0e2b1d06970975378e50b0ae3bab15d803f10ddfc3cbc1912dfd962eeba4947d3213fd44ce44d859a7741ea4dbfe67b192c258751df06fa61422431281fbe8e
+EBUILD regexp_parser-1.8.2.ebuild 876 BLAKE2B 82bacee65732f0f87c38e5f0e6044efb35e628f512de34a1dc55e866ebef3e947c0289c5aaa168fc136b5042e2e8e2af9aa23a77e5acccba5c8899ebd41ad5b6 SHA512 eec1e3db2f3bb6463ca114977281a0f50d5360eb8953e986f7f99a8b7694d817aeefe073e88f23bac4f7fef4eec2be516f457c4fa4d60b2c33dc6bb8d5ae1403
+EBUILD regexp_parser-2.0.0.ebuild 888 BLAKE2B f4c4432751aeba693e2d7ef3769b96fdea6ec480a0fb7d0393770cd9c98c32181cbcc12c0dc185e7996f1e4cffc4ceba47123d1246d123456a420316f58e3752 SHA512 18364c915f58475c0ae9175a928d3c033211048ecb33ef0787f5ba3e10416fb619722cd37280f74610ebe49b8c382ef524bebf37a8a9184f3dcf791829a5f708
 MISC metadata.xml 345 BLAKE2B 1b8ad1173966e2528e85b076052a92f378eccb6bc3159a69de1a276dea6e65c3b2e83db43d65ab9cd357fa58ee0af3cde2485b0926002cb74e0fe1d54cef375c SHA512 aeac372e6213e9b018782fb640fe6d88b3d86d8f5d02b8511f69980df204dd82d45443c371e81527fc6c34b2c1684ff04b3a7789808b884644c348139b4999ff
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.5.1.ebuild b/dev-ruby/regexp_parser/regexp_parser-1.5.1.ebuild
deleted file mode 100644
index f49d9a581c8d..000000000000
--- a/dev-ruby/regexp_parser/regexp_parser-1.5.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
-HOMEPAGE="https://github.com/ammar/regexp_parser"
-SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "dev-ruby/rake
-	test? ( dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake ragel:rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib bin/test || die
-}
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.8.1.ebuild b/dev-ruby/regexp_parser/regexp_parser-1.8.1.ebuild
deleted file mode 100644
index 9a339fd368c9..000000000000
--- a/dev-ruby/regexp_parser/regexp_parser-1.8.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:full"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
-HOMEPAGE="https://github.com/ammar/regexp_parser"
-SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "dev-ruby/rake
-	test? ( dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake ragel:rb || die
-}
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild b/dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
index 9a339fd368c9..aac70a0d1954 100644
--- a/dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.8.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.0.0.ebuild
similarity index 97%
rename from dev-ruby/regexp_parser/regexp_parser-1.8.0.ebuild
rename to dev-ruby/regexp_parser/regexp_parser-2.0.0.ebuild
index 9a339fd368c9..acb742e4973c 100644
--- a/dev-ruby/regexp_parser/regexp_parser-1.8.0.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-2.0.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/ammar/regexp_parser"
 SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="1"
+SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 IUSE=""
 
diff --git a/dev-ruby/ruby-net-ldap/Manifest b/dev-ruby/ruby-net-ldap/Manifest
index da94c40c1782..ff707ea65ed1 100644
--- a/dev-ruby/ruby-net-ldap/Manifest
+++ b/dev-ruby/ruby-net-ldap/Manifest
@@ -1,5 +1,7 @@
 DIST net-ldap-0.16.2.gem 94208 BLAKE2B aebfc53b29c3bf81eecfc50a7422bd30b7dfe1894f8b7ceaeb82e346ae0e3ecbf463f3f15aab2200d42a391782a07cea8bbbf3f1c0d1cd0ae95959ef77bc8a14 SHA512 5d0e63473b5e1b1133463a49ed1c88fbf00fda06265a9a091fdb513f1d20fb45e5227c6384a9adc82ad71082ef07786cf63143060711b15386ceb7d3bd7b800b
 DIST net-ldap-0.16.3.gem 94208 BLAKE2B 637fe661e1ccf962cfd224ca457c7c4b9b51ec15179d4ca8d429947c45be3ded8dfde1f99b5f4a2c7ecb51682828689086a8ed0598e03905c8b77448bfcb1244 SHA512 18b9b290eb37c2378953011db4d92d41c18d735ae7908a98650b0c941ccc0eb0f44a3686c8ad987066de2a3ff04a58acb9267215dc214212f44ae5fccfcbe30d
+DIST ruby-net-ldap-0.17.0.tar.gz 92548 BLAKE2B 45dd1f6205af25735c8ed55a28ec91084e0b95403fa4c4a06310a19f1a9c247cb4cd1e8be7bbb26b2423c0d05afb4cfd4e8b2eed4e552aa78c9b4b44102f34d8 SHA512 417e946f044db2fda8ceb8ebfee2376310308ac6a1949e165beff0a9c2a8b410f88ffcb607d27ab060d1d55364cb75fd41753d101a404874be6dbbec3875f192
 EBUILD ruby-net-ldap-0.16.2.ebuild 629 BLAKE2B 153ce9b90e84bd6177e46d1438b78cb61711bf3f2344922fcecb3f8d0d6c8fdb483d007c81de8b6419360a0d694b38bd487856fde0afe9d5428671c599ef8a00 SHA512 2cd38c26412f0d2f4949496a75099611b9914959febfa0917b19bdd8ced5feeb7022d8c558e3ba173d38bb3990c71432bfe4b1a5e981d019aecea5e2a97bed9c
 EBUILD ruby-net-ldap-0.16.3.ebuild 622 BLAKE2B 8670a1ff8d6d2c976da284b9fc65f7a8ae30ebbe141add8d6c766e3131480981febd22bce12a17e397d06b76ea017de54e551a82091af00c5344bf50219f3903 SHA512 25707928cfd629b4efbba14e27eefac31ac9055ec5821b4ee0aea2103a71cf36b18948f3189fcd033e90e44e18bfbc95bfa7fe34035529fc581b084292e7fb7f
+EBUILD ruby-net-ldap-0.17.0.ebuild 841 BLAKE2B 58aa88e708d9c5130ef714467edc32a3918578b6f796e3a21b2cfedd1a7e7c63426bd316c73c8b815d8901d3867d2c56074b1f06ee88cbe7ea228ee56cf871f5 SHA512 a3130d2f6f427a5bab4d6d3129557936abd1e7903af2de99a7f648bb0e28e7d316fdf416427c8cfc853ca7771aa29de33f29d1ff0dc55365be94cbc056ecf66a
 MISC metadata.xml 349 BLAKE2B 8048fb25bfc3ecc99fce9301034623a0bb6f946afc23ae87d2308f4cb5e65be2774894573ace6d5808090118105f81a2565cec6a00237a41ccb071170454b7e5 SHA512 522f6bae26a2b7d3ad4876b5fde3e710e07ae82147275a031c3f622df1775311560603960cf6909ba755039f2f62cc2971a3b29871ef7d1320e24d375070bcb3
diff --git a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.17.0.ebuild b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.17.0.ebuild
new file mode 100644
index 000000000000..fd0a3e09c8b6
--- /dev/null
+++ b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.17.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test spec"
+RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc"
+
+RUBY_FAKEGEM_NAME="net-ldap"
+
+RUBY_FAKEGEM_GEMSPEC="net-ldap.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pure ruby LDAP client implementation"
+HOMEPAGE="https://github.com/ruby-ldap/ruby-net-ldap"
+SRC_URI="https://github.com/ruby-ldap/ruby-net-ldap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/flexmock-1.3.0 )"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ': './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index d285e2ddaa29..0a419d3dafaf 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/dot2tex/Manifest b/dev-tex/dot2tex/Manifest
index e6bf07a9e0ad..de2c47966acf 100644
--- a/dev-tex/dot2tex/Manifest
+++ b/dev-tex/dot2tex/Manifest
@@ -1,3 +1,3 @@
 DIST dot2tex-2.11.3.tar.gz 664750 BLAKE2B 9c7effeca0d71810ce37e126df9e7df2b9df19be41393916c85e49df0dc116f42e58a2b29cce9e2bac700fa00859c63c1a4a8c41c70a9db96a5fc210960f463b SHA512 1595299811461b18cff490a8a56c0215f46989dd4a46fa087b455c717ed5d5f7a5782d04acaa3e4567b4e348bca866d5f24d21663012c4cd813445804ef6f714
-EBUILD dot2tex-2.11.3.ebuild 999 BLAKE2B 318ff1ff5d1bc4709819e49ce6963eb27b31e413cf611d11ef409cbaeb773de00db677bdc18415333f9731acc86e41b0bf2f0d32fdcba751c3ca471bb778670d SHA512 b945056b4c000946ffbd962264aec1140c2c51e38940a11b31c0acd421d2b195055cbe043f4ac95a479b0580fec2c2eb6032cc90e9ebdee336733028dd48d993
+EBUILD dot2tex-2.11.3.ebuild 1003 BLAKE2B 307c521fb7a335b5d403fad9b9f4e7731f23b3416d329d111fab9910269d74efa75d57ba31baf3649d98aaa4012b80721f9d4383b5646940a1c905efd3745cc1 SHA512 742aac9cb231c5adbf80b033b8617c06ae6d5367c6f21d284632688fc78448697bdd2b5156ec764dec869b5ffd1904c55bf0c6385d033ad899520642a0db6cbd
 MISC metadata.xml 381 BLAKE2B ab936fa6e8bedf30df2713557cb55b558831dd2230be87fdea15ef84c7ded1a665b90d74cea23a3a2d4ff0bef03e43af9f226e1d236c5e5e79ebfb51a2b55358 SHA512 1b1e745b1979792a554d0a0fbd15e5f97f4806e668ccf3ddb519e60cf70af7081194f1f442b6cd7ef5ff4676fd2a837833e59879d4b05dff817927a11449700e
diff --git a/dev-tex/dot2tex/dot2tex-2.11.3.ebuild b/dev-tex/dot2tex/dot2tex-2.11.3.ebuild
index cada554f8a69..d5d240c5d098 100644
--- a/dev-tex/dot2tex/dot2tex-2.11.3.ebuild
+++ b/dev-tex/dot2tex/dot2tex-2.11.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7})
+PYTHON_COMPAT=( python3_{6,7,8,9})
 
 inherit distutils-r1
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f69d3de86a64..1353ef1ac557 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 9e04922ffd47..885ea53038f9 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -31,5 +31,5 @@ EBUILD cmake-3.17.4-r1.ebuild 6136 BLAKE2B 255ddfbb74512dbbbbf5ad397bbf6f78b9185
 EBUILD cmake-3.18.4.ebuild 6130 BLAKE2B 57a06ffa279519744afa1854fabb28f90da78d31dc26ea6e78fd1f0e0401a4ce86bb5a45297679cb92df3928a79ee8740a5288ad1e8711d908601fadfa02b028 SHA512 8337e005af90f1a0f792b6f2a7d9098767024ad221aed57237e4ced1b20f98a5d16a7633ca86e1df83043a3e3b7d58c138104b58ebd170675146af37e619744a
 EBUILD cmake-3.18.5.ebuild 6130 BLAKE2B 57a06ffa279519744afa1854fabb28f90da78d31dc26ea6e78fd1f0e0401a4ce86bb5a45297679cb92df3928a79ee8740a5288ad1e8711d908601fadfa02b028 SHA512 8337e005af90f1a0f792b6f2a7d9098767024ad221aed57237e4ced1b20f98a5d16a7633ca86e1df83043a3e3b7d58c138104b58ebd170675146af37e619744a
 EBUILD cmake-3.19.0.ebuild 6182 BLAKE2B baf789644fe5a895f2659aff3e0820ca512b003e21c69a471ec7a98ed3609ebdc32985487607c636400a7890c9edb1d1215d1cb4043ab5713b7c5cee2e9221a6 SHA512 5dbd0c14bb478245ce0e84a5d672ac9ccaa31f4f879791dca998e67a703661f658238e279dbe1ef4b3faa7ffc2b078b8397f79f146c1b41553aea2a2428fa905
-EBUILD cmake-3.19.1.ebuild 6337 BLAKE2B 15048f91e80f297ba0b64f0f6a920ff6408e94c5675cd7e28215e2a58528f668addd1beb3e4e2819b4bf5630304481b9531b35407fe4a74b570a316aa874e316 SHA512 5601c38d73f3a5d145bf3c689e30f901a7d88f12bd58a000f5ff30e6cdaa19e26f084b5e3e96da4025a20677adcae2a482289c33af2b04d30612a9582f99a23f
+EBUILD cmake-3.19.1.ebuild 6620 BLAKE2B 08f857fbb4188519564decfb1c63a29f1269cd878466a8b8568bcd41640d2c0bd6c9f39769c4cad4f82843aca87ae08084441f969ae52f2f0f993a04d60d9e0f SHA512 b9c0a84740cfe4dc21efe715d22335bc56f615ee34d759113664c13fc35815fd7bad59849c79c6859ccf14d7d57f1114975ea8e44ee1cde7315c87c2d04f7b94
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.19.1.ebuild b/dev-util/cmake/cmake-3.19.1.ebuild
index 9c290413b185..54a6d646dda4 100644
--- a/dev-util/cmake/cmake-3.19.1.ebuild
+++ b/dev-util/cmake/cmake-3.19.1.ebuild
@@ -129,14 +129,20 @@ cmake_src_test() {
 src_prepare() {
 	cmake_src_prepare
 
-	# disable Xcode hooks, bug #652134
 	if [[ ${CHOST} == *-darwin* ]] ; then
+		# disable Xcode hooks, bug #652134
 		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
 			Source/cmGlobalXCodeGenerator.cxx || die
 		# disable isysroot usage with GCC, we've properly instructed
 		# where things are via GCC configuration and ldwrapper
 		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
 			Modules/Platform/Apple-GNU-*.cmake || die
+		# don't set a POSIX standard, system headers don't like that, #757426
+		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmLoadCommandCommand.cxx \
+			Source/cmStandardLexer.h \
+			Source/cmSystemTools.cxx \
+			Source/cmTimestamp.cxx
 	fi
 
 	# Add gcc libs to the default link paths
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 8af3d1535728..3e0ac7cbafb5 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -3,7 +3,7 @@ DIST debhelper_13.2.1.tar.xz 541428 BLAKE2B eb377a09fe23aef159c6a8309c1a63df94be
 DIST debhelper_13.2.tar.xz 540400 BLAKE2B a1734ecbd92eadc3f5fbd0b118ffb4c6b697b157c39cab7626bd734adb80c6dfd0061298220c5d5c7a7fff412a1a52490e7001c8d634596dc41389a7e81c7a74 SHA512 07fd1f32975a9d84940a15140875994d30fe4bc0a40b40fe83a1ff9a304121167345194802691326251490852e601c388cab5cd02c000a4a6768edd1259a7bbc
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
 EBUILD debhelper-13.1.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
-EBUILD debhelper-13.2.1.ebuild 1527 BLAKE2B fe9bdbe2d1122aed96921fdd78f4bb60eefbbf397dcbe1098200bd308897b8db4f0d8265363bd33e17c42516ee58c9782a377b00dfd0f29043076d0567584ff3 SHA512 ec7415f07de425971beceb44db6c786068c47729f11794610e902f0859f145978207c97d07b6ec9fb31fcffce2de255db33d0364034eac78feba51ad55a469e6
+EBUILD debhelper-13.2.1.ebuild 1524 BLAKE2B 26c0ec05171e41da67876ea27452d799f8be8540c0893beaade349bcaf447a2a3ecc4e9d97a97174c9eb04747b3d8948a6f2e07193c5e1ffd43f6389ed676044 SHA512 73016959d67d163b61d9af938b991df6388d1e23a0ef3debbd75d7d0fd101264805e31d4e29091debf8c65840631f9eab3af2a807090df4efedea05e6d2ebdc2
 EBUILD debhelper-13.2.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
 EBUILD debhelper-9.20160814.ebuild 1530 BLAKE2B 8a4529891546c0553fc545b41c0721ab899ff6f62ca5b71e8950c306bc5bdb6f9971fec6534c3b4aa03270154290e6e41b91916deb67a58f6a5fce24c57cca9e SHA512 b466001b990d497caccfdbbd88cd6e28e2e55e399923b33d1050bf667d7a050ccede8c4c2bf2df7460177d4a2094247e2ffcfd34c29d580f40ab432e89a96525
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/debhelper/debhelper-13.2.1.ebuild b/dev-util/debhelper/debhelper-13.2.1.ebuild
index b75be9b7935b..8b150d906aa6 100644
--- a/dev-util/debhelper/debhelper-13.2.1.ebuild
+++ b/dev-util/debhelper/debhelper-13.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 DH_LANGS=( de es fr )
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index 9b95c085daed..e16cdb579bbc 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -2,5 +2,5 @@ AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d89036
 DIST desktop-file-utils-0.24.tar.xz 137424 BLAKE2B 3cce27caa14782ef10886fdc0602c0378c1bad0d49a4b99077436a9951f13ccdb539fdc2b9d27b54430fce94fb0ee0268746b216cc5d6c1b9ba517e1af81b4ce SHA512 b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0
 DIST desktop-file-utils-0.26.tar.xz 83132 BLAKE2B fdbe5427a0278ebe4a9b1bc15a148ecdc3f54b54058b355ae4f9a962fb1c4ec309d24a075973caf8f187a1c74b013e9bed0a7c3668bf888274e77fac9e077ec8 SHA512 5b4e435f0b635d8f898ac7f5759f74a08ffbe2a56d41fee0e84ff57e73b98d08b57b4416f20b99f696dad8bcb1c20792b39acf836b0814220c0b386ea5f6b831
 EBUILD desktop-file-utils-0.24.ebuild 1287 BLAKE2B 7ac58a5fc22f86c48162d3ef0c5f5471031a36294d8e9a68c1bc6643db4bcabb51e0ad581115e18df0e97c1b119d9c0b65737c617f6cdd3dbb984c7c90e81fd5 SHA512 09ee0891f66b52b89f6f45e909c579408cb36f0e8e535636444ab82424cb1c93f89d9cebf48c141f8bd9322c362e3948a5bc6cc3d0e844d1d8d8cb758f129870
-EBUILD desktop-file-utils-0.26-r1.ebuild 1168 BLAKE2B 51abe19eaf1f632475faa8358425dbe45a72d921d87b299ec32c9012eca4526a8bca8d8d50fcc101d32d7b7001d0a47bd293107e14a57568f28cdeda95998f32 SHA512 90ba5e353c9e1e5bd9caa31c2b4c1c02e7459880543d09c235c51fb0a8f395630d48175211276616181f5edb6f987e46e2554315cd60693c179a7a86cb710c2a
+EBUILD desktop-file-utils-0.26-r1.ebuild 1165 BLAKE2B f9b60cf256e8a12fd1b08317948751ba080d87171c65d37376683417f2573686cb335fd5687460ecd35049b483ebca005a844d3424ed60acf63f8869d01d040d SHA512 dc7d937f930c57fb1d5ee58dcf2a84e72ac0cce78a257359b4bfa82664e322124fdc70a83a1518d72160acd7b14c662a658ab468e1f0eaedaf1cdf5c2d9ee245
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
index 52a6baaa91b2..007a7b0f0db8 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=dev-libs/glib-2.12:2"
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index bb017954ab13..f3f69196df41 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -3,5 +3,5 @@ AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f348
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
 DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
 EBUILD gtk-doc-1.32-r1.ebuild 2340 BLAKE2B bd2c6091b9237fe011e29429bf7a515d3e9149667fd8e553319d04da49f0a8983dac1a3aebf0f5aa7df589e03398f1dcbb816fc3381cd10cf2f8da328e4afbd3 SHA512 e70e382d6f2f73de8a9205055f9766b1b18318c4707044c595f6ea8b4f75a53afe0f09c7cf5774a8820ec234f9b31196b2d1a2fa18be6cf6112cb35ea05f8368
-EBUILD gtk-doc-1.32-r2.ebuild 2551 BLAKE2B f0a5da533e9b648396efe547e6f540327a026ffb958ce6d4fb3a37d455fccb34b78114f018432f5c2bcf35c9d8d60847e40dd878985af4e9071b2485af0ed445 SHA512 473663a2dcc0176c426845c6604725afd5a5eae98f7670c0381faa2b95d953ebdf9cdd1d26d92bf1ffc13f3125c025d1fc63a54e6b2b35544ffe51b06722c9de
+EBUILD gtk-doc-1.32-r2.ebuild 2555 BLAKE2B c9995f01b0f824dad7a63220f37ee98c4b58075218ca3263e2396cb7cf709907f62bdb2e697a13c19c2011aab839337579455daa3276a62a2d9f2c8efd9fa4ef SHA512 4209558da79555ad78bd154a2e86d9e9e447e5c7e62ed12b5aba2daeb3499a2a7d5f7b2bcf7e6b3435e654a98d11799e6bdd2e98581dcb6019c2883b5becaa2a
 MISC metadata.xml 490 BLAKE2B 9b4d27b146f567501af858fd704d7713e8eea66caac0b5878d685814b48825f4222a6286acd3a8ec4d8e698ace318c52c74e301dc8eb3eec41bca3d83d24a130 SHA512 0d33e970b5924c264711c8a77aa966ff8f1e6cd2695d34088c0f9af825cd72603173e07e39fb6d6bd22098d76c048b3dc03dd83916b092f2c68c58f94aa95b7a
diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
index ac05cc2f848b..81d3eb361bc2 100644
--- a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit eutils elisp-common gnome2 python-single-r1 readme.gentoo-r1
 
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 203607d07037..3db24c8562fe 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,10 +1,9 @@
-DIST ideaIC-2.2.202.7319.50.tar.gz 529375561 BLAKE2B 08a77a1326b81e9d6299779bf48fb0b9be389572143bd92591bcdf6ede79ecf86b725dde634e1b8bd412dc0b886bde29169bb236fbc902ba509b468e79073e90 SHA512 f68fe18a824fd47b3b21f0a3dcd172652858aafa9f81d1db908b3adc82f925677d2ce48d0a06ad58354c06b30e01c36fff910b4eb7d5ec89c408a6a1ff017e8e
-DIST ideaIC-2.3.202.7660.26.tar.gz 529860795 BLAKE2B 6704910e1ab456dde957eb14545ae2b6a0f9007091b875b65329b3e3ac354ddce326cdc5f0820ef3340cb291ffd2f40ac8f35fcfe6a042e3c4947c6e5a9f9852 SHA512 71ba86615024af4bd3c5ff61598c08122d0c2a7f093766e22e9ed65f1fed73ae7e7eeb8e57cb9c0021e20a268811e8c0a08eace0d4c3e370c092a92e7d572dc2
 DIST ideaIC-2.4.202.8194.7.tar.gz 529563361 BLAKE2B 1f792d1ff8b1246d5ccaf4324d6c85dbe2491f6585c126ef38594709358512766f7ed3cbb2128b6b8db71286ef1a5c6cf8ac21bc0293b0ac9b373e55e6cae3d9 SHA512 f603416c829f1f2b47e371c18dc8706bb6b9df9d87ee6056ac7e4786d7f9c029246195c2fb3b63bb7d0c1c7bfee99911b2c0d686232aa243087e4a17c0f559d7
+DIST ideaIC-3.0.203.5981.155.tar.gz 582023182 BLAKE2B 671fbba0c2173e3780a99d0d3b106af75c4ef6df4198ced3653c1b74a7bbb055a29b1fc31eb89823bfd56e6737c7788f78a90fe7ef46e52ab410c0dff18868e9 SHA512 35d569c5e13ec620d0a476cc52c005d29ea3c7c3c1ab0614a1a73255309635c84ee00820c50584ca19af634165138c77d8d712cfe0d367b9525956ad33aafe77
 DIST jbr-11_0_2-linux-x64-b164.tar.gz 131483925 BLAKE2B fb9c55094aeb4a9e6b89ef41699252355895fa4bf55eaa0d3c0a637b6485b5a91a0445b5f4af1872b62cd67b639f7354e05770970d41dcfa58ffeda7ae43c5b6 SHA512 4f32940166cc8ad5a138866e18d4cbfcd07f4326a85c051b7a622c9dcb8ee4b6d493331ef24d0c01999134fa2a9bad901f026982c16780fdc5e6b9308821db34
+DIST jbr-11_0_8-linux-x64-b1098.1.tar.gz 191689225 BLAKE2B 0da0f0e834709c89820f2e7e1c447dc33ea1c59c7dfb573aa47bc205f7920ccf485454f79931d42d4e6eb4de1017589bb908808d6a80cc586659757abc9958d3 SHA512 a455d8bd3332622592186cd7ae3995a9148a47717a81c274497f5408f1e89ef637c7478321b4ccd5dbe97c2e246a16ac8956c5ce475f8a4156232647f0ea7737
 DIST jbrx-8u202-linux-i586-b1483.37.tar.gz 80726147 BLAKE2B e4e5a076a541fd7153e861193ff4247c02ecbc144396ed28737afa7440f7771569b8d968b7c67b3dac333a89ff0b54cc9e5e76d1651b174cc7c0c21b1deb033c SHA512 53693f2ce994f4891807873ae3fe46ce60bee000b78be03c5d3df06b436328abe5b5d7e75d43e57f35f24187f49915187d034b39589e29806f55deeb14a029f2
 DIST jbrx-8u202-linux-x64-b1483.37.tar.gz 81812743 BLAKE2B 86ddf0c8dc992a27e680caa821f54fa4d647a8bff78b9fdbef82996bfbba828a2f68f1a00ed64bd92ce24a62bfc6c0240837c396644c6e91244cb0d980b6c704 SHA512 cd31a3c4da7b8c65e9ae89326c2c8b260b51890258d30f64b1e8a7c6c1442bb2cb68ea2aa80387ce0c1a8f50e3533e8231f72c5935b639e3cf82bc1ffedee8e9
-EBUILD idea-community-2020.2.2.202.7319.50.ebuild 4693 BLAKE2B ac564614a230e6539459a2122d5ca9b9ce842697a06c44b4b10eef9cdab283a5e8967d39a40cf24c1ec2e1252f97d6569806aa3807aaca8c3a9f686aedf372e5 SHA512 e07f7c5957113f18a57281cfbe75c136b141c82d1ec6487cc0a1eb47f2b87c181f203111ae86505df7d5f2c73791ce03c68e48ae09916caf87188aa121656f7c
-EBUILD idea-community-2020.2.3.202.7660.26.ebuild 4693 BLAKE2B ac564614a230e6539459a2122d5ca9b9ce842697a06c44b4b10eef9cdab283a5e8967d39a40cf24c1ec2e1252f97d6569806aa3807aaca8c3a9f686aedf372e5 SHA512 e07f7c5957113f18a57281cfbe75c136b141c82d1ec6487cc0a1eb47f2b87c181f203111ae86505df7d5f2c73791ce03c68e48ae09916caf87188aa121656f7c
 EBUILD idea-community-2020.2.4.202.8194.7.ebuild 4693 BLAKE2B ac564614a230e6539459a2122d5ca9b9ce842697a06c44b4b10eef9cdab283a5e8967d39a40cf24c1ec2e1252f97d6569806aa3807aaca8c3a9f686aedf372e5 SHA512 e07f7c5957113f18a57281cfbe75c136b141c82d1ec6487cc0a1eb47f2b87c181f203111ae86505df7d5f2c73791ce03c68e48ae09916caf87188aa121656f7c
+EBUILD idea-community-2020.3.0.203.5981.155.ebuild 3939 BLAKE2B 2403506f825258aba5eb513816d5641beab8bae7705973e1743bd010048d59dad74f37125f55d7e33fe80a798da7204aad149ee939c43574bb18336fc2bad3c9 SHA512 17de5710ee2f5d95896930bb12edf5bda5e9281b98d909f8eb923345bd704f50eddb20ab0ac29a0048c4651511e938fd0ee1b014d198f3c83a92ff4e57af1598
 MISC metadata.xml 758 BLAKE2B ab45d0a8508bed2b64d02ca83d0aaffab9dfceb13a6a188accbb18f0648593ef1a9cfa03f375292b9858c05b17f003f4c6c2261b9d962ddaf679eebe7cea2eda SHA512 15ad0429ec342e939f3406e83b736ec9a273cb4ba33998a83584cee7af4ad0433a5a4758c8d01feb24efef51e4a4d9761db18d0bfc054bf9a0980ac8806eb459
diff --git a/dev-util/idea-community/idea-community-2020.2.2.202.7319.50.ebuild b/dev-util/idea-community/idea-community-2020.2.2.202.7319.50.ebuild
deleted file mode 100644
index 97ec35a8801d..000000000000
--- a/dev-util/idea-community/idea-community-2020.2.2.202.7319.50.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils desktop
-
-SLOT="0"
-PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-3)"
-MY_PN="idea"
-# Using the most recent Jetbrains Runtime binaries available at the time of writing
-# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
-# available separately
-JRE11_BASE="11_0_2"
-JRE11_VER="164"
-JRE_BASE="8u202"
-JRE_VER="1483.37"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(ver_cut 7)"x = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS="~arm64"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
-		jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
-		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
-		jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
-	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 )
-	jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC
-	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
-	MPL-1.0 MPL-1.1 OFL ZLIB"
-
-#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
-#either (or neither) bundled
-#Defaulting to jbr8 to match upstream
-IUSE="+jbr8 -jbr11"
-REQUIRED_USE="jbr8? ( !jbr11 )"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*
-	dev-java/jansi-native
-	dev-libs/libdbusmenu
-	=dev-util/lldb-9*"
-BDEPEND="dev-util/patchelf"
-RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-# jbr11 binary doesn't unpack nicely into a single folder
-src_unpack() {
-	default_src_unpack
-	if use jbr11 ; then
-		mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
-	fi
-}
-
-src_prepare() {
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-
-	if use jbr8; then
-		mv "${WORKDIR}/jre" ./"${JRE_DIR}"
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
-	else
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
-	fi
-
-	rm -vf ${PLUGIN_DIR}/libavplugin*
-	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
-	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
-	rm -vf "${S}"/bin/libdbm64*
-
-	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
-		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
-		do
-			if [[ -f "$file" ]]; then
-			  patchelf --set-rpath '$ORIGIN' $file || die
-			fi
-		done
-	fi
-
-	patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
-
-	sed -i \
-		-e "\$a\\\\" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
-		-e "\$a# package manager. See bug #704494" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
-
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-	if use jbr8 || use jbr11 ; then
-	if use jbr8; then
-		JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
-	else
-		JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
-	fi
-		if [[ -d ${JRE_DIR} ]]; then
-			for jrebin in $JRE_BINARIES; do
-				fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
-			done
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/idea-community/idea-community-2020.2.3.202.7660.26.ebuild b/dev-util/idea-community/idea-community-2020.3.0.203.5981.155.ebuild
similarity index 60%
rename from dev-util/idea-community/idea-community-2020.2.3.202.7660.26.ebuild
rename to dev-util/idea-community/idea-community-2020.3.0.203.5981.155.ebuild
index 97ec35a8801d..675066ef9b53 100644
--- a/dev-util/idea-community/idea-community-2020.2.3.202.7660.26.ebuild
+++ b/dev-util/idea-community/idea-community-2020.3.0.203.5981.155.ebuild
@@ -6,15 +6,12 @@ inherit eutils desktop
 
 SLOT="0"
 PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-3)"
+MY_PV="$(ver_cut 1-2)"
 MY_PN="idea"
 # Using the most recent Jetbrains Runtime binaries available at the time of writing
-# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
-# available separately
-JRE11_BASE="11_0_2"
-JRE11_VER="164"
-JRE_BASE="8u202"
-JRE_VER="1483.37"
+# ( jre 11.0.8 build 1098.1  ) 
+JRE11_BASE="11_0_8"
+JRE11_VER="1098.1"
 
 # distinguish settings for official stable releases and EAP-version releases
 if [[ "$(ver_cut 7)"x = "prex" ]]
@@ -24,30 +21,26 @@ then
 	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
 else
 	# upstream stable
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64"
 	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
-		jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
-		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
-		jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
+		amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )"
 fi
 
 DESCRIPTION="A complete toolset for web, mobile and enterprise development"
 HOMEPAGE="https://www.jetbrains.com/idea"
 
 LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
-	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 )
-	jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC
+	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
+	GPL-2 GPL-2-with-classpath-exception ISC
 	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
 	MPL-1.0 MPL-1.1 OFL ZLIB"
 
-#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
-#either (or neither) bundled
-#Defaulting to jbr8 to match upstream
-IUSE="+jbr8 -jbr11"
-REQUIRED_USE="jbr8? ( !jbr11 )"
-
 DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
+	!dev-util/${PN}:15
+	|| (
+		dev-java/openjdk:11
+		dev-java/openjdk-bin:11
+	)"
 RDEPEND="${DEPEND}
 	>=virtual/jdk-1.7:*
 	dev-java/jansi-native
@@ -59,12 +52,9 @@ S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
 
 QA_PREBUILT="opt/${PN}-${MY_PV}/*"
 
-# jbr11 binary doesn't unpack nicely into a single folder
 src_unpack() {
 	default_src_unpack
-	if use jbr11 ; then
-		mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
-	fi
+	mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
 }
 
 src_prepare() {
@@ -74,17 +64,13 @@ src_prepare() {
 		JRE_DIR=jre
 	fi
 
-	if use jbr8; then
-		mv "${WORKDIR}/jre" ./"${JRE_DIR}"
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
-	else
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
-	fi
+	PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
 
 	rm -vf ${PLUGIN_DIR}/libavplugin*
 	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
 	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
 	rm -vf "${S}"/bin/libdbm64*
+	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
 
 	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
 		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
@@ -96,6 +82,11 @@ src_prepare() {
 	fi
 
 	patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+	if use arm64; then
+		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
+	else
+		rm -vf "${S}"/lib/pty4j-native/linux/aarch64/libpty.so
+	fi
 
 	sed -i \
 		-e "\$a\\\\" \
@@ -119,17 +110,12 @@ src_install() {
 	else
 		JRE_DIR=jre
 	fi
-	if use jbr8 || use jbr11 ; then
-	if use jbr8; then
-		JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
-	else
-		JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
-	fi
-		if [[ -d ${JRE_DIR} ]]; then
-			for jrebin in $JRE_BINARIES; do
-				fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
-			done
-		fi
+
+	JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+	if [[ -d ${JRE_DIR} ]]; then
+		for jrebin in $JRE_BINARIES; do
+			fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+		done
 	fi
 
 	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
index 84b30510e11e..6eb4d36f48ca 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -7,5 +7,5 @@ DIST indent-2.2.12.tar.xz 620280 BLAKE2B c3414ebe58d75b74356b5c37234639dc34998b7
 DIST indent_2.2.11-5.debian.tar.xz 6540 BLAKE2B c4d0805f39e1af503bcfcc49a8e9e679fb0df1021de9952af5a80c81f0c36c70e8dd6609b7e7ec5e36596f974d9c9ac31a7cad831a431cd9401758981d46a7ec SHA512 f89f04bb3b9772c5428ef6df939b5cbe92761f3a39869020dad4f98a5e48c57c34de526803141258c9d55ba6edaedf05127009530aa09b1a54cfa15c8a421a31
 EBUILD indent-2.2.11-r1.ebuild 1231 BLAKE2B 89908894927dbcf9a423998aca2f3d5052a6912bad1ff67a68dafee6bd651b402a388873dab797efb196c2a4cb8208b9a0f259b0b1af5be64ba16267885e9571 SHA512 1ddfa9c9624bf7409a063fbf2707a095e120f64c3b2a86abd86ad0e8b9b2200e0a2ba2cf7bacf221d3d9c1553fa71971c94ff4e19bc59fa90ee87bf198177fa7
 EBUILD indent-2.2.11_p5.ebuild 1392 BLAKE2B de097169420daf098c4a3a1f88cd973f0047bc282e3ae5e08be60ea27c18eef908d91d44d418b395ac79af0c6caa4f4fc742a4423d7f3162c5e9ea37a7c77af7 SHA512 9b1b34cdc5fbdc205fa448ba9ddb47a313c2842eb6f0872078c0b1769fe98a8fc491f6b2d4af4c425dacc1f105f2dbe88eb1b27682d339f9cc98185ea1fede1a
-EBUILD indent-2.2.12.ebuild 1120 BLAKE2B 8507f8d2d6b9e6f722636e22389aa1b74f53a6484a69fd57aae0fe569da1c91424d72ca683cabed9594193f219c288ae0b70248d2e007d4f6c255c52bb74f689 SHA512 8a18f85bfba47c9fc6b52fab6c24f681c9431d61c894dd2431dbb9a603bf0bf38b8fad7088b7bbe7298afb8e7d926b5ce3c45d0cfbedea974cabf3d6b33397fd
+EBUILD indent-2.2.12.ebuild 1117 BLAKE2B 720d151cd3dc0f3cb9bfb9e0dbfa972c0b6aad135ecdfd0ebd9df99e2b42e462182e5b549011dba78c971f2564c709c831a857d79faf12feae31e8411d0da4d9 SHA512 545028a10da4e4b23a18c7cce95d6041c232c268e3b33d4929bcf99b26fd807de95ccd2fd1a79f1cb5cc00d597406c9c4522d1f8cc948451cafee1028e4ec98e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/indent/indent-2.2.12.ebuild b/dev-util/indent/indent-2.2.12.ebuild
index 7f7d80d1a266..2cf052f587b2 100644
--- a/dev-util/indent/indent-2.2.12.ebuild
+++ b/dev-util/indent/indent-2.2.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls"
 
 DEPEND="
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 2f2cd1478aee..9ba4d0745f62 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -5,11 +5,13 @@ AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e
 AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
 DIST jenkins-bin-2.249.2.war 67399569 BLAKE2B df3d954988370a47d90363a01de97f17a92cb4d93049ceacea80f7d2a92195cd1e95b1f3780521efa166aee1058949f0e8861b887d6da5b0f0126a2579d22595 SHA512 0300369b3c427420a9c41ee17f3e098c77f14b25597059d740fdbea03f3679ce56d9e154d7765601274cd9dc866939595f7728bc2b8b8a0ef3ea131378648a98
 DIST jenkins-bin-2.249.3.war 67400032 BLAKE2B eb9ffde454bf9ee2140655a985c6f383cb2e3d21f172075cf19171871564d356afd38b8ed6119cb3bd43801843d499242c0ae99087c5c4f7cb2db1b8b80b70a4 SHA512 5d65dee8c128ba2a307ade0750a0ad9b71136b1102a36df0a34a1217ce62df9c0c60449e0f5dd8861369b553000ef65f8bb0afb54a3c8e4315400dede58e779b
+DIST jenkins-bin-2.263.1.war 67270143 BLAKE2B 2c59b2d58632c741a0ce9ba66e4d177779899be01d3e0b9f7ba2e8fa5ff8bac667c2e2c98b9c199a8d55f9c873c1937b80f4aa6ea5f7ff6bbf256047c9a6ee94 SHA512 320dc0d4b365c0b9e11e76d6753b5ba3fbdf81e1acb9a7bbb4082fba1c57f22126810b75c563c4aa75ef3ff1633f2fe1a953c8aa1a25af5f3a0a9b2bc3a104d9
 DIST jenkins-bin-2.264.war 67272894 BLAKE2B 8cf8afc038420bbf101bf8c81cdb37e9ba25f631ccbe0f98d8897f12a93abf8355dca1ec23f254e14b16dbd8e88507a37b545c4854f2e8f3684bda871d8e171f SHA512 9bf29d7ae084c30c02931ba065e7d712a3cab4e4519587a1edc68e7205dac7a91934ca910536dd8d2c268575547fea2cdcc43229c726ed495658210cea7747a5
 DIST jenkins-bin-2.267.war 70971700 BLAKE2B 1470144d6be6cfc33d7b84c51ebb3f762b3e590427a362596302b87510d694b479608ff290b64a433aa98266d3c47b1294a505525cfdeae3547e58cc65f0d172 SHA512 39c042b3ca9d48c040d0a9d9ac9d65aff2f579888e24b800bc1e1b77b7175528aed31f2675b3417577b0b0eef7c17b6faa2d7b794360a17a6a4c8ba867007185
 DIST jenkins-bin-2.268.war 70969355 BLAKE2B e24424c8cd0535c04134cd22b8fc5e73de80c8eaa090e9fdf512dfeda4a9d029b0657e7ecaed4934ff996c1f5e8e59e9f10a7bfc31a313792cf759017780aeeb SHA512 b0e55310a21039fc57a7bdcc3b190ec61141f253d084a8279d279cff1778a3a4edc281bcc2cd1f872389d160a77dd2c9ebdf1b6cbc5d90272f2aedd66296535a
 EBUILD jenkins-bin-2.249.2.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
 EBUILD jenkins-bin-2.249.3.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
+EBUILD jenkins-bin-2.263.1.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
 EBUILD jenkins-bin-2.264.ebuild 1105 BLAKE2B 90abfb2e3e72792cf968489f1da72a5bf90a6f622ac0003fcd56e5cda7a1ae79cd7effb539a7526fabcf85a6453499c831cfaced13db2ad5762b93cd0e2925f7 SHA512 0f1b7d69bb9e1dd47a42c5a0c925bb55f04692c2097b16d64f08d6d49f6b4267b81c766cca359c9ab55b411372741a2af1029ded72e93a600d44dbda7ad02110
 EBUILD jenkins-bin-2.267.ebuild 1105 BLAKE2B 90abfb2e3e72792cf968489f1da72a5bf90a6f622ac0003fcd56e5cda7a1ae79cd7effb539a7526fabcf85a6453499c831cfaced13db2ad5762b93cd0e2925f7 SHA512 0f1b7d69bb9e1dd47a42c5a0c925bb55f04692c2097b16d64f08d6d49f6b4267b81c766cca359c9ab55b411372741a2af1029ded72e93a600d44dbda7ad02110
 EBUILD jenkins-bin-2.268.ebuild 1105 BLAKE2B 90abfb2e3e72792cf968489f1da72a5bf90a6f622ac0003fcd56e5cda7a1ae79cd7effb539a7526fabcf85a6453499c831cfaced13db2ad5762b93cd0e2925f7 SHA512 0f1b7d69bb9e1dd47a42c5a0c925bb55f04692c2097b16d64f08d6d49f6b4267b81c766cca359c9ab55b411372741a2af1029ded72e93a600d44dbda7ad02110
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.263.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.263.1.ebuild
new file mode 100644
index 000000000000..8ab8d5db213a
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.263.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 665a0a33ea27..024cbd40730d 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,3 @@
 DIST meld-3.20.2.tar.xz 593948 BLAKE2B 9f2fee48405d76f9ae2fd0b0dd4116321aa176059dd4ef217a5c4c8d0edff5859bab72bbca83b2e7d612706f017d1889d68579eaf9838d7784c9ecb74ed7d403 SHA512 9c9074cb879e3574eb9a1025eb1212771419ab0d8e92bf8a99f38e70ca583ff5c8cbeaccb87b414e6ff73a61afa08e10742991d574b810cc90e8c4a5ac82ddaa
-EBUILD meld-3.20.2-r1.ebuild 1406 BLAKE2B 13584822203873664df1a2b03fd6766349edff3892cbf33184c460dc0038039a35ed06f02b300334c55d5b50c91f21008a07a86e091b4f2c5d9ba5e328cea4bb SHA512 a9d3bc2ff9b5bc006d5e15ecfd69a5b00063a26984cd1d9945dddeaa2bf7784da1083a65b46155d65d633321be7699671a6f210ea1a1f28b306326668ce8500f
+EBUILD meld-3.20.2-r1.ebuild 1413 BLAKE2B 539d5f21deee3584931dc6c6796e2fa49a9e6f693f5ca639e0fa9d8e0e7216442107d10d304d0b42d29d8a568323c72445b2a7a5966fbb5d07745a3c5c182bfe SHA512 f4d578e70b08d477b7e201a33aae001b12783fc3048a053031e50fd41015e01940da73d4dfd741854dd799170d2432acd3e62b878af108560cd614b0b043b686
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/meld/meld-3.20.2-r1.ebuild b/dev-util/meld/meld-3.20.2-r1.ebuild
index cd83e457a06a..dc488f67b46a 100644
--- a/dev-util/meld/meld-3.20.2-r1.ebuild
+++ b/dev-util/meld/meld-3.20.2-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://meldmerge.org/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index 87e27db7648f..3acb78415873 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -3,5 +3,5 @@ AUX musl.patch 632 BLAKE2B fcaff5d665639ee365d51171024b98f58a431668dc36e829267ca
 DIST oprofile-1.3.0.tar.gz 1547258 BLAKE2B d8777e41856dc2f082570a1542609bd730fd7076000443f2e17c77eaf75df7a7a772ebb49d82ee657f563797858cecb4c23b130b0174d154c54d5619b8528ad1 SHA512 02a940cd8d38834dca2a97c8ac0fff04ef95b3819cfdf74a462b9326c7abbf2dc55d2a9b9d1fbefc7f455465bf85516be2b879d7daf1861ba2c4af51214377ba
 DIST oprofile-1.4.0.tar.gz 1557625 BLAKE2B fe1a725b713da0e06d3876c52f001163965c1b0dd8ccbb271ef6924525ac6ca342d55172c06cc21681b441c744780d5cb523be08562952c5916005ec67734221 SHA512 44c0ae55d20d623ea8b4245bfe3e208813dbb8778d7e320378ffe70538ef6af1a6ddaf5d110e29751c216879543f13121dd71cb320023205622b3f0cd6b157df
 EBUILD oprofile-1.3.0.ebuild 1710 BLAKE2B f8e293e267d697ac5032aa086dcee205a86709b2c26b9ae730e105cd5b2045aec0550c6672ff8fc300c203d53b5d1bae26cdf1a310cd0226f60a58aaf38bbdcb SHA512 b0e87f0a90f21f35cdc9dd21b32d0a93e3bb26ec7517a28669ae5b7086a3d597c1a64f6ca117cec1625cdf239a191c4b028388ca7f3e5ff24fbbf695a55e1234
-EBUILD oprofile-1.4.0.ebuild 2016 BLAKE2B a56ddd9a7058c6b897f77cc8c79c719de5a524f2094250dcfcf421ffaf81334fb8ab578c86475910a1ec7e432c225244361f5b88f42d77ed9d153d20ec96f0b3 SHA512 b92c6f600a90796cb8e69e243d97f89ffdc256b2348e4bac6de959af6b7ddc28c011debe860984e92ec552bde930caecb7396936878cb5fb03dde0e686aa9b96
+EBUILD oprofile-1.4.0.ebuild 2023 BLAKE2B 1d030088f84ba4a06454f139db4016ba531b126be74038beb458c33b42f0490ed3407744de02841ab26aa1f1a74eb45d610066de800f252f7d51c0aca22aa1b4 SHA512 84a69937d9b8224f87120f0ef27905f90a6079b5718e1045b509a4044e34f28cc39cda59853cb1dd2e2689b18115eb1fec2183b832af9d88d64118f5ac58c4b7
 MISC metadata.xml 423 BLAKE2B 18e22d9fcde7236f7aacf9513bb12e7ae4a7eb07445b1b2c56b563a816b02d600722865d8460e810ae0206632b7b52703cac1812aea9626dcd47fd173d4b8cc5 SHA512 2bc1c9012a9f410cc206abf7b5471c1f8b3adf214241ab3ce1da36f34597a2ccc309ee627582c766d1988440a21e8df7a90668691fd57015b6cdd4db34661f22
diff --git a/dev-util/oprofile/oprofile-1.4.0.ebuild b/dev-util/oprofile/oprofile-1.4.0.ebuild
index 485fdf66c1f0..c44a69cfe3dc 100644
--- a/dev-util/oprofile/oprofile-1.4.0.ebuild
+++ b/dev-util/oprofile/oprofile-1.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="apidoc java pch static-libs"
 
 BDEPEND="
diff --git a/dev-util/shflags/Manifest b/dev-util/shflags/Manifest
index d8ea7ddfabed..ad40502f6a71 100644
--- a/dev-util/shflags/Manifest
+++ b/dev-util/shflags/Manifest
@@ -1,5 +1,5 @@
 DIST shflags-1.0.3.tgz 43549 BLAKE2B 2f5376dc9589eb63133857dd48fde5bd9aae48b31d1f94a97c1d9d3f505d48ee1586a2e6a6f7b44ae85be26b4e7643beee2cdc47a5f3c3ff1a69379f174d98eb SHA512 993f5b274855d5dea5d01d3a799cfd5ff6c5ff2bf153461983052a78d8a96f9b0ee44124b4c51977baa4905c86a3293778c5d7e154305ee051fcac03f6fe70cc
 DIST shflags-1.2.3.tgz 42253 BLAKE2B 4837d31762129790659b67d4025cf8627ca5db32225ac61b437a5ba6bf9f894c87976d06dd5e5039a5ad4b7a0b7b173cc7f96fc3a11dc3c2ac797de2c749a8ed SHA512 5bddebce14e516fe37b2b1631d5aec54651ee728e538dfb0fcc68d32b79d335c7b48f5ef5aab99dd730de3b8fd556a6640db9b9ae2a7753feb6aa1e0831b64af
 EBUILD shflags-1.0.3.ebuild 628 BLAKE2B 480e47ff6f6a76724df5ea404c95e8c02bd9120f50931b46d19c155321dd1963e1208ad64e8a33c97ddf61d852d6e1692c4a14904bbe2875c9c2d83e35f451f6 SHA512 e74ebbc0240e843f49e84b99bd518c296416c572f0bbe6e2d1166beda6c2dfce32aac652ad8ddd056368a9feb58da3d66a9e894b25f0a2c7ad989543d98fd99c
-EBUILD shflags-1.2.3.ebuild 587 BLAKE2B 825f7206e9a3de2d2a2dfffdd865a06b3be3cce182c02ef02a0270d35acebbf440dba2c03bc9958290244a28b21f493d8d9d1f4ea20393da43df5954e7115c95 SHA512 096961335d342c29c9e6b92ab67e991c8ee09675bd504dcb732782f0494d3168b38f8cbebfdb4a77c303711f880c9bfddf6fcf335ac7ffdebc17ba39d13cc463
+EBUILD shflags-1.2.3.ebuild 583 BLAKE2B fb8b7c0db5df2e1ed9bfa441d82849b2bffc44ee48f6f2f49ecbb0c737998d86a9b56b9236bb584127098e687cb860bb6b33de0d1623fe82ad2c36abb7e2034d SHA512 9475bcc752d4074dea28cfe9ab67f5b460949e830943ec2fa5e9dd4bc28e79d98052715d31e0ae1c76e735a17c6adffc118f63f3e94b46dd89ee0e3282fe3ddb
 MISC metadata.xml 395 BLAKE2B 771aa58612fb4b5b7502bb3ce0b98eeea7449b3c56fe57b2de23cddec6c4041dea7d4f61cbf29f95bdfbd87c4b1bbb24eba62b255b7b4c7e05ff7710112e7dce SHA512 d5cec821871007bded7b69b96c3a36ff84b5756c97dc21d8e18af460e6218d176f019771843b9bb3e8cd940226c8d121057a3dcc1345bec0771ed301dac9bcc6
diff --git a/dev-util/shflags/shflags-1.2.3.ebuild b/dev-util/shflags/shflags-1.2.3.ebuild
index 209188c6b46c..b40da0eef382 100644
--- a/dev-util/shflags/shflags-1.2.3.ebuild
+++ b/dev-util/shflags/shflags-1.2.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/kward/shflags/archive/v${PV}.tar.gz -> ${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="examples"
 
 src_test() {
diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest
index d0bb504202cc..3db124dbb272 100644
--- a/dev-util/wiggle/Manifest
+++ b/dev-util/wiggle/Manifest
@@ -2,5 +2,5 @@ AUX wiggle-1.0-cflags.patch 576 BLAKE2B 25b065a28bb88f3163c063a90a9dc60ec9171e4a
 DIST wiggle-0.9.tar.gz 809756 BLAKE2B 62fd35c721c4d54204984fd196686decff54c1613ceabf5c727b6383500158a04110c4fa2e63d6456452ac79fb811aac611876528fd2503c1acb7e0eb000e49f SHA512 2e3a4977704231f3bd6aa96ffaba8bc733acde425773b86a9649312676b44360c5b85cb48bf944cd383d8e4d0a541d88755f23be7d7a8884213f68a6320c62d9
 DIST wiggle-1.0.tar.gz 868216 BLAKE2B 7241cbbde488b5cbf8970feb1cc258deb04c935347d793796f34993feba3e82870c9ac2aa7d5039f4739308cd0b20b4b104fb50c5ce64a5c66381ff3f6c545d4 SHA512 e9bd6e794ba0cff70db96a648c53aa21b427967758375b843fccf409dd17faf59468c11bafb1e0a7af8bfa657551da8bc1903b9ccf8def1ed9acc84f50c7e0b3
 EBUILD wiggle-0.9-r1.ebuild 1714 BLAKE2B e8c17c40f61dad213d8cfd43e3211fdcb5293eb46baee1f875f6b262382d6931b1e739d80ffcee7bec2930d6fba1878a1e8d4553dea17daa9be9b74851202f3f SHA512 8b976140f14ac386c2c483f3402097ac49b89bfc7742e8800c1053e3cb46fb75fc8b10ba6be49627aaaaf4261f6c8dff11a8834fdadc31f1029304f062eebe8a
-EBUILD wiggle-1.0.ebuild 1492 BLAKE2B 78af1811c96aff9c1352fbc9b786ce83eacc566431de0299f36d043659037a3eaccbffda21fcb1e582f6cda620740828d943c30f632cecf88da19c42090df476 SHA512 d96b9597f5b23d04adb8d5b25dc18b359cc3555d396a2a1533d75f4e89601750d154b3763ad554f0069a76a63a5f37ecb304eb3a4695300db0be38338f7c6070
+EBUILD wiggle-1.0.ebuild 1491 BLAKE2B 031b2ad8091f0521f9ab17900309ca336f7616570a99188b22fcbdec4f237f5e232e1453d569bb06152374dd7bbc568b94636181ddc279bc614c05dbdd83df0b SHA512 7d62261ed2d1187a2e5d5efe13f792179a2f47975b704627e0b63e953b3c2bb501e4ec90c96ea12ae43de52e3dd88dbfc0c52f493315be30809831b5721661f0
 MISC metadata.xml 256 BLAKE2B 7380eb4443aa7d04fc02d228edb72f675580a9f36244c083c4bbdcbc492a4c5169fb3121158d4a613f25f7c0464042bba7951fb92cf9f11c5208a2d9699e195e SHA512 574345bb2730bbc2d0190a03b16703d10441ccd589623c5e8bdddf84d7ce86226da7e079d7b2135e4c724d0813973c551143cdd0f525a58efdd37716dd83edfd
diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 11a76e00ddf0..33e321fa5383 100644
--- a/dev-util/wiggle/wiggle-1.0.ebuild
+++ b/dev-util/wiggle/wiggle-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://neil.brown.name/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index bab739d403fc..ee1b555ffc69 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,7 +1,7 @@
 DIST xfce4-dev-tools-4.14.0.tar.bz2 292275 BLAKE2B 18f28394ded038a7bcf0e754ebb359464358df245903a0c4441df2845e57c9059de6e6775a90c0e6c3cde4936a847ddf26ae88ff61fe7612fc2626b00f1d56a7 SHA512 e22b139ff7516ec0e510f882cc6a9e8e8b2b7bd41093c8e67e5ef11eb6c2c2848637513369d652f7238f10b5005c5483a938d3348020b48a4c1fadadd6d635f8
 DIST xfce4-dev-tools-4.15.0.tar.bz2 336453 BLAKE2B 9072d86b4b1645e72c04f26b5609162f50aac9d90ad007d2f629bb1ec67d242f3addea4bdd6f129f3336658b04f0eaecbd039154dfd98ccb87a85840b502d11f SHA512 125c8a7d594b17ce822dc5f57f5c700e69ee6208b06931cb0fefcbd1aa70281f388a9eebe8b451ffb55f16682070f9119a43b148f97adcdfd2278b4901910425
 DIST xfce4-dev-tools-4.15.1.tar.bz2 340738 BLAKE2B 73c08f27011ce0d2144eaa1672209669a382695bc9fc9c0a7b9966398df09cf4813afdde9f809354b48d8ddc06644b6e8d4f45ed758dfca24c92e557f5536c8e SHA512 e24fb63774b36f5b3cd901394b75b36e891a68fe7a46a1503a1fc3cfe901bd267e2d8d4aa35a2c760226524079617059e5344b93ef98b3f97dce85e765e5c5dc
-EBUILD xfce4-dev-tools-4.14.0.ebuild 579 BLAKE2B 366d376277ef62122256194b0d4dfdd747e30e82097009b8c41d83473497f5b285b2b75b4584d2293236a17c9efc1ef152a331a398a7f1e67b68dc904c55eb58 SHA512 68fadca9308eb50c5c2be9f50847df966457518cebe86263c21d2f4b8aa64bc5b0f7146f25c16df281924c643ce4de2f38e2fe8db8efb155dde8b3dd9771363e
+EBUILD xfce4-dev-tools-4.14.0.ebuild 578 BLAKE2B ee9471d511f0f61bebc4458fafd29ec7c246ede52b393404d055058f8453149fb13a0c5e83504aa15465ac4549ec67a8bc693d59f44cb268e61ab313de3b0aac SHA512 de4981b2dd476a6582654f5bc09b3e6008d0f96b310737e0797c66bf3e469783a7dbef58445ff20d5e9d8ea02539d334e6c5047f78ecbb82290deab39a9aa83a
 EBUILD xfce4-dev-tools-4.15.0.ebuild 584 BLAKE2B 6b2f6fcd2f8ed91d4a09138a3ea90c1ecb1e5cf8236dc7e16bbf4889d0aabb9a08d822b7cca7b0888ee586837e41a5c055d71836cb2255ac82c99af875a58cf7 SHA512 35e950fba2c4de9b286afa8d9af5560c8c1ec72c8df70ab2fafc67015005bee23f5e7b59e79e8d631e668cb1ceb423106c4a1fddfdbd39e8e7741e6fb9fe1c9e
 EBUILD xfce4-dev-tools-4.15.1.ebuild 584 BLAKE2B 6b2f6fcd2f8ed91d4a09138a3ea90c1ecb1e5cf8236dc7e16bbf4889d0aabb9a08d822b7cca7b0888ee586837e41a5c055d71836cb2255ac82c99af875a58cf7 SHA512 35e950fba2c4de9b286afa8d9af5560c8c1ec72c8df70ab2fafc67015005bee23f5e7b59e79e8d631e668cb1ceb423106c4a1fddfdbd39e8e7741e6fb9fe1c9e
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
index 82bfd3fc320c..f68bf7c7a78a 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.42"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index f15c53f0ea9d..5636ccec581b 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/cssc/Manifest b/dev-vcs/cssc/Manifest
index 4c85de9673e4..0832f76eefd6 100644
--- a/dev-vcs/cssc/Manifest
+++ b/dev-vcs/cssc/Manifest
@@ -6,5 +6,5 @@ AUX cssc-1.4.1-m4.patch 351 BLAKE2B dde4c1f2876f8e84587ad531a094431d1854652f901a
 DIST CSSC-1.4.0.tar.gz 2012122 BLAKE2B c38bf9f50e372559c87d318780973a28fd2fec384cffd0c077c556b321f9f3e68324f59f26900e63c9235f30c564a60783c5a48b515b9b878977fe10266cd0be SHA512 7abb38ecfb5120e807d1f09d16ce81306b3eb16746e44da5029f626feba67dfb46db20bd2b89daffb2e3cdc51ffadc51cd666eef7d1b94e56b4c7dc24f93ea76
 DIST CSSC-1.4.1.tar.gz 2269725 BLAKE2B 264e996280ff23818332dda62d80adc61fd6a2e924af26a044168bf136c22b22bb591d37157030dbe8e2360a2687b0dcbf843f3af8683b08593fded4ef982739 SHA512 b843bd636b15830b2751c423ff2f2e7292e0942d750ca57425d9674b74c7291fe34db33cbbc4b87d27f80d3b54b0074207ceda612faa651b6f01486e0b2485d5
 EBUILD cssc-1.4.0.ebuild 1031 BLAKE2B 83508c5b50db4bd923dba328a108ac29b1a7e14e73aa5eb06991c5ed8ced9390dda2ed44c7a693666003253153e052a94678409d8974432abf12f4da692af001 SHA512 9e83758ca2c372dbc65adfe69f8e9565462c89db5d7cf541d015642a0f8298676ff42f91a15d58f1f058087dbc3320aaf42e008c896975d248fb758037916464
-EBUILD cssc-1.4.1.ebuild 869 BLAKE2B d2430404b911b378706957c6bb852203f5abc362425b561546aa1802caf6e1f5c4978c8d1a98196be6b217ba606775f9d9b405fa3f0aaf17ae9e0b62a9ec92f7 SHA512 1204ab4cb70d538dcc4dd388842e14c6b45a3652371c9df8dec518cdc08549645053e9795125b468eafee179b7b9d17352cb39175145a7868212c6ae12dd6328
+EBUILD cssc-1.4.1.ebuild 868 BLAKE2B aef4433a6e2261225cf05f3c01ee0e3ada945f5bdb0dfa654c119d76d57eb0c125e92fb3dad040d2a4a7f09500fbb3a5d4b1b1573e970d70a57068f4a43e7278 SHA512 5e6f66da6a476c098ef3a9189fd58c1037b5cab9bdc39b215724f67a3e769021f941797f60bb597cff30762d8c273fda02d55dd52ad6917e6c40e6a369cc0661
 MISC metadata.xml 262 BLAKE2B 10958c4700f56d8e765427a12ff0618d4ed03e63bf90adcaf326b5ecddb97825d5996d9f90d91120a6fef3b38828bdfa654184d22abead68a52a9eb382387def SHA512 a1dfa0890289178f9b0d6b0b9669718c428f7c73bbf07f8f420072c9638fdb19198ff9135d0d8853e9eb63536bd0384575f7f7b65ffc54edbf0d425863251959
diff --git a/dev-vcs/cssc/cssc-1.4.1.ebuild b/dev-vcs/cssc/cssc-1.4.1.ebuild
index 39514fabd0b8..0a3f9485a090 100644
--- a/dev-vcs/cssc/cssc-1.4.1.ebuild
+++ b/dev-vcs/cssc/cssc-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${CSSC_P}.tar.gz"
 HOMEPAGE="https://www.gnu.org/software/cssc/"
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 IUSE="test valgrind"
 RESTRICT="!test? ( test )"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 1222fc788312..003535ea2244 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 25cb67b78a31..5ffc91be479c 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -378,7 +378,7 @@ distutils_enable_sphinx() {
 }
 
 # @FUNCTION: distutils_enable_tests
-# @USAGE: <test-runner>
+# @USAGE: [--install] <test-runner>
 # @DESCRIPTION:
 # Set up IUSE, RESTRICT, BDEPEND and python_test() for running tests
 # with the specified test runner.  Also copies the current value
@@ -389,6 +389,10 @@ distutils_enable_sphinx() {
 # - setup.py: setup.py test (no deps included)
 # - unittest: for built-in Python unittest module
 #
+# Additionally, if --install is passed as the first parameter,
+# 'distutils_install_for_testing --via-root' is called before running
+# the test suite.
+#
 # This function is meant as a helper for common use cases, and it only
 # takes care of basic setup.  You still need to list additional test
 # dependencies manually.  If you have uncommon use case, you should
@@ -398,33 +402,71 @@ distutils_enable_sphinx() {
 # declared.  Take care not to overwrite the variables set by it.
 distutils_enable_tests() {
 	debug-print-function ${FUNCNAME} "${@}"
-	[[ ${#} -eq 1 ]] || die "${FUNCNAME} takes exactly one argument: test-runner"
 
+	local do_install=
+	case ${1} in
+		--install)
+			do_install=1
+			shift
+			;;
+	esac
+
+	[[ ${#} -eq 1 ]] || die "${FUNCNAME} takes exactly one argument: test-runner"
 	local test_pkg
 	case ${1} in
 		nose)
 			test_pkg=">=dev-python/nose-1.3.7-r4"
-			python_test() {
-				nosetests -v || die "Tests fail with ${EPYTHON}"
-			}
+			if [[ ${do_install} ]]; then
+				python_test() {
+					distutils_install_for_testing --via-root
+					nosetests -v || die "Tests fail with ${EPYTHON}"
+				}
+			else
+				python_test() {
+					nosetests -v || die "Tests fail with ${EPYTHON}"
+				}
+			fi
 			;;
 		pytest)
 			test_pkg=">=dev-python/pytest-4.5.0"
-			python_test() {
-				pytest -vv || die "Tests fail with ${EPYTHON}"
-			}
+			if [[ ${do_install} ]]; then
+				python_test() {
+					distutils_install_for_testing --via-root
+					pytest -vv || die "Tests fail with ${EPYTHON}"
+				}
+			else
+				python_test() {
+					pytest -vv || die "Tests fail with ${EPYTHON}"
+				}
+			fi
 			;;
 		setup.py)
-			python_test() {
-				nonfatal esetup.py test --verbose ||
-					die "Tests fail with ${EPYTHON}"
-			}
+			if [[ ${do_install} ]]; then
+				python_test() {
+					distutils_install_for_testing --via-root
+					nonfatal esetup.py test --verbose ||
+						die "Tests fail with ${EPYTHON}"
+				}
+			else
+				python_test() {
+					nonfatal esetup.py test --verbose ||
+						die "Tests fail with ${EPYTHON}"
+				}
+			fi
 			;;
 		unittest)
-			python_test() {
-				"${EPYTHON}" -m unittest discover -v ||
-					die "Tests fail with ${EPYTHON}"
-			}
+			if [[ ${do_install} ]]; then
+				python_test() {
+					distutils_install_for_testing --via-root
+					"${EPYTHON}" -m unittest discover -v ||
+						die "Tests fail with ${EPYTHON}"
+				}
+			else
+				python_test() {
+					"${EPYTHON}" -m unittest discover -v ||
+						die "Tests fail with ${EPYTHON}"
+				}
+			fi
 			;;
 		*)
 			die "${FUNCNAME}: unsupported argument: ${1}"
@@ -492,7 +534,7 @@ esetup.py() {
 }
 
 # @FUNCTION: distutils_install_for_testing
-# @USAGE: [<args>...]
+# @USAGE: [--via-root|--via-home] [<args>...]
 # @DESCRIPTION:
 # Install the package into a temporary location for running tests.
 # Update PYTHONPATH appropriately and set TEST_DIR to the test
@@ -503,11 +545,19 @@ esetup.py() {
 # namespaces (and therefore proper install needs to be done to enforce
 # PYTHONPATH) or tests rely on the results of install command.
 # For most of the packages, tests built in BUILD_DIR are good enough.
+#
+# The function supports two install modes.  The current default is
+# the legacy --via-home mode.  However, it has problems with newer
+# versions of setuptools (50.3.0+).  The --via-root mode generally
+# works for these packages, and it will probably become the default
+# in the future, once we test all affected packages.  Please note
+# that proper testing sometimes requires unmerging the package first.
 distutils_install_for_testing() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	# A few notes:
-	# 1) because of namespaces, we can't use 'install --root',
+	# 1) because of namespaces, we can't use 'install --root'
+	#    (NB: this is probably no longer true with py3),
 	# 2) 'install --home' is terribly broken on pypy, so we need
 	#    to override --install-lib and --install-scripts,
 	# 3) non-root 'install' complains about PYTHONPATH and missing dirs,
@@ -522,14 +572,39 @@ distutils_install_for_testing() {
 	PATH=${bindir}:${PATH}
 	PYTHONPATH=${libdir}:${PYTHONPATH}
 
-	local add_args=(
-		install
-			--home="${TEST_DIR}"
-			--install-lib="${libdir}"
-			--install-scripts="${bindir}"
-	)
+	local install_method=home
+	case ${1} in
+		--via-home)
+			install_method=home
+			shift
+			;;
+		--via-root)
+			install_method=root
+			shift
+			;;
+	esac
+
+	local -a add_args
+	case ${install_method} in
+		home)
+			add_args=(
+				install
+					--home="${TEST_DIR}"
+					--install-lib="${libdir}"
+					--install-scripts="${bindir}"
+			)
+			mkdir -p "${libdir}" || die
+			;;
+		root)
+			add_args=(
+				install
+					--root="${TEST_DIR}"
+					--install-lib=lib
+					--install-scripts=scripts
+			)
+			;;
+	esac
 
-	mkdir -p "${libdir}" || die
 	esetup.py "${add_args[@]}" "${@}"
 }
 
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index b53607a164d4..1c9a40297e67 100644
Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ
diff --git a/games-action/violetland/Manifest b/games-action/violetland/Manifest
index 3b881341aa46..df740c807a7c 100644
--- a/games-action/violetland/Manifest
+++ b/games-action/violetland/Manifest
@@ -1,3 +1,3 @@
 DIST violetland-0.5-source-with-dependencies.tar.gz 11495885 BLAKE2B 33c3e8a8955ddc416c66c761681dce337ecccdb52ae7be3777124f4854c325436296ea5614100527a3e5be6c4d3a3cf2dffb2336037d5e904b50e2ae843d0fc4 SHA512 9b00fa600332c956c49bc5906f373c0dfff08a13320617014942ac4dbc199de8f84bef87ed218b38812ae3c53622e9148aa4463c4ea219056360bff1c73b7f88
-EBUILD violetland-0.5.ebuild 1299 BLAKE2B 102f70aba6c07ae88fd4907d10a3259a9be551353135c3ec07816c1a152ec9cf38a2271038c6475265054f05fc44f0ff61aebb5f752e05e7820b8e7051a98b88 SHA512 4d21b5aa99721c295f755dcee53c9a6ed04416e27c7e4337eda3612c123c517f7b800ebcb40f57d236ce327a4561d96b8dea5efa4bfccbd911089f1aae87d2ca
+EBUILD violetland-0.5.ebuild 1306 BLAKE2B 1c2c7829975b23306a2875d2f12e013e12c3c3511427c8d8eb395e4296c6f0bb728c59a6ee6bba325acb71481ab3af9f4443bf2b3004193f0bd2d01f65ced4de SHA512 640d001576712e396519952ae1fe4e4574b1f940c726c2b08bbee3e381ee2b2852b9cd7184d8e1c62b204f5d37faa460e6296e6799a0cc52267e8d8f3fbe3fd5
 MISC metadata.xml 333 BLAKE2B 86b30e29ee29f1969c8e4d24fd673f5c0a5037d96871b22be526619e8311b7bdac18ac82fcbc3e3828a6f371edf6e8a4d4aaaa683ae047faf6f3f615ecac51fd SHA512 d5c43d9e7544a4310b3f9f434c16dfc524234f35cff0a483f6bfcf80efb2f59d802cb5e8d5303839271542c496eccd8efea24e5abdb0e2ac62abdd851d8efe15
diff --git a/games-action/violetland/violetland-0.5.ebuild b/games-action/violetland/violetland-0.5.ebuild
index 2046663755aa..5a534a0a0cf4 100644
--- a/games-action/violetland/violetland-0.5.ebuild
+++ b/games-action/violetland/violetland-0.5.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-libs/boost:=[threads(+)]
-	media-libs/libsdl[sound,video]
+	media-libs/libsdl[opengl,sound,video]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[vorbis]
 	media-libs/sdl-ttf
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index d7b1b84fa62d..a64696540e9b 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
index 28355711bd2e..b48addc8453d 100644
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@@ -1,7 +1,8 @@
+AUX pysolfc-2.6.4-python38.patch 343 BLAKE2B f0530a19cc53baa0f2f5a0a32f4c095c073bec967ffca6aff3185fe147ac8d1b80d5039664eeb111b9a138e144bef7cd8135377fbfb76a8f78bd00ea773244e0 SHA512 1a1362bfc3faa9a4b51ade80004a2931975def8aa6ea63db3a33116c9e3965a2bed110428d29175f1d9245a5438746ce33d04c8d8b13fa0d376a7c204fe12df5
 AUX pysolfc-gentoo.patch 322 BLAKE2B c2fccd5b11942d4cdce148199c6e8b8544502ba7bd95c2bdf230ebf96abc0b9d4e6225e7b1dde92f5eea8820149c10eb4c53e8f95fe82fcec15a480c0efa061a SHA512 963daef445d492a693380466fcfdc7f464947269d8a2b687039f31179c1f4fe5119efd71f83708073373c3ac5174a754075367937f99253d6b443e74e60e93d3
 AUX pysolfc-locales.patch 655 BLAKE2B ce8068858b91eead34f3ff374959d362aef3c1b2e6448016f54a4f69a04ff3c629660460a04af51d09e7451870db0727aa46bb190cd4671f0b81cb57c783c689 SHA512 53f95675c032f6d47957e883c9c5da4807b185fe4daaab663f36fb7044f12eb191cd934b6375534f5fcbc3f45dcd1b003639cf1d5f9d65b90fa5cc0afaae718e
 DIST PySolFC-Cardsets--Minimal-2.0.1.tar.xz 1450064 BLAKE2B 629318963ee9bf82f6ab0de03f1b59047b896f7528d0f9f5be973fb550b496b523238b9ef8fcdc034f53b5a7adc4c3b56326e912bb83fcfa7e7ad2f9dec8be6b SHA512 56c9ad3c1f9231c6f3866366d694eb6be6036b1b46c8a1ffbd6f7a243a19ab377d30ee4ccaae34f13e35727357d4168db7d9bc044562ec2d86445fb8aec84e4a
 DIST PySolFC-Cardsets-2.0.tar.bz2 30687905 BLAKE2B f17f5095a05cf42ea9eb3e7a3a7fefe055cc3452882bf96db82bb4d1bebb2307ffc2d0fd8836f7414bfcd93b1d8de52adb43ef22701a0806f2c6c036d9306501 SHA512 24275cd3656024e268a49487ac75e1e67e61ec20e0a9f88e2d1c287f91314a1a9343856d1202ce468f8863f4e9a9bf27526fbb1979a7d765718b38e64ca0cfc8
 DIST pysolfc-2.6.4.tar.gz 7380668 BLAKE2B d172a5d69ab2d9ca2c2c56327111b564bcdaf4800f0903051bd5a4f06e22be7ca5630f7f8b9b70b7ebfcb7ad88cc5fea2357e13a9f0bb791edb6edd42f210127 SHA512 da127a2859315eba72b6affe8210068b3b8bf16837ba106a268e0de84b908528aef1a97d5fc63cecfa89317e3bef815758e44007c50d772fb96a1f62045e5906
-EBUILD pysolfc-2.6.4-r1.ebuild 2158 BLAKE2B fb56e6f9fe1f7e98c0322f8a66fad1fd14264e45fa3bd1f2dfcc099c4c5e511cde481c262c227841daf5aca507535fe2714747f40978ccc225c82617e1307b2f SHA512 d87b99707c6bebe937318e758fbfc41e3bc5078834d8c974fc8a0696af7bae17b774c9e97b6bb58080c1f32a0dacd26ab6c4d85439cb7762ca4bd6a07510897b
+EBUILD pysolfc-2.6.4-r1.ebuild 2197 BLAKE2B aa558f7b6dbfb1096fd0d6da1619f425ae0f098fc7bf7fad68d8583c05b72a9cd497661505ee0873544a6cede8e30613470ed729a57a9220da1479da2ddff5b1 SHA512 acdcb4ffcb7859eb31460bd121086e9646827f25628ce93c976a2920b77d1c8b821828f6d4759a1e30ce38ee7f2ee6e7e9ef0a44b7d0dd8b15bb43e12d590f6b
 MISC metadata.xml 562 BLAKE2B 1c818819cff77a23b88ca9ba0e67dab5a1ec9e388f68bd125acc0514306df05d76f2e9137aad414aebe2ed91b2632d04ca9f71435545846099c90a5c42e14ad5 SHA512 e3c7ecd4c54a21b46ee4ce4abc994fd5b8b486e4d5924755c0817fb0a29784a2fb36a10ed7aa36d4d5fa2c6518187702d879efc305a17c7699e8fe99bb09d107
diff --git a/games-board/pysolfc/files/pysolfc-2.6.4-python38.patch b/games-board/pysolfc/files/pysolfc-2.6.4-python38.patch
new file mode 100644
index 000000000000..9a857f3b266b
--- /dev/null
+++ b/games-board/pysolfc/files/pysolfc-2.6.4-python38.patch
@@ -0,0 +1,13 @@
+diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py
+index f461ed1..c71a61f 100644
+--- a/pysollib/mfxutil.py
++++ b/pysollib/mfxutil.py
+@@ -143,7 +143,7 @@ def getprefdir(package):
+ 
+ 
+ # high resolution clock() and sleep()
+-uclock = time.clock
++uclock = time.process_time
+ usleep = time.sleep
+ if os.name == "posix":
+     uclock = time.time
diff --git a/games-board/pysolfc/pysolfc-2.6.4-r1.ebuild b/games-board/pysolfc/pysolfc-2.6.4-r1.ebuild
index 1ecc1b59d1e2..146e92428c92 100644
--- a/games-board/pysolfc/pysolfc-2.6.4-r1.ebuild
+++ b/games-board/pysolfc/pysolfc-2.6.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_SINGLE_IMPL=1
 PYTHON_REQ_USE="tk"
 
@@ -44,6 +44,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-gentoo.patch" #591904
 	"${FILESDIR}/${PN}-locales.patch"
+	"${FILESDIR}/${P}-python38.patch"
 )
 
 python_prepare_all() {
diff --git a/games-board/sjeng/Manifest b/games-board/sjeng/Manifest
index 3d1a243209a5..801d02e1960b 100644
--- a/games-board/sjeng/Manifest
+++ b/games-board/sjeng/Manifest
@@ -1,4 +1,4 @@
 DIST Sjeng-Free-11.2.tar.gz 174019 BLAKE2B c50f312ce4f569b17cf7f240fe27e9d6d27e83e260c7549ba13ee612a357700b1642c2b274637af3e0e0f45c35e46f088cdcd5dce6bb62591ef600b97d8c6d6b SHA512 cda3409d732ac1b07e83ccc0d3063d24497651097c633500dfca66fbb3021532053082ac57a5e23909dd1016a2bae07f166e56b82c4ce834749a101c9ee444b8
 DIST sjeng_11.2-8.1.diff.gz 13341 BLAKE2B 187cb85e504511504ee9ed8bc2c6d6c19815e3e267099f1e98ea8964145e81074e2dd6b298dba76e91e2824dec1b4c6ac3d43b24f1ab970362c3bf07da87541d SHA512 2d470e0bee12a5f06808653ab3607301622d8e4f802295c04853b973c553074850c1fed278fe4696a652773af71dcac461d428d7f776d5a967256c4f39c627c9
-EBUILD sjeng-11.2_p8_p1.ebuild 1034 BLAKE2B 4f2d57c769d123f695fdddf57409d3aab8567698059ed7dff7fef853d46850a0a77b496e27cdc24291561e186c939880cf5bf599fea9cbea0df5500c84c1fbb4 SHA512 49d59de5ad69f5199207c8bc2e21d2f4106083f004d442ffd04a8cdcd8c2704a6adc8e7050e5d50f25035301d8d7fa9fff1462c8f4ab0422ca479a4ec8279794
+EBUILD sjeng-11.2_p8_p1.ebuild 948 BLAKE2B c456cdffa555792072cd14738d09f2a889cfc7c274ea25fc245e5019bddefd21eb3e79f72f963aa71aa5aa8557680a8bd485279f80ce9a04b606f27dbed1d74d SHA512 978d6e3d141e254986a617a0c437f8123f6a2f24cd9d57a5b0965f1c8e28384fdd0d42d3a1f4fb52661c8e4dfe2563c17a9b3e68740a6f3cbf1e382b35ee6463
 MISC metadata.xml 328 BLAKE2B a01f3dc1b89d082ffb3e813bbadc30aec1d774322215d6aac79934e8e6e4b139beeeea052d46e075c7694a5fe2c3de80a418671fd339eb24afa51331051c41f3 SHA512 54f4f8c4089f82b019be4e1cc7f8ce10221142ff020c992f37cbcd3a9e87a43e4b61a1c5dca23edfcc1e5060fe0db19292d4f63319414d4994b91f517153c68d
diff --git a/games-board/sjeng/sjeng-11.2_p8_p1.ebuild b/games-board/sjeng/sjeng-11.2_p8_p1.ebuild
index f23bf3d1d6b2..a34e7ba861cf 100644
--- a/games-board/sjeng/sjeng-11.2_p8_p1.ebuild
+++ b/games-board/sjeng/sjeng-11.2_p8_p1.ebuild
@@ -23,15 +23,17 @@ IUSE=""
 
 RDEPEND="sys-libs/gdbm:0="
 DEPEND="${RDEPEND}"
-BDEPEND="dev-util/quilt"
 
 S="${WORKDIR}/Sjeng-Free-${MY_PV}"
 
+PATCHES=(
+	"${WORKDIR}/sjeng_${MY_DEB_PV}.diff"
+	"${S}/debian/patches"
+)
+
 src_prepare() {
 	default
 
-	eapply "${WORKDIR}/sjeng_${MY_DEB_PV}.diff"
-	QUILT_PATCHES="debian/patches" QUILT_SERIES="debian/patches/series" quilt push -a || die
 	hprefixify book.c rcfile.c
 
 	# Files generated with ancient autotools, regenerate to respect CC.
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index efb6068f49d0..9700d5589a2c 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 7533209c7d76..21deaa247677 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,4 +1,4 @@
 DIST dolphin-5.0_p20200705.tar.gz 41580877 BLAKE2B 78fce8cb10543857633d66789999b0ebb8f195e10652b9316f3346d5c84797dea96a31f509f86cb9470b4b9677ca58c4a865494121277cd0bc7dcc93932da9f4 SHA512 8b1aed8c98ff7205d7b1716aea3faad0bfa3d1ff3fe3a616431a421ae62592a57887e18295276b7a0fee52d19e641b72d5dc00e071cefea7fbe40adc9f3f01a1
-EBUILD dolphin-5.0_p20200705.ebuild 4420 BLAKE2B 4e7be2832c1723532c59fa0268e9c62bd68754296b26bea8728bbf2c3967e58678cc9421f0a3810c30bf83ac14c1c9ce674c44bceda179ae704ca7345fb68e1d SHA512 a52a06306f6e8482fa2acfd41f308b5a583e5fe1e5a51ab31b1504a1d8c0b6e70e7f9419ee4adeea9e33ffbd116c993e931c9f17891475921d8ce2110a825b3f
+EBUILD dolphin-5.0_p20200705.ebuild 4427 BLAKE2B 1e5bb1dc1d994e38989f4414837da45ca0f3f1fd9e684ff017199ac0e1ffda7e3472a90c937b7a029736114f34cb0e8e58f3c77c8702b1c7547bbe5e8320a581 SHA512 f46e6bc95f0cb5c68fa4bf202acac60bebe1a9fad8d399161e156da1a365b70c2eb974516f3275f26a4e1f8506344874f257230248a3c7eaf497f74ce5245f09
 EBUILD dolphin-9999.ebuild 4671 BLAKE2B 5de627ef99a6ca280c244ac862e39d35de9fae454bff7db7846ced1b96e4321ba491ec6536bbce6c31d5bb09da317abfb9ebfa541c6d9b6b7737ff8aa740e745 SHA512 dd6377b8f39bcd1c02a66a45f90e31b9a10449b545977658beb68a336a72533981d710e04f888a49f70bd5400d1b89abc139a6a2ea811fb7fac9dc61d7758671
 MISC metadata.xml 856 BLAKE2B 982e3d9ee65ed158e831ccb72d144944eaab8efd8f535f120f2d9e14f8332a980244bb23ee7fe0ca6c1ca8b6f2cdc6c1c766439b4416e17fc8df93fc24ca7655 SHA512 994efa4a7b1504a2d02f4d470382c212f0b9c2f929bbc67483b1a4efa4e68d4422216737dca65977ad99afd26fb6772224f6b1902a0eb6b869f155cf010aff33
diff --git a/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
index 1b2cd79579d2..e933904d1e56 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
@@ -16,7 +16,7 @@ else
 	inherit vcs-snapshot
 	commit=0dbe8fb2eaa608a6540df3d269648a596c29cf4b
 	SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 ~arm64"
 fi
 
 DESCRIPTION="Gamecube and Wii game emulator"
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 46e840f2c4cb..7743380c0569 100644
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 814736cec989..3887208ee47b 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -10,6 +10,6 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c
 DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20200907-9257-93f62bbad.tar.xz 19787388 BLAKE2B 932bb679ac83320c56284371967e3f18e9d44b2635c743443a2e73511bd62557fb478c035136fc63276b3ada97736c18d05ed809772266d5b16dfdcaf03104d6 SHA512 43b5fd11382cdbc589a32c5f8f2ef36abcd0a41ba0251d4edf1c45466ad2ff875bc237c304b5a6668a44d01fb8f465a761f9e654b306762fa086b40f8bd75284
-EBUILD eduke32-20200907.9257.ebuild 5981 BLAKE2B eff5e356e6614be49a9a29e592588bcb05c4aae00b1fe12b3feee13672317ae1407feafbea099478bd826ff92f2100ab666eb9b006b7f2a173bb38454518a9e5 SHA512 d42dfd9c765621988a46ca098440444124cc976a4e9eec3f1bdc7a9102cc0a9af514884ee64813c8362f9831829b39af48dd2137df218f6e1add01310d0209d6
+DIST eduke32_src_20201128-9276-42c62c58f.tar.xz 19786040 BLAKE2B 5cf8fced61ed5876030a4569e3068ef1e6d2542dbb57528aba0101e37d8233e9c878f1adba7deedd34cbbce37470c47be4d61713c2a4d9eafbcdc65c690a53a3 SHA512 54d2eb3d2caec8ef941796106c60a2cfeb6edc37f1c353cf8acbeacd3c96e4e2ccd037b0c6a9e1adc47406c3572aed816136190161b83948e36b364ec4edd518
+EBUILD eduke32-20201128.9276.ebuild 5981 BLAKE2B 137a2c86bf9f2a3bac6faf5bfbfb7cfe0edaae9c678cc32b70f374ef3591eefcb9029fe050fb70ead1a1f6b1dfc8b306ed0df729f3e9bbc798855b558401de8a SHA512 a22a61b807089a2df51a25f94d10cd23d2a33af0eeb9a87270dcb09c4d44d28f98cde9b161096dc1d8746e876d1a848acdd73655be0d3f27f904702a6a16da6e
 MISC metadata.xml 1697 BLAKE2B 76ea172154c71939d93fb4599f516b782682b9d774daf740e8c6a31810926e9a42b9f0c91f131de51975ecde8d2f99a542ddad1757da60b21f4934baadf0222a SHA512 c8f3410f58e8da648e6b0399b5167829d60800aab710df2a370e3976eb27bd1c3f8ad313b964c6e8d47eb22236010ef6bd6bd148b989ee5489122e7b174e17a7
diff --git a/games-fps/eduke32/eduke32-20200907.9257.ebuild b/games-fps/eduke32/eduke32-20201128.9276.ebuild
similarity index 99%
rename from games-fps/eduke32/eduke32-20200907.9257.ebuild
rename to games-fps/eduke32/eduke32-20201128.9276.ebuild
index b3342d7aa9ce..e7ec5d6a3a6a 100644
--- a/games-fps/eduke32/eduke32-20200907.9257.ebuild
+++ b/games-fps/eduke32/eduke32-20201128.9276.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit desktop toolchain-funcs xdg-utils
 
-EGIT_COMMIT="93f62bbad"
+EGIT_COMMIT="42c62c58f"
 MY_BUILD="$(ver_cut 2)"
 MY_DATE="$(ver_cut 1)"
 MY_PV_HRP="5.4"
diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz
index 27f0457b8638..de08bc0947ad 100644
Binary files a/games-sports/Manifest.gz and b/games-sports/Manifest.gz differ
diff --git a/games-sports/xmoto/Manifest b/games-sports/xmoto/Manifest
index cd2ca32bee24..bdb11cf179f2 100644
--- a/games-sports/xmoto/Manifest
+++ b/games-sports/xmoto/Manifest
@@ -1,4 +1,6 @@
+AUX xmoto-0.6.1_cmake_lua_version.patch 565 BLAKE2B 7d8a41465eea47a6b9016236b00df91b853b0862edb9df5375b59f66d9db90ce6a30a98e677d15a51cdd4ec5ca34c63b9542ca0587f1a591eede2881881dbcee SHA512 53ff371f8c74643290b479b20798a64d07ba568379489191c000116bbccee0fa714a08b2423ced1817b7bebdf7f586405fade15e92f1a28bf03ac4888fc88c72
 AUX xmoto-0.6.1_lua_deprecated.patch 2581 BLAKE2B c643744ba7a9ed53dcad90f2c30445ef0aa8a465bea02ec75c19596c3b8d6fbc8b53fb71c23d6bed11f49e9cf23ecd3749438c80e38570043e52e3fcfe348abb SHA512 e4f6ad1c791e27b9c4ceeaf9a282111a06cc8aaef6e33f6649dd8d78bf2fa6751f76ddee32ed0d3e0f1c5c738acedd898068a280cdd0dd9151c4a3e1358c0901
 DIST xmoto-0.6.1.tar.gz 41623870 BLAKE2B a26b89266b05513f2a48a2516ffdd39f05d584e70aa1fb18d463c754acd438cef0b0f1664cc577ebb89012f86dc37e2d52cd9d1310217941f16c9a4085dc3894 SHA512 809e5f149e5679adc2f82313afe654dbd027c0c10292c90e6c1982bdd3f7d0f1305e30b974bba94a92e18aeeff5faa6f0d24be225d4755ae73ad03274adaf60b
 EBUILD xmoto-0.6.1-r1.ebuild 1607 BLAKE2B d5b198ab87ea9f0663c9c559c92f4ee33be0abb5d2d0ece2ae546c72b676dcb1e9b7ff948f73a56d47d87a137d5dc265cfa477435ff554703bc7650b44b8384b SHA512 835acdab73411a481d08765028b0cfea3375d8762f8155095529c37acc4a86169f09be07551f5a43678f4298da69727efbcdf8abf9c46319799a2e05b202c225
+EBUILD xmoto-0.6.1-r100.ebuild 1765 BLAKE2B af4eb69f73766e5be23737b6532d809be9d6c94053def74f23bdd37077177f40fe21a8e34db6bc28e3c393cec02933117f8ad2e9d266ceeec673e88aa5e4ec83 SHA512 1ec325e15e65149d2096745130d73095eebc27edb353c40a67604d0b402a762aa2537322ac3d45bfae0f3e40034aad4423c554e2a7f32e7d46f9f78fbc15acea
 MISC metadata.xml 447 BLAKE2B 39dc46e26dbcacafbdaaee5a45f19d3d8fcae0c24a3336938beb549bdc4c4ab8a8b4027f8b28fc62c2cf29c70b63ae9b39acb0241c0179a2adef346edac07695 SHA512 150597c0a53e42f1996ffbad3bf0d773a1a8a7028abc9ac5fedf1e2a5e076bc160d33dca327b05737678a388d6df0ddd200a30fa3e7d81238fd8749444e8c895
diff --git a/games-sports/xmoto/files/xmoto-0.6.1_cmake_lua_version.patch b/games-sports/xmoto/files/xmoto-0.6.1_cmake_lua_version.patch
new file mode 100644
index 000000000000..53a29161a141
--- /dev/null
+++ b/games-sports/xmoto/files/xmoto-0.6.1_cmake_lua_version.patch
@@ -0,0 +1,13 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -40,8 +40,8 @@
+ endif()
+ find_package(PNG REQUIRED)
+ 
+-find_package(Lua)
+-set(USE_SYSTEM_Lua $<AND:$<BOOL:${PREFER_SYSTEM_Lua}>,$<BOOL:${LUA51_FOUND}>,$<NOT:$<BOOL:${WIN32}>>>)
++find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
++set(USE_SYSTEM_Lua $<AND:$<BOOL:${PREFER_SYSTEM_Lua}>,$<BOOL:${LUA_FOUND}>,$<NOT:$<BOOL:${WIN32}>>>)
+ if (NOT LUA_VERSION_STRING VERSION_LESS 5.2 AND LUA_VERSION_STRING VERSION_LESS 5.3)
+     add_definitions("-DLUA_COMPAT_ALL")
+ elseif (LUA_VERSION_STRING VERSION_GREATER_EQUAL "5.3")
diff --git a/games-sports/xmoto/xmoto-0.6.1-r100.ebuild b/games-sports/xmoto/xmoto-0.6.1-r100.ebuild
new file mode 100644
index 000000000000..aa6635754fc4
--- /dev/null
+++ b/games-sports/xmoto/xmoto-0.6.1-r100.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit cmake lua-single
+
+DESCRIPTION="A challenging 2D motocross platform game, where physics play an important role"
+HOMEPAGE="https://xmoto.tuxfamily.org"
+SRC_URI="https://github.com/xmoto/xmoto/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="double-precision +nls"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="app-arch/bzip2
+	dev-db/sqlite:3
+	dev-games/ode[double-precision=]
+	${LUA_DEPS}
+	dev-libs/libxdg-basedir
+	dev-libs/libxml2
+	media-fonts/dejavu
+	media-libs/libpng:0=
+	media-libs/libsdl[joystick,opengl]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-net
+	media-libs/sdl-ttf
+	net-misc/curl
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	virtual/glu
+	virtual/opengl
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}/${P}_lua_deprecated.patch"
+	"${FILESDIR}/${PN}-0.6.1_cmake_lua_version.patch"
+)
+
+src_prepare() {
+	sed -e "/^Icon/s/.xpm//" -i extra/xmoto.desktop || die
+	sed -e "/add_subdirectory.*\(bzip2\|libccd\|lua\|ode\|xdgbasedir\)/d" -i src/CMakeLists.txt || die
+	rm -rf vendor/{bzip2,lua,ode,xdgbasedir} || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_GETTEXT=$(usex nls)
+		-DOpenGL_GL_PREFERENCE=GLVND
+		-DLUA_VERSION=$(lua_get_version)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	rm -f "${ED}/usr/share/xmoto"/Textures/Fonts/DejaVuSans{Mono,}.ttf || die
+	dosym ../../../fonts/dejavu/DejaVuSans.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSans.ttf
+	dosym ../../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSansMono.ttf
+}
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index b82313fc1686..15cb31aaf706 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/asc/Manifest b/games-strategy/asc/Manifest
deleted file mode 100644
index 8e4786acd600..000000000000
--- a/games-strategy/asc/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX asc-2.6.0.0-freetype_pkgconfig.patch 1012 BLAKE2B 8e6619f39c1ac5dfcc9e07c0bfd160ed55300aba75eda17aa9d40620d5be4f1da6a3233699f5cdea7a016580f02a8b456143a5c96f6b62f2ed78591d91d3df1c SHA512 f27e02554711bad885a53929f6049607201ea2090fa686b4d680c47470a0f7fec53c84a3f4657341fa46a3ef0369f204246b4bf2d3b25d588953e288edaa8a19
-AUX asc-2.6.0.0-gcc6-nothrow-in-dtors.patch 741 BLAKE2B f74d9e7529433ee86dd3f0406cc79a52ddcd0cca0880749268f5878f1aaacc7c67fce131af1d568c3f19549dfa21c5c20eed8a7116fc7fccefd689dc8bcf05b8 SHA512 d92086128b2b491a6f0c96d0b92f2e5ae9a7d521070405b7971fafa4ab953e6d4996784a6c5837b8cbf2811a18e043481c0278d960f6fe9804d8da68c8afa32d
-DIST asc-2.6.0.0.tar.bz2 42280527 BLAKE2B a2ab8777f36d64924bb12359226792ea6d76a07f306bfe2f7204f50de5c103d524fbb69eb88106c293312650619cf3683a25a6afa6176941e8efb72edca9424c SHA512 e1dea48bf87424fd65772e6d9bad96cf63e4062df5717bbc925562683782afc2d9788ea28e7147d905c3c0f6db3ef7c102a59022988c9fcf8aa6adba91dc5540
-DIST frontiers.ogg 4691844 BLAKE2B 02909247293439b72ca2f94b515abd53ebf931ac4ffbcc7a4d7909cfdcc79cd1411c973f42760e6012197ead5ce2369895d52b8b4fea5107f62e852502f2428d SHA512 8c2ce497519b3842fba2d39b5c6de6194584d64c0375d404535628898cb2e7a82433fc6008781381a80a6cbb24ff49162de3634ebcf28b17b0631c30668fd8af
-DIST machine_wars.ogg 3138308 BLAKE2B 7c1f4e2c652b70dc9e41f313a8428a22844d1f98717b3c59061d462cf6d4a8f30c2ea2f7d2032afd8b6c9d50513286c409d8d21fb78c59bd246bd4cce3255029 SHA512 2c1bab89b9397f52dcf7eedfc0dbc88d49a586ac0474c76a09a87a880712bf0fa408c03a65a5f5d322dee86e3b12cbc66d53cd6728e8fa34fa8f2ee2bbc06cd8
-DIST time_to_strike.ogg 3830679 BLAKE2B ced7de55d8f52177ee5fac6a19a4f76df8b50f70f9d62e42b10d6868608ebf88fe5405e072ee7b1cbc2152f54f4ae66fe3e025c13faf9b57b09a6c117a2c3d13 SHA512 2ed946116cac2ea63d401eb7415d5b3e4e548bc5a5b00b01a6f1c4db6a242895810dfefdf1ace9652f01dc934a70b756aa74d01630cfac97b19ce84a93b772ee
-EBUILD asc-2.6.0.0-r2.ebuild 1777 BLAKE2B 04c24eaf6ed938e37bf6660a91f2ce8ff00ea5b106741436e50c4a6cf26b41c2eb1148903178685849131e51ad02699795d0b581b04cc3d17b0fb840c7426e04 SHA512 5df6fc0a21c2102049456591f00aab405559d9881117eb6bfda6e354c2d66f02d2cdede9598866d3288c3dd7f269880ae9e9c8eb2ffee1f79a2a4c098935268c
-MISC metadata.xml 329 BLAKE2B 0289ce2add055169d9f1b87baa936fe3b1066e11f9cf774fa46c26adfc534c7edc7c16e568000d3ebcb9936849be0c73fa44a2508a6d05c723cda6be1ba05dbd SHA512 1fa38f0da7bfc4cc3f1193758234379a9932c58742b914deebfc2d8101154e6303497b61c018eec7f52d5e8561ea2d7df89ad89f5d1cbe3f8a7732a1c922b051
diff --git a/games-strategy/asc/asc-2.6.0.0-r2.ebuild b/games-strategy/asc/asc-2.6.0.0-r2.ebuild
deleted file mode 100644
index 6f17949ef838..000000000000
--- a/games-strategy/asc/asc-2.6.0.0-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER=3.0
-inherit autotools toolchain-funcs flag-o-matic wxwidgets
-
-DESCRIPTION="turn based strategy game designed in the tradition of the Battle Isle series"
-HOMEPAGE="http://www.asc-hq.org/"
-SRC_URI="mirror://sourceforge/asc-hq/${P}.tar.bz2
-	http://www.asc-hq.org/music/frontiers.ogg
-	http://www.asc-hq.org/music/time_to_strike.ogg
-	http://www.asc-hq.org/music/machine_wars.ogg"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-arch/bzip2
-	dev-games/physfs
-	dev-lang/lua:0
-	dev-libs/boost
-	dev-libs/expat
-	dev-libs/libsigc++:1.2
-	media-libs/libpng:0
-	media-libs/libsdl[video]
-	media-libs/sdl-image[gif,jpeg,png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-sound
-	media-libs/freetype
-	media-libs/xvid
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
-
-DEPEND="${RDEPEND}
-	app-arch/zip
-	dev-lang/perl
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/"/${P}-gcc6-nothrow-in-dtors.patch
-	"${FILESDIR}/"/${P}-freetype_pkgconfig.patch #657998
-)
-
-src_unpack() {
-	local f
-
-	unpack ${P}.tar.bz2
-	for f in ${A}
-	do
-		case ${f} in
-		*ogg)
-			cp "${DISTDIR}/${f}" "${S}/data/music" || die
-			;;
-		esac
-	done
-}
-
-src_prepare() {
-	default
-	# required for freetype_pkgconfig patch
-	eautoreconf
-}
-
-src_configure() {
-	need-wxwidgets unicode
-	# Added --disable-paraguitest for bugs 26402 and 4488
-	# Added --disable-paragui for bug 61154 since it's not really used much
-	# and the case is well documented at http://www.asc-hq.org/
-	if [[ $(gcc-major-version) -eq 4 ]] ; then
-		replace-flags -O3 -O2
-	fi
-	local myeconfargs=(
-		--disable-paraguitest
-		--disable-paragui
-		--datadir="/usr/share"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodoc -r doc/*
-}
diff --git a/games-strategy/asc/files/asc-2.6.0.0-freetype_pkgconfig.patch b/games-strategy/asc/files/asc-2.6.0.0-freetype_pkgconfig.patch
deleted file mode 100644
index a07cd2f86274..000000000000
--- a/games-strategy/asc/files/asc-2.6.0.0-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/657998
-
---- asc-2.6.0.0/configure.ac
-+++ asc-2.6.0.0/configure.ac
-@@ -401,22 +401,7 @@
-       FREETYPE_CFLAGS="`$ac_cv_path_freetype_config --cflags`"
-       FREETYPE_LIBS="`$ac_cv_path_freetype_config --libs`"
-    else
--      AC_CHECK_LIB(freetype,FT_Init_FreeType,have_freetype=yes)
--      AC_CHECK_HEADER(ft2build.h,have_ft2build=yes)
--      if test "$have_ft2build" != "yes"; then
--         have_freetype="no"
--      elif test "$have_freetype" = "yes"; then
--         FREETYPE_LIBS="-lfreetype"
--         ft2inc="no"
--         AC_MSG_CHECKING(freetype2 include directory)
--         if test -d /usr/local/include/freetype2; then
--            ft2inc="/usr/local/include/freetype2"
--         elif test -d /usr/include/freetype2; then
--            ft2inc="/usr/include/freetype2"
--         fi
--         AC_MSG_RESULT($ft2inc)
--         FREETYPE_CFLAGS="-I$ft2inc"
--      fi
-+      PKG_CHECK_MODULES(FREETYPE, freetype2, have_freetype=yes)
-    fi
- 
-    if test x$have_freetype = xno; then
diff --git a/games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch b/games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch
deleted file mode 100644
index e710b22f8c8b..000000000000
--- a/games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Bug: https://bugs.gentoo.org/612934
-Upstream Bug: https://sourceforge.net/p/asc-hq/patches/2/
-
---- a/source/basestrm.cpp
-+++ b/source/basestrm.cpp
-@@ -1728,7 +1728,6 @@
-       }
-    } catch ( ... ) {
-       displayLogMessage( 9, ASCString("~tn_c_lzw_filestream : caught exception") );
--      throw;
-    }
- }
- 
---- a/source/simplestream.cpp
-+++ b/source/simplestream.cpp
-@@ -43,6 +43,7 @@
-  #endif
- #endif
- 
-+#include "util/messaginghub.h"
- 
- tnbufstream::tnbufstream (  )
- {
-@@ -270,7 +271,7 @@
- 
-    int res = fclose( fp );
-    if ( res != 0 ) 
--      throw  tfileerror ( getDeviceName() + " : " + strerror(errno));
-+      displayLogMessage( 9, ASCString( getDeviceName() + " : " + strerror(errno) ) );
-       
-    _mode = uninitialized;
- 
diff --git a/games-strategy/asc/metadata.xml b/games-strategy/asc/metadata.xml
deleted file mode 100644
index 33170f2a7547..000000000000
--- a/games-strategy/asc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">asc-hq</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest
index ec2c5a74cbe7..a1d5f90a4ed6 100644
--- a/games-strategy/hedgewars/Manifest
+++ b/games-strategy/hedgewars/Manifest
@@ -1,4 +1,6 @@
+AUX hedgewars-1.0.0-cmake_lua_version.patch 282 BLAKE2B 0a65ddbc5b69264e51b5ca6bd23a3800d8aa04ca3cb59741ed7c58b7a44b8d173c6b22f6917a57fb6c37f1199305a347099afcb806b111a8bb304ebee956766b SHA512 406d52cecded03e392dd37e3119137a47604b9fc6c72af34ee671cf4c33b93158dd727083af87763a8220cf5ff05ab8eb6366da134481c2507dc83d5c6eecb3d
 AUX hedgewars-1.0.0-qt-5.15.patch 328 BLAKE2B 9304e4e1811e2aab876b5a6c3edea584c3271c5531035bfb2a53369000a30c61264464df655396146a26e08750ee29ffd9eb25aca8f89fa91409247b69675ad1 SHA512 f45985e878c9380f4bdcf755a79f1c906bdc6a8fa243faaa15f1c73b50d7b619c461821271ae151076f631ca0aecae31ddbe00d3d97945f13afc94610e216856
 DIST hedgewars-src-1.0.0.tar.bz2 177668452 BLAKE2B cbd99a4403b911023fb4a522ed1ed04272f07705321585b0e7a8f56785ef11bf8c654df95016b0af94f603c387f73804cbd95e13a92e875990adf5fec149e334 SHA512 9aeb904550239040a878a0e7ae5006aa4d824124b61d813b9e6f6dfe1bd1c8f5fe395e0fd6e58d685ef1259abd4669e03b985be129c620be15f6e5ad82519ec2
 EBUILD hedgewars-1.0.0-r1.ebuild 2613 BLAKE2B e8c230cc14735fceaab5689c2573d8896f1e84662fe1c1cfc65bb9a7d36b49d323c9930eaafbf7e96656463de23d11abce955d2f58227013e438b1cfc0a0c46a SHA512 dafaf4ab6fa9c06e3d0f7f367e9a9ea13e1341f15fa43cace46a473f558122cfa21b6d1c9e279b8119b508a39613aa827271b44959c9e664c95ed4dca9d9ce04
+EBUILD hedgewars-1.0.0-r100.ebuild 2764 BLAKE2B 5a0b19b46f0982da58fa25bf7d7291481039cef1a1c89b954bba060cd450ffd9929a27b65b1b2824d357bbf34e6a47ac9098d718e634d24318e99b6853ce90eb SHA512 e0ed15c1cbeebd7c460828bfef0ad03233f25f7891cdf2285afd00bebabc4c3c0deb7ec7897da0e04b5fdd6e1ec55638ba61a3f912f057097527057f5452a27e
 MISC metadata.xml 310 BLAKE2B 0893b58ddb3ed4a4d6a73bd5cc4d31558d185953ea37fd15f9e067804b8fd4aad9021666f35feabe695fc34df502f1c1c814e52b717fdb26a5f419c07e5696a0 SHA512 aab3f53bd107c152983576ef65b7021002724f73e0a8cbda391284347eff3eb8d8489cb26fae34512e3a58bc9529903c05f41c1277e25af155215308b3da462b
diff --git a/games-strategy/hedgewars/files/hedgewars-1.0.0-cmake_lua_version.patch b/games-strategy/hedgewars/files/hedgewars-1.0.0-cmake_lua_version.patch
new file mode 100644
index 000000000000..b1daa2551124
--- /dev/null
+++ b/games-strategy/hedgewars/files/hedgewars-1.0.0-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -202,7 +202,7 @@
+ #lua discovery
+ if(LUA_SYSTEM)
+     if(NOT LUA_LIBRARY OR NOT LUA_INCLUDE_DIR)
+-        find_package(Lua)
++        find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+     endif()
+ 
+     if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
diff --git a/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild b/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
new file mode 100644
index 000000000000..8f127f790724
--- /dev/null
+++ b/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR=emake
+LUA_COMPAT=( lua5-1 )
+
+inherit cmake lua-single xdg-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="A turn-based strategy, artillery, action and comedy game"
+HOMEPAGE="https://www.hedgewars.org/"
+SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 Apache-2.0 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="server"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+QA_FLAGS_IGNORED="/usr/bin/hwengine" # pascal sucks
+QA_PRESTRIPPED="/usr/bin/hwengine" # pascal sucks
+
+# qtcore:5= - depends on private header
+DEPEND="${LUA_DEPS}
+	>=dev-games/physfs-3.0.1
+	dev-qt/qtcore:5=
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/libpng:0=
+	media-libs/libsdl2:=
+	media-libs/sdl2-image:=
+	media-libs/sdl2-mixer:=[vorbis]
+	media-libs/sdl2-net:=
+	media-libs/sdl2-ttf:=
+	sys-libs/zlib
+	!x86? ( media-video/ffmpeg:= )
+	"
+RDEPEND="${DEPEND}
+	app-arch/xz-utils
+	>=media-fonts/dejavu-2.28
+	media-fonts/wqy-zenhei"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	server? (
+		>=dev-lang/ghc-6.10
+		dev-haskell/entropy
+		dev-haskell/hslogger
+		>=dev-haskell/mtl-2
+		>=dev-haskell/network-2.3
+		dev-haskell/random
+		dev-haskell/regex-tdfa
+		dev-haskell/sandi
+		dev-haskell/sha
+		dev-haskell/vector
+		dev-haskell/utf8-string
+		dev-haskell/yaml
+		>=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6
+	)
+	!x86? ( >=dev-lang/fpc-2.4 )
+	x86? (
+		>=dev-lang/ghc-6.10
+		dev-haskell/parsec
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${P}-qt-5.15.patch"
+	"${FILESDIR}/${PN}-1.0.0-cmake_lua_version.patch"
+)
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMINIMAL_FLAGS=ON
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share/${PN}"
+		-Dtarget_binary_install_dir="${EPREFIX}/usr/bin"
+		-Dtarget_library_install_dir="${EPREFIX}/usr/$(get_libdir)"
+		-DNOSERVER=$(usex !server)
+		-DBUILD_ENGINE_C=$(usex x86)
+		-DNOVIDEOREC=$(usex !x86)
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE
+		# Need to tell the build system where the fonts are located
+		# as it uses PhysFS' symbolic link protection mode which
+		# prevents us from symlinking the fonts into the right directory
+		#   https://hg.hedgewars.org/hedgewars/rev/76ad55807c24
+		#   https://icculus.org/physfs/docs/html/physfs_8h.html#aad451d9b3f46f627a1be8caee2eef9b7
+		-DFONTS_DIRS="${EPREFIX}/usr/share/fonts/wqy-zenhei;${EPREFIX}/usr/share/fonts/dejavu"
+		# upstream sets RPATH that leads to weird breakage
+		# https://bugzilla.redhat.com/show_bug.cgi?id=1200193
+		-DCMAKE_SKIP_RPATH=ON
+		-DLUA_VERSION=$(lua_get_version)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	doman man/${PN}.6
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/games-strategy/naev/Manifest b/games-strategy/naev/Manifest
index feae7a099487..ad386f6882fc 100644
--- a/games-strategy/naev/Manifest
+++ b/games-strategy/naev/Manifest
@@ -1,4 +1,8 @@
 DIST naev-0.6.1.tar.bz2 1047908 BLAKE2B 3763440c64f89c5ceb5993a3e4ee356d0cc615df8b70dba14ce0fb35d12a0a136e82958349887d9c5a719e14d9ddfc47beb524b88650ea6f7a6859a6422d6898 SHA512 4766c80b49de5a7e748948f0404ac54edbc5afa80618150d1f993d66c7462ea73bfc5220d73073cb51cd76ff5dc6ecdf935d6f843051943136ceefaea9837203
+DIST naev-0.7.0-ndata.zip 319608404 BLAKE2B e6edd79282171d4b327d220b33af37720e09f7137a26697de472e3494587525de5d9509865bfccc1093f5d4befa11faa10e0d4f4c59ea8621ecd8d564eb546fe SHA512 5fa8faad36e410f0d2af1c80e6fedbffdd020da72dc96b329ce623e9836490cfb515c1bb88719045491366ca96a32888374029eec6cd14ed86ac8597750995ca
+DIST naev-0.7.0.tar.bz2 1076658 BLAKE2B 582bbfbc16e33d16600c19928ed6810dfe5fd3165930e6a51ec9b65d25305cd0bbfaf6f4cced12c5b7f76163ed4dc36b7108e81f4a4e82dc626c6045d3fe769f SHA512 9f8a2912e9f4f29ed6e276b008d4010da3ccdd309de5bb4360c393f2704aa7aff6e18db9e5d3657b4229e911ddec9b2a3312cf182c3c48a91a007a91138d84ae
 DIST ndata-0.6.1.zip 303984255 BLAKE2B 154d8b326e2596cfe16fc646e7d482c07d7015253b6933889d12b93a2ee7e28649b1f3ffcb0c0ed2bfe9d1e3654623cab00113486d05fe6fd1262ce989bf9c25 SHA512 71c3024e1713b094b63cb0de3c70239d61c54142b715e61d5206c5eb3cb8c7a851fc1b388ecf891110dd8bb5c2b3759af71d20f39cb6e629c71b27386a57d7fe
 EBUILD naev-0.6.1-r1.ebuild 1531 BLAKE2B b58f34c1cf684d0e18bb215ace1fa3b77a3cf6e65131b1cc8dda0ae04bff1dc0bbda13540502b696ada59da9035ca7c001553078e6088ee1dacd5911d98d07ee SHA512 efad61393d551d265b6980198bb0efdb32132d32255472f9512c0dedc696816338c8926b4dc1795e8dd9131da5c601078e55bb004cf49dec039c81b0529aabff
-MISC metadata.xml 480 BLAKE2B 5769dca136bfc7d26f0b5acb60ee6598d75651b7a58d9899b6da0839180a95bee9d183c229026773ec5641e07637e3dbbfbe4fe6f77b0c466fdf62dfb01fc4cc SHA512 d42e9402581393d47976730560c1850d41e0bdd5d8bf842781222b4621db4c5c55ed5b3a886106d7bc43c3830e38bfef55182478fa7eae8bc6342cd1ec293f62
+EBUILD naev-0.7.0-r100.ebuild 1743 BLAKE2B 326278a4ad061cc00c8165271880e1b7e292404de08b571530bcd929c0ed339145cbbc68a155de23e774ebaa798246c113d488f91a57efbe3bf9091a5f509ddb SHA512 1cb9c86dd7ceae36b2cbfd6de5c9620f6455b6a13a4b184fc91918bda8a8935aa5511fed8e5182fe59e5ca9581306959d2f3a39dfb710ddb652a3ee9ccb2524f
+EBUILD naev-0.7.0.ebuild 1631 BLAKE2B 95c08ea170079af3ffd36455a09805b3de649137a90abe6d26743abf4d966cbc2a83728cbdc30300659655bb08589ead539b3e30a3d81feb40ef7dcbab8b3dd3 SHA512 cdc0fbe5403874eac22ac2d5cdd3fa0d266edf54049ddf498b33158cc75f4f217af129804fa7cb81fc9c93c01a16e9c86c2a3aabf6a5c63bf7f9163c73318a59
+MISC metadata.xml 480 BLAKE2B 4d01de527c3e9c5d5b97dfc169be7b0639be97a2cfa75564b6f2f3f0543c783f9b2403b15471191ecd0b1cf6ddc97eb87d9e04d7f53fe9534fd3626398f02425 SHA512 48c3f9af6ccc92e0cd032f169c8febe7a954cc3b304717e329d2bc9f8d4fff4d9be72bcab2cbfa2c3b75c46ab85a044fe76c786638c062c2a8a9005f1fff6b54
diff --git a/games-strategy/naev/metadata.xml b/games-strategy/naev/metadata.xml
index fd273f3193a7..935309187f72 100644
--- a/games-strategy/naev/metadata.xml
+++ b/games-strategy/naev/metadata.xml
@@ -12,6 +12,6 @@
 	</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">naev</remote-id>
+		<remote-id type="github">naev/naev</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-strategy/naev/naev-0.7.0-r100.ebuild b/games-strategy/naev/naev-0.7.0-r100.ebuild
new file mode 100644
index 000000000000..f43b5a4502f8
--- /dev/null
+++ b/games-strategy/naev/naev-0.7.0-r100.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit lua-single xdg-utils
+
+DESCRIPTION="A 2D space trading and combat game, in a similar vein to Escape Velocity"
+HOMEPAGE="https://naev.org/ https://github.com/naev/naev"
+SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}.tar.bz2
+	https://github.com/naev/naev/releases/download/v${PV}/${P}-ndata.zip"
+
+LICENSE="GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +mixer +openal"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}
+	media-libs/libsdl2[X,sound,video]
+	dev-libs/libzip
+	dev-libs/libxml2
+	>=media-libs/freetype-2:2
+	>=media-libs/libvorbis-1.2.1
+	>=media-libs/libpng-1.2:0=
+	virtual/glu
+	virtual/opengl
+	mixer? ( media-libs/sdl2-mixer )
+	openal? ( media-libs/openal )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# This is so that only the source tarball is unpacked - the data file
+# is supposed to be installed *zipped*. This is why we do not need unzip
+# in BDEPEND in spite of what repoman/pkgcheck might say.
+src_unpack() {
+	unpack ${P}.tar.bz2
+}
+
+src_configure() {
+	econf \
+		--enable-lua=$(usex lua_single_target_luajit luajit shared) \
+		$(use_enable debug) \
+		$(use_with openal) \
+		$(use_with mixer sdlmixer)
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		appicondir=/usr/share/pixmaps \
+		appdatadir=/usr/share/metainfo \
+		Graphicsdir=/usr/share/applications \
+		install
+	insinto /usr/share/${PN}
+	newins "${DISTDIR}/${P}-ndata.zip" ndata
+
+	rm -f "${D}/usr/share/doc/${PF}/LICENSE"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-strategy/naev/naev-0.7.0.ebuild b/games-strategy/naev/naev-0.7.0.ebuild
new file mode 100644
index 000000000000..1b20e968fdde
--- /dev/null
+++ b/games-strategy/naev/naev-0.7.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="A 2D space trading and combat game, in a similar vein to Escape Velocity"
+HOMEPAGE="https://naev.org/ https://github.com/naev/naev"
+SRC_URI="https://github.com/naev/naev/releases/download/v${PV}/${P}.tar.bz2
+	https://github.com/naev/naev/releases/download/v${PV}/${P}-ndata.zip"
+
+LICENSE="GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +mixer +openal"
+
+RDEPEND="
+	media-libs/libsdl2[X,sound,video]
+	dev-libs/libzip
+	dev-libs/libxml2
+	>=media-libs/freetype-2:2
+	>=media-libs/libvorbis-1.2.1
+	>=media-libs/libpng-1.2:0=
+	virtual/glu
+	virtual/opengl
+	dev-lang/lua:0
+	mixer? ( media-libs/sdl2-mixer )
+	openal? ( media-libs/openal )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# This is so that only the source tarball is unpacked - the data file
+# is supposed to be installed *zipped*. This is why we do not need unzip
+# in BDEPEND in spite of what repoman/pkgcheck might say.
+src_unpack() {
+	unpack ${P}.tar.bz2
+}
+
+src_configure() {
+	econf \
+		--enable-lua=shared \
+		$(use_enable debug) \
+		$(use_with openal) \
+		$(use_with mixer sdlmixer)
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		appicondir=/usr/share/pixmaps \
+		appdatadir=/usr/share/metainfo \
+		Graphicsdir=/usr/share/applications \
+		install
+	insinto /usr/share/${PN}
+	newins "${DISTDIR}/${P}-ndata.zip" ndata
+
+	rm -f "${D}/usr/share/doc/${PF}/LICENSE"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-strategy/openra/Manifest b/games-strategy/openra/Manifest
index 75e8a6ad586b..4c4710253eaa 100644
--- a/games-strategy/openra/Manifest
+++ b/games-strategy/openra/Manifest
@@ -11,5 +11,6 @@ DIST SharpFont-4.0.1.zip 151532 BLAKE2B 3745959e449b0745b5cd1c20a9653595ce2166f4
 DIST SharpZipLib-0.86.0.zip 463599 BLAKE2B 5d6374c5daef33afc1faf814992df1ef7001b593594a022657406ac8ce67ac5e00f71cfe9365c4acab2925ef458f9add83ec62dd22e4db74e17efdd1e1091542 SHA512 70ac4a39b599a37ff45733477ba1afb4caee177262b72037998b7eb08a737177f8689bb690759b8090d25b9d408ba8c84e56bec3509997adde62724fcfcdc2b5
 DIST openra-20190314.tar.gz 24551126 BLAKE2B ed6289bbfab9f55aa88ac834dab3a2bab4cea3cb5a3b6934e24feb78bea1df71d839d4434242df666cda6180027a8e6d5b7766b6155ab2e85a4ee639a7950e12 SHA512 a16884cf626a31b3cf21662c307aef505bfcf6d34330f09b10510aa6c88d9d1026f17f2037565827fc95148776b0651fe0559c65db493295957df428793b2d71
 DIST rix0rrr.BeaconLib-1.0.1.zip 17989 BLAKE2B 2a65c9276b725ac6c433eb2cf6e4a13d6e5c07446dbff1e096b100a20eebb2a432c81cfbc13c11fdf672fbd37eb5985497b3fa425a317afe39049a6a967e3a7e SHA512 4fe4c6dfd7ad0f7eb5549c66fe53cd38f74026a8202d3553481bdfdab8ce0788f8b31f05092d93f9751a687badf75a1ec22da201235f2e505893192bb371367f
+EBUILD openra-20190314-r100.ebuild 5011 BLAKE2B aaec300aa007cdc04961f89f32f4cb4120cc9bde374d2728f692bf0c78115ee2347c0ae3885ecb19aa9f4d1fed86a036f425c64702e2474e431a2c4bf6b4ef74 SHA512 40f12f8f9b87dd3dbbf74f4fd8c4f9a0aba9c57f42ade666ca95ad805fa4d535f017ee40a2f21caf075c5bc4a33669119ad23a3482b90cb4d6f6fe8f6e7edc93
 EBUILD openra-20190314.ebuild 4890 BLAKE2B 5805d4bc6f43bc93f2748849ab462c7f8612c3cfeab5439e8b183537111ddc5296cfe42bfdc09cd5855d347582beae866cd3c21b23e121b8d8c0fbb02d5cdf2a SHA512 289a8c32e587585b6876fe65d42411402ab4806cba7f5be09b3626a1a27f17861338455dba527a91ee627660b60e1a31f64815a7b63f0bbb97c8801b4b3d484b
 MISC metadata.xml 507 BLAKE2B 41509ed4d51adffd4aaf548f986ff19ccdf2b382e6265eeca268ccf693fcbf47468fad4ba1fcafb73f2a7fd5893942944f4118ca3b388a2b9299fd9130621d5e SHA512 ffeb53c6a7368c79336656bee82ea41fcdec13ef68f22e70a2ef70b5ba644ae1ad3832406cf54c7afd888ebe3357d2530528f39b07d515b813cf090248fa5186
diff --git a/games-strategy/openra/openra-20190314-r100.ebuild b/games-strategy/openra/openra-20190314-r100.ebuild
new file mode 100644
index 000000000000..c9121cd7fddf
--- /dev/null
+++ b/games-strategy/openra/openra-20190314-r100.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+
+inherit lua-single mono-env xdg-utils
+
+MY_PV=release-${PV}
+#MY_PV=playtest-${PV}
+
+DESCRIPTION="A free RTS engine supporting games like Command & Conquer, Red Alert and Dune2k"
+HOMEPAGE="https://www.openra.net/"
+
+# This sed one-liner was used to generate the SRC_URI list
+# below. Ideally we would package these DLLs separately instead but
+# Gentoo Dotnet doesn't seem to be in great shape right now.
+#
+# sed -n -r -e 's@.*curl.*(https:[^ ]+/([^/]+)/([^.]+)([^ ]+)).*@\1 -> \3-\2\4@p' \
+#           -e 's@.*noget\.sh ([^ ]+) ([^ ]+).*@https://www.nuget.org/api/v2/package/\1/\2 -> \1-\2.zip@p' \
+#           "${S}"/thirdparty/fetch-thirdparty-deps.sh | grep -v 'NUnit\|StyleCop' | sort
+
+SRC_URI="https://github.com/OpenRA/OpenRA/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/OpenRA/Eluant/releases/download/20160124/Eluant.dll -> Eluant-20160124.dll
+	https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/OpenAL-CS.dll.config -> OpenAL-CS-20151227.dll.config
+	https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/OpenAL-CS.dll -> OpenAL-CS-20151227.dll
+	https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll.config -> SDL2-CS-20161223.dll.config
+	https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll -> SDL2-CS-20161223.dll
+	https://www.nuget.org/api/v2/package/FuzzyLogicLibrary/1.2.0 -> FuzzyLogicLibrary-1.2.0.zip
+	https://www.nuget.org/api/v2/package/MaxMind.Db/2.0.0 -> MaxMind.Db-2.0.0.zip
+	https://www.nuget.org/api/v2/package/Open.Nat/2.1.0 -> Open.Nat-2.1.0.zip
+	https://www.nuget.org/api/v2/package/rix0rrr.BeaconLib/1.0.1 -> rix0rrr.BeaconLib-1.0.1.zip
+	https://www.nuget.org/api/v2/package/SharpFont/4.0.1 -> SharpFont-4.0.1.zip
+	https://www.nuget.org/api/v2/package/SharpZipLib/0.86.0 -> SharpZipLib-0.86.0.zip"
+
+# Engine is GPL-3, dependent DLLs are mixed.
+LICENSE="GPL-3 Apache-2.0 BSD GPL-2 MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+debug geoip"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RESTRICT="mirror test"
+
+BDEPEND=">=dev-lang/mono-4.2"
+
+DEPEND="${BDEPEND}
+	dev-dotnet/libgdiplus"
+
+RDEPEND="${DEPEND}
+	app-misc/ca-certificates
+	${LUA_DEPS}
+	media-libs/freetype:2
+	media-libs/libsdl2[opengl,video]
+	media-libs/openal
+	geoip? ( net-misc/geoipupdate )"
+
+S="${WORKDIR}/OpenRA-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-system-geoip.patch
+)
+
+DOCS=(
+	AUTHORS
+	CODE_OF_CONDUCT.md
+	CONTRIBUTING.md
+	README.md
+)
+
+pkg_setup() {
+	lua-single_pkg_setup
+	mono-env_pkg_setup
+}
+
+src_unpack() {
+	local DOWNLOADS="${S}"/thirdparty/download
+	mkdir -p "${DOWNLOADS}" || die
+
+	# Stub out unnecessary development dependencies.
+	touch "${DOWNLOADS}"/{{nunit.framework,StyleCop{,Plus}}.dll,nunit3-console.exe} || die
+
+	for a in ${A}; do
+		case ${a} in
+			# Unpack engine sources.
+			${P}.tar.gz) unpack ${a} ;;
+
+			# Symlink other downloads, Makefile will extract and copy.
+			*) ln -snf "${DISTDIR}/${a}" "${DOWNLOADS}/${a%-[0-9]*}${a##*[0-9]}" || die ;;
+		esac
+	done
+}
+
+src_prepare() {
+	# Stub out attempts to download anything.
+	sed -i -r 's/^\s*(curl|wget)\b/: #\1/' thirdparty/{fetch-thirdparty-deps,noget}.sh || die
+
+	# Extract what is needed from the downloads.
+	emake cli-dependencies
+
+	default
+}
+
+src_compile() {
+	emake $(usex debug "" DEBUG=false)
+	emake VERSION=${MY_PV} version man-page
+}
+
+src_install() {
+	emake $(usex debug "" DEBUG=false) \
+		prefix="${EPREFIX}"/usr \
+		gameinstalldir='$(prefix)'/share/${PN} \
+		DESTDIR="${D}" \
+		VERSION=${MY_PV} \
+		install \
+		install-linux-mime \
+		install-linux-shortcuts \
+		install-man-page
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if [[ ! -s ${EROOT}/usr/share/GeoIP/GeoLite2-Country.mmdb ]]; then
+		echo
+		ewarn "Multiplayer server locations will show as unknown until you install"
+
+		if use geoip; then
+			ewarn "a GeoIP database. Run emerge --config ${CATEGORY}/${PN}"
+			ewarn "occasionally to fetch one and keep it current."
+		else
+			ewarn "a GeoIP database. Start by enabling the geoip USE flag."
+		fi
+	fi
+
+	if [[ ! -d ${EROOT}/usr/share/.mono/certs ]]; then
+		echo
+		ewarn "The multiplayer server listing will not work at all until you install"
+		ewarn "CA certificates using Mono's cert-sync. Run emerge --config"
+		ewarn "${CATEGORY}/${PN} occasionally to set them up and keep them"
+		ewarn "current."
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_config() {
+	if use geoip; then
+		ebegin "Updating GeoIP database"
+		geoipupdate -d "${EROOT}"/usr/share/GeoIP
+		eend $?
+	fi
+
+	ebegin "Updating Mono CA certificates"
+	cert-sync --quiet "${EROOT}"/etc/ssl/certs/ca-certificates.crt
+	eend $?
+
+	if [[ -n ${ROOT} ]]; then
+		echo
+		ewarn "Mono's cert-sync cannot write to your ROOT system so you must manually"
+		ewarn "copy the certificates from ${BROOT}/usr/share/.mono to ${EROOT}/usr/share/.mono."
+	fi
+}
diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index 6d4c3ed9ac00..43e5b490b0e6 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -1,3 +1,4 @@
+AUX s25rttr-0.9.0_pre20200723-cmake_lua_version.patch 296 BLAKE2B cabdc87d6184e59f0896762f3d3434a137fed4fd1c2dae84d30dbee5d4903e68ba01c30b92d0d5290dec9b371807c317b462213a421cadd172b78b08407f66aa SHA512 074ac3e70fec0da6bd4a9602052989a8b6c26b5cfef669d6330d9177547bbeeeef2a4e6b9d83a9e9cbdf4ec33df7dcce50a862e3c9e533049ad8452df6073816
 DIST s25client-f0b97b120140c96bbeacae9c22633f899931db69.tar.gz 20184306 BLAKE2B 4204a62e0a57a614c5ae1a947741f8f92fd7cd75b203467716483baa6f68a7c608033f403337e66b00bc8c2851b03f04c25bf84cda124548cfe09a110478fc54 SHA512 c4f0b59a68a0d5ece57f06f51e7a977be0b41ae85ff57821b317c2bb822a2533a192e1dfaa1a738c6738e65505a70ec34b3e7b22a8bd6effc95a4279d5eb19da
 DIST s25rttr-kaguya-38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz 156126 BLAKE2B 05eeccc890549b8dd3fa004c61b73be65f1fcf20867b7f4a46d0963f80b4a76fca611915ea72a401bdc49a81997d3d4500c5f5378a7cd55cbbfab6bcf647261a SHA512 470414d41cb6bad4e428858114f3c91139abfb1bf3ae02bb322d51bfabba8c0aad6796e183ccbb57624ed3484fea3f463636561ac8a359b6be7b90cfd5c0696a
 DIST s25rttr-languages-6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz 698512 BLAKE2B 82bc98077ed18622083894a63044194f599375c93aa745e330ad8ba390e14d9829ebb7c8e62141758f41dff2b72d3afbe2a5b6ebb584c3293c244e6f0c88ff89 SHA512 47de2791a4d4707fa17344de8fff8a15dd4436dd6e8c75adbd95273739cf5022e39a1024edee228eb27294e4f1f0b2a91110a1249b3d4fe64641cace051e4544
@@ -9,5 +10,6 @@ DIST s25rttr-mygettext-b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz 19270 BLA
 DIST s25rttr-s25edit-677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz 198489 BLAKE2B 47ffced26f1cceb78c0137e31114e463f0f5ad15fdb47e6a2809080a7874ce484918a0527e97b33db98c4a0daa338712c1b1a8b4992ac47d96f4e3b7056ee5e8 SHA512 0f5b4a4eeb72a906c86dac74c1bb41f5d4756c58240f59403932e388e523bed7d841ffa1d18dfd87454ab8c60b33e74cef27aec93995e37539868148bbee9900
 DIST s25rttr-s25maps-5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz 8013451 BLAKE2B 042ab804f4ec9babf7c975629fa3bd6856fb1fa4de0c4715420bca7e0f2dd72cc0909134750ba70c69344985bdd7a3a74576536cee80d6dfaf688c8cf82da8c0 SHA512 3339ced1fcca0fc9a37382d23c3c43f46c5e51d4c14b2657a79cd15dbd79ba8025bf8133dbbe45eb125b5c88370c90422faf21b65d95f471af3bb43de54a3210
 DIST s25rttr-turtle-9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz 98611 BLAKE2B 6187ab3109f1c9c20524752920e7b9f0e1de2c882bb09ce8c4d2d29899fbaf8a0e2627afc475f6c1527428d77e9a7a7c7332136ba5a79e33cad9c570fbc19042 SHA512 ba85c03cb3e857c501fcec0223ccb7dfccb99a961dd6594820640e133523f14275e764e196197ead05b739f490003b412e16ca2d0fcae8263ef4c256d252570a
+EBUILD s25rttr-0.9.0_pre20200723-r100.ebuild 4749 BLAKE2B d9bc594b531fdb741d23b5bc033f6265d6051ac0e2d602231dbe4df369175a7d6fb697a1b2d5fe040f392b1dc58e35a8a426986afcac3d227fc3c2106d61b0af SHA512 f4418551f7e2f3963f73432b3f3d38cdb3418dfac17ce8b7e89a8ed0f549da0ab64f3a740c75224defc55a6ceb8bba52ecd3e2135addb323626d12e98d4a37ea
 EBUILD s25rttr-0.9.0_pre20200723.ebuild 4573 BLAKE2B 39ddb5aae6ce13966cb459c1057199d472d721795503f0ea71feb8770eb02eb7047fd8a30ddc6d34e6d37a0e40755aac66dc11d0f3e1221ae3445c5923c3b1b3 SHA512 0680acd8cea4644015fca40b769de67da0a24e5bed86b94163e36c9226ac275b547aafd7f9408a4960666078a399fa909b37aeea6618e60f754d1f31793a3bd1
 MISC metadata.xml 347 BLAKE2B ca0f64b6265a6a9297cd7fb42b007f8d822298f52630bcc6b25bbcdf3854514ea865d3f8407f0754b66a720028b5059962af993c889707fdda4419d445e8d4f1 SHA512 d2602cf6ae2637800c4b1d6448cf557998311ee0e24ac621c221d99fd21ae3bbd4a08963d8185d2afa6c1a63c2cf94f95bd893b7fbe01e9c777266850747ee62
diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-cmake_lua_version.patch b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-cmake_lua_version.patch
new file mode 100644
index 000000000000..07c8403ffe40
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- a/libs/libGamedata/CMakeLists.txt
++++ b/libs/libGamedata/CMakeLists.txt
+@@ -11,7 +11,7 @@
+ FILE(GLOB SOURCES_OTHER *.cpp *.h)
+ SOURCE_GROUP(other FILES ${SOURCES_OTHER})
+ 
+-find_package(Lua 5.1 REQUIRED)
++find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+ 
+ include(GatherDll)
+ gather_dll(Lua)
diff --git a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild
new file mode 100644
index 000000000000..001f1128ae10
--- /dev/null
+++ b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit desktop flag-o-matic lua-single toolchain-funcs xdg cmake
+
+DESCRIPTION="Open source remake of The Settlers II: Gold Edition (needs original data files)"
+HOMEPAGE="https://www.siedler25.org/"
+
+# To generate from git repo:
+# echo -e "COMMIT=\"$(git rev-parse HEAD)\"\nSRC_URI=\"\n\thttps://github.com/Return-To-The-Roots/s25client/archive/\${COMMIT}.tar.gz -> s25client-\${COMMIT}.tar.gz" && git submodule --quiet foreach --recursive 'url=$(git remote get-url origin); gh=${url#*github.com[:/]}; gh=${gh%.git}; echo -e "\thttps://github.com/${gh}/archive/${sha1}.tar.gz -> \${PN}-${gh##*/}-${sha1}.tar.gz"' | egrep -v "/(dev-tools|libsamplerate|s25update)/" | sort && echo '"'
+COMMIT="f0b97b120140c96bbeacae9c22633f899931db69"
+SRC_URI="
+	https://github.com/Return-To-The-Roots/s25client/archive/${COMMIT}.tar.gz -> s25client-${COMMIT}.tar.gz
+	https://github.com/mat007/turtle/archive/9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz -> ${PN}-turtle-9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz
+	https://github.com/Return-To-The-Roots/languages/archive/6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz -> ${PN}-languages-6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz
+	https://github.com/Return-To-The-Roots/libendian/archive/dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz -> ${PN}-libendian-dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz
+	https://github.com/Return-To-The-Roots/liblobby/archive/9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz -> ${PN}-liblobby-9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz
+	https://github.com/Return-To-The-Roots/libsiedler2/archive/5cb9993a32504337c63fd894266991445e0dcd65.tar.gz -> ${PN}-libsiedler2-5cb9993a32504337c63fd894266991445e0dcd65.tar.gz
+	https://github.com/Return-To-The-Roots/libutil/archive/6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz -> ${PN}-libutil-6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz
+	https://github.com/Return-To-The-Roots/mygettext/archive/b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz -> ${PN}-mygettext-b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz
+	https://github.com/Return-To-The-Roots/s25edit/archive/677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz -> ${PN}-s25edit-677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz
+	https://github.com/Return-To-The-Roots/s25maps/archive/5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz -> ${PN}-s25maps-5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz
+	https://github.com/satoren/kaguya/archive/38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz -> ${PN}-kaguya-38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz
+"
+
+LICENSE="GPL-2+ GPL-3 Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}
+	app-arch/bzip2
+	>=dev-libs/boost-1.73:0=[nls]
+	>=media-libs/libsamplerate-0.1.9
+	>=media-libs/libsdl2-2.0.10-r2[opengl,sound,video]
+	media-libs/libsndfile
+	media-libs/sdl2-mixer[vorbis,wav]
+	net-libs/miniupnpc
+	virtual/opengl
+"
+
+DEPEND="
+	${RDEPEND}
+	test? ( >=sys-devel/clang-5 )
+"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch
+)
+
+S="${WORKDIR}/s25client-${COMMIT}"
+
+# Build type is checked but blank is valid.
+CMAKE_BUILD_TYPE=
+
+src_unpack() {
+	default
+
+	local SRC DST
+	for SRC in */; do
+		case "${SRC}" in
+			s25client-*)
+				continue ;;
+			s25maps-*)
+				DST=data/RTTR/MAPS ;;
+			*)
+				DST=${SRC%-*}
+				DST=external/${DST,,} ;;
+		esac
+
+		rmdir "${S}/${DST}" || die
+		mv "${SRC}" "${S}/${DST}" || die
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DCCACHE_PROGRAM=OFF
+		-DCMAKE_SKIP_RPATH=ON
+		-DRTTR_BUILD_UPDATER=OFF
+		-DRTTR_ENABLE_OPTIMIZATIONS=OFF
+		-DRTTR_ENABLE_SANITIZERS=$(usex test)
+		-DRTTR_INCLUDE_DEVTOOLS=OFF
+		-DRTTR_LIBDIR="$(get_libdir)/${PN}"
+		-DRTTR_REVISION="${COMMIT}"
+		-DRTTR_USE_SYSTEM_LIBSAMPLERATE=ON
+		-DRTTR_VERSION="${PV##*_pre}" # Tests expect a date.
+		-DLUA_VERSION=$(lua_get_version)
+	)
+
+	if use test && tc-is-gcc; then
+		# Work around libasan and libsandbox both wanting to be first.
+		append-ldflags -static-libasan
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	SDL_AUDIODRIVER=dummy \
+	SDL_VIDEODRIVER=dummy \
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	doicon -s 64 tools/release/debian/s25rttr.png
+	make_desktop_entry s25client "Return to the Roots"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! has_version -r games-strategy/settlers-2-gold-data; then
+		elog "Install games-strategy/settlers-2-gold-data or manually copy the DATA"
+		elog "and GFX directories from original data files into"
+		elog "${EPREFIX}/usr/share/${PN}/S2."
+	fi
+}
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 3421201ac921..ff60f0ee5961 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -2,6 +2,6 @@ AUX widelands-0.20-boost-1.73.patch 854 BLAKE2B 2132909f12c366c3ddb21661a96d7131
 AUX widelands-0.20-glvnd.patch 780 BLAKE2B ec09d7624e9432e9adf339efc2ce0b094d7007834e34ed6be8620fa7e9ed91bd6c4963ea452e2e769abdd521d7f679c012a2f5c5ceee9ef9f7643af6b116ac5e SHA512 9c05d8744eeacc13ec84ffda49e055fe29420a4104e7628da3a0d1c0f4e4cc4740531879c7bd88b41cb5e7ef5827c132a33c795eefedd9a4718afc738b452f05
 AUX widelands-0.20_rc1-cxxflags.patch 1060 BLAKE2B 1cc356c615037ab293877a2f65a3db2fc979ebfec370e3968da4f466873c92b523671b6e7193ae7bb1dc948b713901421586266e1837f34a19d50279f02224d9 SHA512 da3f5b9e5680c84d48740c202fd937aeb76465647b1a24e4eee5a6d3df44b2f4abda819606ff7294ee1d8fe27ceb3281e4a00ca7f03d944af933bcac0e490059
 DIST widelands-build20.tar.bz2 232364340 BLAKE2B 1d8e2cd28d2ac3e2425c91a9872a3f158d7063a2c6c669d95df347561ef35dfca479fd81252d61008a3282c99a2ce70c4d904622272dd86477a731fc711306b1 SHA512 25280db6a57adeb37d13db35ce9eb41a5478534b04772240f6228c180f5a41a55fc414dab66e724945442985cbbba7a8a59a582291aca176e0bd8ae6c08760e5
-EBUILD widelands-0.20-r1.ebuild 1672 BLAKE2B 2074826806e80b8c7de048d6919bf4e663e3e0c46c74bc62952cf60c88f698e5d0e6b1249492de66c35c29b0cfa71d9109a04c790301aab0abba259c8155caaa SHA512 58223c2563b901a0c134d4f149ae1224c9c9a6b83ed0477bfa73a19fc69250571b294a23864df98b7e75827b4c7841dcf8e6310646a418d51913bca62520e2cc
-EBUILD widelands-9999.ebuild 2148 BLAKE2B e9be419865610425b050b75ef2007bcfa2bbee1726b63abf2ef375950080646249e7db9e4b9c60dd0309a84ca83efd3a91f0b04618312689596a6f7681f05e29 SHA512 f85d3a81e91b94e60db0a8a6ccdb59cdd43b599a6bb8b0469089c5404f37bc15e960913c9456a60cb39f9fae7ae022d5484b3d5971c398e5559b0da16f740ef7
+EBUILD widelands-0.20-r1.ebuild 1656 BLAKE2B ecf68dba322894fc9e9acf65e11bd28af69c075757a5a4aae822ec7f68bace21076618badd67ea7c2efcce0230765741df3189eb163ca76ecf85c8d667574589 SHA512 e1da2854877aacf135c8fd37b43e45ad8dfd154d0e89d26341d107ebc1548cb9ae762a8a9056d8526ee3d2082815c300bc2eae7d977a6618d0c728df6c334663
+EBUILD widelands-9999.ebuild 2132 BLAKE2B ad52b806425b512be09dd8fd2cea623b647a7956a0ce944aaac6bf97813310023afd7c33740a0d009e0931c66043df177728cfb18776b5b84a67e7627f9dd054 SHA512 e62cb8eab5ace0e5113638dcf6541272144922e7b87d2fa92c97858d7ce86c8448e21d11d36fd00be9b1d076f8d62cd1d1b38a93f396997074c8103632b709bf
 MISC metadata.xml 330 BLAKE2B 40ce3c95a2be4fd32bc1d9cc214fb4a61435b869c5d0c6406094ddab24a1e4a7b64f28b866e4c712d1d7020a047f28a239e9b8d51092242f2a43269d13934cc4 SHA512 a56671f43b3ce3e6274b9101b7c5ea1a4b2ff261fb94366e80d2655519a07c52fa0629b762d3ca76f82693075a1c717795bff2a69122938c9749ea249dc1e75d
diff --git a/games-strategy/widelands/widelands-0.20-r1.ebuild b/games-strategy/widelands/widelands-0.20-r1.ebuild
index c0629174bc75..c01f32953ab0 100644
--- a/games-strategy/widelands/widelands-0.20-r1.ebuild
+++ b/games-strategy/widelands/widelands-0.20-r1.ebuild
@@ -32,7 +32,6 @@ RDEPEND="
 	sys-libs/zlib:=[minizip]"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	dev-lang/lua:0
 "
 BDEPEND="
 	sys-devel/gettext
diff --git a/games-strategy/widelands/widelands-9999.ebuild b/games-strategy/widelands/widelands-9999.ebuild
index 157430929194..33ade68e2d5c 100644
--- a/games-strategy/widelands/widelands-9999.ebuild
+++ b/games-strategy/widelands/widelands-9999.ebuild
@@ -39,7 +39,6 @@ RDEPEND="
 	sys-libs/zlib:=[minizip]"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	dev-lang/lua:0
 "
 BDEPEND="
 	sys-devel/gettext
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index ad2302fbd75f..e68ac2fd124d 100644
Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ
diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index d88f4cd64372..5d810ef19bc3 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -1,8 +1,10 @@
 AUX slade-3.1.12a-bundled-libs.patch 2424 BLAKE2B fbd40c43b396d9d82fc4ce8af75a23ebfb2cfe85d3a217680b219601e02fdcc58e158052249b2e4d949742643d1b6efda9e38c7b44c1932f163e8a66ebfa818e SHA512 31706d662b25f5c0cbf618970de874da27c48390421809da2462b909d8d207b856c56e212b3efa13c78d6048f3619fd74a95d9c25c87ee6c8a481e36e7f695bf
+AUX slade-3.1.12a-cmake-lua-version.patch 329 BLAKE2B 94f07076227b7cbfb30a05e9968f19df045ac271694a2e14defe682ceaa0b6d0afc1a51831eda0da19fd48f2873ab0039395bb1df7ad8c5b1bb1e41da554712e SHA512 af510793bee2f87d3f88ce4a752d2eb6dd19e64667e823b07453ad21739cf4b2796f28ae71930d9da8c5bd5d461e1d24bc1eb3f99a284c7fe69d205e7ffc7401
 AUX slade-3.1.12a-fluidsynth-driver.patch 541 BLAKE2B a8596e7c65014201eee1d87b7779d78b582338b35447d4722341176a507314cae2977d254d7a948e2207ba619a2aa6a443303fbf6546ac10da23243e23f96e35 SHA512 002f44606a9efc1f6b299353d29e133cf84a2bd13e6eb37f601365ce55d03037f4db94c569c0dd0bd7bc97ea5701714ecc5d9e83a374cfe988deb8b3d13bcb9c
 AUX slade-3.1.12a-freetype-deps.patch 2207 BLAKE2B 48ae8033f80c6438db6af26f8c8105c663ef7133b7e4560d7df82588afdd771bdf0df30678a5148456338254cef5e3e0d805d4f23f4a5facc6272cd65cb00925 SHA512 f03f57d9e76f283bde48d48904ae9ff4759b472e78efc01f40d24427a6a27114e36e27e4ad7b3f9ebb149c5b600b0540e901eef8dcd5f30949af95810255ebd9
 AUX slade-3.1.12a-sfml-gtk3.patch 2524 BLAKE2B 0bdd400ba218d1c0a0db48a3ab144b6083c22fcc69d112765aeda069853c03a97c4f774d24cb73c1bb202089eb8184435a121a0473f5914d17ee208bdf181a4d SHA512 b83c27f224c45533738d8341ac7116e226ae45e13514b9dca85f5813d73c2b1f13460961ea8fbbbe8acb40ab80d37100f3c66abc7df4b49abeabba1ffa8fa70c
 AUX slade-3.1.12a-wxGLCanvas.patch 3768 BLAKE2B b69e84d4c31c7f46c9298f282f4407c10edaf77ec73ccea780f3a9dddbcd89bd315e327716dee8432a27e8150133b42a6a819c8af7b8567980941c79a8b7a138 SHA512 5ae7d5e91012a3e526fe95003cfbcfcb69de9636b453018a654da50af11772c2be4690f36786634e8941d011f8094093fa2a7e8ac1d099a0627e93e1ee47b863
 DIST slade-3.1.12a.tar.gz 5883702 BLAKE2B 400cf032bf0b60555b45b450c524d85f145d593d74601461f33fa571360a0c66a1d5933a7d48e8cfad98981bcf446df213240f53da237be6d9a1ce09517c4566 SHA512 ecedec880b8ebed921e152d016a451164efd4de90ae69963be077d1ef39326670254ca8eb03e1045ca7ae5b02f7512dbbe712f83c845cbbd4ed787a90899ad13
+EBUILD slade-3.1.12a-r100.ebuild 1559 BLAKE2B 6dd5c652dde38b3706a9a0fd76e84077609f1b36b5a5c9d58f265ba97b6d2d9033896cfa7912957cb708485e62099f6e4693dc46e8d8ad237321ce3b7ed2d456 SHA512 66c9077cb3ffaef370c004fc23f1e64af62dd1b02c5ef5b5f1e70d6ae614b7a4928da68ba4690340f8ac19cbdd63cc1a93657b0e68f2b0ea73d05ae8c18ae64a
 EBUILD slade-3.1.12a.ebuild 1401 BLAKE2B 5824cb7b6ade4442c0110e935df95fe9eff51701b991da081cecd989cd05250ad3672b99e84f3e9ff91a62ab01eaf964850f758a429f293a5c369b119866a482 SHA512 22d2855a3a87858b98eef4fd8f3a9198f86dd9f52d0a8215190c0543ac1b73699d7fc285eecf2cb9422b7b825e75b55007bce26c0760e4eba0cd3194db15ec00
 MISC metadata.xml 456 BLAKE2B bb0657015b0259912543f091f7e08695a3bba37da01594f9979c71d435bd1505790f009d827cd654267b96de446666c4eca7c564962e35563eff26027b30e119 SHA512 e6cc7225d2bcf85aaf62158fdfb7b92f2816f4363795f7b82293f932efc4182275979117a2673242f7c666d26036a1de1a6caaab0c3a48e19ca00b639007f272
diff --git a/games-util/slade/files/slade-3.1.12a-cmake-lua-version.patch b/games-util/slade/files/slade-3.1.12a-cmake-lua-version.patch
new file mode 100644
index 000000000000..ba7fba329c9b
--- /dev/null
+++ b/games-util/slade/files/slade-3.1.12a-cmake-lua-version.patch
@@ -0,0 +1,11 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -104,7 +104,7 @@
+ find_package(OpenGL REQUIRED)
+ find_package(GLEW REQUIRED)
+ find_package(CURL REQUIRED)
+-find_package(Lua REQUIRED)
++find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+ pkg_check_modules(DUMB REQUIRED dumb>=1.0)
+ include_directories(
+ 	${FREEIMAGE_INCLUDE_DIR}
diff --git a/games-util/slade/slade-3.1.12a-r100.ebuild b/games-util/slade/slade-3.1.12a-r100.ebuild
new file mode 100644
index 000000000000..da73f5e0060b
--- /dev/null
+++ b/games-util/slade/slade-3.1.12a-r100.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 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-gtk3"
+
+inherit cmake lua-single wxwidgets
+
+DESCRIPTION="Modern editor for Doom-engine based games and source ports"
+HOMEPAGE="https://slade.mancubus.net/"
+SRC_URI="https://github.com/sirjuddington/${PN^^}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="fluidsynth timidity webkit"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+DEPEND="${LUA_DEPS}
+	app-arch/bzip2:=
+	>=media-libs/dumb-2:=
+	media-libs/freeimage[jpeg,png,tiff]
+	media-libs/glew:0=
+	media-libs/libsfml:=
+	net-misc/curl
+	sys-libs/zlib
+	x11-libs/wxGTK:${WX_GTK_VER}[gstreamer,opengl,webkit?,X]
+	fluidsynth? ( media-sound/fluidsynth:= )
+"
+
+RDEPEND="
+	${DEPEND}
+	timidity? ( media-sound/timidity++ )
+"
+
+BDEPEND="
+	app-arch/p7zip
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN^^}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-bundled-libs.patch
+	"${FILESDIR}"/${P}-sfml-gtk3.patch
+	"${FILESDIR}"/${P}-wxGLCanvas.patch
+	"${FILESDIR}"/${P}-freetype-deps.patch
+	"${FILESDIR}"/${P}-fluidsynth-driver.patch
+	"${FILESDIR}"/${PN}-3.1.12a-cmake-lua-version.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Delete bundled libraries just in case.
+	rm -r src/External/{dumb,glew,lua}/ || die
+
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLUA_VERSION=$(lua_get_version)
+		-DNO_FLUIDSYNTH=$(usex fluidsynth OFF ON)
+		-DNO_WEBVIEW=$(usex webkit OFF ON)
+		-DUSE_SFML_RENDERWINDOW=ON
+		-DWX_GTK3=ON
+	)
+	setup-wxwidgets
+	cmake_src_configure
+}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index fc608297bfb6..943163d26749 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 607fdd6cdda0..1359708c5ebd 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -5,6 +5,6 @@ AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb1
 DIST gnome-settings-daemon-3.36.1-patchset.tar.xz 79352 BLAKE2B 6daf9528f5aa4c6597a017f25da41039dd2c09b4a1c29dca2d72f20195bb93c9003de39df89a669996e13050538553fbf6ed4f738b1c6fae29e8825ba252d26a SHA512 fea4ecaadac102b0024c365ae2ba9e632ffeebab138bfc09b3f5bb0a7794c6efc779180023a73c6c884c7b64f7e8ac1ec40f1478231a5528c03829cd9273a58e
 DIST gnome-settings-daemon-3.36.1.tar.xz 1415080 BLAKE2B 4026f3443b8dcab872ef54563b5fe8e89d6932373da0513d7d8c614616d396315f1e6a8d0be022aec82351b5cfe5868cbac5caeaa782d609885029fbbd1d91e3 SHA512 f2f43d9b772589b6b4212ee2b0afe8be79d50a2e0473a960c7a7b9d379222bbe84ca548114d0a247810a094b4b3bf41e40ca91173c6cf552517dc63eb3750c88
 DIST gnome-settings-daemon-3.38.1.tar.xz 1437096 BLAKE2B dddc4672585c23f1d0f1824303b503ec30d6fc4a2a88b9633e0256d34ca2badd067fa54a404de032f8b2e8dd5b7bfa3915464bc826d8bbea5d57431b7a2ac7fe SHA512 b32c0897d1a5680747bf68e9009ea44cf1a05ef807b772ca6514a278002754d520def7bced929b9004d3aec82a6e82b52637bd2eadd3f6cd54f3d0ac5c8e8cbd
-EBUILD gnome-settings-daemon-3.36.1.ebuild 3907 BLAKE2B 1ad1f505534b636f4157f3bfe70afc2dfc97b3007f2aa35d76a76e4f043318009784a824444baa61b3ab6fe60324a383db663fa85a680ffc9ee5f74ab0316f2c SHA512 fb60dfcca7171cd8a040d5e0a98b6861dffdac19e40efcd707fa648fe4e91baca83c5090c23adaea6eebab4de2c74cae720285aacf8f78642ee3a72a719e6ec7
-EBUILD gnome-settings-daemon-3.38.1.ebuild 3853 BLAKE2B e28fe376c288cd80b5224d2395d21896ac9de45510e566549715d88b80e29fea2dfb20b271a58c6a8343ead9b65df380c5a2dc6e3bf91f3c0c05223794e1fd74 SHA512 687482050a72f82f17b92ed7a0ee63aa8b620718b90b09e5b0de1b8781b75f34c964a3f92b3943209c9f5b4014acad043aa519bafeee673bdf71bc76e2c918f7
+EBUILD gnome-settings-daemon-3.36.1.ebuild 3936 BLAKE2B bc43ce2fd69ebe44810a7c8a89267622b043a110efcc5bdac6dbf5386134bed0a4bcf1f5b882e38974b55acce3013c305dbb8e5f4ec5741678d46c35fb14f4e2 SHA512 9b85c3f9cbfa5bf2ef9c53355389f149295c586cdbf600a5bd6e85e0c897f236ff1b530c471aa4fdc16454c01ea1f3cfcce3bef1caec1c0351d8d027911bb450
+EBUILD gnome-settings-daemon-3.38.1.ebuild 3880 BLAKE2B a75e19a704ba1d402b6645e0134f3ab4a997d403de89af689b936ff56d0da9034f23a9204f47d11c2bc1a5a70f4f2813446450ce95d34a1c09269d5551e41f76 SHA512 fea21b725e04dcd0cd9764f29bc962f5352b21223835ac5d522fff727bde9683aa3ec251ac278f9c8a275bb9cac5538a0bf2b29570693ef1f9e96974cdc738d3
 MISC metadata.xml 546 BLAKE2B 8b82608d88d30a327a48d46992c0c19cefd594682191bfe4649a0e090ff13c0a9b88adf4c4aa4b42f9393c21153130afbf2d5090d774b348cff3003b41e3cef3 SHA512 c1a8e1a648564c52fb00d68a67bcfea6b2f6369186ede54a7278f258ef9f6b0cc6f399fa5f9c8ee7846d97a6163729c8da970a0f2e93e23bfa2f84ebf2466cba
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.36.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.36.1.ebuild
index 7043f1323e07..c79b95c35630 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.36.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.36.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
 
@@ -13,6 +13,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test +udev wayland"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	^^ ( elogind systemd )
 	input_devices_wacom? ( udev )
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.38.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.38.1.ebuild
index ce585ea54bab..cf87e4731d3f 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.38.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.38.1.ebuild
@@ -12,6 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test +udev wayland"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	^^ ( elogind systemd )
 	input_devices_wacom? ( udev )
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 445b40ef8b0a..07ae95723070 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-shell-extension-appindicator/Manifest b/gnome-extra/gnome-shell-extension-appindicator/Manifest
index eae41b12f701..ebe86da62675 100644
--- a/gnome-extra/gnome-shell-extension-appindicator/Manifest
+++ b/gnome-extra/gnome-shell-extension-appindicator/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-shell-extension-appindicator-33.tar.gz 32600 BLAKE2B d24e18dc3697baf5f6a5466da6ba6bc4e699bb20cabde80dcfb007b339246cfb940af4407bc99d22632a1dfa1fe255a60fcf608ec50af88e3edbb2dcbceddf69 SHA512 ceb79a1fa22440210477e53e1ebca3db3ea81eb8a45613c46d37f44ebb3e063b626a073df519af978becf1c6a83d68c02a26f22bf0a9ed43e2299bbab7acb599
+DIST gnome-shell-extension-appindicator-34.tar.gz 34764 BLAKE2B 3a619f810d9ddf7984fc3b0c96735eb0f9233f36ff3cbddc5b28a8243f55d57cbc9c58b49516e99b30f35b12b6e747b7fa288fdc36f99cf7e61b7ad8cc2e84de SHA512 1f02a7cc3cfb90af8ee1a0bb39135fb3203bcc87d13cda0cf7f110db4b838a7c082eba30246a913306ef0e4b2fdb7c9f52f24f62525013ff8f1de9d054d45425
 EBUILD gnome-shell-extension-appindicator-33.ebuild 899 BLAKE2B b21b9cc8e0ff4caba11eaa8a37d0388c850c8da5feec13b6313158d8c1cff079f8f07ff9fbc4c2121bb7024b5f66e4ec23c49437c62da7d3949bb7f3315e47d3 SHA512 231365e25199991cc36994cd6d43524636baca5b97ee826f495ba23f3c69d0b474a8dcad9f9c2fcf3158fea7f25cff517f76999487087492a6476f69cd30bd99
+EBUILD gnome-shell-extension-appindicator-34.ebuild 901 BLAKE2B b896325223cadabc32b8dbe698dedb15a2f54eb34dfd6deedb2dc7abaf951eed167e57905676c69509c5690b6fcd5529a8e54040cb53a1e23f552500dcffa46c SHA512 51d87864fbfc517edf2824f76fbb492ef1fcca2ad39442479989978fd4056bb8ad9e19f280a6778518b68f745409002ca22b63557d4f449c2588dfc708bc50f4
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-34.ebuild b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-34.ebuild
new file mode 100644
index 000000000000..933325eeb279
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-34.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Support Ubuntu AppIndicators and KStatusNotifierItems in Gnome"
+HOMEPAGE="https://github.com/ubuntu/gnome-shell-extension-appindicator"
+SRC_URI="https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	dev-libs/libappindicator:3
+	>=gnome-base/gnome-shell-3.34
+"
+DEPEND=""
+BDEPEND=""
+
+src_compile () { :; }
+
+src_install() {
+	einstalldocs
+	dodoc AUTHORS.md
+	rm -f AUTHORS.md LICENSE Makefile README.md || die
+
+	insinto /usr/share/gnome-shell/extensions/appindicatorsupport@rgcjonas.gmail.com
+	doins -r *
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
index 81484f9aaa35..dd91d404d193 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
@@ -1,5 +1,5 @@
-DIST gnome-shell-extension-applications-overview-tooltip-7.tar.gz 79965 BLAKE2B f7698bdad46837f1ae736bbb2d9b376a28946df5f8a00d2e9b19d48bc4c2f4e742030f952d14bf5816ca1aae9b172a2639e2170d6bd87f373ff23c7ce9bd8912 SHA512 1cfaf23fefe5a940ae448658e176c69da9bb319f6200983b4ac14f65e76f5e449b9a235e6c1ccaf9b6d6db0fda9576e963fa1273b776dbfb5a72c608961e2d48
+DIST gnome-shell-extension-applications-overview-tooltip-10.tar.gz 81397 BLAKE2B a9c838eb66ae49a3a195d8ce6e17fd971fb0dec00f62a2a7380fc973c9ba129611a93b904c658318e0bc80fb26ff9d65100cccd29f7f172dbef0f406bacefd14 SHA512 28bcc52b38d36e0897c949ba0eef11a94fce2e022ca3d398208221476b63b39281db9870d0c26a4bdffc07bb82e9d8942fd98820c78c6a4afe6d52eb5758e1c1
 DIST gnome-shell-extension-applications-overview-tooltip-9.tar.gz 81415 BLAKE2B 518352e80b5a3c6f8a2ff05e692178436625ea533e10a2afde82e73b6216f82dc29119c0e0a204ac8f1619de9409c47105107b94e3c4d1027c852b255eeb27ab SHA512 b8a2879f303a76e68eb5921005453e3fb73d966f1ed3f5978d9d210f447d8f780b5d9fa359aaa411f7ed8cecf72171dfcaa8da8515fd620193676b1b63742636
-EBUILD gnome-shell-extension-applications-overview-tooltip-7.ebuild 1257 BLAKE2B 0aa3332efe830f8924e37dfa0d601c13c8e2e5109a4ffb5096fe62a4762f36d46b6d828d09a077a235ed8bdabe79274b6091a1098c2ca7df711e0b0ee3002d88 SHA512 efdbd3153a58a13fc3ea5e66d438e6913b774ae4318f81b417b00d920a6f75043aab9cee11074322c5025c678d0d5f45ceb930ad88d4cd114941fc62b6b343b4
+EBUILD gnome-shell-extension-applications-overview-tooltip-10.ebuild 1193 BLAKE2B d40a81efa58bf9f9dfc079ffcd47bb6a7c6bc849c732e1212616c38e4f941387b9518b9da30b25cf1b8f4c852ff71045d0e922f1484889efd4740f4a24bd20c7 SHA512 15b515144936404e225a323828d1d2b2862f0a75c0f5445aa963993b9fcd0871d75b4679f26973fd826818be70b570b2f9b3dd215dc48662025adbe57428ac5c
 EBUILD gnome-shell-extension-applications-overview-tooltip-9.ebuild 1257 BLAKE2B 56d3fe14b44a58c5d2eb9b59ffc99ebbe0448227e27a68252950d0f676a765a5983e44c554d1e06249653ef74b0655a1f516f15509baa05b3e9310c0beaab737 SHA512 faa26aa51c48098efca83872ac76ad3215d30ebf8c8493df70e32dc719da37378d21b9b87a47d45c89caf5d3958a7205496bfd08f9d4a060e67c8383ef616130
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-7.ebuild b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-10.ebuild
similarity index 71%
rename from gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-7.ebuild
rename to gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-10.ebuild
index 749eb17dd185..2f000f6faee8 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-7.ebuild
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-10.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit gnome2-utils
 
 # Workaround until https://bugzilla.gnome.org/show_bug.cgi?id=663725 is fixed
 DESCRIPTION="Show tooltip with full name and description"
@@ -11,32 +12,38 @@ SRC_URI="https://github.com/RaphaelRochet/applications-overview-tooltip/archive/
 # https://github.com/RaphaelRochet/applications-overview-tooltip/issues/7
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-# glib for glib-compile-schemas at build time, needed at runtime anyways
-COMMON_DEPEND="
-	dev-libs/glib:2
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
 	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.20
+	>=gnome-base/gnome-shell-3.38
 "
-DEPEND="${COMMON_DEPEND}"
+DEPEND=""
 BDEPEND=""
 
 S="${WORKDIR}/${P/gnome-shell-extension-}"
 
 src_install() {
 	einstalldocs
-	rm -f README.md || die
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf README.md schemas || die
 	insinto /usr/share/gnome-shell/extensions/applications-overview-tooltip@RaphaelRochet
 	doins -r *
-	glib-compile-schemas "${ED}"/usr/share/gnome-shell/extensions/applications-overview-tooltip@RaphaelRochet/schemas || die
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
 }
 
 pkg_postinst() {
+	gnome2_schemas_update
 	ebegin "Updating list of installed extensions"
 	eselect gnome-shell-extensions update
 	eend $?
 }
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
index 6cb0082e3f0c..5adafb605bbe 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
@@ -1,6 +1,5 @@
-AUX gnome-shell-extension-bluetooth-quick-connect-10-3.34.patch 218 BLAKE2B d44cf86a76c0a5a0596db9b49f96b1105a05493b2d39b13c6934c4410c8f1c997053b7d36ac20f1e7815ddbd0e536715da7e8be794ee941dc3333e4c08dc7986 SHA512 cb72680ab9ee09d1cf47b104dcb98749633ebeda2e8aaf2d7757387600287ed0846dd3cc4851df65d0aa61c5c434fccdf3ee9a41356da5287ae11f9ffd22afa0
-DIST gnome-shell-extension-bluetooth-quick-connect-10.tar.gz 18214 BLAKE2B 6ca20071041605c5b0a34198562b0d913d4527b2521a0f219e7533730fece41607b2270f0349f0511a6270a9f5b4f5d936247be740a6813aa9901adf3cc0fdba SHA512 5d2dab53b5377cba00743de6501259691c519dd404922bab0e500ca54bcf8942731795aff122c1669471fd3d6a51521ecea966cd2df843777ef1aa871a548772
 DIST gnome-shell-extension-bluetooth-quick-connect-13.tar.gz 19937 BLAKE2B 3b5c70d5302d8508d0a6165b06e41db9d256805c35ab4de095b7d97ce9bb24ee58185b6a7afec15a2fbe22ce9dc7859229670d4e00646c5353825dab1d1b4b5b SHA512 494827fa61e02bb3df0a054c7274fd61bf7d42aa4f8ece8c2b30a29a459b6fceba110b4016bd069f3cf5504561aee06fce3260cf9496b3d41516f077e8f99563
-EBUILD gnome-shell-extension-bluetooth-quick-connect-10.ebuild 1185 BLAKE2B 5c2b96964368d4fd74251f9eb8bad7b84f247eae4dc0b8768e5bb53c4bcdc71d8cedeb71182bffcfec5eec066afc53fcbcee0c4f5197c833f8d9217b3afcacf0 SHA512 5fabfe97d49fcfc2f873b50757b26aabdbfe0ad1923e13d8922d41c5dfd0bd7c030b56832bcd7a82b71c40de64667172cfc4147fd3851e15717711b6900c7849
+DIST gnome-shell-extension-bluetooth-quick-connect-16.tar.gz 20053 BLAKE2B 37cf71c319a3715a7c5acb9835f1a480eb8b383e6dca48b3852ab949233137f963ee583d01e16d558bec02a9c7b604883c62e7c1b606624aecc82f7e83bbf297 SHA512 e9052d2199b8339e86b69dc317c26f23086131a6ecd8286d8058dddd185fb5cea4215fa3fb11e8b214f0a07a86cac2c45cdab1d83a529df3ab1991143b6cf53c
 EBUILD gnome-shell-extension-bluetooth-quick-connect-13.ebuild 1139 BLAKE2B 44b974fdb78c81f5215d7124220dcc4109c775af99a55f34b82bda63c736e41041bc639f70ec134bcf971563c06c411470883bb372ce1447d4c0ec5a09641604 SHA512 9e75dfa7a8448960c0c5dcab2e346a5a741332c0d577a51499f85cd0443dd55a69eaf948ca7863ac9fff3a663a6812737e7418af206d79472ac7f570c90179e2
+EBUILD gnome-shell-extension-bluetooth-quick-connect-16.ebuild 1092 BLAKE2B 14eeaa99828dbd1e05b3745ddcf54ab5265c15efba8d51e8d66eb9871f6735e0290a097629a0b415b2db50058342b815fd2c52393d1c59005e5a640c93b674a7 SHA512 f68352aea036e05eb0720807333024e567fa5b40dddcc86465ba009c6970d8c4b008a418a936c1ce87d8d3264801626274624ed1aaee7f2d72cba9d1c9b0851f
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/files/gnome-shell-extension-bluetooth-quick-connect-10-3.34.patch b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/files/gnome-shell-extension-bluetooth-quick-connect-10-3.34.patch
deleted file mode 100644
index abde8a8ccba5..000000000000
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/files/gnome-shell-extension-bluetooth-quick-connect-10-3.34.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/metadata.json.old	2020-03-15 18:17:50.474579697 +0100
-+++ b/metadata.json	2020-03-15 18:17:57.704750038 +0100
-@@ -9,6 +9,7 @@
-     "3.26.2",
-     "3.28",
-     "3.30",
--    "3.32"
-+    "3.32",
-+    "3.24"
-   ]
- }
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-10.ebuild b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-16.ebuild
similarity index 66%
rename from gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-10.ebuild
rename to gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-16.ebuild
index 281272309a72..3d6b2ffef0ad 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-10.ebuild
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-16.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit gnome2-utils
 
 DESCRIPTION="Allow to connect bluetooth paired devices from gnome control panel"
 HOMEPAGE="https://github.com/bjarosze/gnome-bluetooth-quick-connect"
@@ -9,37 +10,39 @@ SRC_URI="https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v${PV
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-# glib for glib-compile-schemas at build time, needed at runtime anyways
-COMMON_DEPEND="
-	dev-libs/glib:2
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
 	net-wireless/bluez
 	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.26.2
+	>=gnome-base/gnome-shell-3.38
 "
 DEPEND="${COMMON_DEPEND}"
 BDEPEND=""
 
 S="${WORKDIR}/${P/shell-extension-}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-3.34.patch
-)
-
 src_install() {
 	einstalldocs
-	rm -f README.md LICENSE Makefile || die
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf README.md LICENSE Makefile schemas || die
 	insinto /usr/share/gnome-shell/extensions/bluetooth-quick-connect@bjarosze.gmail.com
 	doins -r *
-	glib-compile-schemas "${ED}"/usr/share/gnome-shell/extensions/bluetooth-quick-connect@bjarosze.gmail.com/schemas || die
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
 }
 
 pkg_postinst() {
+	gnome2_schemas_update
 	ebegin "Updating list of installed extensions"
 	eselect gnome-shell-extensions update
 	eend $?
 }
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
index 2abe1af06505..cf4143c5a395 100644
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20200713.tar.gz 3431 BLAKE2B 6355135f9027d53b10ba1f02f2fdf90dc0acbd090be8905addc78f22f7b136464831985152d8a112febc8891bbd18ea42aedd8009c7db4afc52ba48b6d502511 SHA512 322da0bc511bbb6943713fd3fc3d75d8f32b9872ced9eeb611acc77756392d0b9c9dc1311bdb4e255d131637de6a17a3d0a76f1cebcc71218d67d2ef6078a4d1
+DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20200901.tar.gz 15697 BLAKE2B e689b1cb09dd7a84b8c542a78fcc45dcf09af16725f44aa325d68009f189d4cd72ee435b8b66989cd18c6d1d33cda5d7a2408533f32a8da93a9b8cdd2f4f0bd0 SHA512 db29ea4ad68ed945857e2aef3c5afcc8449b5eb5163a7940487fa2fe174ab036a2a436a35dac345e3a3d96ec075460afe3ba48f5f460f14ed033ad5307ae5969
 EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20200713.ebuild 1330 BLAKE2B 5fa31ccac489303a350c07a479310b22c18a1cdb18d3946b8f2345b72ac6a6c46ec9d2e6b6d8a41db5a54d8fa0095b181661cde21049a0565dca57e35ed2e716 SHA512 71643acd4848f8432bf80d199ac8e13e560e571d9d60edb608ccd98eaf82059909a74321e90ae39ba3bd25493bfce5437faf34f27badd675ec97bafa10fc67da
+EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20200901.ebuild 1332 BLAKE2B 00489b78e1bffebf5c01404fc01212ca13da07581d262797d1dc0d26f7d2026f3fa2dbd202aea6b1c028f3c6a1f8f547f92cc26412a05a8c3a72f284538f0f07 SHA512 c3c4c3cafc30b73d4977f6ba96a7a02f06972cbe7047ba53f3dbb03ec8512a6dcc108af9d6622e30fc1d0e7d01ab99d3f9a593dc52159661061b3b561bfd8e1f
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20200901.ebuild b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20200901.ebuild
new file mode 100644
index 000000000000..8d72170e4b9e
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20200901.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils
+
+DESCRIPTION="Control the blur effect on gnome-shell lock screen"
+HOMEPAGE="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen"
+COMMIT="df16335b2b7f4bbbd22b9e95a16f074ae405b3a3"
+SRC_URI="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# glib for glib-compile-schemas at build time, needed at runtime anyways
+COMMON_DEPEND="
+	dev-libs/glib:2
+"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.36.4
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/Control_Blur_Effect_On_Lock_Screen-${COMMIT}"
+extension_uuid="ControlBlurEffectOnLockScreen@pratap.fastmail.fm"
+
+src_compile() { :; }
+
+src_install() {
+	einstalldocs
+	cd "${extension_uuid}"
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf schemas
+	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
+	doins -r *
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index 975b12ce2c2e..4e69ae842ed5 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -1,10 +1,8 @@
 AUX gnome-shell-extension-dash-to-panel-26-branding.patch 637 BLAKE2B 1e124561143b577413090e16c7ad0c8cbb66911b079ae5844da9cf04e0197aab15fc4f746d3020ab7d4e6756b8a35befa773967c223d29289e13c6b3ffd70234 SHA512 8c176972ff10e87e957cfdda23e86a3e434dc050e8a954e7c2257942301daa5aa7c5b788188768f13c5b009d842fca8b14819a255a6a561dac8fa60e355ec211
 AUX gnome-shell-extension-dash-to-panel-26-opacity.patch 578 BLAKE2B 64feaf9d1acba25d991d52e10c78741dbe9f948639c951e9b11dfbc1ebb7e83c854ffcb4ac2b3661b5482868bf9de8d91b661775f3eb1f6a762ff36e9b737a0b SHA512 0c09afaabcbbe6c10c930dfc9acb72fabf2c458486bc9f62661aab41bbb2b3fd2fbb430e31c36915dd2233c28486597aba5ccd9fb25c9e7945c10cd856b6e26d
-DIST gnome-shell-extension-dash-to-panel-37.tar.gz 21116028 BLAKE2B 3e35f1f4b809f17e3971b708cdbed9f35a04cccbe651d804f101b70d1067310def60a7c8f6b2ebcf09087ed76a0214ce31e5560c8b8b4ef211bfa1f5befdbf79 SHA512 3f76ffc9e05ece7a96807815b229b6fb3fc391ec1b7ab35fb5db9fd61899f3c626a979f3d286f7f5ffb39890f9c99242c702d84d7690d0c9ee20b35a17e3303b
 DIST gnome-shell-extension-dash-to-panel-39.tar.gz 21123453 BLAKE2B 6cc5bc56368d1e65d601894251642fad1a28508b475a8abcd9566c0a5bd9e48677a98401fa1b263b4df6a0650442d253ab297bdfce5409feec96933fa1d3a67b SHA512 37ff633b3ab04024d65c25e42885e6e9f8b11f5d2e7516fefe7b8ae791b7beac62d7c7a2d5f88fbb8e69e28688f90e4b41cd4d330f381aa7b351e5603a14c007
 DIST gnome-shell-extension-dash-to-panel-40.tar.gz 21130921 BLAKE2B 3f5b60aaf4bece5d14adab616580e127ec62abfe3a68e3fdebe25a16c1a7e498932e350489863cc002cdb78ffacdc52dcc4eb79532da7aeb17d3cafaaeead8f4 SHA512 b59c0fe518c950b63119535cf53a51024d9575994de8a7603707d28b6503f6824324e44ca09d89f206c7d33888593e46604cb5745be366731160adace6d64e05
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gnome-shell-extension-dash-to-panel-37.ebuild 1700 BLAKE2B 4350cfab57f90892f8ac0f236ca9780170cb4b4d1fecca2984c2e5665ceaadb45cae64f66f41d2bb2d81268a2a90c0bb4b432414188ea95d21a94526f3e51ad1 SHA512 61d1f5bead3b607b87e1a7a43c25ff1af33dc3064eeec6d710a3f3453344bc492f16dd6ac8c824b3ddb066263a60ef8e8e3c0fa388b5025b292243b4bb01d826
 EBUILD gnome-shell-extension-dash-to-panel-39.ebuild 1700 BLAKE2B 4350cfab57f90892f8ac0f236ca9780170cb4b4d1fecca2984c2e5665ceaadb45cae64f66f41d2bb2d81268a2a90c0bb4b432414188ea95d21a94526f3e51ad1 SHA512 61d1f5bead3b607b87e1a7a43c25ff1af33dc3064eeec6d710a3f3453344bc492f16dd6ac8c824b3ddb066263a60ef8e8e3c0fa388b5025b292243b4bb01d826
-EBUILD gnome-shell-extension-dash-to-panel-40.ebuild 1830 BLAKE2B 6b47c3ea74f6403b20448a843828b03faa49fd3ec10bf2149a839a9d9c1f4ab2044b613918be9794f7e2cfeb980a97db21dedf441d3c5cda8096aa2547b45b84 SHA512 629d04cb5fff0676a7b5ec152cba741455de635278c1114e845b8017db2ab086aa454b2d5b52e052e60ba6ea1f5d2a8ba3f20d090f3faba03249f6b37cbaab82
+EBUILD gnome-shell-extension-dash-to-panel-40.ebuild 1828 BLAKE2B 6180baacf1d2e4dc57afdf92d8c4f205b8459c2ae81b3df6d89fe1276792e7dc8f3d4db3ef795c88388e3814f5962b8092926e45ebc68f38b8792286e9da2ab9 SHA512 a320b154e0b349d1e15ac209d926ba8d3a309ec84db3089a4b7bb5353b7e4623ee0df165929f04a6bbfe3e67748d121d2f045e37a511a9c65d7f85077cd554ad
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-37.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-37.ebuild
deleted file mode 100644
index 23612f13646a..000000000000
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-37.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
-inherit gnome2-utils
-
-MY_PN="${PN/gnome-shell-extension-/}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="An icon taskbar for the Gnome Shell"
-HOMEPAGE="https://github.com/home-sweet-gnome/dash-to-panel"
-SRC_URI="
-	https://github.com/home-sweet-gnome/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="branding"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.18.0
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# Enable by default custom opacity to get panel slightly transparent
-	# as was done in older Gnome versions
-	"${FILESDIR}"/${PN}-26-opacity.patch
-)
-
-src_prepare() {
-	default
-
-	# Set correct version
-	export VERSION="${PV}"
-
-	# Don't install README and COPYING in unwanted locations
-	sed -i -e 's/COPYING//g' -e 's/README.md//g' Makefile || die
-
-	# Provide fancy Gentoo icon when requested
-	use branding && eapply "${FILESDIR}"/${PN}-26-branding.patch
-}
-
-src_install() {
-	default
-	if use branding; then
-		insinto /usr/share/gnome-shell/extensions/dash-to-panel@jderose9.github.com/img
-		doins "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg"
-	fi
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-40.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-40.ebuild
index 225fca6fd96c..307565980ca6 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-40.ebuild
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-40.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="branding"
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 3c21282ee69e..ffb8b53b64af 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-shell-extension-gsconnect-41.tar.gz 614195 BLAKE2B ebcf9fca448e27fe0e74bf4118528a5f8f7055ea962d4e928feceaa3257e9ff6f286a2b11631468abac1355c2506a0d8923fe56d4370f37fd7e93fe7cd8e8d45 SHA512 12de97683e4bcbf49774b6b6f93803bb0d0005f3114a581ccd7a7219cc2cb27a0e7b10d45a162c879f27e058d99b791ce33425e465651fe1f4e93f1a332a0eaa
 DIST gnome-shell-extension-gsconnect-42.tar.gz 729438 BLAKE2B 19aea0008487c5c316a6883da176ccba4bf31334abe1ce273cdba91d4fbacfa8a3e003909488e957486ea371043174eefd1ca990470f99ac4ff36ff73cd498cc SHA512 27965435ef9524021e3ce3825af73d9a8b7f602d8c73b524bcf247b6af47ad14b16e83815b1a30e148b109531fbe230e531e1a0b456f5f51c9c96a4c5a3b19a5
+DIST gnome-shell-extension-gsconnect-44.tar.gz 731896 BLAKE2B f4d51ca366bf6a3fe65713da516331a5e3beba19ed6fa22b7224be3c05433bdc125d80e04ac3a1da966ed4f671c6771a53b0cd3f94f7c81eea51f8a30415a5d6 SHA512 92ca5750772c64300c4b8760d4202a1e27d5e7f0fedc5672fd54b48e17de095b29fe0ce18df76619a2e3e3802bb4b77ffdc98b9b4987db3e9550251a61f8b832
 EBUILD gnome-shell-extension-gsconnect-41.ebuild 1589 BLAKE2B 2fe5b45b50e276f1b075d3541f78bb798a9ce254bcc88c40e9ddcf13a1668386cb97710e33db19fdcd5f71ae11603f42a8d005c6db7b13793526a5af2a328688 SHA512 c74181be8de7a50b6bb1938b9d756563bc7d9f89ecc609a1204a7f3aaadce7f2f801499f4374f8e0ce29b832575e1eace11979b83b7e76fd4446d18cd3b2ffb1
-EBUILD gnome-shell-extension-gsconnect-42.ebuild 1619 BLAKE2B ac709d464e11b0060a789b98137c6092b84c18fff2f201575d34995d207fbc565dadd69c0cdb9a91e55f67fbe5c01fc4554d93543ac465d1ceb79555d6f2c7ed SHA512 cb8b85bfc3a8226b9fb289d0cc81555ac1bab214e5cb3ca11daeeaba220c6b62729ea9c5736eb0688666b816196ff018394eedadb2812260b66c758965fcd52b
+EBUILD gnome-shell-extension-gsconnect-42.ebuild 1617 BLAKE2B df9cfa8cf83c338b36041ab932e582af2fc30578b9887173dbcbc28cd26b78f7374ff5ed3f5f8f74415f338cc5f4f0a2aaa33160564c763f26876a178a8448b8 SHA512 48e0991a87fc962686e5fc235981b9fa3ffaba7e82b19daec86f203c4d2735739465759bd55d2b1e7b06737b84ef0c4d539095a87c421bb2ecb5860690ce0732
+EBUILD gnome-shell-extension-gsconnect-44.ebuild 1619 BLAKE2B 5519a8b0133817ceed28d093caeaa80b5a6992649d4685d7e5b58a5d0fa4d26cc7301a3dfe461919a43b342a2384b11a08c02b401de8898315f9ab27f16f8532 SHA512 51caf148a025dcc87de59b82a7aefb36417e1f865c14ae75288b82ce04ab1537ec781f8a253f5e6b8f9f758c85679cd1a45676d1df9b980a3be9dcfaed1b3046
 MISC metadata.xml 321 BLAKE2B daf09efc56bcbf90c8a190e25127a11d12fa7935ee49fbbb5881f1aa3e552485e63ffd9dd8e4099260b504ebdf2a7342a868328cd591b8f4ea1dde173292a882 SHA512 f8b184239c05241cac2b86acfab2f265297cee49a7fe254633181208ec7d29b875582091f34ccc0d8fed2fa41bc4488509a913d96efc9ca8155cbed5f362683f
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-42.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-42.ebuild
index fed37ac837da..8179bcdda6ef 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-42.ebuild
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-42.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nautilus"
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-44.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-44.ebuild
new file mode 100644
index 000000000000..a971cf00fd4f
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-44.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils meson readme.gentoo-r1 xdg
+
+DESCRIPTION="KDE Connect implementation for Gnome Shell"
+HOMEPAGE="https://github.com/andyholmes/gnome-shell-extension-gsconnect"
+SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nautilus"
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=dev-libs/gjs-1.48
+	=gnome-base/gnome-shell-3.38*
+	gnome-base/gvfs
+	gnome-extra/evolution-data-server
+	|| ( media-libs/libcanberra media-libs/gsound )
+	nautilus? (
+		dev-python/nautilus-python
+		gnome-base/nautilus[introspection] )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="For knowing more about how to do the setup, please visit:
+https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
+
+src_configure() {
+	# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
+	# https://bugs.gentoo.org/694388
+	meson_src_configure \
+		-Dinstalled_tests=false \
+		-Dnemo=false \
+		$(meson_use nautilus)
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_pkg_postinst
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index f5d5d926e4e5..2cf843f5f078 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -1,9 +1,3 @@
-DIST pch-session-3.34.3.tar.bz2 9189 BLAKE2B 82c8f346ef8b627c4756f6781e0ccc9274c5152cd723ddcf00e23411efdf3ff633ca0078cd0a4b3ebc24e1f2ef79e7d736fdc6f9b46b750f7f88177c7977a408 SHA512 dcada2ac88fec4fe2d893bd0fd76e63fb574452612b3c9286fe42f3c51fba3b2f3992ff3015b11867c01c1d328fcd8f007f9dc1e1e3030c1e722d3b4df4740b5
-DIST pch-session-3.36.1.tar.bz2 9461 BLAKE2B 069e0b8753dab8ccf7e9b8600f15f554bd38f1ee62c63ff77e308ef54013a7e82883b58a9ceedbec5d95dfcf30e398009c217423479b30919fca0de15a1e0d1e SHA512 d8bfd058e3237d2cccdce420be04dac496f9c04ef24b376875d4c9f38fe2e3b7199406e4b3963cc601e3cb3572f187eac6811e9028a276bba2b6a06cb43fde65
-DIST pch-session-3.36.2.tar.bz2 9559 BLAKE2B 072b395039320b23f46a145ebfc7d80adfd5981c95bb14e5a8f70ce3b1004a74431e74a3af1b3ca30c2620f3deb1cc62ffbcb1028f6312459fe59c9dbba68f5f SHA512 2f5a3ad24ffcfb9e8890e6562dcb86d374c355d4ce63e35653f3d2a2daa9bb19399fb68965e83bf9b2c3213c60be9db139ad3d44a6a969e51bfaef78a10da33f
 DIST pch-session-3.36.3.tar.bz2 9575 BLAKE2B 1f7001c50247821b2c9771b8d16bd2b962712c033fde7af225a9aac152abb2a0505b73f5baf5913ce12e05bc7a89abcf0411b2ffa64dc0aa38b2bea0f3f41796 SHA512 b784421b27a446d460191da5a2eb6fbaf53aa4cffbfe8f113bc8c3ef308741ccfd6a208d6f6b1a50839b3a0925b22e6573604fd315496a5c59ae969fc8e6f7a6
-EBUILD pch-session-3.34.3.ebuild 1116 BLAKE2B c40d8b6fe8e344c57ceeebc9ef1299fd77810a8fce722aa9469c9cc327ee288f1f665dab820835ca914b7c7e07dea82344c64fe0795f03a2050d09f3adddd42e SHA512 a0c2d66acf1d40d340747684904b6f08e8fcca8a336828a4711aa7bd8d5f300eb69e6c5eadde8fba8b2a4d38a291008a0b7b74949f8838bf57cabf02cc2c9d07
-EBUILD pch-session-3.36.1.ebuild 1284 BLAKE2B afa6c9ea764c95d17425fdcf30ca1a4c870c57333c31de2d69be68d5cb98d88991dc5509546bc288657233a88299ca8ba09ebec54840af2218a4e1acd5697792 SHA512 d3c8c23ac76a2b141518d6d604ba4c8ee40f378d88cd66b6f967b5a4699dbde4b7b21317c0c7a0430a1fc2f61742eae03a2c3e9fa92fc90628c8f41b8761a14d
-EBUILD pch-session-3.36.2.ebuild 1284 BLAKE2B afa6c9ea764c95d17425fdcf30ca1a4c870c57333c31de2d69be68d5cb98d88991dc5509546bc288657233a88299ca8ba09ebec54840af2218a4e1acd5697792 SHA512 d3c8c23ac76a2b141518d6d604ba4c8ee40f378d88cd66b6f967b5a4699dbde4b7b21317c0c7a0430a1fc2f61742eae03a2c3e9fa92fc90628c8f41b8761a14d
-EBUILD pch-session-3.36.3.ebuild 1286 BLAKE2B a2f84213d944c73db6701b449b97da1603059477ca43ebb13bd3a8e4d6c00bebe9a31afc500efe0fa4edf47fe658356be3ed25a7267f89c0f52b7745926974a8 SHA512 42053487aa5ff7597a1b7e821934f3a22da77a54a2272ea234c65bab41d5a724ae5178ee0be56e4f657a7fe827b7c7879ffcbd5f009202f5778f5cab27871127
+EBUILD pch-session-3.36.3.ebuild 1284 BLAKE2B afa6c9ea764c95d17425fdcf30ca1a4c870c57333c31de2d69be68d5cb98d88991dc5509546bc288657233a88299ca8ba09ebec54840af2218a4e1acd5697792 SHA512 d3c8c23ac76a2b141518d6d604ba4c8ee40f378d88cd66b6f967b5a4699dbde4b7b21317c0c7a0430a1fc2f61742eae03a2c3e9fa92fc90628c8f41b8761a14d
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/pch-session/pch-session-3.34.3.ebuild b/gnome-extra/pch-session/pch-session-3.34.3.ebuild
deleted file mode 100644
index 220ec8debc7a..000000000000
--- a/gnome-extra/pch-session/pch-session-3.34.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-DESCRIPTION="Unofficial gnome based session with different default settings and extensions"
-HOMEPAGE="https://gitlab.com/pachoramos/pch-session"
-SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# gnome-extra/gnome-tweaks to configure extensions easily
-RDEPEND="
-	>=gnome-base/gnome-shell-3.34
-	>=gnome-extra/gnome-shell-extensions-3.34
-	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-6
-	>=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-10
-	>=gnome-extra/gnome-shell-extension-dash-to-panel-26
-	>=gnome-extra/gnome-shell-extension-desktop-icons-19.10.2
-	>=gnome-extra/gnome-shell-extension-gsconnect-33
-	>=gnome-extra/gnome-shell-extensions-topicons-plus-22_p20190929
-	>=gnome-extra/gnome-tweaks-3.32
-"
-BDEPEND=""
-DEPEND=""
-
-src_install() {
-	insinto /usr
-	doins -r usr/.
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/pch-session/pch-session-3.36.1.ebuild b/gnome-extra/pch-session/pch-session-3.36.1.ebuild
deleted file mode 100644
index e72ccd6232b4..000000000000
--- a/gnome-extra/pch-session/pch-session-3.36.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-DESCRIPTION="Unofficial gnome based session with different default settings and extensions"
-HOMEPAGE="https://gitlab.com/pachoramos/pch-session"
-SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# gnome-extra/gnome-tweaks to configure extensions easily
-RDEPEND="
-	>=gnome-base/gnome-shell-3.36
-	>=gnome-extra/gnome-shell-extensions-3.36
-	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-8
-	>=gnome-extra/gnome-shell-extension-bing-wallpaper-27
-	>=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-12
-	>=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713
-	>=gnome-extra/gnome-shell-extension-dash-to-panel-38
-	>=gnome-extra/gnome-shell-extension-desktop-icons-20.04.0
-	>=gnome-extra/gnome-shell-extension-gsconnect-34
-	>=gnome-extra/gnome-shell-extensions-topicons-plus-27
-	>=gnome-extra/gnome-tweaks-3.34
-"
-BDEPEND=""
-DEPEND=""
-
-pkg_preinst() {
-	gnome2_schemas_update
-}
-
-src_install() {
-	insinto /usr
-	doins -r usr/.
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/pch-session/pch-session-3.36.2.ebuild b/gnome-extra/pch-session/pch-session-3.36.2.ebuild
deleted file mode 100644
index e72ccd6232b4..000000000000
--- a/gnome-extra/pch-session/pch-session-3.36.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-DESCRIPTION="Unofficial gnome based session with different default settings and extensions"
-HOMEPAGE="https://gitlab.com/pachoramos/pch-session"
-SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# gnome-extra/gnome-tweaks to configure extensions easily
-RDEPEND="
-	>=gnome-base/gnome-shell-3.36
-	>=gnome-extra/gnome-shell-extensions-3.36
-	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-8
-	>=gnome-extra/gnome-shell-extension-bing-wallpaper-27
-	>=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-12
-	>=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713
-	>=gnome-extra/gnome-shell-extension-dash-to-panel-38
-	>=gnome-extra/gnome-shell-extension-desktop-icons-20.04.0
-	>=gnome-extra/gnome-shell-extension-gsconnect-34
-	>=gnome-extra/gnome-shell-extensions-topicons-plus-27
-	>=gnome-extra/gnome-tweaks-3.34
-"
-BDEPEND=""
-DEPEND=""
-
-pkg_preinst() {
-	gnome2_schemas_update
-}
-
-src_install() {
-	insinto /usr
-	doins -r usr/.
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/pch-session/pch-session-3.36.3.ebuild b/gnome-extra/pch-session/pch-session-3.36.3.ebuild
index dc5a9627439a..e72ccd6232b4 100644
--- a/gnome-extra/pch-session/pch-session-3.36.3.ebuild
+++ b/gnome-extra/pch-session/pch-session-3.36.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # gnome-extra/gnome-tweaks to configure extensions easily
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 717652437e67..73ebca2292f1 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/libwpe/Manifest b/gui-libs/libwpe/Manifest
index 1711f8f37098..cbde3b63c4ee 100644
--- a/gui-libs/libwpe/Manifest
+++ b/gui-libs/libwpe/Manifest
@@ -1,5 +1,5 @@
 DIST libwpe-1.4.0.1.tar.xz 49636 BLAKE2B 6fc9d6865873c7c16be3c959316539ecd4f08ae91dac003a46ca91e34503810cab089c9b609318b32919c02e111e209b68874aba0b6730e71b2e51fb75498656 SHA512 cbbe6b8e9bbb864d7f96bbdb56db262bbd341c86bc7bedfcc51be8077c0ea58a4e88c61b7b7bec937d5476e6cb81c093229bf80e3ee99452829287bd26175670
 DIST libwpe-1.8.0.tar.xz 51260 BLAKE2B d5f5249e3fffba03a0e87e6a8b2a261e426dc25c2a57d5e060d81f7618e957884c1c74a86a79216d4e5e85f9e173e7629be9c6a674898b20e701fd59d487bd32 SHA512 38b02d97f9ee40a1bb345ba0766acd1852500c704447bde224ac79f41e91abc06fb3047119f9843a11c78cdd5899287ab86ccedbcaefb51e366a1810f2f42fa8
 EBUILD libwpe-1.4.0.1.ebuild 579 BLAKE2B c45bbab88c62dcc3d07c0ba9cc294b2156f7aef9d19b2899c3003b0e1104fd8aa4917e114c86425c404498527dc47d7b2f75f5f1a28f9b7a21e83d9c3009f090 SHA512 aca65332f9a002e9da94b21da16439d529200adf6afb3a5f8dbd8f5007df8a6338826a9feb0c4212f5b5f34a3afdf35d36eb1f4034e3b19e44573058f422d018
-EBUILD libwpe-1.8.0.ebuild 582 BLAKE2B 8e676af9000127449fdcc9ee8be5285b41b71a0af29c4a4291c18e8bd1eb12564344dc78fd34882c3a6c97c160daadfc37af7baaa576862f5edc173ffc87488b SHA512 c01ce3ea4fedfe6eff89053cc75be521777e57b463f9657954205f32e74943d9ffe6fc2abbc8426cd99db9f1b678b4c9135b8d635de2f64f5cbbade6a2b34d28
+EBUILD libwpe-1.8.0.ebuild 580 BLAKE2B 38ce0d9989a6f6bbb6654ae389de751666e667b87c5732fc1058afab59ca05358352326b53c20fa523885e0c865dea91a0c555d23e02d79a98a256469d36f430 SHA512 dc298760fe7b3232dbf70af1dcb9e2c96e18bd588573a82f9d72b972ab8bd2f5b7504c29fef79a95554551203f0dfa4e3a76622ed75d90a78ef62a6f038727fc
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/libwpe/libwpe-1.8.0.ebuild b/gui-libs/libwpe/libwpe-1.8.0.ebuild
index bca416f78586..f61eafe633f4 100644
--- a/gui-libs/libwpe/libwpe-1.8.0.ebuild
+++ b/gui-libs/libwpe/libwpe-1.8.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD-2"
 SLOT="1.0"
 IUSE=""
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	media-libs/mesa[egl]
diff --git a/gui-libs/wpebackend-fdo/Manifest b/gui-libs/wpebackend-fdo/Manifest
index 68617d627fab..6dc9794f93b4 100644
--- a/gui-libs/wpebackend-fdo/Manifest
+++ b/gui-libs/wpebackend-fdo/Manifest
@@ -2,5 +2,5 @@ AUX 1.4.0-eglmesaext-include.patch 816 BLAKE2B 451eb913d74197820adcb639e6768c479
 DIST wpebackend-fdo-1.4.0.tar.xz 30204 BLAKE2B dda32e0408a8fd98dc1d03c4606e20fb219fe722aef24360e31cd62027601a4795dbdbf026925e284e6b87f223e6e79824e8e6bab181b7bbf42a9db0664358dc SHA512 f94167b13345adfda15312b16e5de04910f812c7481f7e3c8a00163ce8387be22373867b51b2c5cb424e62de877c1aaa48592aac85ec9cc03c969c7e83185660
 DIST wpebackend-fdo-1.8.0.tar.xz 42520 BLAKE2B 885a1eee84d040e176a4f9d06e3cd527a6f619c3a85f19f2331b18a84460a102692aec3f3a1a5eff96e9fe858aa45df5ab5785db5c8c71f76cee5dc3a49f0338 SHA512 e885a169e89f90bdd38149894406af368ddd951a17612975a459bd958fef3adf46f39f80c2264a9a2eae965984a8f1f61b36440836780e73cb4e7b8f433335a6
 EBUILD wpebackend-fdo-1.4.0.ebuild 681 BLAKE2B cf241acf23a9f0ed3cb9b0a77b351e1836af881d634f9ede62185a9bf2ca93ec107ff4434f16a303720f7029fd10c37b32e8020fbffd3424ca321cbc96d3e589 SHA512 19b01b03c88022aeed8e377b75c5eabfabeeed854c4dfff4088bef7d91c2b5667430331412291a87719415f2a6ff7a56ee32247cc97e8769026d726b703fe09a
-EBUILD wpebackend-fdo-1.8.0.ebuild 638 BLAKE2B bfccd81194c4650c189b92e56d46523b5805972c7c9398504a7de4f0bea3add2d6d8b718fb137451af18d61e6e990e849f51a1fa236b433fe8c9dee9cce16d49 SHA512 85b0c87489f88f8451800679a5f308db7fcfa18f776acd8c3a7fe02b360ff0cd0f3247551ae502edd0d1446caff2aef22e0aef3563b9c9658b9ac0064db58a78
+EBUILD wpebackend-fdo-1.8.0.ebuild 636 BLAKE2B 4288672053dd6af9a7d1f92f869065ba7ac12418f0053e8e6a66084cf6247ae090faac491dd1103196707a4d84784d39e872fa77a7bf6aacc530fac269f2d164 SHA512 9bff4470bc8ced96051ce070a547efc0db20b93f55248c4eb3dd5f393771f0c0b7797fd47dd8ebafa1151aca9d710425cbf4c29369221c818014e0d6adef0dd9
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild
index dcb700c819f6..56dd3dd78d18 100644
--- a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild
+++ b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD-2"
 SLOT="1.0"
 IUSE=""
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	media-libs/libepoxy[egl]
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index bae4b1a1f62c..7d957bbb86fb 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 229eb0b8a8d9..162c75c52340 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,6 +1,6 @@
 AUX bluedevil-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch 2204 BLAKE2B ec7b389b3bd663f7c4da29c6d4afbc770e6ed2e96c1c6335e1f92b13d05dd77fbcafa508676c27e9759684eaac8087606e8965e8106d55d23427cb63aef1b786 SHA512 a678b1c40cf40659caf3387b028f605d396a03ac08d04b4d74900ce0795208b344942acc1541d3fcd3ef102adc2ded9440f391d4bec501bac5955e108b7fd1e4
 DIST bluedevil-5.19.5.tar.xz 168480 BLAKE2B 2fd4447dde007540e3cbfc0994cc257cf777088582c27bb3af123df3085138496f33ce4cf9c403944de1f012cfbae6e7d72058d9536c00ef735c071da7d20fe6 SHA512 152702f37e46b3b359ff23705dcf347588691d87e1a0cbce940ef557f29e92fd9e129724ab37158b4daa00fdd38d31ad5197318dc09b33d7c834e562b6aff5dd
-DIST bluedevil-5.20.3.tar.xz 159176 BLAKE2B 35a392d2fd31fb8bde50fabaec5f4603e20b1250bd2d240e8a54b7bc147766c9f23873dc07e5303f1927446b48646b781cca0b4631b1ce2e898f7b78838a172b SHA512 6ab7585f5e062cca526cee09f32097eff141786aa8f6f4fda67d5854dd7f6ef5ae5ddec3d1ffd31173a8d3f9de27abdbb2c7ae9a15938ea7965a73437d14a788
+DIST bluedevil-5.20.4.tar.xz 158580 BLAKE2B 586609e809e7dff815e8ff069e6937f49af4b1ec4df92f3c941c5d61e967f7df800c60a6ee1ffe7360835a9b4d5092f12c6642d5bb467cf1bf1f8e68c6daa7df SHA512 732e3daaeba782d6935bd9feb1feb2233e33c6eaf9b2767cb646a78a6aa4346f84cfc5c7cbfccb02df46d8a85035e5f0b1907f296c2a2ddf120689e3cfd0b45a
 EBUILD bluedevil-5.19.5.ebuild 1245 BLAKE2B 443419ed1215b968d0382eb690c3255276b08d876569fb1a2556b1bd26745c2937fad9b1bcce9f34a6fd06b79f04fadb02d3233392f798403e9beab41144022b SHA512 090b68d1357195c6ccf3f0cc4ad1ef8cd8ffd23f7e8ae4499c1ce032fbd316b5b1d0b62ea3b06f09c444cf75ade6fce0966f7d6bf3209a0109fc3f09f5043233
-EBUILD bluedevil-5.20.3.ebuild 1189 BLAKE2B c4dddab958cc71e8e6f360ff367a5a43d5bedf6c01d7408b06bcc980fd2cd5df5e59321f3a1c52c636d62a20bbd22ca6615e7137bb4192fd05fbab30b6094b14 SHA512 ecee305e94e7188dee1e5fdaddbb933277698bb52c8d7c677334ea29148a7aaf85b5ee25e37e8ad7c2c44f137083d1191f73c1823e077fb131b35f3c5740da19
+EBUILD bluedevil-5.20.4.ebuild 1189 BLAKE2B c4dddab958cc71e8e6f360ff367a5a43d5bedf6c01d7408b06bcc980fd2cd5df5e59321f3a1c52c636d62a20bbd22ca6615e7137bb4192fd05fbab30b6094b14 SHA512 ecee305e94e7188dee1e5fdaddbb933277698bb52c8d7c677334ea29148a7aaf85b5ee25e37e8ad7c2c44f137083d1191f73c1823e077fb131b35f3c5740da19
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.20.3.ebuild b/kde-plasma/bluedevil/bluedevil-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/bluedevil/bluedevil-5.20.3.ebuild
rename to kde-plasma/bluedevil/bluedevil-5.20.4.ebuild
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 43648af88cfa..60fcedb47e66 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-grub-5.19.5.tar.xz 3145156 BLAKE2B 5d18ed9699fe1fd5e0d3a94263c25692f4f933066de9b43098f70051dddb11fbead60032c9d28b3fb5960b7f05dc1a2d4aaf6ffe80fb203394d568f09d421772 SHA512 db589b3f8daf4518b517b74110b925319b610251e002c3e28fdd2e0a88d99c2d3108dbbe02257a60bb4b6a3e4b594febf26f7d2448ec1caeaf341d95cd02c0e3
-DIST breeze-grub-5.20.3.tar.xz 3151204 BLAKE2B 583bd02a1e1381c04a6f50ad6007f7ff21b55f6e453bb3a113e2314eb96b274b585d19f4c52196b183f4b854557059d505c1675a77722681a1c5077c476fbeea SHA512 2a6535cc3b52f2dd58c84f1bbe82d9dd53cfc73ccd16f869c731c9a3680e0eb1125cae149d5204cb82c23760ea18ea6fcbd2c4d25a3ac41655a92a39edfab5c0
+DIST breeze-grub-5.20.4.tar.xz 3141304 BLAKE2B 4df906bc4b960dfef02dbcb9d2dac8d7ae19658e840091b56053b54a0f74773147d5ee841eb35cf99f0bf313292a5a756de43ba52b83bc374863fe683fd39274 SHA512 726785ddbe86a81c5dcc6be511cd8e019ece7a1ed18fdcc1a0a49ebf83ea1f0b750896a2d438ed1b762be799d897b9e579e063ca783a40426fbc65660b68cba5
 EBUILD breeze-grub-5.19.5.ebuild 401 BLAKE2B b40427f0cebd7be07839cd83567eca442698d69810c7cbc3e8ce420715978a4976efd2c5f0ae7bd584e6631bf9063c23a5286f10ee93e08ffcef4a56c8b9c75f SHA512 4eb3b349876f9bd17ab398d50b3990388ccbed8c07849c66476eb20c8b93199601e7d8266e25f238c3bc9eaef9d44b1b8de24e08e47344d6c5ea45cb0fe6376d
-EBUILD breeze-grub-5.20.3.ebuild 404 BLAKE2B bc692ae35e7e3ca4229fa86aeec89731c7c6692f3cb0c0464d9335bea80dca0bdbcb7d748cbb63089a6f342a42275f10cafd99e91412edb931bd6fc95eb98fd6 SHA512 a61aa0cef0893e0e419e35b909ebf10befcc0524d063e6fe038607d7de9f97517070273facb24e9f85b2c91a6609795638404679e9091f3c5be5ae06acaadd66
+EBUILD breeze-grub-5.20.4.ebuild 404 BLAKE2B bc692ae35e7e3ca4229fa86aeec89731c7c6692f3cb0c0464d9335bea80dca0bdbcb7d748cbb63089a6f342a42275f10cafd99e91412edb931bd6fc95eb98fd6 SHA512 a61aa0cef0893e0e419e35b909ebf10befcc0524d063e6fe038607d7de9f97517070273facb24e9f85b2c91a6609795638404679e9091f3c5be5ae06acaadd66
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.20.3.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/breeze-grub/breeze-grub-5.20.3.ebuild
rename to kde-plasma/breeze-grub/breeze-grub-5.20.4.ebuild
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 596db01d6af1..d42751b0b7ca 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,6 +1,6 @@
 AUX breeze-gtk-5.16.5-cmake-pre-3.16.patch 542 BLAKE2B 58af50232fc314cbab7f6d47a54bf87b2be75757354f0ad7fbf65e36822774dc96a3d7928360b1c27c7819e7d55253db73f5f883cddbdaf89ca62e94cf1732c1 SHA512 9065680b040447fa84d4f100bf5ed7fdde2631c53ab777abac238d9a319c33d40ac1f111ec942c9f32721363fd80e71514e405cb0dc429e07b80dbbb4233c0fe
 DIST breeze-gtk-5.19.5.tar.xz 42576 BLAKE2B 8874a468666d17318a2fc06ab6dad66e4a6e648bc46479b019e7ead84b29185f8dd334801231b2890c6aec3821172871ce4d9859daf6fd6e83bde23fc7ebc4df SHA512 cb201730ba20745cdf04e8889830e1a5f6ac530435783ca1c01c52d456c650a88f459c871fb6e6b4ef36bc771dbaa4e2d03d7ad08906c910b7b9849678bf9f2f
-DIST breeze-gtk-5.20.3.tar.xz 43224 BLAKE2B a6947a359f5d2030c684d503f5b72f0272835747562f36ee97d9d927ca9ea81cf7afb7ba947affb0cd4e95b80c02b2101831547049881eab3daad4ec935f497c SHA512 29b969752bb2f5f13f3e9db61f3e2c0c793dc1a7f32f9010a62bd23f4337a8d286ae782ee1eb7556641374064a34d23eb99daa3d60369909424cb1e8129675ad
+DIST breeze-gtk-5.20.4.tar.xz 43052 BLAKE2B fb34b4b56f018928faf7dd2f6a83cfd61f0bf1dd5eecd75b997ec940e755e559db94395c00c4d428963afc12f8bfbd765c520fd59d073f2dd5a1d256813950e9 SHA512 3097c3bd389e17b1ec40dd9e20e2369b72da6c2136c3d6bf7aff269b87cd4336e432d68b9d829520c9feb18c78b044b35a1b55bf1a88a027180b7216404142b2
 EBUILD breeze-gtk-5.19.5.ebuild 1016 BLAKE2B 5faa84f7e21350dd618cff01c6d230d7a09cab602f885072059e60703eab11f9542c8c238902160e0db45dff81430fcf140bd96313d29689255b74c2be30946a SHA512 36efa28342658411b75d2abfc734979c06498009b7fe8b2c5d2178c1bcf4879fd17f20baa7c54d6743ef29b72bb77f3d13d017d6f1bc6cb2e39ec6472ec60774
-EBUILD breeze-gtk-5.20.3.ebuild 793 BLAKE2B 932055cc82f2f1f4ba24a8b8652cfa33b4fe0552f928a63334c73d985ec63e38e0b0c869bc0ae3fd9862a24cc31733be07878444ceda9a4a462cf42d58bd8ce5 SHA512 3fba39059fe1286c265a1772964a1b339e6d0bd0df4e4c87eec5ba01e5d565d8c90c971e12a946c095c1ade7a46f32218657d0cacb00247d9b4707d75ab0bdcd
+EBUILD breeze-gtk-5.20.4.ebuild 793 BLAKE2B 932055cc82f2f1f4ba24a8b8652cfa33b4fe0552f928a63334c73d985ec63e38e0b0c869bc0ae3fd9862a24cc31733be07878444ceda9a4a462cf42d58bd8ce5 SHA512 3fba39059fe1286c265a1772964a1b339e6d0bd0df4e4c87eec5ba01e5d565d8c90c971e12a946c095c1ade7a46f32218657d0cacb00247d9b4707d75ab0bdcd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.20.3.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/breeze-gtk/breeze-gtk-5.20.3.ebuild
rename to kde-plasma/breeze-gtk/breeze-gtk-5.20.4.ebuild
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index d3f7088b2d2f..50664169c237 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-plymouth-5.19.5.tar.xz 105732 BLAKE2B a9d0cb4e34f3d5f9bb7229c3b29074765fadcf54424562d7c91b4f56233d130efebfbd263e65b4013da2a3da1b59b7da6d77e728661d1ea5d965c413cb558e10 SHA512 8f0739379c2ddb62b612acf65c41bee57e36d98a120289a1db3245467d118e18f3c0fe67905d990c586dfbe333c47f8671893726ad5ee9c28883d938e309963d
-DIST breeze-plymouth-5.20.3.tar.xz 108588 BLAKE2B c6f99081b484f9c03273592977574ec9baa4962199457e91a4a80b3d121c7466d3315a349701918187f63c15e35046b90e743e80e0801afb0a1b6435e8e48c7c SHA512 ae1f6ffb8f432f4c0c3fb5079accf079dee6d56da1eb2623879209b60edc174f9332897b43e9bb4ece92f27a039d26a3c77d7e42069323e995885ae9143d5c11
+DIST breeze-plymouth-5.20.4.tar.xz 108864 BLAKE2B ea5deca2985becf38f4ab6bf38dac928dd028271827da4acdc1b68eb28fc9392740870e2ba83581cbe09348f08dfdd79cf327e239759f6ef728b54978c354a59 SHA512 7cdc1c2e447e3fd14abd2037b4bf99d3b705597ae85654d4f2102c670c343ff181cf0fc9e416f9890865762235555ad58b9f5227bc2747621cf9b33ce9c7d40f
 EBUILD breeze-plymouth-5.19.5.ebuild 515 BLAKE2B 77e594cf5b75f0cd93105bb43dc9322dfadf3c7bdebe11754424160bc2f4b14037b6e1fb45ef295bfb8a399014911e7b920deb72cc1d41f48f5dde10ac094416 SHA512 db06ff20f3c67c964491cda6050c8c0b8d395c761019e003cd5f6e1492ff5689d9f40d7a4e1f809acea890ab26148205638274a2cc116451bed54a83df9d3c09
-EBUILD breeze-plymouth-5.20.3.ebuild 518 BLAKE2B 500c7078d4feb9c5f45c8731450a453a22c22f327d3e44bf4e82e931ccfe7bb67affd12af9bc83fdb131a0e801950cf4e1cae09aba2e55918addac324d197543 SHA512 8b810c7c29e4b2fad9ec84d459064f4fe87f5f74067c99ffedf74fef75dcbbca5970d8744d78b0e08936ee8f95a36d3dac86bce7864e967a6f21e4a71807a9a6
+EBUILD breeze-plymouth-5.20.4.ebuild 518 BLAKE2B 500c7078d4feb9c5f45c8731450a453a22c22f327d3e44bf4e82e931ccfe7bb67affd12af9bc83fdb131a0e801950cf4e1cae09aba2e55918addac324d197543 SHA512 8b810c7c29e4b2fad9ec84d459064f4fe87f5f74067c99ffedf74fef75dcbbca5970d8744d78b0e08936ee8f95a36d3dac86bce7864e967a6f21e4a71807a9a6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.20.3.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/breeze-plymouth/breeze-plymouth-5.20.3.ebuild
rename to kde-plasma/breeze-plymouth/breeze-plymouth-5.20.4.ebuild
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 00b432a0174c..19fcf6d80d04 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-5.19.5.tar.xz 22761136 BLAKE2B 379a26d103acc718281f7ccdc6d66539c78d77ca9bcbbb0d3c9d86625a4d053f1772b49584a179d38d1c00e14441695b717405898ca6ed9ce0c6e947e93ac172 SHA512 6b67b147c34e3b143e0c4c400eb3133ab15b826f9046ad2e701114f3ceaa1e2d085d864f04c28f2bdc37464a2313c6d8b5983fab5ca9f22ccae90ef1528eb8c4
-DIST breeze-5.20.3.tar.xz 15692472 BLAKE2B 4ba43e37dc78961d7c31055e42f42e385f857e5cdbc2bbcb9918f540b72363082f7fd091fc8e50bb3ed88dd298ea6d244758aa417c97dcca74f80489aeab2b4e SHA512 9e4176935eb9dba2013901411c40165d65dc25231c61f2da51f2038d62c276ffa2333228f8c716f981be87d70934a395deb31c2821c82e9b5697f940b0e6f7cf
+DIST breeze-5.20.4.tar.xz 15695296 BLAKE2B cd0f65dd891e04f7bacd2b279f4c8e6d2424752ff3cad807069009e83dab7f31946ab8601aa93bc57b3be2dc49f3e27de670c7c8e372a8d1f4fc603fb5ab2485 SHA512 e09f1631df0fb6227975304760146743affbcccbe5fd43463384e639400a198faf8322d27a20f49b41a6a048ec765e1af331a8a47a7014a65124c429a29a5c44
 EBUILD breeze-5.19.5-r1.ebuild 1334 BLAKE2B 1b670cb195c476531b5af8c78615b00b48b642c6361d022a9d4763147ddee5b30e73b3cfcd23582bc97eb062a061ee097284bc4aeec54f498aef24d226689959 SHA512 76b8a6bbc9c2f6e70ddcdbb980e284c07a2a45bd985d1a693ac7b44fa1af1162677ea88eb845781298dff97129737ca970f9454bdbc467c0f03aaa9eb96ea518
-EBUILD breeze-5.20.3.ebuild 1337 BLAKE2B 6fb8605ccf005f2e5720ab9289d6d672dd0f9e00a9fe97178172251c28b4709a552d5869e7cc404da35af3a1f2cc021b96a14bea8a018729b90b681e920b2f6d SHA512 f188d671b6c702134c56df166830e04efd38313c43c27dcc97c187b0f8007f861dc58b0cddc8a8a1443421ca0bc49e383ca9d5c28d360ed54cc3bddc31bf7d78
+EBUILD breeze-5.20.4.ebuild 1337 BLAKE2B 6fb8605ccf005f2e5720ab9289d6d672dd0f9e00a9fe97178172251c28b4709a552d5869e7cc404da35af3a1f2cc021b96a14bea8a018729b90b681e920b2f6d SHA512 f188d671b6c702134c56df166830e04efd38313c43c27dcc97c187b0f8007f861dc58b0cddc8a8a1443421ca0bc49e383ca9d5c28d360ed54cc3bddc31bf7d78
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.20.3.ebuild b/kde-plasma/breeze/breeze-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/breeze/breeze-5.20.3.ebuild
rename to kde-plasma/breeze/breeze-5.20.4.ebuild
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 7012adb586b1..a41ce61e163f 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,5 +1,5 @@
 DIST discover-5.19.5.tar.xz 10296324 BLAKE2B d19662ea90f8be4e090e62587ae79b19c072dfac28d90c2bc1476ff4e375498e938e0b76d02487e8cdc64e297193dc62bce34484f81122d827ae0fcc5070fc3f SHA512 524fc45331631a305620f05fe67f780aee2dba7714978f32d9baa0d488185da801ee7a4d11592f2e07dfe395726b0c34d4ae7dfe3abf2b0e7632bdea27a714fd
-DIST discover-5.20.3.tar.xz 10303108 BLAKE2B 7f3577c740aa46b1237545be2b7c1ce41227b74a78241fa50dcf235e9dc17dd6388c52ad0591996549944f32458656566b7cb5a21d3a142e026209382c091bca SHA512 93c1828861749bcb5f0633cc98eb6022cbd2f19a22bbd8bfb1aeca186ea389f044d6116daafad27d2e40151c2028373a75108658fddfccded8c2d4810a11e153
+DIST discover-5.20.4.tar.xz 10304892 BLAKE2B 2d273e056d71b52c4612e1d46c63abc46a4d5c0cc38bf4b7ff47fd3083b7069fc51ee97daa0f6e8912d059bc3c92bf08769ca8a0e0d132d59439b0c18604c672 SHA512 81ee818b0417a0eedb0840038a683ec453a92a412a8b60a14e7d20f5ac2bb73dc98c22065ea11f2bd0488d2fee850af6482285e1c8fa2a1df39ad8197412a8a0
 EBUILD discover-5.19.5.ebuild 2032 BLAKE2B 885e08114d9fa1440380f6fad21f64a816d39776242a2aa53b14d253e17053693e069dae7e5ed62fec03772474c2ce3e690f4692f57abc7be96f5041626f0ca0 SHA512 55bd727d282f46296930d399dec6299be3dd686b3a2cc1c8e87d7816ccae73dd2cdfce5dd200ed55f9aeeff63fbe6cbc7c3fe10986f2838cb3d7a9df76921ec9
-EBUILD discover-5.20.3-r1.ebuild 2093 BLAKE2B a8b6dda4144329eae29eb82df62ba140094fe69eb742b51535d3625babf3973739df1885fe943a3e96713cc2b50018483a0a1442a2cf2e75672f3c0192cd63b4 SHA512 d17b6bfbd7fce92f70931029aab325d11e6ac6c42aa72688c469ff90f76a586ee54f2f621b8cb15333b7075a2d3da6b26beed63933053b7b6e52afe62ab6997b
+EBUILD discover-5.20.4.ebuild 2093 BLAKE2B a8b6dda4144329eae29eb82df62ba140094fe69eb742b51535d3625babf3973739df1885fe943a3e96713cc2b50018483a0a1442a2cf2e75672f3c0192cd63b4 SHA512 d17b6bfbd7fce92f70931029aab325d11e6ac6c42aa72688c469ff90f76a586ee54f2f621b8cb15333b7075a2d3da6b26beed63933053b7b6e52afe62ab6997b
 MISC metadata.xml 468 BLAKE2B cd98862045ebe78aecaf3dc74526afd4ff2bd377816993e2a0aa4d61cd4f14f7b3e5779d5892244233cbef03b9aba6404aa9fe9aa161f2fc868e369df6ea626f SHA512 a8807c50a9ab4b8e9fe2876fe159a3880bbaeb36a84ad7e7fed55cf6367b1c17ed7e0af135a579685bd4a5d8b550f38b240ac31c00e463befc22de35fd67b2ff
diff --git a/kde-plasma/discover/discover-5.20.3-r1.ebuild b/kde-plasma/discover/discover-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/discover/discover-5.20.3-r1.ebuild
rename to kde-plasma/discover/discover-5.20.4.ebuild
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index d7f0aa6d22fa..7c8c86d8dbe0 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,5 +1,5 @@
 DIST drkonqi-5.19.5.tar.xz 744412 BLAKE2B 54840e9fab41f09c6184eb29e3e7bfb17d08a76966b7bb9776f1f044671c61073bd38ca4b8f96c6c3eb4a534871550363941cf2fd94a177f770caccec9a3339f SHA512 0dcfcb5018f1024ad751c234f7e67b865f06c8e8bf5a1a95a160df2af97730ca111f4cc8614da646c8dbe042a206d3d4be214790abcf617ca454582161f0aa24
-DIST drkonqi-5.20.3.tar.xz 754608 BLAKE2B c54d704278d0ec6e4286b32dc020e634936a073d709b30c49473f80c6c308fcf78a1cc099a3a7b0af52b2c04c77ad626d4569efa1fef095229ba2aebc3038505 SHA512 0efbd66035c2acc749cabfea439e286e2934b11ac7b957c729f5692b3ac236a9eab992742fd721214578cef7807e4306b13c8bde64acb4b63f0df30c332f46cb
+DIST drkonqi-5.20.4.tar.xz 755840 BLAKE2B 7abc2f2646062842b4a931c5dd2ea98d79f035c958ed70a79745078b21882e70cb02dc80d0bab9e3eb77dbf8c1e5454b65d9cb4997d121ee43decfc32d9a0180 SHA512 a0d8e619acc01633f99cc53e827b160027ee974b60c19232764066f7b286a6772710a5e770da97f4e3b0562f0024f6bc250628006f0f459ec01ed9edb900bddf
 EBUILD drkonqi-5.19.5.ebuild 1641 BLAKE2B 1277c750214b86b6419ef30f07c07d88f014dbdd7613707f280dfdbead0c6dcfa613f35f794c6345ddf52035fe67c58385bff763e3ced75b21a58611042ecee8 SHA512 8c0056c6b8ca5091d8ce4edf71a0f3506d740f7629c3dae4c4dd996e3a48d136a54ff3c79b8626da0312ec9bf4133b69a2ef6553b14b621f19683f84907e815c
-EBUILD drkonqi-5.20.3.ebuild 1644 BLAKE2B ca4da4615321276ca6f454a75052ee5995f14345f339f62aa1c2b772cf53e7dbbab0e2073084319a5e13e4423ad7a29117f58217d8bacc451dac3ecd20157282 SHA512 29a125ad3459a99ccfde6ddcc5e5ff5ca89848489f3dc827adbd5d86d925915f4d31323aa2ef51b1f76d82df08df0733a9eb0b151754e968b23015274836f622
+EBUILD drkonqi-5.20.4.ebuild 1644 BLAKE2B ca4da4615321276ca6f454a75052ee5995f14345f339f62aa1c2b772cf53e7dbbab0e2073084319a5e13e4423ad7a29117f58217d8bacc451dac3ecd20157282 SHA512 29a125ad3459a99ccfde6ddcc5e5ff5ca89848489f3dc827adbd5d86d925915f4d31323aa2ef51b1f76d82df08df0733a9eb0b151754e968b23015274836f622
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.20.3.ebuild b/kde-plasma/drkonqi/drkonqi-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/drkonqi/drkonqi-5.20.3.ebuild
rename to kde-plasma/drkonqi/drkonqi-5.20.4.ebuild
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 9af04e8c51e6..e05ef236a40f 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,5 @@
 DIST kactivitymanagerd-5.19.5.tar.xz 84996 BLAKE2B c5dd47d35fc1bcb5a1f64ed0a60d96f85398372d481927511269abe98512ba38c1128fde760dacbdf044dfca1b52eda68aa3558cab2b9238a0c957bb0edac009 SHA512 884f839c68b94da264042262b730baf81ca4b65320daa2b4de2ecba0698728600f25de77feeb6ef69bc9d98b06e827d8ce467fb9d7b54807442d7d9cf2b9b9a7
-DIST kactivitymanagerd-5.20.3.tar.xz 94756 BLAKE2B cebc08a10bc283b3b67db953ccb63e0686ccd62d6fdf04d2554bf1c94e021e4da8461eea410fda8b8a7d11341b09e22dc255c113999242d7547adce5e42d9d60 SHA512 ecfca37a39a2de6594818f85f42d56e12aa9b088bc85a88550bb092ada62a91d4818db3cf39ec4b69288865cc126a4fcf36f4c02f3fd5bc9c2e9e9c9cd06c1ab
+DIST kactivitymanagerd-5.20.4.tar.xz 95172 BLAKE2B 9eb6e7b2ff2de866a4f93ed1d38b5abf9d04631d4f24e37a2324d538b201fd76b4ac3b75ad5e58b62a53b6d73d59548af914e540f6a3ec7bdd098d286ca2f227 SHA512 172f69726a4633e177a4323ef38aa9700c3244869f581945c65d609f2395d7508d9bd354734d2954cb2da7ce3f7d028dd9857b741caaa8d03d0d1730e19759ac
 EBUILD kactivitymanagerd-5.19.5.ebuild 909 BLAKE2B 0ffe727777c14ef0e5b0c7a5b039d49dd87a32f0d2468741f3bf7d4fa29cd96e9c067745043c8451ae536a1a6aab7486e4694428edbda97bf9a41c64d2074d46 SHA512 c0810c97c98f1cef8351494c3790a9f7484f0242d8f48d1630f76cf6f05b61f9ebabca3e414e3441c637bd01734fb0a5da63cafb9e4a3c2f467e42d9447808c5
-EBUILD kactivitymanagerd-5.20.3.ebuild 912 BLAKE2B 66448bba8ebf1dbc0d373b1b60b05cf967e4007a816eef1a040219690bde7890fcb4067b503d44eb59d9a93f28f1b892f9bb0b636148d48dd904e5dee261e75f SHA512 626b6c7a3122441351eef8ef4da53ff438464c752fc31f47c87cb209181baba7cc248180587c514e86729c6b17af4df5b8f36881360d9c5896c30cef0f2e4465
+EBUILD kactivitymanagerd-5.20.4.ebuild 912 BLAKE2B 66448bba8ebf1dbc0d373b1b60b05cf967e4007a816eef1a040219690bde7890fcb4067b503d44eb59d9a93f28f1b892f9bb0b636148d48dd904e5dee261e75f SHA512 626b6c7a3122441351eef8ef4da53ff438464c752fc31f47c87cb209181baba7cc248180587c514e86729c6b17af4df5b8f36881360d9c5896c30cef0f2e4465
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.3.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.3.ebuild
rename to kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.4.ebuild
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index d74ed9c9b53f..6f394351d4cf 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,6 +1,6 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
 DIST kde-cli-tools-5.19.5.tar.xz 600580 BLAKE2B bfe77d7d5d9528b3b7d089341afa1cf48bd05d2b82c596a85eddaa197ec9ddce4c83f223e6698979b10e764f4468b3a5bfc94777400d8aa927227cbd0508c975 SHA512 9e8de408643caad7c0de52cd348c35678c92b478587a2e7fd6b0cfd1d93dd578d9060c58b1dacf4b0143840d61860b51f41b53b7c2349112b855c9bad3c9b897
-DIST kde-cli-tools-5.20.3.tar.xz 601248 BLAKE2B 926e7a1d9f806f85b26bb30242947f7c7a21ea1ef38e72166124c1924edc4a88bd514f9ea2455e07167a8064a3deb995d2c1bb2802796cca5307e1185b91fcea SHA512 0fd55bc416efcb247a7262029040efb58d515a2a12906b69f92895a94551772eea4ee31261ea9cbdda374eff40bf78a97865850e41cd7e7542d092b57f795aed
+DIST kde-cli-tools-5.20.4.tar.xz 602460 BLAKE2B cd3774a6eeda4f671f7c53e5635b02d2575c2be6b692c9ffa8d2036d19206a0a793fb7ddfad2487220c1682e83a1e59ddcdde037e30289507dacba94e1062745 SHA512 eac9dc35f5ee11d3525fb0a1de826623183180e69aea97fd767545719db64c28ed08b0471e6a5ddfc16b761b7cb09c417cb6ee24d6dcb8cf8a6a8942c3924ef7
 EBUILD kde-cli-tools-5.19.5.ebuild 1723 BLAKE2B 9477d1d27efd6aed0ba74fe6847d8cc1caa543b7cf02b0425dac1ba3c3c308303cf7e2d5ecbc969f2a0a08d2acfa8127f4cc3e4b4a1a3ef0b1743b1691941aa4 SHA512 281271bdb6ba3f1da7bbdc25ec620442941058e0650ca47817a8076d41e5de9780999448a465ae37002eb542d61a3fd9c158ea939764c450d1969a5509128c15
-EBUILD kde-cli-tools-5.20.3.ebuild 1726 BLAKE2B b916cd4cfafd374e99e1b7a3451886f6ba1a7c837e0b68a388b64bd7d1346910621fcdfd724667c9c4be202c62ea8c502dccf7123d9fdb93e57d5fa0c11c2a14 SHA512 8f44a7a97e3de16a0ecbc56a84a35cd936470ed59ac402e042488e55f79683dbc711261a3c2b41a8fbcb7c8e2ac137d996ed71bc3eddcadf723183925a1bdabb
+EBUILD kde-cli-tools-5.20.4.ebuild 1726 BLAKE2B b916cd4cfafd374e99e1b7a3451886f6ba1a7c837e0b68a388b64bd7d1346910621fcdfd724667c9c4be202c62ea8c502dccf7123d9fdb93e57d5fa0c11c2a14 SHA512 8f44a7a97e3de16a0ecbc56a84a35cd936470ed59ac402e042488e55f79683dbc711261a3c2b41a8fbcb7c8e2ac137d996ed71bc3eddcadf723183925a1bdabb
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.20.3.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/kde-cli-tools/kde-cli-tools-5.20.3.ebuild
rename to kde-plasma/kde-cli-tools/kde-cli-tools-5.20.4.ebuild
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index e91f68d5a2c4..48377febbb17 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,5 +1,5 @@
 DIST kde-gtk-config-5.19.5.tar.xz 26224 BLAKE2B c55e69d3447179817b0a152b837843f97eb3fdf7e337b1cdabcce4089532a23609777fb57aab1615aad70369d5a22b2707c5eaa10783500e3ae33d57cd868e2f SHA512 d9875fc1af767b7f318520f386a62404779c33312eb5bad1eebc924a36ca05d822cf219b56548cd050e0965b0dfd581b5fee533a77fb5d745e51f63b350ff79c
-DIST kde-gtk-config-5.20.3.tar.xz 67992 BLAKE2B c340c7afc56ea4e37e7ca3d3de63cc0238356e2cc80a3c8628b9d74285dc6cfc2a53907e5c9c0d4c7b597d330886ee113a711f54d22068c53c8e7ebad52a67af SHA512 4b6aff87d72c031ee57462eda01d20dea1aa760daaa93192e754c8781026d2879714c5fcae1fe62d4af66cb649c52e38065722a24ed90157641bdb9b92fa0fd5
+DIST kde-gtk-config-5.20.4.tar.xz 68052 BLAKE2B a4ebbf73a806948d062fbd5cf8ea3552602e583e537e9db11988c77bac7f25155fb2c240983dfaeae86a33daa18a307ac09154a8f18ee6dac310ba21ecd080e0 SHA512 753a0151cf0b010852e1ce013f74e264d2513f8fe47d3d4f139e3eaf54f4dee99ab73d46fc6b1fada8dab37baa15be9a11093706b4e0c5ae7a17eaac5541ed5d
 EBUILD kde-gtk-config-5.19.5.ebuild 1189 BLAKE2B 5dd189ee2135920e6bd5133139a27819959c9b0e4840e48839968e218a428e6a026d713a234b71fa8b9de7526a52e8c56f4f5b0413e9ca3d9b0d4b85ade4d57d SHA512 9da0e6205029ad1d0ab8a4dbe8d8a2b448f88890adecd7ab43e98b15528f5edb128d3af7f0d01b95b7e8f8bf3d1b463c7ebf0397544ff62212de8c53b0eb492d
-EBUILD kde-gtk-config-5.20.3.ebuild 1322 BLAKE2B 230fea630976af028a8dd4f9938a3e0722debcdd80062f14dc608f9ab36bf2690d9ef49e05a56257f12cd78c654d1535189cb105c697084ac7b8a1e2472b4425 SHA512 5f3c3a50d9ffb64dd07e57405994e557e01a9608e3e0a3076bb2eecea3f750fc1575014a39eff2306150ee7f0eb4a560352de699c5cf26f53e2f2b2146706a07
+EBUILD kde-gtk-config-5.20.4.ebuild 1284 BLAKE2B 71f8e61d1a4da2c6f32a168f061b6a178e0d8c52deec5409f5d5f7dbe6bbe6304bf5a43d10fab9d513e9896774b3e21c2e8bcf4075e7c0c34936449acc254f77 SHA512 127ef5fd10612eb686cb18417e491e5961ba8dd4bc4a9049021b03d1d4caa32801ed8849a8edfb8e398b4761e1d3879a3d679cca043043674ef52e853bad6c0f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.3.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.4.ebuild
similarity index 97%
rename from kde-plasma/kde-gtk-config/kde-gtk-config-5.20.3.ebuild
rename to kde-plasma/kde-gtk-config/kde-gtk-config-5.20.4.ebuild
index f061fff0a222..41f4752b6089 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.3.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.4.ebuild
@@ -32,7 +32,6 @@ DEPEND="
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-plasma/kdecoration-${PVCUT}:5
 	x11-libs/gtk+:2
 	x11-libs/gtk+:3
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index f2a059c15be7..00877891a3c4 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,5 @@
 DIST kdecoration-5.19.5.tar.xz 43832 BLAKE2B 7d72c6014e6893f194c3c1faa2cab0cde122ed51e39006c95eda2bff247601e54d973cb2ad7ce6a92bc410db288396e279efb5b15c911d7008d47d566e9b504d SHA512 74ce5ed6a071ebc484103a2efbfbf3f2f624852dc00e141ced85813571bffb351f832dd6162c1c672274006c7bf2c7b64d59e5224f5eca6d17cd3e3a2e35151b
-DIST kdecoration-5.20.3.tar.xz 45600 BLAKE2B 58d2ebfdb60ab7866d861e66ce0f67ea30ba4c28f12d7af59c4a140c4ffb8dae1b24909fb43f7ddc8186ec8e4f6043c65cf67839cc310e87709dd96fea3cf1e1 SHA512 602ca27b093520d4e42e510ba7da2ef1bafe0653d6b7d48abce623bc2628d19fbb9d11b246e038e7562d58a1302ff2c0df13459b618bfdd66fc8efff66832b4e
+DIST kdecoration-5.20.4.tar.xz 45516 BLAKE2B 2044c72d710e086fe652e044ed7701cf581c598368204ca4e10ce9954cd347b177e676b2ccaa04533261eca395acb3d51fce748825ccb43da53de4f92b448612 SHA512 0102144eb64998f8bbca969b7c77e0b04d8562651b6c9905cd9f35f8252fc1e7e943f5cb4705e6f82636cafa5bff608e3f82930aa8638f963c1ad34b5d766796
 EBUILD kdecoration-5.19.5.ebuild 479 BLAKE2B 384f16ab8b0c5570039e645d020c66f7dd1888dc3c85a729f6502cc6f4fb29cc25b6af3de43cd32aa1833e606d4474cacc9f769768c3beef41c5f850f8b10003 SHA512 2fe4ee5c8c65275957344333c4186bbbb7ad5257b94b1438bf2414b551caeea0cb3adbc2f5f48b2f04687bbe00d7b6fbd9eefb086ce065dc13f4a1f3b84d5ccd
-EBUILD kdecoration-5.20.3.ebuild 482 BLAKE2B 61264c6a0279046b16aab4aaa08999de7d2fbd2784aa23e1fa9d83d1785014d8201b327e064474ff8d27be77d2fb8080a1be43c5fd6bac5bdb6cfb612e132954 SHA512 8f7bb75a6e4e878572da47f495d3264298dccc1895f35ba5dc98caa490be3f1f9ab8dc8728d6b3c5ae67d28844576dc32e7e26fb836654b77f2db4a1cd48aea0
+EBUILD kdecoration-5.20.4.ebuild 482 BLAKE2B 61264c6a0279046b16aab4aaa08999de7d2fbd2784aa23e1fa9d83d1785014d8201b327e064474ff8d27be77d2fb8080a1be43c5fd6bac5bdb6cfb612e132954 SHA512 8f7bb75a6e4e878572da47f495d3264298dccc1895f35ba5dc98caa490be3f1f9ab8dc8728d6b3c5ae67d28844576dc32e7e26fb836654b77f2db4a1cd48aea0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.20.3.ebuild b/kde-plasma/kdecoration/kdecoration-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/kdecoration/kdecoration-5.20.3.ebuild
rename to kde-plasma/kdecoration/kdecoration-5.20.4.ebuild
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index eaa60711483a..9ee0ff6b5daf 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,7 +1,7 @@
 AUX kdeplasma-addons-5.19.3-kross-optional.patch 1956 BLAKE2B 922b8e73147439a706a37fcec29dcf7fb424e8ceaa8bfa1e4e54ca6c5851cf937318ee91654bf5cb352b80076aa90c9063ec07b02c7fbade8613f3d560178e86 SHA512 f9c87b27b0e8d020519259fda8df118266dd11b589873a3a8a5b4bcdf1e77e65fad29334aee80717cfe208c54021d39caee36533d144538bd80b5c1618cd36b4
 AUX kdeplasma-addons-5.19.5-fix-potd.patch 2485 BLAKE2B cddf302e5956c3c215c51c08e3358083b02d27038b6e46a345881f2ae4b38c7af3f0012ca300fbe9697bcc15165d09bd0596f91f743dc6cc6bc7f4b286a85951 SHA512 5ef0b40c381bdda5a701240e4622df2044ccb68093b2d0853671db9d6de7274f28723b799d4552e2a99d35e67c232d26a0e1a24939bf02c155366c050a0bce6f
 DIST kdeplasma-addons-5.19.5.tar.xz 629136 BLAKE2B 992df5d362aca213531cb96b8d01a3c2792ed91562d4f6a7f71e8b50ba6ee28cbd6501b75c7c91923b6afcb13fdf1b385189f718d8cebb482d1cedd040f67d94 SHA512 93de717c623605ceb9fdcedecdf656030b6e9bc360ce834ea918403f64f250029e9a2406bddc0b324e4738006d4ca155bc509f4a7d40c073a2aefb2017db9731
-DIST kdeplasma-addons-5.20.3.tar.xz 634740 BLAKE2B fa7141863c1aeb3b2c5d43af12eb67288b67030a76f24e86be73f7b1cadd461151a4c54a6e9ac5bda2a8d1cf63530d1d83a6812041b5d683485592e325de2359 SHA512 e1509b547cea891af84c1d5d1a2bc3232a0039e4a96852d4da898eb83381bcd5403f6bea5d8bed2400f5c77d74dd3c82bc00b05aaf69396df7d964a90e240347
+DIST kdeplasma-addons-5.20.4.tar.xz 635732 BLAKE2B 3f5f9279683d77b8c721ef0e5931fff7c204043ace0ad34afa922b8b5ca01a02744acf95957cc47bb0d44a6554ed46da49849bd8dd6d6ef18026f4c5b5652cdd SHA512 62508aedf42488abfd4237af19b92bc8a24cca7dae6c9bdbf0e3f3f60f8fa6bb207e88bde0fa9d9e2e44a0de0a9d7c622f187e84579b3a3228430706a0498048
 EBUILD kdeplasma-addons-5.19.5-r1.ebuild 2182 BLAKE2B ad22125c6d0d678ca69b404131c9472057f35f13867a0268ee2f4c0139a12841b37b1fbdca11dad1f575436a26769fd4d24b416cdbeb023ebfb89c4c58bfa186 SHA512 0e9e5d29a0a6dbadfb4adaad2ac6f7776b441463236680e7ce6e8982eb3c315b1520df3a78852534d1c62a78ce17bab8dd55307ea6960e60acffedd905309e32
-EBUILD kdeplasma-addons-5.20.3.ebuild 2123 BLAKE2B 91c91591fcd5e923e652495eef9f6db3c7d68dedafcdd86a3b3b3513f68d111480868bd2033dfecd0a4b3231f70a75dbb936ea69b8ebb2750f4cf2ee6dcb9a02 SHA512 8874430e4c50ca99e55a15cdbd8ea7ce1b8550ccdd5287bb9c6434db5ccfd0c103cd5b4d10500fda16eff970991715ae4f36fcdc016fe7ab4de133dacb6168a4
+EBUILD kdeplasma-addons-5.20.4.ebuild 2123 BLAKE2B 91c91591fcd5e923e652495eef9f6db3c7d68dedafcdd86a3b3b3513f68d111480868bd2033dfecd0a4b3231f70a75dbb936ea69b8ebb2750f4cf2ee6dcb9a02 SHA512 8874430e4c50ca99e55a15cdbd8ea7ce1b8550ccdd5287bb9c6434db5ccfd0c103cd5b4d10500fda16eff970991715ae4f36fcdc016fe7ab4de133dacb6168a4
 MISC metadata.xml 567 BLAKE2B 5009c2a6fd74956562b1b3b33322a457a0d295ae472f89208c3756d9847aed9f7b501d0a7e135e95c1a455a57f65876dca71e94446043b9b7d3dc551d58da854 SHA512 2e2fdba9c39b93e082b24d38b1134245e682b07a99b587c9eb6060aae318dd10d08af661880df478a1a97a23c46f1259a4753b9b6169af6af75babfbccf1c7ce
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.3.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.3.ebuild
rename to kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.4.ebuild
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index f579c5f553ab..84e946e93168 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,5 @@
 DIST kgamma5-5.19.5.tar.xz 80752 BLAKE2B 33280fb2b7856d7b6029e7c05323897a393ca2a1d86f8951327e237cdd29b22f07b64a46ffcaa78093866036c09324605b485fcc103e144b5aa9ee4116e1a338 SHA512 bb758ac5a4ed21563bcdad3eca07a822a8bdebe5d5cf4862f92f2b38dc9a8fc4b15b8cf0e96d6a329b969eb36064c8723ec432a044cecf1c25fe43853cb8f567
-DIST kgamma5-5.20.3.tar.xz 81444 BLAKE2B b5763ca5f0c1d20a3561a2a2ef277e314b869627d96c680febe336697dd3245180fd35c3ee99df08cfae6ce5ab938f6af7d6ab82c47a92d93142fcba81ea56a2 SHA512 d2a9f9afb0873c4da1baed33e4f128ac19a00980ea6e6c3bf5b498e846706efc843fcca16bdfe505ad852ff1953c7c9ebf00a934e573a8ecd6b392ef9c5b9c84
+DIST kgamma5-5.20.4.tar.xz 81500 BLAKE2B 037fd377b3c863098b2bb21b934f0ab38e17ec16564eefd63050c377d3ed32c940e9746112897f0912ee20099d746f8c3a7005692ae6b184e62bdf948b455ecf SHA512 e3f20ae39168688ad3054b2418c195fbeb2a960ee1dee299232afabe2a73e73bb52b73852de6280461d0664b2be6cfb0dea886132934f1112cffa5824f5b6d9a
 EBUILD kgamma-5.19.5.ebuild 677 BLAKE2B 2c3b13deef596a3f1b9b7b4a211e0903d7ac7aae05bfdf8f301f08955e95eb7b2d10827f309e10007f29846eae9abf803c2b3eac3eded9c3a12ae3eab4be9557 SHA512 6016baa4a43307b102666c57f12a8329541578bba5609c8baf7a3d7d1a564ebacefa0cef2bcdc6658cb981916c71b8b287a2e4d04148a3048f35683bcdb71f95
-EBUILD kgamma-5.20.3.ebuild 680 BLAKE2B 54aa4511a8e88332610a32b075ccf4d48c1db11c89753329ab02d1368b3c15070a261ed6fea818d2ea5d1f4673bded3c66d740801546776405a01d083f480d60 SHA512 c731bf61cf1c072a8e67bdc8d0257407e8842fd2431f5040423418696b4051c08163e416d101717a34774c7aba8fdaf7bd3cfcef30b6885a95ee9a7950ac27ab
+EBUILD kgamma-5.20.4.ebuild 680 BLAKE2B 54aa4511a8e88332610a32b075ccf4d48c1db11c89753329ab02d1368b3c15070a261ed6fea818d2ea5d1f4673bded3c66d740801546776405a01d083f480d60 SHA512 c731bf61cf1c072a8e67bdc8d0257407e8842fd2431f5040423418696b4051c08163e416d101717a34774c7aba8fdaf7bd3cfcef30b6885a95ee9a7950ac27ab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.20.3.ebuild b/kde-plasma/kgamma/kgamma-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/kgamma/kgamma-5.20.3.ebuild
rename to kde-plasma/kgamma/kgamma-5.20.4.ebuild
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 4fa9f006c966..6fb354b9a2ab 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,5 +1,6 @@
+AUX khotkeys-5.20.4-unused-dep.patch 780 BLAKE2B 82fe708c5e56a2f848dffeba923ea21f1661888d985a63d399bf79d8ab0fc502a7c85e1702b540cd6f5dcead1befc899c7fd3ae0c57266ce63817c12cc2e84d4 SHA512 6ec31bfe5b0f8cf21ae5e35b018829f1b88fbbccc39c27aeeac4e2463cf6c766cf9a5c51d832d7b06b14b3fc2cecd76ad5114e52672e0bd6b569034544caf963
 DIST khotkeys-5.19.5.tar.xz 1855968 BLAKE2B 464797fce42a50313c187743a7213b870af805aea2f75e0e3564e81fec49c334f9574515b267a1acd57dae1f7e8b6e62849ce6e554db52bd452bcac05374660b SHA512 c7832ea7cb2890cbdf9d160b1658a393e105903e54b87cd10cf00f5bffa1b240e70685a201e2b4d580b4083e903770a2b26fd65f68f05302798320e7f20103be
-DIST khotkeys-5.20.3.tar.xz 1856500 BLAKE2B 707e2f0d49ebb16c40b038698fc55211008a6f13c704b43103ad6e1c7608ce092c8cd95ddeb15aaada28f7b0e704a30ad2b59688e3562cc5a952d64aec83acc0 SHA512 dd1439d7d9ab7d13ab657e8e1f13a0ad343d62a2883f2b483972c39de82b97e4cc7a71ba1ef3a82597df9ee151b81064d8681880c80f5191fdcaac3ddec6acdb
+DIST khotkeys-5.20.4.tar.xz 1856300 BLAKE2B 914e5eb1b06a8f098c8b35b29d18326db25af00b0d7206f20b29da8c7b6dbae39f631a9f18f009a8937e95fd2d1813a97c2a51b22dad64d9249ea7942b968fbc SHA512 2547fe40a7b3868491a32993b3a7332cafd1a7ad49ec158dc6c88437a45642562d542fcad9b98b37046452d5096bdfd66e26ef1ac44d613972df57c7c97b057f
 EBUILD khotkeys-5.19.5.ebuild 1430 BLAKE2B 91463c3d1a6378a0d89685cbaf7aa99b9b3eb3d32e22c10f3179bd5fc546118f187b5e75dd7af00d54571cc8cb4d5521c2e7b011b6525220d1d11bb68aae6e33 SHA512 5da2a34138e88fa67ab3a6d6557e373ef610681aaf4358900f790172c7fbd59e7589ef016a2f9bbfef21ac7b802c2a057b853630bb5c738d423caa45ea215950
-EBUILD khotkeys-5.20.3.ebuild 1310 BLAKE2B b3e0a4cbc35ba03683ffaefe441a404d1788f72054b64172e50a7fcca002fb8a437e6721eb8c2ddf17a82c08f7c4e967d6e4ae9e6ff3ca26672a8239f509dbe9 SHA512 dded081aad7e408c70334272d35e24f238b4c6e78bcbf7d22b84c3a42a79b08be6ce8117804d140d5bb1838d0c7317da49fc5f5668a7c9768e6fe8b465ab2014
+EBUILD khotkeys-5.20.4.ebuild 1406 BLAKE2B c443c360a81057b2ad4bd4470e49d7bdd235b59d21b62b2a4b2621d1083852f0270972c5fcd238f8046fdd0725a6b493075acae6de01edb303d85e02b1a0186a SHA512 667021cf4323416c61978cd1b6be150fe12f2767c526610f58385cc62a8dc7a032dd3b41e4c8b284c7a1ef43d6c22a839c86b2309622eff001e6c755b87457f1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/files/khotkeys-5.20.4-unused-dep.patch b/kde-plasma/khotkeys/files/khotkeys-5.20.4-unused-dep.patch
new file mode 100644
index 000000000000..6d39c5465791
--- /dev/null
+++ b/kde-plasma/khotkeys/files/khotkeys-5.20.4-unused-dep.patch
@@ -0,0 +1,28 @@
+From 5f622844605a569eec776f3cdd0954ccefd8c99b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 29 Nov 2020 11:55:10 +0100
+Subject: [PATCH] Drop unused KF5Plasma dependency
+
+This had been already dropped in commit 1d60f46f, which was reverted in
+commit 8ba8a29c. At least that part of it was correct though.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a945dee..b49bff1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,7 +32,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+     KDELibs4Support
+     DBusAddons
+     KCMUtils
+-    Plasma
+ )
+ 
+ find_package(X11 REQUIRED OPTIONAL_COMPONENTS Xtst)
+-- 
+2.29.2
+
diff --git a/kde-plasma/khotkeys/khotkeys-5.20.3.ebuild b/kde-plasma/khotkeys/khotkeys-5.20.4.ebuild
similarity index 93%
rename from kde-plasma/khotkeys/khotkeys-5.20.3.ebuild
rename to kde-plasma/khotkeys/khotkeys-5.20.4.ebuild
index 53a2ae627eb4..bd5786697a71 100644
--- a/kde-plasma/khotkeys/khotkeys-5.20.3.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.20.4.ebuild
@@ -35,6 +35,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
 	x11-libs/libX11
 	x11-libs/libXtst
 "
@@ -47,3 +48,5 @@ RDEPEND="${COMMON_DEPEND}
 	>=kde-frameworks/kded-${KFMIN}:5
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
+
+PATCHES=( "${FILESDIR}"/${PN}-5.20.4-unused-dep.patch )
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 53eb530c81b6..2245efdcf6dc 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,7 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.19.5.tar.xz 1265760 BLAKE2B 3af323d32e07d310aa224f47c292ae03748aacea0d7cf56770e5a301f9698d1767159f97e0d43733d9a09d6cfe56c41a4a44f988e3000a1dfc06f271accef0f4 SHA512 732d6111f59e099fb032966667b6d7907e607939884714a95f0a2e48903f8a0d7e2331a87611ee058a4bc18bcb012c92040415812243fab4d618a07f2e7dccaa
-DIST kinfocenter-5.20.3.tar.xz 1287892 BLAKE2B 8e756448e64b754d82211ed504c7fc0311b13d98a10aeffe8dc3fde37d29c48aaf05cce0c603389f799f297ee1c668b91865ba5d590f879c6a897499faf253be SHA512 c165d6fcd210b14acd7f10b901c16b0c367aff92a003fb4dc8ed255852a51f5ab28d12f7042d5baacb6aa1116a5e0a866c11b59a1310ee7258bce0b6393edcfa
+DIST kinfocenter-5.20.4.tar.xz 1286324 BLAKE2B 969a61a75dc6b1314abdd0461fff462c0099a2d7d73620af0a2f1d0cfbf86ffd8eeb1c47f31739d6cfc852b39ec4124c45e423dc28f3c3ffc84269b8d179adda SHA512 3ef08b9e2f08b143897e95b25ec302de8f2a5badd7db7eb854bedcb501a5f8f53cb151b27042e709c6269e963593e0eac4956c6fa67ce572fd9dfb565cc344f6
 EBUILD kinfocenter-5.19.5.ebuild 2760 BLAKE2B 4bb04ceca0ade7cf3636d3400c421d8f1ec2afdc874c6756f771f9fbeb1812776a051a709d36e170b18080240e9ff420975beb1cc8b2a46f8cf5f95d6b879057 SHA512 2b5f78e9aed13a248ed1f82d6db44fe262ee0737de76929f1236b90b25c486c1553a6197f06ac478aba1a44620d5526bb5623bdade1a44ded68897007310e810
-EBUILD kinfocenter-5.20.3.ebuild 2726 BLAKE2B 4f7de3153fbbac983fcbe1655bcad8426c134fc48ad795afc94c8ee06a6bfdeb55b2baac7c46cb1d84b1c9b9c667fdb0f276f782e79f4500302e0743472d8530 SHA512 99459f8c81df94808c55833c30307e6c252b6edf8063bc851becfed832d13018f55895a2f047e4240b80a35e0312e1f76a7543a42063130ec1260c2ef9c89ab8
+EBUILD kinfocenter-5.20.4.ebuild 2726 BLAKE2B 4f7de3153fbbac983fcbe1655bcad8426c134fc48ad795afc94c8ee06a6bfdeb55b2baac7c46cb1d84b1c9b9c667fdb0f276f782e79f4500302e0743472d8530 SHA512 99459f8c81df94808c55833c30307e6c252b6edf8063bc851becfed832d13018f55895a2f047e4240b80a35e0312e1f76a7543a42063130ec1260c2ef9c89ab8
 MISC metadata.xml 320 BLAKE2B a0e83642729b42cf0f6e8b5aad1937770df05aa01ea26d98a215a9a4f7534388f6b6992d1d8e7e4bb2b90007778d755f6b789fd80f1da316a99486a9ae35f9ec SHA512 5530f3ad6ccb8e826c297d0ed4c9d9197e73bd79ad428050f4c1ddd1c09136f34d1e8c48b1b87a5594369568647ea70972c78c6f1eb4b2936113646a858e6c2c
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.20.3.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/kinfocenter/kinfocenter-5.20.3.ebuild
rename to kde-plasma/kinfocenter/kinfocenter-5.20.4.ebuild
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 5ae7bb12289c..c183774ac1bb 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,5 @@
 DIST kmenuedit-5.19.5.tar.xz 896836 BLAKE2B 35e921a58856a3ed63f5ef912b06d3db1670e6e7e278d2120aaad69964a2fa60f536634d3b0dc3781a6b487df5aa948eec4ff943a7413f88dc1f9f40010a36d3 SHA512 332fa310a8a4d0c792e05db5427d16b3290998f0da5c7184d674d8104e8079bff51065575a98f61b83899df6cdd7f4be6daf0a5dc014f30bf1ced49c896e1241
-DIST kmenuedit-5.20.3.tar.xz 893664 BLAKE2B 49e0ab06561e7d561f002a6d2a421d130365d6a38d561a07bc166460f8707ae362ca256f3dd466a438c33b00a579e7b95077fad4409f6dc95c83ba70d6f70bad SHA512 bf3d32390d944096a83cf2f7064ac56d677f036cf2f5f57b384d97f940228b0f006c69ebcace1821f5c0ffc4f18115740717136b913991e9dfcc63c2187d89f5
+DIST kmenuedit-5.20.4.tar.xz 893928 BLAKE2B 8012d6f9e76d8b1c32a088866343553c32e3ef757d8041c4550e5e7fa39d395dc5e932aea24230ddc2e28c59575f9cf63956b09b1d355702f16bf4b18b3c9b76 SHA512 69c7f6cd557bd81063ba5c47f4b1e5361bcafa6a57a181b3004ea431125adb47d7c351f5e970d6917a0c21211b2948aac388fbdabcd61377b5fd8ee92c7d8ce7
 EBUILD kmenuedit-5.19.5.ebuild 1096 BLAKE2B e373c8f1d299065e26dea7068505fb6bd3b15a126faa71cf677c3e2636bfdac8ade7348bbac549f13a6bccbbea9bd6625400d1eac37a669f471fadd928f8d642 SHA512 9c7cfe3711745595e76142084903932b1ada8d43c2bc14a8e93cda4afffe3e29251068a216ea89f46f4f65cb30730d5e9d0a2bc7fabfbcd3d256fe56f7e83c0e
-EBUILD kmenuedit-5.20.3.ebuild 1099 BLAKE2B db2bb30fd41501189705e36d388af92531a908087a583383424ae70afbfc803e7b440e0c4f97dc7402ce7c9f2f3909cf170cc81fa195576d69cceb0203258924 SHA512 dac513ef2ce4fda61deebfdd9360ef877c4a85e10a9c1d48a484d092ac4f249f54ce56f51dfaca864dac43a2c132f7737df2ac9b18a14fa22437bf6fd80a1cfb
+EBUILD kmenuedit-5.20.4.ebuild 1099 BLAKE2B db2bb30fd41501189705e36d388af92531a908087a583383424ae70afbfc803e7b440e0c4f97dc7402ce7c9f2f3909cf170cc81fa195576d69cceb0203258924 SHA512 dac513ef2ce4fda61deebfdd9360ef877c4a85e10a9c1d48a484d092ac4f249f54ce56f51dfaca864dac43a2c132f7737df2ac9b18a14fa22437bf6fd80a1cfb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.20.3.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/kmenuedit/kmenuedit-5.20.3.ebuild
rename to kde-plasma/kmenuedit/kmenuedit-5.20.4.ebuild
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index ce6c32ed2222..3d71315ce428 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,5 @@
 DIST kscreen-5.19.5.tar.xz 113748 BLAKE2B 91dda071d5b70706f8a5735905c22333eb68c8bab32fe138e77e12764bbfc8d19481b285548caefafea91f666b2c98e5b058f15f481862903fb1cc109be96d3a SHA512 ce47e5b0e16f985811d0e71d4c97d2d25d2a4258732c5b7b8706cdfd176c4883c431ea946833abcbc87fdd81ed6d546da6e23640b4586b8013591ee5917c20f0
-DIST kscreen-5.20.3.tar.xz 114572 BLAKE2B 8b839729a1bac0e2bb49548847004929f4c7edc9dde9a36f8d2664d616bf7839438f2a6a7083f0d7251a4859d0659fd88f308e2bd71c26474743291d64f9a032 SHA512 3f7992c0919dfb6390a9a76f5bdebf6bc58660aab9eddaf9f345fa45a4d0ba721f867b5f07c13ef49ea0441592f856c83dd42cb6cbed4ff201d4e32653bc1719
+DIST kscreen-5.20.4.tar.xz 114824 BLAKE2B 711ea39c89e53f7a7bdc403b1010d805b63e7394e0e7f5b0bb520a0fb796394bcd0d39a73fa3556b59b74c0822857055051098b206d8fe23abf72f164cbf17f0 SHA512 feef278441a019673aec6e80b786e6982aebcec93576f8dfc342deacd717dc0b03e1a485a44a0712230be65614d1d2dcba314a041eb82f2581faa2badcee6cfe
 EBUILD kscreen-5.19.5.ebuild 1225 BLAKE2B c27d88d1278cbe91d87de7791a0a124a0414663906b4ec7f91f4b6ef2619f3a253dc8ba1bbced1435606cfa634e0172fe032a70fa4c681956b2acdb0db68ad61 SHA512 7d07427c0f9d9681b70af8907e2485baa178c317265b76f66190d8842f2ceedfd373f856ec6c49e21c63b5e3674bae95b47c4c5abfd1e362a8dde4ff0023c685
-EBUILD kscreen-5.20.3.ebuild 1228 BLAKE2B ad0e2646c5e2c734298054f2d4aa5358be2af5c3d7e256e054a2d33ea08c72e87bf3edcab48ec7bf0b258af00ca58b6af57c8165c206b1836de05850b107ec69 SHA512 b34092ac43c3fc5fd6024edc59512a8c6bef43aa59b4446ed835b0f43c8d1ba7ef0e76d30ac311f225e80fbde5201dee14d573d462aedc31429ef0b005ea98f6
+EBUILD kscreen-5.20.4.ebuild 1228 BLAKE2B ad0e2646c5e2c734298054f2d4aa5358be2af5c3d7e256e054a2d33ea08c72e87bf3edcab48ec7bf0b258af00ca58b6af57c8165c206b1836de05850b107ec69 SHA512 b34092ac43c3fc5fd6024edc59512a8c6bef43aa59b4446ed835b0f43c8d1ba7ef0e76d30ac311f225e80fbde5201dee14d573d462aedc31429ef0b005ea98f6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.20.3.ebuild b/kde-plasma/kscreen/kscreen-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/kscreen/kscreen-5.20.3.ebuild
rename to kde-plasma/kscreen/kscreen-5.20.4.ebuild
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 869692c565b6..17af686125ed 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,7 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
 DIST kscreenlocker-5.19.5.tar.xz 126420 BLAKE2B bef083f6ffaa7930446a234c35d628ffe81c187718be48ee3158b50d5eaf7b5989abda1d3f23a275cff5b949d101cc43e4819bc44b300674681b4233bcbf1f1b SHA512 aa112b28374e2ccfa257d161d47de96ba8a884dbf6cdc59be9dac3624e49472aad7ee0f413e63c9a001969b7e0413d2571e19f39e232e46cefe112fb7f880eda
-DIST kscreenlocker-5.20.3.tar.xz 115308 BLAKE2B 7d4675caa5b347e55e15f7ca67919b61c48e6c5c5ec1cc50293a67f96e44aa04ebec465caf5d302b67f060790b178cf8d72fba7d2e05e3fadeef48910d9ccee4 SHA512 dc2b984ed65c167341d7ad60dda490a8889abf47a2f09190ca4e827786e7d1c9c550285e47056dd59d2d4b18f15b21b970ea8e107249bb6d77734a6a2093f721
+DIST kscreenlocker-5.20.4.tar.xz 115532 BLAKE2B 90a7c9d341241dacc54fc29f9313e3c84db8ace28f5c9c582ec2af07f3cfde01417dd986d7de590ef53ecd835d99a5ea65cb80bb7101cb3d62224d391aa0c773 SHA512 63d82d42dc52bd32ce4f252cc9bd9fdba57515e248a0632ae6f23ac42973c138135a1ae41ccd1480f2e481def819912b5425a298eaa219cc1da5ae07b008d492
 EBUILD kscreenlocker-5.19.5.ebuild 2238 BLAKE2B 7368868e7337088729cf8fcc9d4bd6f68f43b123bd62d646b0326d5bb719e9185b34621e373ecc6f9948f597a05dce51ad2bcdff7d0b9f12536866e8a593f563 SHA512 a50bb08b695832eb913f74cd43214a5c2ab777917fea82bb5838845f45075f30ec4f4922e5b9a575599a7a6a153f218c115eb39483f3b9f77a983aba60b13341
-EBUILD kscreenlocker-5.20.3.ebuild 2149 BLAKE2B cff77a7274ae408256c38a0f5f30b03059eef1a9b78032a1b0830d7c79515974726e087d1e6637b99757712aba8f15f0a15643cf311cc4398f21c33475c02818 SHA512 82ca10fed7cedab270436b480b32b89e3e170c5932bf14d08233a0b2c479ccd03271eb180c4758546ea09e62f790a375555e0ddeb4ce6988a38a49a4fcd028cb
+EBUILD kscreenlocker-5.20.4.ebuild 2149 BLAKE2B cff77a7274ae408256c38a0f5f30b03059eef1a9b78032a1b0830d7c79515974726e087d1e6637b99757712aba8f15f0a15643cf311cc4398f21c33475c02818 SHA512 82ca10fed7cedab270436b480b32b89e3e170c5932bf14d08233a0b2c479ccd03271eb180c4758546ea09e62f790a375555e0ddeb4ce6988a38a49a4fcd028cb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.20.3.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/kscreenlocker/kscreenlocker-5.20.3.ebuild
rename to kde-plasma/kscreenlocker/kscreenlocker-5.20.4.ebuild
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 601b14ecec86..1865bed5a9b8 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,6 +1,6 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
 DIST ksshaskpass-5.19.5.tar.xz 23572 BLAKE2B c399be04e33a51968c7c3d962039f7aaff176c7a14bb5d8d2da36e999908aba1f3fa07337412390470cab1342a70bd37b2241b750e7bf852980c77810f311873 SHA512 7bd70985cb4a133e49d58b27c9266222913097154b78f60fc55b7ea3e684723b3ae55cdd0b44f58dd7c2cb54cc2f6046907b7881355b437689d9e470c2aafdd4
-DIST ksshaskpass-5.20.3.tar.xz 23516 BLAKE2B a8c868df495307003765488bb8a2b1ac4c39470905944d696a24f1b8dd49fd7f03e8eae7b10556fe94d8a8ff29e949357dd92aa208f075a15666aad637cb96c7 SHA512 e072f04b187f0047a12ac0e1ee02c28bbaffcd89650a98f9e16bef36c074a1ac9b84a861c6a9e379e8bdc1329cca5afbb1b03ec7dbec36b4027297e7fa988992
+DIST ksshaskpass-5.20.4.tar.xz 23488 BLAKE2B 898ec022f1da19e1c3d4b9aca8b07d43a7f9e2c0c8499f01d2285400adc9bae8f9dc1cac2b0c5ea12f2253655b73ac0249eb3a5e460cbd7bb7441b6f893fcba4 SHA512 f3fb2559152fe316017b400b9c08527ab913bb12060dcebc27a56f2bfc9ecaba998423e7dfe0bf174736e84896313cebcf2dc4f01854cc1dce1b25ba22162426
 EBUILD ksshaskpass-5.19.5-r1.ebuild 2256 BLAKE2B 5f2dc91ac1d7282916293f3688a02097d356b253d3c3a490e7b9aafb7e7229ddc9ccf41bcd49a5cf6b3d598e44bcfad3a844ecc2a0ea4e2fb926cd7456e8956c SHA512 1c9f0696fe8a7f109eea8508ab1888023eff5b3c5ef1c90706b78952c65a76a4d43ee5160f96de01d626591fd0546254ee3f0ad3d7bb7a4b95829341d18e76e8
-EBUILD ksshaskpass-5.20.3.ebuild 1436 BLAKE2B 09032ed1f73d570d966c8da06d23ccf3cb17be74cd42d72b59a718c8070692c33e82a82eb38a2effaba225944ee38b7457108b919b2c16b0a04a64f6fc768772 SHA512 0b06ec5fb4fe0be972bdf3c74f679eb1e4eb6c6d0010f5db26f9998e104573616e73d140bae2e38909db97f73db946b6f85b1498eb5b3b0477abdb3b57ce6103
+EBUILD ksshaskpass-5.20.4.ebuild 1436 BLAKE2B 09032ed1f73d570d966c8da06d23ccf3cb17be74cd42d72b59a718c8070692c33e82a82eb38a2effaba225944ee38b7457108b919b2c16b0a04a64f6fc768772 SHA512 0b06ec5fb4fe0be972bdf3c74f679eb1e4eb6c6d0010f5db26f9998e104573616e73d140bae2e38909db97f73db946b6f85b1498eb5b3b0477abdb3b57ce6103
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.20.3.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/ksshaskpass/ksshaskpass-5.20.3.ebuild
rename to kde-plasma/ksshaskpass/ksshaskpass-5.20.4.ebuild
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 89bbae08f6db..763d7f20b49b 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,5 @@
 DIST ksysguard-5.19.5.tar.xz 542628 BLAKE2B 3aeacb401c79723aa46e9eb5df32785e314d7a52704d983e5c6b48dd841e908ec84c5b28c609accec990d6011d5355ba3363329973a68149f03b0b20d5d59265 SHA512 5dd3503e3792c247fa2dab274347ae00ac3ddd0090b8b5115abc90c84630e0f7376ce2ec43a853e2a9cfdadb31b142ea70190b54b65c7a45b5839b1dde5a1feb
-DIST ksysguard-5.20.3.tar.xz 562868 BLAKE2B d597b088079c68e176e6f40d6dc468082e9906dacc800b60177f85f176a81eeb2db4ce489e8133c392ae36e1fbc97c97c6283b22ba2fa790798d993c52e55f5d SHA512 827a6e4dee4323a1fd9fe23eca165da861ebce266937691e114ea032475e08eaa07f7e8a0efb4e5f0971b1053f1d97da56906fb15a2083ec6d7a8089d41536fa
+DIST ksysguard-5.20.4.tar.xz 563696 BLAKE2B 231c2be9e9cc5b6999fefeb68b7417b7d5daa2a522f83056c2538bf5e1c2ec4c025125cbf86c6206c234f10e7df94956effa4a4957afc60798c2f49a292407dd SHA512 7cd2524b22dc869ec0da2b82fc7dd0446910d15b2699290962522c58c38aece1e1a702e13a2f2017bcbec3a99d0a36774992881e20d2c4c76b7450da1044636e
 EBUILD ksysguard-5.19.5.ebuild 1412 BLAKE2B ed15bd5f6f51235bcc2a2d3d105feaf3c531ccbb511f97387162364deb2cc2108a133c9293128ac6a6458d1a3ff1ceffaddb585c73cd07e3877b9c1376cc81d3 SHA512 2cdd16db81febd6ba22b342bef89179c702b17adcafc35223cccc1db404f062847ecfbabd174dfdb95f27be5e5dbf067299c0e8e4e06fa0d5fd72478c25bffdd
-EBUILD ksysguard-5.20.3.ebuild 1596 BLAKE2B 1c98f52cf926ad2a5ad6179817efe1af8a54ec922aebd43d3c03297b66d16589fe7415df1648e99e50a71e5ccbc648cf0d7aae87707520049dbe7a0435aa2ab9 SHA512 38ce45990aa8bc0c2dbbb82fdf6c05a5ef9e4a37712e7b6997a1de050654cda024272fa601907ac1eb36ee20e04ebfc0031a926f67107d27fb03dc369b83dabd
+EBUILD ksysguard-5.20.4.ebuild 1596 BLAKE2B 1c98f52cf926ad2a5ad6179817efe1af8a54ec922aebd43d3c03297b66d16589fe7415df1648e99e50a71e5ccbc648cf0d7aae87707520049dbe7a0435aa2ab9 SHA512 38ce45990aa8bc0c2dbbb82fdf6c05a5ef9e4a37712e7b6997a1de050654cda024272fa601907ac1eb36ee20e04ebfc0031a926f67107d27fb03dc369b83dabd
 MISC metadata.xml 617 BLAKE2B b122ab127e8a60b79ee9ad276ce975badbe0d0a750c85987d2aa6da790562a03a2f77fe93766187f863d1a402dca5b79bcee6c44238f6753c7d892e46b34a620 SHA512 fc4a5fd8233b70f4cdd7153aa6681423a74e03a8420534d6c9965c24a3e1c110b43923656720163aca045227cb1896246fe37fd935f5e1270f168435cf6791c5
diff --git a/kde-plasma/ksysguard/ksysguard-5.20.3.ebuild b/kde-plasma/ksysguard/ksysguard-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/ksysguard/ksysguard-5.20.3.ebuild
rename to kde-plasma/ksysguard/ksysguard-5.20.4.ebuild
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 5a980329fcb5..faee2cd868e6 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,5 +1,5 @@
 DIST kwallet-pam-5.19.5.tar.xz 19932 BLAKE2B 28d8419f500c163ba15a79cc994af70b723dff24fa8c32e899bd856766290f20d09e3ee98e164d55596d1b97137e92096f9c2c3cf2386bb700aa0b7bcfed1c39 SHA512 3fe30f979f6ee838b073b7afdb406068f90529fbbac3513d65145f6a46ab8ba0b61ba11a3e9192c60b1ddd50e9af448c1298725fc01dca483b40a8030053095d
-DIST kwallet-pam-5.20.3.tar.xz 19868 BLAKE2B 0c774b155f1d6f3b871b5c5d0dce5a67a53ff46a1b5b0e86bb60e0301e2701cbbcc1d0f145d6ec01172495c61d976310323d5edd3c80028b93b34e4608603b4a SHA512 566e6c7cb3581fc5ea05fe35163af3e1f76d8baa74d30c3ca996c5b265645168589e52f7fe6bb89675f7c1252362af19bfe469fc987f0f8d843f0a897fdf0b13
+DIST kwallet-pam-5.20.4.tar.xz 19812 BLAKE2B cf4e59cde87a1bf4b3501c2f2602eaaaf7a32c2661ba7b055b85469bf204cdff1659effaff6cc6ff75b575a8a554c5be577f2bb62b42b02e7c73a4c1230129d1 SHA512 2d8b953cec254b184fc4a36890e425ed4f7c15063f05ae2f8adf263d2aa7cdb05885d40e0c0e03b99df9cf23ca4dd0eabce5f3cd450012c2bc3369e24e5e49a2
 EBUILD kwallet-pam-5.19.5.ebuild 731 BLAKE2B d950afa45dbb80cbf33a5fba88d382962b9a0c6c53bd65ff445ffbcd5b062578e7909768d8102a6faae954b38853d2dbcf16e0379e80f1408399cc0f3ce2697c SHA512 87942ac14c168a76d23669b2b2ece8f828684a07125fc9a29d8b10367586d2e5039abf192cc30f3cb311e4cdbb7e3a0404b0c2d2986b3680b82d922b87fb0e1e
-EBUILD kwallet-pam-5.20.3.ebuild 734 BLAKE2B 5544f220c8e46ab9d530719b0adb42ffc1961775d8d988cfac17f37f5f3638b9564720fa0e8612246053e2bcd91764f5f9d0f0fc9bbeef1b287adca7dc6bf302 SHA512 2fd2f8578eed8295c50b63ba0b1e2d85e659b573894a7e7c6b5bf5469e80174a49db7454879f1f83ea4a3c4a5950e371833d2229efc9aaf582592e187261f0e5
+EBUILD kwallet-pam-5.20.4.ebuild 734 BLAKE2B 5544f220c8e46ab9d530719b0adb42ffc1961775d8d988cfac17f37f5f3638b9564720fa0e8612246053e2bcd91764f5f9d0f0fc9bbeef1b287adca7dc6bf302 SHA512 2fd2f8578eed8295c50b63ba0b1e2d85e659b573894a7e7c6b5bf5469e80174a49db7454879f1f83ea4a3c4a5950e371833d2229efc9aaf582592e187261f0e5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.20.3.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/kwallet-pam/kwallet-pam-5.20.3.ebuild
rename to kde-plasma/kwallet-pam/kwallet-pam-5.20.4.ebuild
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 9885d4f9948f..29dad4375184 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-integration-5.19.5.tar.xz 21276 BLAKE2B 0d2a243b665efa9a1be2464dc04a4d01e71be65cff143fddd60e49c4d4d1377ae4982087711b1c5706a1c95434aa8e751e2ea35c2e50e3a0de8ff3a36abbab5b SHA512 db5f05ac9d942650b0933d723ba7138d35d262757b229f5f79b07a621543fdd87679da28d9fa059dc48064db39b69ce34f5296decdfc126442ac3f9f4bbbb2b6
-DIST kwayland-integration-5.20.3.tar.xz 21340 BLAKE2B bfb612ae6ec989e875b6cb24d11e9925799e57d6aa094484fc39bd5ee79b2d90adb320e6e1e07e530e807a15c5473356f3bca3b55c6367f503179769a036f185 SHA512 1e1c6102080ecf9e5b585d7a4a2ef643009334628beafbff171621b45a08d11aa70a9ada6ae4bd958a97e5181c90f2c6d757870039ca2429888e45e66742ab9a
+DIST kwayland-integration-5.20.4.tar.xz 21356 BLAKE2B 5b337c3485237d5f752382dc2bf0fbf855db87f7ff128c423b0fdd047adbea7c584dfa5e9aae552b372a2a6ae8a6d4a5ef759501d58643a51027ea2bed057550 SHA512 28481eee4893e2a33f9876441b8ac7ecec2b83a4f6a2498898dbc62429c6f19dbeafc1c70796d7be2e6342844cf6bf19d2e107f2501ad64e1555aab6bf5b076a
 EBUILD kwayland-integration-5.19.5.ebuild 699 BLAKE2B a30fefc4ac1419b0fc461154fe5e08aa1d7cfb2a6b0b814732475ea86c570fefec39fb078a9841281d81eff051753174616adf1c81884d7a127c7fe295fc30e5 SHA512 d5ee26c40bfeb3c715999237928592cca13f5366fb0cba850949a57d3e8db620037878f8e71b3de837ac961f60c4473d5d7980ca93a6a61c9943b7af4c24357f
-EBUILD kwayland-integration-5.20.3.ebuild 702 BLAKE2B 636a47bcc1a1d6242c15952395ffbaceec2231d72ed2d02191974935bf8d5a5b22e3216f31288eeab3e8a7314b9f5cdb9f0014f6f31303443304ce13b851f787 SHA512 e3f800e627b5d735092ae561042e4d0e4732e96d5db7cee9995c894e00402e38df602fa065ef95f00c9c143463e6be3ac72441e1159b7081c3482801bc93cd08
+EBUILD kwayland-integration-5.20.4.ebuild 702 BLAKE2B 636a47bcc1a1d6242c15952395ffbaceec2231d72ed2d02191974935bf8d5a5b22e3216f31288eeab3e8a7314b9f5cdb9f0014f6f31303443304ce13b851f787 SHA512 e3f800e627b5d735092ae561042e4d0e4732e96d5db7cee9995c894e00402e38df602fa065ef95f00c9c143463e6be3ac72441e1159b7081c3482801bc93cd08
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.20.3.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/kwayland-integration/kwayland-integration-5.20.3.ebuild
rename to kde-plasma/kwayland-integration/kwayland-integration-5.20.4.ebuild
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index b1817eeac62a..fc9e7fac884c 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-server-5.19.5.tar.xz 229752 BLAKE2B 8730fc1e14512756478870a1446310db7a0130afffc29ad42d4a2efa18bdd0991c89c508072c4741ff6a67a28f8cb534b4f097762444ac42b3d2189d753dfa65 SHA512 5e039e38f290daed747a4c5d0fb37c828ad7ff1e05b735abb30bfaa69d67e812ea89b78921ec0877622ed9127a92aa76b5c6468126004c0f53ddf909a45f391b
-DIST kwayland-server-5.20.3.tar.xz 220956 BLAKE2B dfe68bbd8626bd5db47a6184d3e7aae62cfd12e61761b546a5b6f117e395edf6c0f133a089356e8b2c524a2e4f02f5db47078b4b26415cbc98abc8868272c80d SHA512 bfd2f04a1ec9991073056fae6f3b3cb6cd87415419caba035d864a678175cedf96736a5fab206b7887ded5a739d0dd19c4dc0b885a0b5f0bbe9242e091503335
+DIST kwayland-server-5.20.4.tar.xz 220960 BLAKE2B 6d9689c8e19772ec7a8331d946d150ec70267ec19c4e5433f65ca4c5c651138d651e4d675f1226e7695109f29703b60b1818d0285a111bf83029a7bf2c668404 SHA512 a895f52c5705cc57a9f6734755f2e6fa8a04787b3849d28ddfda74ca2994726ac0ef7e2fa10f5a6fa17361173755dad7ba97be33e59be8d0e552128fb60e7b77
 EBUILD kwayland-server-5.19.5.ebuild 775 BLAKE2B 724d6a9db4e7bb3b3a36d4099184ea4b57f40392778f36b336dd316be6342659923032b7475f8f1e620a5d6bb9eff5b27768432f08277243103d6601e661ffe8 SHA512 3d3baa2749844913d51c2c67f521c8afc37cf12996b05854f483ed42688b6178950d86fdb152e35f14eee5de05c28b657bdd14a6dca8ddf628058a9daff4ef19
-EBUILD kwayland-server-5.20.3.ebuild 786 BLAKE2B b1d02cf335e6e9193f0d5eccc503b7e4e37cccc05f0091eb05a964e6b4e2d2771e818c78f938b485f7f9c649ebc99b9b52dd91edecd5195cfd130d8446845110 SHA512 e7063db25f5fb0861e61aad565b42eeb46e1b0202b8ca227d80054ae97849a046f7a62e9d2a80529360cbe5d2f342364ceab01c7ae97a03f899fb604e1318925
+EBUILD kwayland-server-5.20.4.ebuild 786 BLAKE2B b1d02cf335e6e9193f0d5eccc503b7e4e37cccc05f0091eb05a964e6b4e2d2771e818c78f938b485f7f9c649ebc99b9b52dd91edecd5195cfd130d8446845110 SHA512 e7063db25f5fb0861e61aad565b42eeb46e1b0202b8ca227d80054ae97849a046f7a62e9d2a80529360cbe5d2f342364ceab01c7ae97a03f899fb604e1318925
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.20.3.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/kwayland-server/kwayland-server-5.20.3.ebuild
rename to kde-plasma/kwayland-server/kwayland-server-5.20.4.ebuild
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 0ba1b4ae7bee..f5234da68631 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,7 +1,7 @@
 AUX kwin-5.16.80-gstreamer-optional.patch 963 BLAKE2B 7a65b1e36ba1261cd97c9cca8cca39a03f932ef23780c9d5f1104bdac665744dd03878a5b7f1ccc20dccab42facb8d97474c31548b602db0debb27e5490ac76e SHA512 2b1de2ceeeed51bcc691273caea969243ef08ced929030daa94c0f19bad2fb31a507e3efbb9018833a8bd3b66850380dfbefb9018fa39e00664a1295b9482183
 AUX kwin-5.19.5-safe-removal-of-X11-event-filters.patch 5327 BLAKE2B fd2982a92f2a2bdbdb2e718fcb4e3293245470877aa3021eb0b8da66a5018e79a68bf34034689919a156e8c8de1f1686797c3e355cb96330dfcd559ab27d2e43 SHA512 ffeb77e0f718e06a605ffd82708228ab63161d449ec21067eafc9d34b119bfcb80d9bb608c1e7cacd1bda0786618c475a2cf7977b94e7475482caa281000debe
 DIST kwin-5.19.5.tar.xz 6260188 BLAKE2B bcf3c8afc00af0df8cddeb49396bd23df6178e379ac4c3ba3c547a2c602d309202a72136b69b83f729434fc5691ba24699cf3f44d47b2c033623bca5d551bdb1 SHA512 97ad0096066d99b4bba3089416a6d3744b6f83d82a004caa8762b420cad34cac4221b3535678d4c6f1bcb43c4d97db56be5ac68c4ac501dc168f4472a6c0dad5
-DIST kwin-5.20.3.tar.xz 6329376 BLAKE2B 11dfb77c147f9033850fa4592ec3e4baec425a32c377869c427591aae8239ce86452660063dbf1fbfa7ec311b73fcece8e2512fc8ae5bb84bcf169d5f4452965 SHA512 a156ef06fad48402a98e13dbaeeddf0f84e74b969198be631a3519fd36216968914ff4dca90e74b9d7a15b2ee7479791822006e13046e6ad4f1463faeac759e1
+DIST kwin-5.20.4.tar.xz 6328068 BLAKE2B af249815add959b337a7b08a3a15fdbbf6949595d27653611954f90dc12d697ca062ea46c8b00775f3e284b3e4ae12bd3dce11de7eb1234ec1bfcdb59de9a9be SHA512 b402ce6fea79d4c41d10b76d48f5737c10321ca5ab4a2b188646d8fe2b8ea346813091412a7dbd1246eb70ea3f4cd6961d577c19c325a9b5d94083961e0ed512
 EBUILD kwin-5.19.5-r1.ebuild 3116 BLAKE2B 705a3a61df8bf2b0c1e334b7aba8690ad5478f64f2956b1e3c8a863b8ac0773b95d69b75c94d23f91af0e6562f071d2a3a642257f07f041c9bf59fb58d3b8072 SHA512 ef47a3b4851d18f6dcc4615f290b98c87ce16a9655f08efc42f1f993878229f04ad7e591741baac5fb17efeceff7dae33a918115f144319b1818819db96ea67b
-EBUILD kwin-5.20.3.ebuild 3374 BLAKE2B a87ab4235bada706974757ea02be652126f9dbfc9a0bd11085d4e91046cce28ad3c1d553216d737072d335473c39ee6e5f06af81561e8abc1de981b873f3ab36 SHA512 f988521d1bec7b8cf5089fb7953ea76cb8617bd36f0450528ffcdc2b2a42b4906df728ec36682ed5c10afbf7b6b6309c0f8a4fddad6c61172c37a4a182e648d9
+EBUILD kwin-5.20.4.ebuild 3374 BLAKE2B a87ab4235bada706974757ea02be652126f9dbfc9a0bd11085d4e91046cce28ad3c1d553216d737072d335473c39ee6e5f06af81561e8abc1de981b873f3ab36 SHA512 f988521d1bec7b8cf5089fb7953ea76cb8617bd36f0450528ffcdc2b2a42b4906df728ec36682ed5c10afbf7b6b6309c0f8a4fddad6c61172c37a4a182e648d9
 MISC metadata.xml 443 BLAKE2B e972639d031b3e32681af007b9d5daa44167bdbcb9b83ff557e7bcde84b588403240021f8880eb1cc852fbae37d9e8c5ffb392fa1aff19f2075d32876f5082af SHA512 cf0743ac8f3ed8a2ec354653cfbec6bbd5ef191227e46d5d56119f7c0b3ac5a388cfef44f7ce5f2ba9079f3eee897b29b52b726f4e99ee50e29cbb584ed19b3c
diff --git a/kde-plasma/kwin/kwin-5.20.3.ebuild b/kde-plasma/kwin/kwin-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/kwin/kwin-5.20.3.ebuild
rename to kde-plasma/kwin/kwin-5.20.4.ebuild
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 7178a162c52f..d02285db7749 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,5 @@
 DIST kwrited-5.19.5.tar.xz 20208 BLAKE2B 76a5ddb2c9e4e3e47f1deb65c077634715dd1853a879573ce6be259d5cfcfb9ce7bd68b5967fa006e84f34dafdaf82ee18c9154ab28bcf49d152edc6816e7b10 SHA512 c5beb32da7ea08d944d603db9f5af6356b7742be9408f8d5e540d2e782c54d0642f93a784420a931ce807f980fc6aed0135d54e8cb03f88831ac7c0404dc7136
-DIST kwrited-5.20.3.tar.xz 20448 BLAKE2B c2eed7f8ed4f9d5ca4c2e48ff2c57d36fb2abb44b0ec37888d9ba937c7a977b054f9b777a29ec9c2b8625b9d56ed785f28e315e15f500b19bbc6ac381d806cd9 SHA512 1d138449f8c7e2e835359510b3ea173e18656f42ae3d5c3790565d251440fc202f3e7e2db9dec04d9d51c3b6cbc425864def5b52d346b64477ff5ff9340bebcd
+DIST kwrited-5.20.4.tar.xz 20496 BLAKE2B f1d053c546252cdae2f90669af223476733bd3ab0177f8f6292eeb4a61b54d899ce114e0e7e1223758916b832a956f8ffcdd1aa52c3781b4b682e1166270a1cc SHA512 687bea35141c2a8abdab86e5fe06161117c671da30f45c3582ce0f2874910f6f8d9cc61b332fbacb7eb1395f9091e7ec77f3187f2d00a876a857291c3dadf44c
 EBUILD kwrited-5.19.5.ebuild 623 BLAKE2B bcc2a84195ee3c1bc321b9a4ddb0815812fcde9713ddbd5ca74579316232039099099b7e25c7a052ea7b5b7d3f50c236eb8c5ef63cd4081ec0b3449ab7dfb364 SHA512 40f2fcfaf5a4dac3327142348c4373636d1f0f920a1b975a4e924f070284d73ba52539d7e74d468b1d2aeff197a688aaba9f84685d9db08aeb0a483e823b2449
-EBUILD kwrited-5.20.3.ebuild 595 BLAKE2B c0be4c542449a99b308e5b839cab1fdba794a6e98ee1d4584dd11535e461af6d56bcc0792aead373aa8c2d30283502c11845d153c46e8abb4bf838d4be06f1a8 SHA512 db337652d01ca796797229455b3fe8cb65fde1e5bd37107268c1a44d0f229b5adc30b2293f18d114612ac2834542a5540c26b4cc68160b59ffca14c05ce9be89
+EBUILD kwrited-5.20.4.ebuild 595 BLAKE2B c0be4c542449a99b308e5b839cab1fdba794a6e98ee1d4584dd11535e461af6d56bcc0792aead373aa8c2d30283502c11845d153c46e8abb4bf838d4be06f1a8 SHA512 db337652d01ca796797229455b3fe8cb65fde1e5bd37107268c1a44d0f229b5adc30b2293f18d114612ac2834542a5540c26b4cc68160b59ffca14c05ce9be89
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.20.3.ebuild b/kde-plasma/kwrited/kwrited-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/kwrited/kwrited-5.20.3.ebuild
rename to kde-plasma/kwrited/kwrited-5.20.4.ebuild
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 7abe2e8954af..b612a9a23908 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,5 @@
 DIST libkscreen-5.19.5.tar.xz 85468 BLAKE2B be5d055092395e53e252e879d4bfb5177e45e1b5df96cd53bff81a0cf88b10f84dd1a0b7445bc1073357c98040afc62334aa433e20d5afe3f21f73b3e3ea5cae SHA512 5bc462ee9e322bbdbd375003b962b868a6c6dfff6344e61d39e04644fbb7f409a337116df1c274a664f633b176dfd69af992d3e0e290fa85dbe529cbe1a1e87f
-DIST libkscreen-5.20.3.tar.xz 85576 BLAKE2B 62a00c504cbdf23bbcc6f568d58a9ccea4febf1080f8d9fba1a214e5a94b4fcd73238bdc289afbe9b94d53eb163e2fc1a1bdba424671906a4f5a4652ceda8ebc SHA512 6bcecbdcb7723e3b5a0b9bd49c2108fe8407fd7166a5ad5fd27bf2102825b7ac25fc86dc0b8f5d6b4cd770acd35c0c44b8d75d711a397832fb8819842a9892e4
+DIST libkscreen-5.20.4.tar.xz 85400 BLAKE2B 5e1ba17946331f68bd05266f96f7a48c791932a098d03c2f16b1a4f5a552460891a4f0202f0fc93335deefdeccc9612c672591990bebfbc440a0c15c8dc2a03a SHA512 225439f696f0f768ed68bdb2071769b1fe09116c90e4e7ab35aebf3f3dc9ac7ba11da0a60e7d6fdb78d37f17fe69f9ef175f70b6ce31de4f3fc272366587f38a
 EBUILD libkscreen-5.19.5.ebuild 647 BLAKE2B f3aceb4ea5508d25b411deb683820f455f278efabb70b8d800a1cb10f457aa51b979f99cf55db6527be3c8356788eef78e5c35df9994dcff3cf7bacb8d9e0e49 SHA512 596a327c444c5cbf52b0860ed63d1b54a00133d52006b83bd79feccba4f3690a0a92b12be9430b9415d6ac77ea76adc249dfec822b557e8baca152cc3a8c8776
-EBUILD libkscreen-5.20.3.ebuild 650 BLAKE2B 68116e9df2250691073d2cf5caa3903d6740b1af9d98a77ba3defc960e0f8d44d0929ce54cc708356ef6ae0d20abbe487e06a73bac1ebb4827e6cd52d4a6e0c1 SHA512 0ad44399177b321399c4b5c77cf3efc3bd4b537eb4c73bb58d7517b5b11cb935e7fb4fdc747cba39999c19c87d1492724e9e05f3636bb55c11c08944896173de
+EBUILD libkscreen-5.20.4.ebuild 650 BLAKE2B 68116e9df2250691073d2cf5caa3903d6740b1af9d98a77ba3defc960e0f8d44d0929ce54cc708356ef6ae0d20abbe487e06a73bac1ebb4827e6cd52d4a6e0c1 SHA512 0ad44399177b321399c4b5c77cf3efc3bd4b537eb4c73bb58d7517b5b11cb935e7fb4fdc747cba39999c19c87d1492724e9e05f3636bb55c11c08944896173de
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.20.3.ebuild b/kde-plasma/libkscreen/libkscreen-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/libkscreen/libkscreen-5.20.3.ebuild
rename to kde-plasma/libkscreen/libkscreen-5.20.4.ebuild
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index bd7a894aa5dc..4a8c56cb2cbe 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,7 +1,7 @@
 AUX libksysguard-5.16.0-no-detailed-mem-message.patch 1039 BLAKE2B c05f1bf38ef733630ec4c2bcb36b8d0cffe0c4ca318e93dfce60dabea6a92e980e94e57f347683b0235499b95cc0f40734d322309321a5ddc792c3a110a5613e SHA512 dd54d1eda30655876916a517fc3f2a9f141975bc2eb3384a3434c23ef591285cf31188aef83a2f2597d8cc9b77800ba95d37e5e2a22a8f0c9b78fa6e767a00ee
 AUX libksysguard-5.18.90-unused-dep.patch 3054 BLAKE2B 9d48130d6754fd02a570ea91a17cc35fdb20a14b89e8408d041c983a4893dcf1fe3d35751ccacba845bcb4a8a5a230e0a78b722ba0a7cf720d2123abfdb6b78e SHA512 caf4a646361f3011a5926ae0ba7b10ab6b31bb01d8a5bead676735021096117492f531e8cd9d09dbfbfcfdc83b1d4d94d327c1766928fa6a7684989b967ba354
 DIST libksysguard-5.19.5.tar.xz 674900 BLAKE2B 88408494360921bff732ba535a932b2a17d8faba9a0cd231754dda6116ce52d8cb6ed32f89f05e16091b54a378d3d50e5e46feff1e27b46260f3803ca78b9855 SHA512 8e723eff1e50195005a91dd558df0ddce956c33478c00e177f1eae4d9997ea8332d86bb8fae1eb2d18bfe3bdceefa31fe4211dfcf4bb1c463d347ced33e75348
-DIST libksysguard-5.20.3.tar.xz 694116 BLAKE2B 0b9baf9dcbeb8328d7380ac16b746c4e1676aa774444cf3b47b9f80de5fbbe30e01b2341cf5b80acd0484a77cb23af6691e14c443626e0dec30469a5d874642d SHA512 cad47e70de732a891ca63adc6716c9edac63384c1610f5f59687f2f073914e2881549ce54cff16166b0ffc9997926161ca7c5bc8b2cc3585f30eab45be739c26
+DIST libksysguard-5.20.4.tar.xz 697444 BLAKE2B 62a9cc3d077e0d099456c200f223ca1045818d1a0b2c64650ff80a22c11761702c3e89a4ad7ed940687cdafe34e7698ac16df00ef2f04c762b5841949d6efa13 SHA512 ba49e5c35821d54c6bd34efa35a9a9f8c7786d1bb36769c235bf2b15f3b90093bea7dc1f8ec4992583fd10c83cd56c9982ea6bb40b34abf3d1dae8ea690f0cb9
 EBUILD libksysguard-5.19.5.ebuild 1710 BLAKE2B a0671e4ba5b7e5c6db8b933a7a48b3b5330fd2e6810b43135e90712577f2f265bef1be40bccce65f856e0fe40d9174cb26695a7cab10e3f25a9e09e176abba09 SHA512 9a4c63e759fae3557a467fa9222b0dcb6c12f39399c842a50d75134fe3482c0bd9f4f33cbcd684f55940dc36a8322620cc5085c177d832115b4976234d5f35eb
-EBUILD libksysguard-5.20.3.ebuild 1692 BLAKE2B e3944aab2514da446d3ac22d33830de181ae7a4109abab82fc6f0f28a7ff64f731c13c3ba7910d11c663f2fd90ed347907d8473a946b904fc0f6751a4e686192 SHA512 a8b8a542cbf6733d5eef8fa150f5de40061e1f4d47ada0b8ca1305e883df6852297b7fc78e6525f56c85bb06696ebc5bc2f75c7cc4a7c919b740312128548f6f
+EBUILD libksysguard-5.20.4.ebuild 1692 BLAKE2B e3944aab2514da446d3ac22d33830de181ae7a4109abab82fc6f0f28a7ff64f731c13c3ba7910d11c663f2fd90ed347907d8473a946b904fc0f6751a4e686192 SHA512 a8b8a542cbf6733d5eef8fa150f5de40061e1f4d47ada0b8ca1305e883df6852297b7fc78e6525f56c85bb06696ebc5bc2f75c7cc4a7c919b740312128548f6f
 MISC metadata.xml 542 BLAKE2B ff3326f819a0324fdc3ab339c3172f91d1fabd5eae8faffdb3b3bcbaab2a73fb3882e57db5fb6bdb669b5ff3338fc8b3ccc63b771255e527c7a64f0cac0d3cc9 SHA512 ea5d493aa7e05db1b63db2556ff3cae361aee8a18fd2688871cba9882f91b8dbf7897b91ddce16b2acf0b12efe100e8db0754fd86126a7c1d95b6cee02b576c9
diff --git a/kde-plasma/libksysguard/libksysguard-5.20.3.ebuild b/kde-plasma/libksysguard/libksysguard-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/libksysguard/libksysguard-5.20.3.ebuild
rename to kde-plasma/libksysguard/libksysguard-5.20.4.ebuild
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index c471d1207073..a9ad76aa6e28 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,7 +1,7 @@
 AUX libkworkspace-5.18.80-standalone.patch 5188 BLAKE2B 5635ef59e36581aee87689dcc3b2b9acc66eb37de12b084f249c6f80ae18d727b830cdf7b2e9795ad4ecb956cce431ed25b4ff0b9b3be02a09c835f182f49fdb SHA512 02b36fc91b10b0dc38cd57f3e138cfab51994a31edf73727762ec92a6e8fd1d786724cc3591956d337f6cc46b87596004909503e0a21a52115828b594bb0cca4
 AUX libkworkspace-5.19.80-standalone.patch 4989 BLAKE2B 6487cb2071b4ac026966d23cfe5dd6ca8e3ddab77cffb08d51b5266e3a9ea16f74a90d987fc1b86891a65b40bcbacc3fd9dc865c79e08206cd0ac67cf7bb82cb SHA512 d86365f59cbd20979c9f7412f106c34eec26d3ce0361269e192c0310d3107fb2486eebc1fb7fc7bd331887a883ae5722259467b4edb0d23cb4355ab472f93c7f
 DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
-DIST plasma-workspace-5.20.3.tar.xz 9031572 BLAKE2B 242286eef9d15b9dacec0dca3a7899c538141490611f932e0ebff59e1ea7a54cbad56e3bcad6e4a720b4f7610de2fc0e128288c3fe3d2b9e8255ffe16e0b86fa SHA512 c1daa19834ea7997a8e44fcb6ce9745d5bac56a0a4d99320e1e3e42e9cb5489aa36887e3c2bd8e385644d555d355211c9dba6c40edf2471478566c531a2d9c89
+DIST plasma-workspace-5.20.4.tar.xz 9040936 BLAKE2B ac21ba0e094aed811d3b635ef71a468ac398fe54371cd0898324692cf8bb5759f526008ab9201f84cb4b8af9f948d73b8ada943cff2e8a8e5016a1a1135931c8 SHA512 071ca0073ade4206bd42277114bc2693698cb91c4f448ddbbd56f3430ed0a1946afb474a6b80cb11ee907a5a83fefdde06866c7a887bfbc3456a64b60a6f38e1
 EBUILD libkworkspace-5.19.5.ebuild 1489 BLAKE2B 53d3846cd030eea66ecc98dd65d644e5ea5898e985ed9f16e33f1de96be534d0c8f917ba62e84e284be001766acfcb2505988bd0c2f30cc13c2afef186c5904d SHA512 989aeacfcb48f10857cefe15a0959077a41f415a2bae4936f0e01bb219b3b3350cf70a16dccc28b405372992eb1b1c996f20600631af9a4cc5c54e20854b3a1b
-EBUILD libkworkspace-5.20.3.ebuild 1492 BLAKE2B 1d9776d1321806f785b3a1d992ae195425b41f0ee783a9c2a8078811b4cd3ef273f91bc1e89f49664f15db4ff020b1537713305ff55cb0135b4fabe2b6ebe03a SHA512 c7def611e9eab3457d0046b26711b022798b48393bfe5dd463dc456af510a6ea62a8536af203bb1047ab59f5c60b47841ecda66fddb942dd11fa7ac36b3e24cd
+EBUILD libkworkspace-5.20.4.ebuild 1492 BLAKE2B 1d9776d1321806f785b3a1d992ae195425b41f0ee783a9c2a8078811b4cd3ef273f91bc1e89f49664f15db4ff020b1537713305ff55cb0135b4fabe2b6ebe03a SHA512 c7def611e9eab3457d0046b26711b022798b48393bfe5dd463dc456af510a6ea62a8536af203bb1047ab59f5c60b47841ecda66fddb942dd11fa7ac36b3e24cd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.20.3.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/libkworkspace/libkworkspace-5.20.3.ebuild
rename to kde-plasma/libkworkspace/libkworkspace-5.20.4.ebuild
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 033b2afa11d4..9824aeec4d0c 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,6 +1,6 @@
 AUX milou-5.19.80-disable-manual-tests.patch 849 BLAKE2B 96f6148e384bcaa62cd7748bb695c86dec1d12b93252a5deda724ccee92b72ab9cdb132848746771dd4ee539eb8ba6f83681c410b28c1a203cde50a0a36b7ffc SHA512 c5dd9078754ef0dabe5704df18423ddc273c0ac0d7a685cc3df949588202bc18dd3542925e67dba868074e2e4bb5ad06ca4c6d8efec91d19af6fbea2642d6d2b
 DIST milou-5.19.5.tar.xz 64612 BLAKE2B 588e5b98d5a1aa061dfe09d9566c68904c882a7a4120e3fadaed60fa1f372013d966511693ee44bb67d6b554e44d287374784ed02b25c04a0b7b06fd34240fa1 SHA512 c480d22ec7f6be8031af13b23914add05d331b017c1d4d2a193a47f31cad1ede0bfa833a9368d0ba9c35cf5b0f97e23d15307ae45569d8bd9d7fde305d17b913
-DIST milou-5.20.3.tar.xz 55368 BLAKE2B 80c852229e5310e388d41024ece730ab5de4a6997f83452db87078c84efbadd660c19c5d2bf01377e3d4222ffc4a75d9755493a898de501049d1ac088de86748 SHA512 1e7ce2cb01343032171654bcdca53b63ad02ea6be616461764ef3994d05600cd972940fefafdf41636e86ffda2081da51c7e5988078d35b77938b981eecce298
+DIST milou-5.20.4.tar.xz 55372 BLAKE2B 6d9155a148912994ac245680ae58a9a7a29ba967dac31291c9f298ab51ae43f0fdb0ecbb77f7578041ac8da75d5d456ab9acb03e5609541bf1235abeabeedbeb SHA512 c260176a12793777b7467de92dff6cfbec12ce41a1390ce6b43472a8cd3228cf3d435f949c075b9feef90e52ff82ee1fbe88636b8189a128c0cc74236435c5b9
 EBUILD milou-5.19.5.ebuild 913 BLAKE2B e69c781c56921e660e6c1d730405646ac7ef0c97a1ab6b58b296bd3cfac21ea9f5052d2ea832e248d38bb71117b3b16f76738996d34a5729f8ca9ed8c0281e3b SHA512 0c4aa58903ea695871d3f2b755a339fca2f549f92c9417f4817ae49a0760b3b24b4c8404a991fc6670bdb05da45b9f4e9819a7df45ddc5b9e4fd75b8d084d916
-EBUILD milou-5.20.3.ebuild 916 BLAKE2B fc350e844d1c9323b939a6e35406ca82620aaa320855847c823dec3ffae3bd790a9cdbebd55b1d86b48e48e9b137856252c809f2752316efb606b4ae9e4cab3d SHA512 7aada9245a06fb90b483d1c0f9e1f2c72e7d1105ad697d8195e71e61c6e4dba4b7f1e73866b930088451ad46ed97e0ad36e1e0e01eb95e40e941f25d6a8dc844
+EBUILD milou-5.20.4.ebuild 916 BLAKE2B fc350e844d1c9323b939a6e35406ca82620aaa320855847c823dec3ffae3bd790a9cdbebd55b1d86b48e48e9b137856252c809f2752316efb606b4ae9e4cab3d SHA512 7aada9245a06fb90b483d1c0f9e1f2c72e7d1105ad697d8195e71e61c6e4dba4b7f1e73866b930088451ad46ed97e0ad36e1e0e01eb95e40e941f25d6a8dc844
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.20.3.ebuild b/kde-plasma/milou/milou-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/milou/milou-5.20.3.ebuild
rename to kde-plasma/milou/milou-5.20.4.ebuild
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index f1af4f9816d5..622ecfab6400 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-5.19.5.tar.xz 4462408 BLAKE2B 94a284ed12f6f1d2b04518c9dd6e891ee78c3959c39a82a339e58dddfde442e9bf2ad0a1296dea2f511a3e099fe61deea570f0f0a9b01ccff50e3ff8cd2d45be SHA512 53eec62c875dfb94d6b757e2b37b0ac23756d16ad4841cc6d7d9992cd2feaf8d7fba35987cd75f265563783dac013df509f7261033d169b8dca5e545e0eb03f4
-DIST oxygen-5.20.3.tar.xz 4470124 BLAKE2B f1b4abfbd2bb83d32e5e36243c4876a67d12c4974226d85207155acaf46005df5c723d5711f6c908b84e2fc1a5d79a13ce832882bdf350cb1332dc07ac5bf398 SHA512 d96290bb8430972223cf32298307a274e1d4f1f01086b7521adca5950f44ad915bdbc9c4b32ffda55981a7a989e28bd08a00f2e46e0403a75d55529e51901587
+DIST oxygen-5.20.4.tar.xz 4471132 BLAKE2B f0fdf9b49e71a2feabfd37740b3e71ad82c0516a8d278e283054388ca825997841f10a9b503348b54c28eb53a2b02deb447f5b8ecad7b4f6d639dc3311d68ffa SHA512 d0e2f3b1745f449d6736889e7c2976ac64a1df3305781b2701a688974044037fb4bb0cff1848eec64caea8db9b66b273325a831010ff7c30f9edc3dbded08332
 EBUILD oxygen-5.19.5.ebuild 1363 BLAKE2B 4d06fb8b263bbee235363ce1f1f7daf24565395eb15843e8ea70782425fc25edfc41ea3c7c68b2d59fc56ff4ca6d15114f39973e9b73a31fd72b5d99c606dfc8 SHA512 e1675ceb9f884c4efffe6f2e759901c6c03ec0d31e93b90547163ffd8297fca278d5bc855dd61146d2772949a39abccc4cefac9e34cb8315e450537b10126b9a
-EBUILD oxygen-5.20.3.ebuild 1366 BLAKE2B e77a2bdf296a31b8aedbab51d1c5e24aa12d50986382194bb0052fa234c0756dff846f01c9177fe45aef71a0c496ac25304912bd0077e71eb72e076f866bc9de SHA512 f5b553851b79ddd5a2dacf4b6f915df16aad80858cf0d331e87f666cd6702fc506fc89afbc04533e27116545d7e23d5397c7608a9711149ac605752e56d0f6c4
+EBUILD oxygen-5.20.4.ebuild 1366 BLAKE2B e77a2bdf296a31b8aedbab51d1c5e24aa12d50986382194bb0052fa234c0756dff846f01c9177fe45aef71a0c496ac25304912bd0077e71eb72e076f866bc9de SHA512 f5b553851b79ddd5a2dacf4b6f915df16aad80858cf0d331e87f666cd6702fc506fc89afbc04533e27116545d7e23d5397c7608a9711149ac605752e56d0f6c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.20.3.ebuild b/kde-plasma/oxygen/oxygen-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/oxygen/oxygen-5.20.3.ebuild
rename to kde-plasma/oxygen/oxygen-5.20.4.ebuild
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 9b420b34406c..bfcf6043545d 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-browser-integration-5.19.5.tar.xz 176780 BLAKE2B f46d8434a957d52ecf3b475c08b106705df2c4486b85b7365b7ddf7144d2cae993787c53397ed0e91c0cd3210f9f746a22d61df08a5bd4d1d5eb58605572b452 SHA512 c7334c4ab4ab3e0e1e93715257995fa7b16103a61eb40877b3e859f75b781e27456f96d5fef409284d0f584335f723b30a5a0bee0a06ffb9cea9012cb158b9e1
-DIST plasma-browser-integration-5.20.3.tar.xz 192904 BLAKE2B 33e1e3915fa9b5cca3b38359b6e1cd360fb4b690f117dd20e62039c6f69bf7271fb7d7960b96648eb87f419d49ecec5fe6493e57b85bc102a2162e193ef697c1 SHA512 ec9f869f789b08144bf937fd83ff914922c2ecfa905cd80ddb920d88d82239074c33f8341a77bceb790d5b1a02163afee6b1e7ef8949aa9ba700e5195e6001f3
+DIST plasma-browser-integration-5.20.4.tar.xz 192224 BLAKE2B e07cce3701564180f52048dcf2c4c56c94e7ca3d0c0780a601af24908a5d1bcf9fdb321f0e787c4da639abc0832e03ab3058963133da32106d0df8fa15689a53 SHA512 b75546feb0d9d41adddd972fadabbcd98f5116e895cc7bbad34de3cbe10758ca06dc82ef91e9d41beda58579c2bb99550974b941efb92fef66f62163b9950392
 EBUILD plasma-browser-integration-5.19.5.ebuild 967 BLAKE2B 30c98708554e9764c6cb5b6b9b5c4c510faf386ae7b419e15a0035d42a22f7df51ca9008467312a0b4fd30029ae979d081060b5e86ad6697c85425e27b4a7c20 SHA512 f2fc528476cb303fb288dc59d9edc5a7c65b8795d6c1ef1a7ff5f0c3dd8ecfc9009460ddc6c3830c147bd16a2478c50dec669b2a6f4fd81b58eca9eb57b67734
-EBUILD plasma-browser-integration-5.20.3.ebuild 970 BLAKE2B 17478331b3b6685039a026148f8a8cd1f8dea1756f3c41096ae90b2bb933e185656fc92a9ce785011718d0e8de024b8da84d71574a74344576002822a9ff6d85 SHA512 ae6b6cc2df7bf711cb5c26dcfe0135be8f78eb9b6b1d35b1adaad629ff2442431f64200ca899f364cdc57725eecaa846d8f207d87dcaf5a27b03627f1639c438
+EBUILD plasma-browser-integration-5.20.4.ebuild 970 BLAKE2B 17478331b3b6685039a026148f8a8cd1f8dea1756f3c41096ae90b2bb933e185656fc92a9ce785011718d0e8de024b8da84d71574a74344576002822a9ff6d85 SHA512 ae6b6cc2df7bf711cb5c26dcfe0135be8f78eb9b6b1d35b1adaad629ff2442431f64200ca899f364cdc57725eecaa846d8f207d87dcaf5a27b03627f1639c438
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.3.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.3.ebuild
rename to kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.4.ebuild
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index a8c35a9ca566..e2ac78dbd189 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,7 +1,7 @@
 AUX plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch 980 BLAKE2B b7b9cb993d7209182f92fa1924e28b66aadeca88eab3ceb98db1edea10c9d2fe65128cf0f019791478a270d645d6bbd9115a9a9372c6d4e63c8806b5bc06029f SHA512 e184cfaec2910a7389309e43c1f550c48de6b2c6c23a522a1c8bd5f6087fc57b2f3533e6b862d5801aa97f1eee8cc22ea0c4e415b44bef873f612ee039aefdb0
 DIST plasma-desktop-5.19.5.tar.xz 9430088 BLAKE2B 02894dfdc8c0d4535782629059b7d69e7722c63ef47c44077d5b49ac489b53af8440ba361a31a327783fe7a2b56d1812d59c8f6f0797c8fcc81aa90c1fac96c4 SHA512 d7c7b26dc5a7d4804a780833f8d22797312b845962ed4f9218c448fcb3c720c032eca1e79bec5f9c084f1825f0b6f26c34ffe032320396c9092e04a5b05c3d12
-DIST plasma-desktop-5.20.3.tar.xz 15887428 BLAKE2B 198b84ee3c4458e2b0b89e2133175fcbe831ef996195e5a99a6a3820e3aa9419a83ddbce66efaf04613e31645d17155f9be798e2f00af3f14e4b9be0c4618e18 SHA512 e639db19e9bee488ed798c4027cfccf2402597f3bab7f114cb21d24f02710a6129b270d8bdec07d8c0d22d82f9123ea3b39edb304e31f8c7530277b08103acc0
+DIST plasma-desktop-5.20.4.tar.xz 15896040 BLAKE2B 15f8e3f32be659c58d3fe1b5a9c9dff26b1aefe3d247226054a2d96586a8d284576fcd63627540baed7f28346d8ae1aaea3955b09347c968694c32eb6999f74b SHA512 bf04bcc25ba91429625db97c5bd90f0f6417a89897800fae3af2935a3986b31005a7bfc77b76e84efdc8498c50a10a608de7ec817e0d141a5ecfb5a893b802b1
 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
 EBUILD plasma-desktop-5.19.5.ebuild 4714 BLAKE2B 907055b17edd13e279b51463352301b5397b34b189d060f53df1f1394004a726a3127923736df58bc134833aff3cd157fbc95ccca73a4b5b12b0dbaf0728d10d SHA512 66229eab5329c3fdc40018d036dc8bd2d7882a087729c4ea81be2288a1dfe0235a70aad78bbf29ec81fb34ff4d0d5b19f7ba7c2527df62fbd4beb5ee2a0eeb95
-EBUILD plasma-desktop-5.20.3.ebuild 4793 BLAKE2B b772fd355e085abfce81860ef47e3fc9509fa0895f3c12686f9100f35f9045d5197c8c27080d4645f5789d6899926bd80043691663cdbec7db07b96481ff6ac5 SHA512 b7ee5193f07b719f7b3a531fb7290e6a73824b4dd80084e10c29f4416cc42bdf9cab57061b49d60041643d91f364552d6c2ef82e7ff34fd944eb8f802b52ba63
+EBUILD plasma-desktop-5.20.4.ebuild 4761 BLAKE2B 13dcacde0af6cc684ed45b423c0862c261ff2b95b192dfe8a0a50066738d50fffc729dbd4f2bf97cde3ecb7d7cd0ede2fff71b46323b7e675459966ca1f0e2e1 SHA512 f2c5c1975604dadd9f730edcd4285d74ce5d983c11accfaf32cfd85f50c962b82ba962b227b5ef63e3ac639d5c8410e405ac30e89458d653fd76191daec5bf24
 MISC metadata.xml 738 BLAKE2B a846c98d05f6e305354ee0fa36d26df2b60c3db3ee348edc64bbd5d5ab3c8f542b573d9ab395607edf0bc83fb95095147dd52a05beebe8790e21f86a45eb6890 SHA512 659770ee7aac2145f99a512049200f1049474fb97b553dd9b54663f104253939d80b3f35a6efc206db3de834862f074aa2cfaae22e2651198f6b9a298adfe6a1
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.20.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.20.4.ebuild
similarity index 99%
rename from kde-plasma/plasma-desktop/plasma-desktop-5.20.3.ebuild
rename to kde-plasma/plasma-desktop/plasma-desktop-5.20.4.ebuild
index 898aae1b2615..67ed6e89997f 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.20.3.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.20.4.ebuild
@@ -109,7 +109,6 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 	>=kde-plasma/oxygen-${PVCUT}:5
 	sys-apps/util-linux
diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest
index 74d2991579d6..6b87d50238d6 100644
--- a/kde-plasma/plasma-disks/Manifest
+++ b/kde-plasma/plasma-disks/Manifest
@@ -1,3 +1,3 @@
-DIST plasma-disks-5.20.3.tar.xz 63712 BLAKE2B b19d9bc8d486a59b4c7be0912eb4fa90432a90bcb5cca00fc5c30b991edf8d1e61a50c3b278034b0bc45a0438a792f3fe6457881f556096cd4e9206548aa1114 SHA512 4bbeb1cde7e635838b2f08dde62dad414179b4ace32b3f9eeb957f420318770937ae8b242cd5e322568649949d09296824ba471b7c836ea50b0181e2debe6249
-EBUILD plasma-disks-5.20.3.ebuild 1033 BLAKE2B 745e6b705f8cb2b6e9567e263f71733674139f8b92115e048ae6b4b08723e9dd0078ce50a7d7cfbb73adbf1b2c654b26e88da3f978eda149026fe232bbd9f4d2 SHA512 b8fd4bdc59be6ac379ef6809ff9126692c8c064d3bedf02c22539325583e65a754575e434a685e780ecbab36b6078285c46e46f3fb989b7ee098b6548f0efcb1
+DIST plasma-disks-5.20.4.tar.xz 63640 BLAKE2B 206c18d2f38f44cb01a820cbd85cd4792680037371d0ebd032be38e08da583174acde8352c0475bad7e46fc61cb9a00efcdc403f46f373b9cefa5c96d6bd623a SHA512 cc4fb025411085b0e49f37be12c3b175110d0ee8aa9797f8e844e9b1576aeaba93a40fc05474c9c2208ebe9baadb9aa15448ada8c215e2c17da7e2baae8fa2d9
+EBUILD plasma-disks-5.20.4.ebuild 1033 BLAKE2B 745e6b705f8cb2b6e9567e263f71733674139f8b92115e048ae6b4b08723e9dd0078ce50a7d7cfbb73adbf1b2c654b26e88da3f978eda149026fe232bbd9f4d2 SHA512 b8fd4bdc59be6ac379ef6809ff9126692c8c064d3bedf02c22539325583e65a754575e434a685e780ecbab36b6078285c46e46f3fb989b7ee098b6548f0efcb1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.20.3.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/plasma-disks/plasma-disks-5.20.3.ebuild
rename to kde-plasma/plasma-disks/plasma-disks-5.20.4.ebuild
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index caca579ed925..76ce80a946be 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,6 +1,6 @@
 AUX plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch 1327 BLAKE2B 6a9f02c1fb516bb7d3c5bf261ab4b6b6ea1f4a225df1db8f564b25ec6205db89060451362a18d0facf32637a6af6b25c8101b28f0095970e7a1135f6f8fe5f3a SHA512 f38145990ac03799724d7f579ba98baa0078b4cc07805ad5d12b6266ab0bdf3c4dd4999151d0005b0217430197cef74514b330ee1ac14b9530d63e9c8364ed00
 DIST plasma-integration-5.19.5.tar.xz 57464 BLAKE2B ef5ec9f849087ae738a1ff1de14a77994b4486f89b632777caa8e0aad67cad8553bdf1d0553893361ab4c11ddba0caf32464cb49f08047cf2d40375f789c166e SHA512 9e17e1720e5d5c1d3cada3f1eb891d27fd189eb65378c2e0be6547c79d93d5df2f785a3c67d35a4a374d320b118ad3b7d3fb7d968a7f5b629e505d21c83cfe36
-DIST plasma-integration-5.20.3.tar.xz 59664 BLAKE2B d14ebc27edc211a285316b02e9b40962e27199be6b9bc285491945956fe523568f0e1576fae5468cfa09b3ccb7c6b919f7d955bba89292750d4518d9d9aad0b6 SHA512 277848ad4e4fd4579bc4a2f6dd7af59d710fd1f283b9d9c8286d6ee6b26fc9af5694bc84488afa52413b00043c855eeb334f3619cb3e7f16135dcf25a4e5c961
+DIST plasma-integration-5.20.4.tar.xz 59748 BLAKE2B 4878ea35edba2007c4d975c4bc1d78eddce65069b05af606bba61a0969b87600e4712c0c7273e92540d1a488c737e56269e44f1c71c1600f160a359451e1916c SHA512 994069e4fd3d70a2d1d89a06dacf42eea99fa7e9b6dd43adaabbc96e40ec28a0bf30fe34dc0076556f8008ac15155b448540e2991250447f0d8c53d500bdd4e3
 EBUILD plasma-integration-5.19.5-r1.ebuild 1317 BLAKE2B 36dd356ae7cff604d68f8199171dcf88382b391f64f688b19468230b69769e92d59347f4eda807cafc0feb51bf976b09198715a7b679bad1b0a99587e8a23b0b SHA512 faf6475f6332ab198978c91c6348f64eb2b7af87584aa3b48c4db2ef341145e11215e8a9b588e05c5ebc9d8d16bf8d7f16699f1debd07ef3a2655b6c86c80860
-EBUILD plasma-integration-5.20.3.ebuild 1238 BLAKE2B 4bc0c443b23651f83f23fac9a0a8766c0db73d3bd5e33ce8b6d90c289fd6f0289c97c1e26762c55d9fe709f7e3482886c4d46fa13e2be098377f181bf35d81db SHA512 6f1b8b4c1e46b224d9cd26fa4548649decb890590530b04e555ead72676e8e15218b149110a4c527063a91a13419bf13d7cead2fdbfbf07c411d2eaee663a303
+EBUILD plasma-integration-5.20.4.ebuild 1238 BLAKE2B 4bc0c443b23651f83f23fac9a0a8766c0db73d3bd5e33ce8b6d90c289fd6f0289c97c1e26762c55d9fe709f7e3482886c4d46fa13e2be098377f181bf35d81db SHA512 6f1b8b4c1e46b224d9cd26fa4548649decb890590530b04e555ead72676e8e15218b149110a4c527063a91a13419bf13d7cead2fdbfbf07c411d2eaee663a303
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.20.3.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/plasma-integration/plasma-integration-5.20.3.ebuild
rename to kde-plasma/plasma-integration/plasma-integration-5.20.4.ebuild
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index f44324d322cd..5c23a0a09c9e 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-meta-5.19.5.ebuild 3628 BLAKE2B 7e7eac543cb2e77d257927652c969e78e289897377e56b6524d247153145a16fe5c7bf8e339c9e40c26017e44fe102b7f2ab381c6cbb93062b94daec682de5fd SHA512 1e044042c5a6dfad973c4fc2d52038545f1b00dcc2d3a27b4dfd2b79f3e518e4c2ceb3ab231dafecc77a8329fa2e503a122dbf94b85890360701995b9494a8c5
-EBUILD plasma-meta-5.20.3.ebuild 3649 BLAKE2B bdead8e70896bc26f4e929216264c3bf8ea2dbba259da499eb6f78f7193ead0088850a66a65beb4a691527b2e69f5cd57c80b38aea7bd853d7e01def4184024d SHA512 d10566d000fa287e80ef15ffb1d495cb978805e60419a84f636fb7775f013f9034e7733bde7a610d70245e3544b818fe6fd81be4f4b48ad1776af70082555241
+EBUILD plasma-meta-5.20.4.ebuild 3649 BLAKE2B bdead8e70896bc26f4e929216264c3bf8ea2dbba259da499eb6f78f7193ead0088850a66a65beb4a691527b2e69f5cd57c80b38aea7bd853d7e01def4184024d SHA512 d10566d000fa287e80ef15ffb1d495cb978805e60419a84f636fb7775f013f9034e7733bde7a610d70245e3544b818fe6fd81be4f4b48ad1776af70082555241
 MISC metadata.xml 1978 BLAKE2B 4ea42f2c1a260bd6aeab7edcfc0d66bf10a7bd7624e7e8d679747cdd84d0cbfece968ce19ae0f31cc5746280f50e335ed46cc5d57fd85b4da66db941bdfe9447 SHA512 7ff4b7d77a372710105a10b71594e88e6f3e86908feb6d15ac47939e93e2235f3a482b3c1a2a77bbbe63c5de97438fa17a93784e8b45fee0281316d8f9e74f5b
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.20.3.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/plasma-meta/plasma-meta-5.20.3.ebuild
rename to kde-plasma/plasma-meta/plasma-meta-5.20.4.ebuild
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index d6397351d2f8..bf4969b859e7 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,6 +1,6 @@
 AUX plasma-nm-5.19.2-fix-inline-password-field.patch 1458 BLAKE2B b169f54b842e38fb077a793778c9a923e2a5df906abd0c29edee7d5279cd81555617b0b70d50953724737d0aa068618bbff9eb341eb3d9fc542cbdcd982db3a5 SHA512 90be93b2a95cd2a69e7d8083d33b7c0ea11a4b09e4396e853f6147b304dc60635274a21ec91e23637c6045813586b6ef52b670d273c1bf29b5abe3a48ed65b39
 DIST plasma-nm-5.19.5.tar.xz 855504 BLAKE2B a2437794d9de5a0fda6328dd0e352fad956710cef06f9bc2d6590dbde7f2eb469d051db6fc4ce647fe59bf95e48e6e6c9ff68e512a2992abe183ab309112f94d SHA512 2fdd42e7c9bba0b069e0ca39f8ef996b36a807a4065172a816023c32d5d24869bf92c577c9cc5a08bb9e8b13c628b7cbd8346d17dc1e6814c931f7f7ec9439a7
-DIST plasma-nm-5.20.3.tar.xz 859028 BLAKE2B 3a53572b5049c0e5cacb48a577cc6492d2b7098b7a903fee5f670943f95047871dfbb45ee25f6246cc155249abd5732cc047608e6440b3ebec05f5f6db801343 SHA512 9f98aba2897d7f2fbae155b4460a870476995df5ba7f4599f53e223681847613fa9eb2ef848ebc421612262a82277d4406372a68b064bcd98a6ebf7962b598b8
+DIST plasma-nm-5.20.4.tar.xz 860676 BLAKE2B fa57643fcfead2e3ace003e6ed99e9d4dd4a262ae9aa19cee647b808e4a82b16c5a39445b0f230e8c6b042c595a55b60b4cf13fc6d2d923077019aa487901fa6 SHA512 305ce3d0cab6aa1f8eb42111291866e59e9f1b3e1bc939cb6cf0f6ef911cedf07bd416200cf9d1bc93682d8604f159ec8ddcde43df47b43548a16927e6548edb
 EBUILD plasma-nm-5.19.5.ebuild 2411 BLAKE2B face78008487cde60f4c07d53389a3fd99e83e4bfe79ae04bb1c2bffb76c4ae22cbbb08fde8738d1b758551477e325604025515640c01b260b4351c0321c3e81 SHA512 2a79e85fa7901df76e16761bbc63bb9f4183df4940a765196a4e7ba793d3e1f8c43de960ba3061e470f13fefc7817de2139a1ade6b7834344f3885fb3d3b9364
-EBUILD plasma-nm-5.20.3.ebuild 2323 BLAKE2B d9879dffd379f5cc6e49008b86a58d91763bcaffde9d72fa2ccfbb2f0b45576fd0842b906c825a60e957d406f049e852ba865746ae06b4f924f28a4b9dfe1c5b SHA512 1839dafb727e6d322c558a40e08ec2657d7184adf68120c81dd83de811f576dfc237c677b8aa0c5ff4b60b3eb30718a8df44e67f8cca2d85cf1f3799b6816962
+EBUILD plasma-nm-5.20.4.ebuild 2323 BLAKE2B d9879dffd379f5cc6e49008b86a58d91763bcaffde9d72fa2ccfbb2f0b45576fd0842b906c825a60e957d406f049e852ba865746ae06b4f924f28a4b9dfe1c5b SHA512 1839dafb727e6d322c558a40e08ec2657d7184adf68120c81dd83de811f576dfc237c677b8aa0c5ff4b60b3eb30718a8df44e67f8cca2d85cf1f3799b6816962
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.20.3.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/plasma-nm/plasma-nm-5.20.3.ebuild
rename to kde-plasma/plasma-nm/plasma-nm-5.20.4.ebuild
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 7ce8601f7c70..402dd6a87fdf 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-pa-5.19.5.tar.xz 108156 BLAKE2B cbbb50c102d77b4eddb865daddb432e4ec1e7b27d033ecbd87c0bb8d64b565eebc206d4c13b197ea4f5bff4693e4ef9c9e3570e21fc177adc58f478683269603 SHA512 90d9faf8ab2f4fc7ecdc3e4fa84276ef6c7fc3abc2b2b7a0407e9f001c10330aa98a89ee68602c5378e4e46eec89a88c55e1e01dc2d755e613e4f584234331b6
-DIST plasma-pa-5.20.3.tar.xz 114148 BLAKE2B 2aadab265c75a364485d3d993bc5019e4f42635bf7c9195b48014e570cfa9a87f050d6dee5c810b1b1e6a8a09e3b8747cef3a0d37887754a67d89f3dd7f639b4 SHA512 fff348cd08e1258c215f5a0c515412541451a4717017910f694a48dcbac86e19b24441f6f8adacd9926a6e77ee831197c568dc8b6f9656d4a5faece9f7ce5ac2
+DIST plasma-pa-5.20.4.tar.xz 114080 BLAKE2B b7e20010f59c64f01b6bd46b048d5856fcbb4780748d17c9610cd2871323a100992a6863425b5841507beb3bcafc055492f34b99c4958e4150f5fc02d9dde7da SHA512 c84887031ceaecda59d391b886420048d89bda919ddff2f63e2db83ceee4f68ecbe24e46370cac21870c865e20df2c210bfa6ed11a285b6128e61966959de93f
 EBUILD plasma-pa-5.19.5.ebuild 897 BLAKE2B fce148bd7d433d3655a74cdf735b139bf59f22721e7e14f1b559bc649f2420fc64713728c7a185fe33c9c828ae1943419da48e3a32f88064750ff77e2302d215 SHA512 b639dff3b9b9e559b10d39574ab5dbe4898886993e1ea49fcc291bcc76e1555c519643a5de9caad1c7b4f756bc7b700f7d704180e019891806ad3ede250e605b
-EBUILD plasma-pa-5.20.3.ebuild 916 BLAKE2B ec6f12c7c978b4ff7f976b0f18260890e39e00e9bcd6a7e2e36f408557e24971cbf77f9033c32668a0e1b39b67bfd1bad17872ca385f7d53804e4de58bec2f56 SHA512 79e075b7c78b2bf473b9b6c4d75fe12ef27811c6ca0956b4c20bddbcbe854fa845c8dc0ab32d14f11cd2f3696e9fcc353dc2e1df43a4427f4813416779905ff7
+EBUILD plasma-pa-5.20.4.ebuild 916 BLAKE2B ec6f12c7c978b4ff7f976b0f18260890e39e00e9bcd6a7e2e36f408557e24971cbf77f9033c32668a0e1b39b67bfd1bad17872ca385f7d53804e4de58bec2f56 SHA512 79e075b7c78b2bf473b9b6c4d75fe12ef27811c6ca0956b4c20bddbcbe854fa845c8dc0ab32d14f11cd2f3696e9fcc353dc2e1df43a4427f4813416779905ff7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.20.3.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/plasma-pa/plasma-pa-5.20.3.ebuild
rename to kde-plasma/plasma-pa/plasma-pa-5.20.4.ebuild
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 4d9c0cf7256a..972412a396eb 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-sdk-5.19.5.tar.xz 263576 BLAKE2B 4752ba4423930bac21893140f397595dc1b5fe9238b054043a7b961756d762a11bd50d806c779e59dd512c2ca304c38bb72ebc1d811d89bb46746cc7f0528dc4 SHA512 66ca604bd27a7c48f8127f04e43c0093c098820e099c944cf7e4715ee0703175761ce6e4be270ffd78b0b1a87fbb2a8e7f670010df0032c4148bcf4275fc32f6
-DIST plasma-sdk-5.20.3.tar.xz 267000 BLAKE2B 5b9e55f372b05769c5fae2a918e614741d6b7ee715beafbdfd779f25dd0ab1cbab559091a25486a40512c093d07d4016ae94457d7e876bc98186b50da3140d51 SHA512 de0efdabe2db6e6cee8fa143657c5f60d8e6c1d621900d2316ee823e29e8ace907ff541309ac7bfa87405369f781338af5462036c47e10ddf8009eef76c22d03
+DIST plasma-sdk-5.20.4.tar.xz 266644 BLAKE2B 3ec6b5be2f49981e8e122750b1d40a790fbec41bfb8ce385c993f9c956a96ae7d26400ccb6fb584a781bf907ef2433d6000e6d45c902343781733d56ea43a336 SHA512 34de3ae7561aa0c2840c196e7d19fdfb92140744f75b994d09d84a6fc853ac4b023f6ae45d04e345617e233d653b2aa670c764a6de44c46dc83a0850cea603f2
 EBUILD plasma-sdk-5.19.5.ebuild 1254 BLAKE2B b441d03b8efc4a4313ff64fbd2043d88686aa560f34dbf5ca5e11e7a63987edbb7a528baa80f0c6189b7f5ebb308e8c60830095d8d38ac1639d2d63584bd2aaa SHA512 68a3725ad4cbf259512d135ae2c13829442e5dff5b8f40deb8ac21ac164187798a4a9ba7950281b4c811441d6f68d5479287c8f762484f1d492a9bcc8111e5e4
-EBUILD plasma-sdk-5.20.3.ebuild 1257 BLAKE2B 85d81b6033ffc9aec7bb3f1054f439457ba9e978c0fe89e164f5025900a36156e2846bee49c17ba7ce2472263564e609a77b253bc9c55e31776d4b3465039b4b SHA512 494a02f5bcfe6ea8bc37c334c5e44494ff9761970c5f21677a7272f2bab9305dce7d66203917c68471323b71cc94e382ff20e6b3b638c971149d96fc514c3917
+EBUILD plasma-sdk-5.20.4.ebuild 1257 BLAKE2B 85d81b6033ffc9aec7bb3f1054f439457ba9e978c0fe89e164f5025900a36156e2846bee49c17ba7ce2472263564e609a77b253bc9c55e31776d4b3465039b4b SHA512 494a02f5bcfe6ea8bc37c334c5e44494ff9761970c5f21677a7272f2bab9305dce7d66203917c68471323b71cc94e382ff20e6b3b638c971149d96fc514c3917
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.20.3.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/plasma-sdk/plasma-sdk-5.20.3.ebuild
rename to kde-plasma/plasma-sdk/plasma-sdk-5.20.4.ebuild
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 2fb31145e69e..a874b3b384fd 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-thunderbolt-5.19.5.tar.xz 51300 BLAKE2B c0a9b3665d58ac57c4e4fc71670edaf402d69e8477e0b74875df2d4d666ea8f1c1ce2d0b950f5f20950a431837d651a545f8df19412b60332e0b5d3b08beaa5b SHA512 34c0cb7495b03eaf4f84426fbb6ab2a8b3b336fa1a7f32014231f302c3f1a0e061462e32ded86dab713aa2b602ba5311da3a45e0352f63f59d6e503c1eb7905e
-DIST plasma-thunderbolt-5.20.3.tar.xz 56344 BLAKE2B b6d39dd01d4dd4eced36b980ca19e3dcdbf248f6244d1b977f57b448cfd661794d5886602e4c5fe38171dc05a7ac62b24bb61a1471af53fdee78177f80a1341b SHA512 081aafc9982d9e3087d5587e7fbd9a6cd694e88fb7c985d60ba3330a21f71390ab445b652fe5b73ab6655264d32e4a2c2f26298033e316c67094965d658087cf
+DIST plasma-thunderbolt-5.20.4.tar.xz 56784 BLAKE2B 8a0318320759dc4090cebf55ed93fd6ec30e9f5edc60923e77452a1f95fa4401530dadc2420aba762120d4257476a3c448680355ecedc52dad0826d7c712cf49 SHA512 e7032a07587511b6bae99d66de2902dcb4ba6b8e2e5d5e5724ad44255040ebf545f7fabf5c40484b67a462ef3820a7d0fbb8acd8faddcc3c27d8b7e61f0051de
 EBUILD plasma-thunderbolt-5.19.5.ebuild 890 BLAKE2B 5df170041f9c01861849b9274c79d71a2104d57df8736c868445c167a90df77e5e981b358ef49fd7793d426570af2b020d3abf0416b324f02d481964281041e7 SHA512 4140970ca8d0a2bf023fd9c6d249cf43a813bccd7f4f3ed7c751abb1489e82bc293cdc32ef02ddfc9e79ce7f6567ad10f47b3aca97cb23ee0014632201f53a6e
-EBUILD plasma-thunderbolt-5.20.3.ebuild 892 BLAKE2B 1ed1565791eeff09c5166f3e01ff721a265fed18b8169b5798304d6f58aaff6f223b79383f3190f4d87650d88f99708ebea469e5f607451825e9a27c2c0aea19 SHA512 e47232f16fa7d45de91de77f6a1f5728a698582dd163ac9a75eb6e02ecf4206571d4c4115fbe9605776326d6fbeca4602430c517bf0e61ace46b3e2840a2e92a
+EBUILD plasma-thunderbolt-5.20.4.ebuild 892 BLAKE2B 1ed1565791eeff09c5166f3e01ff721a265fed18b8169b5798304d6f58aaff6f223b79383f3190f4d87650d88f99708ebea469e5f607451825e9a27c2c0aea19 SHA512 e47232f16fa7d45de91de77f6a1f5728a698582dd163ac9a75eb6e02ecf4206571d4c4115fbe9605776326d6fbeca4602430c517bf0e61ace46b3e2840a2e92a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.20.3.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.20.3.ebuild
rename to kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.20.4.ebuild
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index d76c0bd3a352..5e7f8590b8b1 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,6 +1,6 @@
 AUX plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch 1928 BLAKE2B c7fc121bd0956d00f51831e92f7178f134cd777f50529a9f3269ee7248e2c984f44285b870f57b7e8252c3a7a74affcd0b0d5bcea8948d6e9e0c1c68c3e536cb SHA512 2dfeaa620444df7d6f5a36c9a4957c9783b8f37c2c75576a21712558b81f7b027f5753aa5b62560045476e26de822f0047d3670c8b3560d8f1606ed169b0e6c9
 DIST plasma-vault-5.19.5.tar.xz 145448 BLAKE2B 3b9dff74ab3c7120d9fe1c40007333d514d6773602941987bed55b977c46f7e2b8a27c125c258030a5da638c30e83186d0097ca553e437c2efc13e390b7471db SHA512 d2c00601dae41b924ffb174a7fca9b508ff6e6ae052dd72fa2d9b6767718b4d40a25a7b7c9131f197d25e113c23d74df36829634ce8d83d4a76355aa66ce5771
-DIST plasma-vault-5.20.3.tar.xz 158264 BLAKE2B 91138c250e308b6fa45025c7736f79cb47000fc7efc71616b60a266d64d272b6ab17f73a3fa1b3f321d99c468b58a8ff4964e123700bed5930779d377cd3f9e9 SHA512 47cb0e8f2ba64b3598fee8da7e458bfbe622b5eebdff4c47cf838ca83d96aac7a969b1d97d964aeee5589c688e662bb6c17f1be9687db5bad4b57b221793345a
+DIST plasma-vault-5.20.4.tar.xz 158220 BLAKE2B a1e57750227a53e025e5b9f65f207780c06718cb2bad244ccf42c92ed2c3270f8dfab64e29d40e3897910bee8abd2460dc6d1d8ee35b8055b0a1867630505221 SHA512 39ce54e5648d7c123ff33b2e8403b10d82fd84e5161085a019bb98a4e8c5f9cb391fc0a5eb3cc457d3fb6f4d3758ab6da0c5f6c1dbd936b48f4be83b8ef2a1dc
 EBUILD plasma-vault-5.19.5.ebuild 1406 BLAKE2B cca54b9f66bade1812e2419327ab7a7fe5a553c69d1bb4e872dbbde0fee3ec957547b25683141ab1a7a43b7aa35465e7aec518ce859e5d54e830fd759b1fae8f SHA512 6a5faa085e8fb38d80d1d861e62bedeeda9f76705357d15ac66aa7b37c6d9eb96f6a648e47d6219492eb4bab8161bf212e70f5cdb81100c60392a323c438aab9
-EBUILD plasma-vault-5.20.3.ebuild 1277 BLAKE2B 541600310cea567ad2997f6d6b2a586b42ffc3a37bba25e489aebfed1f07fb99aa22aedd9f6ab6f8e6ff6985c0186680b1ea76e7dc74b2391eee89e455e35c5e SHA512 8c1018fff12f1a59f5e1e9225846ffcdfb453fa23374eb2a713b9cc891c4984a888ec52e3fff0899a19bdac3f9e899e844b6462344976886d3ff042ad29b2f80
+EBUILD plasma-vault-5.20.4.ebuild 1277 BLAKE2B 541600310cea567ad2997f6d6b2a586b42ffc3a37bba25e489aebfed1f07fb99aa22aedd9f6ab6f8e6ff6985c0186680b1ea76e7dc74b2391eee89e455e35c5e SHA512 8c1018fff12f1a59f5e1e9225846ffcdfb453fa23374eb2a713b9cc891c4984a888ec52e3fff0899a19bdac3f9e899e844b6462344976886d3ff042ad29b2f80
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.20.3.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/plasma-vault/plasma-vault-5.20.3.ebuild
rename to kde-plasma/plasma-vault/plasma-vault-5.20.4.ebuild
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 3e34a8fe9e18..dc2c3889e59a 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-workspace-wallpapers-5.19.5.tar.xz 41824532 BLAKE2B 08b90cd0869e5935320a00fe7687c6a15a3978bcf3288e8e37f48dcef53baaf84921f573949f8dbeeaac2f5861151a4625520fd6a89de264e150918955d39da9 SHA512 79723d50f47412d4904effddbb641d75675a66f517e70164bf55f89e31cbb8246ea1617f90e4cd8e1c5ec169332187586443ead7bc2721b0df85a693ada9287f
-DIST plasma-workspace-wallpapers-5.20.3.tar.xz 45931672 BLAKE2B b631f041405a32eb7db395cf7e517f69f18388aaa00397c5cc194077c9cf6ac59b993d1611de9da7ae17285cfaa5f77fd8d5b65cc8ccf8047d158bbd18d34c3e SHA512 33f05cb189b285b554d4834fe554a371649d25af400998d1ebb6f1b0010c097eb482deedb5bf7c6ca6c865456ff03e137e196afb8f21c296dc46f5315d7197df
+DIST plasma-workspace-wallpapers-5.20.4.tar.xz 45933108 BLAKE2B af2fc46b8f5f9b5fbc1deb6ebabacdc7a3948b806a52bcaa9ebad71c50f2f6e296d9215ecc1124f7ea4e13e3f251563b30b1544a5b0aad7f8f4b1f37cdf462f6 SHA512 894f54b1d915b4c60d3bd6ff0892dcbb2de874f5268cd93a17e756524e0337172069e49955e898626b65a4b1418be9b2672aa72b623303f74080dffb022d98bc
 EBUILD plasma-workspace-wallpapers-5.19.5.ebuild 348 BLAKE2B c449bc49a75155acc1348de26718af57f8bcc58c75effd5102f471f4b6acfd43a969d4a4cca058d3aea144dcc3d8dd133f22b52ff20ef2f10b5e73d53ca642a9 SHA512 0b1b68aa9a5b5c0f2b4964f71b1ff59f2cb2f1f6a542f6c3182b8ec838ee3d6778d5bbc99b665363a7e68a1247fac50d8c17184f90e1e0a99427a3b718c39412
-EBUILD plasma-workspace-wallpapers-5.20.3.ebuild 351 BLAKE2B ebcadb1a2f7539dd43ee5132dfd359b39f2d2004b6b513c8f51f25480f65f626b2eded11361bcf1d9dec3d2607ae17e7e4b074c0efac898f2fba6c5c3514ae9e SHA512 4ccb55e72e0b523a380f4d4c1aa94c36d10b7487705987d5677308208d33732f7b3a4029f62400dad65a185eeff0b39e65be6d33fcac9c5a3ec0273cea4c8f1b
+EBUILD plasma-workspace-wallpapers-5.20.4.ebuild 351 BLAKE2B ebcadb1a2f7539dd43ee5132dfd359b39f2d2004b6b513c8f51f25480f65f626b2eded11361bcf1d9dec3d2607ae17e7e4b074c0efac898f2fba6c5c3514ae9e SHA512 4ccb55e72e0b523a380f4d4c1aa94c36d10b7487705987d5677308208d33732f7b3a4029f62400dad65a185eeff0b39e65be6d33fcac9c5a3ec0273cea4c8f1b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.3.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.3.ebuild
rename to kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.4.ebuild
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index b32e6ecd2c9e..46f1520c7972 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -6,7 +6,7 @@ AUX plasma-workspace-5.19.5-gpsd-3.21.patch 997 BLAKE2B 034a08a4c524ce7b4be4d41b
 AUX plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch 1608 BLAKE2B 1d6b2679d7f41863f83c69a2d11791b972275f7e9b838bc8a252c8ed4661f5774d6b43c019d9c4653f7f9af407b154869378d6845fec878972b6bd59e4fdbfa8 SHA512 08971de678b6e4c9148c4f55b44eb64870a639c9b0ecbeacdcea3565e9204f720205fd9707cc52c3284d94c0228d3f2e1464a70551582af4d49e95172f64f390
 AUX plasma-workspace-5.19.5-login-button-size.patch 2035 BLAKE2B 57618eda7a8d5071501998c9b420bfb007acd181df81068a2982fd2d40ba18398876177f221203de8daa4c53c4ec00260cb85a9f8f10c3bbe5d2f9449d9bf831 SHA512 16ae3fc015318d24c8e01adfabff4b304c98292854b805384328c47c7823d7749ad52eeb6acccc1ae9f2a2d4547929a4039e4174ab58db87de6c864b91d0f135
 DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
-DIST plasma-workspace-5.20.3.tar.xz 9031572 BLAKE2B 242286eef9d15b9dacec0dca3a7899c538141490611f932e0ebff59e1ea7a54cbad56e3bcad6e4a720b4f7610de2fc0e128288c3fe3d2b9e8255ffe16e0b86fa SHA512 c1daa19834ea7997a8e44fcb6ce9745d5bac56a0a4d99320e1e3e42e9cb5489aa36887e3c2bd8e385644d555d355211c9dba6c40edf2471478566c531a2d9c89
+DIST plasma-workspace-5.20.4.tar.xz 9040936 BLAKE2B ac21ba0e094aed811d3b635ef71a468ac398fe54371cd0898324692cf8bb5759f526008ab9201f84cb4b8af9f948d73b8ada943cff2e8a8e5016a1a1135931c8 SHA512 071ca0073ade4206bd42277114bc2693698cb91c4f448ddbbd56f3430ed0a1946afb474a6b80cb11ee907a5a83fefdde06866c7a887bfbc3456a64b60a6f38e1
 EBUILD plasma-workspace-5.19.5-r2.ebuild 7161 BLAKE2B 616371d4525a652790da41eb4e8f126f35f73b200bb90cec0715b2194b249dd9b0db638c93b40c042a261268c87c22d8ae95324790592f2841c43629c3c9d0d1 SHA512 6e757950dd26c93fdec581dcb8a04eaf5b090d9d12843a8309a142e278e3cbd2278a170616a48dd72ac64ce6face681d72ee48b2bec407f14f3537319564c149
-EBUILD plasma-workspace-5.20.3.ebuild 5955 BLAKE2B 1638d4c45b99755ab7e7b060e77870637c7c88266d7664f1507a386dc7a035475095b3ea6cc4d51130c818105fbfd5033af43014a495af5eb9b147326a5a836d SHA512 3e3204e35fd23be45a809394bd8f5185e7008c8a8dfc21c1fad2f1fc0db9a232ddd6ede5ccd67d4cb67ce74e5afce0d493e5e80404c520d8fe76183244681eb1
+EBUILD plasma-workspace-5.20.4.ebuild 5987 BLAKE2B 312e1d4d238639d2f11f7ac4e6c982fdeed7b74ad1fa0cb59ecfe914f590250af7d3c467b966d7e488ff18385870434f2b2a806f6bbee896fccd707320c97f3e SHA512 05219007ae9a203c2f96d51b811fd1aa10123315c4e242f9b6543e9917c3b0a3a625debdf74bedc385f5493e0d18a5b268b9ca345e01519883968516a490222b
 MISC metadata.xml 848 BLAKE2B 60b6be066ec5e396d88f6e57774e7bde6e9906de72b808d7e4887fde6f8fdd4e99667e30e244602e92c10aa8950d583adf78b6e122b4a9dc60a7a538aa69663b SHA512 77e385066c166cb8a43b531e0e079f39004d645364237d1ead4a26816297edec7283cf551310f1c0643692eb8794bce74a949b00b049f140da2e2f7a6fb2689a
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.20.3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.20.4.ebuild
similarity index 99%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.20.3.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.20.4.ebuild
index f0d127a1c238..dcc51e97f629 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.20.3.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.20.4.ebuild
@@ -72,6 +72,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/plasma-${KFMIN}:5
 	>=kde-frameworks/prison-${KFMIN}:5[qml]
 	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
 	>=kde-plasma/kscreenlocker-${PVCUT}:5
 	>=kde-plasma/kwin-${PVCUT}:5
 	>=kde-plasma/libkscreen-${PVCUT}:5
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index cbbddab6cf82..f890cfa45392 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST plymouth-kcm-5.19.5.tar.xz 41680 BLAKE2B d9a7a0c5d512322d0a9074e810fd8ebbdc2308985f471280c9c862f71aef77270fc39c9a6a4b4b2e8691c78501496fb101cd288b4b39b638cfc2f8f518ca50b5 SHA512 fbcebcec7ee4c69491b6425c5cac09801a26310ff15bc252bb66bdf8e322734c0d1551b97a4eb3e725e08e70010a0a4949560e2c5a58f61d1aa004620c8ac6cc
-DIST plymouth-kcm-5.20.3.tar.xz 43076 BLAKE2B a308b822565aaeceb32dc2130e9c282d6f9364a9d0faf726a0e663ac10890b27d7f483108d8c08e41d2b9293b4e6f548082a89791962b7bd28446678e6fe5e98 SHA512 6a64deba7eabfd01b17ec997be7abc330d1121ac8c919628bfabaf88eb3e92928d5e7150c13d1a809f2866eec0a73626c1e8def08709f1073560e88d1a79f6e3
+DIST plymouth-kcm-5.20.4.tar.xz 43008 BLAKE2B 6b6736a7e85f5e4782357b0122792a6b59b688150a95e4360202766b6143116d4ec30bd631b7943b3a8dc0c3981b8d4b59f39eff2031eb4ce8d66c8e88a8c0f8 SHA512 00efdf859c94d50192fbca18807911ae3e9ae65e20a78982ae3b2c19c32ec9f2e1958ad052bb51c9c531591fe45f4c5b79ea500f092a316d49e209b2181f2170
 EBUILD plymouth-kcm-5.19.5.ebuild 958 BLAKE2B 78e51aee8b32d3ae877e2302461c7d27b4acc64a5f96b88de213d58bafb2bf1ee5e5167e01c0ad0e1a1657a504f6cf4602b0190e56fb1a2af8d7a704dffca324 SHA512 a919680546d045c374efaa5ed77bcc2242a106022a66f9fbd8bac4b7139e4ef0a472ff10f0b206dc12c32b9505054ddbd442da4c9448a8276bf9faca9e534e4a
-EBUILD plymouth-kcm-5.20.3.ebuild 961 BLAKE2B 051cd3223d00cecef5e3891441f57b527ecee2bb5f368fb184304fb8a2b24848254318c134c3b5c87b06229d6d163b2e124857455d990610774b09c2a9949070 SHA512 29c21f4fd735541770ab756d173bf9bc4240c813bb2a04385e5c2c4123acbe0c3774f90ea76a05bf62cb58b2d9e6e73717bc1d5ef6f81918e8f6ed17d5074a38
+EBUILD plymouth-kcm-5.20.4.ebuild 961 BLAKE2B 051cd3223d00cecef5e3891441f57b527ecee2bb5f368fb184304fb8a2b24848254318c134c3b5c87b06229d6d163b2e124857455d990610774b09c2a9949070 SHA512 29c21f4fd735541770ab756d173bf9bc4240c813bb2a04385e5c2c4123acbe0c3774f90ea76a05bf62cb58b2d9e6e73717bc1d5ef6f81918e8f6ed17d5074a38
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.20.3.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/plymouth-kcm/plymouth-kcm-5.20.3.ebuild
rename to kde-plasma/plymouth-kcm/plymouth-kcm-5.20.4.ebuild
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index c3a1f41fe5e3..659a3e301e4a 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,5 +1,5 @@
 DIST polkit-kde-agent-1-5.19.5.tar.xz 44824 BLAKE2B 117b1ccd5ec5ec38ec45edd45c33671b30fbea7bf53a444e9e172cad4d88d0165c60e59d9664348422f11930ddb089f574af03eea743c10e85b036702dc7ed3d SHA512 f0e27056af864535c533a2bedbe2445f9e1648789150eac16031a1486f6676f8a4c929fee5f8cfbd7e48a904045f6c2d283083b33bbb823a2da27549d42090a5
-DIST polkit-kde-agent-1-5.20.3.tar.xz 44608 BLAKE2B 891dea94747a2f6b6cd1dcf2cedd57fa02088bf9300450d6937892a1af320407cbed10ef05ad49f228f8ce2f16e25d9891d03687677bc6a4ce2495d8db55763f SHA512 9ad06af2aa2d14c752bc804f86789276a8e194352ce7df1ea1dd9eb718b0c20787e6b84ee0f2fb6f761ae3439f82501fb35c3a96077cf02f1621ff0f4a36ff22
+DIST polkit-kde-agent-1-5.20.4.tar.xz 44656 BLAKE2B 02e24220cb9a650ac18eef9db05e49cc4b6c999890df557bc73f202f94c1f7c40c1f940da7d71e2b7e66c8d0db972c5402fbe3956f9dab56849735efbb64785f SHA512 4b04a25eb0b8d8b965c1164853eea9e3b336418fd795e302154167e87d9bbc5f7982c54d20d603b1426e19ccbcb8faae75abb4275d16fa3b5f6d11e5207e0cd2
 EBUILD polkit-kde-agent-5.19.5.ebuild 797 BLAKE2B 6dbe80ef5baa4ad5176045b9826863eba32332d96492c475a38b0d0cc4439605dfe01b7834bf5cb9d181cdcc99b8195c407bb2dc4e590757ad465ae877619c69 SHA512 4b83db76c503e0f790cba85edb4e5c8f9090553f49efc0d5ac668c2fe4247e0c65ada2a2993723e71a24f8ac1b6b30f0a75979e9893b9cf8cac363606013d9d4
-EBUILD polkit-kde-agent-5.20.3.ebuild 800 BLAKE2B 3dd1ef7e5024989577655a572921146520efd5382ee3678e7568019913da09a841e5e6acc56ae872dc34b2ebb82ee763cff4c0c4feb2d1985e7407b3fce94d5a SHA512 7e0bf47937a8a8add3c329472639e9f174cd6312fb36a2ed6c0362d7a5117061fd2b1b602b7dcf30d87629e86337dc72d39209b7cca0a74a38abd62ce754c695
+EBUILD polkit-kde-agent-5.20.4.ebuild 800 BLAKE2B 3dd1ef7e5024989577655a572921146520efd5382ee3678e7568019913da09a841e5e6acc56ae872dc34b2ebb82ee763cff4c0c4feb2d1985e7407b3fce94d5a SHA512 7e0bf47937a8a8add3c329472639e9f174cd6312fb36a2ed6c0362d7a5117061fd2b1b602b7dcf30d87629e86337dc72d39209b7cca0a74a38abd62ce754c695
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.20.3.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/polkit-kde-agent/polkit-kde-agent-5.20.3.ebuild
rename to kde-plasma/polkit-kde-agent/polkit-kde-agent-5.20.4.ebuild
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 836fe43cc57e..a134dab5a204 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,6 +1,6 @@
 AUX powerdevil-5.19.4-ddcutil-0.9.9.patch 975 BLAKE2B b151f0109b4ee804359c63171df3020334f8410baaa4f24155d9f478540254645866eabb594040f334ae811d2bb6c4016cb5c175a64626aafd229babe312e391 SHA512 d1bfb6d7b16b80077989af9bf7600d063c5811d1fa115ce8985099022b468bacd54a4cd41283766780eb5734dc3d8d26798c9d74f5aa7f2bc003aa76b7c131ad
 DIST powerdevil-5.19.5.tar.xz 600388 BLAKE2B 0b99c229b576d8a033187dd81a0f6f199ff991f9c1eb4c6856a77a7ddd269ddf1ce50a76ea71821487be11593f5740a7d66a2af3e6b6c1f983a5e87bfc008b9b SHA512 5f1b1e8fdcd996769024a4f008527960fc91af32862047fdd13674ddb6925fd7b1a024a5c45182d14be32aa0bb8ba1bc694476061e480bcdfb3bdcb65d60cb16
-DIST powerdevil-5.20.3.tar.xz 609300 BLAKE2B df64f234c68abb5145263e6f2d7089d9780a62aa1aafb4cac6e74f0d65f5ee6dfcac7f2c442d34e4e468380098ab67cdd806550be7dd6e6154d091d1669d8ff8 SHA512 5fce022b73e38bbf6098de86b8ede2bffd571cce9985f18f57c2ddc1e2a2e3bd8d1fe4ced9461f17f68b4b68a39e0b6210a75d86f7f41abc916362ebd25279c4
+DIST powerdevil-5.20.4.tar.xz 609696 BLAKE2B 3ef8be43273542873ce7e808411e87bb6d1bfa389a9d9d834efd9a75706e027987541a7fe4834fa44025e37ade4407e3bba760a01a1040694552d6c03408df91 SHA512 a4f40fd8e4f025c9fb1e0cec371136edec4d7f97736dc58f142eddf66ce638d4f83013edbb3f0aca27e80fe61ef05f15648f5a8aa68d8dfc94894ae083ccfb67
 EBUILD powerdevil-5.19.5.ebuild 1945 BLAKE2B 764373c637212f2bbe811f850f6963980c0f4675b5ee34ed93defe6d63cc2eb19c83286c311c77b55701b6df34ff34953bd2f479a19572dbf395bf4077c76b81 SHA512 cfb3119edd15b9d212b1296d761bf4cf6e07cc59b21ea5406674e877177d21e7a644ccd62d211a8384954a678d2f7c4c91d8e4715c44a40545243537515b4f1e
-EBUILD powerdevil-5.20.3.ebuild 1947 BLAKE2B d67cbe9ffadd9ff582870e0c7908811107f1d3184647d0d6719679c88bb4f02dba0466a23dbcf442b627234576519a679021f37527412329731d63f87a26b0e2 SHA512 95167af47d29051ab417f8b4589580479a1d33a01eebb714068071dae67d4c9ae6dfbe2a5161856036b3ec6f229300fd775ec46726178f8234d98b2475c03aeb
+EBUILD powerdevil-5.20.4.ebuild 1947 BLAKE2B d67cbe9ffadd9ff582870e0c7908811107f1d3184647d0d6719679c88bb4f02dba0466a23dbcf442b627234576519a679021f37527412329731d63f87a26b0e2 SHA512 95167af47d29051ab417f8b4589580479a1d33a01eebb714068071dae67d4c9ae6dfbe2a5161856036b3ec6f229300fd775ec46726178f8234d98b2475c03aeb
 MISC metadata.xml 528 BLAKE2B 9548d3d1af958f0ad037e7df6f12a844c0e0ff51376512732b03520856914321e34ba95a533a003f581759f878b61393cf573e90d7818b8ddab71441d9a67f05 SHA512 72536e575abbe4fcc7e3320b3649f87d33dff3af231b54d06707802397963e373962df1d8ffda7c3975b298804ca2d42254d339531861e88590c44fa49fce58f
diff --git a/kde-plasma/powerdevil/powerdevil-5.20.3.ebuild b/kde-plasma/powerdevil/powerdevil-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/powerdevil/powerdevil-5.20.3.ebuild
rename to kde-plasma/powerdevil/powerdevil-5.20.4.ebuild
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index f53b4e4feaba..5f6adb6a64dd 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST sddm-kcm-5.19.5.tar.xz 62468 BLAKE2B e02a9c839cfaeb8d90a9bb317a6025be9d65399963a4ffbff562572bcf722d499cd20e007f13614f609ffce75322ee6b834b0cc760dd59d35952bbde22d85ecc SHA512 5eb79696addcb08e8c6eb95960a43cfd7ec5013a7948d67b025430fd09ad20917a71e903b5a2b0b0f1d47e7dbce7473cfa69dd143b9c6b2f4fbb8828cdd86704
-DIST sddm-kcm-5.20.3.tar.xz 64612 BLAKE2B b4048ccc4587f1a3ec037ab0a297998a5a68c0357ba2dbdee758181bb7e4f3f4288360719288d2ad79b72029bd5a0c8050a97f6961d6fc44ca015a2276574621 SHA512 69a8ecc3c3b51d7e1eab63bd7f7b63df677846d0295fe51d6de73b5af981d1b380781fd70ef32812d3c86a5ae67a9513607581158ee9b4d336b070031f118841
+DIST sddm-kcm-5.20.4.tar.xz 64804 BLAKE2B 46475f145aab01747c170ad633dedac9b08dcb5d725c1a89eb064218373322f23dd8a9a8d19213a3cd54bb1aa7b3bd56b2f7c806183a34ed767227e00954efa5 SHA512 f6a509d1d4351e17cba0d15ba361206efcaa4be1f42ec0341473de1857cb8220549747788c668f2e1728d9466ef9e8c81bf2d3f933b6f149b4ccff9400c165f9
 EBUILD sddm-kcm-5.19.5.ebuild 912 BLAKE2B be1a56103d4842a9677d7e123d05f0dcfb67ed81029d78cb105c09e12b1d3c32c17536da667dc8a728db3e90e75172e6d62424d9848600e2cf878488413db263 SHA512 753d2993319ff3e41a74c578cd92813c38dc4fdf8af10a015ec6882a3fade54d4201242e568823307ac212e7177720314c17065b1c8fce32b0603e016738c7bb
-EBUILD sddm-kcm-5.20.3.ebuild 915 BLAKE2B b028c3273e362f70b6ef9343b7d26d6c1f1ba9c06638cd04e5377bc7b4d7a4b87421fadc2d66e849205f433bafcd0a8e228cc78e2eddbec8a1493ae07bfdc594 SHA512 11beca814a270d2e6963d4f01be8858ca29103ab33b1e596efcc4519d8c6a6bd75cc146ddf9be2d86251fdaff53d1529e69185607aa8b17cc872118f0fa51e36
+EBUILD sddm-kcm-5.20.4.ebuild 915 BLAKE2B b028c3273e362f70b6ef9343b7d26d6c1f1ba9c06638cd04e5377bc7b4d7a4b87421fadc2d66e849205f433bafcd0a8e228cc78e2eddbec8a1493ae07bfdc594 SHA512 11beca814a270d2e6963d4f01be8858ca29103ab33b1e596efcc4519d8c6a6bd75cc146ddf9be2d86251fdaff53d1529e69185607aa8b17cc872118f0fa51e36
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.20.3.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/sddm-kcm/sddm-kcm-5.20.3.ebuild
rename to kde-plasma/sddm-kcm/sddm-kcm-5.20.4.ebuild
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 6490394892b0..716e45149bf5 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,5 @@
 DIST systemsettings-5.19.5.tar.xz 183360 BLAKE2B dc8eb9b466f2f86405175e29e7abf54a243e64022222f5e8a370d17bedcf44a5b35e760b0f2f9a7da67a5845d68a77049d7d2ba405f2574b4676a42fea0b0676 SHA512 381aa73e5bc195f2c05cf4df904a031f8415fffb99eaf33414604bdb623e8618c66ffa2e5b108b7838f5d9cb83cec578cefa4e414d9d7fa3fe258c864e1568fb
-DIST systemsettings-5.20.3.tar.xz 193692 BLAKE2B 98d1b40fe455d667159c4b9711d6e2610b3ea9fb6de3ce70dffdd26748b940e48313a0f902cb7a71c2311553f890f759d538f5f0edb2820563025031e3149e63 SHA512 5041f55a9715c86061c68ac689a63d426b4c543b38127291bb7f9b46b062514a93d0962821d5e8e3eb8895a8be1d7404e3cb8bdbb10ff0dcb3f71e4fa1d16eac
+DIST systemsettings-5.20.4.tar.xz 193664 BLAKE2B 258d34748c540e15872bdeb928fa67f59e525078060a46b260a5c907216af95bf1513fb7414d1e2549463fd223ec3284281568cbfa8658801c223dd6d463d6ff SHA512 c0f60316b41fcf2eb824178290e1ea45e370ea6256449a40b419b76fa61073e6c919a371e625364c4da786b8cf066cf8ff3ea2d4fc71f27a387ce90da017cebb
 EBUILD systemsettings-5.19.5.ebuild 1698 BLAKE2B 4963706de0bb6d75e70bfba760302c92b1929c1bb1a4b7321de2adbf98e751b3f5e4e4cd8a2b1132ca0feb584a2011fdc18a3faa4467624dc64caf23da0ccc60 SHA512 68ce3c2eca46848c3301ae2881f8c7a75a1290aec1c9ff3be43c1461a577013d3c7dd707f5c8429c64d6783c41ba0e8848a3f401947b24c8d6a20cf013a2d7db
-EBUILD systemsettings-5.20.3.ebuild 1706 BLAKE2B f35e33dd6a42d64e57b45944eac960f41a14ed6ca6ac6e9fe800041c1b6e88847345a231e3245edae49f182a01b0f6c09e171fa9d519c9f4da5da8e927c251e2 SHA512 341c37061857e2d7aa95e1f4f95c2f72b7e8ab2b68947949b3f0d6a1f088df0a2aa9c24a8cc5a77309be3df90748e505f35420ecbecfab3f8c73748967714387
+EBUILD systemsettings-5.20.4.ebuild 1706 BLAKE2B f35e33dd6a42d64e57b45944eac960f41a14ed6ca6ac6e9fe800041c1b6e88847345a231e3245edae49f182a01b0f6c09e171fa9d519c9f4da5da8e927c251e2 SHA512 341c37061857e2d7aa95e1f4f95c2f72b7e8ab2b68947949b3f0d6a1f088df0a2aa9c24a8cc5a77309be3df90748e505f35420ecbecfab3f8c73748967714387
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/systemsettings/systemsettings-5.20.3.ebuild b/kde-plasma/systemsettings/systemsettings-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/systemsettings/systemsettings-5.20.3.ebuild
rename to kde-plasma/systemsettings/systemsettings-5.20.4.ebuild
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 17cdbc881cf3..285bff0f3c00 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,5 +1,5 @@
 DIST xdg-desktop-portal-kde-5.19.5.tar.xz 76348 BLAKE2B d3205542ec76bd6c9fa4ae5076d0716c1f201f8c90aeeb61dfcaf9010ada0b21a3e80cff70089077646059d56d19033f8ae887b34c9f30c54b8190d559df0a09 SHA512 5d82e5a1553e9fcb471895e356a23915cbad1215ae1fff5fa6fac6f1673af4c406171131222a88a13eee847dc0d99f8bab00dac1849dfa6844b1672ae7545bb7
-DIST xdg-desktop-portal-kde-5.20.3.tar.xz 81764 BLAKE2B 2a95be9ae24d535a241beeb6260359763f3102f03ee80f812e8d8ce32bad69ea1a2c859b0b1823a30fcdcc104e818e41c3a91bceecbfad6a17518df517113eec SHA512 7543e1231c2f78db01852add1ee42846254a1bec2bc61d4eac0901e8376034cf60590dee10706c71462269a9e075fdf5451349984575a2e7baed63d9e8ac21ca
+DIST xdg-desktop-portal-kde-5.20.4.tar.xz 81796 BLAKE2B de9f7a2657b80e1cb5f78aae6edd57885762117d8cfbddac4ea8fef379417c94ec0355a8726fd91c4e652f1825a77023160e45950018dd5b7f79665343749357 SHA512 60cc023dd7b5738d3a5ba710a3f0e8b2e3fbca2d4d4c832ce0842c85e2aafc30c82dc1242a327f2502867e98b666c554184e579b779fbb59153021117ecfdcf9
 EBUILD xdg-desktop-portal-kde-5.19.5.ebuild 1213 BLAKE2B 3a9514d45be2e1b59d30cb76b0057e291829a1aaac7cd8f2832f5719ab9585272185b4b064eca40f23f3a3295c562e296ca505eb9b75640e8f7cd1801a704ec4 SHA512 425f92eeaf6ab77c520df2dc69ed3bd7a1e5be79dba8afce0f656ff138c94772d63d71be4731420aa2c65ac4dd3f515f72536be6c1ee8b54b04110ec53775398
-EBUILD xdg-desktop-portal-kde-5.20.3.ebuild 1101 BLAKE2B 7e436fa86845de8bad31ed063be178dde63fcccc20dba74fdb14a1fec459d5168b6d1127dc67ff051affd175cc15b34cf01560be064bd7df7c92fa3670549f15 SHA512 287b119f135d79085a5dfee4898e7d92af4cc537210f443acc5dbaac53a8f98ce28c308a96194c830151eba501b6fed105ac5846ace7210ceaf3960fd328d057
+EBUILD xdg-desktop-portal-kde-5.20.4.ebuild 1101 BLAKE2B 7e436fa86845de8bad31ed063be178dde63fcccc20dba74fdb14a1fec459d5168b6d1127dc67ff051affd175cc15b34cf01560be064bd7df7c92fa3670549f15 SHA512 287b119f135d79085a5dfee4898e7d92af4cc537210f443acc5dbaac53a8f98ce28c308a96194c830151eba501b6fed105ac5846ace7210ceaf3960fd328d057
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.3.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.3.ebuild
rename to kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.4.ebuild
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index a21751f6d207..53478ae68737 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,6 +1,6 @@
 AUX xembed-sni-proxy-5.14.90-standalone.patch 1984 BLAKE2B e3d5b53479fc18612bd698d89e27c69e178aa1f9bcfc7ce118eb1271d29cd7ee18ced9ec5e4296a3e6d45a4331c9688185ac41bc00ca30f2158d5617feae94d6 SHA512 cef4a94f1a31495bc7e8fab80be4e145a5335f4a9d500680435919e7554efa2c4e87013c4d16d53e1f7b4b7e341092e53d314ccb2a6f7e09ab83d5571275b4e1
 DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
-DIST plasma-workspace-5.20.3.tar.xz 9031572 BLAKE2B 242286eef9d15b9dacec0dca3a7899c538141490611f932e0ebff59e1ea7a54cbad56e3bcad6e4a720b4f7610de2fc0e128288c3fe3d2b9e8255ffe16e0b86fa SHA512 c1daa19834ea7997a8e44fcb6ce9745d5bac56a0a4d99320e1e3e42e9cb5489aa36887e3c2bd8e385644d555d355211c9dba6c40edf2471478566c531a2d9c89
+DIST plasma-workspace-5.20.4.tar.xz 9040936 BLAKE2B ac21ba0e094aed811d3b635ef71a468ac398fe54371cd0898324692cf8bb5759f526008ab9201f84cb4b8af9f948d73b8ada943cff2e8a8e5016a1a1135931c8 SHA512 071ca0073ade4206bd42277114bc2693698cb91c4f448ddbbd56f3430ed0a1946afb474a6b80cb11ee907a5a83fefdde06866c7a887bfbc3456a64b60a6f38e1
 EBUILD xembed-sni-proxy-5.19.5-r1.ebuild 1048 BLAKE2B 2335a894410e71d1d7e46696ad9365008f99c4275e99c44c379a57099c8ab6c3d06f2d88c0d48d5bacaecd08a830875370f016c9eda77ea2e2ed294341c64e01 SHA512 43fc124032ccbca8f033373fde1b4432e0caf762d03d476f909c4e4732d2e2dcb4f9144e1fd3f4e1724249fc066e3e98b860b51c2f088c3bb9a8b37f9513ca42
-EBUILD xembed-sni-proxy-5.20.3.ebuild 1051 BLAKE2B f99017bd0b55e90934c714135dab5027543bed0b07c820ca881c221606fcfabcb7b042b6364285e48d8d29e9ef95f4d19de0c292a97c313e92c481fe08971303 SHA512 ff9fd892696ed233aac336d0ea0b9b210c35a109b1390258ba88fa8fdf3edc566615846d39a6b9eba4f5e964568e391d27147e69b290e4697db66c82be9c3523
+EBUILD xembed-sni-proxy-5.20.4.ebuild 1051 BLAKE2B f99017bd0b55e90934c714135dab5027543bed0b07c820ca881c221606fcfabcb7b042b6364285e48d8d29e9ef95f4d19de0c292a97c313e92c481fe08971303 SHA512 ff9fd892696ed233aac336d0ea0b9b210c35a109b1390258ba88fa8fdf3edc566615846d39a6b9eba4f5e964568e391d27147e69b290e4697db66c82be9c3523
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.3.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.4.ebuild
similarity index 100%
rename from kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.3.ebuild
rename to kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.4.ebuild
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index e8c204f42c40..ad5e6fdde7ee 100644
Binary files a/licenses/Manifest.gz and b/licenses/Manifest.gz differ
diff --git a/licenses/modeller b/licenses/modeller
new file mode 100644
index 000000000000..4921a6462b45
--- /dev/null
+++ b/licenses/modeller
@@ -0,0 +1,19 @@
+End-User Software License Agreement for MODELLER
+
+   1. Andrej Sali (``LICENSOR'') grants to (``LICENSEE'') a fully-paid, non-exclusive, and non-transferable license to use the ``MODELLER'' computer software program and associated documentation furnished hereunder (hereinafter called the ``PROGRAM''), upon the terms and conditions hereinafter set out and until termination of this license as set forth below.
+
+   2. LICENSEE understands that this Agreement is license for use of, not sale of, the PROGRAM. Consequently, no Purchase Orders can be accepted by LICENSOR.
+
+   3. LICENSEE acknowledges that the PROGRAM is a research tool still in the development stage, that is being supplied ``as is'', without any accompanying services or improvements from LICENSOR and that this license is entered into in order to enable others to utilize the PROGRAM in their scholarly activities.
+
+   4. LICENSOR MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. By way of example, but not limitation, LICENSOR MAKES NO REPRESENTATIONS OR WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE PROGRAM WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. LICENSOR shall have no liability nor be liable for an direct, indirect or consequential damages with respect to any claim by LICENSEE or any third party on account of or arising from this Agreement or use of the PROGRAM.
+
+   5. LICENSEE agrees that it will use the PROGRAM, and any modifications, improvements, or derivatives to PROGRAM that LICENSEE may create (collectively, ``IMPROVEMENTS'') solely for internal, non-commercial purposes and shall not distribute or transfer the PROGRAM OR IMPROVEMENTS to any person without prior written permission from LICENSOR. The term ``non-commercial'', as used in this Agreement, means academic or other scholarly research which (a) is not undertaken for profit, or (b) is not intended to produce works, services, or data for commercial use, or (c) is neither conducted, nor funded, by a person or an entity engaged in the commercial use, application or exploitation of works similar to the PROGRAM.
+
+   6. LICENSEE agrees to notify LICENSOR of any IMPROVEMENTS made to the PROGRAM, as described in Section 5, above, and hereby (a) agrees to supply LICENSOR with a copy of same, and (b) grants LICENSOR a worldwide, perpetual license, with the right to sublicense (at any tier), such IMPROVEMENTS without any royalty or other obligation to LICENSEE.
+
+   7. Ownership of all rights, including copyright in the PROGRAM and in any material associated therewith, shall at all times remain with LICENSOR and LICENSEE agrees to preserve same. LICENSEE agrees not to use any portion of the PROGRAM in any machine-readable form outside the PROGRAM, nor to make any copies except for its internal use, without prior written consent of LICENSOR. LICENSEE agrees to place the appropriate copyright notice on any such copies.
+
+   8. This Agreement shall be construed, interpreted and applied in accordance with the Commonwealth of Massachusetts and any legal action arising out of this Agreement or use of the PROGRAM shall be filed in a court in the Commonwealth of Massachusetts.
+
+   9. This license shall be for a term of 5 years except that upon any breach of this Agreement by LICENSEE, LICENSOR shall have the right to terminate this license immediately upon notice to LICENSEE.
diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index 24fe199e15d9..d5465bc09594 100644
Binary files a/lxde-base/Manifest.gz and b/lxde-base/Manifest.gz differ
diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index c62158b6afc7..69d03959ac1e 100644
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -4,5 +4,5 @@ AUX lxdm-0.5.3-pam_console-disable.patch 307 BLAKE2B 4bf6b05b5b803b582e441cd5b17
 AUX lxdm-0.5.3-upstream-fixes.patch 5836 BLAKE2B 0e76a7c92a9b5c57dc85fa9659653b29ea449810ee4bf596e4691e91cc4ed1645b6b75e64bd7fe35f2488f469bad237633042b43e10d10afd0ce7f8fa29bdd9b SHA512 c67186af1f3288633e5a3b8a25167f92999209c99dac4257b330d9046eb0524eb766032dc6e2870a9843afa8ede88defcb1f0e1cff57ece5bc9d5d1121446070
 DIST lxdm-0.5.3.tar.xz 239132 BLAKE2B 9d27feb60452af49127972ce0ecdc25122f5f86961f65512fd6c185c5d6ca03e637fab703fa2df156dba8a3d0ef4e7cf9f55e20762ba49bb14dc4ee8a82b1fa3 SHA512 0e3539c595a71cb850c1756dd075b8d477a4e111a4167714057cac06650e9587f338f797f14122e7b2a2f4ad35b38cd7172b83e996758abeeaf0146d65bbc26f
 EBUILD lxdm-0.5.3-r1.ebuild 1549 BLAKE2B 6a22f765f60efdaa11adc03b6da72f06d5351a4685af43b3e93a342de3fb655192508402a3abec366864873308f8f7e609277da174088bcb17dbbf9916ed7cab SHA512 9e55aca8efaab0d0566da17fbf3a1e2d9992ff54dce4dce728055b4cc705e4f84b59979af20ddfab832b342e3b528d8a8b02b09adb13624095ccdc40559f1e72
-EBUILD lxdm-0.5.3-r2.ebuild 1768 BLAKE2B b271c5f2aca77da353a2b332ff0c36f5cb095a7aff98dffca5b9b47a127020b4bde7407e6163be733e103519b41b84204f1e520be40dbac90da22f5214bf99bd SHA512 f11946b034571a8704c278d28265f36595a829173d75e06e8e34572aea3a13eb51f78a005aa305cc942b977972ae9d1331e830556437c7c20846329916169a95
+EBUILD lxdm-0.5.3-r2.ebuild 1775 BLAKE2B 31fac516d653db6845b945d48e3dd60c9cd75491d884abbc640606ad7837a7e55963b820e2cb3213fe4136d6cdb9a907a83d62fb3c2c470cc8c17d772f59e1d3 SHA512 4c8b4a9c18e69a7841e91150e35b36727d23eb564ea157a2a3a6798389f3338add0b4f2e1e386c35904df9209045cf455d5b4930211bc52d214c7c5618f90832
 MISC metadata.xml 385 BLAKE2B 177f5546a968d34e0c4e91fffab0d4473da28ee5501ec59fad5d351ff6c3e1abdea5da1f5d2f27db1efa4b198363df715d8ed0ad86a9dfe893cefbd68dca6070 SHA512 744589fd0229e035f7b42be3744a9043413cdfb0c1d977fcb6aea67bf0e4c6cc09d4f27b1a33491b51fd9000df32ff7ac5e56c8ab892732fc29852d0dc247332
diff --git a/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
index 177b447fa3c6..b15ace55d6d0 100644
--- a/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
+++ b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 
 IUSE="debug elogind +gtk3 nls pam systemd"
 
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 9159346f9d9c..a8c63604bd30 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 9f985c630009..361560ce0300 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -2,6 +2,6 @@ AUX claws-mail-3.17.5-enchant-2_default.patch 1284 BLAKE2B 076c2aa8c121e656a0b15
 DIST claws-mail-3.17.7.tar.xz 6447268 BLAKE2B 432e36e5a376622508eed2e4ba7fbc885df66b05b7f91386f8bb3cb1f96980b946362fad55848f1c0534bc079981d7e4d894ebf62d6ecaa9c60cfde709927a75 SHA512 b8089b0454c8e91a2e1fac8829e44ab01faa049f899252eb226e0b4998be4136334bba3d3efc5baff90e23e027ad928162950b4c986504d918dc628fcf9fa2ff
 DIST claws-mail-3.17.8.tar.xz 6435692 BLAKE2B 2fb981ea86294eba0918c4b9bd74b762e19b6658d1970e6ec8f41e97e37063d3823f4aaae3ffcd855bd2839b7feb3a4bca0c15595fce2968de2418758f4fc50c SHA512 dc29c968dc81a184af8f66c1afe5c9d17558ce6a4a8b196136a9fb5deec96aa67eec42148ed0f4d6d6ee94aec2791247b9034090dac81beec193bd7d366617d7
 EBUILD claws-mail-3.17.7.ebuild 5816 BLAKE2B 4b6f0cbc4bf08564857154b8aae80efd349227ff9c20da8ecc68c7ccc8759e677801b78fdd142b929a2ba8dcddebd6b52ca75a8f16bf080807bdbf6d5642e254 SHA512 10b9a5334ad4b6f2e6c52de60821138a3427bb99ff57fb4172b7e38ec2c1d5e0c321d1b32769a4c19452254b225380308302b52f4187c9afb36454d24c475d8f
-EBUILD claws-mail-3.17.8.ebuild 5818 BLAKE2B ee17641eead61567571ba8890585a5d376015eb0194d47981c82120ea761b1b44f3058226e7f369ad6a5be13f400b93807573b51a58fc54478d0a719f782784e SHA512 4699445051a9fb983bd080e933a57d662196c5abdfa6eef685ce2f546b1bd55f428b3174a8b6afbfc32b71a103ccbe6a06faee8c7a92e9f6529efc70c698e5f9
+EBUILD claws-mail-3.17.8.ebuild 5825 BLAKE2B dbff2e83176350505756b91fba1c92fcb14511291cadd63a78868120fc23f41564caae2df6c3e26adffde582186dba2e4c510dabfd56817cafaa5182c7ea2099 SHA512 6a4f55f8ca6205a27650e3696b084f8ff56a3606ab22f710f16c0db8be55416312b2c2f42684d2972cb36947be2efa200eeefe9a25ffed29d15278cc9fcf2add
 EBUILD claws-mail-9999.ebuild 5962 BLAKE2B 770f6e6afd334f616bb46b04868d797bfeb45e1ffb6b5f82067959e31b2661c87e85cc0bce855a165f383975c5050e7539b256576bd72bb9dfbc11970bca96d5 SHA512 8792faf220af90d010715a9971d54b82c6b08c2a5c2d105f34aed9c14620965f684b4350ff975554611f0f505f03f313d08db20f67b17544448c8e1d4302fa53
 MISC metadata.xml 1467 BLAKE2B 84d9e335170d8e84ac9da4a8e02222cab0b2454ce4044878c8f1bf7a390f7ed190633537469be424de5e2db58791636b86b7db325a971d684233919838cf97d3 SHA512 6c655572b3f4c5cfb38776118fbbe692385bc7dfa5211846a13cde6f2d2d5ab3dc05b12a9a93da1ad7c82c5963dff2773ab3dd8f32e8d1a44fa4d7834e77ded1
diff --git a/mail-client/claws-mail/claws-mail-3.17.8.ebuild b/mail-client/claws-mail/claws-mail-3.17.8.ebuild
index 92d042602969..7057f3fdc12b 100644
--- a/mail-client/claws-mail/claws-mail-3.17.8.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.17.8.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
 else
 	SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 SLOT="0"
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index ca1d2819467a..eac1dbe289cb 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -9,6 +9,7 @@ EBUILD neomutt-20200626.ebuild 3296 BLAKE2B 596daf041ca8dc467da3c6443fe5d4ba8253
 EBUILD neomutt-20200821.ebuild 3933 BLAKE2B 0e592f8efb86fe2dbbd2d5ff0b6781ba7e3a5139d45763927b9823b7e5ef39fe3a9c8ce334f2f172541db08cd4fa8fea5166eb87bdfee58e6ad74c95ba0ce398 SHA512 fa67b72be4a08472c353c1f78c687b81421779bb774705851cb62fb3ed10ecaeff1a2922266cd6de5ea156bc0bc4c78fa32ad2beef4889684d14465bed3c649f
 EBUILD neomutt-20200925.ebuild 3940 BLAKE2B 2229af1bba05eacfeb7180ff18c41a7853fd121efe923609483b67e4f354e3e215f32b0044cc4a771a166bd73243d1d56ee36281a22b1c1d030be46b205dd346 SHA512 a8eccbf6699e65b7107dcc66f57b0ab852149047342d1951cec4a39a61b3dd02ea2760dd28e37737837addc5647ceb71611cfdc4154ab36870c7a55e870f72eb
 EBUILD neomutt-20201120.ebuild 3940 BLAKE2B 2229af1bba05eacfeb7180ff18c41a7853fd121efe923609483b67e4f354e3e215f32b0044cc4a771a166bd73243d1d56ee36281a22b1c1d030be46b205dd346 SHA512 a8eccbf6699e65b7107dcc66f57b0ab852149047342d1951cec4a39a61b3dd02ea2760dd28e37737837addc5647ceb71611cfdc4154ab36870c7a55e870f72eb
-EBUILD neomutt-20201127.ebuild 3895 BLAKE2B ee6d13f590805c6517aa038c8a6d9ca50ab410445d13b097e581e209a6ee5874483a14bc17cba2d5cf58a9e3e461fb470ae4ffdb987984489b23b1a905af68c8 SHA512 b4ef83532185b6d4773a4c156f84de626fab96b8410040d6335091c6d2b437a13f390f1ee3437d20870801866a31638a2e6997eac197dd0cc2496587e07d300f
-EBUILD neomutt-99999999.ebuild 3895 BLAKE2B ee6d13f590805c6517aa038c8a6d9ca50ab410445d13b097e581e209a6ee5874483a14bc17cba2d5cf58a9e3e461fb470ae4ffdb987984489b23b1a905af68c8 SHA512 b4ef83532185b6d4773a4c156f84de626fab96b8410040d6335091c6d2b437a13f390f1ee3437d20870801866a31638a2e6997eac197dd0cc2496587e07d300f
+EBUILD neomutt-20201127-r1.ebuild 3896 BLAKE2B ab8ff53e93d1e91099beccc09fcc96729e0884cefd1020ccf810eb4a0697604db40f3266696b3f231f1e9f7cb0ce5d9ae76ee30bc521a768fadfe44f958f8057 SHA512 3be81472b254249a438fd356263fef7bd6bd153f10a47450537594f0f1ddee874e630d52fd62b3b6569dab0ee96996122066b5245860e44ad19947b5f2ee4a49
+EBUILD neomutt-20201127.ebuild 3893 BLAKE2B 4adc997b079b216529697ae0dd46947fcb8a01b068aeff3c8eae4c9e6b48a9151228160a87e159aa96f897c8f636425930507323834862d052730040eb7b66a7 SHA512 1c6caa40884d8c1daeda009ce81098f61acde8c4cef0cfd29c87465f7b7610138c946f5f4e429fe9d81161bca909f476bea08942c4c61d190b5529b8f30c8e1f
+EBUILD neomutt-99999999.ebuild 3896 BLAKE2B ab8ff53e93d1e91099beccc09fcc96729e0884cefd1020ccf810eb4a0697604db40f3266696b3f231f1e9f7cb0ce5d9ae76ee30bc521a768fadfe44f958f8057 SHA512 3be81472b254249a438fd356263fef7bd6bd153f10a47450537594f0f1ddee874e630d52fd62b3b6569dab0ee96996122066b5245860e44ad19947b5f2ee4a49
 MISC metadata.xml 1207 BLAKE2B d952b478eb3e513307c58ea2d47dc2b208e00213deaf2d8d0878bea451c5eba117f16f596e2e7ee77a81e5ea7e8e431e0410ee292b527be89470e3530b1f55d9 SHA512 bcaeaea3b9d33cf92de7851f4f843e61c833b5ad09ff7899c999787c3caa57d8b3f77a2903ffab72f6938ca87899926eaf026bbf25bc9e74b66f21720a447c41
diff --git a/mail-client/neomutt/neomutt-20201127-r1.ebuild b/mail-client/neomutt/neomutt-20201127-r1.ebuild
new file mode 100644
index 000000000000..c2227b88db2d
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20201127-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
+SRC_URI+=" test? ( https://github.com/${PN}/neomutt-test-files/archive/${TEST_FILES_COMMIT}.tar.gz -> neomutt-test-files-${TEST_FILES_COMMIT}.tar.gz )"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:6.2
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+		<sys-libs/db-6.3:=
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	lmdb? ( dev-db/lmdb:= )
+	nls? ( virtual/libintl )
+	qdbm? ( dev-db/qdbm )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	gnutls? ( >=net-libs/gnutls-1.0.17:= )
+	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
+	idn? ( net-dns/libidn:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	!slang? ( sys-libs/ncurses:0= )
+	slang? ( sys-libs/slang )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.2u:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${CDEPEND}
+	dev-lang/tcl:=
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| (
+			www-client/lynx
+			www-client/w3m
+			www-client/elinks
+		)
+	)
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable gpgme)"
+		"$(use_enable pgp-classic pgp)"
+		"$(use_enable smime-classic smime)"
+
+		# Database backends.
+		"$(use_enable berkdb bdb)"
+		"$(use_enable gdbm)"
+		"$(use_enable kyotocabinet)"
+		"$(use_enable qdbm)"
+		"$(use_enable tokyocabinet)"
+
+		"$(use_enable idn)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--with-ui=$(usex slang slang ncurses)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+
+		"$(usex test --testing --disable-testing)"
+	)
+
+	econf CCACHE=none "${myconf[@]}"
+}
+
+src_test() {
+	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	pushd ${test_dir} || die "Could not cd into test_dir"
+	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
+		|| die "Failed to run the setup.sh script"
+	popd || die "Could not cd back"
+	NEOMUTT_TEST_DIR="${test_dir}" emake test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# A man-page is always handy, so fake one - here neomuttrc.5 (neomutt.1
+	# already exists)
+	if use !doc; then
+		sed -n \
+			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
+			Makefile > docs/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^docs\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			docs/Makefile.autosetup >> docs/Makefile.fakedoc || die
+		emake -f docs/Makefile.fakedoc docs/neomutt.1
+		emake -f docs/Makefile.fakedoc docs/neomuttrc.5
+		doman docs/neomutt.1 docs/neomuttrc.5
+	fi
+
+	dodoc LICENSE* ChangeLog* README*
+}
+
+pkg_postinst() {
+	if use gpgme && ( use pgp-classic || use smime-classic ); then
+		ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+		ewarn "  support.  You can probably remove pgp-classic (old crypt)"
+		ewarn "  and smime-classic (old smime) from your USE-flags and"
+		ewarn "  only enable gpgme."
+	fi
+}
diff --git a/mail-client/neomutt/neomutt-20201127.ebuild b/mail-client/neomutt/neomutt-20201127.ebuild
index 0903176798d7..2fbecf8b7800 100644
--- a/mail-client/neomutt/neomutt-20201127.ebuild
+++ b/mail-client/neomutt/neomutt-20201127.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ 99999999$ ]]; then
 	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index 0903176798d7..c2227b88db2d 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -42,7 +42,7 @@ CDEPEND="
 	qdbm? ( dev-db/qdbm )
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17:= )
-	gpgme? ( >=app-crypt/gpgme-0.9.0:= )
+	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
 	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch:= )
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 8141b248d2f2..f25af948c376 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -4,71 +4,71 @@ AUX icon/thunderbird-bin-r2.desktop 851 BLAKE2B 09f88c3e849ef901ff7825752c560c21
 AUX thunderbird-bin-wayland.sh 128 BLAKE2B 015511404f636845d7248fd3cec02eb9a4ec70567da442bfa5ca8f2168634347cb478c63161c422facbf47c8d5a6b7358ce7ee9cdbd48c4e555460248287e06e SHA512 9df7306d7046a9f51e60e70572e6e8e22d42e6065900416fd407dce5c083dab3212877ee9dfc7f5af7337996951577e7b7c75e583ab811d6ceaadf6e6c903a7b
 AUX thunderbird-bin-x11.sh 122 BLAKE2B 40fdde93db7c5c27174e22295b946834ebe37763b0499f710e4aa7030941654bdab714c886d4bc4ef4c8623e54819ca2ce6d6786901e8f5ce29213ec59228472 SHA512 907d34b5e67b8806dd3f546f67ab3818dc0fe5d487aa8706046feaf68e23ef69be6e0ead0a31c89c559151854f8837bda93fbeb336bf73d96839656ae649d1d3
 AUX thunderbird-bin.sh 2972 BLAKE2B f9cdb961ae34636c178df29094ef8e42ec29fd5f70d9aa830cfa4113b32c69aa5a47bed083e0923d2315b5b7a0ea72aabb298695b3457968a3338e28bd2c8159 SHA512 ce4afc6834268d3a42deea5da2173548fde02a4ea4a6ff69595f07af41886e7e31e1c8514abac1c52bdedf23e40a9366df83bbe8c2a00d9cb23fd2958dbf9fb0
-DIST thunderbird-78.5.0-af.xpi 548318 BLAKE2B 479eebf8437aeed5e2ee9b4f743729ae97111dc19b75502670587b8848118282a9b18aaa1f570270c073408d9354a55cffc90878ceb52e857be19d3f3fc32bd4 SHA512 96691128a3d6b93392fa48dd7485cec8ca92a0af1df6949493aa096289ca2488e07672ad87fa1d5377b4fc5bf66aa171b6953e928b3638951f25eefb16a23534
-DIST thunderbird-78.5.0-ar.xpi 648572 BLAKE2B a5f17cd99faee0800d221ecb97cd98e1e74f23e03103a0aa2489c64686b072e692e1bff53bd64e7b3bef62b8fa94a0c3e207580d051a95dfd8d0d2bad6154522 SHA512 5d28982dbefb8d7186490cf3ba591b349321bae46ec0b30d79749389b17678f739ef04b6943e7028b223cea7e4835edc46fdd397c0f64439adba02321ed5e892
-DIST thunderbird-78.5.0-ast.xpi 561213 BLAKE2B 7863103ed4c83b0c00825c3588f9b23798d141e3cf6faa378bacaa45b177ddeb75643125815733b3e3e7ee43433f97f483215efecd11b25c1a3110125e27ac68 SHA512 845b5c19ef773ca2a169122e3a8dd2513a91f016748ca834a0d2eb5579455be918ce38f77e71257c916ac6cf719c4c25795851cdd1b716029d75c4705a5de0b7
-DIST thunderbird-78.5.0-be.xpi 666633 BLAKE2B a333de1dde21f1d450f1a97b46d319f840b6ef5b3f1b3031dea2b4bbe8c7ee9a58c4c61e740835efc735b7894d3ef09c18d5f239b55c1ca9ed3af0d75695e474 SHA512 9c0cd7ad9b3994b87f48cb406a758d3b10e9bd397ff782f9e5d0a9c92467b25c5cf06ca81ac00e117b2080268a6500d78283dc8c281304941508c7c963cccebd
-DIST thunderbird-78.5.0-bg.xpi 672382 BLAKE2B 4dbbeea6db33e4f8172ef9d95781b50d68916091673441463b0104873443dad3cd906137fbaca9e70674cbed61505bc7d298695f47adfba134e469bd3c547f92 SHA512 3386be24f48ad47ca7467997831b1f81e79f2007da5e74699b929b8d023ca715edf6354392b4865ef4b62635f3689902ac94c700b1941cae584691d8cda5cbd1
-DIST thunderbird-78.5.0-br.xpi 604498 BLAKE2B 6f368232ef0ffec699f89239c8de8295307fb0b53b6b3dafe84d3b765c9b46dca099cea50707783b8bb4891c6c6d60effa8fc31b220ea9ffd78818cba7edc77a SHA512 78803f838b4c7315b5761f0a93e362cd267674c532758e29190ec233aa886dd4840afbdf298856cf726540b21b6d67e41cb79781e8ed467a45c1724b0ae6e165
-DIST thunderbird-78.5.0-ca.xpi 620410 BLAKE2B b20e21ac5063486eec47721877eab8d8ea73ebd12604c6be2356be45dc2898f552067f6b38807fedbed605b21554fdd78a60d8a4b15188e9dcd52bf17430c442 SHA512 d5e122b96588ff32fd775da351d90a96db21850e73e00cfcdca1da65bc6229a5e481fea1c4b3e89a1dbcccb24ae55e60daf7952af6416cb0a7c0c671569705a7
-DIST thunderbird-78.5.0-cak.xpi 635653 BLAKE2B d2f4f5601fe56cb2336ef7d049ed144f30b78bf7f1ae7eefe401bc10210749e9c9ac53e2b3abc2c34292abcf4300191bf09108bd3db1ecea58a57188c63e5b32 SHA512 20ba4003476f673468cad2edbfb43d6ddfda8deccd44ba48fe8332c5d12aea01c4355de1a8d0ea372f59b526efa2e3b085339db70bedbbccc1a23ca4b3da4bb0
-DIST thunderbird-78.5.0-cs.xpi 635315 BLAKE2B 2d4a08c27cc7b69e44f79c36c81e6d4d92c0fe91a7ca5d7267e4b7993c049fbf057c67e8974d95789f6465fb62e659869295f8e60159e8f923a0127ed988561a SHA512 1a968bf633093513d326242d2ff057cee9824d91e3328b3bda6b2acb18aaafa4540bd2f974f8be0b4767a3a4bef68060d96449fafc9ee9e877a02527d4ae7d0c
-DIST thunderbird-78.5.0-cy.xpi 646244 BLAKE2B ebf23594f0053f179bb655339393edf562c8204f9dadf1b49f810a97de71d4ad096c841e51cf68c6ad05ed4b9e953e62751e7843ce5c09b1940d63172e482e5f SHA512 53005cd6f409fed072211a504faa86f4456ab849e001cb44ad99c148228b11f1885f8d0a2505dc9f71f83c2061c8d7f67d2d5e6752e35c07f427536a978d2efc
-DIST thunderbird-78.5.0-da.xpi 620986 BLAKE2B 56bdfacb9c40cf2c70560aec395cda594024b82d31d6c96bef4a5b71214edbc3bbf74ae013f0cce4bf44287160477e08a2ef6a91df14e8e700d2d9ccfaecfe67 SHA512 7c3af279f77e313c79b26a84ecb937cf799dce35abdbefdf1dca084d532a4121248b5ae056f9ec370171e8c1bdb70a6b05674b2b5eb1e7e7b7b9a51f9b5d0e61
-DIST thunderbird-78.5.0-de.xpi 665194 BLAKE2B 2f0e1acf124aa2ddfd8615d1b596332762e105ec065cffa4a763d54a504d381c37bd16aef8a2093a99ab514b9efa226650d1d31649e3c58335dca35b71fb90c7 SHA512 63a326c45198aa2d41f8621d0624a412dd635955f0397090d931c2fa3fc7a3fe6e9e896c00954cee9fbaefd6650de4b86571d038ddd8c60f81e5c2c661df55a3
-DIST thunderbird-78.5.0-dsb.xpi 666774 BLAKE2B 751095ef5074451e5c31554c325f15063fecab8c7e9ac1c4f330e0ff091205b800e7dbfb15908988eaa234aac75899813f9effe927e34acb21aec48d52ef0991 SHA512 300e63b1f3503bd8943ad757efb4fc04564e316a3484445750b29198ad3c1a41a485728c09b81364ea6538f34338d0d3addc85996855fdbe0ac4d6ff50c21b9b
-DIST thunderbird-78.5.0-el.xpi 774453 BLAKE2B 7227d22a148d5c8a1f8e9f6ad787fbb1f3049b9348b9c19d731bf1886fd8bd7c5f90494a7b7a27b7e7eb3544fe03d0ba4bee4dfdf2d458e1742bdb449b8ee488 SHA512 58eb6309690db9b871b3e7d1aad35ad26dbaf84ef5e17207d4fc8d46ffab5f588592858aa56b3141b2fb62f77a2454bfd6e86260a33e455bd870bee822a61e02
-DIST thunderbird-78.5.0-en-CA.xpi 611774 BLAKE2B db5cff4f516ec03b6fb6b9f64294c32679414ff88e533e3bf9f8519ca937c952d6f51f76ee3354430a29438db0a85b7ce407afd7e6173ff9446d7c271e4a61a0 SHA512 ac0c9f7dff24427c597075c354cb4d9df4051749a77c94a1a5ffb8dc04a312a18cea97b37e5e3afda28aaf6feea07e479508cfe2a0080697f1ba5ba59d662719
-DIST thunderbird-78.5.0-en-GB.xpi 611183 BLAKE2B 9dd73b2216fbf886064e5d000672d083456c0eaf405e638a2ba4ee205fa02b36f029352728d4424b4ffc41bb94fd4c1a9c7df8a40276e8b84026354ad7856e40 SHA512 0af500a12631db42c986fab910e30ac6d385b2b2c51960c70b21dc1110d6073681ba2ade60447eaa1e5d52052fe3c2217f2d70f817b250b22ab3a7ec864f4d70
-DIST thunderbird-78.5.0-es-AR.xpi 657791 BLAKE2B aa70da5cc23e9577c36106f2368e345edbe53b6861be5c92cc37d5565f430993d6ccc64f275cdc6550220c4f2f55e9d007b1549deb12b3ddb83538c3fb53b74c SHA512 4b3f29a8ca6e03af2413ad8a1776412eadcd280fa9fc90b0e6465ffc0915453e792abf1ba9cae05b2a8e3b07b103d76524bc9725d425189babc8003dd52deb29
-DIST thunderbird-78.5.0-es-ES.xpi 569792 BLAKE2B 2545d12db6082522f3ff7840edeef3b90fbad543b555853ddef5dd6b0c97b3fcbbe9d21495878e0deee497e2053611a8eda4327e502eb02b4e32cccdc5732e2f SHA512 0a84d0adf2ca64b0d869c39a59a493d130cad491e02f2255aa5360f573a65bc7cb5666842378485f2717673087d452570b90d59ac97b2e48f2486374b042ddfb
-DIST thunderbird-78.5.0-et.xpi 597699 BLAKE2B 8832e1ecfc20a5a812b78d603d689ef67b87f6a6b763afe421491f978a0b3e1f63dec8b4e6d4909b96aa996961f50b4290901ab70ea2c7081809481b999afc32 SHA512 cd57822ccddb61092d5b8b9330578aca883d2ea4d536e7f1e9546351f382b7a78f171905c360c9a4aef143983ff83db85b062a34b1828a1e99b992ffccc2411d
-DIST thunderbird-78.5.0-eu.xpi 632935 BLAKE2B 0de8f2679a007a06af29c43db017934af8ba20910234e3689cbc1509b2f9e2c31c4c5adb6f6879a32122d05e616e3e0d305104e5abee7693ee3e88128d24385a SHA512 53e0ad6c2ea7d08b47852d399b1c1139bea0ce6b0956f8458e4623524abf4213f0f2b085250964421586523486d95ef4550b17afd435db3905dd08afde75aadc
-DIST thunderbird-78.5.0-fa.xpi 639717 BLAKE2B 95ba7fc570b926c7598d824ca49d5938fd39a10f96464b45ade2c693faa296210641f33bf6965e3d5c3934c30e0c7c7021e1aa613d71fb01ff656d2014e90fbd SHA512 d46dc6015e5c8b80dbf5de451e4378a2a0a4792b4ef4b17be8b6abd8b6c7c0a1cb22fb8546e22fe857cf916a5a7d250238ee94b28303f6bec8b515380a68707a
-DIST thunderbird-78.5.0-fi.xpi 642442 BLAKE2B 72477dc4eabd7f044849a3b117141dff8a19d24063939ae96105380ab8c67de769a09e93409f9f11c46b00800e73db530392dbe5026b06c19b501499da2f3849 SHA512 6b5071e983d2cb87957e097f72383501dfa1487fa16bc69d8895e1060768d4470ec54e402792c254a0f29cf5ed5aa36927b3bbe5b29aa1e3e85ff593dfcae2b9
-DIST thunderbird-78.5.0-fr.xpi 669492 BLAKE2B 8a33feeb9465cec5b76b98a6c3160afcdddf6bdcf636d049eb6b62a77bf1c5a59866a58350a9bf16495fd80bb8c8ff8184a4c7b9ed371777621f2d6a8cdb9b20 SHA512 189d57b9e2400fc64385df87bb7108e85d145b003bd528231dec525cf5271cb68dec4ed274107350d3895799782b8837e51bf0e23d19c129b26ee80d169b3174
-DIST thunderbird-78.5.0-fy-NL.xpi 653078 BLAKE2B a01388939ac01e3f80d94af5619184d2e4b1ea7e4793dbf9ea4a13ba108edf88fa9ec4c2306505fa0dc4007f65d1973ab2e35ec84e734f24ff0ef7cc85ba7b26 SHA512 b68691898d813b25751c7785198ea934bd268536b6ff955cada16692b53c31836d41d9630dd2a19fb6e41c181bd4fb4d183dfb255ecd5b6a3ecbefb1af316b15
-DIST thunderbird-78.5.0-ga-IE.xpi 600682 BLAKE2B 4132e89fe97cb2f7bed52c249de87402e17aba8d6c8df65e4acc7fed9df68eb8a2427538593586d6c510b01a0b3f754a33f12e4aa81ff63d5792e74f968c890e SHA512 12f599046bde3d5b5da69575ff00e7bf6b106e8d4b69a838d38542ec77568db3b0a702c7eb73a7a0572b479547b2c9d0aabfbf4496740e8a5c3a76cd75c602bd
-DIST thunderbird-78.5.0-gd.xpi 609349 BLAKE2B 794edca1cfd129a8c40e0314be00b55ea9220dc2891dcfaad47f8edcb7b88972528954e4d1ef608330cde89d77c2b17fc9495c4b8c8f1161dab90ec108d51bcd SHA512 6837e09384170805e5525fd0421dafc9b33f2ae24955ef7d7c4193418d12cabfb6adae16d81719ce41cc9931d2c4c47eb61bc0ca77e4018905e07c07ff6d3d28
-DIST thunderbird-78.5.0-gl.xpi 615720 BLAKE2B 4c323cf22735d0906ffdeebd8163eb0068d3d2925142d805d0abd836cdbcae5c55dfe5c25e78afcd8d90ca481219bf6fa00c98451bad5fb6214b2710525a5d37 SHA512 8adabc5252396d873e4e85edf7bf42d1db91f9a4fbecf81b44a99f550375eb2f3d0c6cd95837edc10637c0d1f27a6b05e050a47c33b7598449b97f30b6927cb1
-DIST thunderbird-78.5.0-he.xpi 640490 BLAKE2B cc2bf3f5e0dec1f999292e15f47b380155f64920f978dc690f7a98410db979374b9ef7a9ea42f96359ca2171c8c800b3ff7ef4fcb2ef34f81d70107043b90faf SHA512 47d1b89dc20cdf01b5bf49afa4a6dd7e93f1cda6e9a557cfe2012305832f9e9e37a2fab1ffcea1be173030dcb4229120b0f19381bc3e4ddf572235237e23adfd
-DIST thunderbird-78.5.0-hr.xpi 628987 BLAKE2B 88092f356b745ae7b9b934ae707b24a57fda6896f493e8863378abcde2ea082ccdc6ca94ac751877b73246dc6e90ca5cc25e9008480761ead6a0968938f71ca2 SHA512 762789377ed6766475c6a9fd35c89898088fe5cea59ea1540dd654b5bdc017c3b5b8314639d834093cdf9808002a8ab1f64b9bd2b18c9e1f4e2569adb1e1e390
-DIST thunderbird-78.5.0-hsb.xpi 668606 BLAKE2B 94d94a476217ef84221540dc494fed8b14323c42952dbc9d8a82eaf1f28b50f3641779fcd5b174e84d5cfc2bd4d1c60ce15a42cc25a987d64f26ae11d478fda5 SHA512 1115090bc146536a9fbc5ccea7e599814fc2351bd499d66d95844b16a71599067eb2c593e21a3a49934689312841d974328ea8d6a528a97202364ac0010d28de
-DIST thunderbird-78.5.0-hu.xpi 679829 BLAKE2B 4dfa36bb84a1e4141fa01ee667c23e66c48835e24f43af0ee4e9c07be1d69131cb939a53003266e9a58fc2695a95adc22c9a37e0a661c28f19f9c920426ad04a SHA512 04624a6fe98b6e0786e74b9a2ee5d769a477b74b35b92f83e84e4570554750d9cfe49cadb6613fb81345cfbc32fc7cf0128c0df740908f74ac16afc59f866ad0
-DIST thunderbird-78.5.0-hy-AM.xpi 713297 BLAKE2B f885bfc263998c4e0ab7a1bce0399e84ae807b4c2cbddfe22e222841f762d38d12269d5ccfba9dcd2eeeb9b830ead2f8cd8d39e101c7db7a0a99913ed4a1d1f0 SHA512 8d459e9aaa2db307bc32e004d8d8919dccd17b02da08fdcc6220f654669c315c85fa4eb26084bfbf6250a95552b2781d5afabd82820e4292fd2e4d897b67ae6d
-DIST thunderbird-78.5.0-id.xpi 620640 BLAKE2B d113eed7cecc377615df9d890061f266cf221bd59a6804d7cedef9372c9de71f9882d06c9383f964a1d30a1f313eff5d0c39e3e04c0d2ac8b90ecf0d1f90a54a SHA512 cd7868591687ea85e746f22ded825b7c64d640666faaad61fa543baf3d4754d2363d1d6899285c694315db5a4800be18e59e56b28455c6a96a03909e7ef00776
-DIST thunderbird-78.5.0-is.xpi 581605 BLAKE2B 67c78746e0fb1a513d327280c29a1eb118fffaf004bc1e8d34e5bc490f94bef7679c4fad80b170e363a7a0b1d58da5362f708a7b46b0f9689eeb3d30369db978 SHA512 f21f12913d4a79dbcfb5688dba909345404761b2832467e9d31b370aa39c7fa7ed06f8b147eb8e55161bb345a78c4fdee7e8f1a25da9057c78ec76b5414ee18d
-DIST thunderbird-78.5.0-it.xpi 572958 BLAKE2B f005acb2a117146726bf944688be8cb5fc35e4c820bd68e99cf7858d8f3f2fbfd9fe7e315e24314f2428fdc7b9275572d5ea96aa198c06b15fa2cabf29eb8007 SHA512 b79a5eaec4b7e0e043bd0b39a0129326b2bdb11793428e8f722405cee5c922575876528e5da4109bae97546ef110c864910d35d5b791f04ffda24bf5f1e3974e
-DIST thunderbird-78.5.0-ja.xpi 722455 BLAKE2B aac3e647fd677b69c501b8a974e55558610581c857d4aa728300325d11b66d0233ab7853170cd9ac91644aa51f6d348192adc528208fb38a50a815da9ab96800 SHA512 8ea3d523759fd92464ffeb6f5432f80259068cd0fa85003f007be622bcbe788a59e6efc83feb736673db95e32069e132cbeb08eb2f21790e053ea9b32bf9d555
-DIST thunderbird-78.5.0-ka.xpi 717014 BLAKE2B edd1c1f6f9936344585006c63feae3cb100f2a2f7c6095e3fb08291e8760d2d3334574e5582d3dea35fd6ab487ff21149f10d2bb1b936628a492c23ceae75a65 SHA512 fd9e0f27ea490b998d399dc542442c755e27a11ba3748d125eb3841e4fc193c2776988744872c77f7fc77094dca7b58698772978e38618ada224c553177a92ce
-DIST thunderbird-78.5.0-kab.xpi 651925 BLAKE2B 7c6e54095c3450b34e36eac6b31412097f84327e6bebaed1196162f1e5ce6518326c85596dd7fc04603e1be577bc69b6e7358576fde607e56dd273d7d62000df SHA512 06b29cf7509b63a6f668c71ef900be12e3b6bb3b77b261eda16ae009d5214572148e30d30f660b18c72bf3b90b2926b5e931be892f299381ecce41d3885f639a
-DIST thunderbird-78.5.0-kk.xpi 720431 BLAKE2B 58681793c59f883f8838ca7ce2a4c6cb5cc4d72d4b9aa6e8b9d492302dd1aced926eba3ece59589b92b1310f989356409e928f6a3b465dd57e799e401b5d1714 SHA512 9e7f589c20b6b06dd41fe6a4bc4a42d50a1d8be2745aaf6b14057db7abb9c59935f45e314efe7209b08897d78122737d5b42a0589c25d1adfc8c9ce704e7695f
-DIST thunderbird-78.5.0-ko.xpi 688209 BLAKE2B e50ed2289e34cfc0819c334959fc1eb790241efbecf82980fb8eefee80e5d7b45fea69b6ad2fec8a587fd3b26d8f09e52f255d531c7685347c3be7849b72ea09 SHA512 74985c58df4bc72bc1719383dfd8ae2ad601105645f852caae922128afc64ce10354edc11ab1f7e8e517ce95196db52ed0fc0bc41adffe521a2450302bcacaa8
-DIST thunderbird-78.5.0-lt.xpi 660299 BLAKE2B 1cf913c519472630640bcd610c3f81a0ce93d2d7c6512b46ae8825f8be2144ccdb42926c0d587a2895af64d24866b33e655ddd6fad52f3cd45b47c73abf23c65 SHA512 d4df0dbbf5c9055fcd5f64da33b715d597408a65e684e59e7c05da70a16a0a4c6dc057f031b1eadcc7a499c10afa0cd8987c857ee408592a47fc4e7aab44998f
-DIST thunderbird-78.5.0-ms.xpi 572136 BLAKE2B 5b49ae2b21691c0de11e3f3813aa958e5c818edd407127031a631c8749391b113c9dc0263714f0b1fe1e28bef6829a05ad4d1a858b26422346d7944ca965a8f6 SHA512 2db29f15f5d1016a3656de9b668416031776df5a821953dc57235955652e1bff29e0abf82023081bbc4b0b1005d75b168de9ba7c18f3f8b147df118a33d33c18
-DIST thunderbird-78.5.0-nb-NO.xpi 637235 BLAKE2B f1e6daf9fc7529e10fd1b4e65691fee484c911815db7c96e472c17d79a5e56addca302e3f21d76cf491c05479a82e61dd169dbc12892ac88ec970dc89d8f444c SHA512 524c9ed6e0a66cb53f8394f8459ff34a2894b3d07edced3eeef1f1169b275898cc6c2b30fc78b4f4dd06f1fbc6651999a7050cd428cb0bf2bf439f866fcdfd69
-DIST thunderbird-78.5.0-nl.xpi 644354 BLAKE2B 7d3f8f9e88957608c343a643afb2193878e239841aadae541429ce3441957bf5a0ffb7d016003d883a53f97b011c5ef096769de4a109c4b0615e620a93832fd3 SHA512 3621c41faea13780a139ed7485e9904893552b8b3e182f34ea49fb4a2e4f85654aa26fe7b76753b8b883a04d481e808bc616758624fc61e7ff9aed1d09e92df8
-DIST thunderbird-78.5.0-nn-NO.xpi 640684 BLAKE2B bbf1ff1201dfb1c2e5764072098d1a1ba1500326507c4f9274e479fe8fa07b5446fdc9bc6a8d9b84c80a876f7b2606bd1921be1343e46bf56533fb5ef577422b SHA512 4560e185285c942667ff7d9f8af6659fa11efd4c2c5cbbe85494beb084f6bc6671a88dac0ec46ae2e738666a718cb14695e84e6a8e67dbbc93ad4ceb3aa04b33
-DIST thunderbird-78.5.0-pa-IN.xpi 633177 BLAKE2B 628a1922abdf728a82520014f6da315be96a3c159752e5eccf3c3b18396e37202844b3cee4edc068bc8a8b0497e97d904f6f11fa28a0d74221ae4bd8c95ef992 SHA512 5ed8c7afe3bb9a92fec130e8ec377288472ab910b9bc0a028dd18960c39889f28211e11da7e34acc203ce57ab24fa524d862e22653f3c26a349fd604d1df8c1c
-DIST thunderbird-78.5.0-pl.xpi 637112 BLAKE2B a6bc4e8e8021eac5f53ced8b0decf23460b83282bddf0b9aa5822f2f2c9b8c1026b8d5c4b1aece0435cd88167257c2ff306a8405ceaa9df3c6b81e2e1197d1a9 SHA512 1b415108ae218ea9269a4cc2f51fd64d716deaaebc8116a94611fe2800c39ab56c123345ff4d075dca92cae56f00e97bb55f205bdb6b19948528211fb6574528
-DIST thunderbird-78.5.0-pt-BR.xpi 649414 BLAKE2B a0a56356620ec5226e47560e08132f56cbdf360576715a517ccd3ee9d9f55ebe5e7be6a6ce08f522687a32795ab128a8b9ccb78cf3b9ee8f3cd858a882cbb076 SHA512 349c8f47cf1405210d01e91a59a1132c47a84771d5da878b5f668f497e522d259c3ebd4ff1001604f580c1b54a3ff4fbe6084785b4c580c7a9b79056153afb9d
-DIST thunderbird-78.5.0-pt-PT.xpi 655497 BLAKE2B d49efa87dd516027f30b5dae1dca9f3b11f23802de03b9643804ce2d0554c494153a20500883a7c04fab15b3d30fc32bc65daf329aef1b9f352f3cf1627b56dc SHA512 cd00271ff1919b88920d734706670b63dc00c6de4b0caa1c1b5e91f7f7ea5b82fef18452ee228f6949222bb6ab3d7a297c3123e3f10d34a7d7090afa186a930b
-DIST thunderbird-78.5.0-rm.xpi 646531 BLAKE2B 0b56269c62d275dca843c57460dfd70bba13f01de7a852a29cfbbeedd4d9842e7cedc57ce9574f6348543d15623a607e283dcf89740b16328061664a8267878a SHA512 f81a43a476c91d8f3d6f830bd27479b92a8fadf539f46fba8ca0dd07dbd2cb639ece560fcda88764e4510e8854537c5a558e1b837a4e7fd6ddc1dac914a88092
-DIST thunderbird-78.5.0-ro.xpi 662642 BLAKE2B b19931aa66e26fca2f857439c0e47172ced0255c23f3d7731af95a9639078f0869bd524e0cbbad49118c374d5ecc7f652467862076c2b8870cd467d957603f4d SHA512 53356a655803f14d68312d461920d3a6f17db118547fb7d040f5110d4e65db76104e072646b3849efa5ca47f027e5c761a721be83ebf3cd200e36b9deb15ebbd
-DIST thunderbird-78.5.0-ru.xpi 756187 BLAKE2B 42d2470e72e519a63addd3356824f4604ab300e43b0d9bcf08c79cd6d393d1decfa9a30f1c44fc136540af9979284a90530a6ca8b7c8886517b871536e029629 SHA512 2ade9448e0178aefa8ea032a2e53a42b8f77641dc56e790826f44ff3628d381dfd490b08164838c85ed80e84a69348251a1b5920291586720044a51e587b8b5b
-DIST thunderbird-78.5.0-si.xpi 651069 BLAKE2B 78fcd5569a87e3938893f8010d3bb3a515365b92986a75bb2d27ae36482eed906eeabe59c6beed626027267dd0380ae1f186221d9227bad3e25ae60a213b3739 SHA512 5b22ef4072b0d81ccffbd62ac6279a783a5acf716b67561d206034f66e8569935bf1d0eca8e03d6af7a4601acc1176be0c78bb40daf95c544bb11b918aad9673
-DIST thunderbird-78.5.0-sk.xpi 643185 BLAKE2B e4fc5bb819bd79161359cd90aadb56f28d887897a4bc5b5c4b6db79ae525fae2ebd0f1d53e3897194cfa11232fdedb99538f398a1a48accefd18f7046d2efaf1 SHA512 e948a48e333306d744dc7c397b2839ce4b899a44c72c68748557657422ca0149781395c870a3bb38e97f8a2a786d2373f3aa64331e99f392b6bd451a3dac1a6c
-DIST thunderbird-78.5.0-sl.xpi 632340 BLAKE2B 046266bce228b914c30f726bd78d00d725791cd6710c65fe146054e8a9fc0af743b3c839b57f1e773a2d009776ef2d703532cb2bcaef324149018bfd149e53b2 SHA512 aae9faa7de38d6d55e39bfc95ee035526bb7cc67136afd80b3304930067a8739cd5e8bb4d867fb49f2f8de784c4fd306857d9139a5d619f1679e5e7d64ce7c68
-DIST thunderbird-78.5.0-sq.xpi 657818 BLAKE2B d0af6bd2947854326be426109899308fe0d085ceff533e66db0b58cbd64ec419e85d7076e61bf4af17065d02292b64e7ac257657f4ccf4c3451de53ef398e4b7 SHA512 9ba4ec6ae1b69802d2db51649f05db16d1cd472af7fbb7cf00dfa87cebda6496bb8c293f88aef3bdb5b0cf84c8a751eabb461673b2dca2d89f7a049cdc01a654
-DIST thunderbird-78.5.0-sr.xpi 683076 BLAKE2B df42669c5ea3ff0341d3365f01e05911f6e6b275f2595ab2662131436907f0ec70edee6b0aef48f9afec12258257f3744c0cabfec288589b4e558a3ea76bdd21 SHA512 e85a21aaa1e83d97470241fec487b8df29982a21e7a0aa1ead9057b6dd2261f103882b31e3fd39ed1b35b296297651976e998d80f07eae135bd35538a97ff64b
-DIST thunderbird-78.5.0-sv-SE.xpi 648863 BLAKE2B 18900bcda5bf2edfeccf2d2aec02ec7ad3bd413caf4d89d85f4723fd27254787b0968cb0740d367acf1590cc9601486b4027e0e9617844106c96efe52afb48e7 SHA512 2d0f6d8f7c5d7661c4a6d2a09487c03b952a4c542631b4b9d947464e6e74e6b760dbe7ecf808ebc8fdd258ad5f69211dbbbe7b68b08770b67b8eebe5413968cc
-DIST thunderbird-78.5.0-th.xpi 712031 BLAKE2B 8de6fd5f9eafaa4b97658eb303289be97c053bc153fdc2d902d8ae8bbb0e290c4e0512f3085dc87c18afdff4dc37338d18fc9253419b0b7bfb66ac2e007d394c SHA512 c9769389be0e9b154ce686e79fd4cc7047d7f115eff2b888dcaaf4a70b29d0f27a2b0a840a231569bf2229419ddef53c111fb4a3103d836b100915ab979997bd
-DIST thunderbird-78.5.0-tr.xpi 649071 BLAKE2B b7fd59c4c846e1214f7a16899741a74044cf9c945385bb57735ef2773da1877085368f273c25aa37e2dbc8549f0c805dff501614e63d7761e5892e0eb6240b6a SHA512 e77fc7064bc530df959e73f0bcd2e977cc09ca3cc0adde703850a3c89b171e73ae57a9b7c715e75310b8d6ecc2a3444c36519e2c56f9c0c7aba561b26d8f2f30
-DIST thunderbird-78.5.0-uz.xpi 586572 BLAKE2B 7ada629d4274e2500c59dd6ab75ff8c9e9b88fface27fb650abc0637a137971f6a95323b6fcf4bda995203b42b0f9a6a135f48aa16c37f6b7e5fb09a08f68b95 SHA512 9c627329b438b1a4afc7507a4e87c4c5a94bb665d51935227df51023d7c37e407ee4d6c84626668fd50d1f3b7d282c7701ac7a273ee37c665e99492fd22aa6b4
-DIST thunderbird-78.5.0-vi.xpi 674608 BLAKE2B af9954482a76f094a0ae0a48135198465f656fe739419b3cf75931967cb9561b8a16d44eb9dac54d78f024ff28658a8a5ea2144c344aaed63e8c33b3b67392e4 SHA512 2641538591d060a60abeb25893bee0446a55ee750de430e39ba147ff1620836a9f486f142e3f1c1180bc7b3c142b399cbb2765a162b792f8fcd1884163b7d61b
-DIST thunderbird-78.5.0-zh-CN.xpi 687174 BLAKE2B 2fcd423229281528ea8767dafe8c6f7073b29b8b1e0d22624b81f84bb944bfca3040c840031317edb0f94a0c7afbd9126fd97ef76442a6d213416c0ab29cd4c0 SHA512 569e3dc49d102d56b50d9dccb7587e76481bc637f008493c40fdf7bcf2b7dd58c776131ac3cd6b37d479b900d77da4621e7c6476526159a0026da7bd156a163b
-DIST thunderbird-78.5.0-zh-TW.xpi 687620 BLAKE2B be48d9da7320faf2bea2f3cb682a34114321f7a0af505f4cf4e677b3ade4784f0a9d444c0b407a9d97bc50eb1f6292078a3e38f1e6d83c32ba64f094378c3b71 SHA512 a7a5e00e02ba66fd8dedbfe60af12843f5af67aa72e43c4b99bea1c6edd598d39219a58e147f819390a7d2f1536a27e87f63139a4014d84ac5ccb4ee653ccde4
-DIST thunderbird-bin_i686-78.5.0.tar.bz2 68172901 BLAKE2B 279cfa0c35b78948dbde04ee2b9e7589d7584b9e85614c322102c4f97c7879f07c07168317b4cf65ca2dfd4a713eca2e06a76c00ef0d1f25973c3f8793d91ba3 SHA512 c9afc63e22849d0bdb6e07d447f9bd25180397ab88844b6455f3d95ad11f287d63224f35be748b7286d7928bbb8235ec88e4fe88eef6003741f513a72f53dded
-DIST thunderbird-bin_x86_64-78.5.0.tar.bz2 65186918 BLAKE2B 1c1bc418826dd02ec62c885ca76ac47b0d223490b0b4cafb1d9b088527745b49c850267f18dc20bc202c7494513a0fb6a2f1a739bc3db9fa3c5f2c5911efb48f SHA512 bb731e63d4558fc13d8f64302665aea5ba1b1068f69dfad1530d1897d033786c2dcc5c344f1efd9f5c4bc8826ae4ec2a2eefdb9ac386949b4825965234ef6bee
-EBUILD thunderbird-bin-78.5.0.ebuild 10244 BLAKE2B fa13396fac7f04ad1bbe22c8e04114048a2694e48609f063191b6c502b967e98da85ac4bf0e29ee15acf867611465eee2d79043693f99a42d932c6ed1f5c618a SHA512 ef68593e9528d6a61a5c06a2e58deb8ac7a6bfa62dc14a4506ec7e52a2d74308b243b9f53d00befa0ebb6aa663442ef703d1ef2038e36d13244bd2ab4f42200e
+DIST thunderbird-78.5.1-af.xpi 548317 BLAKE2B 80a469f883041bf82e0543fcff986c16e49256b95c7d51258136bb5f1ff48ce5932092f3e70c31ec99918fa30831e5175dc7d6015a652953fb872e0ae90fa115 SHA512 541cb5d81de551099a2807cf5b83d23a84e0d4eb421b85fb22dcfbf3b05289b7db1debc45b1e7a1bd502b7ca89f569b494cf72110db8192eb588e333b98411a9
+DIST thunderbird-78.5.1-ar.xpi 648570 BLAKE2B 15abd5bafd8b328a3391bb7f95305bc2c0df70f2ec723ca63be103cabd506433f145d541430d78c530be835801f01687849ecc124802056d649d28f4a37a67ad SHA512 95d8e1f46c9cc92a1097cd55f3bdcf6f685cb8294ecdc8c89520548789107579997364faed9be42e796e5845b86af2db72e5c6564d6635c061641a6c1275b1fb
+DIST thunderbird-78.5.1-ast.xpi 561220 BLAKE2B 34d5db5e6ffbcc6960d1e94eb53d4e99c7c56dd06a08b2737bd9782ca07c731de4b01e7d45bbf769043b7fd4530390e33e973c58937a36a40e9360ec02e1dac3 SHA512 fff1034b0d9859797c4a77b296a3f47cc3602d43a000bed91184b50b065321c96af0078a85617de1abe4a73aace498af3a8b9ee6941884ac306d2eadeda6d99e
+DIST thunderbird-78.5.1-be.xpi 666628 BLAKE2B 2c96c3383fe5218149e8097be028ab287ff447f3cde0792c9c498ac242f3f35faff34dfefa870a4dafdb46e1341c9f787d7cff76ecdd7f294c48b7354b38417a SHA512 431c4fc83d9784428f8120cb64cee8860f5f750178ffbd3f894a9c2bb3c8f58248ce0098fdaf8f6b18476ee54226749c0d224e9a32cd9bb8e42f427ecceb51e0
+DIST thunderbird-78.5.1-bg.xpi 672381 BLAKE2B e1f8d1338b45fd41ebdfbb46b746fe526a1e6e71fa62e1b8161e760da08d3c0e7724ea89802240b6ddc35f26514b36d92be3a63c1a5eba607fb5d41fd6cdae43 SHA512 2f8f47ed87d297957f7a8393fe37d879e1bbb265aea4731ea090511d01584be32f5edab71fe9241d6f3383e21a8cd04ac44577389e81ede7134dfe14e3d5bff4
+DIST thunderbird-78.5.1-br.xpi 604491 BLAKE2B 4daa0bae19200a217f46906fb17bf9543f0282a5135acbdcd45b04f1567039e97389541df1319b68593334fbf54b9a32d2a425befa46f062db7e6a2be79f39dd SHA512 2aca811de1943c192fc8997ede4678225ccec0a3b4e382f7ddbb88b37e80c363451a47a437be0f29f554a05564827bb12b17868db18dfb3fc4ab34e4959a2318
+DIST thunderbird-78.5.1-ca.xpi 620419 BLAKE2B bbf6566f0d123adf5d09fa1c21e40fda9ac5772789ebc64eb14a627a40cbe4725937b53875182457813edc14ff68d4431a659974291818303785e77fe4e6c534 SHA512 aa6c9c77429344cc5a8a284b55083d7732c6890248ef74101a3b44f4d6ea9cbd39b955b8e92fe53e8ad9db071864ca10d4a536d9181cfac3579e7c7117be5cd0
+DIST thunderbird-78.5.1-cak.xpi 635650 BLAKE2B 249198354c43236e301c80cef747967183065e20e0c9ca47a080f356520cad5a2f66a9bb5d03ced579be73ef7559241df4be01b73dabe84e1d28e7f5b6d22f0a SHA512 6c4a924ab6c469529f61a1ce05e5741c22da86c56be169e64c868ca5e101c55f89a38e8f4f3e83070454f6379dd42010eeefd7f986a68967a80a32cc72ca8cc9
+DIST thunderbird-78.5.1-cs.xpi 635315 BLAKE2B 7b51c43c4965ebeda4b7a9b214860162bd8ff24183a66803ef11810683d689661997a6d060322df3199ea4b85ab7c1297b513f95f3b13550a58b30bce9c9719c SHA512 ecf60ff8676a8688a796a90598a6a6a4c0b8796289bbed7e2a237ff7412ccd31546d894d0fff526bb2ce418f3046c0753faa22c488863a558c6764fe90751200
+DIST thunderbird-78.5.1-cy.xpi 646229 BLAKE2B 17a0db36aff61e5cba9732aa514e37fca3a9561a2f8543bc1020921eeb39147867248cb016660e6bf9dab7270ad76dda16615de58a643cf6e717f37a9926e2ca SHA512 69951b3986e34090a67434fdaa27cf7c71236bb3d152bf3cecde24e7e1222781e12936870af701e10736656554951dc856646468d0aaa30855a1dfec8e3a5eea
+DIST thunderbird-78.5.1-da.xpi 620984 BLAKE2B c24fe8be92f797bb11a8a994143598bcbdb316e1f02dc22e1c8faf8c8bd94b9b394085eb9fd0cc07d9a9cdbc448b05173150900f74b7ed8b9e1ebde93cb5c00b SHA512 f9c0f29c8af5a81df0ac5aad76b134757aceda4fc2bf6c849ba4f9952e6ff275ae1b7ea4e8f978b21ce2be1cc91fa97a005fbebc0f956ab8ad259b1cfa863615
+DIST thunderbird-78.5.1-de.xpi 665194 BLAKE2B ca9b5a4cbe98ef9cb2c8b08940cb6bbfe43128fca438b130a1716824543b43d51d2f4c8f88d8fc0db743e2a8ff4092cf03909b4d01b2127e31c28544d3a60153 SHA512 94626848abb600432922c860a7b272d1f1b19c60af8794ed657276dc35674e823e04c359fc159d7d370c97d6bf4e764b7a666ad891488345d78b8368138dfd62
+DIST thunderbird-78.5.1-dsb.xpi 666772 BLAKE2B d756bfbeee58fd3786fd027c5e52ebacbb743ae5058af2aac864d654bfcb9aae593f3c65cffce239b89fa66a3f03ea9893763f0f8a60754a301ff4829a00f0f6 SHA512 5b0fe19a94ee353743b6356b197fbba47218288670cf2077beb15d25dcfa85bbc1d9912eb2952f54b1cf4137fe2ad50388151757bd1645905711d5573bbbf9fd
+DIST thunderbird-78.5.1-el.xpi 774449 BLAKE2B 6280704e57d88a33f27213d1a5a86cd7435acaaf176dca004ccf60cd50e298c5182a685f808f4efeec3e8af6a9d21a68ef2834ea44d61cf316b3b79e5f7de4be SHA512 521b748687b439b1a5d870b27c11fba764ddd15abd049b59201c8cdb7827a9bfcd39148eba39d971c1f560430482bd73d3e813d82e87ba2484532acceea24b06
+DIST thunderbird-78.5.1-en-CA.xpi 611779 BLAKE2B 8fa12883317f2013327afaff0412553a452944743bbcd21ba1057061060af5e0cd948f94bdd839387925ba19b245d9e31f7c761df22f2b0f9ee1e2aedf513720 SHA512 65bad1f9fb111b6a7be3b5ce8277c910655c370a2f07e8b7db6049f14559c8c53f8f66528b250fd4d179ef8180a591494da3ae52b9cc818508d08d918e4596cf
+DIST thunderbird-78.5.1-en-GB.xpi 611182 BLAKE2B 3521e522f7a36f85a2a2a92427df577af173ecd30129678274d73d7dfcb9395de5854f3d349407cffa219e376439f36c0b2e210f3e1ec902d9a7822c64c548db SHA512 a3d94b14d7bdf12423178b9ee31a6c0339ae48add3505303ffc78a6e477afe66ee38acf787c928e77fd0aedc5616917117a6b5e121c36065d1da2e2cf0979ce8
+DIST thunderbird-78.5.1-es-AR.xpi 657798 BLAKE2B 920dd49f9d646adf3e35ea1dbf9c6c980e811bf0014a861e67ff551cb802ce3e582267cb1cd3ccba431b477da3426c352a5568ae6e5eff687dfc3e5db6a27e69 SHA512 019840c0bab36712b61ec2b499916c844f804ce2bddd41b8247edc538a75df82e3394a735936093b9b8ca5c4bf91db9282b4ae4f54e2790306a7e9163578a630
+DIST thunderbird-78.5.1-es-ES.xpi 569804 BLAKE2B 583210a4a75ba8ca886168aa36c3bb5db3b0551982f0f983a3ad2c71fe2a608bc29e882c0194f7bdbeccae6a9d7d6b992e8743270073cf3049d2935c8b5d6cf9 SHA512 7168318d7d1bf63d5bfc70c21b79962b19a7e0938a1636965130eb75caa33f7e861567e8654e1c0d71f206938a0971430379fefd290cd2d1d02fbd7427abb959
+DIST thunderbird-78.5.1-et.xpi 597700 BLAKE2B 0d872a5aaeb393c4747398990f86563461e7a2c772575a9a825c77437c2bce67b2c8a45d2ff4ec07288ef561bc9f4d052e934227c4010e36244a6278bf17dd8b SHA512 6ba39ed5b5704d0ca4dcddfd39f4ae2f181e1d3cc7fa329076a05308932337e17ead3174cdfc7bf7b1fc98ee321fdf6c7cc540aee66a41bbaf4e06f2de90a32f
+DIST thunderbird-78.5.1-eu.xpi 632925 BLAKE2B 2b731410f4f60bf3b7da7fcaacb55eadf4a8d69bfa4409d62287787e3b12e34eac3aafb85fd9075e7584be034bb2436ce7b7b867825bf5e3812e8eb0b67638a1 SHA512 ec6bef4a5a3c5a444c4d1b0f0844a630cb48dde0b3d3abbc8535c0f0fba5c24ae2de96cc81e679d88458d2d807d52ea12fce894d202ab46008fa87d9fd938ccf
+DIST thunderbird-78.5.1-fa.xpi 639719 BLAKE2B 45b06ca22fe853b945fdfe2de4dc677ed2316befdd616309dab0a549d92f696a6278c58f65b4e1b02ca99ccc0812d9e3e9cd08fa2a23b725450a60bfc8fdcf54 SHA512 46558a43f3ec608fd8bbf6fef2980ef836ecb220553b2d58531d3cce7ebb36e3980167e7fb0b26b1b2ae460a0bd119ff6bf68ff53287e6ce6d89c948184c3984
+DIST thunderbird-78.5.1-fi.xpi 642443 BLAKE2B 15d348ad03607202169233126afbfbcc585dc03df2e560c0aa9f3a54f996147c1de48ce5be79b044c154d3edb2bc3eeb3d7a19d045af6bc373c8eb4eca379cde SHA512 b666187d4544efabfbac80003cf858c105f03a75594c32ca96509dd6f16144d476855133323c7aaad1675d7eca237bb472a36b5f8687bae4255f54bceef233c9
+DIST thunderbird-78.5.1-fr.xpi 669494 BLAKE2B 522d8277d81e520c1e1089ab8dad5a0f892c13ff901bafcbf530b6df99f72f6840543ef690c0bf67874f0e968bd7ebb88e0bbf694148fad87ef048afa11876eb SHA512 c6631632d4588a5f9a5d750437835bcf1bb6b6506cb0f9c2eae431c1ba9003a190bf13258593085658e26c99129b3b75726e14365dc193c128231d2f1846ad57
+DIST thunderbird-78.5.1-fy-NL.xpi 653091 BLAKE2B 760d579c67f35a36fbad0b9d8fa4524f62c1f41a921bf341d32dd2c8794a767781270e620091ecdee9cc305f2873f3de3033bf783fe207acf3d5dc6a3e7aa79c SHA512 44547c1cfa39509bce6689f2757241da29d4a0f394890c05c62b9ca0e1674401c253a5038e36aaeed4209b4393c02051355cf7a6450fc458e6e4a73b2f26e66a
+DIST thunderbird-78.5.1-ga-IE.xpi 600677 BLAKE2B a9562455165498d23469da82ddf5924a705bcbc1a251363a290aac7467086d7fc3ded9c5f0b15dccc94cd1ae156fb0f490e3e89663393ab83de450941a96f42a SHA512 ff05174aa49f01370238209d8261e3b0d8e38b0c6175c6727b7def9a4d042aecd51207530bec92a7489959f3f3405c812686896d150faaee76991ab058dbdc20
+DIST thunderbird-78.5.1-gd.xpi 609349 BLAKE2B 5168ec9ba6945dfeca67621ac6954bedc092832276e6d2f7ed93f51745717edfe710017714f8ba41fe5a5df328e67dc9e6e19628dafa34eba86948bf029be578 SHA512 490a8901dd72f6eda9c368cccbad243436b13cacac3b79cfbc6c934d2f949739821ff7c64bb8ec76788c5f080a0b1dfb7eeeabdfd7e1438631eb1ff88e65f934
+DIST thunderbird-78.5.1-gl.xpi 615718 BLAKE2B e3c2b585a5512b161e1f439e8e914d12c0f7da095741b893f512a7c7d80a707c37b24bf93dbdcfb04fcdf21978120028322c4a7f91ca20c0045d924c4066b727 SHA512 724330f721f139147e92148fe8bc6f77d48fd0a3488bfeab1d708b858de121bbc19efbba405378bfd5b435dd50b17a6c9578f2085be6d283f91872f68325b0b1
+DIST thunderbird-78.5.1-he.xpi 640499 BLAKE2B 6b9e3f28de22fe93af930618fd6f1d8ed5b6f29d51384584ce771ee51211e7ce5dc6577259d689baceede0aff0257fcd4e905dc3f10e49e9d242040de0f24c57 SHA512 e66530728e25e06e32988abe513655bc1f3dd1dcb40a04b8788db28d9e8cb12a7eee07bef970cdc4f0a2f4d10518da17e704dae0fa528fa211a03153633a9699
+DIST thunderbird-78.5.1-hr.xpi 628987 BLAKE2B bb02af1159b9b014b2e6f3e781b431db5f95fb25f00d30704712d255c4bee3725be3b6edd58d1ac545d02202713044024ddd229fd6b98363d3d886193d0e6a17 SHA512 a51d8e229eb9125ab10d55abbb6a9e26698468f62aa093ec07fe998737c68de94922ac820ce74ff7221210e2c1e28711e5f11182fc986df4467a9bc3fddece5a
+DIST thunderbird-78.5.1-hsb.xpi 668606 BLAKE2B 608323c58f315b23f8ab4beeb6b1cc30bf775d9dedda2357e312f059da1ea328d3d50f9a267e1505a37180dd017b0bb400d5efcedc810f1a989d1e3d75ec4c93 SHA512 90bcc4f42ca6e9c0dfae09d46d410c1165c601920f1e1e772e6b80b1e17b18ef52461d037ebd51c40fd9b266ffbd2c8652ab3f851fe39139782c15d2043c1b0a
+DIST thunderbird-78.5.1-hu.xpi 679837 BLAKE2B c06f38a49a328354905b93fc7c7c747879d23af82aafa920d72b9e8b5637c5c6a32691e90036ab6a964bbb1b9de70a048240d0fc115fab7212a1bfa5a9ebefd8 SHA512 94df7445b5d86b0b6aa890d4d22f44074b59ae49ac10dd836fdd4e8d6d64f410ca6426af2a359686bee09bc8499a5c8b602e96a4c34e6ebb0ae759c42fab4588
+DIST thunderbird-78.5.1-hy-AM.xpi 713292 BLAKE2B 88fa195a1482fc58eb3df6c92099ff5b22dca080174642de9198efeb12ae2aaa9e78532edd05701821093ef67ea5e6a5363ffd5e79f58965ab987720a567db00 SHA512 5837992f34196d2fad2d248fc36a951404815d6a69896cd9dc5c2bac9fe3fe31ab59cb07fecc6a5a3ae4fd01648b3e7b8e6708a7e1fee03a18d435e1a33b510d
+DIST thunderbird-78.5.1-id.xpi 620643 BLAKE2B f3c832f88ce69ef9a4f59d2a92448cd82abc8062196c3625a48bf5f667024459e108be0bb5c8695f84c8e57b41409e209c7bea359888e2787a2e941128da967c SHA512 7fe96ea30a5f5ac5a73b257d27931cdbe3e2f2667e393191dc47b526b995f8873d33cab4dd942fc04010d439b372f0f9a852ac71946b03c65871d883adcf9d66
+DIST thunderbird-78.5.1-is.xpi 581612 BLAKE2B c2b11850b9198266feed8f31e5e135c80112bf3a18de4bb17c300874ccf403174069f116396158be0b3105ae5b901d4e6cbf8e09297bf0e0a19d62bc736f7d2e SHA512 fb64e17be001dc1a62e4a9718fc30088c9e7902db078959b3a2eca471decfc43bb5033324a5dcc887d24b5b6515ef7f403d0df4a6eb2b61596f498e192aaf203
+DIST thunderbird-78.5.1-it.xpi 572960 BLAKE2B a3183fbae41f1099492dbe84a8cbc7dba8465731377efe9210cbf8724a2eb851496bf10acefdca32c88bb505039bee2c8a3110c43382a12c2f136026ed56e192 SHA512 2b779384ac1ea2632b374ac40a9c124a336cab3fe8790fcee2ddfef38870abcb1e10a507680f17491fefed1a5463f5c2415a8cb085834ecc360183500076978e
+DIST thunderbird-78.5.1-ja.xpi 722456 BLAKE2B 16eb0e1fdfa62bc9aa7f79bc7bff160421c95ceda22dcbbdcffbe3c1671cf57dcaaa2e1d5e3a10da8a899e86ee63c2612c87c5a9f3722ed0d89cbb6e20ac0519 SHA512 9b241ddd26f63fed0d372499dbc98932b971463f32d16770b9027973e235d3ed70293ea92980ec7a66606365a6d51829577a24059dfc703f6542666dcadb86d9
+DIST thunderbird-78.5.1-ka.xpi 717015 BLAKE2B 83f25487af674b6844e850acb79bedbfef4c7704e5aa4204ebab8f08dcfa05482b8db58a90bf4c50ecf160667bb618616606adbfbe61ed85898c1ecbea5e6447 SHA512 33822ad70ecc12f63570efae6685e959ebd819eb4e27635c4bff2e25d2c369cbc9e83da99a3b3c62179cf292b498ee1e2b926afd0d38d0cf2e17d2913585c458
+DIST thunderbird-78.5.1-kab.xpi 651915 BLAKE2B 3e445f99eb3e14701020d17522c2499dd52ba2fdd9a81a9ace904a4788494f663d98b0f267f276fe3b31b327cb380aa24ed55348c951fc12cb0d80471e7185f2 SHA512 19829195a42390abc2a57ef6bdfe69ec16e17347f75effda816f60f6145bf8aa8be6e4771bc0ca3b89f88610b6950458531528b35838372841c696e546d55606
+DIST thunderbird-78.5.1-kk.xpi 720428 BLAKE2B 30d3955a004fa5477e2c984b0828754be2038d663421df0778e253a5ee4d9cc1390da2377b236f252be4c6aa25dd63870bceb71af4f3673c16f42dc73b727b67 SHA512 6a7133a31d65a87eb7382caded36e2ade4911370272c79cf347e096f6e0e21af4aa443b5302df31e73a4f3f083241b799786bb71136f156434efdc157e6bd59b
+DIST thunderbird-78.5.1-ko.xpi 688202 BLAKE2B 1681654ef4c23d8f01b8d9c88a1f297d1e5af9ad8ee3469eb725d13fce1b9435924bcf8b3140a884e82a5053a5ab0c1c5daa79e56a239033b44e39a3b0353e03 SHA512 18f013b59502cb78df9f4e28d97cb15d609da71d5947c3ed7e6fd38bf9741d7e276356352419537efb0b88eac6ba3f9b9cdfd7622aabdca3860629eea1a2fd88
+DIST thunderbird-78.5.1-lt.xpi 660289 BLAKE2B 366528af429b2aeea346794a239877a45c0d55dbd4289115186c3a2e8f12fbdc30be22f6986f8cabf8861f39e44906e6b4c08bca00a067b025964aa061fcad45 SHA512 4d8f80894781e85ed7baa74f084fb1c5188c9813d91a597bfc635dd8d1c6e330ba2ea2c543d51dd626e4c93011811987669aa71076452e82680a14f2f2f838c4
+DIST thunderbird-78.5.1-ms.xpi 572142 BLAKE2B 8dd6ac687d74f18bb3b8daafd0600367d15a721bc1db220fc3bdd7cb8fa0c3dc1c84eedbe77078459ce940e2069da7ae2a40b8b9d5cb80791d1cb9baeb7dffda SHA512 1eb5fb12e0b857b55dc83a9abf6ba55ca544e5ba621182bd236e22e136cae761f5de3c17766e655acc92b216e06ac3a8a95c6e6e08a2d9518182ffe8fdf7df1e
+DIST thunderbird-78.5.1-nb-NO.xpi 637238 BLAKE2B 7e8e02a580f7eff461380210312c879b5a07c60a5f51e6e9299e65e158151ef12a2f01ecc39913a455b2354049c561e33dd0ba517a3e99ccda7a0d5ec167c2e6 SHA512 ee3781417f8ebe2edbecce6960f37e01a9d1f57ea325255058221259edfec98da96783e6ba1c9342a11fe9fa5c50125d9c72d2c3555cf36c96a2011246671e6d
+DIST thunderbird-78.5.1-nl.xpi 644354 BLAKE2B 776033ca2fbed739fa2b00fd56f3e379f020bc663021204ad8600c629c82662c4154638050aa1097df7e5d5531907e89290047dc5166e758b80246ce37bb5bcd SHA512 df9145131d1365f4eaf4d0461e67134846b4076a9afb5a1b517364f52103ed97f216ab5ba62ffeafb56376bed4962476e95984714b0e0a6d06caf797b058a231
+DIST thunderbird-78.5.1-nn-NO.xpi 640682 BLAKE2B 487553ffa26848bee49f91877d02277946a12fb8a40e036aee75c8e3f37f703bf0e6f8fa8f784f3a320830c61959d42c671a9c0d95c9ca37a9b9884ff83929ab SHA512 dbf3264dfd82b1f32f2b88c5fd35377e8943a1b7177b9a4933d99b1936a881d5e97f1007354c7571dd9abc082f92116db85abaf802d1fdda649a8495bfb2a22f
+DIST thunderbird-78.5.1-pa-IN.xpi 633181 BLAKE2B 3a5d92d39440a0609240599313fb298d5a2b3c37bd54bedcb52cb0080883c9d762ddb3c382f4f7c233d84c3d9dbdcc99c2e7ac7b135f948165c3b77738f3fbc8 SHA512 284816bfba52c58e6d52064f7b5eef1427886995f19f040efb63ddbdf9d2cc49dd2faa7fbfd8fc5355742d99f030afb8e7df6d5a04c7f705798c9b5031f3e43a
+DIST thunderbird-78.5.1-pl.xpi 637129 BLAKE2B 263b8c50a9c1cff8c9f21623845be52f35b56b75dd5dbf86888ac378b12fcfe720e438aafbd079ef0b18f1c7e25cc5a0ae1648bc924dd0ff7f382aab3c311c9e SHA512 3746970c2d1325cbd178875497b397f778578b4088231e5077c4d2424faeed81e3342023241f2ecc92f4f512dba64f9e73f4643ed14b295929daf4f6377f006f
+DIST thunderbird-78.5.1-pt-BR.xpi 649416 BLAKE2B 4f2ab5a7208059f16c205f3af2cf96027c16b3e8ec032d9643523afd1020bae8e92ce19a30573c9c4a52de40a96c95299ed2008436f81376eb9dd0698aee4138 SHA512 1b8d9a94af244aaeb59af89f5b5cfcf72abcaadba040d026c128478615ad07aa67e05cfe153a97ba11883622da86402e0fe2d1b700260299771be5ad764982df
+DIST thunderbird-78.5.1-pt-PT.xpi 655491 BLAKE2B 7ae674d9a503a2ede7991589f24a2c480c32cbf2dd6b014345e98d6276264402c0c8d3f4507094f017c6961ad7744d77dbf6aa9412a975c18c47879ed97a44f4 SHA512 db621cfa2b4e1090950f13d237a1abfce0cdeb7db1dfc0fff530e6cfedc7570b718f45388df19da8b8b54724d7e5c4bdbf532c308ef9d61a85f006937023e507
+DIST thunderbird-78.5.1-rm.xpi 646538 BLAKE2B 70c60755d9fea5e48ddae057a044d2ff4ac4975b6c5df6b4ee5d5c806ebe53e0ff6c0bf66edb49909ff9c9a2544a9c60abe0ba9c2a132eb0ebb017f7e92e6f32 SHA512 6c9be6bd9e9a7bdc3dfde57825cb39b602b36fa79e52a8b3d9d023cfa03337b84b02eed9cc871859f747950be6d2e738b9f38161354c90dcd0fc3991b86ea350
+DIST thunderbird-78.5.1-ro.xpi 662627 BLAKE2B 1ac945d19cf012db593f6a557e1eaec5522fc8cb25ac4e38a561808836c545fb8a864391f3bca7d8d8ee379bf41f8726a43c405a90d30772a9c711f49e1d8b76 SHA512 3d73cf97e6c7ebfe771f69bd5b65181b48b98e431b6d9d9c094becd8619f42fba71e4a8c7310af592c50baa805d8202956f3da569678702cfdab85c64a1503d7
+DIST thunderbird-78.5.1-ru.xpi 756189 BLAKE2B c94b2e749a38e81b223af874e8988ebf4f631504dbfa234bdae70a998d3236259d28e720d4e75ea8b2f5634b806fb11f5b8c51090d2743c7cec1115025b358f8 SHA512 d9060cef57d7b875387c26b2cbe5e1573e441e453feea6182bccef7a05cb2593c1fb373f8d218dfc2d2123073b750ec30e0097a76af64ddcef0c6c4b5400aab6
+DIST thunderbird-78.5.1-si.xpi 651075 BLAKE2B ea9e7c7d2087616f615523e83c9675884d67457a438fe2e520b51b1cf9f5de169c48008ce8854738e22772c9a6b2c970a7293200bd4db55a75f858e844b2f0f0 SHA512 f6c4697d699a3006e40a2351c49dc64c743f83b625faa3b7bee850b60702e8ebb8cc61d170e76e339a7d219128c90f0cc71f1169547e3335da3221f359156cd8
+DIST thunderbird-78.5.1-sk.xpi 643191 BLAKE2B 7aff13b4c8b3c903daf636456c410e7089257324226e0b82fd9e205c8199b25a30acf89f00d0edfb0d7ec523af1b67f265b6748adef807b7a761cd927fb063dc SHA512 f6efe47ca5fb297d01138f7b3430b63804460809fb558ea7d2365739878b0f0a7fac78c4fcccfb5e3e5151583c814534abf953a807138d4813dffa76c20fb7ea
+DIST thunderbird-78.5.1-sl.xpi 632354 BLAKE2B 8406e6cad8efd51026a93134018e8f5f134f2f099787484a06e054236bcf3b1c84fe1317dbfeecc99147585648aa6355210087415c360061f5ec412c07acabc2 SHA512 20f231f49628e758b6754c4dd0b08a5f2632ec2cc0434845f55e3667106c422299543a1b510c726c37637ee4a7c22484f29f8838ea3e5b1c2f91dae341940aa4
+DIST thunderbird-78.5.1-sq.xpi 657818 BLAKE2B 5147802ea56857df2e05ff2c2445e67f089fcad270c33ef5578b02a540b91fe36c9f3b17dff1ad6ff5661399081bbbb1f9334c2787e85c8489b93fdbab184393 SHA512 e187a54689436f38a44a875ae60142b1294f23038b7b3506f2cd596255f95d697d53010d69bc9156684c7f8190e222d1a65902c36e227a0effdea9be1d567f41
+DIST thunderbird-78.5.1-sr.xpi 683075 BLAKE2B 0090896e671101bee5c2e9e183fab4cc498bdb728c92121e263430be26f3156e29af56564f7d8f69f6d7cbf7bb4a9e635e4c2d31e4bec89eeb7844637356ea37 SHA512 ecdc2e22af60c9d8ef48ea19f200b600ece88360285422f85582a2c1f3921c1f4d6c4707f308953ac5b9b723161893b0f45fdd10fb528889b2003a345f351ac1
+DIST thunderbird-78.5.1-sv-SE.xpi 648868 BLAKE2B 69106363eee6f6f72e8254bb6f0a9b000d959cc1e31c8f0181ce82472bc92acb5bf899d2e1ea6e39ec4b992e3c5055c6cdfb5f37b0907e9fd9c44567f3b3f07c SHA512 a156f0818d10d343099865f79eff559580469836a1f705033335768a6b9e214376f501a50248a80ea214ee06539d90584a1cb93fc6f4e74e8c26f34624f3c889
+DIST thunderbird-78.5.1-th.xpi 712036 BLAKE2B 392ed101a03eb78bfe75999000c14fb42b5647eceaf03868caacc19834f64654f4731090841b795e3ddb85ea1bbc424ddba23a849de94eb423b8447360bea664 SHA512 ab2d7e813c6f612211e5b3314f4eac7d64d8d54f46b623cad21aebd7e9e66e3ec0a956c5904a4571e1112f276318821006e7d3564a16d93cd94316c0a5dde57f
+DIST thunderbird-78.5.1-tr.xpi 649071 BLAKE2B 3a757f3f5621d2f2acfbd5cd6cf31efc4cfcc99355f8440150bf0ea5f8db74e3c60d066fb6e0c89a7574119026ade3946e9361eb61d71d5c3a10984fa2674eec SHA512 bd06af705b0b8a76c6895293fd008b47ce0d6cbbefcc41d600c9cd53cc741fa57aad42707cf190183323cb0a274ab2bef250c38b8c1cd814164f1e813848272d
+DIST thunderbird-78.5.1-uz.xpi 586572 BLAKE2B d88d9d5350b9c654fec7a384b94f0d83c6edf5fd4d15d2d05a4363ab843b711d41c8202f35306c81b37dd2e3cf824f9db793dc260606bd7b15779c26b9a69baa SHA512 be1ee1ab3bc06dd52f228e6d5e6c45dfec6b91d2469f2c5129a42a7481faee0a180b0a0b099837c645b2c62c0a5e1b51d604a6bfeac92bee4f7694a56249076c
+DIST thunderbird-78.5.1-vi.xpi 674603 BLAKE2B 47d7902b363d3f383d18be1446b83aa67be5065726b39bb67c06a8eca8b024c803867e396b85ef24ccd820227c19d45c18c5addbcd55c5ac087e907659ba6307 SHA512 f8245adddc5130c0559a345415d64a206a282f2bfac0777d97ccb96fee7f091982621a02df605e2fb9dbb1b1da6adeca7195384084b65e1ff9134c8e99e455fe
+DIST thunderbird-78.5.1-zh-CN.xpi 687173 BLAKE2B 559fe08784381491f4711200b8024a43a3a539b234aa8f4c4a0836899774a792805c1e5f74a77c33ea3d61392d2e7a6a3521903d1d776e8fe671d2667c6f5f32 SHA512 917ddc49e8603eed925678e57d9a00da85da42676ae7b0a9e567e84f8cb8daf8014b897cc9a651ce60a683d17cd9510400647e5621261ae483fd6634cbeaea36
+DIST thunderbird-78.5.1-zh-TW.xpi 687617 BLAKE2B 905f1290f151c44961c3052237b57732f1be545a60189e2fd1621b1b31d522cfc8cbb7e49fed1d8b8795d936a830c7f5dc33e0b27d8caff31309d09429397e76 SHA512 1bf9343592d4df3f5f091ae6fe63b58c2c43bec0581124db88e7c714877e364f0a97d252736dec6cf3522134a7eceb7ca00ffa00274e5690f39e6a4de1f05a8c
+DIST thunderbird-bin_i686-78.5.1.tar.bz2 68231037 BLAKE2B cd770c1f6c12fe9c8ef79106f835b5078ab2ba932d4e18341679c38ea661ec8135188136e8ce7fd34954f61ef9160e19385fbfb6971c1d278915d2563e1f54ce SHA512 ccf3ebfe40a9e245685adbcb9bdc0f760be0d84b873cfc94b305ceffd1eacd6a51b86f04813e0ae5bbc5b48ea10bd34caf0bc2a3caf7a3837f0457fe60b2a6ad
+DIST thunderbird-bin_x86_64-78.5.1.tar.bz2 65109284 BLAKE2B 2559bd7dd79878873a03ede4e9ec6df8b8e73a57117779b767475e8476a15419fb83cd472a637bf9e6fcfdde2611b7f7bc27dcecab30d804d23a8e6a6e6faf86 SHA512 9bfca093b6e8d77a49f8320db400fef6029a1b96ea68fe21e8a74dcc4a18e9e8e0c2a11d51bdb2ecf5dcf52e99d8eefcf27a9c503b3c747e52e30f6c12e5708b
+EBUILD thunderbird-bin-78.5.1.ebuild 10244 BLAKE2B fa13396fac7f04ad1bbe22c8e04114048a2694e48609f063191b6c502b967e98da85ac4bf0e29ee15acf867611465eee2d79043693f99a42d932c6ed1f5c618a SHA512 ef68593e9528d6a61a5c06a2e58deb8ac7a6bfa62dc14a4506ec7e52a2d74308b243b9f53d00befa0ebb6aa663442ef703d1ef2038e36d13244bd2ab4f42200e
 MISC metadata.xml 254 BLAKE2B b88b441b35ae1040470cb225b4b898a6c2a995beac668099b50cd32700cdcad63f41dc8c50416d9a2a1ed865f3f7ad45ca0a9cf053c0ab73cdf68fb9b2fc4553 SHA512 d159efb994f7a897f0e15392446c3e5d66abcb4bedb30d4e8743ea15cc3df99771b78fc665a988002acfd2d6c7701449f6001587bdcd748be684b41640b22261
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-78.5.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-78.5.1.ebuild
similarity index 100%
rename from mail-client/thunderbird-bin/thunderbird-bin-78.5.0.ebuild
rename to mail-client/thunderbird-bin/thunderbird-bin-78.5.1.ebuild
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index f1cf0d7502b7..981eb48940cd 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -5,70 +5,70 @@ AUX thunderbird-wayland.sh 118 BLAKE2B 7ae701fd21972d3b67f94962441e37bdd04d6b71f
 AUX thunderbird-x11.sh 112 BLAKE2B f62f330ead8aa425d614249f7f968078def08f851d2529005cac6f0bb9257d0ffd6bc15e200b53283106a2739674c1d0cf900f6dc4270138281bcc7666b547b1 SHA512 24490cd7c9dbd4d04124f92a5cd523fc0c48cff2d7f37cb2492bb6644a986da7ff05e62beb744fff1187f991c6f3edd68474ce6cbdd8ea34479bce2c2ded4406
 AUX thunderbird.sh 3178 BLAKE2B 5219498d7dce79cff36ea440ad01dfec1c2ccf3707c4855aacbb93da8b429d5bbc109a8b593a158e6128082b7350660100c2fe3aac48c7de7e033a298dfb704a SHA512 e7963afb9fa57a33980d2a55b630736d4029fc9de2f394f498eaffb0787b5796268f06757728c3f2d93afb5494b5088b7cd923f24eac4615c57041b5799b85f6
 DIST firefox-78esr-patches-07.tar.xz 66156 BLAKE2B 8f69883432dcbd484b1fb15e3fde1630b1424e502ba78d9ec3cbe70cb2676a6876853d3477c8bfe35e92bca91b200e2d14543de1778d895676a52d2608109af2 SHA512 b4a01d3499002bd33a7fb45a1a80e9e73ba27a0986b6bfa43b3482dd8d82a686a14ae0c5e013402c8c8f359a642632a40bf4c362a0e83a1f53b453914f42e3a7
-DIST thunderbird-78.5.0-af.xpi 548318 BLAKE2B 479eebf8437aeed5e2ee9b4f743729ae97111dc19b75502670587b8848118282a9b18aaa1f570270c073408d9354a55cffc90878ceb52e857be19d3f3fc32bd4 SHA512 96691128a3d6b93392fa48dd7485cec8ca92a0af1df6949493aa096289ca2488e07672ad87fa1d5377b4fc5bf66aa171b6953e928b3638951f25eefb16a23534
-DIST thunderbird-78.5.0-ar.xpi 648572 BLAKE2B a5f17cd99faee0800d221ecb97cd98e1e74f23e03103a0aa2489c64686b072e692e1bff53bd64e7b3bef62b8fa94a0c3e207580d051a95dfd8d0d2bad6154522 SHA512 5d28982dbefb8d7186490cf3ba591b349321bae46ec0b30d79749389b17678f739ef04b6943e7028b223cea7e4835edc46fdd397c0f64439adba02321ed5e892
-DIST thunderbird-78.5.0-ast.xpi 561213 BLAKE2B 7863103ed4c83b0c00825c3588f9b23798d141e3cf6faa378bacaa45b177ddeb75643125815733b3e3e7ee43433f97f483215efecd11b25c1a3110125e27ac68 SHA512 845b5c19ef773ca2a169122e3a8dd2513a91f016748ca834a0d2eb5579455be918ce38f77e71257c916ac6cf719c4c25795851cdd1b716029d75c4705a5de0b7
-DIST thunderbird-78.5.0-be.xpi 666633 BLAKE2B a333de1dde21f1d450f1a97b46d319f840b6ef5b3f1b3031dea2b4bbe8c7ee9a58c4c61e740835efc735b7894d3ef09c18d5f239b55c1ca9ed3af0d75695e474 SHA512 9c0cd7ad9b3994b87f48cb406a758d3b10e9bd397ff782f9e5d0a9c92467b25c5cf06ca81ac00e117b2080268a6500d78283dc8c281304941508c7c963cccebd
-DIST thunderbird-78.5.0-bg.xpi 672382 BLAKE2B 4dbbeea6db33e4f8172ef9d95781b50d68916091673441463b0104873443dad3cd906137fbaca9e70674cbed61505bc7d298695f47adfba134e469bd3c547f92 SHA512 3386be24f48ad47ca7467997831b1f81e79f2007da5e74699b929b8d023ca715edf6354392b4865ef4b62635f3689902ac94c700b1941cae584691d8cda5cbd1
-DIST thunderbird-78.5.0-br.xpi 604498 BLAKE2B 6f368232ef0ffec699f89239c8de8295307fb0b53b6b3dafe84d3b765c9b46dca099cea50707783b8bb4891c6c6d60effa8fc31b220ea9ffd78818cba7edc77a SHA512 78803f838b4c7315b5761f0a93e362cd267674c532758e29190ec233aa886dd4840afbdf298856cf726540b21b6d67e41cb79781e8ed467a45c1724b0ae6e165
-DIST thunderbird-78.5.0-ca.xpi 620410 BLAKE2B b20e21ac5063486eec47721877eab8d8ea73ebd12604c6be2356be45dc2898f552067f6b38807fedbed605b21554fdd78a60d8a4b15188e9dcd52bf17430c442 SHA512 d5e122b96588ff32fd775da351d90a96db21850e73e00cfcdca1da65bc6229a5e481fea1c4b3e89a1dbcccb24ae55e60daf7952af6416cb0a7c0c671569705a7
-DIST thunderbird-78.5.0-cak.xpi 635653 BLAKE2B d2f4f5601fe56cb2336ef7d049ed144f30b78bf7f1ae7eefe401bc10210749e9c9ac53e2b3abc2c34292abcf4300191bf09108bd3db1ecea58a57188c63e5b32 SHA512 20ba4003476f673468cad2edbfb43d6ddfda8deccd44ba48fe8332c5d12aea01c4355de1a8d0ea372f59b526efa2e3b085339db70bedbbccc1a23ca4b3da4bb0
-DIST thunderbird-78.5.0-cs.xpi 635315 BLAKE2B 2d4a08c27cc7b69e44f79c36c81e6d4d92c0fe91a7ca5d7267e4b7993c049fbf057c67e8974d95789f6465fb62e659869295f8e60159e8f923a0127ed988561a SHA512 1a968bf633093513d326242d2ff057cee9824d91e3328b3bda6b2acb18aaafa4540bd2f974f8be0b4767a3a4bef68060d96449fafc9ee9e877a02527d4ae7d0c
-DIST thunderbird-78.5.0-cy.xpi 646244 BLAKE2B ebf23594f0053f179bb655339393edf562c8204f9dadf1b49f810a97de71d4ad096c841e51cf68c6ad05ed4b9e953e62751e7843ce5c09b1940d63172e482e5f SHA512 53005cd6f409fed072211a504faa86f4456ab849e001cb44ad99c148228b11f1885f8d0a2505dc9f71f83c2061c8d7f67d2d5e6752e35c07f427536a978d2efc
-DIST thunderbird-78.5.0-da.xpi 620986 BLAKE2B 56bdfacb9c40cf2c70560aec395cda594024b82d31d6c96bef4a5b71214edbc3bbf74ae013f0cce4bf44287160477e08a2ef6a91df14e8e700d2d9ccfaecfe67 SHA512 7c3af279f77e313c79b26a84ecb937cf799dce35abdbefdf1dca084d532a4121248b5ae056f9ec370171e8c1bdb70a6b05674b2b5eb1e7e7b7b9a51f9b5d0e61
-DIST thunderbird-78.5.0-de.xpi 665194 BLAKE2B 2f0e1acf124aa2ddfd8615d1b596332762e105ec065cffa4a763d54a504d381c37bd16aef8a2093a99ab514b9efa226650d1d31649e3c58335dca35b71fb90c7 SHA512 63a326c45198aa2d41f8621d0624a412dd635955f0397090d931c2fa3fc7a3fe6e9e896c00954cee9fbaefd6650de4b86571d038ddd8c60f81e5c2c661df55a3
-DIST thunderbird-78.5.0-dsb.xpi 666774 BLAKE2B 751095ef5074451e5c31554c325f15063fecab8c7e9ac1c4f330e0ff091205b800e7dbfb15908988eaa234aac75899813f9effe927e34acb21aec48d52ef0991 SHA512 300e63b1f3503bd8943ad757efb4fc04564e316a3484445750b29198ad3c1a41a485728c09b81364ea6538f34338d0d3addc85996855fdbe0ac4d6ff50c21b9b
-DIST thunderbird-78.5.0-el.xpi 774453 BLAKE2B 7227d22a148d5c8a1f8e9f6ad787fbb1f3049b9348b9c19d731bf1886fd8bd7c5f90494a7b7a27b7e7eb3544fe03d0ba4bee4dfdf2d458e1742bdb449b8ee488 SHA512 58eb6309690db9b871b3e7d1aad35ad26dbaf84ef5e17207d4fc8d46ffab5f588592858aa56b3141b2fb62f77a2454bfd6e86260a33e455bd870bee822a61e02
-DIST thunderbird-78.5.0-en-CA.xpi 611774 BLAKE2B db5cff4f516ec03b6fb6b9f64294c32679414ff88e533e3bf9f8519ca937c952d6f51f76ee3354430a29438db0a85b7ce407afd7e6173ff9446d7c271e4a61a0 SHA512 ac0c9f7dff24427c597075c354cb4d9df4051749a77c94a1a5ffb8dc04a312a18cea97b37e5e3afda28aaf6feea07e479508cfe2a0080697f1ba5ba59d662719
-DIST thunderbird-78.5.0-en-GB.xpi 611183 BLAKE2B 9dd73b2216fbf886064e5d000672d083456c0eaf405e638a2ba4ee205fa02b36f029352728d4424b4ffc41bb94fd4c1a9c7df8a40276e8b84026354ad7856e40 SHA512 0af500a12631db42c986fab910e30ac6d385b2b2c51960c70b21dc1110d6073681ba2ade60447eaa1e5d52052fe3c2217f2d70f817b250b22ab3a7ec864f4d70
-DIST thunderbird-78.5.0-es-AR.xpi 657791 BLAKE2B aa70da5cc23e9577c36106f2368e345edbe53b6861be5c92cc37d5565f430993d6ccc64f275cdc6550220c4f2f55e9d007b1549deb12b3ddb83538c3fb53b74c SHA512 4b3f29a8ca6e03af2413ad8a1776412eadcd280fa9fc90b0e6465ffc0915453e792abf1ba9cae05b2a8e3b07b103d76524bc9725d425189babc8003dd52deb29
-DIST thunderbird-78.5.0-es-ES.xpi 569792 BLAKE2B 2545d12db6082522f3ff7840edeef3b90fbad543b555853ddef5dd6b0c97b3fcbbe9d21495878e0deee497e2053611a8eda4327e502eb02b4e32cccdc5732e2f SHA512 0a84d0adf2ca64b0d869c39a59a493d130cad491e02f2255aa5360f573a65bc7cb5666842378485f2717673087d452570b90d59ac97b2e48f2486374b042ddfb
-DIST thunderbird-78.5.0-et.xpi 597699 BLAKE2B 8832e1ecfc20a5a812b78d603d689ef67b87f6a6b763afe421491f978a0b3e1f63dec8b4e6d4909b96aa996961f50b4290901ab70ea2c7081809481b999afc32 SHA512 cd57822ccddb61092d5b8b9330578aca883d2ea4d536e7f1e9546351f382b7a78f171905c360c9a4aef143983ff83db85b062a34b1828a1e99b992ffccc2411d
-DIST thunderbird-78.5.0-eu.xpi 632935 BLAKE2B 0de8f2679a007a06af29c43db017934af8ba20910234e3689cbc1509b2f9e2c31c4c5adb6f6879a32122d05e616e3e0d305104e5abee7693ee3e88128d24385a SHA512 53e0ad6c2ea7d08b47852d399b1c1139bea0ce6b0956f8458e4623524abf4213f0f2b085250964421586523486d95ef4550b17afd435db3905dd08afde75aadc
-DIST thunderbird-78.5.0-fa.xpi 639717 BLAKE2B 95ba7fc570b926c7598d824ca49d5938fd39a10f96464b45ade2c693faa296210641f33bf6965e3d5c3934c30e0c7c7021e1aa613d71fb01ff656d2014e90fbd SHA512 d46dc6015e5c8b80dbf5de451e4378a2a0a4792b4ef4b17be8b6abd8b6c7c0a1cb22fb8546e22fe857cf916a5a7d250238ee94b28303f6bec8b515380a68707a
-DIST thunderbird-78.5.0-fi.xpi 642442 BLAKE2B 72477dc4eabd7f044849a3b117141dff8a19d24063939ae96105380ab8c67de769a09e93409f9f11c46b00800e73db530392dbe5026b06c19b501499da2f3849 SHA512 6b5071e983d2cb87957e097f72383501dfa1487fa16bc69d8895e1060768d4470ec54e402792c254a0f29cf5ed5aa36927b3bbe5b29aa1e3e85ff593dfcae2b9
-DIST thunderbird-78.5.0-fr.xpi 669492 BLAKE2B 8a33feeb9465cec5b76b98a6c3160afcdddf6bdcf636d049eb6b62a77bf1c5a59866a58350a9bf16495fd80bb8c8ff8184a4c7b9ed371777621f2d6a8cdb9b20 SHA512 189d57b9e2400fc64385df87bb7108e85d145b003bd528231dec525cf5271cb68dec4ed274107350d3895799782b8837e51bf0e23d19c129b26ee80d169b3174
-DIST thunderbird-78.5.0-fy-NL.xpi 653078 BLAKE2B a01388939ac01e3f80d94af5619184d2e4b1ea7e4793dbf9ea4a13ba108edf88fa9ec4c2306505fa0dc4007f65d1973ab2e35ec84e734f24ff0ef7cc85ba7b26 SHA512 b68691898d813b25751c7785198ea934bd268536b6ff955cada16692b53c31836d41d9630dd2a19fb6e41c181bd4fb4d183dfb255ecd5b6a3ecbefb1af316b15
-DIST thunderbird-78.5.0-ga-IE.xpi 600682 BLAKE2B 4132e89fe97cb2f7bed52c249de87402e17aba8d6c8df65e4acc7fed9df68eb8a2427538593586d6c510b01a0b3f754a33f12e4aa81ff63d5792e74f968c890e SHA512 12f599046bde3d5b5da69575ff00e7bf6b106e8d4b69a838d38542ec77568db3b0a702c7eb73a7a0572b479547b2c9d0aabfbf4496740e8a5c3a76cd75c602bd
-DIST thunderbird-78.5.0-gd.xpi 609349 BLAKE2B 794edca1cfd129a8c40e0314be00b55ea9220dc2891dcfaad47f8edcb7b88972528954e4d1ef608330cde89d77c2b17fc9495c4b8c8f1161dab90ec108d51bcd SHA512 6837e09384170805e5525fd0421dafc9b33f2ae24955ef7d7c4193418d12cabfb6adae16d81719ce41cc9931d2c4c47eb61bc0ca77e4018905e07c07ff6d3d28
-DIST thunderbird-78.5.0-gl.xpi 615720 BLAKE2B 4c323cf22735d0906ffdeebd8163eb0068d3d2925142d805d0abd836cdbcae5c55dfe5c25e78afcd8d90ca481219bf6fa00c98451bad5fb6214b2710525a5d37 SHA512 8adabc5252396d873e4e85edf7bf42d1db91f9a4fbecf81b44a99f550375eb2f3d0c6cd95837edc10637c0d1f27a6b05e050a47c33b7598449b97f30b6927cb1
-DIST thunderbird-78.5.0-he.xpi 640490 BLAKE2B cc2bf3f5e0dec1f999292e15f47b380155f64920f978dc690f7a98410db979374b9ef7a9ea42f96359ca2171c8c800b3ff7ef4fcb2ef34f81d70107043b90faf SHA512 47d1b89dc20cdf01b5bf49afa4a6dd7e93f1cda6e9a557cfe2012305832f9e9e37a2fab1ffcea1be173030dcb4229120b0f19381bc3e4ddf572235237e23adfd
-DIST thunderbird-78.5.0-hr.xpi 628987 BLAKE2B 88092f356b745ae7b9b934ae707b24a57fda6896f493e8863378abcde2ea082ccdc6ca94ac751877b73246dc6e90ca5cc25e9008480761ead6a0968938f71ca2 SHA512 762789377ed6766475c6a9fd35c89898088fe5cea59ea1540dd654b5bdc017c3b5b8314639d834093cdf9808002a8ab1f64b9bd2b18c9e1f4e2569adb1e1e390
-DIST thunderbird-78.5.0-hsb.xpi 668606 BLAKE2B 94d94a476217ef84221540dc494fed8b14323c42952dbc9d8a82eaf1f28b50f3641779fcd5b174e84d5cfc2bd4d1c60ce15a42cc25a987d64f26ae11d478fda5 SHA512 1115090bc146536a9fbc5ccea7e599814fc2351bd499d66d95844b16a71599067eb2c593e21a3a49934689312841d974328ea8d6a528a97202364ac0010d28de
-DIST thunderbird-78.5.0-hu.xpi 679829 BLAKE2B 4dfa36bb84a1e4141fa01ee667c23e66c48835e24f43af0ee4e9c07be1d69131cb939a53003266e9a58fc2695a95adc22c9a37e0a661c28f19f9c920426ad04a SHA512 04624a6fe98b6e0786e74b9a2ee5d769a477b74b35b92f83e84e4570554750d9cfe49cadb6613fb81345cfbc32fc7cf0128c0df740908f74ac16afc59f866ad0
-DIST thunderbird-78.5.0-hy-AM.xpi 713297 BLAKE2B f885bfc263998c4e0ab7a1bce0399e84ae807b4c2cbddfe22e222841f762d38d12269d5ccfba9dcd2eeeb9b830ead2f8cd8d39e101c7db7a0a99913ed4a1d1f0 SHA512 8d459e9aaa2db307bc32e004d8d8919dccd17b02da08fdcc6220f654669c315c85fa4eb26084bfbf6250a95552b2781d5afabd82820e4292fd2e4d897b67ae6d
-DIST thunderbird-78.5.0-id.xpi 620640 BLAKE2B d113eed7cecc377615df9d890061f266cf221bd59a6804d7cedef9372c9de71f9882d06c9383f964a1d30a1f313eff5d0c39e3e04c0d2ac8b90ecf0d1f90a54a SHA512 cd7868591687ea85e746f22ded825b7c64d640666faaad61fa543baf3d4754d2363d1d6899285c694315db5a4800be18e59e56b28455c6a96a03909e7ef00776
-DIST thunderbird-78.5.0-is.xpi 581605 BLAKE2B 67c78746e0fb1a513d327280c29a1eb118fffaf004bc1e8d34e5bc490f94bef7679c4fad80b170e363a7a0b1d58da5362f708a7b46b0f9689eeb3d30369db978 SHA512 f21f12913d4a79dbcfb5688dba909345404761b2832467e9d31b370aa39c7fa7ed06f8b147eb8e55161bb345a78c4fdee7e8f1a25da9057c78ec76b5414ee18d
-DIST thunderbird-78.5.0-it.xpi 572958 BLAKE2B f005acb2a117146726bf944688be8cb5fc35e4c820bd68e99cf7858d8f3f2fbfd9fe7e315e24314f2428fdc7b9275572d5ea96aa198c06b15fa2cabf29eb8007 SHA512 b79a5eaec4b7e0e043bd0b39a0129326b2bdb11793428e8f722405cee5c922575876528e5da4109bae97546ef110c864910d35d5b791f04ffda24bf5f1e3974e
-DIST thunderbird-78.5.0-ja.xpi 722455 BLAKE2B aac3e647fd677b69c501b8a974e55558610581c857d4aa728300325d11b66d0233ab7853170cd9ac91644aa51f6d348192adc528208fb38a50a815da9ab96800 SHA512 8ea3d523759fd92464ffeb6f5432f80259068cd0fa85003f007be622bcbe788a59e6efc83feb736673db95e32069e132cbeb08eb2f21790e053ea9b32bf9d555
-DIST thunderbird-78.5.0-ka.xpi 717014 BLAKE2B edd1c1f6f9936344585006c63feae3cb100f2a2f7c6095e3fb08291e8760d2d3334574e5582d3dea35fd6ab487ff21149f10d2bb1b936628a492c23ceae75a65 SHA512 fd9e0f27ea490b998d399dc542442c755e27a11ba3748d125eb3841e4fc193c2776988744872c77f7fc77094dca7b58698772978e38618ada224c553177a92ce
-DIST thunderbird-78.5.0-kab.xpi 651925 BLAKE2B 7c6e54095c3450b34e36eac6b31412097f84327e6bebaed1196162f1e5ce6518326c85596dd7fc04603e1be577bc69b6e7358576fde607e56dd273d7d62000df SHA512 06b29cf7509b63a6f668c71ef900be12e3b6bb3b77b261eda16ae009d5214572148e30d30f660b18c72bf3b90b2926b5e931be892f299381ecce41d3885f639a
-DIST thunderbird-78.5.0-kk.xpi 720431 BLAKE2B 58681793c59f883f8838ca7ce2a4c6cb5cc4d72d4b9aa6e8b9d492302dd1aced926eba3ece59589b92b1310f989356409e928f6a3b465dd57e799e401b5d1714 SHA512 9e7f589c20b6b06dd41fe6a4bc4a42d50a1d8be2745aaf6b14057db7abb9c59935f45e314efe7209b08897d78122737d5b42a0589c25d1adfc8c9ce704e7695f
-DIST thunderbird-78.5.0-ko.xpi 688209 BLAKE2B e50ed2289e34cfc0819c334959fc1eb790241efbecf82980fb8eefee80e5d7b45fea69b6ad2fec8a587fd3b26d8f09e52f255d531c7685347c3be7849b72ea09 SHA512 74985c58df4bc72bc1719383dfd8ae2ad601105645f852caae922128afc64ce10354edc11ab1f7e8e517ce95196db52ed0fc0bc41adffe521a2450302bcacaa8
-DIST thunderbird-78.5.0-lt.xpi 660299 BLAKE2B 1cf913c519472630640bcd610c3f81a0ce93d2d7c6512b46ae8825f8be2144ccdb42926c0d587a2895af64d24866b33e655ddd6fad52f3cd45b47c73abf23c65 SHA512 d4df0dbbf5c9055fcd5f64da33b715d597408a65e684e59e7c05da70a16a0a4c6dc057f031b1eadcc7a499c10afa0cd8987c857ee408592a47fc4e7aab44998f
-DIST thunderbird-78.5.0-ms.xpi 572136 BLAKE2B 5b49ae2b21691c0de11e3f3813aa958e5c818edd407127031a631c8749391b113c9dc0263714f0b1fe1e28bef6829a05ad4d1a858b26422346d7944ca965a8f6 SHA512 2db29f15f5d1016a3656de9b668416031776df5a821953dc57235955652e1bff29e0abf82023081bbc4b0b1005d75b168de9ba7c18f3f8b147df118a33d33c18
-DIST thunderbird-78.5.0-nb-NO.xpi 637235 BLAKE2B f1e6daf9fc7529e10fd1b4e65691fee484c911815db7c96e472c17d79a5e56addca302e3f21d76cf491c05479a82e61dd169dbc12892ac88ec970dc89d8f444c SHA512 524c9ed6e0a66cb53f8394f8459ff34a2894b3d07edced3eeef1f1169b275898cc6c2b30fc78b4f4dd06f1fbc6651999a7050cd428cb0bf2bf439f866fcdfd69
-DIST thunderbird-78.5.0-nl.xpi 644354 BLAKE2B 7d3f8f9e88957608c343a643afb2193878e239841aadae541429ce3441957bf5a0ffb7d016003d883a53f97b011c5ef096769de4a109c4b0615e620a93832fd3 SHA512 3621c41faea13780a139ed7485e9904893552b8b3e182f34ea49fb4a2e4f85654aa26fe7b76753b8b883a04d481e808bc616758624fc61e7ff9aed1d09e92df8
-DIST thunderbird-78.5.0-nn-NO.xpi 640684 BLAKE2B bbf1ff1201dfb1c2e5764072098d1a1ba1500326507c4f9274e479fe8fa07b5446fdc9bc6a8d9b84c80a876f7b2606bd1921be1343e46bf56533fb5ef577422b SHA512 4560e185285c942667ff7d9f8af6659fa11efd4c2c5cbbe85494beb084f6bc6671a88dac0ec46ae2e738666a718cb14695e84e6a8e67dbbc93ad4ceb3aa04b33
-DIST thunderbird-78.5.0-pa-IN.xpi 633177 BLAKE2B 628a1922abdf728a82520014f6da315be96a3c159752e5eccf3c3b18396e37202844b3cee4edc068bc8a8b0497e97d904f6f11fa28a0d74221ae4bd8c95ef992 SHA512 5ed8c7afe3bb9a92fec130e8ec377288472ab910b9bc0a028dd18960c39889f28211e11da7e34acc203ce57ab24fa524d862e22653f3c26a349fd604d1df8c1c
-DIST thunderbird-78.5.0-pl.xpi 637112 BLAKE2B a6bc4e8e8021eac5f53ced8b0decf23460b83282bddf0b9aa5822f2f2c9b8c1026b8d5c4b1aece0435cd88167257c2ff306a8405ceaa9df3c6b81e2e1197d1a9 SHA512 1b415108ae218ea9269a4cc2f51fd64d716deaaebc8116a94611fe2800c39ab56c123345ff4d075dca92cae56f00e97bb55f205bdb6b19948528211fb6574528
-DIST thunderbird-78.5.0-pt-BR.xpi 649414 BLAKE2B a0a56356620ec5226e47560e08132f56cbdf360576715a517ccd3ee9d9f55ebe5e7be6a6ce08f522687a32795ab128a8b9ccb78cf3b9ee8f3cd858a882cbb076 SHA512 349c8f47cf1405210d01e91a59a1132c47a84771d5da878b5f668f497e522d259c3ebd4ff1001604f580c1b54a3ff4fbe6084785b4c580c7a9b79056153afb9d
-DIST thunderbird-78.5.0-pt-PT.xpi 655497 BLAKE2B d49efa87dd516027f30b5dae1dca9f3b11f23802de03b9643804ce2d0554c494153a20500883a7c04fab15b3d30fc32bc65daf329aef1b9f352f3cf1627b56dc SHA512 cd00271ff1919b88920d734706670b63dc00c6de4b0caa1c1b5e91f7f7ea5b82fef18452ee228f6949222bb6ab3d7a297c3123e3f10d34a7d7090afa186a930b
-DIST thunderbird-78.5.0-rm.xpi 646531 BLAKE2B 0b56269c62d275dca843c57460dfd70bba13f01de7a852a29cfbbeedd4d9842e7cedc57ce9574f6348543d15623a607e283dcf89740b16328061664a8267878a SHA512 f81a43a476c91d8f3d6f830bd27479b92a8fadf539f46fba8ca0dd07dbd2cb639ece560fcda88764e4510e8854537c5a558e1b837a4e7fd6ddc1dac914a88092
-DIST thunderbird-78.5.0-ro.xpi 662642 BLAKE2B b19931aa66e26fca2f857439c0e47172ced0255c23f3d7731af95a9639078f0869bd524e0cbbad49118c374d5ecc7f652467862076c2b8870cd467d957603f4d SHA512 53356a655803f14d68312d461920d3a6f17db118547fb7d040f5110d4e65db76104e072646b3849efa5ca47f027e5c761a721be83ebf3cd200e36b9deb15ebbd
-DIST thunderbird-78.5.0-ru.xpi 756187 BLAKE2B 42d2470e72e519a63addd3356824f4604ab300e43b0d9bcf08c79cd6d393d1decfa9a30f1c44fc136540af9979284a90530a6ca8b7c8886517b871536e029629 SHA512 2ade9448e0178aefa8ea032a2e53a42b8f77641dc56e790826f44ff3628d381dfd490b08164838c85ed80e84a69348251a1b5920291586720044a51e587b8b5b
-DIST thunderbird-78.5.0-si.xpi 651069 BLAKE2B 78fcd5569a87e3938893f8010d3bb3a515365b92986a75bb2d27ae36482eed906eeabe59c6beed626027267dd0380ae1f186221d9227bad3e25ae60a213b3739 SHA512 5b22ef4072b0d81ccffbd62ac6279a783a5acf716b67561d206034f66e8569935bf1d0eca8e03d6af7a4601acc1176be0c78bb40daf95c544bb11b918aad9673
-DIST thunderbird-78.5.0-sk.xpi 643185 BLAKE2B e4fc5bb819bd79161359cd90aadb56f28d887897a4bc5b5c4b6db79ae525fae2ebd0f1d53e3897194cfa11232fdedb99538f398a1a48accefd18f7046d2efaf1 SHA512 e948a48e333306d744dc7c397b2839ce4b899a44c72c68748557657422ca0149781395c870a3bb38e97f8a2a786d2373f3aa64331e99f392b6bd451a3dac1a6c
-DIST thunderbird-78.5.0-sl.xpi 632340 BLAKE2B 046266bce228b914c30f726bd78d00d725791cd6710c65fe146054e8a9fc0af743b3c839b57f1e773a2d009776ef2d703532cb2bcaef324149018bfd149e53b2 SHA512 aae9faa7de38d6d55e39bfc95ee035526bb7cc67136afd80b3304930067a8739cd5e8bb4d867fb49f2f8de784c4fd306857d9139a5d619f1679e5e7d64ce7c68
-DIST thunderbird-78.5.0-sq.xpi 657818 BLAKE2B d0af6bd2947854326be426109899308fe0d085ceff533e66db0b58cbd64ec419e85d7076e61bf4af17065d02292b64e7ac257657f4ccf4c3451de53ef398e4b7 SHA512 9ba4ec6ae1b69802d2db51649f05db16d1cd472af7fbb7cf00dfa87cebda6496bb8c293f88aef3bdb5b0cf84c8a751eabb461673b2dca2d89f7a049cdc01a654
-DIST thunderbird-78.5.0-sr.xpi 683076 BLAKE2B df42669c5ea3ff0341d3365f01e05911f6e6b275f2595ab2662131436907f0ec70edee6b0aef48f9afec12258257f3744c0cabfec288589b4e558a3ea76bdd21 SHA512 e85a21aaa1e83d97470241fec487b8df29982a21e7a0aa1ead9057b6dd2261f103882b31e3fd39ed1b35b296297651976e998d80f07eae135bd35538a97ff64b
-DIST thunderbird-78.5.0-sv-SE.xpi 648863 BLAKE2B 18900bcda5bf2edfeccf2d2aec02ec7ad3bd413caf4d89d85f4723fd27254787b0968cb0740d367acf1590cc9601486b4027e0e9617844106c96efe52afb48e7 SHA512 2d0f6d8f7c5d7661c4a6d2a09487c03b952a4c542631b4b9d947464e6e74e6b760dbe7ecf808ebc8fdd258ad5f69211dbbbe7b68b08770b67b8eebe5413968cc
-DIST thunderbird-78.5.0-th.xpi 712031 BLAKE2B 8de6fd5f9eafaa4b97658eb303289be97c053bc153fdc2d902d8ae8bbb0e290c4e0512f3085dc87c18afdff4dc37338d18fc9253419b0b7bfb66ac2e007d394c SHA512 c9769389be0e9b154ce686e79fd4cc7047d7f115eff2b888dcaaf4a70b29d0f27a2b0a840a231569bf2229419ddef53c111fb4a3103d836b100915ab979997bd
-DIST thunderbird-78.5.0-tr.xpi 649071 BLAKE2B b7fd59c4c846e1214f7a16899741a74044cf9c945385bb57735ef2773da1877085368f273c25aa37e2dbc8549f0c805dff501614e63d7761e5892e0eb6240b6a SHA512 e77fc7064bc530df959e73f0bcd2e977cc09ca3cc0adde703850a3c89b171e73ae57a9b7c715e75310b8d6ecc2a3444c36519e2c56f9c0c7aba561b26d8f2f30
-DIST thunderbird-78.5.0-uz.xpi 586572 BLAKE2B 7ada629d4274e2500c59dd6ab75ff8c9e9b88fface27fb650abc0637a137971f6a95323b6fcf4bda995203b42b0f9a6a135f48aa16c37f6b7e5fb09a08f68b95 SHA512 9c627329b438b1a4afc7507a4e87c4c5a94bb665d51935227df51023d7c37e407ee4d6c84626668fd50d1f3b7d282c7701ac7a273ee37c665e99492fd22aa6b4
-DIST thunderbird-78.5.0-vi.xpi 674608 BLAKE2B af9954482a76f094a0ae0a48135198465f656fe739419b3cf75931967cb9561b8a16d44eb9dac54d78f024ff28658a8a5ea2144c344aaed63e8c33b3b67392e4 SHA512 2641538591d060a60abeb25893bee0446a55ee750de430e39ba147ff1620836a9f486f142e3f1c1180bc7b3c142b399cbb2765a162b792f8fcd1884163b7d61b
-DIST thunderbird-78.5.0-zh-CN.xpi 687174 BLAKE2B 2fcd423229281528ea8767dafe8c6f7073b29b8b1e0d22624b81f84bb944bfca3040c840031317edb0f94a0c7afbd9126fd97ef76442a6d213416c0ab29cd4c0 SHA512 569e3dc49d102d56b50d9dccb7587e76481bc637f008493c40fdf7bcf2b7dd58c776131ac3cd6b37d479b900d77da4621e7c6476526159a0026da7bd156a163b
-DIST thunderbird-78.5.0-zh-TW.xpi 687620 BLAKE2B be48d9da7320faf2bea2f3cb682a34114321f7a0af505f4cf4e677b3ade4784f0a9d444c0b407a9d97bc50eb1f6292078a3e38f1e6d83c32ba64f094378c3b71 SHA512 a7a5e00e02ba66fd8dedbfe60af12843f5af67aa72e43c4b99bea1c6edd598d39219a58e147f819390a7d2f1536a27e87f63139a4014d84ac5ccb4ee653ccde4
-DIST thunderbird-78.5.0.source.tar.xz 355944116 BLAKE2B ca785b280f66442e1e3014f0e09343ef341d22e073d179514b6059f566e1436ec64fba9dc104382d38cd694baf58dc253eee35aaec1453cc8d5ca850df298c35 SHA512 dae49dc0910dd017250643c920c79f03d3ef14bcbafde7fcdb3aaeba2b27a42ef6f88c8de8b961f8bb1c3d1a153bc8988ab43a39eb051d81839cf3b9e8373118
-EBUILD thunderbird-78.5.0.ebuild 28782 BLAKE2B 1e3f7ef47ff59a0e7fd2d19258b52b73e8768fb93fa37f23f2fbb347900ee1019d5dfaea8438126b84e9daec373bf97feb8a37f30b87064379f068fbf4f55289 SHA512 1ccf7da9e06f7c4d21e9bf856f04011a9ac486a16fa05345baf40a58688328ccc332f02201f3b8ac7ab4af622fda669b0ca7e914cf83f6c92e604c173d939446
+DIST thunderbird-78.5.1-af.xpi 548317 BLAKE2B 80a469f883041bf82e0543fcff986c16e49256b95c7d51258136bb5f1ff48ce5932092f3e70c31ec99918fa30831e5175dc7d6015a652953fb872e0ae90fa115 SHA512 541cb5d81de551099a2807cf5b83d23a84e0d4eb421b85fb22dcfbf3b05289b7db1debc45b1e7a1bd502b7ca89f569b494cf72110db8192eb588e333b98411a9
+DIST thunderbird-78.5.1-ar.xpi 648570 BLAKE2B 15abd5bafd8b328a3391bb7f95305bc2c0df70f2ec723ca63be103cabd506433f145d541430d78c530be835801f01687849ecc124802056d649d28f4a37a67ad SHA512 95d8e1f46c9cc92a1097cd55f3bdcf6f685cb8294ecdc8c89520548789107579997364faed9be42e796e5845b86af2db72e5c6564d6635c061641a6c1275b1fb
+DIST thunderbird-78.5.1-ast.xpi 561220 BLAKE2B 34d5db5e6ffbcc6960d1e94eb53d4e99c7c56dd06a08b2737bd9782ca07c731de4b01e7d45bbf769043b7fd4530390e33e973c58937a36a40e9360ec02e1dac3 SHA512 fff1034b0d9859797c4a77b296a3f47cc3602d43a000bed91184b50b065321c96af0078a85617de1abe4a73aace498af3a8b9ee6941884ac306d2eadeda6d99e
+DIST thunderbird-78.5.1-be.xpi 666628 BLAKE2B 2c96c3383fe5218149e8097be028ab287ff447f3cde0792c9c498ac242f3f35faff34dfefa870a4dafdb46e1341c9f787d7cff76ecdd7f294c48b7354b38417a SHA512 431c4fc83d9784428f8120cb64cee8860f5f750178ffbd3f894a9c2bb3c8f58248ce0098fdaf8f6b18476ee54226749c0d224e9a32cd9bb8e42f427ecceb51e0
+DIST thunderbird-78.5.1-bg.xpi 672381 BLAKE2B e1f8d1338b45fd41ebdfbb46b746fe526a1e6e71fa62e1b8161e760da08d3c0e7724ea89802240b6ddc35f26514b36d92be3a63c1a5eba607fb5d41fd6cdae43 SHA512 2f8f47ed87d297957f7a8393fe37d879e1bbb265aea4731ea090511d01584be32f5edab71fe9241d6f3383e21a8cd04ac44577389e81ede7134dfe14e3d5bff4
+DIST thunderbird-78.5.1-br.xpi 604491 BLAKE2B 4daa0bae19200a217f46906fb17bf9543f0282a5135acbdcd45b04f1567039e97389541df1319b68593334fbf54b9a32d2a425befa46f062db7e6a2be79f39dd SHA512 2aca811de1943c192fc8997ede4678225ccec0a3b4e382f7ddbb88b37e80c363451a47a437be0f29f554a05564827bb12b17868db18dfb3fc4ab34e4959a2318
+DIST thunderbird-78.5.1-ca.xpi 620419 BLAKE2B bbf6566f0d123adf5d09fa1c21e40fda9ac5772789ebc64eb14a627a40cbe4725937b53875182457813edc14ff68d4431a659974291818303785e77fe4e6c534 SHA512 aa6c9c77429344cc5a8a284b55083d7732c6890248ef74101a3b44f4d6ea9cbd39b955b8e92fe53e8ad9db071864ca10d4a536d9181cfac3579e7c7117be5cd0
+DIST thunderbird-78.5.1-cak.xpi 635650 BLAKE2B 249198354c43236e301c80cef747967183065e20e0c9ca47a080f356520cad5a2f66a9bb5d03ced579be73ef7559241df4be01b73dabe84e1d28e7f5b6d22f0a SHA512 6c4a924ab6c469529f61a1ce05e5741c22da86c56be169e64c868ca5e101c55f89a38e8f4f3e83070454f6379dd42010eeefd7f986a68967a80a32cc72ca8cc9
+DIST thunderbird-78.5.1-cs.xpi 635315 BLAKE2B 7b51c43c4965ebeda4b7a9b214860162bd8ff24183a66803ef11810683d689661997a6d060322df3199ea4b85ab7c1297b513f95f3b13550a58b30bce9c9719c SHA512 ecf60ff8676a8688a796a90598a6a6a4c0b8796289bbed7e2a237ff7412ccd31546d894d0fff526bb2ce418f3046c0753faa22c488863a558c6764fe90751200
+DIST thunderbird-78.5.1-cy.xpi 646229 BLAKE2B 17a0db36aff61e5cba9732aa514e37fca3a9561a2f8543bc1020921eeb39147867248cb016660e6bf9dab7270ad76dda16615de58a643cf6e717f37a9926e2ca SHA512 69951b3986e34090a67434fdaa27cf7c71236bb3d152bf3cecde24e7e1222781e12936870af701e10736656554951dc856646468d0aaa30855a1dfec8e3a5eea
+DIST thunderbird-78.5.1-da.xpi 620984 BLAKE2B c24fe8be92f797bb11a8a994143598bcbdb316e1f02dc22e1c8faf8c8bd94b9b394085eb9fd0cc07d9a9cdbc448b05173150900f74b7ed8b9e1ebde93cb5c00b SHA512 f9c0f29c8af5a81df0ac5aad76b134757aceda4fc2bf6c849ba4f9952e6ff275ae1b7ea4e8f978b21ce2be1cc91fa97a005fbebc0f956ab8ad259b1cfa863615
+DIST thunderbird-78.5.1-de.xpi 665194 BLAKE2B ca9b5a4cbe98ef9cb2c8b08940cb6bbfe43128fca438b130a1716824543b43d51d2f4c8f88d8fc0db743e2a8ff4092cf03909b4d01b2127e31c28544d3a60153 SHA512 94626848abb600432922c860a7b272d1f1b19c60af8794ed657276dc35674e823e04c359fc159d7d370c97d6bf4e764b7a666ad891488345d78b8368138dfd62
+DIST thunderbird-78.5.1-dsb.xpi 666772 BLAKE2B d756bfbeee58fd3786fd027c5e52ebacbb743ae5058af2aac864d654bfcb9aae593f3c65cffce239b89fa66a3f03ea9893763f0f8a60754a301ff4829a00f0f6 SHA512 5b0fe19a94ee353743b6356b197fbba47218288670cf2077beb15d25dcfa85bbc1d9912eb2952f54b1cf4137fe2ad50388151757bd1645905711d5573bbbf9fd
+DIST thunderbird-78.5.1-el.xpi 774449 BLAKE2B 6280704e57d88a33f27213d1a5a86cd7435acaaf176dca004ccf60cd50e298c5182a685f808f4efeec3e8af6a9d21a68ef2834ea44d61cf316b3b79e5f7de4be SHA512 521b748687b439b1a5d870b27c11fba764ddd15abd049b59201c8cdb7827a9bfcd39148eba39d971c1f560430482bd73d3e813d82e87ba2484532acceea24b06
+DIST thunderbird-78.5.1-en-CA.xpi 611779 BLAKE2B 8fa12883317f2013327afaff0412553a452944743bbcd21ba1057061060af5e0cd948f94bdd839387925ba19b245d9e31f7c761df22f2b0f9ee1e2aedf513720 SHA512 65bad1f9fb111b6a7be3b5ce8277c910655c370a2f07e8b7db6049f14559c8c53f8f66528b250fd4d179ef8180a591494da3ae52b9cc818508d08d918e4596cf
+DIST thunderbird-78.5.1-en-GB.xpi 611182 BLAKE2B 3521e522f7a36f85a2a2a92427df577af173ecd30129678274d73d7dfcb9395de5854f3d349407cffa219e376439f36c0b2e210f3e1ec902d9a7822c64c548db SHA512 a3d94b14d7bdf12423178b9ee31a6c0339ae48add3505303ffc78a6e477afe66ee38acf787c928e77fd0aedc5616917117a6b5e121c36065d1da2e2cf0979ce8
+DIST thunderbird-78.5.1-es-AR.xpi 657798 BLAKE2B 920dd49f9d646adf3e35ea1dbf9c6c980e811bf0014a861e67ff551cb802ce3e582267cb1cd3ccba431b477da3426c352a5568ae6e5eff687dfc3e5db6a27e69 SHA512 019840c0bab36712b61ec2b499916c844f804ce2bddd41b8247edc538a75df82e3394a735936093b9b8ca5c4bf91db9282b4ae4f54e2790306a7e9163578a630
+DIST thunderbird-78.5.1-es-ES.xpi 569804 BLAKE2B 583210a4a75ba8ca886168aa36c3bb5db3b0551982f0f983a3ad2c71fe2a608bc29e882c0194f7bdbeccae6a9d7d6b992e8743270073cf3049d2935c8b5d6cf9 SHA512 7168318d7d1bf63d5bfc70c21b79962b19a7e0938a1636965130eb75caa33f7e861567e8654e1c0d71f206938a0971430379fefd290cd2d1d02fbd7427abb959
+DIST thunderbird-78.5.1-et.xpi 597700 BLAKE2B 0d872a5aaeb393c4747398990f86563461e7a2c772575a9a825c77437c2bce67b2c8a45d2ff4ec07288ef561bc9f4d052e934227c4010e36244a6278bf17dd8b SHA512 6ba39ed5b5704d0ca4dcddfd39f4ae2f181e1d3cc7fa329076a05308932337e17ead3174cdfc7bf7b1fc98ee321fdf6c7cc540aee66a41bbaf4e06f2de90a32f
+DIST thunderbird-78.5.1-eu.xpi 632925 BLAKE2B 2b731410f4f60bf3b7da7fcaacb55eadf4a8d69bfa4409d62287787e3b12e34eac3aafb85fd9075e7584be034bb2436ce7b7b867825bf5e3812e8eb0b67638a1 SHA512 ec6bef4a5a3c5a444c4d1b0f0844a630cb48dde0b3d3abbc8535c0f0fba5c24ae2de96cc81e679d88458d2d807d52ea12fce894d202ab46008fa87d9fd938ccf
+DIST thunderbird-78.5.1-fa.xpi 639719 BLAKE2B 45b06ca22fe853b945fdfe2de4dc677ed2316befdd616309dab0a549d92f696a6278c58f65b4e1b02ca99ccc0812d9e3e9cd08fa2a23b725450a60bfc8fdcf54 SHA512 46558a43f3ec608fd8bbf6fef2980ef836ecb220553b2d58531d3cce7ebb36e3980167e7fb0b26b1b2ae460a0bd119ff6bf68ff53287e6ce6d89c948184c3984
+DIST thunderbird-78.5.1-fi.xpi 642443 BLAKE2B 15d348ad03607202169233126afbfbcc585dc03df2e560c0aa9f3a54f996147c1de48ce5be79b044c154d3edb2bc3eeb3d7a19d045af6bc373c8eb4eca379cde SHA512 b666187d4544efabfbac80003cf858c105f03a75594c32ca96509dd6f16144d476855133323c7aaad1675d7eca237bb472a36b5f8687bae4255f54bceef233c9
+DIST thunderbird-78.5.1-fr.xpi 669494 BLAKE2B 522d8277d81e520c1e1089ab8dad5a0f892c13ff901bafcbf530b6df99f72f6840543ef690c0bf67874f0e968bd7ebb88e0bbf694148fad87ef048afa11876eb SHA512 c6631632d4588a5f9a5d750437835bcf1bb6b6506cb0f9c2eae431c1ba9003a190bf13258593085658e26c99129b3b75726e14365dc193c128231d2f1846ad57
+DIST thunderbird-78.5.1-fy-NL.xpi 653091 BLAKE2B 760d579c67f35a36fbad0b9d8fa4524f62c1f41a921bf341d32dd2c8794a767781270e620091ecdee9cc305f2873f3de3033bf783fe207acf3d5dc6a3e7aa79c SHA512 44547c1cfa39509bce6689f2757241da29d4a0f394890c05c62b9ca0e1674401c253a5038e36aaeed4209b4393c02051355cf7a6450fc458e6e4a73b2f26e66a
+DIST thunderbird-78.5.1-ga-IE.xpi 600677 BLAKE2B a9562455165498d23469da82ddf5924a705bcbc1a251363a290aac7467086d7fc3ded9c5f0b15dccc94cd1ae156fb0f490e3e89663393ab83de450941a96f42a SHA512 ff05174aa49f01370238209d8261e3b0d8e38b0c6175c6727b7def9a4d042aecd51207530bec92a7489959f3f3405c812686896d150faaee76991ab058dbdc20
+DIST thunderbird-78.5.1-gd.xpi 609349 BLAKE2B 5168ec9ba6945dfeca67621ac6954bedc092832276e6d2f7ed93f51745717edfe710017714f8ba41fe5a5df328e67dc9e6e19628dafa34eba86948bf029be578 SHA512 490a8901dd72f6eda9c368cccbad243436b13cacac3b79cfbc6c934d2f949739821ff7c64bb8ec76788c5f080a0b1dfb7eeeabdfd7e1438631eb1ff88e65f934
+DIST thunderbird-78.5.1-gl.xpi 615718 BLAKE2B e3c2b585a5512b161e1f439e8e914d12c0f7da095741b893f512a7c7d80a707c37b24bf93dbdcfb04fcdf21978120028322c4a7f91ca20c0045d924c4066b727 SHA512 724330f721f139147e92148fe8bc6f77d48fd0a3488bfeab1d708b858de121bbc19efbba405378bfd5b435dd50b17a6c9578f2085be6d283f91872f68325b0b1
+DIST thunderbird-78.5.1-he.xpi 640499 BLAKE2B 6b9e3f28de22fe93af930618fd6f1d8ed5b6f29d51384584ce771ee51211e7ce5dc6577259d689baceede0aff0257fcd4e905dc3f10e49e9d242040de0f24c57 SHA512 e66530728e25e06e32988abe513655bc1f3dd1dcb40a04b8788db28d9e8cb12a7eee07bef970cdc4f0a2f4d10518da17e704dae0fa528fa211a03153633a9699
+DIST thunderbird-78.5.1-hr.xpi 628987 BLAKE2B bb02af1159b9b014b2e6f3e781b431db5f95fb25f00d30704712d255c4bee3725be3b6edd58d1ac545d02202713044024ddd229fd6b98363d3d886193d0e6a17 SHA512 a51d8e229eb9125ab10d55abbb6a9e26698468f62aa093ec07fe998737c68de94922ac820ce74ff7221210e2c1e28711e5f11182fc986df4467a9bc3fddece5a
+DIST thunderbird-78.5.1-hsb.xpi 668606 BLAKE2B 608323c58f315b23f8ab4beeb6b1cc30bf775d9dedda2357e312f059da1ea328d3d50f9a267e1505a37180dd017b0bb400d5efcedc810f1a989d1e3d75ec4c93 SHA512 90bcc4f42ca6e9c0dfae09d46d410c1165c601920f1e1e772e6b80b1e17b18ef52461d037ebd51c40fd9b266ffbd2c8652ab3f851fe39139782c15d2043c1b0a
+DIST thunderbird-78.5.1-hu.xpi 679837 BLAKE2B c06f38a49a328354905b93fc7c7c747879d23af82aafa920d72b9e8b5637c5c6a32691e90036ab6a964bbb1b9de70a048240d0fc115fab7212a1bfa5a9ebefd8 SHA512 94df7445b5d86b0b6aa890d4d22f44074b59ae49ac10dd836fdd4e8d6d64f410ca6426af2a359686bee09bc8499a5c8b602e96a4c34e6ebb0ae759c42fab4588
+DIST thunderbird-78.5.1-hy-AM.xpi 713292 BLAKE2B 88fa195a1482fc58eb3df6c92099ff5b22dca080174642de9198efeb12ae2aaa9e78532edd05701821093ef67ea5e6a5363ffd5e79f58965ab987720a567db00 SHA512 5837992f34196d2fad2d248fc36a951404815d6a69896cd9dc5c2bac9fe3fe31ab59cb07fecc6a5a3ae4fd01648b3e7b8e6708a7e1fee03a18d435e1a33b510d
+DIST thunderbird-78.5.1-id.xpi 620643 BLAKE2B f3c832f88ce69ef9a4f59d2a92448cd82abc8062196c3625a48bf5f667024459e108be0bb5c8695f84c8e57b41409e209c7bea359888e2787a2e941128da967c SHA512 7fe96ea30a5f5ac5a73b257d27931cdbe3e2f2667e393191dc47b526b995f8873d33cab4dd942fc04010d439b372f0f9a852ac71946b03c65871d883adcf9d66
+DIST thunderbird-78.5.1-is.xpi 581612 BLAKE2B c2b11850b9198266feed8f31e5e135c80112bf3a18de4bb17c300874ccf403174069f116396158be0b3105ae5b901d4e6cbf8e09297bf0e0a19d62bc736f7d2e SHA512 fb64e17be001dc1a62e4a9718fc30088c9e7902db078959b3a2eca471decfc43bb5033324a5dcc887d24b5b6515ef7f403d0df4a6eb2b61596f498e192aaf203
+DIST thunderbird-78.5.1-it.xpi 572960 BLAKE2B a3183fbae41f1099492dbe84a8cbc7dba8465731377efe9210cbf8724a2eb851496bf10acefdca32c88bb505039bee2c8a3110c43382a12c2f136026ed56e192 SHA512 2b779384ac1ea2632b374ac40a9c124a336cab3fe8790fcee2ddfef38870abcb1e10a507680f17491fefed1a5463f5c2415a8cb085834ecc360183500076978e
+DIST thunderbird-78.5.1-ja.xpi 722456 BLAKE2B 16eb0e1fdfa62bc9aa7f79bc7bff160421c95ceda22dcbbdcffbe3c1671cf57dcaaa2e1d5e3a10da8a899e86ee63c2612c87c5a9f3722ed0d89cbb6e20ac0519 SHA512 9b241ddd26f63fed0d372499dbc98932b971463f32d16770b9027973e235d3ed70293ea92980ec7a66606365a6d51829577a24059dfc703f6542666dcadb86d9
+DIST thunderbird-78.5.1-ka.xpi 717015 BLAKE2B 83f25487af674b6844e850acb79bedbfef4c7704e5aa4204ebab8f08dcfa05482b8db58a90bf4c50ecf160667bb618616606adbfbe61ed85898c1ecbea5e6447 SHA512 33822ad70ecc12f63570efae6685e959ebd819eb4e27635c4bff2e25d2c369cbc9e83da99a3b3c62179cf292b498ee1e2b926afd0d38d0cf2e17d2913585c458
+DIST thunderbird-78.5.1-kab.xpi 651915 BLAKE2B 3e445f99eb3e14701020d17522c2499dd52ba2fdd9a81a9ace904a4788494f663d98b0f267f276fe3b31b327cb380aa24ed55348c951fc12cb0d80471e7185f2 SHA512 19829195a42390abc2a57ef6bdfe69ec16e17347f75effda816f60f6145bf8aa8be6e4771bc0ca3b89f88610b6950458531528b35838372841c696e546d55606
+DIST thunderbird-78.5.1-kk.xpi 720428 BLAKE2B 30d3955a004fa5477e2c984b0828754be2038d663421df0778e253a5ee4d9cc1390da2377b236f252be4c6aa25dd63870bceb71af4f3673c16f42dc73b727b67 SHA512 6a7133a31d65a87eb7382caded36e2ade4911370272c79cf347e096f6e0e21af4aa443b5302df31e73a4f3f083241b799786bb71136f156434efdc157e6bd59b
+DIST thunderbird-78.5.1-ko.xpi 688202 BLAKE2B 1681654ef4c23d8f01b8d9c88a1f297d1e5af9ad8ee3469eb725d13fce1b9435924bcf8b3140a884e82a5053a5ab0c1c5daa79e56a239033b44e39a3b0353e03 SHA512 18f013b59502cb78df9f4e28d97cb15d609da71d5947c3ed7e6fd38bf9741d7e276356352419537efb0b88eac6ba3f9b9cdfd7622aabdca3860629eea1a2fd88
+DIST thunderbird-78.5.1-lt.xpi 660289 BLAKE2B 366528af429b2aeea346794a239877a45c0d55dbd4289115186c3a2e8f12fbdc30be22f6986f8cabf8861f39e44906e6b4c08bca00a067b025964aa061fcad45 SHA512 4d8f80894781e85ed7baa74f084fb1c5188c9813d91a597bfc635dd8d1c6e330ba2ea2c543d51dd626e4c93011811987669aa71076452e82680a14f2f2f838c4
+DIST thunderbird-78.5.1-ms.xpi 572142 BLAKE2B 8dd6ac687d74f18bb3b8daafd0600367d15a721bc1db220fc3bdd7cb8fa0c3dc1c84eedbe77078459ce940e2069da7ae2a40b8b9d5cb80791d1cb9baeb7dffda SHA512 1eb5fb12e0b857b55dc83a9abf6ba55ca544e5ba621182bd236e22e136cae761f5de3c17766e655acc92b216e06ac3a8a95c6e6e08a2d9518182ffe8fdf7df1e
+DIST thunderbird-78.5.1-nb-NO.xpi 637238 BLAKE2B 7e8e02a580f7eff461380210312c879b5a07c60a5f51e6e9299e65e158151ef12a2f01ecc39913a455b2354049c561e33dd0ba517a3e99ccda7a0d5ec167c2e6 SHA512 ee3781417f8ebe2edbecce6960f37e01a9d1f57ea325255058221259edfec98da96783e6ba1c9342a11fe9fa5c50125d9c72d2c3555cf36c96a2011246671e6d
+DIST thunderbird-78.5.1-nl.xpi 644354 BLAKE2B 776033ca2fbed739fa2b00fd56f3e379f020bc663021204ad8600c629c82662c4154638050aa1097df7e5d5531907e89290047dc5166e758b80246ce37bb5bcd SHA512 df9145131d1365f4eaf4d0461e67134846b4076a9afb5a1b517364f52103ed97f216ab5ba62ffeafb56376bed4962476e95984714b0e0a6d06caf797b058a231
+DIST thunderbird-78.5.1-nn-NO.xpi 640682 BLAKE2B 487553ffa26848bee49f91877d02277946a12fb8a40e036aee75c8e3f37f703bf0e6f8fa8f784f3a320830c61959d42c671a9c0d95c9ca37a9b9884ff83929ab SHA512 dbf3264dfd82b1f32f2b88c5fd35377e8943a1b7177b9a4933d99b1936a881d5e97f1007354c7571dd9abc082f92116db85abaf802d1fdda649a8495bfb2a22f
+DIST thunderbird-78.5.1-pa-IN.xpi 633181 BLAKE2B 3a5d92d39440a0609240599313fb298d5a2b3c37bd54bedcb52cb0080883c9d762ddb3c382f4f7c233d84c3d9dbdcc99c2e7ac7b135f948165c3b77738f3fbc8 SHA512 284816bfba52c58e6d52064f7b5eef1427886995f19f040efb63ddbdf9d2cc49dd2faa7fbfd8fc5355742d99f030afb8e7df6d5a04c7f705798c9b5031f3e43a
+DIST thunderbird-78.5.1-pl.xpi 637129 BLAKE2B 263b8c50a9c1cff8c9f21623845be52f35b56b75dd5dbf86888ac378b12fcfe720e438aafbd079ef0b18f1c7e25cc5a0ae1648bc924dd0ff7f382aab3c311c9e SHA512 3746970c2d1325cbd178875497b397f778578b4088231e5077c4d2424faeed81e3342023241f2ecc92f4f512dba64f9e73f4643ed14b295929daf4f6377f006f
+DIST thunderbird-78.5.1-pt-BR.xpi 649416 BLAKE2B 4f2ab5a7208059f16c205f3af2cf96027c16b3e8ec032d9643523afd1020bae8e92ce19a30573c9c4a52de40a96c95299ed2008436f81376eb9dd0698aee4138 SHA512 1b8d9a94af244aaeb59af89f5b5cfcf72abcaadba040d026c128478615ad07aa67e05cfe153a97ba11883622da86402e0fe2d1b700260299771be5ad764982df
+DIST thunderbird-78.5.1-pt-PT.xpi 655491 BLAKE2B 7ae674d9a503a2ede7991589f24a2c480c32cbf2dd6b014345e98d6276264402c0c8d3f4507094f017c6961ad7744d77dbf6aa9412a975c18c47879ed97a44f4 SHA512 db621cfa2b4e1090950f13d237a1abfce0cdeb7db1dfc0fff530e6cfedc7570b718f45388df19da8b8b54724d7e5c4bdbf532c308ef9d61a85f006937023e507
+DIST thunderbird-78.5.1-rm.xpi 646538 BLAKE2B 70c60755d9fea5e48ddae057a044d2ff4ac4975b6c5df6b4ee5d5c806ebe53e0ff6c0bf66edb49909ff9c9a2544a9c60abe0ba9c2a132eb0ebb017f7e92e6f32 SHA512 6c9be6bd9e9a7bdc3dfde57825cb39b602b36fa79e52a8b3d9d023cfa03337b84b02eed9cc871859f747950be6d2e738b9f38161354c90dcd0fc3991b86ea350
+DIST thunderbird-78.5.1-ro.xpi 662627 BLAKE2B 1ac945d19cf012db593f6a557e1eaec5522fc8cb25ac4e38a561808836c545fb8a864391f3bca7d8d8ee379bf41f8726a43c405a90d30772a9c711f49e1d8b76 SHA512 3d73cf97e6c7ebfe771f69bd5b65181b48b98e431b6d9d9c094becd8619f42fba71e4a8c7310af592c50baa805d8202956f3da569678702cfdab85c64a1503d7
+DIST thunderbird-78.5.1-ru.xpi 756189 BLAKE2B c94b2e749a38e81b223af874e8988ebf4f631504dbfa234bdae70a998d3236259d28e720d4e75ea8b2f5634b806fb11f5b8c51090d2743c7cec1115025b358f8 SHA512 d9060cef57d7b875387c26b2cbe5e1573e441e453feea6182bccef7a05cb2593c1fb373f8d218dfc2d2123073b750ec30e0097a76af64ddcef0c6c4b5400aab6
+DIST thunderbird-78.5.1-si.xpi 651075 BLAKE2B ea9e7c7d2087616f615523e83c9675884d67457a438fe2e520b51b1cf9f5de169c48008ce8854738e22772c9a6b2c970a7293200bd4db55a75f858e844b2f0f0 SHA512 f6c4697d699a3006e40a2351c49dc64c743f83b625faa3b7bee850b60702e8ebb8cc61d170e76e339a7d219128c90f0cc71f1169547e3335da3221f359156cd8
+DIST thunderbird-78.5.1-sk.xpi 643191 BLAKE2B 7aff13b4c8b3c903daf636456c410e7089257324226e0b82fd9e205c8199b25a30acf89f00d0edfb0d7ec523af1b67f265b6748adef807b7a761cd927fb063dc SHA512 f6efe47ca5fb297d01138f7b3430b63804460809fb558ea7d2365739878b0f0a7fac78c4fcccfb5e3e5151583c814534abf953a807138d4813dffa76c20fb7ea
+DIST thunderbird-78.5.1-sl.xpi 632354 BLAKE2B 8406e6cad8efd51026a93134018e8f5f134f2f099787484a06e054236bcf3b1c84fe1317dbfeecc99147585648aa6355210087415c360061f5ec412c07acabc2 SHA512 20f231f49628e758b6754c4dd0b08a5f2632ec2cc0434845f55e3667106c422299543a1b510c726c37637ee4a7c22484f29f8838ea3e5b1c2f91dae341940aa4
+DIST thunderbird-78.5.1-sq.xpi 657818 BLAKE2B 5147802ea56857df2e05ff2c2445e67f089fcad270c33ef5578b02a540b91fe36c9f3b17dff1ad6ff5661399081bbbb1f9334c2787e85c8489b93fdbab184393 SHA512 e187a54689436f38a44a875ae60142b1294f23038b7b3506f2cd596255f95d697d53010d69bc9156684c7f8190e222d1a65902c36e227a0effdea9be1d567f41
+DIST thunderbird-78.5.1-sr.xpi 683075 BLAKE2B 0090896e671101bee5c2e9e183fab4cc498bdb728c92121e263430be26f3156e29af56564f7d8f69f6d7cbf7bb4a9e635e4c2d31e4bec89eeb7844637356ea37 SHA512 ecdc2e22af60c9d8ef48ea19f200b600ece88360285422f85582a2c1f3921c1f4d6c4707f308953ac5b9b723161893b0f45fdd10fb528889b2003a345f351ac1
+DIST thunderbird-78.5.1-sv-SE.xpi 648868 BLAKE2B 69106363eee6f6f72e8254bb6f0a9b000d959cc1e31c8f0181ce82472bc92acb5bf899d2e1ea6e39ec4b992e3c5055c6cdfb5f37b0907e9fd9c44567f3b3f07c SHA512 a156f0818d10d343099865f79eff559580469836a1f705033335768a6b9e214376f501a50248a80ea214ee06539d90584a1cb93fc6f4e74e8c26f34624f3c889
+DIST thunderbird-78.5.1-th.xpi 712036 BLAKE2B 392ed101a03eb78bfe75999000c14fb42b5647eceaf03868caacc19834f64654f4731090841b795e3ddb85ea1bbc424ddba23a849de94eb423b8447360bea664 SHA512 ab2d7e813c6f612211e5b3314f4eac7d64d8d54f46b623cad21aebd7e9e66e3ec0a956c5904a4571e1112f276318821006e7d3564a16d93cd94316c0a5dde57f
+DIST thunderbird-78.5.1-tr.xpi 649071 BLAKE2B 3a757f3f5621d2f2acfbd5cd6cf31efc4cfcc99355f8440150bf0ea5f8db74e3c60d066fb6e0c89a7574119026ade3946e9361eb61d71d5c3a10984fa2674eec SHA512 bd06af705b0b8a76c6895293fd008b47ce0d6cbbefcc41d600c9cd53cc741fa57aad42707cf190183323cb0a274ab2bef250c38b8c1cd814164f1e813848272d
+DIST thunderbird-78.5.1-uz.xpi 586572 BLAKE2B d88d9d5350b9c654fec7a384b94f0d83c6edf5fd4d15d2d05a4363ab843b711d41c8202f35306c81b37dd2e3cf824f9db793dc260606bd7b15779c26b9a69baa SHA512 be1ee1ab3bc06dd52f228e6d5e6c45dfec6b91d2469f2c5129a42a7481faee0a180b0a0b099837c645b2c62c0a5e1b51d604a6bfeac92bee4f7694a56249076c
+DIST thunderbird-78.5.1-vi.xpi 674603 BLAKE2B 47d7902b363d3f383d18be1446b83aa67be5065726b39bb67c06a8eca8b024c803867e396b85ef24ccd820227c19d45c18c5addbcd55c5ac087e907659ba6307 SHA512 f8245adddc5130c0559a345415d64a206a282f2bfac0777d97ccb96fee7f091982621a02df605e2fb9dbb1b1da6adeca7195384084b65e1ff9134c8e99e455fe
+DIST thunderbird-78.5.1-zh-CN.xpi 687173 BLAKE2B 559fe08784381491f4711200b8024a43a3a539b234aa8f4c4a0836899774a792805c1e5f74a77c33ea3d61392d2e7a6a3521903d1d776e8fe671d2667c6f5f32 SHA512 917ddc49e8603eed925678e57d9a00da85da42676ae7b0a9e567e84f8cb8daf8014b897cc9a651ce60a683d17cd9510400647e5621261ae483fd6634cbeaea36
+DIST thunderbird-78.5.1-zh-TW.xpi 687617 BLAKE2B 905f1290f151c44961c3052237b57732f1be545a60189e2fd1621b1b31d522cfc8cbb7e49fed1d8b8795d936a830c7f5dc33e0b27d8caff31309d09429397e76 SHA512 1bf9343592d4df3f5f091ae6fe63b58c2c43bec0581124db88e7c714877e364f0a97d252736dec6cf3522134a7eceb7ca00ffa00274e5690f39e6a4de1f05a8c
+DIST thunderbird-78.5.1.source.tar.xz 352743032 BLAKE2B b713b157e273a01ad215bfe751d79948884b9320b59689e0ae1916dee730b54f9147f7c895ec629f06cf4b6da7bff9045bece54704c5d683d9c1deaf41298e8d SHA512 3fb50ee1b5ec4bedaca0c68a86286f5141d3e350025b9d928348c55e57e07013124ef8b0315ee6cb16c08777ba8b0fb715ddc4b5fef2481e32f2b676090a2d80
+EBUILD thunderbird-78.5.1.ebuild 28782 BLAKE2B 7f2695a7d58ed38c5475b800395741d5af8d7c47b18214bbe0fc5046e7ebd968dcfb24ffa33b16f1ae6fa21e9487e16d90f04d1fe8a32b9ba349ed07055f87a8 SHA512 62f53db40bc9df23f22d9ed7c0de8e9929dd837de63cafcc32d6c52660135818523bb5777d6612aa2edbf24db0b15a82feada5a910cbbe289b1de6354e0802dd
 MISC metadata.xml 1646 BLAKE2B c8c3a757f3fd2da52a41466c40abb57e2ef493439ee51648730d92935ee98fff2c87e486537ebb0f03ba50461b05e123e3f5b0939aabf0e47f2a23a68b1838c5 SHA512 33520a230924981a68191e8373cac6e211851ed878111b778748e90639f4f4570a038ea9ad0e1d91aedf65dd89c9b472bdc6b08464b3ce1f5687f28ba83a0eb3
diff --git a/mail-client/thunderbird/thunderbird-78.5.0.ebuild b/mail-client/thunderbird/thunderbird-78.5.1.ebuild
similarity index 99%
rename from mail-client/thunderbird/thunderbird-78.5.0.ebuild
rename to mail-client/thunderbird/thunderbird-78.5.1.ebuild
index f5515a1339ce..0c653ddb1081 100644
--- a/mail-client/thunderbird/thunderbird-78.5.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-78.5.1.ebuild
@@ -70,7 +70,7 @@ BDEPEND="${PYTHON_DEPS}
 	app-arch/unzip
 	app-arch/zip
 	>=dev-util/cbindgen-0.14.3
-	>=net-libs/nodejs-10.19.0
+	>=net-libs/nodejs-10.21.0
 	virtual/pkgconfig
 	>=virtual/rust-1.41.0
 	|| (
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 506e06bc16f7..c18996c0b174 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/afew/Manifest b/mail-filter/afew/Manifest
index 94e693c0374b..e8dfd197c1d1 100644
--- a/mail-filter/afew/Manifest
+++ b/mail-filter/afew/Manifest
@@ -1,5 +1,5 @@
 DIST afew-3.0.0.tar.gz 36525 BLAKE2B fd9b676ad00d9f6d989d8901f8885a7861d753ab96e4a768f2a1118b72893517fc3a8122a7a63d2e26659bf1afc2467bc7503f279b8037c65da9c250c18b152b SHA512 8d1947d547bde7fdc9ec2fc8fb212165fecc1cd4bc37c2dda60133e5ffe31dee1393ad0a92e4f0e2c85863a01f7ae252555e88868fa8ba5dece8380080f0e36c
 DIST afew-3.0.1.tar.gz 40092 BLAKE2B 9ce125ec2359f7cf4630b9602b3068327adc06a699d325c90bc9b545df9ce7f3a62623cc733dfec55ee3e51523e4512ebec04e7186470fc56bb1589a7141cbc9 SHA512 1a76ecc78ed9fb8598be74c48a1d51c78db20df08b27c04c24779aaba01aa457c776457a647c54a5e92f0fda364a86810957a95c0d3f686e77e083d2103b1bf1
 EBUILD afew-3.0.0.ebuild 1164 BLAKE2B 233267562dfa67077beebe764f976ade4629b35ed0dade646447ed3b5d2621fa37643a37704a2e9dc4a5229559d1189872d05bcc40ff84657c2051ffb59305c3 SHA512 7912869b7b7fa2bda7b3389af1f9a5ed85deb0a386ee2079a004f6c0a9d328b3b65e89d2502e827e2da74955189b24899910c4d399fb9ebe9afa94dcd66e1135
-EBUILD afew-3.0.1.ebuild 1184 BLAKE2B cd13530f831fcb95c619c33c970a9a6d0b8f7712d0f1b28a439f082ce0934831c471c43edd6499e90ac4ee93a1deedfb4dcb8a6b379324d258781a33b11ddb18 SHA512 b5661f088706ff3b0ee80f6a323d647601dc567714fec3be251030ff25cf90920f6efafde4eaf469f1c26f54a5708c1da7aec9d052ba45e9d2d9160f70936a80
+EBUILD afew-3.0.1.ebuild 1182 BLAKE2B cc54aabfc61ece0b7b7b64e9283f3ab175d70fb3e35aa74c021c2faebf03db8fbc86735996a1fadf6becb8b1a90a538ea12e779b2725c215849dc9d8499f2151 SHA512 e8f17ebe07df886a9fdd7f7e1e64289e42337e67ceec7622c056324e0ad338db906c9ce973e68795ceda430d60d5d25ad5f965dc6b1eff45b520c4358a0d382b
 MISC metadata.xml 1001 BLAKE2B 33e569aa1f5f64926dfb7a74743d1cd40d16177ef814cb25e16904c20b8ba7b1ef1b12562bd437353254af73abf0759ab90da818a0aaf5acc4cae089bd21451a SHA512 44016d8a87273ede7b9fd52871095894725584202b17c69feb7b599859cbdd6202c2e41296744e63fcc918b95daf1962f64af9ea87b627bd4bf8d318b2703feb
diff --git a/mail-filter/afew/afew-3.0.1.ebuild b/mail-filter/afew/afew-3.0.1.ebuild
index a2ee5e08bf39..ae20edb0ea73 100644
--- a/mail-filter/afew/afew-3.0.1.ebuild
+++ b/mail-filter/afew/afew-3.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index fd6f0c0129c4..9ea7558adfb7 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index 4decdc50a47c..d21e76834f6f 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -4,5 +4,5 @@ AUX nullmailer-2.2-disable-smtp-auth-tests.patch 2383 BLAKE2B 07f2fc7517df280fac
 AUX nullmailer-2.2-fix-test-racecondition.patch 890 BLAKE2B 7d12af8a9b6071f11e70c6aedbe0471f042c2c2e611eedf768071715b7f42a94b2b41e814a87dd87777810cbb823d20138d40f6aa3aba93ebaec89ebb6d9e2f3 SHA512 10873e538dbc89e8899047e732515d30108b25fd0ff6bb2fc695f5790a94ac32629f41c470a2fec951357169fead36ee4512f543ad0e02c52f09799334b815c7
 AUX remotes.sample-2.0 920 BLAKE2B 26e777624086267e543354f130d3abc9591d832afbd80b8efd1fd2ce2391ed16641877077d90cef7d491a844e94fec3cba0a45dd452aa7f29151dd5873871200 SHA512 21694c7cceb3bdd743e30e2241b5e3293a3ad0fcdc4345d200f2e81c26b72b8a53c6cc3912a4e5f1de6411658a2144803746b44b59d48024cb3de33d72238354
 DIST nullmailer-2.2.tar.gz 257740 BLAKE2B 18821caa1a377a899e3fedc84530d7c672f345cafb627da05e6c7bcd7d2708d54fc4ff4b761a6a23b2ddbabe73514473a5ec2abf3182dce2f5d3d4fbe3618fed SHA512 21b29d59f3c386c13ce4541ae11dc5cd69f842085479d7fc9a69a540abc608ce5c1825f06bd3566536b392931f7eeb1b2d35addd816849e6f431877bb18c8268
-EBUILD nullmailer-2.2-r1.ebuild 4277 BLAKE2B d854bb6a9b83c14213b3dad8ed304e9f7fd468bd1d987e1ad6d6aa29f84f810ce2c882ed6cec10063d45e70b521928777c638a4821e0d662a88af1c3dfc16670 SHA512 c6b520cee7decd5f8100bf79c4428029838673711539cd98af775ac97b87a1b0639a4aa0cde0f64f9cde4f0b922b5c55391c9a2b6534f2de5c61d9c4a168ade2
+EBUILD nullmailer-2.2-r1.ebuild 4284 BLAKE2B a93914f24430536d74fd00d9698f85945c8facb849051175b422a3546742180ac6cbb7c08462e95922ca1992644bc18f5dd01394aa0280bd60e80c70a17a5592 SHA512 2e0a0228c72e06809d24a1596a955514df4909dd228e493a56c8e87443ef20601554b2b22d77d6bdfc8b25bee92e67fa07763bcee45bab6afd27e716d1248f1f
 MISC metadata.xml 462 BLAKE2B 6bb4c3b64b2a26224d66df58a133e26bec2c8db7069f5f94b131c4b09387d707a8d5170f0581c9c5136e79af4b97b5f5c3ca4a649171497957ef4aef4312a2cd SHA512 d1370220b0d410947a347c71c9dca8070b3c4a28a82742f618f605be86099ffd37dce1a7d6ab706248eae290aaaf8de2df57c5b3c8f8e818464b9eb5d26d7719
diff --git a/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild b/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild
index 051ce2259b9f..4ffe7cc5126b 100644
--- a/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild
+++ b/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~x64-cygwin"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~x64-cygwin"
 IUSE="ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index f152d982aab7..97393e2260f2 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index b630945633a1..bfefce696fef 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -1,19 +1,15 @@
 AUX 64asymptote-gentoo.el 337 BLAKE2B 56b028184573dd8db6babd90ae45838b9788671134d625df5960744b71b377db3cacf1dd4fc78d9800ffdf4e83a2413b7e87680ab0fcf45c31ecad9dc538388a SHA512 c8c74d5464f500e9bc3ca2fd89065e4f68a834c1b82a444820efd70abf9d2bd7c52ecbecd7ea5fad916259512acf4aedf8aed803a707733121211e59ef300c86
 AUX asy-ftd.vim 60 BLAKE2B 2ef690e6c1906378872aff97ed956b0c8fd1cf2e492787edd3bbd928d50724eec7b5b65f2b1b70c83e520b849c1cfe1539dcc7aabb0f8ba38b448ef58f36b802 SHA512 f4b62341f1482386d3e402f9d70a0f6b4c103a412a63dd8947aa45a5d43f12970902615b6c13e8cd8123f1cd44bf72e4204118d3bcfa7969fce078924bf150fd
-AUX asymptote-2.61-info.patch 436 BLAKE2B 34787bb4afb276074a16bbf36bf31ed71a1fd213d96f6124f4552497901c6b315009b33da74dbd554806089ce2ca1a35d3efbb4ce6388e4e05339c4ed36ab688 SHA512 4ec89ac4ddd7eb1b4b1757453000b88f509323f20995631e82a2923cd275d4ba3f7ffabef8293da943ab2ecf406e20e239ef7d2c956d6c441b287ae79e34da20
-AUX asymptote-2.61-xdg-utils.patch 752 BLAKE2B e73ad1bdda49fe95f494815571b21c7987e256450885077b89bb1dc6e192fb0cb5389dcbc1864750f6a3b6bb2762056df3c3ccea01edc42ca8f5cb435d1fc4f8 SHA512 a967c529c9e487fea3fedc46cfde81347aca98e470f7bae17879f4ca7c661ea658e764dfb352c73dc0860e152d5a0969e4ced034e1bbbd59f78d495365ce5f70
-AUX asymptote-2.62-info.patch 436 BLAKE2B f4994502868851fc175d05bdd83b3a099d67a2aa4d188656c24860ac167bb54b61a68497233536854656964b7fd7b71f050ec4b9c7c797a0e852936d3a2c7ce6 SHA512 77dea1306a90df1030b0789a0a6bf2c95c03805c13664d1b4599fc4a00fac7218425b33e506d1fb52b8e9da67d468b64de990a2ed3fb3853185ebc16ce74033b
-AUX asymptote-2.62-xdg-utils.patch 752 BLAKE2B 887e0ad34c0b24e20b50556eb070da9c4bcc00af60873b9da84445125f1129eef41050002fd8aa04ea796c14916041692c335a6d04833bf5c374e6c9aec5bad9 SHA512 cee63bbaf975ccb9fdece0728f62026b7e59e945790c6ffa1c182db814c87b0acdf38b9f1939532edf36e8f248d09f8f540c4223f7f6933c3d8a5f2a1ad0602e
 AUX asymptote-2.65-info.patch 436 BLAKE2B 0ddf2454a1ad2370c153d74d8fe4b8f36c2f702d6f732608097865885cb71681e1564e2a25b107bb0d3ff5bc0db746a86f58be49179d6b825459fce02b51b88e SHA512 77e47570629ba0370e43f0e872feb58739958ba939d29edb8411681cf638a00866a892a3dcb9a41de82f463c8e4e21fa1a7e76003075f7d78d938ab38ca636e9
 AUX asymptote-2.65-xdg-utils.patch 754 BLAKE2B 6697eabd3cded5ac11c4802805e1c55a05d41ad35fa46d57ea0534d85a2d34d6fabf1b119d94b83ad8387e9de4537d933f25c24fbe2e376eba4bc02925f2a2fc SHA512 85d85f15d8ebeb3d272d1e619ec7a97cac71b673c03a9811c1e051ef6c49ba41399409eb26b24523145eb758c353233dc50d8b105979723d903c9da3bcbc4d52
 AUX asymptote-2.67-info.patch 436 BLAKE2B 2ec0525ed1695f55bb25d6d5fdbdbf8d77eb85385ab13e5c292b6937fe1e60c51976101b5e1aa0c4036504a7a7b9133aab294220c92f7412fea9e62838c6d0a2 SHA512 d4ea5c8d914b09434ef92bc66e4847c40b82bd8c58581f7d5b305ae759e6e01082dcc31a615081bf77a09e630b5a27f245c2b60b056467000c1237c73939a207
 AUX asymptote-2.67-xdg-utils.patch 791 BLAKE2B 90e37b056462ef70ee34e8d1503ebd194c16f80e62987de776cc40bb0e6efda5a6c8d5e53f85842aa2554f4814423a3ac0bcebf4767996c004cdffa652bc1ecc SHA512 9cb5b2eaf19d3805167bba763333b1ac804d1ef426a59e41a19aa6213a35c5c2088d27fd9f22caf2b36cd6405bb84516e6d1a4de5d6fc5afb57337625e15b010
-DIST asymptote-2.61.src.tgz 4623504 BLAKE2B 8432f07ce21f630c5bdae609650c0bb2bcd237a121df68030dc19d1cae986f0bfa56dd0e241570809f9fcb202440e8b9b3c6d47a22eeaabe3eb9523360a166ca SHA512 34bb610360b4536da70ca9edf1e069ebbf0c9225948b92b3d59ea25e8684587364fa7bbb03909ba02617e6ee81d41a2e530c9ed639141e4cda42096143cab5f7
-DIST asymptote-2.62.src.tgz 4625853 BLAKE2B 49a5c75f936149139576cc224b005e76d2465a6c813bcb152f2534e98e042685c1500eafb0954b9e53ac0e667b47ab88a8b3387f1627d58828008d0e4d4cc0c8 SHA512 f7e817cdbb3c079a10c5f6f56a1eb47b1aaf8230902c06870bc8feacfed5f7af3d8ed22e4c60cc7130828ced8d36ec035533de1074cb049d3de9006ee542ac2e
+AUX asymptote-2.68-info.patch 436 BLAKE2B 2ec0525ed1695f55bb25d6d5fdbdbf8d77eb85385ab13e5c292b6937fe1e60c51976101b5e1aa0c4036504a7a7b9133aab294220c92f7412fea9e62838c6d0a2 SHA512 d4ea5c8d914b09434ef92bc66e4847c40b82bd8c58581f7d5b305ae759e6e01082dcc31a615081bf77a09e630b5a27f245c2b60b056467000c1237c73939a207
+AUX asymptote-2.68-xdg-utils.patch 791 BLAKE2B 90e37b056462ef70ee34e8d1503ebd194c16f80e62987de776cc40bb0e6efda5a6c8d5e53f85842aa2554f4814423a3ac0bcebf4767996c004cdffa652bc1ecc SHA512 9cb5b2eaf19d3805167bba763333b1ac804d1ef426a59e41a19aa6213a35c5c2088d27fd9f22caf2b36cd6405bb84516e6d1a4de5d6fc5afb57337625e15b010
 DIST asymptote-2.65.src.tgz 4640419 BLAKE2B a508532b9697a0744d48f8109d5b04ca71eb1ee7a08f15eccd2b95d63c16c980621ef03d01a03917a767c774f14a239a13f8fe50ad98b154b092f710917af1ad SHA512 c6879689192c1646a318b389de222accc55c8d5e9df17fab3c88c37f627d2cff8133cdefe9e6dec2784cf72edf261e557ad83f7fac6e67fd49c483e9d8971026
 DIST asymptote-2.67.src.tgz 4668696 BLAKE2B 30be754a0e5869caad4d605f162dffe688d2dc09a0163a8c37d15fd9d6dd05652b7b0b2710ab31edaa8f4b36484df256d032f8826f3547e755eb90e5dbb179ec SHA512 5854ce51bc7a3d330eeb0887376645c3d292a368b06d01ec84c15ee5beee90ae429abfee1bff5025bdfb51edfa7f66e535c1187f66440df0c6626c79e3de6210
-EBUILD asymptote-2.61.ebuild 4627 BLAKE2B 211e3136584bbf32862382b9e8320493c2380430b92f79fee46a35174db8dcbd73140c4460f31f37c3aff378cc45ae5fc6d188d859e162209fb843c1c48e19fa SHA512 52f15e395335622fdd219b9c589ba5c296bbf39de02e69275f70016e865a71206c40424a236022212d793bca2847fb7ceefa5819197a18cc9ffed44377050e15
-EBUILD asymptote-2.62.ebuild 4629 BLAKE2B c19da5209a22a836a6c9c59870c1a7456c5724886296de32d668258990ac221a49059c81dd8b5fab8f376fd42e20f53a6e0a30d71d86251c3c4ab3828d1c87a4 SHA512 b6d960457b9ffaadaf842ab6fc335a15a62b576b83ba0d76bdacbc1cb3d961f494901a16cb31bfc9305faebf85716a0b5a1b18fc9e4270825d56382e816b9833
+DIST asymptote-2.68.src.tgz 4672007 BLAKE2B 96c1a99815cf04180ea2fe01528615390faf8d1e5853d4e2e5f4fcdf48f0ec7e774ab0facdb86ad427e6ac11f5ce684902997f7d1e4855460ad450f6d6c64cfd SHA512 20aa3ae5116b93f266020a1d45178d7120cf39980634108b86a0bc8a4202e28b2cf0a1ac6fa5e921506db150e9077a1e3d7b8ad04869bc9bd22bae447f45fd46
 EBUILD asymptote-2.65.ebuild 4629 BLAKE2B b79215e02d3e4f59e190025daae4a4d6f328d0eebec055da2ae73ba81afb42534d41a1c81b2b9f6cfb2b1857fa099985ef57d15a433cc80ed1095718f8e4368f SHA512 94bf7f665139cc77125185918e2236ac31c0c7a1a8732eb2cc37d777c54d7b30bb2bd850502243bc219c55e38204c175d1017011e03a6bfa3a1d70dd16fe97d0
 EBUILD asymptote-2.67.ebuild 4816 BLAKE2B 6d7e6563239cfca0317d25ea4180b1e1079578148969375018782bea8bd234376da6516be67f89f40746e8b8fa0c57ddaaefa087a31614e8521aca00cdbfa896 SHA512 0af77d5679a84feaca0ab4ae6cbb95b77fa415056d4f38306d34debfde4c480fd8668c3a57c3e74a071222f6dae2f671b42e4bb1618ee7d8c9b0aa9b5b05bf10
+EBUILD asymptote-2.68.ebuild 4816 BLAKE2B 6d7e6563239cfca0317d25ea4180b1e1079578148969375018782bea8bd234376da6516be67f89f40746e8b8fa0c57ddaaefa087a31614e8521aca00cdbfa896 SHA512 0af77d5679a84feaca0ab4ae6cbb95b77fa415056d4f38306d34debfde4c480fd8668c3a57c3e74a071222f6dae2f671b42e4bb1618ee7d8c9b0aa9b5b05bf10
 MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee
diff --git a/media-gfx/asymptote/asymptote-2.61.ebuild b/media-gfx/asymptote/asymptote-2.61.ebuild
deleted file mode 100644
index 0117ea06a1dd..000000000000
--- a/media-gfx/asymptote/asymptote-2.61.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools elisp-common latex-package python-r1
-
-DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="https://asymptote.sourceforge.io/"
-SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	offscreen? ( opengl )
-	doc? ( boehm-gc )"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.4-r5:0=
-	>=sys-libs/readline-4.3-r5:0=
-	imagemagick? ( media-gfx/imagemagick[png] )
-	opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
-	offscreen? ( media-libs/mesa[osmesa] )
-	svg? ( app-text/dvisvgm )
-	sigsegv? ( dev-libs/libsigsegv )
-	boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
-	fftw? ( >=sci-libs/fftw-3.0.1 )
-	gsl? ( sci-libs/gsl )
-	python? ( ${PYTHON_DEPS} )
-	X? (
-		${PYTHON_DEPS}
-		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg]
-		dev-python/numpy
-		dev-python/pycson
-		>=gnome-base/librsvg-2.40
-		)
-	latex? (
-		virtual/latex-base
-		>=dev-texlive/texlive-latexextra-2013
-		)
-	emacs? ( >=app-editors/emacs-23.1:* )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-lang/perl
-		media-gfx/imagemagick[png]
-		virtual/texi2dvi
-		virtual/latex-base
-		app-text/ghostscript-gpl )
-	test? ( app-text/ghostscript-gpl )"
-
-TEXMF=/usr/share/texmf-site
-
-PATCHES=(
-	# Changing pdf, ps, image viewers to xdg-open
-	"${FILESDIR}/${P}-xdg-utils.patch"
-
-	# Bug #322473
-	"${FILESDIR}/${P}-info.patch"
-)
-
-src_prepare() {
-	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
-		-i configure.ac \
-		|| die "sed configure.ac failed"
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# for the CPPFLAGS see
-	# https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
-	econf \
-		CPPFLAGS=-DHAVE_SYS_TYPES_H \
-		CFLAGS="${CXXFLAGS}" \
-		--disable-gc-debug \
-		$(use_enable boehm-gc gc system) \
-		$(use_enable fftw) \
-		$(use_enable gsl) \
-		$(use_enable opengl gl) \
-		$(use_enable offscreen) \
-		$(use_enable sigsegv)
-}
-
-src_compile() {
-	default
-
-	cd doc || die
-	emake asy.1
-	if use doc; then
-		# info
-		einfo "Making info"
-		emake ${PN}.info
-		cd FAQ || die
-		emake
-		cd .. || die
-		# pdf
-		einfo "Making pdf docs"
-		export VARTEXFONTS="${T}"/fonts
-		# see bug #260606
-		emake -j1 asymptote.pdf
-		emake CAD.pdf
-	fi
-	cd .. || die
-
-	if use emacs; then
-		einfo "Compiling emacs lisp files"
-		elisp-compile base/*.el
-	fi
-}
-
-src_install() {
-	# the program
-	dobin asy
-
-	# .asy files
-	insinto /usr/share/${PN}
-	doins base/*.asy
-
-	# documentation
-	dodoc BUGS ChangeLog README ReleaseNotes TODO
-	doman doc/asy.1
-
-	# X GUI
-	if use X; then
-		insinto /usr/share/${PN}
-		doins -r GUI
-		chmod +x "${D}"/usr/share/${PN}/GUI/xasy.py
-		dosym ../share/${PN}/GUI/xasy.py /usr/bin/xasy
-		doman doc/xasy.1x
-	fi
-
-	# examples
-	if use examples; then
-		insinto /usr/share/${PN}/examples
-		doins \
-			examples/*.asy \
-			doc/*.asy \
-			doc/*.csv \
-			doc/*.dat \
-			doc/extra/*.asy
-		insinto /usr/share/${PN}/examples/animations
-		doins examples/animations/*.asy
-	fi
-
-	# LaTeX style
-	if use latex; then
-		cd doc || die
-		insinto "${TEXMF}"/tex/latex/${PN}
-		doins ${PN}.sty asycolors.sty
-		if use examples; then
-			insinto /usr/share/${PN}/examples
-			doins latexusage.tex
-			insinto /usr/share/${PN}/examples/animations
-			doins ../examples/animations/*.tex
-		fi
-		cd .. || die
-	fi
-
-	# asymptote.py
-	if use python; then
-		python_foreach_impl python_domodule base/${PN}.py
-	fi
-
-	# emacs mode
-	if use emacs; then
-		elisp-install ${PN} base/*.el base/*.elc
-		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
-	fi
-
-	# vim syntax
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins base/asy.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/asy-ftd.vim
-	fi
-
-	# extra documentation
-	if use doc; then
-		cd doc || die
-		doinfo ${PN}.info*
-		dodoc ${PN}.pdf CAD.pdf
-		cd FAQ || die
-		dodoc asy-faq.ascii
-		doinfo asy-faq.info
-		docinto html/FAQ
-		dodoc asy-faq.html/*
-	fi
-}
-
-pkg_postinst() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-
-	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
-	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
-}
-
-pkg_postrm() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-}
diff --git a/media-gfx/asymptote/asymptote-2.62.ebuild b/media-gfx/asymptote/asymptote-2.68.ebuild
similarity index 92%
rename from media-gfx/asymptote/asymptote-2.62.ebuild
rename to media-gfx/asymptote/asymptote-2.68.ebuild
index af22df7d3e9b..1e7593538a89 100644
--- a/media-gfx/asymptote/asymptote-2.62.ebuild
+++ b/media-gfx/asymptote/asymptote-2.68.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools elisp-common latex-package python-r1
 
@@ -123,7 +123,7 @@ src_install() {
 
 	# .asy files
 	insinto /usr/share/${PN}
-	doins base/*.asy
+	doins -r base/*.asy base/shaders base/webgl
 
 	# documentation
 	dodoc BUGS ChangeLog README ReleaseNotes TODO
@@ -143,9 +143,15 @@ src_install() {
 		insinto /usr/share/${PN}/examples
 		doins \
 			examples/*.asy \
+			examples/*.views \
+			examples/*.dat \
+			examples/*.bib \
+			examples/piicon.png \
+			examples/100d.pdb1 \
 			doc/*.asy \
 			doc/*.csv \
 			doc/*.dat \
+			doc/pixel.pdf \
 			doc/extra/*.asy
 		insinto /usr/share/${PN}/examples/animations
 		doins examples/animations/*.asy
@@ -158,7 +164,7 @@ src_install() {
 		doins ${PN}.sty asycolors.sty
 		if use examples; then
 			insinto /usr/share/${PN}/examples
-			doins latexusage.tex
+			doins latexusage.tex externalprc.tex
 			insinto /usr/share/${PN}/examples/animations
 			doins ../examples/animations/*.tex
 		fi
@@ -172,7 +178,7 @@ src_install() {
 
 	# emacs mode
 	if use emacs; then
-		elisp-install ${PN} base/*.el base/*.elc
+		elisp-install ${PN} base/*.el base/*.elc asy-keywords.el
 		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
 	fi
 
@@ -181,7 +187,7 @@ src_install() {
 		insinto /usr/share/vim/vimfiles/syntax
 		doins base/asy.vim
 		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/asy-ftd.vim
+		doins base/asy_filetype.vim
 	fi
 
 	# extra documentation
diff --git a/media-gfx/asymptote/files/asymptote-2.61-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.61-xdg-utils.patch
deleted file mode 100644
index 269691eecfe9..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.61-xdg-utils.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: asymptote-2.61/settings.cc
-===================================================================
---- asymptote-2.61.orig/settings.cc
-+++ asymptote-2.61/settings.cc
-@@ -98,13 +98,13 @@ string defaultPSViewer="open";
- string defaultPDFViewer="open";
- string defaultHTMLViewer="open";
- #else  
--string defaultPSViewer="gv";
--string defaultPDFViewer="acroread";
--string defaultHTMLViewer="google-chrome";
-+string defaultPSViewer="xdg-open";
-+string defaultPDFViewer="xdg-open";
-+string defaultHTMLViewer="xdg-open";
- #endif  
- string defaultGhostscript="gs";
- string defaultGhostscriptLibrary="";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- void queryRegistry() {}
- const string dirsep="/";
diff --git a/media-gfx/asymptote/files/asymptote-2.62-info.patch b/media-gfx/asymptote/files/asymptote-2.62-info.patch
deleted file mode 100644
index ffc8ac7c8fb5..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.62-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.62/doc/asymptote.texi
-===================================================================
---- asymptote-2.62.orig/doc/asymptote.texi
-+++ asymptote-2.62/doc/asymptote.texi
-@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir
-      
- @dircategory Languages
- @direntry
--* asymptote: (asymptote/asymptote). Vector graphics language.
-+* asymptote: (asymptote). Vector graphics language.
- @end direntry
- 
- @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.61-info.patch b/media-gfx/asymptote/files/asymptote-2.68-info.patch
similarity index 72%
rename from media-gfx/asymptote/files/asymptote-2.61-info.patch
rename to media-gfx/asymptote/files/asymptote-2.68-info.patch
index 0046ab9628a0..c0812477115f 100644
--- a/media-gfx/asymptote/files/asymptote-2.61-info.patch
+++ b/media-gfx/asymptote/files/asymptote-2.68-info.patch
@@ -1,7 +1,7 @@
-Index: asymptote-2.61/doc/asymptote.texi
+Index: asymptote-2.67/doc/asymptote.texi
 ===================================================================
---- asymptote-2.61.orig/doc/asymptote.texi
-+++ asymptote-2.61/doc/asymptote.texi
+--- asymptote-2.67.orig/doc/asymptote.texi
++++ asymptote-2.67/doc/asymptote.texi
 @@ -23,7 +23,7 @@ file LICENSE in the top-level source dir
       
  @dircategory Languages
diff --git a/media-gfx/asymptote/files/asymptote-2.62-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.68-xdg-utils.patch
similarity index 73%
rename from media-gfx/asymptote/files/asymptote-2.62-xdg-utils.patch
rename to media-gfx/asymptote/files/asymptote-2.68-xdg-utils.patch
index b26bc78fda23..a6a2c7daba0c 100644
--- a/media-gfx/asymptote/files/asymptote-2.62-xdg-utils.patch
+++ b/media-gfx/asymptote/files/asymptote-2.68-xdg-utils.patch
@@ -1,18 +1,19 @@
-Index: asymptote-2.62/settings.cc
+Только в asymptote-2.67.orig: .pc
+Index: asymptote-2.67/settings.cc
 ===================================================================
---- asymptote-2.62.orig/settings.cc
-+++ asymptote-2.62/settings.cc
-@@ -98,13 +98,13 @@ string defaultPSViewer="open";
+--- asymptote-2.67.orig/settings.cc
++++ asymptote-2.67/settings.cc
+@@ -100,13 +100,13 @@ string defaultPSViewer="open";
  string defaultPDFViewer="open";
  string defaultHTMLViewer="open";
- #else  
+ #else
 -string defaultPSViewer="gv";
 -string defaultPDFViewer="acroread";
 -string defaultHTMLViewer="google-chrome";
 +string defaultPSViewer="xdg-open";
 +string defaultPDFViewer="xdg-open";
 +string defaultHTMLViewer="xdg-open";
- #endif  
+ #endif
  string defaultGhostscript="gs";
  string defaultGhostscriptLibrary="";
 -string defaultDisplay="display";
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 61d0c227951e..582b632956b4 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,5 +1,7 @@
 DIST blender-2.83.4.tar.xz 38528352 BLAKE2B 54596207cbee34fcaa6b81a0d829976b42c28c793b88de81d78c1c3fdfe9dd2a0189a314be281b2a0f1829a0b7fd30d37bceaa28d35c9794dcb0f009fa71e83d SHA512 061735273159742784ed210d13fb39ad076efbbfd5f0291bab1b983699d43b20462dc7e4795e28dab0cd191c9879b43d9ad0f0545c24ef5da23c74679e5ccab5
 DIST blender-2.90.1.tar.xz 38836408 BLAKE2B 42622e742ebd397dc035c85cf26ab72ffee64f2cd46f1523de78dc8861bc19286a7d87b9e31a0d6afdf9a931da7018ccbdb9b4185b8535b4529656c6d85efc34 SHA512 e7d6f8df598f2a2a99f64716331ec4e981a5a49c76b307caf7856480c778455cfc4bbb56fbedc8b22d1e10951ebaeb6844d1ead9476847bf2824dddf5b135992
-EBUILD blender-2.83.4-r1.ebuild 8560 BLAKE2B 295b8bdf8d2dfc2d260911fa07deb04ecd5ace532e5358fc99a2be61f972b44aac993becde6b708b38b3c08967979ed1e595c6f62f4570f3ea032e9ed0e93907 SHA512 7fe110617b574ae4ad11056a7748891556f20f41b907c6f38a714469a5f544ac8a59a4f2d400e3d4e594080b86476e6e281a20b7edf01aa87d0906f9de0cf754
-EBUILD blender-2.90.1-r1.ebuild 8594 BLAKE2B 1eea748af879ef517c436f8105dfa6f63537e4cc43fa3bd5f07e003afd418940c7f47a2b3fab8e5605a7e5afc7ca582cc71c6c14d00d3b05a523dae94d7bec86 SHA512 f0a5797d2aa739e47311dc66e6464431f6620d6bdd322dbca3cfd9dd1daa4e5e7df4d4665ae855690c3701d72b89dc917cffd566d72c8e98c8c1168c0f6c26cc
-MISC metadata.xml 2961 BLAKE2B 77f0031737c448bac4387ca94430ccebbb75f1cdf6fa5780e3c1bdf2118382dbba29479e680c009685cc86105ed3f64d73b7ce2c1a882a1dd18bf4e00a1a249b SHA512 67031dc5c4428e1e7d15fc499f1cb3abd666e2c365d423c845fd587ac87712a72b171df5d7ca2a0b5d2cbe2850081212a77f66c11196700aa7f253b0c5963442
+DIST blender-2.91.0.tar.xz 41528920 BLAKE2B f28bce92b0b63e380c7ce2c9dae0ae4235792ae7c7dff52c2c9c0c5baa81b4d540f853f49d7622f6feca8c7f403b254b55f200758a64e4d95bd43709e5509c1d SHA512 a4b6cb09765d735274fb4a61ac301cbd6ee16f09ab77b19a6e283454b9b8a8c76f1b181501dc285b288130da9e283d3343b948b2855eea00bcb9e114636d55aa
+EBUILD blender-2.83.4-r1.ebuild 8590 BLAKE2B d1f5765922114878d629e653248491878f1ae7003f0ad8dad49713e083d28b5133b2e1a0b1ba6b9a2600a7f9512c9a98aa0a551e9e368aa2cfe46346ed5c7914 SHA512 36f33f65151a8c98a42a2f014209d2bf0552779c8b5e52513fc8063c5202ba77c1cf3c744e3e818387ada59a3ec88805f35f96bcefcc3c000da331b73a756780
+EBUILD blender-2.90.1-r1.ebuild 8628 BLAKE2B 6f432315a7bf13dc3635ab915e9c72668aef526358f74b324067ebe4d5a34c5fa6daa207fdb753adaa756be9d53617896ec5545071755459ed0799a56618d18b SHA512 1b4bc3de4447577cd062283fde8ef091c0800968a0129a833b4d3c9acf8992e143a204bbc32b887254cdf4977ea083cb262e47242b5b2f1d581cf183339374a7
+EBUILD blender-2.91.0.ebuild 8741 BLAKE2B 9ce61b45d2b8858d4c7765e62e1b630b86000f70f2d35e31214e2ffee1c9e4ca4f944a72da23a3d9f3f2cda11a866982e2448e2f0d383ae280c399474ef9be3e SHA512 52ac7e13bdc6b44be34d897cfd68d38fbe818ab8f38b6fe4c13adbb4d89f37b7cb37d4742541a99921c16ce20f52ecff8a4c4acf84f9a4b9817b159d27257b02
+MISC metadata.xml 2795 BLAKE2B 6a3b2ec4f6c57286f41e4304bd394dd2d9c23830678e2a29fd7657eb9aae760c5061f5a5fcf43e65993ccbdf4c3e42bbd933857e22355ef4069f870ec7d180bb SHA512 20ba570f24a0daaa50a07991d0b6ec6620b080ad3a253af2dff7008c504fea3ac2fc11301e1947d81f38b0398d878de0c299700fd99880b021e5e8e5f41afc95
diff --git a/media-gfx/blender/blender-2.83.4-r1.ebuild b/media-gfx/blender/blender-2.83.4-r1.ebuild
index a4a6501ff7a4..f28ba088062c 100644
--- a/media-gfx/blender/blender-2.83.4-r1.ebuild
+++ b/media-gfx/blender/blender-2.83.4-r1.ebuild
@@ -88,7 +88,7 @@ RDEPEND="${PYTHON_DEPS}
 		~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
 		dev-libs/c-blosc:=
 	)
-	osl? ( media-libs/osl )
+	osl? ( media-libs/osl:= )
 	sdl? ( media-libs/libsdl2[sound,joystick] )
 	sndfile? ( media-libs/libsndfile )
 	tbb? ( dev-cpp/tbb )
@@ -114,6 +114,8 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 "
 
+CMAKE_BUILD_TYPE="Release"
+
 blender_check_requirements() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 
diff --git a/media-gfx/blender/blender-2.90.1-r1.ebuild b/media-gfx/blender/blender-2.90.1-r1.ebuild
index 7ad59e31836d..8c7494285e83 100644
--- a/media-gfx/blender/blender-2.90.1-r1.ebuild
+++ b/media-gfx/blender/blender-2.90.1-r1.ebuild
@@ -30,7 +30,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	alembic? ( openexr )
 	cuda? ( cycles )
-	cycles? ( openexr tiff openimageio )
+	cycles? ( openexr tbb tiff openimageio )
 	elbeem? ( tbb )
 	opencl? ( cycles )
 	openvdb? (
@@ -88,7 +88,7 @@ RDEPEND="${PYTHON_DEPS}
 		~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
 		dev-libs/c-blosc:=
 	)
-	osl? ( media-libs/osl )
+	osl? ( media-libs/osl:= )
 	sdl? ( media-libs/libsdl2[sound,joystick] )
 	sndfile? ( media-libs/libsndfile )
 	tbb? ( dev-cpp/tbb )
@@ -114,6 +114,8 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 "
 
+CMAKE_BUILD_TYPE="Release"
+
 blender_check_requirements() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 
diff --git a/media-gfx/blender/blender-2.91.0.ebuild b/media-gfx/blender/blender-2.91.0.ebuild
new file mode 100644
index 000000000000..3cbd3fe1ef08
--- /dev/null
+++ b/media-gfx/blender/blender-2.91.0.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \
+	toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+
+# Blender can have letters in the version string,
+# so strip off the letter if it exists.
+MY_PV="$(ver_cut 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
+	abi6-compat abi7-compat alembic collada color-management cuda cycles \
+	debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
+	man ndof nls openal opencl openimageio openmp opensubdiv \
+	openvdb osl sdl sndfile standalone test tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tbb tiff openimageio )
+	elbeem? ( tbb )
+	opencl? ( cycles )
+	openvdb? (
+		^^ ( abi6-compat abi7-compat )
+		tbb
+	)
+	osl? ( cycles llvm )
+	standalone? ( cycles )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?,threads(+)]
+	dev-libs/gmp
+	dev-libs/pugixml
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	media-gfx/potrace
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/glew:*
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/jpeg
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( media-libs/opencolorio )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	cycles? ( media-libs/freeglut )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+	fftw? ( sci-libs/fftw:3.0= )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	llvm? ( sys-devel/llvm:= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	opencl? ( virtual/opencl )
+	openimageio? ( media-libs/openimageio:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
+	openvdb? (
+		~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
+		dev-libs/c-blosc:=
+	)
+	osl? ( media-libs/osl:= )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb )
+	tiff? ( media-libs/tiff )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+"
+
+CMAKE_BUILD_TYPE="Release"
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# we don't want static glew, but it's scattered across
+	# multiple files that differ from version to version
+	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+	local file
+	while IFS="" read -d $'\0' -r file ; do
+		sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
+	done < <(find . -type f -name "CMakeLists.txt")
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+}
+
+src_configure() {
+	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+	# shadows, see bug #276338 for reference
+	append-flags -funsigned-char
+	append-lfs-flags
+
+	if use openvdb; then
+		local version
+		if use abi6-compat; then
+			version=6;
+		elif use abi7-compat; then
+			version=7;
+		else
+			die "Openvdb abi version not compatible"
+		fi
+		append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version}
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
+		-DWITH_CYCLES_EMBREE=OFF
+		-DWITH_CYCLES_STANDALONE=$(usex standalone)
+		-DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GHOST_X11=$(usex !headless)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_LLVM=$(usex llvm)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex elbeem)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
+		-DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+	fi
+}
+
+src_test() {
+	if use test; then
+		einfo "Running Blender Unit Tests ..."
+		cd "${BUILD_DIR}"/bin/tests || die
+		local f
+		for f in *_test; do
+			./"${f}" || die
+		done
+	fi
+}
+
+src_install() {
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	if use standalone; then
+		dobin "${BUILD_DIR}"/bin/cycles
+	fi
+
+	if use doc; then
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	cmake_src_install
+
+	# fix doc installdir
+	docinto "html"
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py"
+	python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts"
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "dragging the main menu down do display all paths."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${MY_PV}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 0dff6db1f81c..56a4c98b6a4c 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -42,9 +42,6 @@
 		<flag name="dds">
 			Adds DDS textures support to Blender.
 		</flag>
-		<flag name="doc">
-			Build C and Python API documentation directly from the source code.
-		</flag>
 		<flag name="elbeem">
 			Adds surface fluid simulation to Blender using El'Beem library.
 		</flag>
@@ -86,9 +83,6 @@
 		<flag name="tbb">
 			Use threading building blocks library from <pkg>dev-cpp/tbb</pkg>.
 		</flag>
-		<flag name="test">
-			Build the provided unit tests.
-		</flag>
 		<flag name="valgrind">
 			Add support for memory debugging using
 			<pkg>dev-util/valgrind</pkg>
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index 4a6f2d779be7..c1aedbda5c44 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,4 +1,4 @@
 AUX fotoxx-15.05.patch 460 BLAKE2B 95f19579fecaa13dacf5249cae1e05561070f2ac9cf8856d17d0bbf0e4b4c55ea476960f5e49580200e190d0f84daa3c29862a1414848a14b6d72a058b694767 SHA512 e4d2ddd827de492ac4890c8c8b34719b9dcc6acd555de60c7d5bef35d8c0dca032635fac9b989c92594ea92d5bd47c0300acca9074696058321bd401fdbb7b0b
 DIST fotoxx-15.05.tar.gz 3573278 BLAKE2B 0a7f564b2a31cf7db131d8a09a8624f087b7a5beb377949843d99d5933d5b16fb270177fe233f943af7f26753fffc6a52a5a5feea18c065f0dd99a74256a33f0 SHA512 07155e5f32c0ada33dd95de333a4a124c9fc56b3807bb2edc2b078f0eab37968f374f84701bb8ce9b200f00ed4587c83f772899ba39527378d3527050960ac0e
-EBUILD fotoxx-15.05.ebuild 1151 BLAKE2B e57effd1bcc1ef9f867e9c93a0080c55f108ed87a9c7e1ee58faeb4632e23f06939f8aa2d97347ef25e58cdd96784e00960abf944886d0450873e259a021de64 SHA512 7fbb27c242856ea797982b6799a558394da5e245b1adad434fcfa087a8f4b11ab5665f1ca8419943ca7ae74ff7f96e16c0c1a4dede948fbb93e0842d1af69f7f
+EBUILD fotoxx-15.05.ebuild 1158 BLAKE2B e2885489ef78b828f1141a268876333168088c3a042208cbcedbf068613711e47526ca8fb79121d61f067030d6cb2cc7cb671161c8d2a26a5e6480c7915965f7 SHA512 374c9c7e979a9427003ed76f36aa0b7233667407fc2a7ee1498e7bbba9e351ba3202efaaa676eed84ddb5997a9d0cba1f5f38ee878c3f75aac5054d7ba8100d8
 MISC metadata.xml 773 BLAKE2B 75c03d8cf914e9aeb25db837d5e945908082d8711b19fbeb8694371ebb8c2ff6c69088dd4c887ce4f29eb456e2f412f6d992ac04c447a31e814838dbf5932aa1 SHA512 1fbf87c22810a242a8d7f0e91e6ee6bcb6b1a08cb39c3e827171e110bdcc5468a2440c42d56f1630860555a54fee0133483d8551dac164492bb630fcb45c7cc8
diff --git a/media-gfx/fotoxx/fotoxx-15.05.ebuild b/media-gfx/fotoxx/fotoxx-15.05.ebuild
index dd440e48f705..b0b0b1e02756 100644
--- a/media-gfx/fotoxx/fotoxx-15.05.ebuild
+++ b/media-gfx/fotoxx/fotoxx-15.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.kornelix.com/uploads/1/3/0/3/13035936/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-gfx/viewnior/Manifest b/media-gfx/viewnior/Manifest
index 9745befdc6f4..2f8eb58b90c5 100644
--- a/media-gfx/viewnior/Manifest
+++ b/media-gfx/viewnior/Manifest
@@ -4,5 +4,5 @@ DIST viewnior-1.6.tar.gz 168966 BLAKE2B 1a04ec6ee4e05da8d0721115826d2550c7d24b42
 DIST viewnior-1.7.tar.gz 165719 BLAKE2B 906ab0b632fcc102ac62dd77d6742c2121c46cd92adc0dfe9ba772bf697eff356519dbb6219016a6470903c855aa4c9081f0d61ca1607d8d1b6d8e03236a19bc SHA512 5ba17d7b5ceeffa65b04213f179c1439b09ac44e412e0750dde159b118a714f28d3a290509a402b234e4e7ba5b185fc73eef65d418598f344911e4e2c1373fe5
 EBUILD viewnior-1.6.ebuild 932 BLAKE2B 421cec0425ef6008090cdea7df88f90c45641f0a26355fcedaaf86c9f11f797cdcdcded489c233ca128ed87dd0863f1965013899c6421584f44d6d7e1dbb5d18 SHA512 847f9cd4e8c24460e77df21e99899507f2adf634fdc605bf3884ba0ba317b84e468218ce5f0b46a6d96b8b6c94966c0dd0b170d330cd22ba2c4069bcd4529303
 EBUILD viewnior-1.7-r1.ebuild 1279 BLAKE2B 4302bd5b94b27ff3e5b0f8db78a3f5e7fc092a7f861c3edec053f050368b136b44d19ae151331c4f4a7c915d56c5609fda2099c075fb2e3a944e7ecd598b7a35 SHA512 c974ab91c7110447b9d51a2e6a0481730452bfd8d3d0090ea6b631df0e890a3e0fbfb280e6836a28e01c1f26ecaf36b67ee848d9842bd1268e8f9e9949f3f2c9
-EBUILD viewnior-1.7-r2.ebuild 1162 BLAKE2B 0be864a12245dafbcb199f774478a17ea23715f9b160bdfc3ae2b498a9bc7849ab3ecf8f5588cccd23aabce0a3bebb5ead3526a5cf713fb32152f46e4f16f0cb SHA512 3533cd649c5619a44679a2316a67862812706eb625b6ed19b0435e077e312836e8ce63aa6732e3e818417f2a6201864d1dc8de0d8a4b0313643c04846ceeb0d7
+EBUILD viewnior-1.7-r2.ebuild 1169 BLAKE2B 242cbb29e603adc30d320265849cc5b48d75e174b7e1949c98d160aa9e75537afd48c86882208b2b6326dfb1c27c49b4b3b943f1261c76c221d2497f427e7ff6 SHA512 aabf358b22d8258791f7f60ce062070bc9fe72f1c5f9cd8b2bb5281194b3bb5b2a21d38f8f1dcbe07e157366e62e3594fc2c3a9952c41b45fb96b6d0bf9d6f67
 MISC metadata.xml 522 BLAKE2B 3f08e8b96d95c32bc0c2265afa2b580b92258060f4964c9f595da738fe96814406f8d8cc67965b985b714abded06d848df43bbd9fb72641b1123bbe1fd6f348a SHA512 94a9310a1eb358b2468caf0c21a5d799b81049483443b87e0fd4abe644295390f1703ec1b7a58562db89b353632f682f555cec64f41969e3a3e90017cb5913da
diff --git a/media-gfx/viewnior/viewnior-1.7-r2.ebuild b/media-gfx/viewnior/viewnior-1.7-r2.ebuild
index 60e6b46a431e..1c67cf68d566 100644
--- a/media-gfx/viewnior/viewnior-1.7-r2.ebuild
+++ b/media-gfx/viewnior/viewnior-1.7-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hellosiyan/${PN^}/archive/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index ee2190b7632e..3eb03cc78bd7 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/a52dec/Manifest b/media-libs/a52dec/Manifest
index e9325e5ac6ff..ed70349c230d 100644
--- a/media-libs/a52dec/Manifest
+++ b/media-libs/a52dec/Manifest
@@ -3,7 +3,7 @@ AUX a52dec-0.7.4-freebsd.patch 295 BLAKE2B a927fb15b6e7afbd52ebb75d1d99430d8d910
 AUX a52dec-0.7.4-test-hidden-symbols.patch 637 BLAKE2B 542d1bfbf8722d900b25fa6bce240924e82ca1b903a308634b23c23acf59e606adbad54951da39b3c1c60cf95fe9c8bad87da09cb10894ac82de3e670b199cca SHA512 097f4f9cb82f01cb42e5536bfb4fa5ed6cbe85da5f4a31c19e83e1d1e73f8724a3828f0585834142f861bad3417fb9c55b21581def85733278870c3c48c2e8fd
 AUX a52dec-0.7.4-tests-optional.patch 299 BLAKE2B af245be87277559c2fbc1695180d4e451ccc6a76157111d57fa86992c4cd4dd59e166b7a68a7d799bdda56d0ac5ae3ddfe5c433cbccf6eef4a999e2b336eda0e SHA512 9f5c0afbfd656287eafeba04eed34070f53a77cb53981d64ff71edb96bef6cc2c0638e0be6647086cbad87ead97aa0215cd6cb413258d0122bc3f45bcf4480b1
 DIST a52dec-0.7.4.tar.gz 241507 BLAKE2B e8475b391a3afe77883f5683f58a64d2babfcf93c08a3bcbd0208476323e9c86c5d268d2738efddd2093a1c47886deb22185cb8f00c4ec8b4153f64e1af1f49e SHA512 4b26fe9492f218b775fb190b76ecf06edaeb656adfe6dcbd24d0a0f86871c3ba917edb88a398eb12dccedaa1605b6f0a0be06b09f9fddd9a46e457b7dd244848
-EBUILD a52dec-0.7.4-r6.ebuild 1413 BLAKE2B 45ebb82ffca81f3f3c1bb3344ecce998e1cd5a7299af97e1451cd50f43b74c45380a717e991aa0a66f20da86f918602eed72746227111d8ae915f51a8b3f9744 SHA512 50170b8a1fd4218ea832fb305fd6366ef28bcfbbd41dc4cde438e9d94ace3d476a35d845ae6204e49efb4f1b87db1baa646f202f2deead042d2cfc75bb62fe5e
-EBUILD a52dec-0.7.4-r7.ebuild 1543 BLAKE2B cbb898b79f8c8bdd8daaaff8fc186b8ca9c3f24d2f8c28cf2206298384eb84ba449903106673b02e746c5fe7f757a4639df1f218b63cc4f15746dec7adfe442c SHA512 2a93b8d533c84ad430c16fe0242317da4b09fd32fdefa550c99a2c682dacadb4ac03e96ece2cc4641a0021adcdf7a6011cfcd2226245b023ed42a02e7926706a
-EBUILD a52dec-0.7.4-r8.ebuild 1452 BLAKE2B 77c734fd419292c20f4e2676ba7390d53bf989c82238f47ecf5f52cd33fd2f208e0bdc2a941736a2287e64f246f5c750b10caef8e650ab072ae4d7464efddd30 SHA512 58e2c6eeb982ad13eb362d7a2d6f9704528120ea3bc435b33340f2ae022f829d3767eb201c4612daa4a1a3b255c4b38d05fe6e468449c63c40dea8e5f07acf59
+EBUILD a52dec-0.7.4-r6.ebuild 1414 BLAKE2B 5e8063b18c746c84b52b544aaabc75bfb49c378c457778d8888becc9c41b1bdbcb3efd19c91ec37cc38a7ac9fd985208ccaf3f308216cdd874d7c7cdcf45159c SHA512 e013229559cc7326cfccce482f6378e17e2fb73cfd65e9a07ef14617ac326dd314e97cb0925bb741a8808fcf49300586ddb21a8e1d9d30fbb0518ce26c0d4017
+EBUILD a52dec-0.7.4-r7.ebuild 1544 BLAKE2B 056731f355c76ab2591760174dfa78d932f0522b2a358a224861c523566dd553deb56b4cf6b8ea2561077c81a687ae273bb69455851491788ee197cc54ce0e1b SHA512 c8af97e615f804bb81a226f9284a102f595fa6aabf9ac1a7bf87d3e38b097354dcbfbb434dfdf69a6e2b7cceecbf576719eddb091e1abf37938b3d044a00d5e5
+EBUILD a52dec-0.7.4-r8.ebuild 1448 BLAKE2B b41c705aae4eb6bb327d2e7c0a42c2630c09558c714a96c79100526ba829c2b3aac6bb78ad74436d77d755784553292d2ff9e33d7f5b6c673f6850aad4840673 SHA512 2509e75c0857293820348d8a7532bcc54db049aa2481331abe2a035eea359913c1d840b9051ebf1f6574daa776cffb7777c2b3eb370626fb52d1f8feb14f1784
 MISC metadata.xml 442 BLAKE2B 6e92f797dedf977ed4dd7321249af91b56488c98f9bb64cc8df4fd1ed1012a501d0f49ef5cb063d52e0636583dca77c4376df2e1071da889f598415aa91d801a SHA512 acc8d37733d5efebd4e65401dfff5926a64e13f641dd383343a26b666fe13963191782990ec4571c18803584808b249cb60646a06d91437f0a6793237eb99ca0
diff --git a/media-libs/a52dec/a52dec-0.7.4-r6.ebuild b/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
index 69546430db82..19ca4e2db9a2 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://liba52.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="djbfft oss static-libs"
 
 RDEPEND="djbfft? ( sci-libs/djbfft )"
diff --git a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
index 8879829f3c9f..65720cd03138 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://liba52.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="djbfft oss static-libs"
 
 RDEPEND="djbfft? ( >=sci-libs/djbfft-0.76-r2[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/a52dec/a52dec-0.7.4-r8.ebuild b/media-libs/a52dec/a52dec-0.7.4-r8.ebuild
index e32e97439eda..363f2bde9509 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r8.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://liba52.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="djbfft oss"
 
 RDEPEND="djbfft? ( >=sci-libs/djbfft-0.76-r2[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/fontconfig-ultimate/Manifest b/media-libs/fontconfig-ultimate/Manifest
index d09bf23049c7..cf2125b7cd57 100644
--- a/media-libs/fontconfig-ultimate/Manifest
+++ b/media-libs/fontconfig-ultimate/Manifest
@@ -1,5 +1,3 @@
-DIST fontconfig-ultimate-2015.04.tar.gz 455899 BLAKE2B 5b9395da2c9091965ddbd65d536932a925c81d2a872f790bf946b2dbb7eea0ebae3a258f88b3628a67b26022cb489aa4a4cdc98cfb4d67b3f1d83907c9f21e5b SHA512 cdf11c298c9746c720dd6a4e1d361aa16244fdd46630fa00fea03d6d57956b6cee41b3ea439c84d81756a11d63768e4672851c9692a87944b6688a9763a06096
 DIST fontconfig-ultimate-2015.08.01.tar.gz 1241997 BLAKE2B 291a2cefb793dda5b5d5c826dd720cb9eee311d67a8268554911a4581b6e2bd3389079f4383eb32d350c57f9eb854af04734adaac40e3da134a819c77456c03e SHA512 2c1e8c522c94f6db45c63cde610bd2abf95ae913241ebda275d40cda0c0b62a489047749eaefa78fcf25d802ebad442f32f2bbf5629d4fa8ee0c6dbc9f105de9
-EBUILD fontconfig-ultimate-2015.04.ebuild 3144 BLAKE2B 221307db922eec0882feeb81b1d321ff61098764108d6bfbd3a1dc48da7cdfbc58075983cdb56f57d87ddda4a491de4c11b9b4a7a1e935347041f465677748c4 SHA512 3f15be9d4612b925ef33db3d146985b7d4999651a71d0c47a5d6eb1d8106dafde7ebd863bad40189d8ca84e38b89200bc16557963f9f833341e102fa2b3aa310
 EBUILD fontconfig-ultimate-2015.08.01.ebuild 3144 BLAKE2B 221307db922eec0882feeb81b1d321ff61098764108d6bfbd3a1dc48da7cdfbc58075983cdb56f57d87ddda4a491de4c11b9b4a7a1e935347041f465677748c4 SHA512 3f15be9d4612b925ef33db3d146985b7d4999651a71d0c47a5d6eb1d8106dafde7ebd863bad40189d8ca84e38b89200bc16557963f9f833341e102fa2b3aa310
 MISC metadata.xml 341 BLAKE2B 609469836f44b2b1afcd253057bb9a2ce0a1cae6a28177d71864b50e7ce8cf320278d3b6c393fac59af62d513018ff587bf8cc8a5d251ab1ec3dfccbcd5b34da SHA512 55d47d4699c323ee47f874f74fd765211068a361b83aaa0016c7dd0b838d2d1902ed0c14b8ae264184e1501c31b10d84c87cd9e27989076b999049177b134272
diff --git a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
deleted file mode 100644
index 0a217240ac46..000000000000
--- a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit readme.gentoo versionator
-
-MY_PV=$(replace_all_version_separators "-")
-DESCRIPTION="A set of font rendering and replacement rules for fontconfig-infinality"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://github.com/bohoomil/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-eselect/eselect-infinality
-	app-eselect/eselect-lcdfilter
-	media-libs/fontconfig-infinality
-	media-libs/freetype:2[infinality]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-DISABLE_AUTOFORMATTING="1"
-DOC_CONTENTS="1. Disable all rules but 52-infinality.conf using eselect fontconfig
-2. Enable one of the \"ultimate\" presets using eselect infinality
-3. Select ultimate lcdfilter settings using eselect lcdfilter"
-
-BLACKLIST="43-wqy-zenhei-sharp.conf"
-
-src_prepare() {
-	pushd fontconfig_patches/fonts-settings || die
-	rm ${BLACKLIST} || die
-	popd
-
-	# Generate lcdfilter config
-	echo -e "################# FONTCONFIG ULTIMATE STYLE #################\n" \
-	> "${T}"/ultimate || die
-
-	local infinality_style
-	infinality_style=$(sed --quiet \
-		-e 's/^USE_STYLE="*\([1-9]\)"*/\1/p' \
-		freetype/infinality-settings.sh) || die
-
-	if ! [ -n "$infinality_style" ]; then
-		ewarn "Missing USE_STYLE variable in package source."
-		infinality_style=1
-	fi
-
-	sed --quiet \
-		-e '/INFINALITY_FT_FILTER_PARAMS=/p' \
-		freetype/infinality-settings.sh \
-	| sed --quiet \
-		-e "${infinality_style} s/[ \t]*export[ \t]*//p" \
-	>> "${T}"/ultimate
-	assert
-
-	sed --quiet \
-		-e '/INFINALITY_FT_FILTER_PARAMS/ d' \
-		-e 's/^[ \t]*export[ \t]*INFINALITY_FT/INFINALITY_FT/p' \
-		freetype/infinality-settings.sh \
-	>> "${T}"/ultimate || die
-}
-
-src_install() {
-	insinto /etc/fonts/infinality/conf.src.ultimate
-	doins conf.d.infinality/*.conf
-	doins fontconfig_patches/{ms,free,combi}/*.conf
-
-	# Cut a list of default .conf files out of Makefile.am
-	local default_configs config fonts_settings
-	default_configs=$(sed --quiet \
-		-e ':again' \
-		-e '/\\$/ N' \
-		-e 's/\\\n/ /' \
-		-e 't again' \
-		-e 's/^CONF_LINKS =//p' \
-		conf.d.infinality/Makefile.am) || die
-
-	# Install per-font settings
-	pushd fontconfig_patches/fonts-settings || die
-	doins *.conf
-	fonts_settings=$(echo *.conf)
-	popd
-
-	# Install font presets
-	pushd fontconfig_patches/ms || die
-	for config in ${default_configs} ${fonts_settings} *.conf; do
-		dosym ../../conf.src.ultimate/"${config}" \
-			/etc/fonts/infinality/styles.conf.avail/ultimate-ms/"${config}"
-	done
-	popd
-	pushd fontconfig_patches/free || die
-	for config in ${default_configs} ${fonts_settings} *.conf; do
-		dosym ../../conf.src.ultimate/"${config}" \
-			/etc/fonts/infinality/styles.conf.avail/ultimate-free/"${config}"
-	done
-	popd
-	pushd fontconfig_patches/combi || die
-	for config in ${default_configs} ${fonts_settings} *.conf; do
-		dosym ../../conf.src.ultimate/"${config}" \
-			/etc/fonts/infinality/styles.conf.avail/ultimate-combi/"${config}"
-	done
-	popd
-
-	insinto /usr/share/eselect-lcdfilter/env.d
-	doins "${T}"/ultimate
-
-	readme.gentoo_create_doc
-}
diff --git a/media-libs/gmtk/Manifest b/media-libs/gmtk/Manifest
index 1193eb737442..cccd832f9f1e 100644
--- a/media-libs/gmtk/Manifest
+++ b/media-libs/gmtk/Manifest
@@ -1,5 +1,3 @@
-DIST gmtk-1.0.8.tar.gz 407790 BLAKE2B e156edc18124b8ff87dec9ad70c579fb95dcaf96a2cef5316cc2e95cf68700099ccbb1b83652cb515c9c33f27f63f81b7966ee8d6d30e5b7545b3e9be63e864b SHA512 ef2bff079df5ba41b86b52118b51bfe0343093e206dd7eca0da39f0420eca4d2f3cbb93940ecadb1526303c8ca0f9b27ff61cbd193122cc91a0fff768e6601ee
 DIST gmtk-1.0.9.tar.gz 411609 BLAKE2B 6c5c7b3390a3d7ab6593484247447f1016475b5f785cb7cf77810aac37034ce704286e9512cc5d091a04ae6362f8a0634db21599ff6bb78141aa3c5a5405db9d SHA512 61da4bbba5b74510c5ad5d6b5e10606fb99f54732cf412aa6245add2dc2b0df12b75e4e6f1474b4cab0541063ba6f95893e366f1c8b52a055521b667c182dcdf
-EBUILD gmtk-1.0.8.ebuild 1009 BLAKE2B 7b9c50381a9b454e1c63a75de37849672ae50931ab519a3fa93a8d42480f99b73905d3084bbbd6a872642fb3a9e1434a40f5278b3243b5be3f20ba96a09a63e1 SHA512 8a374b3aa1627d6e6d292df970e0e09e43602b994c96f9a758185e3222071d4bbd1ab2131ba557a700b3536530422644a98d779e39d4f68fb98173e8a2276c4a
 EBUILD gmtk-1.0.9.ebuild 1016 BLAKE2B 0f3ad5d4f7326bbbbac3579f920dd606d59ad762c47228f4563e6d40634b841136dcef32fd38bb89ad02f3a49aa3ea86ae726b20d410aebb702ba0e7e1d90540 SHA512 d756b97726b63bbeb8c57b3471b13479ebb41378abbb08575d69d354766d04b47c5ae640f59011a4d166f90004d5e85ab1e72031b0ec4d4f890b2dbe7a5e3c6a
 MISC metadata.xml 321 BLAKE2B 9ee0f6f0335977fcf934de319b5c6b43c490de8c6e2e84563e962f10bf781186b04a1db77d420f2c13782723eec266b1b150b2bf72d96c55edc5aee6b4b5aa88 SHA512 e89aecb354cbcd3e1df953d02b20ade390b417179779efc7f8e5d3753a583502bb87637f26b205c883abbfca8022fe4f9119e7129f2599aaf5a434e974bc8247
diff --git a/media-libs/gmtk/gmtk-1.0.8.ebuild b/media-libs/gmtk/gmtk-1.0.8.ebuild
deleted file mode 100644
index dc272d4de8e8..000000000000
--- a/media-libs/gmtk/gmtk-1.0.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils ltprune
-
-DESCRIPTION="GTK+ widget and function libraries for gnome-mplayer"
-HOMEPAGE="https://code.google.com/p/gmtk/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
-IUSE="alsa +dconf pulseaudio"
-
-COMMON_DEPEND=">=dev-libs/glib-2.30
-	>=x11-libs/gtk+-3.2:3
-	x11-libs/libX11
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )"
-RDEPEND="${COMMON_DEPEND}
-	dconf? ( gnome-base/dconf )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS="ChangeLog"
-
-src_configure() {
-	econf \
-		--disable-static \
-		--enable-gtk3 \
-		$(use_enable dconf gsettings) \
-		--disable-gconf \
-		$(use_enable !dconf keystore) \
-		--with-gio \
-		$(use_with alsa) \
-		$(use_with pulseaudio)
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	prune_libtool_files
-}
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index d7f3ea3b1582..d2bd0e3aae8f 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,7 +1,7 @@
 AUX hamlib-3.3-format-security.patch 738 BLAKE2B 896d6023f68979400ba8782956da86b9d30878f661eb70ac40f595cf903739f29c11fe4a3d75135333c65148ff8d0e2fb8b81e03ea32520d16b0824e9262be01 SHA512 fea0ed27228de5177f1f849e237a517b32f3efd74efab4dfc858c75ae7339dacf942097016229faaa790396f6627160e0e4716dfb16eb496e91c5d8301134098
 DIST hamlib-3.3.tar.gz 2192119 BLAKE2B edefd8b8c75876c07fa498c98f7d6760985fdecc477bf6711e948071e45964bf7fdf6705b3172e56951366a7dfb0288e025eab66d3b6436d158649ae53ac39bd SHA512 4cf6c94d0238c8a13aed09413b3f4a027c8ded07f8840cdb2b9d38b39b6395a4a88a8105257015345f6de0658ab8c60292d11a9de3e16a493e153637af630a80
 DIST hamlib-4.0~rc2.tar.gz 2188867 BLAKE2B 02df21910266e47c99e3cd72fc815ed75b9b5f50b29b9a94aa6fc5ddac73b1a09d16caa0d5e4be71bfe44e1940b853a0a8e1303f23fbacf003da18eed198531c SHA512 6d192bbb1c98e76fdfd1dd6bde1d0fd8b668243332827ae609e7bb4a93a3fed9fda0b12363638f5e9df65d65fd2305dfd493bd37a99aca2f2bd5b0861e948d5b
-EBUILD hamlib-3.3-r1.ebuild 2098 BLAKE2B 71e21520f50d9d4edf8b6185fa7504bdac6462245f7ac13390738784fc58134f81a80985684595853b7a703cced26790f8b2009b4635e67cefb2f4e54ee85d08 SHA512 f2ef47cb0738712c29bc588ce4ebcba070ebc3d8d71ebf9649eeb1370c6f8102d7df30714f5d1f8d56badfec0919f6ce271d12fe035707a9742c3adf19e9b3da
+EBUILD hamlib-3.3-r1.ebuild 2096 BLAKE2B 59b0a7f8e8b77e95e300dc98959ba8e6d70d0264c7d98b35368c730d085545a9c5d98b1c59954312611b835eb4c5ef3a2070731dd5323617f968582decc6e892 SHA512 01d9a0506a075d5e1e619f2431cb3f9c16dcf234f3e6a240539623ce9cbe62f98918a0408e3c82d372b36a66d45f48bbf42dd0130543ddfa351a3cfe517b0b49
 EBUILD hamlib-3.3.ebuild 2094 BLAKE2B 6efc59674c743530a54fc0d68e8750f5cc7eb3504d74ad1fd160a41e1dd0f3be87fb669c0d7fe6cd9de2001d55ba108cdbbbb5e62ee05c688c80f25a5db0b765 SHA512 ad1af776080acb8a0fe6dd960bbe8f1ace7feff5966b648b29b04d5e6017ba094f2ddeaecbc5b7df8e256689fcd5a4848c67db98cb02263caac66679ed4ce3c5
 EBUILD hamlib-4.0_rc2.ebuild 2063 BLAKE2B 3462b89e1a29d30dea53432b9bfe776257bbd133e35a55fb9b882dcac064f9f086c17cde3938a029b92be8ecd27909e124d03e78a19b4ec7a902414fb86e8c09 SHA512 a75e48f521015e950695712c2d41a5c826662fcd21e9b860f203118462413ff1f4fc44d9fe1d59001e28d6e07fe033a3f2e9e7cd4cb69b56fcd8a372ffa0cb8d
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-3.3-r1.ebuild b/media-libs/hamlib/hamlib-3.3-r1.ebuild
index fba1a537a608..f5ac9c6a5344 100644
--- a/media-libs/hamlib/hamlib-3.3-r1.ebuild
+++ b/media-libs/hamlib/hamlib-3.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.github.com/${PN}/${PN}/releases/download/${PVR}/${P}.tar.gz
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc perl python tcl"
 
 RESTRICT="test"
diff --git a/media-libs/lib3ds/Manifest b/media-libs/lib3ds/Manifest
index 69b3369ac00a..d8cb5b3be67d 100644
--- a/media-libs/lib3ds/Manifest
+++ b/media-libs/lib3ds/Manifest
@@ -3,8 +3,6 @@ AUX lib3ds-1.3.0-pkgconfig.patch 2345 BLAKE2B 9d1fddb8a14ccaf5d2747c39113e809ca6
 AUX lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch 1453 BLAKE2B bb196782a7da408412d7a1ae5c1c006ff9b59827dfbe6bb7092ae8b6d7ca1b7eaaeba167bb3804dd24ba369b90982dc97f10443424dea39b0f3ecaac378ed2e7 SHA512 63bc93b5cdf099a33b13ad84ebbd964607fe2824f102d5e4dd37c435cb84ca82e4de16a1796de8abe9e4dd43071b3bcb6b3f176d0d2c4019534d8d08decc8570
 DIST lib3ds-1.3.0.zip 443675 BLAKE2B 7e9aa3b7d0c74013264430be24b1f8417f5ff7754bd77508fb85fee227c8675c023b6b805b3cda57a1ea3c1bbc7b0fbd37df8ed1c4d00ac295a39ffb0e3c1219 SHA512 7c866ea9721a7a124c25b4962e933a7066ec2e3c7998e5ae2ba93727f19b91bdb103699bada6d1e04b67e0a54b9f58d09382093569114a1846d86bb03821b8ac
 DIST lib3ds-20080909.zip 427233 BLAKE2B 862a4606206c59e357b0b8805998a497de140b5e80aa3f6f7dd41288ebb1ffc12475b41d5327ee3c619a22c549897b28b444bac5df58192979af5c236859d86f SHA512 ba7166dbd9fb97edc0f5cf0df56747b7e3c5aa1e62334ca995020a6ccd77284abc58e3fba80ec96ecf3765f5ce3121612c9f8c7dfedb2322f1cd2af85d567f87
-EBUILD lib3ds-1.3.0-r1.ebuild 554 BLAKE2B 606e9436fbbe9d2f2f8c7ff27a611dc411b2e52af03bfac3e897211365036b9f7b95f97171f40ade5a943a8482c6f920874e22381d67e95459bbc25c15467793 SHA512 67812bdf404fd8be46b8c11d38f5c1da89f3e36849add8843aa16e63a2569438941f770ff6bf0e680f1dee356d02f8a99e6d6c8714aa37f62165c5c84bca200c
 EBUILD lib3ds-1.3.0-r2.ebuild 640 BLAKE2B 3bfb11f5a8c068985efa79b1383ba2fb064d1abb292d296896c20cea4ef82c70adeea74c7cc088c0059c35610efd6ff6f54f03b1f693a10e8e8d162e0e9be651 SHA512 b5e009cf9ba4510b6802b72e61e8de44cbea936b610c875bccfecc1e7f65f2249930aa4da7047b0834dc0d490d0c1f54eae2a0d1221a48ce1e58c12162bd12e4
 EBUILD lib3ds-2.0.0_rc1-r1.ebuild 699 BLAKE2B c7ed09eaa47b6efe577f63dd0048411a86e0d71b4b3fdd31c8fc9065542365b412c6b9f82d39cc05d30ce5ce4ba61c660d65a318e59ddce58ebc3cc99fabfd53 SHA512 9c5cb3890adc65efddc6f80cf168a92c03b5b24552f811e1815aee45f052758e29aa317b3222bc86deab6f8c35963d6b1269554ecc5788fa9e6e7dbbc5ee01a5
-EBUILD lib3ds-2.0.0_rc1.ebuild 652 BLAKE2B a85855fa5d699c0e592437ba23fad789905ade2d5a3d8bc4d331c6fb0683dc451f57bd6674984324a0619a71f8bc5ee687f386dd9c569ac7ce203f21bd129594 SHA512 a1bc042ebaabe3775150cc52bda1fc5509a677057082a836b27e27181b706b1f0f00d7961df7faf2ec4e4a8d1f81be0fdecbdd4c0e4ac72d58adab07a9a256fe
 MISC metadata.xml 431 BLAKE2B c469c1c5f88e5e3014221c85aa47b95ac8720257705c35e79a76945aaebbe075d559696e6941d64c9237e849969c9a369c7a8db96d24965bef78b88b85ace7d5 SHA512 09ba499ac33f3a9162ac15c23d0c262a32606c731a775579a0c8d6d2a24137687e1306aa17e4f66d4aba57d141d991ab4186716e2b7a55ace4ce7526b37680f3
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild b/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild
deleted file mode 100644
index a15221ea080b..000000000000
--- a/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools-utils
-
-DESCRIPTION="library for managing 3D-Studio Release 3 and 4 .3DS files"
-HOMEPAGE="https://code.google.com/p/lib3ds/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="static-libs"
-
-RDEPEND="media-libs/freeglut
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-PATCHES=(
-	"${FILESDIR}"/${P}-pkgconfig.patch
-	"${FILESDIR}"/${P}-mesh.c.patch
-)
diff --git a/media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild b/media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild
deleted file mode 100644
index 2c964c8ca157..000000000000
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_PV="20080909"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="library for managing 3D-Studio Release 3 and 4 .3DS files"
-HOMEPAGE="https://code.google.com/p/lib3ds/"
-SRC_URI="https://lib3ds.googlecode.com/files/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND="media-libs/freeglut
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_prepare() {
-#	epatch "${FILESDIR}"/${P}-underlinking.patch
-	epatch "${FILESDIR}"/${P}-underlinking-no-autoreconf.patch
-}
diff --git a/media-libs/libaacplus/Manifest b/media-libs/libaacplus/Manifest
index a95497d34ecc..5aec0dda4b24 100644
--- a/media-libs/libaacplus/Manifest
+++ b/media-libs/libaacplus/Manifest
@@ -1,6 +1,5 @@
 AUX libaacplus-2.0.2-clang-inline-redefinition.patch 1277 BLAKE2B 6df3ac18034ad74bb46e1fe84ba616558ffc4635ed15414bced6e438c7f7f96db4ef2adc2e134e0495a16714e244ceefdb0c0e187fd35ae137e672b50f24480a SHA512 19fb221b29f1e65f26146358943bed62e0002dd8dc682d9af6134f8f497ce67901fb4ac1eea6c957536900715f82e36914e89f70bd5c50e364dc7f72a13bb340
 DIST 26410-800.zip 1348294 BLAKE2B ff774eb4c6db9a545ccd06611237d35bca192509b44cdfdcdc538c4aa4895e3ca6139904e25e44a457bbfdaa2306b17c3029b916b02c2e35bf9c267fb3007901 SHA512 a1d5a4d9b67b4e7292d3d07ba62090f92e9f6cd90e72aadb0e4067120941cc89b93ed136023461354567e845f34274a8097187a70d1477695b3e2024f86ee29d
 DIST libaacplus-2.0.2.tar.gz 42155 BLAKE2B fd65ac4d1a59136b1af1209f5ade9ba331ccb3d529e184329594c95654829e0bce29d107a221542b2ac3800610062774be52a1619aa0b591eaec3d8836b049a1 SHA512 05a6cc206fc187c96b065e94a80a57f6f1610fc5a3228f0163ac5acedabab2f2501dec8df3d196b9a1e2c2785277b0224cd5bb4d2a090bad2dcae44e023f9189
-EBUILD libaacplus-2.0.2-r2.ebuild 1306 BLAKE2B 2e2dd18b57efa905dc28f9d43034e97aebc8458a695734db8c42b1135754577e8d5c6702f072ab2e981483e7ef1999ce592f45c22498c89ffcb212d6b2b5f835 SHA512 9f7352d881efb6b89020531a47e98d118bf745d1f0ca665458e9439e7e49c5b308ab0f85917c93938f5a28b12298d02496b8766b9055aba4842ee8bc36fea41d
 EBUILD libaacplus-2.0.2-r3.ebuild 1361 BLAKE2B 6600c3458974833ac33d2855b12c306e1db9cace887089daf6080eb91b1ed15fca4b4f0c2567d4b2b9aaa42430e8593e8a93d261dee4827a91f2fb55776363d7 SHA512 65484e22708fbb5129321d6e06fe1d38b89a61fe41fd42068b460b4144c99d479e3d5319c8232b01daddbddc14b355af572b82c5ace9edc160ed8f3001d66c5d
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libaacplus/libaacplus-2.0.2-r2.ebuild b/media-libs/libaacplus/libaacplus-2.0.2-r2.ebuild
deleted file mode 100644
index fc5f229fa590..000000000000
--- a/media-libs/libaacplus/libaacplus-2.0.2-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils ltprune multilib-minimal
-
-# This file cannot be mirrored.
-# See the notes at http://tipok.org.ua/node/17
-# The .tar.gz, ie the wrapper library, is lgpl though.
-TGPPDIST=26410-800.zip
-
-DESCRIPTION="HE-AAC+ v2 library, based on the reference implementation"
-HOMEPAGE="http://tipok.org.ua/node/17"
-SRC_URI="
-	https://dev.gentoo.org/~aballier/${P}.tar.gz
-	http://217.20.164.161/~tipok/aacplus/${P}.tar.gz
-	http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/${TGPPDIST}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-IUSE="fftw static-libs"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	!media-sound/aacplusenc
-	fftw? ( >=sci-libs/fftw-3.3.3-r2:3.0[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	virtual/pkgconfig"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	sed \
-		-e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
-		-i configure.ac || die
-	eautoreconf
-	cp "${DISTDIR}/${TGPPDIST}" src/ || die
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_with fftw fftw3) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-}
diff --git a/media-libs/libaacs/Manifest b/media-libs/libaacs/Manifest
index 7dcb186c9544..f3a729284271 100644
--- a/media-libs/libaacs/Manifest
+++ b/media-libs/libaacs/Manifest
@@ -1,7 +1,3 @@
-DIST libaacs-0.10.0.tar.bz2 319890 BLAKE2B b7ea746e72028f718ee630d74360c52627360b503d739e884c213651597e719711b2dc7649ded4164ee35a56e3420de59e420c4ce8fa7b1dbebcd547f5221798 SHA512 4527749c3c78fd270012b3b36e916356a4aeb8f90169e781a00739f01f190121691042607209864e9b676ede9741f614c6003a7dfbb350dc020e1fa94cd6d66e
 DIST libaacs-0.11.0.tar.bz2 324061 BLAKE2B 8faffa270580f82b7fc6ae53922a9ec15087b754adebc84f1fd216c748dbcbe6723c14908efc9ef77b891bda149d10bf5020321906a36a3654dddbf6bdc00936 SHA512 167edbb6f26599e41d6084908039bf902f69f57da1f64f1491734157d1568ad0b32c8ea3064e0706e383af8dc6007eef65170b2b47222bf3d363e395e0b60388
-DIST libaacs-0.9.0.tar.bz2 316323 BLAKE2B 4fd1ecca0ba5106b1d0195884356a8a8d7163614ebc2fe09f85ed79fa1534b6376951ab90670b3a7d375129e76fae80e3c42f3e1971d0cbcabd6e4e8384bde1a SHA512 b9c658db22a0966486070d3b762509a7c0120469ab29d1e57c1b624cad309701de8b92455ec649db4d731be4a5c29c38fb4f99bb7617dbb4254270284a1903f6
-EBUILD libaacs-0.10.0.ebuild 996 BLAKE2B 0b67440a4d94a4cb6908ab9b977458de835fd9ea2bc161d00a10d9604c2a085c5b1bf3d6b8d4ec4470bf85f3cb5afc4bd586859635a0a3aa3fda319486e786ec SHA512 72b9bbca677307e8a58183b8cae32eda06af8d82586c95021bcc62f99bbf2d6f2bf22ba3c31c63239e4b6d82a152bb7bbc5469928ce06cc81fcc1e763e5af236
 EBUILD libaacs-0.11.0.ebuild 988 BLAKE2B 5a6bf138f51b3bad43d2a5f015190430d59cfb7582cbd7754b411f53c28978c52e586cb6c3705f16943838c4ef829957487345a3be65d066e431a7ebf1c2ac73 SHA512 08d62edfb243c36d0f70a3d8fd171d99b4af1246cd545bebb175db1359aeb1be067fdefb5491e51d41055daec8b72433f9fd9ab7a8147569d9f0ac7b7cc99a0f
-EBUILD libaacs-0.9.0.ebuild 806 BLAKE2B 1b4852f3be27474d53b4d185defdf8f68802ca9feb0fcafcfdc1b5c39f0033a3fe13d68e71ddc4dd3ab5c6edd79f8270b1dac9588c18435225d0ab57d935eddc SHA512 f8760dbd524681a777f6ac97d003d0b35c0519e2af18231bd0285063950307f1c1583f55bcebd9a33ca400223335600d45ee35e12f39e0f4ea9b420ead6e32b7
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-libs/libaacs/libaacs-0.10.0.ebuild b/media-libs/libaacs/libaacs-0.10.0.ebuild
deleted file mode 100644
index 721e0ec2e382..000000000000
--- a/media-libs/libaacs/libaacs-0.10.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Open implementation of the Advanced Access Content System (AACS) specification"
-HOMEPAGE="https://www.videolan.org/developers/libaacs.html"
-SRC_URI="https://downloads.videolan.org/pub/videolan/libaacs/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
-	>=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-"
-
-DOCS=( ChangeLog KEYDB.cfg README.txt )
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-optimizations
-		--enable-shared
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/media-libs/libaacs/libaacs-0.9.0.ebuild b/media-libs/libaacs/libaacs-0.9.0.ebuild
deleted file mode 100644
index 1d50bf2ab9a0..000000000000
--- a/media-libs/libaacs/libaacs-0.9.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-multilib
-
-DESCRIPTION="Open implementation of the Advanced Access Content System (AACS) specification"
-HOMEPAGE="https://www.videolan.org/developers/libaacs.html"
-SRC_URI="https://downloads.videolan.org/pub/videolan/libaacs/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
-	>=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc"
-
-DOCS=( ChangeLog KEYDB.cfg README.txt )
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_configure() {
-	local myeconfargs=(
-		--disable-optimizations
-	)
-	autotools-multilib_src_configure
-}
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 8852f69244e2..77f32813c857 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -1,5 +1,5 @@
 DIST libass-0.14.0.tar.xz 356256 BLAKE2B cf38d472003d6590c69da9347310386559b1ce13425d47505daca881b504453802a60cd553bbe478044764c108586668886372b79a61ccba42cdf49b2ed9ca74 SHA512 0f5fe5d7e662ee1d649981f829e5ef7a53457754f74faaed5679252a5a6769c8f267b6119cda922ebc6a8e5b5b331569f13813ac74881b4e94da7b2e8143a9e6
 DIST libass-0.15.0.tar.xz 367848 BLAKE2B 1ba444d9d718eb364cf0d3ee743404adda36384432dcdfb350db59c1769042b7bbedf1610ecc1b89c2a6c98921710d71ceeac9888371e0774c30f4701746096a SHA512 067ed519e64da7e2e45436bb09e390f1a77d966aeb9420729f36c9725d89491655ead69eb61b43f3220b8ff8f9de3891911b62757466f843ab13ee7149d88459
 EBUILD libass-0.14.0.ebuild 1328 BLAKE2B 60e239a04ccca966e5ce9dbb0c90bffe2d6bd00117fafb2ab29e7f8b01ff5afa70d9e123ffc7fe0e41d538afe7f59cf2ea5aee9811945ee0b422d36ae506c577 SHA512 001656ce8d6857d0c2fd007b2beb95364f43b498604942d3c7a673d2f449dd1e5ff8bac96fcfba846a54e4ee7a827f9194b7d2d3b20ca59f3930d1defb32f517
-EBUILD libass-0.15.0.ebuild 1200 BLAKE2B 8ea27b0eae690757fde1ebb2e2ff438cd67af2aaa359453db716b2a0a4ae8838d1ce38e4117fd404a3e15e397eee688dc31149a5ffe2b62e4794ad48e3610dd2 SHA512 43266256b2c5ff7a60b391faf93d874c40fb101dcb0e594ec0df8ca0349512508027aa50223402af95a68b1eccc6c12839c6fff63c7cdf599a5cb19bc748012b
+EBUILD libass-0.15.0.ebuild 1196 BLAKE2B e509b69f3770e5c3c3059aeb1b904867cf2378a751133138464b3f3f260be2b7f972e1da1ed0aa11fa0f565cfa8aaf05ec3b560d68eadfb61334c29fc04261eb SHA512 db827b366c06d49b31e3bc8ab4ab03bfc81e1c9fc3ed0eee77a9217c48b7a8232c44fc4bb1a67d9390990b79a91a5de14a44ac5f53c51ab1c8728684a263a436
 MISC metadata.xml 420 BLAKE2B 160123e29ca333ee5aa8cc197a986ae489ea578e54efebab089133db45a7d3ba5b554161c2a835fa0f53537a16043b627d41f26c752460e6bf3118aab185f0d6 SHA512 ea6cdb493942844567b8acc3dddf71983ab02ba05d849aaaa0cdf0c8e435a0acd159eca447c3e049ddf27d384fb0e94826ff9aad42322eea459e4313f0319964
diff --git a/media-libs/libass/libass-0.15.0.ebuild b/media-libs/libass/libass-0.15.0.ebuild
index a2a16f40d522..3c59f471b2b5 100644
--- a/media-libs/libass/libass-0.15.0.ebuild
+++ b/media-libs/libass/libass-0.15.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0/9" # subslot = libass soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+fontconfig"
 
 BDEPEND="
diff --git a/media-libs/libhdhomerun/Manifest b/media-libs/libhdhomerun/Manifest
index 89ea6ad8b0ca..59b8ede05ad2 100644
--- a/media-libs/libhdhomerun/Manifest
+++ b/media-libs/libhdhomerun/Manifest
@@ -1,9 +1,7 @@
 AUX 20190621-use_shared_library.patch 524 BLAKE2B 51fa3fa3e8be71ce255b714f4c542e57384751ee9b708960a2a471e32c68cd5acf71fa2c649a00c9dcc4f7c5322e1a51b0ceadd793dfaf0eba0a3840485e38e2 SHA512 49f2c44f8b565edb65b625f4ca21f4751ad3b2ec8c636d0cfda4f65db75cc0382d0e06ebd7dbaeb71fc7bd478b9ffa126e13786809f8e882af0478f6a814caaf
 AUX dont-strip.patch 596 BLAKE2B 166f289c8e6027ce5c57accf6e2644afe6a275849b178993a37260dfee463b67bd7969e4b2b0365d27aba9da4239a4dc821fe4b9beb0846821312f3f04f29079 SHA512 58906ab0d472f3186f99c14d9fd3c6104b7df1ef9b20f5bb3a334ed357d6cc808ec04609108cc7aab6a1b6ed781624e728bb4f9a14cdc59a5cf84ace591268c6
-DIST libhdhomerun_20150826.tgz 49169 BLAKE2B 6b780d61624e9cca9ca6afbbcdf91377dc134782ee22752c8d92849c6eabac502a3a8a8659035b8a0fd66ae1d7404f6696f78758e0ff4484b46b84ca7282b48f SHA512 9b401c1649dc8c32ea9019b732631f9213cb66c43771aa148fa318202fc11739c005c474be6a77a6a7807818b5179f77debb5b2d2411d865cc87bb3d7ab629a6
 DIST libhdhomerun_20190621.tgz 50817 BLAKE2B 7d4293e38be5283fba5d46cb162ee19d90c30ed63481cd94445a055fa0f80597fdacedd59e35ba4edfb53934ce339e967eb0c42d0ae72289ce7d39eb1f91cd50 SHA512 d15c5b0703bf8ca1f3979a8cad93fc33d87c1309367ad5117354c60112a5505d90e80d4bf9055d16b0eef2b892015c5f4886e6544178090b3550c3a8dbd86576
 DIST libhdhomerun_20200521.tgz 51014 BLAKE2B bca7c09afd16dae9177cf8b8c828827818acf8bc24eff404591178519bd1b568bb8689721b452bf23ae5b37143cf85aa6fbce52177fcfbafcd5e30e6f1ceafce SHA512 ac253923b531a8e1f714b7fb98da5a2a062144c045117a63e5bb16b33a49ccafcffd24f5520d412d15ca55bc1810fc0ecb9ad05e2d7f5a196b5439b4e28d5c23
-EBUILD libhdhomerun-20150826.ebuild 624 BLAKE2B 118b8847494bc537d9ad5a71c06c8f3b704dc574bc0f5a85008e1099c6fa698ac338c8b03684073b1eb552e6bb44292947d02c8ee1fbdcfcfcb18b51bc0e3d8d SHA512 0d0a49bffdc67789ceb896db00191c65e40e2f02b21c9cc4aa5b312c6c1edad217f35509a61488a7d59ea7e5c55894cb67f509cf5b69a28df16c6f7918b530e7
 EBUILD libhdhomerun-20190621.ebuild 742 BLAKE2B 4b318d87d60e18826d853bc92451f2d4659af5ed915aeb3c596f7fa33e17cb6e7a0ea2b45d53e2f9ed4237b2ddcfeb05a19afe882166c4596ccdf5c531838275 SHA512 d3ae13a413af9e8ad508d1f5834295dfedadfe1047b65fd360d4997c7b58d6c3e533bc66c09738e57261698c1c5630df463e4a063a92bc649acc7a6420d5e72e
 EBUILD libhdhomerun-20200521.ebuild 745 BLAKE2B 24f96b3e66c295f77841d2f6e5fd0bb50aceb6ab549925b82b87129c260eff20a8e49a85060d88a343097bdc47388dec7ef44efa4a7ce6f47744b29f2075497f SHA512 e6519e4fb53f129baef66b52c471cec82ee2380c91bcb70675221628c68792dbd330226cc44d8a5928f2d8707ee14b900713226fd42008c655863c3fc16a7719
 MISC metadata.xml 381 BLAKE2B 5ffa518c826118aec9b46d3e964d52f21ef19332b0ee956cc153b992eb5c85af27ebebfb6891156262eb19e65b0b47f076d0940b490fadb42f2b04d16889b550 SHA512 4cf06e9cd0ab6bce4c38f2b86c4875864924616746fb18816f647dfb4cacde6e7678c2f7a20c0de94194e9227d6133efded1f81ac2064b7d0532b445cf041b38
diff --git a/media-libs/libhdhomerun/libhdhomerun-20150826.ebuild b/media-libs/libhdhomerun/libhdhomerun-20150826.ebuild
deleted file mode 100644
index 5f5c3b3608b9..000000000000
--- a/media-libs/libhdhomerun/libhdhomerun-20150826.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="SiliconDust HDHomeRun Utilties"
-HOMEPAGE="http://www.silicondust.com/support/hdhomerun/downloads/linux/"
-SRC_URI="http://download.silicondust.com/hdhomerun/${PN}_${PV}.tgz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/dont-strip.patch"
-}
-
-src_configure() {
-	:
-}
-
-src_install() {
-	dobin hdhomerun_config
-	dolib libhdhomerun.so
-
-	insinto /usr/include/hdhomerun
-	doins *.h
-}
diff --git a/media-libs/libmpeg3/Manifest b/media-libs/libmpeg3/Manifest
index 053291a350e7..98433e4b40b6 100644
--- a/media-libs/libmpeg3/Manifest
+++ b/media-libs/libmpeg3/Manifest
@@ -1,5 +1,5 @@
 AUX libmpeg3-1.8-impldecl.patch 559 BLAKE2B a21953fc4acd57169fbb1e6bd48aaf8d6b3d0e3deaa635cbf6f8fe1dcd73bb394820f2f66b188c7d78ae2cc07d7cbbb0176327455a3a49e44ada8c48b8a072c8 SHA512 43affdcfd54146c0623478f6b2108b28b2be09c956d800705b24dfe9eff6c50e861c83e392371a4deaff19649d61fe27edc7521c7daa703ac369c96b5f698ff9
 DIST libmpeg3-1.7-gentoo.tar.bz2 5625 BLAKE2B 8c0e18c690d70d6dc2e87428993eda57c5b67152514221b38860644c21ab4a98d6f4060f9399be5bcfddaa42de0ce6f55019a6d88ae3abfc2793b9d57a0d85e5 SHA512 9ef94c41ee943e321c9fc14a02659a839f08554aac4f5c5abcb9835e9940f0e5dc4c67c26f8124de960cba78493fa43f6c800748c0426e6dc141aa106e2aabc1
 DIST libmpeg3-1.8-src.tar.bz2 2452350 BLAKE2B f5d4a3f7291847baa35bf5103f7bc5d79122d488c1f89ae6006912666cd29d4651cc74721e5e451f543c2493f64bd3cae0fa72384d866454cae6f3e0a2e77985 SHA512 e381f07d46d47d391c6db420791a065e3572e17ca63966eb52712560867866683505693f73b25869059319eec66fd1c2f923dbef1fdca5ef9efbe598e217d60e
-EBUILD libmpeg3-1.8-r1.ebuild 1722 BLAKE2B 63ab983634294c090e005c9e99a1c5152f61afe1d3014bcd10c777c6f48d65ee433f57445a9434409450b41823e56f1e4ae4572e37c8e466ea1f968dae649bf5 SHA512 029278937414ef02172fddde3fd674c564ab5c6106efed367123fe6f7133b01a4e7524cabffc2916624ba3127f9c86e9bfa94b3ee029b840b27fedb94dc4b360
+EBUILD libmpeg3-1.8-r1.ebuild 1723 BLAKE2B d0a90786014d4996dda7ee26050a0ce487f91a196163b8b45c70cf41f31d415985558ca7f2253f5329d91ea4a8ce87f7e382d150c19aa65ec1db62d8120634c5 SHA512 f8f8f40676eb6fd89b385d0a0f8b873ecd4ccc59ecebad7bed2813a3c2279a3e5a9a2aadc2987cb965d45dfb43987875f6ac4145a19d19ab1a25d00822652cae
 MISC metadata.xml 309 BLAKE2B 0ff62755ba6e4b13232af28e76b191520e01ff5603517e3e50b06a3cba120b6a3dccc3aabc3c726568b13c8ee46d21d7065afd6eef3547a3a4403cea155b1e20 SHA512 f14445391f7eee4a7f0906b3c483ccb915cd64bcccdbad63780bb1da5e0eb851621abebafc70f8b88cbfabd335fb396aa3dc909f5789cd8c8eb582af923a2d63
diff --git a/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild b/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
index 7598204e2b06..1a177b2bda5b 100644
--- a/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="cpu_flags_x86_mmx"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index 67fe3557700f..ac4c301f06e3 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -1,8 +1,6 @@
 AUX libopenraw-0.0.9-jpeg-9a.patch 590 BLAKE2B e43ddad7d7c3e48a633bc8e8acc480ac610b505052e267a175acc56c2036d9d2bc2b9127184d30924661243c3a595c2caf3a6eb6443102890d3620095b84108d SHA512 555a4ae729fb4163d7a26bc577fff9257bb326712d8c59f4c4d36c1398bb7ebac26a2f961d22676d9c97812a9fd6433f802ba2d9fc94a5c07e18de60e59c682a
-DIST libopenraw-0.0.9.tar.bz2 478687 BLAKE2B d51410aa2a4ce297c660f80f99c912374faf05c0920be0c9dff78c5979c553cd74aafed0591bd62d479825cb0fd7064b47b86747ecddc75cc177b54184eb42b1 SHA512 88d475d27719212686a0a5a08da04d6879fd456ec8f7531f401217df97f4f3d4c52dc8c4fb1c6ca88c12d6a67ecd516b151c5e9dceba9cbfcd13150fe81d6db5
 DIST libopenraw-0.1.2.tar.bz2 563981 BLAKE2B 60332274c72602e5b3eea3e41dfee8c62303a2f09028df4a637cea6f07391d912f354752cb6f354e06dd9e223dfabe5dbed1d50e0f325d85be42fb5012ecede6 SHA512 edd7e5a71feecbce1d5a20622bd3c7111acd2d4792038fd19920367ebb55d2cc7614627b9739512bbe34d6b5ae2eb65a4da9cee70c400b5cb846bf5fff08efc8
 DIST libopenraw-0.1.3.tar.bz2 565458 BLAKE2B dec7cda78b6ff4b1411b93c0d48758920b73e087eaca3c262a0850eb5a3423fee38ba7537694b1a04bdafa6bbb34b290c059f483a5a6af339b76c132ac77c413 SHA512 c56d84610f0cf5da970c4c0c791fccf2f7e9f7c7dacf2aeac0b2702ce9a0cd3aaa2f6db0794b0466e1dd8316771973db1e64d013f635c1166b7ff2eebdcbf029
-EBUILD libopenraw-0.0.9.ebuild 1188 BLAKE2B e7b22453ca906f3543feac773220e11f5539ab53255de05d00b2a27ce097f94acabbc8b17c97f51a39e4b358db6133f1c38d3244934a2536989e45cdd0191fa9 SHA512 8d5ed9bb0a9651148b10aecd6f8b34324f10dab81e50edbcfec6435f0e597c7dcede922298de77bf9f41a85dfdce4b991594b2b7c83eeffea3bf753bf17e52cc
 EBUILD libopenraw-0.1.2.ebuild 1122 BLAKE2B 98a11c1dc9fcd2eeef188e206eed3f63447f38d1f0cf7675fdf9600ef1d9eea0862baee8543bec78b7b2859382c3f75370923ab0a488d82865f506fd976b5eca SHA512 b7b7700de3aef054478f3c87cffb47c1185a739f38abde560223072e2a81f70f0117b88ddc13217f0c09e66d9bb5785a8b0f774a97e7cb86b710b306fb622545
 EBUILD libopenraw-0.1.3.ebuild 1129 BLAKE2B 0cc1afa57570ff5844d593e70f387b15da8a9c6ce736ff903040b144840757aa3937dbc60d7a4a9d86dc71533731b4066f2b8c9efdfa4797f674b1434d0be48a SHA512 e72348c0051972daf41d9b96bb6afb6f16049c18ed2cffbb4f338fc2c9a642ccd2be4e1aadd559736ef5a6107308d89f24a2d0ffa7f0d1beceb649b4748ae4ed
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/media-libs/libopenraw/libopenraw-0.0.9.ebuild b/media-libs/libopenraw/libopenraw-0.0.9.ebuild
deleted file mode 100644
index ad423950d23e..000000000000
--- a/media-libs/libopenraw/libopenraw-0.0.9.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnome2-utils ltprune
-
-DESCRIPTION="A decoding library for RAW image formats"
-HOMEPAGE="https://libopenraw.freedesktop.org/wiki/"
-SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="gtk static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/jpeg:0
-	dev-libs/libxml2
-	gtk? (
-		>=dev-libs/glib-2
-		>=x11-libs/gdk-pixbuf-2.24.0:2
-		)"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.35
-	virtual/pkgconfig
-	test? ( net-misc/curl )"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	has_version '>=media-libs/jpeg-9a:0' && epatch "${FILESDIR}"/${P}-jpeg-9a.patch
-}
-
-src_configure() {
-	econf \
-		--with-boost="${EPREFIX}"/usr \
-		$(use_enable static-libs static) \
-		$(use_enable gtk gnome)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
-
-pkg_preinst() {
-	gnome2_gdk_pixbuf_savelist
-}
-
-pkg_postinst() {
-	gnome2_gdk_pixbuf_update
-}
-
-pkg_postinst() {
-	gnome2_gdk_pixbuf_update
-}
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index 1eb74bb90d46..7149415ac377 100644
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -1,3 +1,3 @@
 DIST libsfml-2.5.1.tar.gz 22868556 BLAKE2B b6c70b75a778ffeb141438153fb1e5693c3e92e277919b8f8befe98f55dfd519a67c86504bb5656961b947fcf60758b16a18d5a4ae7585c7c5256f327529ae31 SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59
-EBUILD libsfml-2.5.1.ebuild 1534 BLAKE2B a35a5fd9eb69d6bac2baa89ddb58f9237e811ae69e678ed3910ab6eb76ebf081cddde91eb7eed4e067cf593182718cc90686e492125a9c1740f627e7126e9433 SHA512 97f76cc163b0a7e43bbcbf1ca5f04e51b11c791b44af81ac97f374cda211600591ca4ba8efaf917832a5eb171167a48b93e72e1f7f5253b8d52eb39439ab056f
+EBUILD libsfml-2.5.1.ebuild 1541 BLAKE2B 5d59a9fc6342d4ba6fbeae645a37cb514a29d38034f7a808939d6c8c0ab591f472cfd60ee6c2f0c53ebc2cd489196d2e417540e612128d20f66724386c0b0923 SHA512 0e75cf34912d7a520cf081ad2fccec0db53053b1db7150a45882fec2a08487cebb7a3192c04e8839033f52c988ffedd6e3566b08fa1922f11312d632464db4cc
 MISC metadata.xml 732 BLAKE2B 598678c33da33373a1669f4b9048b95503d9c430730b571b985e4137e034e5104dc509cb0a6605834ef463c6d6438b25bd2bb06ec6ce41d7e1c52fbef7219e3d SHA512 3d709fc7d52858ca5ce62ecc8f7aee20b4812be0b735d6eb66c2d4b5cd48bea5017d3b56dce3735688bdd0abb11ce485c58a5c7d4b7973307cf9877036caa8b2
diff --git a/media-libs/libsfml/libsfml-2.5.1.ebuild b/media-libs/libsfml/libsfml-2.5.1.ebuild
index 715c1d5a2246..159102d00492 100644
--- a/media-libs/libsfml/libsfml-2.5.1.ebuild
+++ b/media-libs/libsfml/libsfml-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="debug doc examples"
 
 RDEPEND="
diff --git a/media-libs/libuvc/Manifest b/media-libs/libuvc/Manifest
index 88389569fe24..91595932b8b2 100644
--- a/media-libs/libuvc/Manifest
+++ b/media-libs/libuvc/Manifest
@@ -1,3 +1,3 @@
 DIST libuvc-0.0.6.tar.gz 95598 BLAKE2B 8c317068629512a699536d218401a4ab05925e43bb867ddd0c1b3c06f5b26e0291ad4c486a04f16f76ee03cf5d576b7387d4bde726acf105f7297372ec14b1ac SHA512 d8e52f5d062d2b4561562c9dc017d7f8d9d6734c4284e54b7bc58f9fc968cc8aec51dde938e8911a5c71d0c49fca4478c2fe08c9b7041d4fa26d7c6e1e653f1e
-EBUILD libuvc-0.0.6-r1.ebuild 782 BLAKE2B 70e17b7095036c1beeea530888486fa9aea46ece43b84c93479b2c6f7242c0fb365b85a8b4a3f5d08da904e20c2b7d7ddd93d107db22bd6967ebabed5a61631e SHA512 3df82eab14ab458ec028bd11e9024ca4bb19f2d8f698d5fbee3b663387c6fbdb7724cc8d2b3679f600df437b5a26412aa7c50a62dc43153907204303f4923625
+EBUILD libuvc-0.0.6-r1.ebuild 789 BLAKE2B 7b54213b0e68a9c660ee0159c012ad7f24eb0025ae91770bd5c8395c842c1dccddf825b47fc35366631cf269b0575f79e9fa1aec46906d472af638314f37b2ee SHA512 476cce36b9c961e877329baec2b56750d631e4d5836cbd8e4d16fbdcc5de57e88a7909aea5a51520a8d0e4e1986c2b029b0b6ccc3093493517118a18d3d3a6d4
 MISC metadata.xml 446 BLAKE2B 1c36e6c623d067d28deaec19f5d5b07e7c6509fe7ec3c3a1955c5edc863c38ec6974b2c5c80487b929e64f8e3c03275e708c9a0151151b3f06f1a988af5d9714 SHA512 19c938d7b3f171395552c4758f86cd6d80941e428967c14490d8ef09f0d48b215b8458d1695f390c257e81cc376f7c401e8405f8103c6c68c2b744cafbdb4eb3
diff --git a/media-libs/libuvc/libuvc-0.0.6-r1.ebuild b/media-libs/libuvc/libuvc-0.0.6-r1.ebuild
index 31fa1cec60f5..881b8fc7a2fa 100644
--- a/media-libs/libuvc/libuvc-0.0.6-r1.ebuild
+++ b/media-libs/libuvc/libuvc-0.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="A cross-platform library for USB video devices, built atop libusb"
 HOMEPAGE="https://int80k.com/libuvc/"
 SRC_URI="https://github.com/ktossell/libuvc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d82f104da965..f5665177273e 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -5,6 +5,6 @@ DIST mesa-20.3.0-rc3.tar.xz 14090140 BLAKE2B 8b02a580d54728337970b2e7de9130575b2
 EBUILD mesa-20.1.10.ebuild 14439 BLAKE2B 44180101e4e4c6692661cae16822ed29e292e86821df1361e733839bceeb8353883e5aff3893a91f5e09936aa8e5c0d2d14f8871f558c24590e61b78c6e8716a SHA512 d4474ce10d3cab18cc75ff5c0b9cfe2d05e0987e9c20a2a01ce2cf9873fac0b8e259fad1196327cf3426406e0a338ed326ff9309439af93403f458b104f0fde7
 EBUILD mesa-20.2.3.ebuild 14709 BLAKE2B f32b8f3f99197ad5e7a16393929ddccb1b6fb650dcf413587a74a497531b94ea7c3ba2f0490a32b37729e33271d100e52fa480c8b6422742a16e9ddb9d756911 SHA512 5223621eaf05a7f2b7500b8f31c1b0cf0a68b729c00a57527e741eb353aa57c65e1abffeb552bedf70012338beb7d49efdadd4847626cfbabbc89f59938dc5f2
 EBUILD mesa-20.3.0_rc2.ebuild 14785 BLAKE2B 13affc84aea9015a935438268bb2b71a5751026ad6cb903b37ad6ee52cc449129835a21231597b7f75227381bb90ecb4ec5f54bc272da98130e59642d51110dc SHA512 bc70799ecbcb81ed135354fcdca48f1fe50c35ebbbc0c48d162a70c9d700f7db49ec054dc5266dedeee0cc98d49e16f8a3486f5f50c5651b8344a17aa2509a0c
-EBUILD mesa-20.3.0_rc3.ebuild 14785 BLAKE2B 13affc84aea9015a935438268bb2b71a5751026ad6cb903b37ad6ee52cc449129835a21231597b7f75227381bb90ecb4ec5f54bc272da98130e59642d51110dc SHA512 bc70799ecbcb81ed135354fcdca48f1fe50c35ebbbc0c48d162a70c9d700f7db49ec054dc5266dedeee0cc98d49e16f8a3486f5f50c5651b8344a17aa2509a0c
-EBUILD mesa-9999.ebuild 14785 BLAKE2B 13affc84aea9015a935438268bb2b71a5751026ad6cb903b37ad6ee52cc449129835a21231597b7f75227381bb90ecb4ec5f54bc272da98130e59642d51110dc SHA512 bc70799ecbcb81ed135354fcdca48f1fe50c35ebbbc0c48d162a70c9d700f7db49ec054dc5266dedeee0cc98d49e16f8a3486f5f50c5651b8344a17aa2509a0c
+EBUILD mesa-20.3.0_rc3.ebuild 14870 BLAKE2B d452a46f513c463f8fad88190b65c58217a6ae33ab6b6ccda8853f312f13567b17e0007eba102687a2754cd7166d32e58befd23d70a3b06ffa16b146501d57e9 SHA512 437bc9fb1dcaea25cc459b1dbdc511ede535ba20562552c174d4b09e1c4cd83a00fa6c9162f1cc04967a77afe51e378c8f502ce15d177404580de244785bc771
+EBUILD mesa-9999.ebuild 14815 BLAKE2B bc7b9042aff49cdf9eb57c11af187bc4e39a48cd9210329023f370b3bcae84e6674a717025ab4538ab1ca15660e2669d110d3a5417faf6685fec1e601b54f01e SHA512 904910b88887f22501cc63f919024268494eae6b5da7585cde6619f0589f5c28217a0ff05090916947f0ae16fd06aa780c20f8b638c7a6848909320bca0d8981
 MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-20.3.0_rc3.ebuild b/media-libs/mesa/mesa-20.3.0_rc3.ebuild
index 1da56517de7e..17952ddce99e 100644
--- a/media-libs/mesa/mesa-20.3.0_rc3.ebuild
+++ b/media-libs/mesa/mesa-20.3.0_rc3.ebuild
@@ -372,6 +372,12 @@ multilib_src_configure() {
 	use wayland && platforms+=",wayland"
 	[[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
 
+	if use X || use egl; then
+		emesonargs+=(-Dglvnd=true)
+	else
+		emesonargs+=(-Dglvnd=false)
+	fi
+
 	if use gallium; then
 		emesonargs+=(
 			$(meson_feature llvm)
@@ -492,8 +498,7 @@ multilib_src_configure() {
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
-		-Dglvnd=true
-		-Dshared-glapi=true
+		-Dshared-glapi=enabled
 		$(meson_feature dri3)
 		$(meson_feature egl)
 		$(meson_feature gbm)
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 1da56517de7e..2e217a5233af 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -116,7 +116,6 @@ RDEPEND="
 	X? (
 		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
 		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
 		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
 		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
@@ -372,6 +371,12 @@ multilib_src_configure() {
 	use wayland && platforms+=",wayland"
 	[[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
 
+	if use X || use egl; then
+		emesonargs+=(-Dglvnd=true)
+	else
+		emesonargs+=(-Dglvnd=false)
+	fi
+
 	if use gallium; then
 		emesonargs+=(
 			$(meson_feature llvm)
@@ -492,8 +497,7 @@ multilib_src_configure() {
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
-		-Dglvnd=true
-		-Dshared-glapi=true
+		-Dshared-glapi=enabled
 		$(meson_feature dri3)
 		$(meson_feature egl)
 		$(meson_feature gbm)
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 8dedb352c584..2d492880078e 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,5 +1,7 @@
 AUX openimageio-1.8.17-boostpython.patch 1177 BLAKE2B 80946ef94801bf1a37cfd2930ae33bd3d331dafd458a3665e4ce28f4379143175edc6b1e096f44b51ef4a53551a5f5de52bfeb59aff990b45ad198d7b75b6e14 SHA512 4aae9f6078ff5877ca44e74c7047f0bfe279b7de6bd0c8b8dbf9f3d98b6bfde671e22e91cc66995527eb853e13917e3bb79be88987abe20570439ce57dda96c6
 AUX openimageio-2.2.6.1-pugixml.patch 919 BLAKE2B 3f10cf27a3a521fed3b95183119da62333f3103998ad463c58b9e654ce23faedb0551a34d564899882d586411035bb0531c844425fa639f6def8bba9c10afe6a SHA512 fc834e27b2b166367d9aa2b4016bac70de1561ff6babfd543a6bd503785bd84a251b76a95bf15dbc76367e9482dc4589f208f57a537c2dc430c7e0999cd98bcf
 DIST openimageio-2.2.8.0.tar.gz 29201949 BLAKE2B b77e42dddfaa6a8dff174b89e43c7de158efcae0e851037a97f1f46127f5cda458bdc7b64172c1fe64236d5ace351c9a432c2e857467c7f83b59dc9f6670fbeb SHA512 7bb94832734b4354d961003ec7f85fa30e4a69d7f825c5668a0230d857f8c137dd522730ec5089db012f0d843fc67368c731458a3d6de9ae41dabfb4cc30592e
-EBUILD openimageio-2.2.8.0.ebuild 3333 BLAKE2B 89179cf97ee4ecea05dcd854485c4eebd47c1b4efe42f8296d5d7afc9960ce6acc720affffb80a498df8ba20a63ba76b3963e89a34cff151191c72dd3214f6d3 SHA512 eed484e60fa85a4ecf7f4553f25459f24909e46f60fd97e21bbbedfbeec50bcd3787716ed05e05f5de9663b22b13376a2d08bf11b0c5bf57db35c7db49efb332
+DIST openimageio-2.2.9.0.tar.gz 29216767 BLAKE2B 92c17de4687d3d7390602a02dedc5afc1258018cef98e671977fb706c3fe1e80c30416fff89ff1b9936f0f1426eab0136e130efb4a41d7378d3f1eb77eab193a SHA512 d03500c5a9f4f1417c5629098254d1bbf032a17228898e5f087e4a5d0988f806537d3ab538366e64c51172568c3688389ab29b641fdaaf7208bf939cb859e06d
+EBUILD openimageio-2.2.8.0-r1.ebuild 3679 BLAKE2B 0d6b91115cefd79251cf73688fa76f0498074c5588604eaa02473730ea63bf69e54e498368847d7ef4cee2fc4325fc96ecdc0735a50de752e3ed48dd2a97022c SHA512 19406ec491d915c8f1385681ac1f06fe38dea58f075ef3de06f5e6ee0f3a65ecc834db3bfb2e8fe43db1d79df7fe14c185f28f4722d320876c6d6c1412e2a6b7
+EBUILD openimageio-2.2.9.0-r1.ebuild 3681 BLAKE2B fb434110b41fb72cef3ca045de9f2ca901f22c5360443de23096e2bdb6bbebf4a5ab992ebaa94f880405927a5cec73077c88f46c3bcdbea08e7a25fab6350c96 SHA512 d640bc9d6480a417c4c0192d2ffa745b306d3099488bc74522485ad09acc4fa2a5aabbc7d22a0feac3c8717ccafbb39cc60625a8d5f9f38153a3bd41c4653760
 MISC metadata.xml 922 BLAKE2B 4b63768455a06ac25a2845a1c4510ca33bd0eef4b2d4ddbb002fa2fc3c28fef6e1179d930281b8e3db91945e07e5df1b58677263cc500afa424778386ff5d095 SHA512 0ea0311d739c06c7d82b9e97deabcf9fd6330beebde039a9afbfeb742a7ff189bc498a7c77086bbc8c7be849037512bf98694537a8af98232b2eb3ee3a24ce9e
diff --git a/media-libs/openimageio/openimageio-2.2.8.0.ebuild b/media-libs/openimageio/openimageio-2.2.8.0-r1.ebuild
similarity index 89%
rename from media-libs/openimageio/openimageio-2.2.8.0.ebuild
rename to media-libs/openimageio/openimageio-2.2.8.0-r1.ebuild
index 934cf38bd1c8..78fe460252e6 100644
--- a/media-libs/openimageio/openimageio-2.2.8.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.8.0-r1.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=7
 
+FONT_PN=OpenImageIO
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake python-single-r1
+inherit cmake font python-single-r1
 
 DESCRIPTION="A library for reading and writing images"
 HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
@@ -112,6 +113,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DVERBOSE=ON
 		-DOIIO_BUILD_TESTS=OFF
+		-DINSTALL_FONTS=OFF
 		-DBUILD_DOCS=$(usex doc)
 		-DINSTALL_DOCS=$(usex doc)
 		-DSTOP_ON_WARNING=OFF
@@ -136,3 +138,18 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+src_install() {
+	cmake_src_install
+	# can't use font_src_install
+	# it does directory hierarchy recreation
+	FONT_S=(
+		"${S}/src/fonts/Droid_Sans"
+		"${S}/src/fonts/Droid_Sans_Mono"
+		"${S}/src/fonts/Droid_Serif"
+	)
+	insinto ${FONTDIR}
+	for dir in "${FONT_S[@]}"; do
+		doins "${dir}"/*.ttf
+	done
+}
diff --git a/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
new file mode 100644
index 000000000000..cdd096fdaca6
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake font python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/oiio-Release-${PV}"
+
+LICENSE="BSD"
+SLOT="0/2.2"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# test data in separate repo
+# second repo has no structure whatsoever
+RESTRICT="test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/ilmbase-2.2.0-r1:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	media-libs/opencolorio:=
+	>=media-libs/openexr-2.2.0-r2:=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	field3d? ( media-libs/Field3D:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl
+	)
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DVERBOSE=ON
+		-DOIIO_BUILD_TESTS=OFF
+		-DINSTALL_FONTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_DCMTK=$(usex dicom)
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FIELD3D=$(usex field3d)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENVDB=$(usex openvdb)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# can't use font_src_install
+	# it does directory hierarchy recreation
+	FONT_S=(
+		"${S}/src/fonts/Droid_Sans"
+		"${S}/src/fonts/Droid_Sans_Mono"
+		"${S}/src/fonts/Droid_Serif"
+	)
+	insinto ${FONTDIR}
+	for dir in "${FONT_S[@]}"; do
+		doins "${dir}"/*.ttf
+	done
+}
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index e0b8d68584f9..db4f2f71f2e7 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,4 +1,8 @@
 AUX osl-1.10.5-fix-install-shaders.patch 1333 BLAKE2B daf7970a05ccc2b08139c385caf9c2a9291d2f7db30b2ed1dab99d1d8da25ad5487edc7961a62809811eca45066eaa4bfa0524d0e9c9daa25489fb84be2965b2 SHA512 bc7d5e2c1306fa540d51f425d4b1303c5ad9ab624ba7f44d03ed9d8df77f36a71c334b05049d0a880cabe068947f7936258e3e52479334987b7ae68f55631cc4
 DIST osl-1.10.10.tar.gz 13549066 BLAKE2B d91360d4cde0e8f70e01aa5cbf14bd6dc30be47ba96d4f2206adb75ef8f14af6af43b00f025cbf9b9c03cfcf117380ee9bb0a93129c314b249151cd97135757b SHA512 10371d9aefa786fefbae15cb9c71d7360bd903a36734840f7d0a960a615d48096b7170596bd934d10579b33d8f8398fc0e00471a10cd517c1a4a601169b2ca13
+DIST osl-1.10.13.tar.gz 13551733 BLAKE2B 63b687ec46bd5334a7d0c00cfa5bf5243003e16adf2637fba648a75f98c10103c7c4b5fa1d091ab43b0929f85523b0fa79589eca56686490ee61c48069593767 SHA512 bc39fcf80878160807e35c52654a2993a7d33b3ab2fbf567ec50d0b23636a19064830afab5734f1e39276c77e843bbfe1d6b10a64fd4ebe69b17c8faa5378201
+DIST osl-1.11.9.0.tar.gz 14137334 BLAKE2B db68cb77d6af56e711b897371a4fe9386bf1a62625f9fa04012e9ec22346933fe3b0112301a8ad17ac6dd9c01c2a8e00c6d6e557d947870fd39bb3dec1443fd8 SHA512 f93bce0b29ff2da022372d81f2709c7db68e011c07c346b679c4b5ce05425f7eda8904779d7ea460817639e6be78a8c77272d71a3ffa8b068cfaab7572eb2e65
 EBUILD osl-1.10.10.ebuild 1903 BLAKE2B 80e44eeb35021b93feba3c9630e94da9167290691bccac7cef89f4df465cc6dc9e5d8e8a916fdd3fab623d60c5419a953f573458885022ee551019ad006549a3 SHA512 4ae380db765b81451e4f41c70a09aa5cbf9fb1017d98fcdd12010c25e8ef882b57ceda02edf0e4eb2ff8a8b7d1234ea8ca8a8c6dcdfaf4c5909c1a157d2e6fac
+EBUILD osl-1.10.13.ebuild 1983 BLAKE2B 79df4a848efc544dc5608f2e23a94e31ea9857a0a7ce543e7700520bcec40bc1b51a70574e5ef7fbcd09c669e065c75d222da67fe561fc62cc3c60114108458b SHA512 0c8ef1b17108362843555e0115abf4f48caa94e9580b60a051698f1d1c748ffdea0c70d255a2de4aac0df079bec30ebefd4400a064450ff35e0704dba6f3eaa2
+EBUILD osl-1.11.9.0.ebuild 2132 BLAKE2B a504079bb9e6f9541154a951e102cb4007425b65b54af4e4ac96e098f6f456c8f5a8aa4c26b77d715d90071bb4e12daee7372ed2cda14307217bc60bf6ab923d SHA512 cafdaef138efa8f53ffb84096055b61ab75ddb8c800319c51305cb158afd434cf43f8dbcc71faf3781107dbafe4c833d1ba746cf3140770224c1d7ecb04299ab
 MISC metadata.xml 810 BLAKE2B 85c4497ffc27bcf44682666135bebe083468c950618a5840fac008af4eca4dd902d371123d42f7ccfb3133e94dd2fbae22531d857e4e76bbafe10e55aa6b009b SHA512 cd69216183988e52c8224240263e162079510f264b7b277222dbc299316feb235dd51396351ca650298c4a890d8629ab38ab8ed75c198e8d60e117ed3a4a8b40
diff --git a/media-libs/osl/osl-1.10.13.ebuild b/media-libs/osl/osl-1.10.13.ebuild
new file mode 100644
index 000000000000..85fdd979a7fe
--- /dev/null
+++ b/media-libs/osl/osl-1.10.13.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake llvm toolchain-funcs
+
+# check this on updates
+LLVM_MAX_SLOT=10
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage"
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/10"
+KEYWORDS="~amd64 ~x86"
+
+X86_CPU_FEATURES=(
+	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*}"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/pugixml
+	media-libs/openexr:=
+	media-libs/openimageio:=
+	<sys-devel/clang-11:=
+	sys-libs/zlib
+	partio? ( media-libs/partio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.10.5-fix-install-shaders.patch"
+)
+
+# Restricting tests as Make file handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
+
+llvm_check_deps() {
+	has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_configure() {
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local gcc=$(tc-getCC)
+	# LLVM needs CPP11. Do not disable.
+	local mycmakeargs=(
+		-DCMAKE_CXX_STANDARD=14
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DENABLERTTI=OFF
+		-DINSTALL_DOCS=$(usex doc)
+		-DLLVM_STATIC=OFF
+		-DOSL_BUILD_TESTS=$(usex test)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_PARTIO=$(usex partio)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/osl/osl-1.11.9.0.ebuild b/media-libs/osl/osl-1.11.9.0.ebuild
new file mode 100644
index 000000000000..9ab4388c8dfd
--- /dev/null
+++ b/media-libs/osl/osl-1.11.9.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake llvm toolchain-funcs
+
+# check this on updates
+LLVM_MAX_SLOT=10
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage"
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/11"
+KEYWORDS="~amd64 ~x86"
+
+X86_CPU_FEATURES=(
+	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*}"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/pugixml
+	media-libs/openexr:=
+	media-libs/openimageio:=
+	<sys-devel/clang-11:=
+	sys-libs/zlib
+	partio? ( media-libs/partio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/pybind11
+"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=()
+
+CMAKE_REMOVE_MODULES_LIST=()
+
+# Restricting tests as Make file handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
+
+llvm_check_deps() {
+	has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_configure() {
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local gcc=$(tc-getCC)
+	# LLVM10+ needs CPP14+
+	local mycmakeargs=(
+		-DCMAKE_CXX_STANDARD=14
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DINSTALL_DOCS=$(usex doc)
+		-DLLVM_STATIC=OFF
+		-DLLVM_ROOT="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DOSL_BUILD_TESTS=$(usex test)
+		-DOSL_SHADER_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/shaders"
+		-DOSL_PTX_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/ptx"
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_PARTIO=$(usex partio)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/plib/Manifest b/media-libs/plib/Manifest
index ec301324ab8d..fd98ff1863c1 100644
--- a/media-libs/plib/Manifest
+++ b/media-libs/plib/Manifest
@@ -3,6 +3,5 @@ AUX plib-1.8.5-CVE-2012-4552.patch 1322 BLAKE2B 384a50a970012b7dd41bcb0362ee88ee
 AUX plib-1.8.5-X11-r1.patch 341 BLAKE2B 09ba1a92f54dfb6bd5ca3a11f6c7201819ccc7b1613e0cbddcfb90ae250d87b672d1738d854c9d546ec1d5d8ebf78b501e3dca9e41dc7e1f891b101e3c0ca23c SHA512 3222424f668ba4267d150034fc3ac67770501c543cdd7849c8eda4d491d7cb4d3120101c7d548a20d3122561f0f27e8fb0592773c736d7fbf4bc500121bf9dc3
 AUX plib-1.8.5-X11.patch 341 BLAKE2B b8d42813ff29c233c29183764d3d99ddafa123d418055014333713ac778951d0c671b196b35c7b1ac74fdabc29fb9f3bf87adc4f1b4f806d8e898d7f99802331 SHA512 1a605336ed46cdb7dca8b6f9eab488fd8fcf20a2beadcb70fc449d0ee6b2519b1658a9ca23b6c6a8285732dd4830bbf14ba2fb2ae47cd15a7ac431071e42d560
 DIST plib-1.8.5.tar.gz 779133 BLAKE2B a74a0693463b1bbf8a6ac6a34e3a689775ac892d19e0fe2ed955e0bd4af2eb2a7f55ac2dfe5dc105333a07f634dc74a4f6347e8bbd75d2fcc5b55733aefb133d SHA512 17154cc77243fe576c2bcbcb0285b98aef1a0634658f5473e95fe0ac8fa3ed477dbe5620e44ccf0b7cc616f812af0cd44d6fcbba0c563180d3b61c9d6f158e1d
-EBUILD plib-1.8.5-r1.ebuild 782 BLAKE2B 2418061653e841c61a6cb5874849636e60dd3f6ecc11f4c4fc3dafbd1a9490c4804b75e0bb54a2d54125e1ea6a62a47e77cfdc697f6c80835452f71f95c005a3 SHA512 ed05e1ed616fd53c057da8c8376006a4f10852b46eb589e30545ef2e14f88e468d5226b9366e923d8e79e521d1e22df50d66af83510a0f391ac5bff54aa2ee7e
 EBUILD plib-1.8.5-r2.ebuild 828 BLAKE2B b27bddb3996feb71f6f7f6021e8507e974e41d1874139e3f13fdf9c1ca43b628debbdf999857123c3ca9151ba75262d4cd8145dd564c6200d0496df85e7fa7b9 SHA512 ae4958b5ff7ee436565b4ed13e82804a26800ea2fc789f9ebfa1269c6b79bb589ce77cae206c594549893076b6a544a4233e8a6f3d3d1c19c525f042a615f24a
 MISC metadata.xml 327 BLAKE2B 65003679381c42a0e1bfecce661d9f264ac2117dbb071af263f480d349a9f1473acb191cfebd921036c598c1d5cf5d0d2e76851402d2dd4bf3cb58dfd18b3555 SHA512 63a4b8bd5cef9e67d1684542cc59b20d8276bc791a4d8293053f7be3fc276501c9d47c273c6b8a0a0d131e3842e93da4c02bde50315f642e6d742c87866f500a
diff --git a/media-libs/plib/plib-1.8.5-r1.ebuild b/media-libs/plib/plib-1.8.5-r1.ebuild
deleted file mode 100644
index 7e32e0e06693..000000000000
--- a/media-libs/plib/plib-1.8.5-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic eutils autotools
-
-DESCRIPTION="multimedia library used by many games"
-HOMEPAGE="http://plib.sourceforge.net/"
-SRC_URI="http://plib.sourceforge.net/dist/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc sparc x86"
-
-DEPEND="virtual/opengl"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-X11.patch \
-		"${FILESDIR}"/${P}-CVE-2011-4620.patch \
-		"${FILESDIR}"/${P}-CVE-2012-4552.patch
-
-	eautoreconf
-	# Since plib only provides static libraries, force
-	# building as PIC or plib is useless to amd64/etc...
-	append-flags -fPIC
-}
-
-src_install() {
-	default
-	dodoc AUTHORS ChangeLog KNOWN_BUGS NOTICE README* TODO*
-}
diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index 086316bf661e..1ca86e085e6c 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -11,6 +11,6 @@ AUX raspberrypi-userland-pkgconf-arm64.patch 1453 BLAKE2B 42dae98ead22bf8c37adae
 DIST raspberrypi-userland-0_pre20160424.tar.gz 32933952 BLAKE2B 4a2d40200a6a4d673be277a0958f768342a2777c28b14b4c7fcac1dbc9c59f2ef2485234f11fbd228aea6bbcf4982a3fd1d4825268af60be91665ea6fee6922d SHA512 04a71837b1247ecbbe479b3b09b5705638a9e576dc99a1ab2200727509195a4a2f2a9b184e3c23ce3933a3236b260afc8bd2b75bc218567b386445bdd8208a5b
 DIST raspberrypi-userland-0_pre20201022.tar.gz 32958590 BLAKE2B 01733a24822d80c5bf9aa3e0feefc3e9437390a465d7a4184d0a9c6a68446e91515d3d6d398ff516d9fd1bdcd4a885512d358a4ed1d24d9b94bdc72d81db84d3 SHA512 1813224068b8a8e569c874a8ffb354f1ac86e95b482caaad18b9703a187baaea60f1f87dfbb0c7e4b3cb2eb875abbcc82aedba410646a3c1df0208bd73aaf9f9
 EBUILD raspberrypi-userland-0_pre20160424.ebuild 3280 BLAKE2B 74a7ac7e2fdaa85c45c7a6352f8d30024e33d0b6c10740082447d874bab8e59d7a04d31351b7fe8a69d89cece234709e8444207c4d9960ab20ff08f12b2c1cc2 SHA512 f1fca6c1cf73336d482c4cd400667e22d6493402fa23389e62e40af86dc605af98dddee39b5f553fc33cc03c766f40b8009f41c8af004d540e28b01a8bb24ac1
-EBUILD raspberrypi-userland-0_pre20201022.ebuild 2165 BLAKE2B 11958652dcfbab355a9bd8187a8736f4f8ba2e0b71cb594eabcb1cf61173cf18344541463d21c22778ae39b158e681bb860efb0f3eab4c6495c538dc3ae2f4f1 SHA512 6d50e25e52580d0dbc4932329eae3f63f465bfebe1209b4832e80dccb7bd3ecd87b59b9c776d8c3b32f805a3a712ad57a673a21b75501599a11ed92412e62f65
+EBUILD raspberrypi-userland-0_pre20201022.ebuild 2164 BLAKE2B b56f0e567a8d0f21b6747815fb0bcc01daa59232d5e73632f75bd1e17910af30df4ca322be537f728749886de9e37f9250ed5140ed8b2dd93eb38a74c9e0c418 SHA512 80778a84eb2c7d06a922448ea9c926d0ca772b1589930ef0a05d3245aeb5b9f4231df211da7256c33c7afd8bd4022904d3029089264659ccb8c411ca71687360
 EBUILD raspberrypi-userland-9999.ebuild 2165 BLAKE2B 11958652dcfbab355a9bd8187a8736f4f8ba2e0b71cb594eabcb1cf61173cf18344541463d21c22778ae39b158e681bb860efb0f3eab4c6495c538dc3ae2f4f1 SHA512 6d50e25e52580d0dbc4932329eae3f63f465bfebe1209b4832e80dccb7bd3ecd87b59b9c776d8c3b32f805a3a712ad57a673a21b75501599a11ed92412e62f65
 MISC metadata.xml 351 BLAKE2B ba576d7f61b104574b6a6691584dd75e632a637ded0bce055a267822a86574e35a6d71f5bb3616939af1a964aa007cbe49fd5cf3b64939b387dc0d46d356fc82 SHA512 f0d9ddcb8e1e7df5ff767f33824c5f2b6ab5a9afc508e1d39864a046f2ffc05665011a1a08e2624dd41d6e1c150ed0d14ce888401cb5c52069eb4a8958d167e2
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
index 7fa3e5909284..788e267aecc7 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
@@ -17,7 +17,7 @@ else
 	# * Go to https://github.com/raspberrypi/userland/commits/master and find the full hash
 	GIT_COMMIT="e432bc3400401064e2d8affa5d1454aac2cf4a00"
 	SRC_URI="https://github.com/raspberrypi/userland/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~arm ~arm64"
+	KEYWORDS="arm ~arm64"
 	S="${WORKDIR}/userland-${GIT_COMMIT}"
 fi
 
diff --git a/media-libs/sdl-gfx/Manifest b/media-libs/sdl-gfx/Manifest
index d3d921b573e2..83af1d76eef5 100644
--- a/media-libs/sdl-gfx/Manifest
+++ b/media-libs/sdl-gfx/Manifest
@@ -1,6 +1,4 @@
-DIST SDL_gfx-2.0.25.tar.gz 1760656 BLAKE2B f0779c725529d52b675312a3f6fffac7581f2e3a6f609c433e0c1fc636a3f73660727ce8996764578dcb486252ceaf6064a6710a6b60a82fc3cc106097d2e7ab SHA512 42a5d78fe1a9b644d329fb688ed6c98558f8dd0aa029a1a0d99b1c59f94859269e0aef8f9e420b8018b687d8eae151652890be3994775644e1d3a80ba7b6fe8c
 DIST SDL_gfx-2.0.26.tar.gz 1771164 BLAKE2B 09556762bd9f3e19989d9db4117ec63deff466c015fe0d7b40595b8d3d0f2e7f17d142d101a1463a71144b6ee7700370513057f4f4753a4b4c605308cd42bc64 SHA512 e571caa0d7575683efd4cf8f0a41ab10f4acf913f9ece216ac823af11da22c8734fc2c0ea049009a3e1a53715e49622f5bfcfdbdafb95e5151990d0a4eb69c01
-EBUILD sdl-gfx-2.0.25.ebuild 1093 BLAKE2B da17fb59a9352bd2f274228aef2f782b86fff1b957df3e8c8e949e586c633759b97c7101e2b04f442b14388004120890457a708222b17d18cdc734431a842dbd SHA512 606aa7a5da5b4c8ff97030e289e7bc7f3c39ad08676a15dc1c7b9a3e5e9856a9226ff2b54ee4e38e83780fb3811033e6a6cf1f684ee32ee217892bab72d0cc76
 EBUILD sdl-gfx-2.0.26-r1.ebuild 1205 BLAKE2B c16b4bd22a9cff9db800c4e0a9496bf0ab0a7d27729cd4f6876b266c79fc60519a3a88245569ff7f5e0afcda4c585508b3877dec104367b48ecd73ee2035c353 SHA512 f5a723b7405eeb12d47fdbe06db5dbf92d6684dc93ea65ce364bb193e4684b9b71ebfdcfc91e1b4994b54b19eacb5c66ddce15242d04bd453793d9d9dbecc269
 EBUILD sdl-gfx-2.0.26.ebuild 1178 BLAKE2B 17142db946bbea88c24da66cc2d9408b22a2ee4bbdf0c04879498740709b6e77d6d042f7bd1038b5f7756f4b103039e7f761999c884a9dda019481d506ad07c7 SHA512 ae49f5ea61fe6616f4986b41bf8d719185dfd18802da0a1dea0def0718ff0d1793b9b5a21449014e4ebdac57e3968aadbf1452f0cfbdf3f2ea21eab9ffc81fdf
 MISC metadata.xml 913 BLAKE2B 24b8ef9a2b333c6df842a85ec91f6d3a70c4439ed6bcd829641b158d4fb6f100ac20134cba4b2b2e5732825730ed0a214f55b10ff38a328e6a004770b3d246a5 SHA512 495205062ad772f808daa2da58de9abf6ec504665e06ba9f38392bcae2b4ee343a935be43d5d82e56353d1b282c6e293a859d495f98face961f9c5921503c162
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
deleted file mode 100644
index 3baf22df87e0..000000000000
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils ltprune multilib-minimal
-
-MY_P="${P/sdl-/SDL_}"
-DESCRIPTION="Graphics drawing primitives library for SDL"
-HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/"
-SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc cpu_flags_x86_mmx static-libs"
-
-RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i -e 's/-O //' configure.in || die
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS ChangeLog README
-	use doc && dohtml -r Docs/*
-	prune_libtool_files
-}
diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index da63e07fbd82..5cdaf2f924eb 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -10,5 +10,5 @@ AUX urt-3.1b-solaris.patch 281 BLAKE2B 55cc8b4824624c5b9f6db6ff6e62c841950c22298
 AUX urt-3.1b-tempfile.patch 597 BLAKE2B 9f032e0b4dab232d4540a5e7043ff73ace2e6fcdc69e0b2ba1ecedc7f2b62902e0dfadaa78a2e1cddf6f0c173767afe36ee20af0a586072472c77d8f7d81212a SHA512 83784725f216d387771698b0f29c6d5b2bd5e79e5f6deb091905bbb87839824314217641df760cfb18ce87c9d58196860a4c9d12f08da6020fc80a2e7d40347f
 DIST urt-3.1b.tar.Z 1016405 BLAKE2B 68742773591e2ae28702efb4286939c4000d32edd93110548abc25ab62bfa85e36354f20de6aa74c805ea1c4c8dfa23219c9e6fb08e1c73d90d2625404583aa1 SHA512 6c9070cd106f1d696d22f862cc1c4e10325fafc7bae51e8bb1fb98f6bf8babe21a133e21b3acc0c11cf1b28a23123c8ee7bb064c9d86301b14a1c217fbe1a12d
 EBUILD urt-3.1b-r1.ebuild 2024 BLAKE2B 83ced9f74ef19a2c24d0c93f55f1eb8d58d7e6c9e963b7c25485ce5fdb5215e7ce4612ab47533f9d5fbf5d0283bda98d151a1371d3a8fd4ff65066d4cc77902b SHA512 7b71e6690bc1297c30550e54ae92b842748c3ad41a3a32ffd4faa05d60404c5c0b136f0332d24c9f0229a75465c675fd6fb488ea16ceea361d228fcc900fbcb4
-EBUILD urt-3.1b-r3.ebuild 2358 BLAKE2B e54f679e95e44661ad7e334196ac1a5a6631c0ca0b3da637540fe514a8b363ba941b69dbe43d9126495186d20edab9f0c2a152e1593fbdbb248f12a1d73aafd4 SHA512 dab0b1fcb0b8a6acf46b6763a4d86f8949d1b311bb66fa89bc77520b866b915e0ed286f3edbfafa342106b67a145836a9291f5aebbeff9c1d75ed67c0068a426
+EBUILD urt-3.1b-r3.ebuild 2357 BLAKE2B 60ae6422c256c1571671428300ae9782ac9893ea4b41ed0e8bf5967af997e58982c6d8202047abb5b7b80a327ed500298a0c796fe232a26c94e2ab1480611e0f SHA512 40a8c55f8f933290613aa2643bceabe572e89f0ff20f4b6fceb6c3d638ea661975b87c3975bf9a29ae211ca1edaef0d15fd8ad93e78be916fba8d6cb33f1e656
 MISC metadata.xml 219 BLAKE2B 5fa48553765105c349c2191a280c44bd60cd54219abd17acb444e50eb7d1a4d5c669847b048d3155746e8ccf74f3a7698c2b8dc040fff6b3d919dc36e1978638 SHA512 b1650774ef8d66b16dc9449ca934cfbfb5d130eea013dbfa961a060763ce1765a95330776b6334b954a55077149f2d089b8866bc4d06e69228f02262d8fe1d28
diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
index 04a75fb83a64..2b1a27b002de 100644
--- a/media-libs/urt/urt-3.1b-r3.ebuild
+++ b/media-libs/urt/urt-3.1b-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
 
 LICENSE="URT gif? ( free-noncomm )"
 SLOT="0/3.1b-r2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="gif postscript static-libs tiff tools X"
 
 RDEPEND="
diff --git a/media-libs/wxsvg/Manifest b/media-libs/wxsvg/Manifest
index 1aafe3c1a467..b5738a0bf96f 100644
--- a/media-libs/wxsvg/Manifest
+++ b/media-libs/wxsvg/Manifest
@@ -1,5 +1,3 @@
 DIST wxsvg-1.5.11.tar.bz2 514919 BLAKE2B d15d3478b69c4db4bd1cfc5032ff4909d35aca45f69694dbb74db72bc9d651fae3b8948382f60abd3f93a36dd4756f8f8f2c37acf7ac0b8859a9b03cb8cfda55 SHA512 d3538969bc0dda6bab740efef6952c2ca92e0ca74780c6370e3c6daf21d641e894b570d13b6ca408839b1b37df2aca9a3cf32d6423ddbf5f9f84274cfb1b8582
-DIST wxsvg-1.5.9.tar.bz2 512874 BLAKE2B a81099720e8835637ca82c7c0a3738dba36d16425982aba92f72f1427787e281260b3d06a972b0739d090610f8ab487e23f056f87284251c2a87a960666fb088 SHA512 eda51832dfa646cd4a681acdbbc1282b9d82d3a0571633c1212f89093ac23cad57f8f8e03fb7c35591b956a9b18c48852d439c44204830f1efd813549bc7eada
 EBUILD wxsvg-1.5.11.ebuild 922 BLAKE2B 087912d04790f4c465a1acd3f49055f82f48a2667558701222acc902e8c5fcb5c54ad84c9366ab6e7e75a4857cbfbfe4e408f46ee1d0f2dd1bda50879eeab30a SHA512 fb07aa53048ef08778ce42e170cf47c5c287323b451943b19f7a3b20ffff2a69da60db285f5b75ae84d11c27562ed2d3de5ddf97571fc73c66ca4e4d0c1917d5
-EBUILD wxsvg-1.5.9.ebuild 900 BLAKE2B f0ec7b3b0e58cde46e0f3166d50033ddd9af38e270c3c3ee995293ee7594996411c3ef6c3916a2465b7356d45779e8a499bc1e70d15bb2b5cf432a419eb75f59 SHA512 63dd3644b50cd6f41cf79374aaf350d7308595a8d1effc76e5f1f2e3194e387ea08267b3c5fa5db25f991c97eb75ab2df76f52efd82f99cef434487d90db5cf6
 MISC metadata.xml 336 BLAKE2B 178a381a2b4cf5e5ba3d7b81e721257a354bb098ba0c5c2f2d13b66e4e9163f89ed73ed2329101263076d51267e5e9ceb6764010f6b7a6901937f0a5121587f2 SHA512 01e85d6e1cb1a4a3a717cf79df29e4eed10fc1d21fd3e3d431e7f849acf2282c2a3c85b49b3af7ad84072faab77e35ef1a91409de3ad62a21c34d2d97cd6831e
diff --git a/media-libs/wxsvg/wxsvg-1.5.9.ebuild b/media-libs/wxsvg/wxsvg-1.5.9.ebuild
deleted file mode 100644
index 89506ea43f15..000000000000
--- a/media-libs/wxsvg/wxsvg-1.5.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-WX_GTK_VER=3.0
-inherit eutils ltprune wxwidgets
-
-DESCRIPTION="C++ library to create, manipulate and render SVG files"
-HOMEPAGE="http://wxsvg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="wxWinLL-3"
-SLOT="0/3" # based on SONAME of libwxsvg.so
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/expat-2:=
-	>=dev-libs/glib-2.28:2=
-	dev-libs/libxml2:=
-	media-libs/fontconfig:=
-	media-libs/freetype:2=
-	x11-libs/cairo:=
-	x11-libs/pango:=
-	x11-libs/wxGTK:${WX_GTK_VER}=[X]
-	>=media-video/ffmpeg-2.6:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog TODO )
-
-src_configure() {
-	need-wxwidgets base-unicode
-	econf \
-		$(use_enable static-libs static) \
-		--with-wx-config=${WX_CONFIG}
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 1000d9131ab7..6ca701743b04 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/xbmc-addon-xvdr/Manifest b/media-plugins/xbmc-addon-xvdr/Manifest
deleted file mode 100644
index 5afd1d52ccbd..000000000000
--- a/media-plugins/xbmc-addon-xvdr/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD xbmc-addon-xvdr-9999.ebuild 872 BLAKE2B 069c601fdf0bd8aa7fc3fc31981402d2bd32f971bd4b14956dd2047978c9d2eb21f2c929fbf2a6fa3abbf4a699424008506e01db3e1ebc496ae3aa6da1a8444f SHA512 35a43bb8ecd88572b10d9f06d4ce3e6d3c1c61040da0bfffd1338bb66d6c2fb66317a6d70e636312e720b14883203b48280ce39f7530f3979ad7a5b12d51c9b9
-MISC metadata.xml 337 BLAKE2B e12fff14117304efdefa91579ffebf4ddbaf0436bb66780b888a05182accedb7b3062a1447ff0f4cafa3fa05872195f3a8976be247ba1ccfa083835828b4804e SHA512 ddc8dfe63fa6764d72452b40f409c86c89530bc5dc29051bfbdf97dd5aaa8a8747ccf435813a74707420459ee1288b5661eea980e7ea7fe9d63cff827b48de77
diff --git a/media-plugins/xbmc-addon-xvdr/metadata.xml b/media-plugins/xbmc-addon-xvdr/metadata.xml
deleted file mode 100644
index 6a454981266d..000000000000
--- a/media-plugins/xbmc-addon-xvdr/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>vdr@gentoo.org</email>
-		<name>Gentoo VDR Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">pipelka/xbmc-addon-xvdr</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild b/media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild
deleted file mode 100644
index 8f64cf07d266..000000000000
--- a/media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib git-r3
-
-DESCRIPTION="XBMC addon: add VDR (http://www.tvdr.de/) as a TV/PVR Backend"
-HOMEPAGE="https://github.com/pipelka/xbmc-addon-xvdr"
-EGIT_REPO_URI="https://github.com/pipelka/xbmc-addon-xvdr.git"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	export STRIP=true
-	eautoreconf
-}
-
-src_configure() {
-	econf --prefix=/usr/$(get_libdir)/xbmc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
-
-pkg_info() {
-	einfo "This add-on requires the installed "media-lugins/vdr-xvdr" plugin on the VDR server."
-	einfo "VDR itself dosn't need any patches or modification to use all the current features."
-	einfo "IMPORTANT:"
-	einfo "Please disable *all* PVR addons *before* running the XVDR addon!"
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index dec17fe66b12..fd48a16c0571 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index f2480b5b0393..caa06fcab35e 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,4 +1,4 @@
 AUX envy24control-config-dir.patch 593 BLAKE2B 481ffd2bf81ce1e8fb0cd8ee1d40c398c54aec73ca705c26ea234915c47f2da7f48a71075612540ac42d4aaf91dfc43d23b08ec72c6598b25126b1771841e15e SHA512 267be12fb2d9d561cc2746317beaf5168362005cb98a55d3efe5741dcd974b088bfa049f2ed185919083fe2e24596eec67de2f2984da5369b9aa0eac983b5cef
 DIST alsa-tools-1.2.2.tar.bz2 1876266 BLAKE2B 2bfe4464869927f73b1059de9d972231b90af3be930e0e63048fcc40dadace0c842396e339874595f917b632fe407e16977a8b774240ffaf758004d42f46a27c SHA512 935d46ee3cc843566ccea183bcf7ea36439a4a6aa22964ebf6fd2722b78ec634d3be4e6a30b04c608abe6c5a132dd633f8343fff19f9d90a756d6699fc849a16
-EBUILD alsa-tools-1.2.2-r1.ebuild 3406 BLAKE2B 96ba11cb4d70c6231b0a1b41251969b343276ae6b6678a260b1b38c8c2ecfde681e2f6a97f1ed7b4032d234748d98e3f1858d282008d9d3e9b075de0042765a5 SHA512 4036014c982680d69f5d337f597d79d5e42ba4fb1ae88abfd866f996cc4b042dfc6f04621697c22b1990918491734ff4eb5eb15d3b18312ea182a92ea85e7d5b
+EBUILD alsa-tools-1.2.2-r1.ebuild 3413 BLAKE2B de2a4379b262ae815828dba0ade2ea67374a619c09946ca8fb56489fbef3ddb38490fc87d269ad694e696e0bfa49e3f11eb21964f024deed55dacfa0efb83fbd SHA512 8697d2e9a4245e20c7a44c4feccce91ec5506288a6171d1a765bd60683f3253a9535c70c21a024f57e4ec4eb25d1672470881f7584953ea7b9b3b98f19617f18
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
diff --git a/media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
index 6b7a409f24e1..4686591d3c14 100644
--- a/media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
 alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
diff --git a/media-sound/dcaenc/Manifest b/media-sound/dcaenc/Manifest
index 5057efbdce4e..32adebef1dc2 100644
--- a/media-sound/dcaenc/Manifest
+++ b/media-sound/dcaenc/Manifest
@@ -1,5 +1,4 @@
 DIST dcaenc-2.tar.gz 351199 BLAKE2B 28e0dae58650fcbd9f68823ca0aa2dde121b2376b488067c0977863a22fb83d5b60d04f907cd6b564824a25cb45f25180034d4f9fead12b57805b1c997133443 SHA512 0029f7c3b06199fb8100ce933827013fdc58e5fddf984ddf1744849e5d6cc24ce76e09b868eef19a49e1036a142419c3304c1822492f64301ed4feaa6bea4910
 EBUILD dcaenc-2-r1.ebuild 636 BLAKE2B 9208e2e735f9472192ef840a633cf7c2aa7ec7311ef4394b231ffdc41f78f3388dd9b6592fe0eb4c0f38c551d1ca0e65bd2e30afb11c6e45db70ca41eeb940b7 SHA512 465b3080cf779a327364377e9209374cb20126ce92f6823508909e957b6900af852497ccde32061fe6ca2e98450c24656d6e16da073c92b8cc6a80b03ca99d9f
-EBUILD dcaenc-2.ebuild 382 BLAKE2B cc49111e92ed4b00b570703f7975f1a293fcfc415f18d9a68fb260ad09aaf062a43ffe75fca8dd7ae939ea25e2b822937958f8232c268803612337d4f104133f SHA512 d31cd5534b436542753bd259a77abb9c8009639ad3272a2c1bcdfad5d873c112ae9211ab3544628d3571cf07d80d04a67ad0063662c309cb05438866a05d52e4
 EBUILD dcaenc-9999.ebuild 636 BLAKE2B 9208e2e735f9472192ef840a633cf7c2aa7ec7311ef4394b231ffdc41f78f3388dd9b6592fe0eb4c0f38c551d1ca0e65bd2e30afb11c6e45db70ca41eeb940b7 SHA512 465b3080cf779a327364377e9209374cb20126ce92f6823508909e957b6900af852497ccde32061fe6ca2e98450c24656d6e16da073c92b8cc6a80b03ca99d9f
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/dcaenc/dcaenc-2.ebuild b/media-sound/dcaenc/dcaenc-2.ebuild
deleted file mode 100644
index d07ff3684592..000000000000
--- a/media-sound/dcaenc/dcaenc-2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="DTS Coherent Acoustics audio encoder"
-HOMEPAGE="http://aepatrakov.narod.ru/index/0-2"
-SRC_URI="http://aepatrakov.narod.ru/olderfiles/1/${P}.tar.gz"
-LICENSE="LGPL-2.1+"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa"
-
-DEPEND="alsa? ( media-libs/alsa-lib )"
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 92bd63cebece..195ee77c4fd2 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -2,6 +2,6 @@ AUX jack2-1.9.14-fix-doc.patch 468 BLAKE2B 2062c7823ec928eec8374818409621991ef87
 DIST jack2-1.9.14.tar.gz 6495043 BLAKE2B 9ace1cef2c15c2894831c79bb8d73637df27a21462f654e04b7fb8fc05731e6df898aaefc343a9be4799bcd70576aa7397f2d48b7d2530b682f62463ce3d4a07 SHA512 ca9738fd5aadcb7e125f98a358437905959afebe0b792cab316fc31410e89ea3aefdb85154792a9d0a80fa988aa7eff379ff5c7ac6c4bfa1d57ad3d7de7b5fdd
 DIST jack2-1.9.16.tar.gz 974652 BLAKE2B ff20d57f544bd636d93e77c2c6dec3af3afbafe4a217ba480c66247ddb6d8ca60755fa55599240fdd75e8ce2c1f7d8fb4f1bf68de8a212268588245f35731ead SHA512 8e4717cad097806a436e3a7b7977faa65987ca0fe59fd285014d6207899c62f9abbb79474170d0e5a6e82d0dbfe998c1310b13c4de8cd68cea0a6935ba579fd1
 EBUILD jack2-1.9.14.ebuild 2428 BLAKE2B b400fa2fa9949fac29d1b01a5caa917370357c160c8f4336ff358df5f294d2a044ff1b81cb231b05239c0454e63c4f8d4ec7f6a42e579f62a383cd772c7b0b26 SHA512 514103873e13a1cbc5fb946d12e8dad8739b8b7a68cac4c9bea0825ca6fddd473e8afb5874b8bcb8e5462859fb921b6cffeaf3f16127c260b24099b4927d7b1b
-EBUILD jack2-1.9.16.ebuild 2446 BLAKE2B 458db801cca023bf6b148deedac1e1c736dd9bc7851c4070a36d5f2be3f476d3b87322948a48be8b33f7b8a9b69b28acaba97c488234e3df546e60fc52e02e9f SHA512 a20fb21cc8fa2e18efe1d4d83ec6a1b0a496882618d2996027782401ad583e716617fea707617351a97640f38db849241299e243d899f1dfb31c7234a927f840
+EBUILD jack2-1.9.16.ebuild 2442 BLAKE2B 55c4a81fd8fac7b697b2328cd321273691a5d7b6c43b1c683744049f8798eae3bf67f80cb5b7eeaaf0f53e79e13ae069d45388993535cbd6095e56f6ebac5576 SHA512 48501a6d3c2820fbcacccf03d6192f5f216a9696a80a326a4dd001e74928a04a32ae82fc2b7488acd32d3d2d18f771a2df68dc8a4a8879a70b9a324d2356ad35
 EBUILD jack2-9999.ebuild 2391 BLAKE2B 0387559dc6fe6026a6cf52f23c9b83f86e15171809973c4e2ea9ebc1a13b21ec6436de1e4e0bb2b1a72e5d543032bc54b708251e1b62e6c4b8938afbeccf1bd7 SHA512 d9bf79c776b8f58ea33197bf7f97f01904e08f7a85174e363c1d0e54d46ead8d72401b8ee8ab91ba6fe06fc9dece0ce33523a2007a82ef982228a0e4178efbd4
 MISC metadata.xml 557 BLAKE2B dea6632bcf5640a2863136ac154eb795b8f147edbe29656192311b2b28f4632d4b661ea90cd9cd282e165953aa8db71306e9fcc64efd6ad4f7450525e6817e0b SHA512 bfcbb285075e0459a3afe2cbc50505e51ec50b4509df0d10d521d15fa83a30e46548bd68cf23df00f43ef336979e6fd92ed27e5f8016fc9a28d80431df6e58f5
diff --git a/media-sound/jack2/jack2-1.9.16.ebuild b/media-sound/jack2/jack2-1.9.16.ebuild
index d0bf48e41848..967366114dbe 100644
--- a/media-sound/jack2/jack2-1.9.16.ebuild
+++ b/media-sound/jack2/jack2-1.9.16.ebuild
@@ -18,7 +18,7 @@ else
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 3a169a8685f0..5ff02111e013 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -3,6 +3,6 @@ DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc0
 DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
 EBUILD mumble-1.3.1-r1.ebuild 3812 BLAKE2B d17d1a107e33192f312fc6553ae1e1424e6956c2fd5b207250754877762dfd88522c2f1d8a5ce0d8766be8b3df485b619cc0916c31e47154cd1c209b816e746e SHA512 569d09b0cd7a4493f7a0b7b2e98abb39c67deaa3f24ef103d0fc1221d5a743e86c0ae9b3403ca8435e2ccce02ef5e225ff9887eaf48c4b3b669aacb0aefb91ba
 EBUILD mumble-1.3.2.ebuild 3816 BLAKE2B 873ba96b0f251c96a83aba14941a4b4b0964c367e87fee705b22b5f869398e4d3beec184f24a9365133cfd17f3131872bd514ec6d71b55c8a839bbe5cc128192 SHA512 a0b98e253c6a39b92b8acbf94842012b6e172cd778285d2e9fa70a6929357beac77539f3caa0552a4bd548c15187f61f9dbce6fbb6107fb291f09f5d2c14ec79
-EBUILD mumble-1.3.3.ebuild 3816 BLAKE2B 873ba96b0f251c96a83aba14941a4b4b0964c367e87fee705b22b5f869398e4d3beec184f24a9365133cfd17f3131872bd514ec6d71b55c8a839bbe5cc128192 SHA512 a0b98e253c6a39b92b8acbf94842012b6e172cd778285d2e9fa70a6929357beac77539f3caa0552a4bd548c15187f61f9dbce6fbb6107fb291f09f5d2c14ec79
+EBUILD mumble-1.3.3.ebuild 3815 BLAKE2B 3eb4984ef93cb6ee08a851c5d4a1713703ffe6560b40dc4fc5bb13f186bff4029cd45ab599543ea0f0f907bc1db6166b697da2e87916d8bf73f3692a54b20983 SHA512 3edc9ceea6e1a69cd2a111312007178405e26fbaad6f42299e4940d4c2e879e2530483a1c3dc7234d5407923052f5e1551236f067a0a25bfd9212f60c826fee1
 EBUILD mumble-9999.ebuild 3057 BLAKE2B 8e2614ae3c594f82c09860adaf34a9186874d44e78faec04a3c209d50f13985c4930e6cba0c700a1d65265bb96e67b2b5767ea7d6e4ea819995fbc09e5a232a5 SHA512 6cdb85d603f3b1303e1caef0369dda4e7b7ed8e09a70a72ddd5eb1e33bd21f9ce11c87899dee90ca99b3b832252215ec182676ca4fe2ec9a2ac08e6f0b797254
 MISC metadata.xml 596 BLAKE2B cfea5947f1ae0ed91141892278fb374619e4dcf17664e63f76fd61b60f75341534a7a6ad1602959b700696996ff46b6cf12eb2a652b1079f331f66e3dc4ad4e1 SHA512 aeeb4a05ebda91abcbc0ae8a52840d815d251d9c329a1cb06c7baf150eda8a4d0e10697569bef0adfb3a17eb2c59bd6b5d3db7e2c9c50c69f0e52e341fff454f
diff --git a/media-sound/mumble/mumble-1.3.3.ebuild b/media-sound/mumble/mumble-1.3.3.ebuild
index df7176498fdf..48c7aff21f57 100644
--- a/media-sound/mumble/mumble-1.3.3.ebuild
+++ b/media-sound/mumble/mumble-1.3.3.ebuild
@@ -21,7 +21,7 @@ else
 			https://dl.mumble.info/${MY_P}.tar.gz"
 		S="${WORKDIR}/${P/_*}"
 	fi
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="BSD MIT"
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index c32457ac1f65..9a7d3196c80b 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -7,6 +7,6 @@ DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc0
 DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
 EBUILD murmur-1.3.1.ebuild 3688 BLAKE2B 620347f0ed06e982ffa44509581b95706d0860f5b937e25c9afc51d4ae03f3272d2af323575e6234a582d6a4e0cf3a57fcebc5f80ad03392787b1e6b3b694206 SHA512 46bebc6ceadbdf18cb9ca26702da1d853436cd448e64c2dcfe0e51c88ab5314318259264b6f2c0d46c30d5cd1daebd94ad7af4b23145aa2d472cf67798e6fa57
 EBUILD murmur-1.3.2.ebuild 3690 BLAKE2B bc7a49642fd3389fc43fa5188c3bbb64d9818fefcbfe4bfd0920a79bf4128c88eee13f029ce79682874db637f51b012ab459424161edb6853b3ede252e90645a SHA512 d02b017155372a00c422bad3d79decb7563e857db1639cc80253d6e48cbfe0a412debf758009928611527305f52df928240c60f20abd11d35744da630b1f5101
-EBUILD murmur-1.3.3.ebuild 3690 BLAKE2B bc7a49642fd3389fc43fa5188c3bbb64d9818fefcbfe4bfd0920a79bf4128c88eee13f029ce79682874db637f51b012ab459424161edb6853b3ede252e90645a SHA512 d02b017155372a00c422bad3d79decb7563e857db1639cc80253d6e48cbfe0a412debf758009928611527305f52df928240c60f20abd11d35744da630b1f5101
+EBUILD murmur-1.3.3.ebuild 3689 BLAKE2B 26646b012d7c104a0dfec1f9829d1558c4a464b70bd6c906b7f32032a434a8e264a83c37ce6b63b581232acc9598d008e92915292de974ea7e9625e19c7eae19 SHA512 d8743685b61d4baa2bb72538dc3e05feb41c7bf7b01f76fa6a482eac5f5ca9906ba7aff4fd1fbed6d44117651f6f9eb72c5717d88e61065044ff78f93c9f7627
 EBUILD murmur-9999.ebuild 3748 BLAKE2B 220d4e0fd63cf2464fe0586938525c8c3c8c8b26f3b08c55d5c8e5dd4f9a7a996567fb28f7fb9bef6a602c3f041b743180445f0fd1024583dc68b4a81d472b23 SHA512 0cfb9421a3c7e389ea3dea6a536e49485fd586a6785d0813435165ece1401597b7e7858f6378bf1ca7793ddbdaecdbf9410e0bc5ffbdfcc13d392ba59156c404
 MISC metadata.xml 530 BLAKE2B a6618cb804deee82cf3f88ee683a5b406eee1317e9ca815f7f4e363a0e14c7c8cc2bcf4400d3a79b62f5652881e46be4405d0ac88afe610187419978ac57c9a6 SHA512 ef162d69805d3262f9f4f1732e9d8a031cac73e130f04013123d8f8e1d8e48132df243653ef2464bda1d8b8c0b88485fd32edaab8b3e62555a6295c676c1f5b5
diff --git a/media-sound/murmur/murmur-1.3.3.ebuild b/media-sound/murmur/murmur-1.3.3.ebuild
index 17d28a117c43..18faea156060 100644
--- a/media-sound/murmur/murmur-1.3.3.ebuild
+++ b/media-sound/murmur/murmur-1.3.3.ebuild
@@ -24,7 +24,7 @@ else
 			https://dl.mumble.info/${MY_P}.tar.gz"
 		S="${WORKDIR}/${MY_PN}-${PV/_*}"
 	fi
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm x86"
 fi
 
 LICENSE="BSD"
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 4efed7323cd6..669094789830 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -2,5 +2,5 @@ AUX qtractor-0.9.17-dont-compress-manpages.patch 701 BLAKE2B 2d36699ef29e21dc80b
 DIST qtractor-0.9.17.tar.gz 1934317 BLAKE2B 2cb387484203fcd6511a87364db9ed00d4d21452948abc0bad7d2775f022ab9a224537a8300a46ec220ddc497d071072456ed4e46a3e73c52954b5992bb1ba52 SHA512 9392eb594920be5c826613bfd75be93ac006a718c14256b20bf8d6af23f9316f56c801e5422548b9387ccfd4fe3ba926f1a01cacc2324eab1ca66255f02c9c93
 DIST qtractor-0.9.18.tar.gz 1937478 BLAKE2B 269d2fd9cdb3171155ba32d7af5d6c0ad0037287311d2e77efb706820071fde353c84ba6958c0c0fb75f3ecc22eea5e5f7204018d1503bbfb424f48aefc60150 SHA512 e488f95becde10117fc675a5b20b66378e8ae1f8c388fb12042cafa1f4434292d4156f5fe613b93e0c7409c414df9bf0e614afce843e0a42e4a1bce7c9ee9125
 EBUILD qtractor-0.9.17.ebuild 1545 BLAKE2B 0d644eb5ee0de071a1c9ad0e614557399d7ced7f895a48f1f312279a331bdbc9093e93c81ff4c187585dfdc6c77da4741c102b463bebf2eaf0dc9047e12e48dd SHA512 c1476707f35b119671865fecfefdd936c12e9e99050c2c1b247b0a373dfad29520bf8815d9dee027bec6a7e65721122e88620127490faa38ffc95a629beccca9
-EBUILD qtractor-0.9.18.ebuild 1555 BLAKE2B ec3f76ed0662ef927b6d4ea233a9cc733a6a241f9c9ef9438e2421a66aff059ae848a4c3510f3ce2dc5fb276e1bd0d86796f6943c16686a947c96dc39b9c8225 SHA512 1907bded7b038d5b7bac972acb96fa58525c4436b1606c008e477c0406a00f45ccffc9d477b8c3ba24772832cdb89327008f01f46964039970d75ea1fe3ceab1
+EBUILD qtractor-0.9.18.ebuild 1554 BLAKE2B e7da5338d7d357d755e7aa3261abff563f341a59e8e2a629e20a25d475bf8ed37a452dda93bf2f782139c999d6f42ca6ffde4459f389f84b409dc375ca79384c SHA512 b414593ea0e035e2a2b07b34367c53b9871b26fb87ca78c140ea2f4f59b68542ca437fea002f98024e7e0855600433ae671fc7281cd70257500176b774626d45
 MISC metadata.xml 860 BLAKE2B aa27e27262c24903643b09cced6d78b2e460d030ecfc420ea4f2feeb1056600e64a08ad4b750925a67a18fcb44929169cb2461f2a277713a5bc56948b83e28e3 SHA512 fe3eb53d21b4595741f6c7f8dd8b290012db53ad843727fde8df513b5c0b599f1964b6e0603c9ba152e683a0df68a332ccff4c2274409c17a1c0fe1e74949249
diff --git a/media-sound/qtractor/qtractor-0.9.18.ebuild b/media-sound/qtractor/qtractor-0.9.18.ebuild
index 1d009c34ea23..fb558a1b9bbf 100644
--- a/media-sound/qtractor/qtractor-0.9.18.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.18.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 libsamplerate mad osc rubberband vorbis zlib"
 
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 8b989e47f06f..0062db4913c1 100644
Binary files a/media-tv/Manifest.gz and b/media-tv/Manifest.gz differ
diff --git a/media-tv/w_scan/Manifest b/media-tv/w_scan/Manifest
index 6d4c4360c358..4c2c76a47435 100644
--- a/media-tv/w_scan/Manifest
+++ b/media-tv/w_scan/Manifest
@@ -2,5 +2,5 @@ AUX w_scan-20170107-fno-common.patch 911 BLAKE2B d41b1bdbd25f56789b48a045385810a
 DIST w_scan-20141122.tar.bz2 239277 BLAKE2B eb3afd5977d39ff7c8b4b0c5d85fd57b74cae47f330dd1769a33d3caec2688cd40f8d08c179867042a401db61dfc32494fe2eaed04c790bdb32424cc65ffa3b5 SHA512 64d8d92dd84a5c3cfae4531fbba683602e70597f83ec28c314ccce8810fed70685f03d3e4861d586c52764573e17e0b15881bbdb2f6c60db9d3686d554f1ee6d
 DIST w_scan-20170107.tar.bz2 245517 BLAKE2B 049d555f47935118be26f0bb8a8fc6baa43c273692ff6bc4c95ae912f00f1bda0e5834919c018539b1f891e436ec6556b29ad8c68d69de4a93911e5c7fb265b6 SHA512 c8e163b5e4897e2bc48596a1104974c79807432c423a3dd172e85c6ed6d4f9a4a471150ae7fe1b78fe570987e9fdee666a491700368c8499b03e9b13aa5cde6a
 EBUILD w_scan-20141122.ebuild 677 BLAKE2B 934e0f5e2affa3e77029c1c7b4fe0969e246ddbcde745f78103f2f0fd9c3334fc6a7cbf0be4ce81e03c06d98881be60602ab3cf3f6616ae585ab3b823a1e76d0 SHA512 85f5c1fd201ddee888461a6faf9439fffdd571018ee65bd00612d4f42e5a045e68112c29d9db9bf4f89cced66ed36c0f102b43eb199b910ab59a8073ff3fca7e
-EBUILD w_scan-20170107.ebuild 609 BLAKE2B b0a890af43e77de1d58ba0bb71b6a846d9fbeb3a371fc647c403c3f2c5eb8612181860c42b4044a7fa1fc3b83d238b0f1988e5036790c765a3a21f6bf5b3ea3c SHA512 d8b401faf350109ab18935d9c4b71ff6dda47f3ee298a0d5d545fc472841ce9215f3648dd04c2811da080af5db0f5490b69ce39c1aa3e5e2beffac6bc0f49b5a
+EBUILD w_scan-20170107.ebuild 608 BLAKE2B b995e427719cc079012ffd545582124039a0a3b4dc745819e7f91d06a48d3506357bfa134f8240cc33bd75359aa34879b919a0d596dc21f7ed754adbb396d1c9 SHA512 1539bf030a858165398afbc9fe77c2c193ca835ba58a27dc64a90ffccd7a53de74bee1f8ac497375ecbdd15cbcec15e8a0c3ed486d42f9f23a37e354d9a0fa5f
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-tv/w_scan/w_scan-20170107.ebuild b/media-tv/w_scan/w_scan-20170107.ebuild
index 926e92f2c2cb..504882ed1e14 100644
--- a/media-tv/w_scan/w_scan-20170107.ebuild
+++ b/media-tv/w_scan/w_scan-20170107.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://wirbel.htpc-forum.de/w_scan/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc examples"
 
 DEPEND=">=virtual/linuxtv-dvb-headers-5.8"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 1de2555ef171..8132086cc69c 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index 4f5dc6b05fa7..4785c83770ff 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -3,8 +3,6 @@ AUX gxine-0.5.905-fix-nspr-useage.patch 433 BLAKE2B 3605204a1fc0f4d3c52c0833bf70
 AUX gxine-0.5.906-endif.patch 349 BLAKE2B 55f916dda7abea59e4eb54c327ce299c9fb7b50c617a822fdfa23cc7c3062ec8e41433b681858b9adfaeaacd60776e7f4d560bc5df34025766ff2e8e4573ba03 SHA512 7bdea80e1ddc98621d76540cb4fc02e037ef85f2d9bd8d882701d5a2f408f038d23722ac5d57d309f46510358518a4b0ab812b4a67f8630d5c645b2b070f0d39
 AUX gxine-0.5.907-glib-2.31.patch 636 BLAKE2B 08e3839aa025bb88c398b78e65bdc5e0a9a11b106bd7a34ade7f6e95f8efc4c4522aea07891124b89f83db21ba2d657debb69cebcbdc776e5078f79e5496d04a SHA512 0b017254f4a7412ea243e7b8977c37170d18a005a98f9c8b8fea0113c7dc294e6c7c20719fc1a171093b0be7d672bcf0ccc18ea00699829ece327aca86cdc8a9
 AUX gxine-0.5.907-underlinking.patch 781 BLAKE2B 14a02ab58d17507486e43bb803f60b395ee0f617bdfea6924701774b8fd33cbd26217f34c1a6011d9b66e94d45d609952513dbf4eda1bf84fb76d0c74e5e8f44 SHA512 47775e2c06116505644eaeb13c91fa58ca289d133380857eade90e2e7b7520b1d7801626772d537621358676132202ac83d31ac4e0871ad07e1ce68d2b7b7610
-DIST gxine-0.5.907.tar.xz 910528 BLAKE2B 6c45e1b1d9819bdf9f51fbb3c8be5265144ae62f4e419eb4ab002b14c9705b48f943b28a67ff826a90e945679d487f16c9188ed45f26aa8fda0b0b45ddfe7657 SHA512 dd35c8a8810c233e81a28e9f10504645662d60dc9609451e7c49c5d516bb041b61a3b9c8f330021af1e527064cf3f62f37bde98402df7426f501d0c78c571045
 DIST gxine-0.5.909.tar.xz 928544 BLAKE2B 4b649aca2602eafb5931f5f869d00d9e50f8e23c416bba0a661d895630f70840591cd3286626fc024deb45fe1484d8f640c2fb1412f536b665e6ff6b8091ce40 SHA512 87e65bb87fa416535f76253e4394447c6cd7dfaaa209b76c07b9aa81aeca0ca09399991bb2be8e6928fa3883ff61b155e173610c6c28aab10f5b1487e0699215
-EBUILD gxine-0.5.907-r1.ebuild 2502 BLAKE2B 6cb7d5d4155e82094ca59db704105a9fb9e1367f21091f6f420c630bc395fa305e26f87ed81a51bf81b6ff6cb333e65d832112ba74def6bbf2982e498b3bfd93 SHA512 7796247639f723f8b15fb1001ecd8d80a131b93b165dca96aa5b4b7fbd0a1d8cf69d81a31556d5c2d54b3af4127bd8fd957ed88c123a599b65748c4498a25801
 EBUILD gxine-0.5.909.ebuild 2040 BLAKE2B 68a161a5a1639615b8d976df2e78ba22a969140377e3bce3d4f900617b5074875e87243f8e1c76efd0eb9741dc193e0ff52e0fd7733b4de13a8624109dbe057e SHA512 4705f92285382af777273ae36d77ea72fae400f3cdc82ec5b1b6c9e21bc13848da73e1b968aa444b1f791c9ebb1422739155241fa6a55999ea968e8784e30e4b
 MISC metadata.xml 305 BLAKE2B 0704c2d6ae4a0e249d693a63f719b4ec470a08e1cf1b64342571dad7514fd2a14616bf0812aa8f6a0732049c702ee3e00ab005c5b650723577526413c8337ad5 SHA512 396865e52e9dc380cbf6d3dbf33deb69877495356dc6c6a09ba35ab3062608a93e7ab3d5d22564192070ddc186f3a5ff9ceea639911cc554ca6db5084a413587
diff --git a/media-video/gxine/gxine-0.5.907-r1.ebuild b/media-video/gxine/gxine-0.5.907-r1.ebuild
deleted file mode 100644
index 105163c36e4e..000000000000
--- a/media-video/gxine/gxine-0.5.907-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils gnome2-utils multilib nsplugins xdg-utils
-
-DESCRIPTION="GTK+ Front-End for libxine"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="l10n_cs l10n_de lirc nls nsplugin udev +xcb xinerama"
-
-COMMON_DEPEND=">=media-libs/xine-lib-1.1.20
-	x11-libs/gtk+:2
-	>=dev-libs/glib-2
-	>=dev-lang/spidermonkey-1.8.2.15:0
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	lirc? ( app-misc/lirc )
-	nls? ( virtual/libintl )
-	nsplugin? ( dev-libs/nspr
-		x11-libs/libXaw
-		x11-libs/libXt )
-	udev? ( dev-libs/libgudev:= )
-	xcb? ( x11-libs/libxcb )
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	# ld: cannot find -ljs
-	sed -i -e '/JS_LIBS="`spidermonkey_locate_lib/s:js:mozjs:' m4/_js.m4 || die
-
-	if has_version '>=dev-lang/spidermonkey-1.8.7:0'; then
-		sed -i -e 's:mozjs185:mozjs187:' m4/_js.m4 || die #422983
-	fi
-
-	epatch \
-		"${FILESDIR}"/${PN}-0.5.905-desktop.patch \
-		"${FILESDIR}"/${PN}-0.5.905-fix-nspr-useage.patch \
-		"${FILESDIR}"/${PN}-0.5.906-endif.patch \
-		"${FILESDIR}"/${PN}-0.5.907-glib-2.31.patch \
-		"${FILESDIR}"/${PN}-0.5.907-underlinking.patch
-
-	# need to disable calling of xine-list when running without
-	# userpriv, otherwise we get sandbox violations (bug #233847)
-	if [[ ${EUID} == "0" ]]; then
-		sed -i -e 's:^XINE_LIST=.*$:XINE_LIST=:' configure.ac || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable lirc) \
-		--enable-watchdog \
-		$(use_with xcb) \
-		$(has_version '<dev-lang/spidermonkey-1.8.5' && echo --with-spidermonkey=/usr/include/js) \
-		$(use_with nsplugin browser-plugin) \
-		$(use_with udev gudev) \
-		--without-hal \
-		--without-dbus \
-		$(use_with xinerama)
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF} \
-		docsdir=/usr/share/doc/${PF} \
-		install
-
-	dodoc AUTHORS BUGS ChangeLog README{,_l10n} TODO
-
-	use l10n_cs && dodoc README.cs
-	use l10n_de && dodoc README.de
-
-	use nsplugin && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/harvid/Manifest b/media-video/harvid/Manifest
index b066279f8a88..5bd7abe1c633 100644
--- a/media-video/harvid/Manifest
+++ b/media-video/harvid/Manifest
@@ -1,11 +1,5 @@
 AUX ffmpeg29.patch 11613 BLAKE2B 3ec6dcdf43cfefc26ce9e0fb94f66bb33251430ac5636289726364cd6d7abb1e240d34b2d87fb1ffcd39110ef2bb01eb863d91ff71b1236f519310ca17c6fa5f SHA512 40ddf43ea18912ff8bcf73925ac846a4c96a2b4269f4bb1ca6cdc7a314070bea338c8a4a181018781a6036090c67a1622c1b7968ebad0be290e3a60ce01cba53
 AUX jpeg.patch 921 BLAKE2B 321213241c8160a5f06438f5740c795e69797858f33eab0a9a294cba7b006028f0f5d961d84f114b85089c3419c1c5dbcd137a7b213569a926af1f7a1dca0a91 SHA512 c9bc0f20f118955ed31feedbf24f10a3f988e658d2b248db9fdfdc23cabef1e68139ba6d532e0515fc7bb1830bc1c31d15799568a9871800f31fe27191794951
-DIST harvid-0.8.0.tar.gz 116079 BLAKE2B 17e92f9100d4874604d524b31d3bfd50f2b4f1bbd4d53ab82b05e65f4ff7d43176bad2cf57e197d54d4fb1281dc863d6afae50f8b312933014b92def51538dea SHA512 8e999e91e36708df7264fc351e5b6cac6c47fa5e0e612d0917bbfa02e98d13f9758f43312e6febebe56e7b8f2f72b80b6c47598de7100d3b5479b80720b91568
-DIST harvid-0.8.1.tar.gz 116277 BLAKE2B 1382625d241e63f3733817e57be4ad6cc57411aca6fbb7ba472e1b2959362fd384b1e2d1a35594656c30778fae4f54a1c89d1bb6565d006ad801e29c6d657d7d SHA512 b425eca844bb9eec3ec8caa324f783132a3e83938b258a5f8e92ce6dc47108ae491a009223b7e3c8051d965a1ff1b5e5509a804d1462641128a8524cde5ae60a
-DIST harvid-0.8.2.tar.gz 116541 BLAKE2B e3f82ad0b30fa0c1eefe84b85ba658c1897890d2b35aef355dfc029c26140ee5809a42d4e82a2ea515a277f4cc8cd24fdc032f6a42875bcddcb5bd4a77b6282a SHA512 fde352124008cd3d6230950c79a3a2b8d581803f952c7313c941226b00e80f8078053d941f2c5ead04672639a8db696f0c33482f69dab78187801d7ebce23fce
 DIST harvid-0.8.3.tar.gz 116446 BLAKE2B b245166ab2244a7afdddabb463296974c0d995d70ad8af6e93f549f045245597cb4ca3abf47c608eea15089ac5e6f82972b789d9a3f268b8be98f3080fd6e5e7 SHA512 748475602c7279f10790523cbd5cbf34c9cd283ca9e959ac0535fbb5b4ee6d2fcab976c5ddba3fa40862552b49d73df7145f36d26c9fe708063505812537a8ac
-EBUILD harvid-0.8.0.ebuild 961 BLAKE2B e4357dc555a4dbc0a071cdb1aacae0236f6fbf4bc95c9a7f036b0dc02a707aa6c10b68fdfd1f4c6ab32f17f89870b5b1899a7919308404ea3faee37b5efaf6c5 SHA512 77429081faeccf5bf2f36ee9e28ca972256eb2b85762bef355a478c11885885b9145ab4f34ea681186abdb6872554b61f15820361d8ebbfb40809ecd489ac43f
-EBUILD harvid-0.8.1.ebuild 905 BLAKE2B 025184861535e8073613e1be3a4daf26a534ee1ce84885c25ade482607bc3c511990755f5d81807dccc4f4bbabf9ab3cf7e32949fd76034ae105ff2431b79ed0 SHA512 a00c58f253a040b927198d96591229c660832b9406cd373e3cc45831a4ce691a19e2662468d8efc2caca2f30f4654a4ef4cd6a085936b5e12f88b7ddfb68e70f
-EBUILD harvid-0.8.2.ebuild 905 BLAKE2B 025184861535e8073613e1be3a4daf26a534ee1ce84885c25ade482607bc3c511990755f5d81807dccc4f4bbabf9ab3cf7e32949fd76034ae105ff2431b79ed0 SHA512 a00c58f253a040b927198d96591229c660832b9406cd373e3cc45831a4ce691a19e2662468d8efc2caca2f30f4654a4ef4cd6a085936b5e12f88b7ddfb68e70f
 EBUILD harvid-0.8.3-r1.ebuild 968 BLAKE2B b5ea60fdb804cca1dffd2cefd5becab6ed2bf18dcb8a46087fd6d23bbaa7d20cbcbe7c3ce4e8f672553ef25b7a3e592e16f11a6a5b5ad5346205ba86a1fc8e3d SHA512 5979b29c1632798d9efe1e6dbf9c2678ecc9dcec38d9b02891218814d542fcc424dc15013ebf1487360947d1a0c2f6049ce5295cf24a2dff87bf87a67df6017a
 MISC metadata.xml 306 BLAKE2B 5c1fba580f975a8cbd2247e002f0565de5a1f406f4361e312865e9e7b6fdd406a3e128fee109fddcf37b5978e865850a7de3abbe656f50d3c1642650d8f371f2 SHA512 4fa6b478e09481b73a9c1743c79b108e115a9452c31f3a37134d9ef939f4118c27690e9e7f33fcd0fa7a558d73840b84b944e14344d1ebffc10febc16cbf2315
diff --git a/media-video/harvid/harvid-0.8.0.ebuild b/media-video/harvid/harvid-0.8.0.ebuild
deleted file mode 100644
index 45de47a567e3..000000000000
--- a/media-video/harvid/harvid-0.8.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs multilib eutils
-
-DESCRIPTION="HTTP Ardour Video Daemon"
-HOMEPAGE="http://x42.github.io/harvid/"
-SRC_URI="https://github.com/x42/harvid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=media-video/ffmpeg-2.6:0=
-	media-libs/libpng:0=
-	virtual/jpeg:0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/ffmpeg29.patch"
-}
-
-hv_make() {
-	emake \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		STRIP="true" \
-		NM="$(tc-getNM) -B" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX:-/}usr" \
-		libdir="${EPREFIX:-/}usr/$(get_libdir)" \
-		hdocdir="${EPREFIX:-/}usr/share/doc/${PF}" \
-		"${@}"
-}
-
-src_compile() {
-	hv_make -C libharvid
-	hv_make -C src
-	hv_make
-}
-
-src_install() {
-	hv_make DESTDIR="${D}" install
-	dodoc ChangeLog README.md
-}
diff --git a/media-video/harvid/harvid-0.8.1.ebuild b/media-video/harvid/harvid-0.8.1.ebuild
deleted file mode 100644
index d7829ef1ef59..000000000000
--- a/media-video/harvid/harvid-0.8.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs multilib eutils
-
-DESCRIPTION="HTTP Ardour Video Daemon"
-HOMEPAGE="http://x42.github.io/harvid/"
-SRC_URI="https://github.com/x42/harvid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=media-video/ffmpeg-2.6:0=
-	media-libs/libpng:0=
-	virtual/jpeg:0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-hv_make() {
-	emake \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		STRIP="true" \
-		NM="$(tc-getNM) -B" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX:-/}usr" \
-		libdir="${EPREFIX:-/}usr/$(get_libdir)" \
-		hdocdir="${EPREFIX:-/}usr/share/doc/${PF}" \
-		"${@}"
-}
-
-src_compile() {
-	hv_make -C libharvid
-	hv_make -C src
-	hv_make
-}
-
-src_install() {
-	hv_make DESTDIR="${D}" install
-	dodoc ChangeLog README.md
-}
diff --git a/media-video/harvid/harvid-0.8.2.ebuild b/media-video/harvid/harvid-0.8.2.ebuild
deleted file mode 100644
index d7829ef1ef59..000000000000
--- a/media-video/harvid/harvid-0.8.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs multilib eutils
-
-DESCRIPTION="HTTP Ardour Video Daemon"
-HOMEPAGE="http://x42.github.io/harvid/"
-SRC_URI="https://github.com/x42/harvid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=media-video/ffmpeg-2.6:0=
-	media-libs/libpng:0=
-	virtual/jpeg:0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-hv_make() {
-	emake \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		STRIP="true" \
-		NM="$(tc-getNM) -B" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX:-/}usr" \
-		libdir="${EPREFIX:-/}usr/$(get_libdir)" \
-		hdocdir="${EPREFIX:-/}usr/share/doc/${PF}" \
-		"${@}"
-}
-
-src_compile() {
-	hv_make -C libharvid
-	hv_make -C src
-	hv_make
-}
-
-src_install() {
-	hv_make DESTDIR="${D}" install
-	dodoc ChangeLog README.md
-}
diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest
index 229cb1a82e74..8cebffd77a1c 100644
--- a/media-video/movit/Manifest
+++ b/media-video/movit/Manifest
@@ -1,8 +1,4 @@
 DIST gtest-1.7.0.zip 1164254 BLAKE2B ba8cf5dc336e3a6889b58922b62497cdac94d9f77bc5cbac3d72e4a88f33cbe572b6f61b5323acb7ea6dfc67f92c0ba231bedc5251c276831ea7a9e77ab6d570 SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07
-DIST movit-1.2.0.tar.gz 534145 BLAKE2B 6409bd2d1e85e21dbce00c36152275553594f0c9d809802b5f96e8b7e56c03ccda9588631c156e34da1d54962bbdbbd03d9e78c60062bc01a04896b7fd88410f SHA512 7c75ae60e2b5248e2691074d67005728555d6b7fea320ac9d7bcd401c1640467f18f78e446e57894d9b3b3b6a597ee0603ccdd963f21a408e96c7f0d0f5ac154
-DIST movit-1.6.1.tar.gz 870278 BLAKE2B 736b34cf4d5a9d9b59e56dc994d467ffc33e86c8bd04a8062362e76f4d7a4c973252a65258d6b29753942c0f320e778a4a1ae4484795b3129de779a51770f936 SHA512 36e425cc1bcfce9afd9124c696d95f2f6c74279161c178195d9f4d22a34acb1919aac5f51c29aa13b95d0a7343beacb41b1686fb4ad92acd136c6a25ccb4044d
 DIST movit-1.6.2.tar.gz 878822 BLAKE2B 02b1a5d9b05c944d0b39f93e6c4ea0ced26128e9067db91b93f47fdda154cb7650217a821b077742ae555e6464579f95ad7a5976bcfea319e3dd2d515add83c4 SHA512 005e75712fcb83b0e9c0301925afe2c87a6d99856e7c6fe6468c93de5cbdd633507179c79a7536bb7acb1246c71302d98a92289a0a618b07d920b4620fd6abc7
-EBUILD movit-1.2.0.ebuild 752 BLAKE2B de9c67e720f23eb67dc878061bf662a57d697becf1d999a9e44a5df663661562b4271c7efecaa7921e070ac82796598a6c6d9ad67f9fe1d7110d1734954d2fb3 SHA512 1c22573762ac2d6ee6a18afb2065c8d86447859073602c1dc55e9f892444914576bf8ad12e4f99db66100bf43634a58a48952f1bad124cce8600d3523972ad13
-EBUILD movit-1.6.1.ebuild 883 BLAKE2B b04c01d35eb333aaccae3ffb4594a5e35e12809db36a9a7f5626a57e55b9e8fa7cdd5b014e0528624ac144c1d078a228472e63779e4b620d48583294e961c0a5 SHA512 1022fdc6a6dd486bbe8399f602bc56bc15fe7b8dbfbb9dae2cbed855378c6ac87bb654fb090f8ffe54d43f24353a7aa4194f9ae1c2210507b6f2dccb17700ef5
 EBUILD movit-1.6.2.ebuild 887 BLAKE2B 06d30a4e51dc704ea362781c13ac182e6362261401e264e84b9db11324f59299d8d514f5e86aba68d3f929a195730856b9d94e901cad470a0625856bdbde45be SHA512 3c97c89885dd8df57944740809ca62b7bba0ad1316740615ecddc8998f9900a6df51f38b82acac7bc6b5680c3ff9daff1665076f164e9c2a66d767cb0cd8327f
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/media-video/movit/movit-1.2.0.ebuild b/media-video/movit/movit-1.2.0.ebuild
deleted file mode 100644
index 2559f5d8e549..000000000000
--- a/media-video/movit/movit-1.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# no sane way to use OpenGL from within tests?
-RESTRICT="test"
-
-DESCRIPTION="Modern Video Toolkit"
-HOMEPAGE="https://movit.sesse.net/"
-# Tests need gtest, makefile unconditionally builds tests, so ... yey!
-SRC_URI="https://movit.sesse.net/${P}.tar.gz
-	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="media-libs/mesa[X(+)]
-	>=dev-cpp/eigen-3.2.0:3
-	media-libs/libepoxy
-	sci-libs/fftw
-	media-libs/libsdl2
-	"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
-}
-
-src_test() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
-}
diff --git a/media-video/movit/movit-1.6.1.ebuild b/media-video/movit/movit-1.6.1.ebuild
deleted file mode 100644
index 0a66dbe65a8e..000000000000
--- a/media-video/movit/movit-1.6.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-# no sane way to use OpenGL from within tests?
-RESTRICT="test"
-
-DESCRIPTION="Modern Video Toolkit"
-HOMEPAGE="https://movit.sesse.net/"
-# Tests need gtest, makefile unconditionally builds tests, so ... yey!
-SRC_URI="https://movit.sesse.net/${P}.tar.gz
-	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/mesa[X(+)]
-	>=dev-cpp/eigen-3.2.0:3
-	media-libs/libepoxy
-	>=sci-libs/fftw-3
-	media-libs/libsdl2
-	"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf --disable-static
-}
-
-src_compile() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
-}
-
-src_test() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-video/mpeg-tools/Manifest b/media-video/mpeg-tools/Manifest
index ae1ed99efbd3..eb958a05f251 100644
--- a/media-video/mpeg-tools/Manifest
+++ b/media-video/mpeg-tools/Manifest
@@ -9,6 +9,5 @@ AUX mpeg-tools-1.5b-tempfile-convert.patch 4097 BLAKE2B f60e5bb386c468827024162c
 AUX mpeg-tools-1.5b-tempfile-mpeg-encode.patch 2538 BLAKE2B 4bbc67856c745ea320a6ae70e3ce43db54b044f360c00a94e84582d30d07eeb419dccf47d6b0ec47884004861751383531c119547c11707e924a9e537ee83f5b SHA512 229fcd4e28628fa8d45a20766e6b46bcf2e3a6ea9e69b2e8764b180b2766d539a701c64a7969a4020805a06188825c5fa5a5e1146052ee6a52edbb7d3d572f1e
 AUX mpeg-tools-1.5b-tempfile-tests.patch 5256 BLAKE2B bf52a2bc69f42af32cc6e0aecd910d6c37e12c0a9391d18dd4fff9e7304a99550b9c0a08c608aa6b3bfeda14166caeabb154c6ff7af7c4c307dc23796c46dfc5 SHA512 ee616fc5b4b4bf15e547d737a00a4349fff98127c5ec836e63ae5b6b3e365c50b6cba1c535fd27de2ce6ee28ef5bd3872f5d3b7880f39fe23c7e8ebdc24508e8
 DIST mpeg_encode-1.5b-src.tar.gz 2028724 BLAKE2B 6758a34bbc7a967311f710277b37d6f7612b9f4be429e0909d623b33ff83e7c10a8f7de9de3dcbc69080a23f6312b611315732eede649165873c50e92d53f639 SHA512 df6f9def3ba05c752ebdc5311c512688d6fae380480009dad55b4183a378685eca79943c075166b21ed3bfd0cce7697761abc6ec795f57c0ed1c60c2a5cba469
-EBUILD mpeg-tools-1.5b-r4.ebuild 1842 BLAKE2B a23ef178e3df72c6288aa236892fb4704f6b797f2edaf88d52e90682aac11f8bb28bb101be7ea77897e256a3b128581be0a51d6710bd86370115cb7bf4a0af64 SHA512 c8e87b1d6a4b1383903356b0d861ac856ca05ac14208ce3655b9f4339a451765515f9d4f6d4ba2ae9e7e5c06723ef987988b3e73e5235e4fcf876155fa91a7d4
 EBUILD mpeg-tools-1.5b-r5.ebuild 1788 BLAKE2B 9a8ca3d9486b3f0bdfb31411d8bbb4579b219f76b774e13b348b314c3460b213341a8bd77659610142b5f846df790b36bc7c4814fd19a46d76d14466ca9c4b22 SHA512 f2f00e951318bf3dc3e2a628320e6f3885e9fe604ea926a97f17fc8b367f2530c47b3e2d899a6148a2b0836b99da24442a5b8015f26e0cbc52088d24ca11b77c
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
deleted file mode 100644
index 70ceb15423d2..000000000000
--- a/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-MY_PN=mpeg_encode
-DESCRIPTION="Tools for MPEG video"
-HOMEPAGE="http://bmrc.berkeley.edu/research/mpeg/mpeg_encode.html"
-SRC_URI="ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/${MY_PN}-${PV}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	virtual/jpeg:0"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_PN}
-
-src_prepare() {
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-64bit_fixes.patch
-	epatch "${FILESDIR}"/${P}-tempfile-convert.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-powerpc.patch
-	cd "${S}"
-	rm -r jpeg
-	epatch "${FILESDIR}"/${P}-system-jpeg.patch
-	epatch "${FILESDIR}"/${P}-system-jpeg-7.patch
-	epatch "${FILESDIR}"/${P}-tempfile-mpeg-encode.patch
-	epatch "${FILESDIR}"/${P}-tempfile-tests.patch
-	# don't include malloc.h, but use stdlib.h instead
-	sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:' \
-		convert/*.c convert/mtv/*.c *.c headers/*.h || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-	emake -C convert CC="$(tc-getCC)"
-	emake -C convert/mtv CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin mpeg_encode
-	doman docs/*.1
-	dodoc BUGS CHANGES README TODO VERSION
-	dodoc docs/EXTENSIONS docs/INPUT.FORMAT docs/*.param docs/param-summary
-	docinto examples
-	dodoc examples/*
-
-	cd ../convert
-	dobin eyuvtojpeg jmovie2jpeg mpeg_demux mtv/movieToVid
-	newdoc README README.convert
-	newdoc mtv/README README.mtv
-}
-
-pkg_postinst() {
-	if [[ -z $(best_version media-libs/netpbm) ]]; then
-		elog "If you are looking for eyuvtoppm or ppmtoeyuv, please"
-		elog "emerge the netpbm package.  It has updated versions."
-	fi
-}
diff --git a/media-video/webcamoid/Manifest b/media-video/webcamoid/Manifest
index b4e059323633..5c09af4e8ade 100644
--- a/media-video/webcamoid/Manifest
+++ b/media-video/webcamoid/Manifest
@@ -2,5 +2,5 @@ AUX webcamoid-8.1.0-ffmpeg-4.patch 7369 BLAKE2B 64c7e45b9b8b29efe6982dff8205eb30
 DIST webcamoid-8.1.0.tar.gz 10062681 BLAKE2B e9501ace9ba42abdae4be4e9e689329b02796198fe2610ef3a404535d389a6aa7a7e540148548dd63ea6ba78c9b650b30f5497396e49b37d7ab06ca8708ad056 SHA512 6db53ed29288889c05955967d961b53fa0e4171aeed12cd1557829c26bb2e2031804319fcead4c5b888a695cfd84f531a27f992be56c38366076ff2945ec2dbb
 DIST webcamoid-8.7.1.tar.gz 8900338 BLAKE2B f379811cf9e44e67caa80c301c2774f13c686fa4721b5adc85dcd803ea97edb07073e53575c7dae8dab4ebfa0a9ee4f3691511cc7ddd6b55f84ae2cc77cd3c52 SHA512 b9a4b1dd4c863ab126e304eabce47c025ec0e3eb85a5b42035d26caa004399bde733913c0a5598ada3deb01673bd42ea54c9d2b06d300608582e63dda75d9bf6
 EBUILD webcamoid-8.1.0-r1.ebuild 2173 BLAKE2B 88a417bdc552eb7967c408a61530d5ed28f3f2b8939a67aa9f62d9503be42c217ce07bc5f3590a2a75cc6765ebbd54cab90c12e15147d1a89b4e7eeba709b7bb SHA512 1ca411734d92988a89b25fa4fe81dda185ce5f2676da6623b886941bbfec779f203f5896083f145327601f82f19b9132f43a416dfac86fb954289c5f2f2abdfc
-EBUILD webcamoid-8.7.1.ebuild 1579 BLAKE2B 412bb6fe657f6615c5c71955944335b5e3969c591932c57bbafa78a3d9740861ce06ddfd78ca0578994a80c1fa3f5c76d8c2b8b237395059da0bf7aff0c5f127 SHA512 b2e297c1d07aa4b77ef53d922acf142b6180bdff973872b4f41f9499a7c1fd672ea2f3fd2338a520386af4951df44bc78ab57bfa38364c1c04e880cde1ec5cfa
+EBUILD webcamoid-8.7.1.ebuild 1586 BLAKE2B 1e4d64b0bcf3ccab556890d5e1b4d05e57f7e7a52af1d2752a850f274a7b5686db1adf530705b05ff45f408724c3a62841aab96522b51351166dd45dbc7f1f96 SHA512 3527d48529234811384c36323290788cadd0a610ff53fea24d8defb36c8f031880f8fdc9fd6a12ff3406905386899aa07eb352de4c9f3f543ab9cbdec0b67fb4
 MISC metadata.xml 784 BLAKE2B ce617d4a9bcbf3f8e4ce651fd673bf3c0015e13bc8814d4b4e97eaa4a6c5428553d4a314054315fd3dc8a6b1362b4a322a4af78745f3c3d2378e2e731bdc9ef9 SHA512 6518965213e9deffdb6163243865c9e37ec0a14b6e83558761ff27ad7984003be1b6c6518d455631cd2af29f663b6e91f60dd061151e63b3a4f5ad73e35df5cf
diff --git a/media-video/webcamoid/webcamoid-8.7.1.ebuild b/media-video/webcamoid/webcamoid-8.7.1.ebuild
index fb51238ea518..e2492b146025 100644
--- a/media-video/webcamoid/webcamoid-8.7.1.ebuild
+++ b/media-video/webcamoid/webcamoid-8.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/webcamoid/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 IUSE_AVKYS=( alsa coreaudio ffmpeg gstreamer jack libuvc oss pulseaudio qtaudio v4lutils videoeffects )
 IUSE="${IUSE_AVKYS[@]} debug headers v4l"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index c3810cdda61e..66ed477f508a 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 aef36d43bd8a..55780ba8920e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 01 Dec 2020 06:38:41 +0000
+Thu, 03 Dec 2020 08:08:27 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index d683eeba589f..bf8322b0d2d0 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 490524 BLAKE2B be35a1d153e1ba81293ae8ab5c825660ca94c79791160c09b03110828197671a59a74fda786aa87df0a823f5f18368ee4bdb024182195c06d7785f78d4cdfc02 SHA512 92605b968213805888bbe32f28bff22d2b23ff8e28d68962bb98d751b39f639824fc3891bdf662b3c74e0cdbff6403326e6a81180cc9ca128519d4ae6770b3d7
-TIMESTAMP 2020-12-01T06:38:45Z
+TIMESTAMP 2020-12-03T08:08:31Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/F5PVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/InP9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC7IxAApBLJtZ1WqcK3naUTqQVqbQ+2tZVfOgpnmfWJDgPC4O+KeBnLgNkLXwKz
-DTnHZNrj9OZab2KEB3bV93yhdh/BUbTXB7iJJE3j3fIdRPYiEwM64Ra1ra2lZf/4
-N86Xmha0mMXplIiOgpUaW5CgCvD1PGDx9Be0JWM6Cp4WFG8pNZeicvdhqaf2vQMb
-LFFOV4EAX13R1zCR/sTNoP6LhSsB6ND/xiePMoXHSFbGKsNJGLU4VR7FSSQrZpXr
-P+pFXQS/Re7WT3OdMfWUW/XHvyBIuKuqmQBPFnuLhJQwXzZfOmCKlrMYayACKyls
-DwbvkIWreUBFWyC0iV7v/EPYrnLcLEHIUyjDL3IojPlwxGgUG3jRE1iOFPPlDIoD
-Y/rrmZ9USeBRtVQGUQglBJtGU1ocrK0NJM+sTpglyVL2nDZEu7QMJC+Wb1BWL2nE
-liFp1maSwfVByLrrm2g7FV3+9SZxQtV6AhYOrsMeHZRf1C6LcG+A8awr1USyrZJR
-227C2FRncdSTjlrIju0r9FrOt+tNniRArkQrPItnwZdxAHGFr/8kQgJUQchmtcA4
-3NXCsNp4FVv9jpFBOia2DMFyNVvpd+yUT8QSVe+GgZpXrEqYLFbgaw1bH3fVtplD
-lxDzutgjJbnJBYl9mllT2zMAypgdyMUMKhC0tQ+zVdFrpeLtSno=
-=MzIt
+klD1ghAAqWi3Kjj4TJSc3owMZB48G3fzVv1trHZNLkXIpZXS+WU0DVSe4OblqWIJ
+zw0l3M9u64oUz/ESISLfSmVZXwSruGLQLBGlx3eBQzUgtCfyDfgQaIs1wZ/Gp/dm
+LDGDwYRLAKnJglzmbhsjZmFEmcLjjBZoE4KuSArQJxBMArj2FUFmYgOWmCsbsvVx
++ArVRCuVzQo3lGAhGm1n3ZhxajAB8U//9mP7Ze4zYSnFQ7jx5Xgd3yorxr6xbv3S
+NDD88U9amH920l1BHULh0WbBXv8S8VDLnr9cy/7ccreZbac0I81Rmnv8MW0GBUTB
+SZ/F7wTn3q9vBiuIV0zcTUXGctv74QH2jltA80nJfK+9A9W4ls58toK2WqG0yoI9
+T7FC1dWKlDJVwGGpJUTG/l/5hvuWV4jcPh50VxAA/sc4zReZECZc/tFTePy+vwhe
+6v2cMz9zm2kpasQe8b22rrzoK1j9JIjPYWEQ4oWkQ8COGqsAei0g/f2QC5C1UZ1D
+HZPfogKpmjAqACXIYYMNKe0tzFV4ZRkRs/92TCdpBciRaojS1wso8zMBLe1vbT1s
+4dJLg7wZO1UckVAEasm+qhpVBEhR7h89zbzd9b87k2yzddwXV4dQLAHQR2BaTBb4
+VBQ0UyHXpOuILUnrGyRABq8DdDPjMgPLSsPk2vEaZBHa+k5d8cM=
+=oQJ2
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index aef36d43bd8a..d9a9c1c834ea 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 01 Dec 2020 06:38:41 +0000
+Thu, 03 Dec 2020 08:08:28 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index e6fe5bc1a8f9..8a0b462a839a 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index 7a534651b55b..288a10ef7a50 100644
Binary files a/metadata/md5-cache/acct-group/Manifest.gz and b/metadata/md5-cache/acct-group/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/gatling-0 b/metadata/md5-cache/acct-group/gatling-0-r1
similarity index 92%
rename from metadata/md5-cache/acct-group/gatling-0
rename to metadata/md5-cache/acct-group/gatling-0-r1
index 7586499ca60d..2a574cb5c78d 100644
--- a/metadata/md5-cache/acct-group/gatling-0
+++ b/metadata/md5-cache/acct-group/gatling-0-r1
@@ -4,4 +4,4 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
 _eclasses_=acct-group	c7c2102da2c8db70657be99a7add9c06	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=6fe47fbdf43f68c13e773668a257fa18
+_md5_=426bac7a57d9ec5838785e2dca0b83a7
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index 0e4652552dd8..ec95a469f75e 100644
Binary files a/metadata/md5-cache/acct-user/Manifest.gz and b/metadata/md5-cache/acct-user/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/gatling-0 b/metadata/md5-cache/acct-user/gatling-0-r1
similarity index 92%
rename from metadata/md5-cache/acct-user/gatling-0
rename to metadata/md5-cache/acct-user/gatling-0-r1
index 26d3d8dae073..233679e22818 100644
--- a/metadata/md5-cache/acct-user/gatling-0
+++ b/metadata/md5-cache/acct-user/gatling-0-r1
@@ -5,4 +5,4 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc
 RDEPEND=acct-group/gatling
 SLOT=0
 _eclasses_=acct-user	4e8cbda4e2f81e96d4113bcf7547e6ba	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=8ff4a4d2a132eedb7683cb226c9daad2
+_md5_=7dc2482ce98b65df3f73ac7cf1d2f107
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 2806f2e53e36..c8c31b165a31 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.0-r2 b/metadata/md5-cache/app-admin/ansible-2.10.0-r2
index 5e3f0daec3f7..ee2da06413ef 100644
--- a/metadata/md5-cache/app-admin/ansible-2.10.0-r2
+++ b/metadata/md5-cache/app-admin/ansible-2.10.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-2.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=21eed645e1e587711c59c9da9f37aaca
diff --git a/metadata/md5-cache/app-admin/ansible-2.10.1 b/metadata/md5-cache/app-admin/ansible-2.10.1
index c604717cbc6d..d4b63000036d 100644
--- a/metadata/md5-cache/app-admin/ansible-2.10.1
+++ b/metadata/md5-cache/app-admin/ansible-2.10.1
@@ -5,12 +5,12 @@ DESCRIPTION=Model-driven deployment, config management, and command execution fr
 EAPI=7
 HOMEPAGE=https://ansible.com/
 IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-2.10.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b0027fc0baf7f91687801934ec527681
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4ba2a32c6ffe8ac987c41c627a764a54
diff --git a/metadata/md5-cache/app-admin/ansible-9999 b/metadata/md5-cache/app-admin/ansible-9999
index 0994ac5534d2..3c67f837dcd2 100644
--- a/metadata/md5-cache/app-admin/ansible-9999
+++ b/metadata/md5-cache/app-admin/ansible-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6f2df48de80aa92913dc4aba0fec3d93
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.10.2 b/metadata/md5-cache/app-admin/ansible-base-2.10.2
index 33af824c660a..c8978f9492ee 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.10.2
+++ b/metadata/md5-cache/app-admin/ansible-base-2.10.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.ansible.com/ansible-base/ansible-base-2.10.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=34738fa5db2a606645fef3f583df80ea
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.10.3 b/metadata/md5-cache/app-admin/ansible-base-2.10.3
index c12ac1a991b0..24427b9dc6b7 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.10.3
+++ b/metadata/md5-cache/app-admin/ansible-base-2.10.3
@@ -5,12 +5,12 @@ DESCRIPTION=Model-driven deployment, config management, and command execution fr
 EAPI=7
 HOMEPAGE=https://ansible.com/
 IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh !<app-admin/ansible-2.10 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.ansible.com/ansible-base/ansible-base-2.10.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a3ec384909ee38d4bfd084cfe079320b
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1ce1c1cea329b6c9a5ff90054ef7d737
diff --git a/metadata/md5-cache/app-admin/ansible-cmdb-1.28 b/metadata/md5-cache/app-admin/ansible-cmdb-1.28
index 68d7a1376f79..5e51e92cebac 100644
--- a/metadata/md5-cache/app-admin/ansible-cmdb-1.28
+++ b/metadata/md5-cache/app-admin/ansible-cmdb-1.28
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mako[python_targets_python3_6(-)?,python_targets_python3_7(-)
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-cmdb/ansible-cmdb-1.28.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=098aba3025dbc9fe9d3d9609ce3bb71c
diff --git a/metadata/md5-cache/app-admin/ansible-lint-4.0.1 b/metadata/md5-cache/app-admin/ansible-lint-4.0.1
index c4fa3f317db3..e010dc3ae2da 100644
--- a/metadata/md5-cache/app-admin/ansible-lint-4.0.1
+++ b/metadata/md5-cache/app-admin/ansible-lint-4.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ansible/ansible-lint/archive/v4.0.1.tar.gz -> ansible-lint-4.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d658f6c517054d2e78be2df736673d65
diff --git a/metadata/md5-cache/app-admin/ansible-lint-4.1.0 b/metadata/md5-cache/app-admin/ansible-lint-4.1.0
index 0c92a3cc4570..325bedafc78e 100644
--- a/metadata/md5-cache/app-admin/ansible-lint-4.1.0
+++ b/metadata/md5-cache/app-admin/ansible-lint-4.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ansible/ansible-lint/archive/v4.1.0.tar.gz -> ansible-lint-4.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c5a5d6ae97d865e9611ddb47e71ab483
diff --git a/metadata/md5-cache/app-admin/cdist-6.9.2 b/metadata/md5-cache/app-admin/cdist-6.9.2
index 08e0fe9162b0..ed0fe7a7296d 100644
--- a/metadata/md5-cache/app-admin/cdist-6.9.2
+++ b/metadata/md5-cache/app-admin/cdist-6.9.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://code.ungleich.ch/ungleich-public/cdist/-/archive/6.9.2/cdist-6.9.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9b11085bdbeca6d5dc74e18b2549f5f9
diff --git a/metadata/md5-cache/app-admin/clsync-0.4.5 b/metadata/md5-cache/app-admin/clsync-0.4.5
index 30d29b0c7722..703b1b470e1c 100644
--- a/metadata/md5-cache/app-admin/clsync-0.4.5
+++ b/metadata/md5-cache/app-admin/clsync-0.4.5
@@ -5,11 +5,11 @@ DESCRIPTION=Live sync tool based on inotify, written in GNU C
 EAPI=7
 HOMEPAGE=https://github.com/clsync/clsync http://ut.mephi.ru/oss/clsync
 IUSE=apidoc +caps +clsync cluster control-socket cgroups doc debug examples extra-debug extra-hardened gio +hardened +highload-locks +inotify +lto mhash namespaces seccomp socket-library static-libs kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3+
 RDEPEND=caps? ( sys-libs/libcap ) cgroups? ( dev-libs/libcgroup ) clsync? ( dev-libs/glib:2 ) mhash? ( app-crypt/mhash ) !app-doc/clsync-docs !dev-libs/libclsync
 REQUIRED_USE=|| ( clsync socket-library ) || ( gio inotify ) mhash? ( cluster ) seccomp? ( caps )
 SLOT=0
 SRC_URI=https://github.com/clsync/clsync/archive/v0.4.5.tar.gz -> clsync-0.4.5.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e6ac99911a42b006dd217c9e3f0333e9
+_md5_=4e47e98ba228b13a2e663afc4708b2b1
diff --git a/metadata/md5-cache/app-admin/clustershell-1.8.3 b/metadata/md5-cache/app-admin/clustershell-1.8.3
index c092bbc4c3ab..51247a539982 100644
--- a/metadata/md5-cache/app-admin/clustershell-1.8.3
+++ b/metadata/md5-cache/app-admin/clustershell-1.8.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cea-hpc/clustershell/archive/v1.8.3.tar.gz -> clustershell-1.8.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5a9c9bff43344abda3ef6cdeca1a21e4
diff --git a/metadata/md5-cache/app-admin/diamond-4.0.515.20170311 b/metadata/md5-cache/app-admin/diamond-4.0.515.20170311
index 2095fd465e99..49dd898691e5 100644
--- a/metadata/md5-cache/app-admin/diamond-4.0.515.20170311
+++ b/metadata/md5-cache/app-admin/diamond-4.0.515.20170311
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-diamond/Diamond/archive/73207d04e0739a4ce92bc201b36681c42d9fa7e7.tar.gz -> python-diamond-4.0.515.20170311.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=47af476727a2453a6f1ad46df1be1b23
diff --git a/metadata/md5-cache/app-admin/diamond-4.0.515.20200620 b/metadata/md5-cache/app-admin/diamond-4.0.515.20200620
index 1ecb4f75e064..f19e1b4cd1b8 100644
--- a/metadata/md5-cache/app-admin/diamond-4.0.515.20200620
+++ b/metadata/md5-cache/app-admin/diamond-4.0.515.20200620
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grobian/Diamond/archive/8d8a2e49d80d44968a34d43e36c1d864695a29c1.tar.gz -> python-diamond-4.0.515.20200620.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5076a68521812883e67c3d784ec3166b
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-0.4.3 b/metadata/md5-cache/app-admin/eclean-kernel-0.4.3
index a157273c2e3b..ca57671709e1 100644
--- a/metadata/md5-cache/app-admin/eclean-kernel-0.4.3
+++ b/metadata/md5-cache/app-admin/eclean-kernel-0.4.3
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( dev-python/pymountboot[python_targets_python3_6(-)?,pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/eclean-kernel/archive/v0.4.3.tar.gz -> eclean-kernel-0.4.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=375a8dad77073e7f992ce2794db7f6ef
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-2.99.1 b/metadata/md5-cache/app-admin/eclean-kernel-2.99.1
index d95c6925515c..70e0aaf846cb 100644
--- a/metadata/md5-cache/app-admin/eclean-kernel-2.99.1
+++ b/metadata/md5-cache/app-admin/eclean-kernel-2.99.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/eclean-kernel/archive/v2.99.1.tar.gz -> eclean-kernel-2.99.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f48d1ab3e3ccf8ab8016e31dede3544c
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-2.99.2 b/metadata/md5-cache/app-admin/eclean-kernel-2.99.2
index 8bdbb94cd2fd..2bcc167deb25 100644
--- a/metadata/md5-cache/app-admin/eclean-kernel-2.99.2
+++ b/metadata/md5-cache/app-admin/eclean-kernel-2.99.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/eclean-kernel/archive/v2.99.2.tar.gz -> eclean-kernel-2.99.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5b2eb11b05ce3c067389983d4983063f
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-9999 b/metadata/md5-cache/app-admin/eclean-kernel-9999
index 3460ab8a5500..f550e899128e 100644
--- a/metadata/md5-cache/app-admin/eclean-kernel-9999
+++ b/metadata/md5-cache/app-admin/eclean-kernel-9999
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( dev-python/pymountboot[python_targets_python3_6(-)?,pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0fe65071927e082e8f67b449058fd19b
diff --git a/metadata/md5-cache/app-admin/gentoo-perl-helpers-0.4.0 b/metadata/md5-cache/app-admin/gentoo-perl-helpers-0.4.0
index 966ec775322f..c09e2ee22b46 100644
--- a/metadata/md5-cache/app-admin/gentoo-perl-helpers-0.4.0
+++ b/metadata/md5-cache/app-admin/gentoo-perl-helpers-0.4.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Introspection and Upgrade Assistance tools for Gentoo Perl
 EAPI=6
 HOMEPAGE=https://github.com/gentoo-perl/gentoo-perl-helpers
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-portage/portage-utils-0.80_pre20190620
 SLOT=0
 SRC_URI=https://github.com/gentoo-perl/gentoo-perl-helpers/releases/download/0.4.0/gentoo-perl-helpers-0.4.0.tar.xz mirror://gentoo/gentoo-perl-helpers-0.4.0.tar.xz https://dev.gentoo.org/~kentnl/distfiles/gentoo-perl-helpers-0.4.0.tar.xz
-_md5_=b86f9a5a6dfd08d3651ec6105541fffc
+_md5_=f8f8c88f123819d5b581e28e751784f2
diff --git a/metadata/md5-cache/app-admin/gixy-0.1.20 b/metadata/md5-cache/app-admin/gixy-0.1.20
index 6f092e56b86a..420266c9cbee 100644
--- a/metadata/md5-cache/app-admin/gixy-0.1.20
+++ b/metadata/md5-cache/app-admin/gixy-0.1.20
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yandex/gixy/archive/v0.1.20.tar.gz -> gixy-0.1.20.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7291b120ec2213b34fb2c76d3ba5152d
diff --git a/metadata/md5-cache/app-admin/glance-20.0.0 b/metadata/md5-cache/app-admin/glance-20.0.0
index 16aaa627352f..732852fdac64 100644
--- a/metadata/md5-cache/app-admin/glance-20.0.0
+++ b/metadata/md5-cache/app-admin/glance-20.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/glance/glance-20.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=788166a02ba329a9585177fb741772f5
diff --git a/metadata/md5-cache/app-admin/glance-20.0.1 b/metadata/md5-cache/app-admin/glance-20.0.1
index 3e71f04fdbe8..d918e68a35fd 100644
--- a/metadata/md5-cache/app-admin/glance-20.0.1
+++ b/metadata/md5-cache/app-admin/glance-20.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/glance/glance-20.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=264a79f6be8adcc4c6c426597297cb63
diff --git a/metadata/md5-cache/app-admin/glance-2020.1.9999 b/metadata/md5-cache/app-admin/glance-2020.1.9999
index 2d5b3de0d45e..d6cf80dba5f1 100644
--- a/metadata/md5-cache/app-admin/glance-2020.1.9999
+++ b/metadata/md5-cache/app-admin/glance-2020.1.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/defusedxml-0.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/eventlet-0.22.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.25.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/webob-1.8.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlparse-0.2.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/alembic-0.8.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/futurist-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/taskflow-2.16.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/WSME-0.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] <dev-python/prettytable-0.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-messaging-9.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-policy-2.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/retrying-1.2.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/retrying-1.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/glance_store-1.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cursive-0.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-win-3.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/castellan-0.17.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] acct-user/glance acct-group/glance python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5b3874013c5ed83210986b02e72d1904
diff --git a/metadata/md5-cache/app-admin/glance-2020.2.9999 b/metadata/md5-cache/app-admin/glance-2020.2.9999
index 8b572e547c20..41c174685563 100644
--- a/metadata/md5-cache/app-admin/glance-2020.2.9999
+++ b/metadata/md5-cache/app-admin/glance-2020.2.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/defusedxml-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-python/eventlet-0.25.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/webob-1.8.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlparse-0.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/alembic-0.8.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/httplib2-0.9.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/stevedore-3.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/futurist-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/taskflow-2.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/WSME-0.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/prettytable-0.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/prettytable-0.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-db-5.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/oslo-messaging-9.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-policy-2.4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/retrying-1.2.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/retrying-1.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/glance_store-2.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cursive-0.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-win-3.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/castellan-0.17.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] acct-user/glance acct-group/glance python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7823802a29674f82e04fea89fa97a3d0
diff --git a/metadata/md5-cache/app-admin/glance-21.0.0 b/metadata/md5-cache/app-admin/glance-21.0.0
index 601d5ad2e90a..ff2323d29338 100644
--- a/metadata/md5-cache/app-admin/glance-21.0.0
+++ b/metadata/md5-cache/app-admin/glance-21.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Services for discovering, registering, and retrieving VM images
 EAPI=7
 HOMEPAGE=https://launchpad.net/glance
 IUSE=mysql postgres +sqlite +swift python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/defusedxml-0.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-python/eventlet-0.25.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/webob-1.8.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlparse-0.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/alembic-0.8.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/httplib2-0.9.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/stevedore-3.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/futurist-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/taskflow-2.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/WSME-0.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/prettytable-0.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/prettytable-0.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-db-5.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/oslo-messaging-9.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-policy-2.4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/retrying-1.2.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/retrying-1.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/glance_store-2.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cursive-0.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-win-3.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/castellan-0.17.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] acct-user/glance acct-group/glance python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/glance/glance-21.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7823802a29674f82e04fea89fa97a3d0
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=25d107f05c297a3187e823959f7abf0e
diff --git a/metadata/md5-cache/app-admin/mongo-tools-100.2.0 b/metadata/md5-cache/app-admin/mongo-tools-100.2.0
index 620cf21cca59..5be7a6f12529 100644
--- a/metadata/md5-cache/app-admin/mongo-tools-100.2.0
+++ b/metadata/md5-cache/app-admin/mongo-tools-100.2.0
@@ -4,8 +4,8 @@ DESCRIPTION=A high-performance, open source, schema-free document-oriented datab
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
 IUSE=sasl ssl
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-tools/archive/100.2.0.tar.gz -> mongo-tools-100.2.0.tar.gz
-_md5_=79db2b3d13300a3f7510305debe55502
+_md5_=5bbdbda2e7010ee207cada9735033500
diff --git a/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201 b/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201
index 606acd4dc410..07cca3bb189c 100644
--- a/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201
+++ b/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/ngxtop-0.0.3_pre141201.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dc4c67461f60eb6d36463855a885a41b
diff --git a/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201-r1 b/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201-r1
index 9863e999faba..7f33b4f468cf 100644
--- a/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201-r1
+++ b/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/ngxtop-0.0.3_pre141201.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=731caa7fe831574ff2e17c25542c7c2a
diff --git a/metadata/md5-cache/app-admin/ps_mem-3.13-r1 b/metadata/md5-cache/app-admin/ps_mem-3.13-r1
index 722d36a1fa37..0c53d6701f9b 100644
--- a/metadata/md5-cache/app-admin/ps_mem-3.13-r1
+++ b/metadata/md5-cache/app-admin/ps_mem-3.13-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/pixelb/ps_mem/archive/9f54e1aa3a87ec176ce8b71f02673e0d8293b344.tar.gz -> ps_mem-3.13.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c1e4f9248f7f99b74172dbdb42bcb3b
diff --git a/metadata/md5-cache/app-admin/ps_mem-3.13_p20200417 b/metadata/md5-cache/app-admin/ps_mem-3.13_p20200417
index dbdaa1299c28..46dfd9cef14a 100644
--- a/metadata/md5-cache/app-admin/ps_mem-3.13_p20200417
+++ b/metadata/md5-cache/app-admin/ps_mem-3.13_p20200417
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/pixelb/ps_mem/archive/fc75a8cc3cda05c53a4ae4fe296deeb9fc43908d.tar.gz -> ps_mem-3.13_p20200417.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a1aae55b01839bbd19f067ba9155ed2a
diff --git a/metadata/md5-cache/app-admin/pwman3-0.10.0-r1 b/metadata/md5-cache/app-admin/pwman3-0.10.0-r1
index 91266ff62605..1e39a0dace74 100644
--- a/metadata/md5-cache/app-admin/pwman3-0.10.0-r1
+++ b/metadata/md5-cache/app-admin/pwman3-0.10.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwman3/pwman3/archive/v0.10.0.tar.gz -> pwman3-0.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2926dfaabc53743a97a3a407a16bf957
diff --git a/metadata/md5-cache/app-admin/pwman3-0.11.1 b/metadata/md5-cache/app-admin/pwman3-0.11.1
index 82544cc0b7a5..bcfc8c679cb8 100644
--- a/metadata/md5-cache/app-admin/pwman3-0.11.1
+++ b/metadata/md5-cache/app-admin/pwman3-0.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwman3/pwman3/archive/v0.11.1.tar.gz -> pwman3-0.11.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2926dfaabc53743a97a3a407a16bf957
diff --git a/metadata/md5-cache/app-admin/salt-2019.2.7 b/metadata/md5-cache/app-admin/salt-2019.2.7
index e41cee5cb765..10d4cd82ddff 100644
--- a/metadata/md5-cache/app-admin/salt-2019.2.7
+++ b/metadata/md5-cache/app-admin/salt-2019.2.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-2019.2.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a6297706e3d8c8a1af6b20483272e618
diff --git a/metadata/md5-cache/app-admin/salt-3000.5 b/metadata/md5-cache/app-admin/salt-3000.5
index c61946dbf7b0..9b71c93010ab 100644
--- a/metadata/md5-cache/app-admin/salt-3000.5
+++ b/metadata/md5-cache/app-admin/salt-3000.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_pyt
 RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3000.5.tar.gz https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=24cea62382510289419d6184c48c29c5
diff --git a/metadata/md5-cache/app-admin/salt-3001.3 b/metadata/md5-cache/app-admin/salt-3001.3
index 059a21b44454..f0c82d304ffd 100644
--- a/metadata/md5-cache/app-admin/salt-3001.3
+++ b/metadata/md5-cache/app-admin/salt-3001.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_pyt
 RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3001.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7cdf3e5b0453b63e1586ab73e9077110
diff --git a/metadata/md5-cache/app-admin/salt-3002.1 b/metadata/md5-cache/app-admin/salt-3002.1
index 52ca090f0430..baaf1bf4cb66 100644
--- a/metadata/md5-cache/app-admin/salt-3002.1
+++ b/metadata/md5-cache/app-admin/salt-3002.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_pyt
 RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3002.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=21f9777a8127a1d77bf4d47c46792330
diff --git a/metadata/md5-cache/app-admin/salt-3002.2 b/metadata/md5-cache/app-admin/salt-3002.2
index 820e05a881cc..4da3da9017fd 100644
--- a/metadata/md5-cache/app-admin/salt-3002.2
+++ b/metadata/md5-cache/app-admin/salt-3002.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_pyt
 RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3002.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=21f9777a8127a1d77bf4d47c46792330
diff --git a/metadata/md5-cache/app-admin/setools-4.2.2 b/metadata/md5-cache/app-admin/setools-4.2.2
index b38be7f5dca6..f06b709892cc 100644
--- a/metadata/md5-cache/app-admin/setools-4.2.2
+++ b/metadata/md5-cache/app-admin/setools-4.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/setools/releases/download/4.2.2/setools-4.2.2.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=af482a75286dfba4b2c3e41ed41ca2e2
diff --git a/metadata/md5-cache/app-admin/setools-4.3.0 b/metadata/md5-cache/app-admin/setools-4.3.0
index df2b58305938..995294d0ac08 100644
--- a/metadata/md5-cache/app-admin/setools-4.3.0
+++ b/metadata/md5-cache/app-admin/setools-4.3.0
@@ -5,12 +5,12 @@ DESCRIPTION=Policy Analysis Tools for SELinux
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/setools/wiki
 IUSE=X test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/networkx-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-libs/libsepol-2.8:= >=sys-libs/libselinux-2.8:= X? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/setools/releases/download/4.3.0/setools-4.3.0.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9549543a5ee3a1d3b10a7c436bcf625d
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d43a911d4d36b7a799fb3a62e8a150d7
diff --git a/metadata/md5-cache/app-admin/setools-9999 b/metadata/md5-cache/app-admin/setools-9999
index 9bbb4f190577..0a17729c827e 100644
--- a/metadata/md5-cache/app-admin/setools-9999
+++ b/metadata/md5-cache/app-admin/setools-9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9549543a5ee3a1d3b10a7c436bcf625d
diff --git a/metadata/md5-cache/app-admin/sshguard-2.4.1 b/metadata/md5-cache/app-admin/sshguard-2.4.1
index da12f0c1edbc..d60b7c130f8b 100644
--- a/metadata/md5-cache/app-admin/sshguard-2.4.1
+++ b/metadata/md5-cache/app-admin/sshguard-2.4.1
@@ -3,9 +3,9 @@ DEPEND=sys-devel/flex
 DESCRIPTION=protects hosts from brute force attacks against ssh
 EAPI=7
 HOMEPAGE=https://www.sshguard.net/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=virtual/logger
 SLOT=0
 SRC_URI=mirror://sourceforge/sshguard/sshguard-2.4.1.tar.gz
-_md5_=748be88fb5f69f2ecb2acd67478b93f4
+_md5_=d2cef24012dca5a6ebfab73e0386fbf8
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.4 b/metadata/md5-cache/app-admin/sudo-1.9.4
index 23cf24376eeb..ca6108b0f43f 100644
--- a/metadata/md5-cache/app-admin/sudo-1.9.4
+++ b/metadata/md5-cache/app-admin/sudo-1.9.4
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
 SLOT=0
 SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.4.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	226d8d2ff588bdfd7d188512dbdb189d	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d02e9c181c1cddd9eb7907e35cdb6f91
+_md5_=062546a59bc897f609ebce9aee4ef435
diff --git a/metadata/md5-cache/app-admin/supervisor-4.2.0 b/metadata/md5-cache/app-admin/supervisor-4.2.0
index 3c36b37dade6..042217ae656b 100644
--- a/metadata/md5-cache/app-admin/supervisor-4.2.0
+++ b/metadata/md5-cache/app-admin/supervisor-4.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-4.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=17ab715ddb40ce01fbd9ea8a6ed9bcef
diff --git a/metadata/md5-cache/app-admin/supervisor-4.2.1 b/metadata/md5-cache/app-admin/supervisor-4.2.1
index 9dc71664ba29..cd49ec6ce743 100644
--- a/metadata/md5-cache/app-admin/supervisor-4.2.1
+++ b/metadata/md5-cache/app-admin/supervisor-4.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-4.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fd51ef2c74d87760360bfe4c74b31a2a
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.55-r1 b/metadata/md5-cache/app-admin/webapp-config-1.55-r1
index 1684e17ac2cb..e6272398a94b 100644
--- a/metadata/md5-cache/app-admin/webapp-config-1.55-r1
+++ b/metadata/md5-cache/app-admin/webapp-config-1.55-r1
@@ -10,5 +10,5 @@ RDEPEND=portage? ( sys-apps/portage[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.55.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c914d80e42fbaf49365af767e052668
diff --git a/metadata/md5-cache/app-admin/webapp-config-9999 b/metadata/md5-cache/app-admin/webapp-config-9999
index b29e450d94ae..56da4f0a8100 100644
--- a/metadata/md5-cache/app-admin/webapp-config-9999
+++ b/metadata/md5-cache/app-admin/webapp-config-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=portage? ( sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d06bb2805aee7f7601d6f1d47c04488d
diff --git a/metadata/md5-cache/app-admin/xkcdpass-1.17.3-r1 b/metadata/md5-cache/app-admin/xkcdpass-1.17.3-r1
index 0d7cc5820664..0d2c294c8da1 100644
--- a/metadata/md5-cache/app-admin/xkcdpass-1.17.3-r1
+++ b/metadata/md5-cache/app-admin/xkcdpass-1.17.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xkcdpass/xkcdpass-1.17.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d6a9a00147db1e65e13d4c233c48da3d
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index d3430c8b8031..6747efce32e4 100644
Binary files a/metadata/md5-cache/app-antivirus/Manifest.gz and b/metadata/md5-cache/app-antivirus/Manifest.gz differ
diff --git a/metadata/md5-cache/app-antivirus/fangfrisch-1.2.0-r1 b/metadata/md5-cache/app-antivirus/fangfrisch-1.2.0-r1
index d1785e7b9bb2..5293f3098060 100644
--- a/metadata/md5-cache/app-antivirus/fangfrisch-1.2.0-r1
+++ b/metadata/md5-cache/app-antivirus/fangfrisch-1.2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/requests-2.22.0[python_targets_python3_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/rseichter/fangfrisch/archive/1.2.0.tar.gz -> fangfrisch-1.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=acbb7fa147975204e14a03c51245fd6c
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 74ceaba17025..5fe179ae8638 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/bloscpack-0.16.0 b/metadata/md5-cache/app-arch/bloscpack-0.16.0
index 41c10f5bcd92..9b2489d553e0 100644
--- a/metadata/md5-cache/app-arch/bloscpack-0.16.0
+++ b/metadata/md5-cache/app-arch/bloscpack-0.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bloscpack/bloscpack-0.16.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=603814f20002484377ef0cc7a2487e03
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.9-r1 b/metadata/md5-cache/app-arch/brotli-1.0.9-r1
index 44a49d9700ce..e0366955d1e5 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.9-r1
+++ b/metadata/md5-cache/app-arch/brotli-1.0.9-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 py
 RESTRICT=test
 SLOT=0/1
 SRC_URI=https://github.com/google/brotli/archive/v1.0.9.tar.gz -> brotli-1.0.9.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=159d9a09c4810495bb3b324d908a7afd
diff --git a/metadata/md5-cache/app-arch/brotli-9999 b/metadata/md5-cache/app-arch/brotli-9999
index fccf03a488e5..47ecdf1da4e3 100644
--- a/metadata/md5-cache/app-arch/brotli-9999
+++ b/metadata/md5-cache/app-arch/brotli-9999
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=efcdfb75a3dc5a098e78711e89570275
diff --git a/metadata/md5-cache/app-arch/libarchive-3.5.0 b/metadata/md5-cache/app-arch/libarchive-3.5.0
new file mode 100644
index 000000000000..92496e11dbad
--- /dev/null
+++ b/metadata/md5-cache/app-arch/libarchive-3.5.0
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !libressl? ( dev-libs/openssl: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(-)?] ) libressl? ( dev-libs/libressl: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(-)?] ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( app-arch/xz-utils[threads=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-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(-)?] ) nettle? ( dev-libs/nettle: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(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( virtual/os-headers e2fsprogs? ( sys-fs/e2fsprogs ) )
+DESCRIPTION=Multi-format archive and compression library
+EAPI=7
+HOMEPAGE=https://www.libarchive.org/
+IUSE=acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD BSD-2 BSD-4 public-domain
+RDEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !libressl? ( dev-libs/openssl: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(-)?] ) libressl? ( dev-libs/libressl: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(-)?] ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( app-arch/xz-utils[threads=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-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(-)?] ) nettle? ( dev-libs/nettle: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(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/13
+SRC_URI=https://www.libarchive.org/downloads/libarchive-3.5.0.tar.gz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1cf07b2edb6e19acaa9c48bbccc73d6b
diff --git a/metadata/md5-cache/app-arch/patool-1.12 b/metadata/md5-cache/app-arch/patool-1.12
index 1ff4e2fb0c88..13d137fc03dd 100644
--- a/metadata/md5-cache/app-arch/patool-1.12
+++ b/metadata/md5-cache/app-arch/patool-1.12
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/patool/patool-1.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=10a71454a182d682e1d7625210c5fa59
diff --git a/metadata/md5-cache/app-arch/tardelta-1.0.1 b/metadata/md5-cache/app-arch/tardelta-1.0.1
index be8bc32b88cb..47f3e3ea31c3 100644
--- a/metadata/md5-cache/app-arch/tardelta-1.0.1
+++ b/metadata/md5-cache/app-arch/tardelta-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/zmedico/tardelta/archive/1.0.1.tar.gz -> tardelta-1.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=49aef95e6007bffd6afe919fe86fc115
diff --git a/metadata/md5-cache/app-arch/unrpa-2.3.0 b/metadata/md5-cache/app-arch/unrpa-2.3.0
index 4a3db5f7a8c6..bbdd29e9f57a 100644
--- a/metadata/md5-cache/app-arch/unrpa-2.3.0
+++ b/metadata/md5-cache/app-arch/unrpa-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/Lattyware/unrpa/archive/2.3.0.tar.gz -> unrpa-2.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cc02654f2223ce11c976224fcc56088d
diff --git a/metadata/md5-cache/app-arch/vimball-0.5.1 b/metadata/md5-cache/app-arch/vimball-0.5.1
index 0e358f80f3b4..ab32e7b6b14d 100644
--- a/metadata/md5-cache/app-arch/vimball-0.5.1
+++ b/metadata/md5-cache/app-arch/vimball-0.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vimball/vimball-0.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5ee013e9320cc217469919de2e5e6273
diff --git a/metadata/md5-cache/app-arch/vimball-9999 b/metadata/md5-cache/app-arch/vimball-9999
index b029cbd0f01f..0ae3f16a724f 100644
--- a/metadata/md5-cache/app-arch/vimball-9999
+++ b/metadata/md5-cache/app-arch/vimball-9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d34bf13e54534830d8eecd522c1ecee7
diff --git a/metadata/md5-cache/app-arch/xarchiver-0.5.4.15 b/metadata/md5-cache/app-arch/xarchiver-0.5.4.15
index 3c607abd2ba3..292dcc33f9d0 100644
--- a/metadata/md5-cache/app-arch/xarchiver-0.5.4.15
+++ b/metadata/md5-cache/app-arch/xarchiver-0.5.4.15
@@ -5,10 +5,10 @@ DESCRIPTION=A GTK+ archive manager that can be used with Thunar
 EAPI=7
 HOMEPAGE=https://github.com/ib/xarchiver
 IUSE=doc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3= !!<app-arch/pigz-2.4[symlink]
 SLOT=0
 SRC_URI=https://github.com/ib/xarchiver/archive/0.5.4.15.tar.gz -> xarchiver-0.5.4.15.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4d1acff62e372c4c6cb622f61a789f51
+_md5_=f918265f07b2c224cb1f73e58af51af7
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index eba3986dc37b..2f92a4d7e38a 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/attic-0.16-r1 b/metadata/md5-cache/app-backup/attic-0.16-r1
index e5219652ac93..f165f0ce71b3 100644
--- a/metadata/md5-cache/app-backup/attic-0.16-r1
+++ b/metadata/md5-cache/app-backup/attic-0.16-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/msgpack[python_targets_python3_7(-)?,python_targets_python3_8
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jborg/attic/archive/0.16.tar.gz -> attic-0.16.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f94775749dbf74047b3455cc61cb649e
diff --git a/metadata/md5-cache/app-backup/attic-9999 b/metadata/md5-cache/app-backup/attic-9999
index c8bbb9dc02f4..1be6c8e63ece 100644
--- a/metadata/md5-cache/app-backup/attic-9999
+++ b/metadata/md5-cache/app-backup/attic-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/msgpack[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-python/llfuse[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f94775749dbf74047b3455cc61cb649e
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.1.11-r2 b/metadata/md5-cache/app-backup/borgbackup-1.1.11-r2
index c670f5cc750e..5643b6bd13a5 100644
--- a/metadata/md5-cache/app-backup/borgbackup-1.1.11-r2
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.11-r2
@@ -11,5 +11,5 @@ RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targ
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=045320a92237df61ad4b51846417b0dc
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.1.13 b/metadata/md5-cache/app-backup/borgbackup-1.1.13
index be363aadc333..d1b48755a9d5 100644
--- a/metadata/md5-cache/app-backup/borgbackup-1.1.13
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.13
@@ -11,5 +11,5 @@ RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targ
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.13.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ef480a1414665d8b5a37340e9fd8c550
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.1.14 b/metadata/md5-cache/app-backup/borgbackup-1.1.14
index e75835dd7a4a..81bf9e1a5116 100644
--- a/metadata/md5-cache/app-backup/borgbackup-1.1.14
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.14
@@ -11,5 +11,5 @@ RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targ
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.14.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a98a7e280702578f12dd09b21886a36a
diff --git a/metadata/md5-cache/app-backup/borgbackup-9999 b/metadata/md5-cache/app-backup/borgbackup-9999
index 39d9284a48ef..7f8df9e29586 100644
--- a/metadata/md5-cache/app-backup/borgbackup-9999
+++ b/metadata/md5-cache/app-backup/borgbackup-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a98a7e280702578f12dd09b21886a36a
diff --git a/metadata/md5-cache/app-backup/borgmatic-1.5.10 b/metadata/md5-cache/app-backup/borgmatic-1.5.10
index 83a89491bf44..8f211f2fcd3c 100644
--- a/metadata/md5-cache/app-backup/borgmatic-1.5.10
+++ b/metadata/md5-cache/app-backup/borgmatic-1.5.10
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.5.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ae0f84fac72ce73e768ebdf55a8a7263
diff --git a/metadata/md5-cache/app-backup/borgmatic-1.5.12 b/metadata/md5-cache/app-backup/borgmatic-1.5.12
index 804e656ea81f..09dcb5f76dfd 100644
--- a/metadata/md5-cache/app-backup/borgmatic-1.5.12
+++ b/metadata/md5-cache/app-backup/borgmatic-1.5.12
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.5.12.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=78911794534dcfa3e327b501b9475164
diff --git a/metadata/md5-cache/app-backup/borgweb-0.2.0-r2 b/metadata/md5-cache/app-backup/borgweb-0.2.0-r2
index 6fbed0c25adb..c912f7d5c01b 100644
--- a/metadata/md5-cache/app-backup/borgweb-0.2.0-r2
+++ b/metadata/md5-cache/app-backup/borgweb-0.2.0-r2
@@ -11,5 +11,5 @@ RDEPEND=app-backup/borgbackup[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgweb/borgweb-0.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=af980d43c14c8a018d0094d9d306cbf9
diff --git a/metadata/md5-cache/app-backup/borgweb-0.3.0 b/metadata/md5-cache/app-backup/borgweb-0.3.0
index 50627dba5b97..6bfb4ee509ac 100644
--- a/metadata/md5-cache/app-backup/borgweb-0.3.0
+++ b/metadata/md5-cache/app-backup/borgweb-0.3.0
@@ -11,5 +11,5 @@ RDEPEND=app-backup/borgbackup[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgweb/borgweb-0.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=af980d43c14c8a018d0094d9d306cbf9
diff --git a/metadata/md5-cache/app-backup/duplicity-0.8.15 b/metadata/md5-cache/app-backup/duplicity-0.8.15
index d78ef4231f69..b15f817d49a4 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.8.15
+++ b/metadata/md5-cache/app-backup/duplicity-0.8.15
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://code.launchpad.net/duplicity/0.8-series/0.8.15/+download/duplicity-0.8.15.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=90a5c2e03032bb5ad45315355cb94469
diff --git a/metadata/md5-cache/app-backup/duplicity-0.8.16 b/metadata/md5-cache/app-backup/duplicity-0.8.16
index 0165c32b68b3..21388b8d8434 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.8.16
+++ b/metadata/md5-cache/app-backup/duplicity-0.8.16
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://code.launchpad.net/duplicity/0.8-series/0.8.16/+download/duplicity-0.8.16.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7f9f68a1f21080e81553982d759417a7
diff --git a/metadata/md5-cache/app-backup/duplicity-0.8.17 b/metadata/md5-cache/app-backup/duplicity-0.8.17
index 23cf76cc8ac0..79d2103d7734 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.8.17
+++ b/metadata/md5-cache/app-backup/duplicity-0.8.17
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://code.launchpad.net/duplicity/0.8-series/0.8.17/+download/duplicity-0.8.17.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7f9f68a1f21080e81553982d759417a7
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-2.0.0 b/metadata/md5-cache/app-backup/rdiff-backup-2.0.0
index c0c34ddf566f..758970a6d7dd 100644
--- a/metadata/md5-cache/app-backup/rdiff-backup-2.0.0
+++ b/metadata/md5-cache/app-backup/rdiff-backup-2.0.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pylibacl[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/rdiff-backup/rdiff-backup/releases/download/v2.0.0/rdiff-backup-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8ab7d388ca79b9077f213ebf39e11171
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-2.0.5 b/metadata/md5-cache/app-backup/rdiff-backup-2.0.5
index 666b2472d23c..95ff3e049ee7 100644
--- a/metadata/md5-cache/app-backup/rdiff-backup-2.0.5
+++ b/metadata/md5-cache/app-backup/rdiff-backup-2.0.5
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pylibacl[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/rdiff-backup/rdiff-backup/releases/download/v2.0.5/rdiff-backup-2.0.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0dc741037fce6ee5340ddb83f9a5ae22
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1 b/metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
index 33491050c220..d0bf1721666b 100644
--- a/metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
+++ b/metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pylibacl[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/rdiff-backup/rdiff-backup/releases/download/v2.0.5/rdiff-backup-2.0.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ab1548b179ee5d7ab807956b390c6b7a
diff --git a/metadata/md5-cache/app-backup/untangle-https-backup-0.0.10-r1 b/metadata/md5-cache/app-backup/untangle-https-backup-0.0.10-r1
index 57d8e397e59e..ed7c46941596 100644
--- a/metadata/md5-cache/app-backup/untangle-https-backup-0.0.10-r1
+++ b/metadata/md5-cache/app-backup/untangle-https-backup-0.0.10-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=http://michael.orlitzky.com/code/releases/untangle-https-backup-0.0.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d6751fd3efa0026dd14f9a4a58f64fc7
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index d8abef155c25..5dc72ef3d68d 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/acme-1.10.0 b/metadata/md5-cache/app-crypt/acme-1.10.0
new file mode 100644
index 000000000000..67bfba640e20
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-1.10.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/cryptography-1.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.15.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=An implementation of the ACME protocol
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-1.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.15.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.10.0.tar.gz -> certbot-1.10.0.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d3aec71e9a9f708887b8360136f0c9db
diff --git a/metadata/md5-cache/app-crypt/acme-1.9.0 b/metadata/md5-cache/app-crypt/acme-1.9.0
index 810c4ce25a98..5ac502b4170b 100644
--- a/metadata/md5-cache/app-crypt/acme-1.9.0
+++ b/metadata/md5-cache/app-crypt/acme-1.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.9.0.tar.gz -> certbot-1.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=88e11433e83b95232ba4c978a828f0dc
diff --git a/metadata/md5-cache/app-crypt/acme-9999 b/metadata/md5-cache/app-crypt/acme-9999
index 173165a4f43c..e536e0f1d52c 100644
--- a/metadata/md5-cache/app-crypt/acme-9999
+++ b/metadata/md5-cache/app-crypt/acme-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/cryptography-1.3.4[python_targets_python3_6(-)?,python_targ
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3c79f4dbd37b6a53cde8718c29a419df
diff --git a/metadata/md5-cache/app-crypt/acme-tiny-4.1.0 b/metadata/md5-cache/app-crypt/acme-tiny-4.1.0
index 5f61fda9330b..519ba5ae985e 100644
--- a/metadata/md5-cache/app-crypt/acme-tiny-4.1.0
+++ b/metadata/md5-cache/app-crypt/acme-tiny-4.1.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/openssl:0 python_targets_python3_6? ( dev-lang/python:3.6 ) pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/diafygi/acme-tiny/archive/4.1.0.tar.gz -> acme-tiny-4.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=968633de854a4b406e3e2e8773afae74
diff --git a/metadata/md5-cache/app-crypt/acme-tiny-9999 b/metadata/md5-cache/app-crypt/acme-tiny-9999
index fde3b8c5e369..9c88d7686e63 100644
--- a/metadata/md5-cache/app-crypt/acme-tiny-9999
+++ b/metadata/md5-cache/app-crypt/acme-tiny-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/openssl:0 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f761527ef11b432ba64ca2dec9a11796
diff --git a/metadata/md5-cache/app-crypt/certbot-1.10.0 b/metadata/md5-cache/app-crypt/certbot-1.10.0
new file mode 100644
index 000000000000..8687adbb0441
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-1.10.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-1.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/configargparse-0.9.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-2.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distro-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/parsedatetime-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.10.0.tar.gz -> certbot-1.10.0.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1b591fa691cd3fcdfb52dd5fb977c9fc
diff --git a/metadata/md5-cache/app-crypt/certbot-1.9.0 b/metadata/md5-cache/app-crypt/certbot-1.9.0
index bae7f8700d68..89e07b594162 100644
--- a/metadata/md5-cache/app-crypt/certbot-1.9.0
+++ b/metadata/md5-cache/app-crypt/certbot-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/acme-1.8.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.9.0.tar.gz -> certbot-1.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9d623025c44b7976fded74912e67e3ee
diff --git a/metadata/md5-cache/app-crypt/certbot-9999 b/metadata/md5-cache/app-crypt/certbot-9999
index 9726a8495d20..985176a52fc6 100644
--- a/metadata/md5-cache/app-crypt/certbot-9999
+++ b/metadata/md5-cache/app-crypt/certbot-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=app-crypt/acme-1.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/configargparse-0.9.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/distro-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/parsedatetime-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9142ae085c0d45b37fa2dee53751e32b
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.10.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.10.0
new file mode 100644
index 000000000000..e7dd5007a7e6
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.10.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-augeas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.10.0.tar.gz -> certbot-1.10.0.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d85f33f4d62d7c72c8edd507739e2b33
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.9.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.9.0
index 6067a79bd242..875c869aef53 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-1.9.0
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.9.0.tar.gz -> certbot-1.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fb324a9c0ee2ef174b12b2008382ca76
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-9999 b/metadata/md5-cache/app-crypt/certbot-apache-9999
index df5dfebb2288..c702c7030d7f 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-9999
+++ b/metadata/md5-cache/app-crypt/certbot-apache-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-augeas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9c718e6edba0230678716e783e7f15f8
diff --git a/metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0-r1 b/metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0-r1
index 1e6e29e31b60..22c6074ac945 100644
--- a/metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0-r1
+++ b/metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/setuptools-1.0[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v0.39.0.tar.gz -> certbot-dns-nsone-0.39.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0e6c778cc56bb8df14174da6cdd435a8
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.10.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.10.0
new file mode 100644
index 000000000000..298cfc2abe1e
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.10.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyparsing-1.5.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.10.0.tar.gz -> certbot-1.10.0.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e9f230eb7c57c9cd33df9ca32911eaad
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.9.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.9.0
index a5cd0331f399..270cd89ee4fa 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-1.9.0
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/acme-1.4.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.9.0.tar.gz -> certbot-1.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e49869848dd670bc5783bb3bc1391f9c
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-9999 b/metadata/md5-cache/app-crypt/certbot-nginx-9999
index bea26dfc04ec..be8dd516c2cb 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-9999
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=app-crypt/acme-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyparsing-1.5.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b1d125567354906c41ba169406610d5e
diff --git a/metadata/md5-cache/app-crypt/glep63-check-9 b/metadata/md5-cache/app-crypt/glep63-check-9
index f79ce2793a0c..411a3bd3f8af 100644
--- a/metadata/md5-cache/app-crypt/glep63-check-9
+++ b/metadata/md5-cache/app-crypt/glep63-check-9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/glep63-check/archive/v9.tar.gz -> glep63-check-9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff4a2297a7e2768616c325e840e51850
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.13.0 b/metadata/md5-cache/app-crypt/gpgme-1.13.0
index 5d438c472f71..bb258f7931c3 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.13.0
+++ b/metadata/md5-cache/app-crypt/gpgme-1.13.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.0.2:= >=dev-libs/libgpg-error
 REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=1/11
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.13.0.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d968925ac6604b355894ff460e810f7b
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.13.0-r1 b/metadata/md5-cache/app-crypt/gpgme-1.13.0-r1
index 34634ad5d3ce..a50f12bc260e 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.13.0-r1
+++ b/metadata/md5-cache/app-crypt/gpgme-1.13.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error
 REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=1/11
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.13.0.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1baa486b9a6d015f2f80eca4253e28de
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.13.1 b/metadata/md5-cache/app-crypt/gpgme-1.13.1
index 2659c787fc90..4c66f190cef6 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.13.1
+++ b/metadata/md5-cache/app-crypt/gpgme-1.13.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error
 REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=1/11
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.13.1.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7dcb3fe7e346a29c7c5b2f97d6b9730d
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.14.0 b/metadata/md5-cache/app-crypt/gpgme-1.14.0
index 5a7158a5b2e9..ebfa52c2a8e7 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.14.0
+++ b/metadata/md5-cache/app-crypt/gpgme-1.14.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error
 REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=1/11
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.14.0.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ee6bf94290acd9658f55bf17dc85a27a
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.15.0 b/metadata/md5-cache/app-crypt/gpgme-1.15.0
index 7dc6300781b0..f1797c209a2e 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.15.0
+++ b/metadata/md5-cache/app-crypt/gpgme-1.15.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error
 REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=1/11
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.15.0.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=efb8060b89be2597d5b5cc6d415ec29d
diff --git a/metadata/md5-cache/app-crypt/openpgp-keys-django-20201201 b/metadata/md5-cache/app-crypt/openpgp-keys-django-20201201
new file mode 100644
index 000000000000..ea9988d10d09
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/openpgp-keys-django-20201201
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used to sign Django releases
+EAPI=7
+HOMEPAGE=https://www.djangoproject.com/download/
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://keys.openpgp.org/vks/v1/by-fingerprint/FE5FB63876A1D718A8C67556E17DF5C82B4F9D00 -> FE5FB63876A1D718A8C67556E17DF5C82B4F9D00.asc https://keybase.io/felixx/pgp_keys.asc?fingerprint=abb2c2a8cd01f1613618b70d2ef56372ba48cd1b -> ABB2C2A8CD01F1613618B70D2EF56372BA48CD1B.asc
+_md5_=ff97980623d580685e677fc1ccea121b
diff --git a/metadata/md5-cache/app-crypt/pius-3.0.0-r1 b/metadata/md5-cache/app-crypt/pius-3.0.0-r1
index 11aee7f1062e..eca6f1ca028f 100644
--- a/metadata/md5-cache/app-crypt/pius-3.0.0-r1
+++ b/metadata/md5-cache/app-crypt/pius-3.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jaymzh/pius/releases/download/v3.0.0/pius-3.0.0.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=73f77909a8dfd883ca2455053f9ff633
diff --git a/metadata/md5-cache/app-crypt/ssss-0.5.6 b/metadata/md5-cache/app-crypt/ssss-0.5.6
index 2c318f6d60f9..dc0120b68435 100644
--- a/metadata/md5-cache/app-crypt/ssss-0.5.6
+++ b/metadata/md5-cache/app-crypt/ssss-0.5.6
@@ -4,10 +4,10 @@ DEPEND=dev-libs/gmp:0=
 DESCRIPTION=Shamir's Secret Sharing Scheme
 EAPI=7
 HOMEPAGE=https://github.com/MrJoy/ssss
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0=
 SLOT=0
 SRC_URI=https://github.com/MrJoy/ssss/archive/releases/v0.5.6.tar.gz -> ssss-0.5.6.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4eed1f3039e0e1d15370e8cb26a8921d
+_md5_=a068ae571bb22afd6f0ef0929b2e9e02
diff --git a/metadata/md5-cache/app-crypt/swtpm-0.5.1-r1 b/metadata/md5-cache/app-crypt/swtpm-0.5.1-r1
index 9cff6f388be2..37b8b1dd0e2b 100644
--- a/metadata/md5-cache/app-crypt/swtpm-0.5.1-r1
+++ b/metadata/md5-cache/app-crypt/swtpm-0.5.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stefanberger/swtpm/archive/v0.5.1.tar.gz -> swtpm-0.5.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2a1506737cc03b3df7d382959d07f681
diff --git a/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.5.0 b/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.5.0
index f1f29fd8d17a..39f016a86da9 100644
--- a/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.5.0
+++ b/metadata/md5-cache/app-crypt/tpm2-pkcs11-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/tpm2-software/tpm2-pkcs11/releases/download/1.5.0/tpm2-pkcs11-1.5.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bbd045475e1e9e17aab48968e0b87274
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-3.1.0-r1 b/metadata/md5-cache/app-crypt/yubikey-manager-3.1.0-r1
index 7cb8a71d4cab..b3abedbef19d 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-3.1.0-r1
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-3.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-3.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=206b277b74860697d207684ec4dd244e
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-3.1.1-r1 b/metadata/md5-cache/app-crypt/yubikey-manager-3.1.1-r1
index 7e688b622841..41fe4781d6dc 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-3.1.1-r1
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-3.1.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-3.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2aa5accdeae9a4f5ff02f3c2db3bb8f8
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index d2b1b3aeb21c..ea4e3c1661c4 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/cppman-0.4.8-r2 b/metadata/md5-cache/app-doc/cppman-0.4.8-r2
index ff6925e5cdd3..378023334a61 100644
--- a/metadata/md5-cache/app-doc/cppman-0.4.8-r2
+++ b/metadata/md5-cache/app-doc/cppman-0.4.8-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/groff python_single_target_python3_6? ( dev-python/beautifulsou
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/aitjcize/cppman/archive/0.4.8.tar.gz -> cppman-0.4.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=388b9afd639b69076319d56bd0f8054b
diff --git a/metadata/md5-cache/app-doc/cppman-0.4.9 b/metadata/md5-cache/app-doc/cppman-0.4.9
index b7301f33a0f7..67a98a1f3821 100644
--- a/metadata/md5-cache/app-doc/cppman-0.4.9
+++ b/metadata/md5-cache/app-doc/cppman-0.4.9
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/groff python_single_target_python3_6? ( dev-python/beautifulsou
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/aitjcize/cppman/archive/0.4.9.tar.gz -> cppman-0.4.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=388b9afd639b69076319d56bd0f8054b
diff --git a/metadata/md5-cache/app-doc/mathjax-docs-2.7.7 b/metadata/md5-cache/app-doc/mathjax-docs-2.7.7
index 5856080fb4f9..97928a79988d 100644
--- a/metadata/md5-cache/app-doc/mathjax-docs-2.7.7
+++ b/metadata/md5-cache/app-doc/mathjax-docs-2.7.7
@@ -1,11 +1,11 @@
+BDEPEND=dev-python/sphinx dev-python/sphinx_rtd_theme
 DEFINED_PHASES=compile install prepare
-DEPEND=dev-python/sphinx
 DESCRIPTION=MathJax documentation
 EAPI=7
 HOMEPAGE=https://www.mathjax.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/mathjax/MathJax-docs/archive/9d711f40638202b02f2154d7f05ea35088ff9388.tar.gz -> mathjax-docs-2.7.7.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a9d9642e78b9ad7c92ca4b25ba2e2efe
+_md5_=371088fa5f6a2316e55890aa360f376a
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 3f86754a68b9..22e07dd890c3 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/nano-5.3-r1 b/metadata/md5-cache/app-editors/nano-5.3-r1
index dfb9c31644ec..1da841037094 100644
--- a/metadata/md5-cache/app-editors/nano-5.3-r1
+++ b/metadata/md5-cache/app-editors/nano-5.3-r1
@@ -5,11 +5,11 @@ 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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4d4e0f3ee1a1533b201d4fb8301cc4cb
+_md5_=ecd9e8a8bbf7b4d7cee19798372419cc
diff --git a/metadata/md5-cache/app-editors/nano-5.2 b/metadata/md5-cache/app-editors/nano-5.4
similarity index 84%
rename from metadata/md5-cache/app-editors/nano-5.2
rename to metadata/md5-cache/app-editors/nano-5.4
index 515b0fbbd559..e9e8408df78c 100644
--- a/metadata/md5-cache/app-editors/nano-5.2
+++ b/metadata/md5-cache/app-editors/nano-5.4
@@ -4,12 +4,12 @@ DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= mag
 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
+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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ) )
+REQUIRED_USE=!ncurses? ( slang? ( minimal ) ) magic? ( !minimal )
 SLOT=0
-SRC_URI=https://www.nano-editor.org/dist/v5/nano-5.2.tar.gz
+SRC_URI=https://www.nano-editor.org/dist/v5/nano-5.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bb4012add878cf4309752359a79664af
+_md5_=4d4e0f3ee1a1533b201d4fb8301cc4cb
diff --git a/metadata/md5-cache/app-editors/pluma-1.24.1 b/metadata/md5-cache/app-editors/pluma-1.24.1
index 018852f24724..2b623d0b6dcf 100644
--- a/metadata/md5-cache/app-editors/pluma-1.24.1
+++ b/metadata/md5-cache/app-editors/pluma-1.24.1
@@ -4,7 +4,7 @@ DESCRIPTION=Pluma text editor for the MATE desktop
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
 IUSE=+introspection spell test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-libs/libxml2-2.5:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/gtksourceview-3.0.0:3.0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libSM-1.0 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) spell? ( >=app-text/enchant-1.6:= >=app-text/iso-codes-0.35 ) !!app-editors/mate-text-editor >=mate-base/mate-desktop-1.9[introspection?] virtual/libintl
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/pluma-1.24.1.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a248613733727ca14e1b858afa6d634b
+_md5_=9b4510311b7d60a65c2a28227ef53072
diff --git a/metadata/md5-cache/app-editors/pyvim-3.0.2 b/metadata/md5-cache/app-editors/pyvim-3.0.2
index fe21629a0d90..46e9a63558fc 100644
--- a/metadata/md5-cache/app-editors/pyvim-3.0.2
+++ b/metadata/md5-cache/app-editors/pyvim-3.0.2
@@ -10,5 +10,5 @@ RDEPEND=app-eselect/eselect-vi dev-python/six[python_targets_python3_7(-)?,pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyvim/pyvim-3.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e79da493068cdccd9cb68423fb78f8d4
diff --git a/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316 b/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316
index 722cbe41704c..20d9c5cf0d9a 100644
--- a/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316
+++ b/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( dev-python/P
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/lancos/qhexedit2/archive/ba5af8616b3a6c916e718914225a483267c01356.tar.gz -> qhexedit2-0.8.6_p20190316.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ac844d4ec11e5f9a5a27722c5963d38e
diff --git a/metadata/md5-cache/app-editors/retext-7.1.0 b/metadata/md5-cache/app-editors/retext-7.1.0
index 143efd5062c9..2ddc2c523c72 100644
--- a/metadata/md5-cache/app-editors/retext-7.1.0
+++ b/metadata/md5-cache/app-editors/retext-7.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/R/ReText/ReText-7.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb3af83d83e3ac95418aa1f5f22d45fc
diff --git a/metadata/md5-cache/app-editors/retext-9999 b/metadata/md5-cache/app-editors/retext-9999
index 765d345bb654..28a754cab209 100644
--- a/metadata/md5-cache/app-editors/retext-9999
+++ b/metadata/md5-cache/app-editors/retext-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/chardet[python_targets_python3_7(-)?,python_targets_python3_8
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=169af95081647fe245750f27d454531b
diff --git a/metadata/md5-cache/app-editors/shed-1.15 b/metadata/md5-cache/app-editors/shed-1.15
index 93743fb06f0a..c81a665d4bfa 100644
--- a/metadata/md5-cache/app-editors/shed-1.15
+++ b/metadata/md5-cache/app-editors/shed-1.15
@@ -4,10 +4,10 @@ DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=Simple Hex EDitor
 EAPI=7
 HOMEPAGE=http://shed.sourceforge.net/
-KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/shed/shed-1.15.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5839976db81502fa68ccc525dcd60865
+_md5_=6d5e5831f5aa9f1bfba86fbb814a4f77
diff --git a/metadata/md5-cache/app-editors/vis-0.6 b/metadata/md5-cache/app-editors/vis-0.6
index d177e1d7601b..c914729deae0 100644
--- a/metadata/md5-cache/app-editors/vis-0.6
+++ b/metadata/md5-cache/app-editors/vis-0.6
@@ -1,13 +1,14 @@
-DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=dev-libs/libtermkey ncurses? ( sys-libs/ncurses:0= ) tre? ( dev-libs/tre:= )
+DEFINED_PHASES=configure postinst postrm prepare setup
+DEPEND=dev-libs/libtermkey ncurses? ( sys-libs/ncurses:0= ) lua? ( lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) tre? ( dev-libs/tre:= )
 DESCRIPTION=modern, legacy free, simple yet efficient vim-like editor
 EAPI=7
 HOMEPAGE=https://github.com/martanne/vis
-IUSE=+ncurses selinux test tre
+IUSE=+ncurses +lua selinux test tre lua_single_target_lua5-2 lua_single_target_lua5-3
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=ISC
-RDEPEND=dev-libs/libtermkey ncurses? ( sys-libs/ncurses:0= ) tre? ( dev-libs/tre:= ) app-eselect/eselect-vi
+RDEPEND=dev-libs/libtermkey ncurses? ( sys-libs/ncurses:0= ) lua? ( lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) tre? ( dev-libs/tre:= ) app-eselect/eselect-vi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martanne/vis/releases/download/v0.6/vis-0.6.tar.gz test? ( https://github.com/martanne/vis-test/releases/download/v0.4/vis-test-0.4.tar.gz )
-_md5_=2bb3ef255c484fe829e1eb2df969dde4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=90154460bc67e65ed84f03c3ce9186d2
diff --git a/metadata/md5-cache/app-editors/vis-9999 b/metadata/md5-cache/app-editors/vis-9999
index 597882e0e61e..317cc2b6a6fc 100644
--- a/metadata/md5-cache/app-editors/vis-9999
+++ b/metadata/md5-cache/app-editors/vis-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure postinst postrm prepare unpack
-DEPEND=dev-libs/libtermkey ncurses? ( sys-libs/ncurses:0= ) tre? ( dev-libs/tre:= )
+DEFINED_PHASES=configure postinst postrm prepare setup unpack
+DEPEND=dev-libs/libtermkey ncurses? ( sys-libs/ncurses:0= ) lua? ( lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) tre? ( dev-libs/tre:= )
 DESCRIPTION=modern, legacy free, simple yet efficient vim-like editor
 EAPI=7
 HOMEPAGE=https://github.com/martanne/vis
-IUSE=+ncurses selinux test tre
+IUSE=+ncurses +lua selinux test tre lua_single_target_lua5-2 lua_single_target_lua5-3
 LICENSE=ISC
 PROPERTIES=live
-RDEPEND=dev-libs/libtermkey ncurses? ( sys-libs/ncurses:0= ) tre? ( dev-libs/tre:= ) app-eselect/eselect-vi
+RDEPEND=dev-libs/libtermkey ncurses? ( sys-libs/ncurses:0= ) lua? ( lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) tre? ( dev-libs/tre:= ) app-eselect/eselect-vi
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441
-_md5_=6123359bdad263bbd2377346c5835c55
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=15e68002b8ad4332fd39e0cf1527ee36
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 0aeee56b558a..3510fa6166aa 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/pymacs-0.26-r2 b/metadata/md5-cache/app-emacs/pymacs-0.26-r2
index 027eca9fcd80..7222758c2d71 100644
--- a/metadata/md5-cache/app-emacs/pymacs-0.26-r2
+++ b/metadata/md5-cache/app-emacs/pymacs-0.26-r2
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:* python_targets_python3_6? ( dev-lang/python:3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/dgentry/Pymacs/archive/v0.26.tar.gz -> pymacs-0.26.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7e15ac1dd2470b718cc2571ffaf3a5a8
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 4858f9f0d24b..82fdd8a0c215 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/cloud-init-19.4 b/metadata/md5-cache/app-emulation/cloud-init-19.4
index 5ea03638b54c..90c63a4e56ef 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-19.4
+++ b/metadata/md5-cache/app-emulation/cloud-init-19.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/cloud-init/trunk/19.4/+download/cloud-init-19.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bb9ec48c41acebc3f7342273fc5080ae
diff --git a/metadata/md5-cache/app-emulation/cloud-init-20.1 b/metadata/md5-cache/app-emulation/cloud-init-20.1
index 83f9d324dd00..a34eaadaac38 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-20.1
+++ b/metadata/md5-cache/app-emulation/cloud-init-20.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/cloud-init/trunk/20.1/+download/cloud-init-20.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0b284bfb9e37e38b79fc1e0f9d95fc1c
diff --git a/metadata/md5-cache/app-emulation/cloud-init-9999 b/metadata/md5-cache/app-emulation/cloud-init-9999
index c19ecc6fddd9..7de279524350 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-9999
+++ b/metadata/md5-cache/app-emulation/cloud-init-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c334bedccc986297d6cab1cdf17ecc58
diff --git a/metadata/md5-cache/app-emulation/containerd-1.3.9 b/metadata/md5-cache/app-emulation/containerd-1.3.9
new file mode 100644
index 000000000000..facdefe161c4
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/containerd-1.3.9
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/go-md2man virtual/pkgconfig test? ( btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) ~app-emulation/runc-1.0.0_rc10 ) >=dev-lang/go-1.10
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp )
+DESCRIPTION=A daemon to control runC
+EAPI=7
+HOMEPAGE=https://containerd.io/
+IUSE=apparmor btrfs device-mapper +cri hardened +seccomp selinux test
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) ~app-emulation/runc-1.0.0_rc10
+RESTRICT=strip strip test
+SLOT=0
+SRC_URI=https://github.com/containerd/containerd/archive/ea765ab.tar.gz -> containerd-1.3.9.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d12ae6bf5c0aa7dea5a6a2673eb1397f
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-3.3.1 b/metadata/md5-cache/app-emulation/diskimage-builder-3.3.1
index a0bddf0c7367..587cee76612e 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-3.3.1
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-3.3.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-3.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c991f3cbfb03a57fc83009f2871d68bf
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-3.4.0 b/metadata/md5-cache/app-emulation/diskimage-builder-3.4.0
index 7deca650b960..d8845870f2e8 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-3.4.0
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-3.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-3.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2fc91243cd38c870db49b9a2dce560e1
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-9999 b/metadata/md5-cache/app-emulation/diskimage-builder-9999
index 8973144c8cf2..bb619aaafa96 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-9999
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/Babel-2.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/Babel-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/networkx-1.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyyaml-3.12[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2fc91243cd38c870db49b9a2dce560e1
diff --git a/metadata/md5-cache/app-emulation/docker-19.03.14 b/metadata/md5-cache/app-emulation/docker-19.03.14
new file mode 100644
index 000000000000..37dfbe38c2e8
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-19.03.14
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.13.12 dev-go/go-md2man virtual/pkgconfig >=dev-lang/go-1.10 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup unpack
+DEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+DESCRIPTION=The core functions you need to create Docker images and run Docker containers
+EAPI=7
+HOMEPAGE=https://www.docker.com/
+IUSE=apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp selinux kernel_linux
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) !sys-apps/systemd[-cgroup-hybrid(+)] >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.3.9[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?] ~app-emulation/runc-1.0.0_rc10[apparmor?,seccomp?,selinux(-)?] ~app-emulation/docker-proxy-0.8.0_p20201105 container-init? ( >=sys-process/tini-0.18.0[static] )
+RESTRICT=installsources strip
+SLOT=0
+SRC_URI=https://github.com/docker/docker-ce/archive/v19.03.14.tar.gz -> docker-19.03.14.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=23d2bd09d97f611b21f8032df6f06dfd
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.25.5 b/metadata/md5-cache/app-emulation/docker-compose-1.25.5
index ff45c69eb4ca..5638594681f9 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.25.5
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.25.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.25.5.tar.gz -> docker-compose-1.25.5.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e7992ead49f10216473a462179d636fa
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.26.2 b/metadata/md5-cache/app-emulation/docker-compose-1.26.2
index 74f08404e940..5c063d8ccc14 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.26.2
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.26.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.26.2.tar.gz -> docker-compose-1.26.2.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=47a81294043cea8a207e5ae31d976083
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.27.2 b/metadata/md5-cache/app-emulation/docker-compose-1.27.2
index 98c1202e6a96..f0299fa8bf9c 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.27.2
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.27.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.27.2.tar.gz -> docker-compose-1.27.2.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8827a8b1a120ecb6edaddc96d82099d3
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.27.3 b/metadata/md5-cache/app-emulation/docker-compose-1.27.3
index 5e8cfa530217..beb29f422160 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.27.3
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.27.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.27.3.tar.gz -> docker-compose-1.27.3.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8827a8b1a120ecb6edaddc96d82099d3
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.27.4 b/metadata/md5-cache/app-emulation/docker-compose-1.27.4
index b1c64cee348c..d4282022bd92 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.27.4
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.27.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.27.4.tar.gz -> docker-compose-1.27.4.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=076c118b6387fe8c6f2f3ddf0e7fc76c
diff --git a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20201105 b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20201105
new file mode 100644
index 000000000000..d94f61e6b423
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20201105
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Docker container networking
+EAPI=7
+HOMEPAGE=https://github.com/docker/libnetwork
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/docker/libnetwork/archive/55e924b8a84231a065879156c0de95aefc5f5435.tar.gz -> docker-proxy-0.8.0_p20201105.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=431611e59db4e179c1fb020b8d72d84c
diff --git a/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.5 b/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.5
index dae4a20f697b..fcb5e16bc985 100644
--- a/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.5
+++ b/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.5
@@ -11,5 +11,5 @@ RDEPEND=app-emulation/fs-uae python_single_target_python3_6? ( dev-python/PyQt5[
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://fs-uae.net/stable/3.0.5/fs-uae-launcher-3.0.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c6b14ffa77d20fca4da01ca577c483f
diff --git a/metadata/md5-cache/app-emulation/glean-1.17.0 b/metadata/md5-cache/app-emulation/glean-1.17.0
index b58b133853be..f9dc8b1f5b69 100644
--- a/metadata/md5-cache/app-emulation/glean-1.17.0
+++ b/metadata/md5-cache/app-emulation/glean-1.17.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pbr[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/glean/glean-1.17.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=89659ac53beba04dc6facb2a3b564aee
diff --git a/metadata/md5-cache/app-emulation/pcem-17 b/metadata/md5-cache/app-emulation/pcem-17
new file mode 100644
index 000000000000..86ada708d5da
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/pcem-17
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DESCRIPTION=A PC emulator that specializes in running old operating systems and software
+EAPI=7
+HOMEPAGE=https://pcem-emulator.co.uk/ https://github.com/sarah-walker-pcem/pcem/
+IUSE=alsa networking
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=alsa? ( media-libs/alsa-lib ) media-libs/libsdl2 media-libs/openal x11-libs/wxGTK:3.0-gtk3[tiff,X]
+SLOT=0
+SRC_URI=https://pcem-emulator.co.uk/files/PCemV17Linux.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_md5_=faaff3a67ec8170baefd8d37ec37e0bd
diff --git a/metadata/md5-cache/app-emulation/protontricks-1.4.1 b/metadata/md5-cache/app-emulation/protontricks-1.4.1
index 4f0fce6468a1..3cced06418e9 100644
--- a/metadata/md5-cache/app-emulation/protontricks-1.4.1
+++ b/metadata/md5-cache/app-emulation/protontricks-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/protontricks/protontricks-1.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a5bfe1c2767c5bd926a80732b1cdd9eb
diff --git a/metadata/md5-cache/app-emulation/protontricks-1.4.2 b/metadata/md5-cache/app-emulation/protontricks-1.4.2
index 9f6989740eea..b1da94e2a95a 100644
--- a/metadata/md5-cache/app-emulation/protontricks-1.4.2
+++ b/metadata/md5-cache/app-emulation/protontricks-1.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_6 pyth
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Matoking/protontricks/archive/1.4.2.tar.gz -> protontricks-1.4.2.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=21b2be1c85abbc37872a0c9b962ab166
diff --git a/metadata/md5-cache/app-emulation/rex-client-9999 b/metadata/md5-cache/app-emulation/rex-client-9999
deleted file mode 100644
index d287aa7b1b10..000000000000
--- a/metadata/md5-cache/app-emulation/rex-client-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Remote EXexcution agent
-EAPI=5
-HOMEPAGE=http://mduft.github.io/rex/
-LICENSE=MIT
-PROPERTIES=live
-SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441
-_md5_=25c43da3c426c71f0074582c9ab9ca47
diff --git a/metadata/md5-cache/app-emulation/sen-0.6.0 b/metadata/md5-cache/app-emulation/sen-0.6.0
index c1a9719b5386..f6e2fffae916 100644
--- a/metadata/md5-cache/app-emulation/sen-0.6.0
+++ b/metadata/md5-cache/app-emulation/sen-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sen/sen-0.6.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c2988ff6730316abb6c597a1c1423ff7
diff --git a/metadata/md5-cache/app-emulation/sen-0.6.1 b/metadata/md5-cache/app-emulation/sen-0.6.1
index 9173a3641411..e438f3d36940 100644
--- a/metadata/md5-cache/app-emulation/sen-0.6.1
+++ b/metadata/md5-cache/app-emulation/sen-0.6.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sen/sen-0.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fd2cbe3402ae678faa48f353fea72f53
diff --git a/metadata/md5-cache/app-emulation/sen-0.6.1_p20200905 b/metadata/md5-cache/app-emulation/sen-0.6.1_p20200905
index 42350d3844d5..94e37ba5a1bd 100644
--- a/metadata/md5-cache/app-emulation/sen-0.6.1_p20200905
+++ b/metadata/md5-cache/app-emulation/sen-0.6.1_p20200905
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TomasTomecek/sen/archive/02e5872ee2905861e1da06ab5174e1a3f41f0e0b.tar.gz -> sen-0.6.1_p20200905.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1b9ce5f392c89cff12c1c846cbf2f00b
diff --git a/metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3 b/metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3
index be5a7257fcda..d2473a50ee50 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3
+++ b/metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtinst python_single_target_python3_7? ( dev-lang/pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-2.2.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e508293b1980d4e53b50246dc07783c5
diff --git a/metadata/md5-cache/app-emulation/virt-manager-3.1.0 b/metadata/md5-cache/app-emulation/virt-manager-3.1.0
index 3e57d7dbe4be..3346cae70a42 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-3.1.0
+++ b/metadata/md5-cache/app-emulation/virt-manager-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtinst python_single_target_python3_7? ( dev-lang/pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-3.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ee5e774a43fe7f6fab2f329ad23e766
diff --git a/metadata/md5-cache/app-emulation/virt-manager-9999 b/metadata/md5-cache/app-emulation/virt-manager-9999
index e928e5332467..8dda68d19ea3 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-9999
+++ b/metadata/md5-cache/app-emulation/virt-manager-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!app-emulation/virtinst python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] dev-python/argcomplete[python_targets_python3_7(-)] dev-python/libvirt-python[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] dev-python/argcomplete[python_targets_python3_8(-)] dev-python/libvirt-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/libxml2[python,python_targets_python3_9(-)] dev-python/argcomplete[python_targets_python3_9(-)] dev-python/libvirt-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/gtk+:3[introspection] x11-libs/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] policykit? ( sys-auth/polkit[introspection] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1aabb1b65811d93daa1a0a23f5a7314
diff --git a/metadata/md5-cache/app-emulation/wine-staging-5.22 b/metadata/md5-cache/app-emulation/wine-staging-5.22
deleted file mode 100644
index 49bfc9ca8333..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-5.22
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.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(-)?] media-plugins/gst-plugins-meta:1.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(-)?] ) jpeg? ( virtual/jpeg: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(-)?] ) kerberos? ( virtual/krb5: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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2: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(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib: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(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.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(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[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-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.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(-)?] media-plugins/gst-plugins-meta:1.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(-)?] ) jpeg? ( virtual/jpeg: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(-)?] ) kerberos? ( virtual/krb5: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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2: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(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib: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(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.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(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:5.1.1 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=5.22
-SRC_URI=https://dl.winehq.org/wine/source/5.x/wine-5.22.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v5.22.tar.gz -> wine-staging-5.22.tar.gz )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6eebfddd281810791edb7f823d86c1c5
diff --git a/metadata/md5-cache/app-emulation/wine-staging-5.22-r1 b/metadata/md5-cache/app-emulation/wine-staging-5.22-r2
similarity index 99%
rename from metadata/md5-cache/app-emulation/wine-staging-5.22-r1
rename to metadata/md5-cache/app-emulation/wine-staging-5.22-r2
index 1c379a7f9a60..00da0473b11b 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-5.22-r1
+++ b/metadata/md5-cache/app-emulation/wine-staging-5.22-r2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5.22
 SRC_URI=https://dl.winehq.org/wine/source/5.x/wine-5.22.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v5.22.tar.gz -> wine-staging-5.22.tar.gz )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=afffbf16ebcdbca945c64a858da41b70
+_md5_=6454cffa1f4daee2f0ad39e6687f8287
diff --git a/metadata/md5-cache/app-emulation/wine-staging-9999 b/metadata/md5-cache/app-emulation/wine-staging-9999
index d49957142f4b..43e323300527 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4f50b13a2654cf9a39b5eaee360c7a2
+_md5_=c9e1073b6261f149358c798e409495d4
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-5.22 b/metadata/md5-cache/app-emulation/wine-vanilla-5.22
deleted file mode 100644
index 71d9efcf8d6a..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-5.22
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.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(-)?] media-plugins/gst-plugins-meta:1.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(-)?] ) jpeg? ( virtual/jpeg: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(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2: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(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.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(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[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-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.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(-)?] media-plugins/gst-plugins-meta:1.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(-)?] ) jpeg? ( virtual/jpeg: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(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2: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(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng: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(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.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(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.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(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:5.1.1 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=5.22
-SRC_URI=https://dl.winehq.org/wine/source/5.x/wine-5.22.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1d65fb3c1ef6b59d61c6862ae6884a9
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-5.22-r1 b/metadata/md5-cache/app-emulation/wine-vanilla-5.22-r2
similarity index 99%
rename from metadata/md5-cache/app-emulation/wine-vanilla-5.22-r1
rename to metadata/md5-cache/app-emulation/wine-vanilla-5.22-r2
index 25385421ba85..b354ce8b5da6 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-5.22-r1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-5.22-r2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5.22
 SRC_URI=https://dl.winehq.org/wine/source/5.x/wine-5.22.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=87c78fa6798b8d973c9e6310daedfec7
+_md5_=da1c700bc7c6098b53683d024eac3a16
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-9999 b/metadata/md5-cache/app-emulation/wine-vanilla-9999
index 3c589064e18a..5bea67a9ebc8 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=87c78fa6798b8d973c9e6310daedfec7
+_md5_=da1c700bc7c6098b53683d024eac3a16
diff --git a/metadata/md5-cache/app-emulation/xen-4.13.2-r2 b/metadata/md5-cache/app-emulation/xen-4.13.2-r2
index 23ca62de3d88..52f8be157f60 100644
--- a/metadata/md5-cache/app-emulation/xen-4.13.2-r2
+++ b/metadata/md5-cache/app-emulation/xen-4.13.2-r2
@@ -4,7 +4,7 @@ DESCRIPTION=The Xen virtual machine monitor
 EAPI=7
 HOMEPAGE=https://www.xenproject.org
 IUSE=debug efi flask
-KEYWORDS=~amd64 ~arm -x86
+KEYWORDS=amd64 ~arm -x86
 LICENSE=GPL-2
 PDEPEND=~app-emulation/xen-tools-4.13.2
 REQUIRED_USE=arm? ( debug )
@@ -12,4 +12,4 @@ RESTRICT=test splitdebug strip
 SLOT=0
 SRC_URI=https://downloads.xenproject.org/release/xen/4.13.2/xen-4.13.2.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.13.2-upstream-patches-1.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.13.2-upstream-patches-1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1ca9df0d04a9c11405b70cd37a6af481
+_md5_=77a3d5e6bb0cb78c2ac9d2e2b14e46a9
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index ce1b64d8b8b1..18e54831c0f2 100644
Binary files a/metadata/md5-cache/app-forensics/Manifest.gz and b/metadata/md5-cache/app-forensics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-forensics/aide-0.16.2_p20200614 b/metadata/md5-cache/app-forensics/aide-0.16.2_p20200614
index 4a517df31aab..2bf678798094 100644
--- a/metadata/md5-cache/app-forensics/aide-0.16.2_p20200614
+++ b/metadata/md5-cache/app-forensics/aide-0.16.2_p20200614
@@ -5,11 +5,11 @@ DESCRIPTION=AIDE (Advanced Intrusion Detection Environment) is a file integrity
 EAPI=7
 HOMEPAGE=https://aide.github.io/ https://github.com/aide/aide
 IUSE=acl audit curl e2fs mhash postgres prelink selinux xattr zlib
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre acl? ( virtual/acl ) audit? ( sys-process/audit ) curl? ( net-misc/curl ) e2fs? ( sys-fs/e2fsprogs ) !mhash? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) mhash? ( app-crypt/mhash ) postgres? ( dev-db/postgresql:= ) prelink? ( dev-libs/elfutils ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-aide )
 REQUIRED_USE=postgres? ( !mhash )
 SLOT=0
 SRC_URI=https://github.com/aide/aide/archive/7949feff20501724a43929ee7894b005812ffb4f.tar.gz -> aide-0.16.2_p20200614.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b510d3a5f51694999ff6defd0d4db0a5
+_md5_=6a9b958369d93e2f271cbd6e88e78e61
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 425ae90ace23..a9b7a4b31267 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/kde-l10n-scripts-9999 b/metadata/md5-cache/app-i18n/kde-l10n-scripts-9999
deleted file mode 100644
index a23da9eade9e..000000000000
--- a/metadata/md5-cache/app-i18n/kde-l10n-scripts-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=app-crypt/md5deep app-i18n/pology app-shells/bash:* dev-vcs/subversion kde-apps/poxml >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Set of scripts to manage KDE translation files
-EAPI=6
-HOMEPAGE=https://github.com/vpelcak/kde-scripts
-LICENSE=LGPL-3
-PROPERTIES=live
-RDEPEND=app-crypt/md5deep app-i18n/pology app-shells/bash:* dev-vcs/subversion kde-apps/poxml
-SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441
-_md5_=dae0efd5dc4fd33744993772faaca262
diff --git a/metadata/md5-cache/app-i18n/nkf-2.1.4 b/metadata/md5-cache/app-i18n/nkf-2.1.4
index c8842e499879..a5209ff25c2a 100644
--- a/metadata/md5-cache/app-i18n/nkf-2.1.4
+++ b/metadata/md5-cache/app-i18n/nkf-2.1.4
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/nkf/64158/nkf-2.1.4.tar.gz python? ( https://github.com/fumiyas/python-nkf/archive/000915e115acac57a1fdbceb1e6361788af83a3d.tar.gz -> python-nkf-0.2.0_p20141211.tar.gz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=18c9a8af4cf8be6fa99e4fa33f478725
diff --git a/metadata/md5-cache/app-i18n/nkf-2.1.5 b/metadata/md5-cache/app-i18n/nkf-2.1.5
index a940a674ef73..3aeaf3f2b57f 100644
--- a/metadata/md5-cache/app-i18n/nkf-2.1.5
+++ b/metadata/md5-cache/app-i18n/nkf-2.1.5
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/nkf/70406/nkf-2.1.5.tar.gz python? ( https://github.com/fumiyas/python-nkf/archive/c2c6724714b66f295137c8818dae4c09fc09e0a3.tar.gz -> python-nkf-0.2.0_p20191121.tar.gz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=7497b66e82d23f449b28e9ff3a44f83c
diff --git a/metadata/md5-cache/app-i18n/transifex-client-0.13.9 b/metadata/md5-cache/app-i18n/transifex-client-0.13.9
index fa5d05dc056a..e091e6cb1e69 100644
--- a/metadata/md5-cache/app-i18n/transifex-client-0.13.9
+++ b/metadata/md5-cache/app-i18n/transifex-client-0.13.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/transifex-client/transifex-client-0.13.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=75ae9134d6375eead0fd00d7f043a920
diff --git a/metadata/md5-cache/app-i18n/transifex-client-0.14.2 b/metadata/md5-cache/app-i18n/transifex-client-0.14.2
index 44c01801bfc0..92abb6700789 100644
--- a/metadata/md5-cache/app-i18n/transifex-client-0.14.2
+++ b/metadata/md5-cache/app-i18n/transifex-client-0.14.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/transifex-client/transifex-client-0.14.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5246e32667d4bdfa7a5001ec035464da
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 8b89bd487f89..b9ae4f6280d6 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/asciinema-2.0.2 b/metadata/md5-cache/app-misc/asciinema-2.0.2
index 8c6998e8758b..c2b129783c49 100644
--- a/metadata/md5-cache/app-misc/asciinema-2.0.2
+++ b/metadata/md5-cache/app-misc/asciinema-2.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciinema/asciinema/archive/v2.0.2.tar.gz -> asciinema-2.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=670acd298c22d6e5292fd220505afe08
diff --git a/metadata/md5-cache/app-misc/binwalk-2.2.0 b/metadata/md5-cache/app-misc/binwalk-2.2.0
index e1db00f794c9..8e208c67f532 100644
--- a/metadata/md5-cache/app-misc/binwalk-2.2.0
+++ b/metadata/md5-cache/app-misc/binwalk-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ReFirmLabs/binwalk/archive/v2.2.0.tar.gz -> binwalk-2.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3f137c5114268220c9cc9622086f3278
diff --git a/metadata/md5-cache/app-misc/binwalk-9999 b/metadata/md5-cache/app-misc/binwalk-9999
index b62dc7494f6d..d62f59c26ba4 100644
--- a/metadata/md5-cache/app-misc/binwalk-9999
+++ b/metadata/md5-cache/app-misc/binwalk-9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4f09f4ddd42719cce7ce51c481768e7e
diff --git a/metadata/md5-cache/app-misc/chkcrontab-1.7 b/metadata/md5-cache/app-misc/chkcrontab-1.7
index 355879d77e9e..7368211f6940 100644
--- a/metadata/md5-cache/app-misc/chkcrontab-1.7
+++ b/metadata/md5-cache/app-misc/chkcrontab-1.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lyda/chkcrontab/archive/v1.7.tar.gz -> chkcrontab-1.7.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e2589f5e70088e03360a725de91662fe
diff --git a/metadata/md5-cache/app-misc/chkcrontab-1.7-r1 b/metadata/md5-cache/app-misc/chkcrontab-1.7-r1
index 3c96c72ef438..a43f368ef6a2 100644
--- a/metadata/md5-cache/app-misc/chkcrontab-1.7-r1
+++ b/metadata/md5-cache/app-misc/chkcrontab-1.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lyda/chkcrontab/archive/v1.7.tar.gz -> chkcrontab-1.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f63eb62ccea57b82244c226c0e63b9ee
diff --git a/metadata/md5-cache/app-misc/dtach-0.9 b/metadata/md5-cache/app-misc/dtach-0.9
index 088d473c8817..8300f9ae0ee6 100644
--- a/metadata/md5-cache/app-misc/dtach-0.9
+++ b/metadata/md5-cache/app-misc/dtach-0.9
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Emulates the detach feature of screen
 EAPI=6
 HOMEPAGE=http://dtach.sourceforge.net/ https://github.com/crigler/dtach
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/dtach/dtach-0.9.tar.gz
-_md5_=dbb45d22abb9bd47f903341c479c3df1
+_md5_=b8695e00b8ec2d6c7685188dc01af0ef
diff --git a/metadata/md5-cache/app-misc/freewvs-0.1.1 b/metadata/md5-cache/app-misc/freewvs-0.1.1
index a560310ca00c..40f3a9aa641b 100644
--- a/metadata/md5-cache/app-misc/freewvs-0.1.1
+++ b/metadata/md5-cache/app-misc/freewvs-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/freewvs/freewvs-0.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=31bafb2bb885241606dcf708d3556663
diff --git a/metadata/md5-cache/app-misc/gcalcli-4.2.0 b/metadata/md5-cache/app-misc/gcalcli-4.2.0
index 497b7ee00e43..dec435c39fd0 100644
--- a/metadata/md5-cache/app-misc/gcalcli-4.2.0
+++ b/metadata/md5-cache/app-misc/gcalcli-4.2.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/insanum/gcalcli/archive/v4.2.0.tar.gz -> gcalcli-4.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c4ad6b61dc6fc3d4003f49d59ca731e8
diff --git a/metadata/md5-cache/app-misc/goobook-3.4-r1 b/metadata/md5-cache/app-misc/goobook-3.4-r1
index 752c71214c0f..9efd90be4c7e 100644
--- a/metadata/md5-cache/app-misc/goobook-3.4-r1
+++ b/metadata/md5-cache/app-misc/goobook-3.4-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/goobook/goobook-3.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e0b1b543c9b9735fde277cb582d0cf7a
diff --git a/metadata/md5-cache/app-misc/gramps-5.1.2-r1 b/metadata/md5-cache/app-misc/gramps-5.1.2-r1
index d2a9f0e25f42..d16b5833af38 100644
--- a/metadata/md5-cache/app-misc/gramps-5.1.2-r1
+++ b/metadata/md5-cache/app-misc/gramps-5.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_6? ( dev-python/bsddb3[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/gramps-project/gramps/archive/v5.1.2.tar.gz -> gramps-5.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7df922857634d2053646c5c1769cec7f
diff --git a/metadata/md5-cache/app-misc/gramps-5.1.3 b/metadata/md5-cache/app-misc/gramps-5.1.3
index b18dd8513ae3..15e47acf626f 100644
--- a/metadata/md5-cache/app-misc/gramps-5.1.3
+++ b/metadata/md5-cache/app-misc/gramps-5.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gramps-project/gramps/archive/v5.1.3.tar.gz -> gramps-5.1.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00eae0843590d0af6e47b2b6164d7d0a
diff --git a/metadata/md5-cache/app-misc/icdiff-1.9.1 b/metadata/md5-cache/app-misc/icdiff-1.9.1
index 3db297758ae6..17f0e97969d8 100644
--- a/metadata/md5-cache/app-misc/icdiff-1.9.1
+++ b/metadata/md5-cache/app-misc/icdiff-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/jeffkaufman/icdiff/archive/release-1.9.1.tar.gz -> icdiff-1.9.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6b26b49fd003f90742aa8b4c3221fd49
diff --git a/metadata/md5-cache/app-misc/icdiff-1.9.5 b/metadata/md5-cache/app-misc/icdiff-1.9.5
index afe907f28730..2ab71a83c8f5 100644
--- a/metadata/md5-cache/app-misc/icdiff-1.9.5
+++ b/metadata/md5-cache/app-misc/icdiff-1.9.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/jeffkaufman/icdiff/archive/release-1.9.5.tar.gz -> icdiff-1.9.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c3379edfdb9e960b6bb4f258e576a9f6
diff --git a/metadata/md5-cache/app-misc/khal-0.10.1-r1 b/metadata/md5-cache/app-misc/khal-0.10.1-r1
index 1085a656cf3c..e42a452e01e5 100644
--- a/metadata/md5-cache/app-misc/khal-0.10.1-r1
+++ b/metadata/md5-cache/app-misc/khal-0.10.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/click-3.2[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/k/khal/khal-0.10.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6277a3587d9fd18b5c20ede0081b89e3
diff --git a/metadata/md5-cache/app-misc/khard-0.13.0 b/metadata/md5-cache/app-misc/khard-0.13.0
index effd33112c1d..7726a20c4f2f 100644
--- a/metadata/md5-cache/app-misc/khard-0.13.0
+++ b/metadata/md5-cache/app-misc/khard-0.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/khard/khard-0.13.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ceda5cda580c0d4ef41b3f9bf6be91e8
diff --git a/metadata/md5-cache/app-misc/khard-0.17.0 b/metadata/md5-cache/app-misc/khard-0.17.0
index 046122e53cd8..f58db2801910 100644
--- a/metadata/md5-cache/app-misc/khard-0.17.0
+++ b/metadata/md5-cache/app-misc/khard-0.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/khard/khard-0.17.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9c0b59eb37cd8c0bd4e71ed63808e057
diff --git a/metadata/md5-cache/app-misc/lfm-3.1 b/metadata/md5-cache/app-misc/lfm-3.1
index fbdc73cce0bd..ead0fa6efd63 100644
--- a/metadata/md5-cache/app-misc/lfm-3.1
+++ b/metadata/md5-cache/app-misc/lfm-3.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_target
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://inigo.katxi.org/devel/lfm/lfm-3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=61c72e466f8f7bea3bf0a73353f63746
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.1-r4 b/metadata/md5-cache/app-misc/lirc-0.10.1-r4
index 2ca0aac96509..6eeec6aeb189 100644
--- a/metadata/md5-cache/app-misc/lirc-0.10.1-r4
+++ b/metadata/md5-cache/app-misc/lirc-0.10.1-r4
@@ -5,11 +5,11 @@ DESCRIPTION=decode and send infra-red signals of many commonly used remote contr
 EAPI=7
 HOMEPAGE=https://www.lirc.org/
 IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/vte[introspection] python_single_target_python3_6? ( dev-python/pygobject[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject[python_targets_python3_9(-)] ) ) inputlirc? ( app-misc/inputlircd )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) gtk? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/lirc/lirc-0.10.1.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=11718fdf245548a6b4d5c23cf7011637
+_md5_=6e1aca8acf75eee804613e436a9bd9d0
diff --git a/metadata/md5-cache/app-misc/ranger-1.9.2 b/metadata/md5-cache/app-misc/ranger-1.9.2
index 3b787526eaa0..560b3e7cf339 100644
--- a/metadata/md5-cache/app-misc/ranger-1.9.2
+++ b/metadata/md5-cache/app-misc/ranger-1.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ranger/ranger/archive/v1.9.2.tar.gz -> ranger-1.9.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5865a6963353c641b2fdaaf234181a5c
diff --git a/metadata/md5-cache/app-misc/ranger-1.9.3 b/metadata/md5-cache/app-misc/ranger-1.9.3
index 69fa496484a5..c306dc50f7d7 100644
--- a/metadata/md5-cache/app-misc/ranger-1.9.3
+++ b/metadata/md5-cache/app-misc/ranger-1.9.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ranger/ranger/archive/v1.9.3.tar.gz -> ranger-1.9.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ddf2dbc760f14817f26cc05d9cd0e9a4
diff --git a/metadata/md5-cache/app-misc/ranger-9999 b/metadata/md5-cache/app-misc/ranger-9999
index c073c29eea70..18754a7c978e 100644
--- a/metadata/md5-cache/app-misc/ranger-9999
+++ b/metadata/md5-cache/app-misc/ranger-9999
@@ -11,5 +11,5 @@ RDEPEND=virtual/pager python_targets_python3_6? ( dev-lang/python:3.6[ncurses] )
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ddf2dbc760f14817f26cc05d9cd0e9a4
diff --git a/metadata/md5-cache/app-misc/resolve-march-native-0.9.4 b/metadata/md5-cache/app-misc/resolve-march-native-0.9.4
index 6d32d3e6fc1f..54afb3bbc1c8 100644
--- a/metadata/md5-cache/app-misc/resolve-march-native-0.9.4
+++ b/metadata/md5-cache/app-misc/resolve-march-native-0.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hartwork/resolve-march-native/archive/0.9.4.tar.gz -> resolve-march-native-0.9.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0ac58f50319b2a97ebebcb46a52db011
diff --git a/metadata/md5-cache/app-misc/resolve-march-native-1.0.0 b/metadata/md5-cache/app-misc/resolve-march-native-1.0.0
index c49e15d0710f..7d05d0735245 100644
--- a/metadata/md5-cache/app-misc/resolve-march-native-1.0.0
+++ b/metadata/md5-cache/app-misc/resolve-march-native-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hartwork/resolve-march-native/archive/1.0.0.tar.gz -> resolve-march-native-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2bfb75ec4dcf31bc5e2e3cacded20b96
diff --git a/metadata/md5-cache/app-misc/rox-filer-2.11 b/metadata/md5-cache/app-misc/rox-filer-2.11
index f960f4a964a9..71a293b91e22 100644
--- a/metadata/md5-cache/app-misc/rox-filer-2.11
+++ b/metadata/md5-cache/app-misc/rox-filer-2.11
@@ -5,11 +5,11 @@ DESCRIPTION=ROX-Filer a drag and drop spatial file manager
 EAPI=7
 HOMEPAGE=http://rox.sourceforge.net/desktop/ROX-Filer.html
 IUSE=test
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=dev-lang/perl dev-libs/libxml2:2 gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-misc/shared-mime-info
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/rox/rox-filer-2.11.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=967d24c4fa990a4db8d0f795dcb1cb4f
+_md5_=431307242cee5c2ae4e1aa0f2456f5ec
diff --git a/metadata/md5-cache/app-misc/solaar-1.0.1-r1 b/metadata/md5-cache/app-misc/solaar-1.0.1-r1
index 2d38bea37570..c9155493f89a 100644
--- a/metadata/md5-cache/app-misc/solaar-1.0.1-r1
+++ b/metadata/md5-cache/app-misc/solaar-1.0.1-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-group/plugdev dev-python/pygobject:3[python_targets_python3_6(-)?,p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pwr-Solaar/Solaar/archive/1.0.1.tar.gz -> solaar-1.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cc782daa75b48d1906b54926870795d
diff --git a/metadata/md5-cache/app-misc/solaar-1.0.2 b/metadata/md5-cache/app-misc/solaar-1.0.2
index 91bf2d0853f3..a2f6cd63c589 100644
--- a/metadata/md5-cache/app-misc/solaar-1.0.2
+++ b/metadata/md5-cache/app-misc/solaar-1.0.2
@@ -5,11 +5,11 @@ DESCRIPTION=Linux Device Manager for Logitech Unifying Receivers and Paired Devi
 EAPI=7
 HOMEPAGE=https://pwr-solaar.github.io/Solaar/
 IUSE=doc appindicator libnotify kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=acct-group/plugdev dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyudev-0.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] x11-libs/gtk+:3[introspection] appindicator? ( dev-libs/libappindicator:3 ) libnotify? ( x11-libs/libnotify ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/pwr-Solaar/Solaar/archive/1.0.2.tar.gz -> solaar-1.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=08c37e1c1915277c3f7df328520713a7
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=26b53a943969232b85a8105a76ef3e51
diff --git a/metadata/md5-cache/app-misc/solaar-1.0.3_rc1 b/metadata/md5-cache/app-misc/solaar-1.0.3_rc1
index 32b3d64ebf9a..09421a18ca4b 100644
--- a/metadata/md5-cache/app-misc/solaar-1.0.3_rc1
+++ b/metadata/md5-cache/app-misc/solaar-1.0.3_rc1
@@ -11,5 +11,5 @@ RDEPEND=acct-group/plugdev dev-python/pygobject:3[python_targets_python3_6(-)?,p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/pwr-Solaar/Solaar/archive/1.0.3rc1.tar.gz -> solaar-1.0.3rc1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ffb2be85b67403309e6830f45414bb9c
diff --git a/metadata/md5-cache/app-misc/solaar-9999 b/metadata/md5-cache/app-misc/solaar-9999
index 6489574ffb7c..c5627277830a 100644
--- a/metadata/md5-cache/app-misc/solaar-9999
+++ b/metadata/md5-cache/app-misc/solaar-9999
@@ -1,14 +1,14 @@
-BDEPEND=virtual/pkgconfig python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
 DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A Linux device manager for Logitech's Unifying Receiver peripherals
 EAPI=7
 HOMEPAGE=https://pwr-solaar.github.io/Solaar/
-IUSE=doc kernel_linux python_targets_python3_6 python_targets_python3_7
+IUSE=doc kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=acct-group/plugdev dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyudev-0.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/gtk+:3[introspection] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=acct-group/plugdev dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyudev-0.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] x11-libs/gtk+:3[introspection] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5301400c8434e60ee82adaee2528b890
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2933d22eabd575ca9870a1d38194e411
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.8 b/metadata/md5-cache/app-misc/spacenavd-0.8
new file mode 100644
index 000000000000..d1e64041d2a4
--- /dev/null
+++ b/metadata/md5-cache/app-misc/spacenavd-0.8
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND=X? ( x11-apps/xdpyinfo x11-base/xorg-proto x11-libs/libX11 x11-libs/libXi )
+DESCRIPTION=The spacenavd daemon provides free alternative to the 3dxserv daemon
+EAPI=7
+HOMEPAGE=http://spacenav.sourceforge.net/
+IUSE=X kernel_linux
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=X? ( x11-apps/xdpyinfo x11-base/xorg-proto x11-libs/libX11 x11-libs/libXi )
+SLOT=0
+SRC_URI=https://github.com/FreeSpacenav/spacenavd/releases/download/v0.8/spacenavd-0.8.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3d4adcccd4dd5c138fa1cef3ae507969
diff --git a/metadata/md5-cache/app-misc/tmux2html-0.1.11 b/metadata/md5-cache/app-misc/tmux2html-0.1.11
index b58b90b1d69c..3b3620b3b4fb 100644
--- a/metadata/md5-cache/app-misc/tmux2html-0.1.11
+++ b/metadata/md5-cache/app-misc/tmux2html-0.1.11
@@ -10,5 +10,5 @@ RDEPEND=app-misc/tmux dev-python/setuptools[python_targets_python3_6(-)?,python_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/tweekmonster/tmux2html/archive/0.1.11.tar.gz -> tmux2html-0.1.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5083a8d8df2fa12c6ca9d4105c3e48c5
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.5.4 b/metadata/md5-cache/app-misc/tmuxp-1.5.4
index 2f208b6532c5..80f8317a24bc 100644
--- a/metadata/md5-cache/app-misc/tmuxp-1.5.4
+++ b/metadata/md5-cache/app-misc/tmuxp-1.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tmux-python/tmuxp/archive/v1.5.4.tar.gz -> tmuxp-1.5.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=78a27161cb5968657ccf7f995edf1937
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.5.5 b/metadata/md5-cache/app-misc/tmuxp-1.5.5
index 979db0a4d6dc..be520ea4a0cc 100644
--- a/metadata/md5-cache/app-misc/tmuxp-1.5.5
+++ b/metadata/md5-cache/app-misc/tmuxp-1.5.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tmux-python/tmuxp/archive/v1.5.5.tar.gz -> tmuxp-1.5.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=eed9eb9f7ff6dd77e2fa4c470415edc9
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.5.6 b/metadata/md5-cache/app-misc/tmuxp-1.5.6
index d3256f168b0e..4d58af26fd2a 100644
--- a/metadata/md5-cache/app-misc/tmuxp-1.5.6
+++ b/metadata/md5-cache/app-misc/tmuxp-1.5.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tmux-python/tmuxp/archive/v1.5.6.tar.gz -> tmuxp-1.5.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ab61a5bcb63cec27c6ff7a34037a25bc
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.6.2 b/metadata/md5-cache/app-misc/tmuxp-1.6.2
index 9dba70c95254..8af60e97e8cd 100644
--- a/metadata/md5-cache/app-misc/tmuxp-1.6.2
+++ b/metadata/md5-cache/app-misc/tmuxp-1.6.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tmux-python/tmuxp/archive/v1.6.2.tar.gz -> tmuxp-1.6.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9224ed83139d53113906bfce8fb927b5
diff --git a/metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816 b/metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816
index 1204535550f0..b358b2b1283e 100644
--- a/metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816
+++ b/metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/andreafrancia/trash-cli/archive/5abecd53e1d84f2a5fd3fc60d2f5d71e518826c5.tar.gz -> trash-cli-0.17.1.14_p20170816.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a6c47ad6dfebdce2d76e9c174a4e197
diff --git a/metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816-r1 b/metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816-r1
index 069c0679f7d5..19a122365ea3 100644
--- a/metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816-r1
+++ b/metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/andreafrancia/trash-cli/archive/5abecd53e1d84f2a5fd3fc60d2f5d71e518826c5.tar.gz -> trash-cli-0.17.1.14_p20170816.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4bac02ec231b09efbd37f64b48a64b3a
diff --git a/metadata/md5-cache/app-misc/yq-2.11.1 b/metadata/md5-cache/app-misc/yq-2.11.1
index d92fc6654cd4..a8f488277eea 100644
--- a/metadata/md5-cache/app-misc/yq-2.11.1
+++ b/metadata/md5-cache/app-misc/yq-2.11.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yq/yq-2.11.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e61d25abf498a82509c743d32ef1f087
diff --git a/metadata/md5-cache/app-misc/yq-2.9.2-r1 b/metadata/md5-cache/app-misc/yq-2.9.2-r1
index 339d79d7158e..962f013cbaf3 100644
--- a/metadata/md5-cache/app-misc/yq-2.9.2-r1
+++ b/metadata/md5-cache/app-misc/yq-2.9.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yq/yq-2.9.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=78aa6185ccd4d7d80ebeb2696ee7807e
diff --git a/metadata/md5-cache/app-officeext/Manifest.gz b/metadata/md5-cache/app-officeext/Manifest.gz
index 7e80968d5357..81d47ae27584 100644
Binary files a/metadata/md5-cache/app-officeext/Manifest.gz and b/metadata/md5-cache/app-officeext/Manifest.gz differ
diff --git a/metadata/md5-cache/app-officeext/ooofbtools-2.57 b/metadata/md5-cache/app-officeext/ooofbtools-2.57
index d4a13bfa8015..7e8782d2546c 100644
--- a/metadata/md5-cache/app-officeext/ooofbtools-2.57
+++ b/metadata/md5-cache/app-officeext/ooofbtools-2.57
@@ -4,11 +4,11 @@ DESCRIPTION=Open/LibreOffice extension for the FictionBook2 format with validati
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/fbtools/
 IUSE=office_implementation_libreoffice office_implementation_openoffice
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3
 RDEPEND=app-arch/zip dev-libs/libxml2 office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( app-office/openoffice-bin )
 REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
 SLOT=0
 SRC_URI=mirror://sourceforge/fbtools/files/release/OOoFBTools-2.57.zip
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	office-ext-r1	c5599254918ad9dfc276c949247566af	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7aa79eb37ec644da0fa7b6a10474c991
+_md5_=694f4b40bad92aca90a59087f8627d36
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index f2c111d16ca2..b03c6dbbe542 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/diffmask-0.3.3-r4 b/metadata/md5-cache/app-portage/diffmask-0.3.3-r4
index 98d72fb47463..44902d83d61b 100644
--- a/metadata/md5-cache/app-portage/diffmask-0.3.3-r4
+++ b/metadata/md5-cache/app-portage/diffmask-0.3.3-r4
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/diffmask/releases/download/diffmask-0.3.3/diffmask-0.3.3.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=79ba42bf52edb998e4c67e6c3f00e6e3
diff --git a/metadata/md5-cache/app-portage/diffmask-9999 b/metadata/md5-cache/app-portage/diffmask-9999
index 29ddaabfc7a9..35523009db97 100644
--- a/metadata/md5-cache/app-portage/diffmask-9999
+++ b/metadata/md5-cache/app-portage/diffmask-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=47b6ab5c4130f2358771f684cea67807
diff --git a/metadata/md5-cache/app-portage/distpatch-0.1.2-r2 b/metadata/md5-cache/app-portage/distpatch-0.1.2-r2
index 9ee30ad05bc8..e331351dada7 100644
--- a/metadata/md5-cache/app-portage/distpatch-0.1.2-r2
+++ b/metadata/md5-cache/app-portage/distpatch-0.1.2-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-util/diffball-1.0.1 python_targets_python3_6? ( dev-lang/python:3.
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/rafaelmartins/distpatch/releases/download/v0.1.2/distpatch-0.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c6951ac67aeccc33d9286979e99b3791
diff --git a/metadata/md5-cache/app-portage/elicense-1.0.2 b/metadata/md5-cache/app-portage/elicense-1.0.2
index c4521baddfa7..72bc7b3ee2e0 100644
--- a/metadata/md5-cache/app-portage/elicense-1.0.2
+++ b/metadata/md5-cache/app-portage/elicense-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/portage-2.3.62[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/Whissi/elicense/archive/v1.0.2.tar.gz -> elicense-1.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=373f259aa0fe4cb97cda42c4e41b20bb
diff --git a/metadata/md5-cache/app-portage/elicense-9999 b/metadata/md5-cache/app-portage/elicense-9999
index d65501c1e939..4c7d5aae7009 100644
--- a/metadata/md5-cache/app-portage/elicense-9999
+++ b/metadata/md5-cache/app-portage/elicense-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/portage-2.3.62[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0c0b551030de69e0966d4d3970acfc40
diff --git a/metadata/md5-cache/app-portage/elogv-0.7.8-r3 b/metadata/md5-cache/app-portage/elogv-0.7.8-r3
index 382ef9847891..53c821f8a1fc 100644
--- a/metadata/md5-cache/app-portage/elogv-0.7.8-r3
+++ b/metadata/md5-cache/app-portage/elogv-0.7.8-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/portage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/elogv/archive/0.7.8.tar.gz -> elogv-0.7.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=84079aa9f0e32d30b23bbc6118d8a355
diff --git a/metadata/md5-cache/app-portage/elogv-0.7.9 b/metadata/md5-cache/app-portage/elogv-0.7.9
index 7c3c73dbe363..ac91f6da2daa 100644
--- a/metadata/md5-cache/app-portage/elogv-0.7.9
+++ b/metadata/md5-cache/app-portage/elogv-0.7.9
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/portage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/elogv/archive/0.7.9.tar.gz -> elogv-0.7.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=630c9964fa5f45db834a8cd69de4042c
diff --git a/metadata/md5-cache/app-portage/elogviewer-3.0-r2 b/metadata/md5-cache/app-portage/elogviewer-3.0-r2
index b0145d29063f..5aca85b1fc55 100644
--- a/metadata/md5-cache/app-portage/elogviewer-3.0-r2
+++ b/metadata/md5-cache/app-portage/elogviewer-3.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Elog viewer for Gentoo
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/elogviewer
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ~arm64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)] >=sys-apps/portage-2.1[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)] >=sys-apps/portage-2.1[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] >=sys-apps/portage-2.1[python_targets_python3_8(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/Synss/elogviewer/archive/v3.0.tar.gz -> elogviewer-3.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=55c6679312cd056588258e2750cebf93
+_md5_=2e7033e040e628b00a8d3932ea36a433
diff --git a/metadata/md5-cache/app-portage/esearch-1.3-r3 b/metadata/md5-cache/app-portage/esearch-1.3-r3
index 93c5b7be23fb..c670a7dd565f 100644
--- a/metadata/md5-cache/app-portage/esearch-1.3-r3
+++ b/metadata/md5-cache/app-portage/esearch-1.3-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/portage python_targets_python3_6? ( dev-lang/python:3.6[readlin
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/downloads/fuzzyray/esearch/esearch-1.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b6e3746d3f1d24fb5c1c419a6a302c40
diff --git a/metadata/md5-cache/app-portage/esearch-9999 b/metadata/md5-cache/app-portage/esearch-9999
index ceafa9cb856e..4a582d4a9246 100644
--- a/metadata/md5-cache/app-portage/esearch-9999
+++ b/metadata/md5-cache/app-portage/esearch-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=sys-apps/portage python_targets_python3_6? ( dev-lang/python:3.6[readline(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[readline(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=888850f9b4413e769b22ca5ec619f72f
diff --git a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.1-r1 b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.1-r1
index 48a487f88314..4ddba74ad702 100644
--- a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.1-r1
+++ b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/aria2-1.10.2[metalink,xmlrpc] python_targets_python3_6? ( dev
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/hartwork/fetchcommandwrapper/archive/0.8.1.tar.gz -> fetchcommandwrapper-0.8.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d00099d8fe8ad17965d0dc638a7d77c3
diff --git a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.2 b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.2
index de7519395c81..d71c5f5ccaaa 100644
--- a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.2
+++ b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/aria2-1.10.2[metalink,xmlrpc] python_targets_python3_6? ( dev
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fetchcommandwrapper/fetchcommandwrapper-0.8.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=35a89ea5bfafbec6d6dd7393d593a71a
diff --git a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.3 b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.3
index ca9f06829760..013959883530 100644
--- a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.3
+++ b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.3
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/aria2-1.10.2[metalink,xmlrpc] python_targets_python3_6? ( dev
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fetchcommandwrapper/fetchcommandwrapper-0.8.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e2cee5e148e8e58694c5e01ce9e4433d
diff --git a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4 b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4
index 53354403070f..384f81dab31b 100644
--- a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4
+++ b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/aria2-1.10.2[metalink,xmlrpc] python_targets_python3_6? ( dev
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fetchcommandwrapper/fetchcommandwrapper-0.8.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e2cee5e148e8e58694c5e01ce9e4433d
diff --git a/metadata/md5-cache/app-portage/flaggie-0.2.1-r1 b/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
index c1546616d198..f0786e2d8970 100644
--- a/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
+++ b/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/flaggie/releases/download/flaggie-0.2.1/flaggie-0.2.1.tar.bz2
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fa54693cc2b2085519504b6ad2dec30c
diff --git a/metadata/md5-cache/app-portage/flaggie-9999 b/metadata/md5-cache/app-portage/flaggie-9999
index 9d68e80f49d7..b83dbdb7c698 100644
--- a/metadata/md5-cache/app-portage/flaggie-9999
+++ b/metadata/md5-cache/app-portage/flaggie-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2c41ee1ced7f478a3b7e5b182c18cc04
diff --git a/metadata/md5-cache/app-portage/g-octave-0.4.1-r7 b/metadata/md5-cache/app-portage/g-octave-0.4.1-r7
index 3ca442cc9d33..ee116631f15d 100644
--- a/metadata/md5-cache/app-portage/g-octave-0.4.1-r7
+++ b/metadata/md5-cache/app-portage/g-octave-0.4.1-r7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/downloads/rafaelmartins/g-octave/g-octave-0.4.1.tar.gz https://github.com/rafaelmartins/g-octave-db/archive/bdf02cbf0a8d017c6c1bddeffd6f03d5d90695ed.tar.gz -> g-octave-db-bdf02cb.tar.gz https://dev.gentoo.org/~rafaelmartins/distfiles/g-octave-patches-0.4.1-r7.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=73df595bc8fd9faea601a39d42ba7925
diff --git a/metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1 b/metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1
index c81b2bc069aa..2ac306fc21ec 100644
--- a/metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1
+++ b/metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jauhien/g-sorcery/archive/0.2.1.tar.gz -> g-sorcery-0.2.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d2846ec63d6000e072b131b04b90ece
diff --git a/metadata/md5-cache/app-portage/gander-0.0.1 b/metadata/md5-cache/app-portage/gander-0.0.1
index 57696f68bb69..ce985a9e2b7c 100644
--- a/metadata/md5-cache/app-portage/gander-0.0.1
+++ b/metadata/md5-cache/app-portage/gander-0.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/gander/archive/v0.0.1.tar.gz -> gander-0.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=943716df03d3827f7ed6e17148d11651
diff --git a/metadata/md5-cache/app-portage/gemato-15.2 b/metadata/md5-cache/app-portage/gemato-15.2
index 87feb135e0ef..a16d17ce6014 100644
--- a/metadata/md5-cache/app-portage/gemato-15.2
+++ b/metadata/md5-cache/app-portage/gemato-15.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gemato/gemato-15.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=205a24a8b50a1cf0044bc8c8238ec0b7
diff --git a/metadata/md5-cache/app-portage/gemato-16.1 b/metadata/md5-cache/app-portage/gemato-16.1
index a9b948d5bf73..02d441aa0293 100644
--- a/metadata/md5-cache/app-portage/gemato-16.1
+++ b/metadata/md5-cache/app-portage/gemato-16.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gemato/gemato-16.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e28a5070aa6ef2a561da3ac609362cd6
diff --git a/metadata/md5-cache/app-portage/gemato-16.2 b/metadata/md5-cache/app-portage/gemato-16.2
index 553c30b47203..af91fd59e238 100644
--- a/metadata/md5-cache/app-portage/gemato-16.2
+++ b/metadata/md5-cache/app-portage/gemato-16.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gemato/gemato-16.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2780e1f57fb3df8c28d2994881406395
diff --git a/metadata/md5-cache/app-portage/gemato-9999 b/metadata/md5-cache/app-portage/gemato-9999
index 5ff277ddf3e9..375dee9655c6 100644
--- a/metadata/md5-cache/app-portage/gemato-9999
+++ b/metadata/md5-cache/app-portage/gemato-9999
@@ -10,5 +10,5 @@ RDEPEND=gpg? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_py
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9ae41ed33048eee14411acd405add2b6
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.6 b/metadata/md5-cache/app-portage/gentoolkit-0.4.6
index 00718a69571b..75c1989cfd6f 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.6
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.6
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.4.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8e369e409bcb3736a58a01057c6e193c
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.7 b/metadata/md5-cache/app-portage/gentoolkit-0.4.7
index 408e5993fd94..30ed057e339d 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.7
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.7
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/portage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.4.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=97311a33d6e42ab83e8df7efa19a7c18
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.8 b/metadata/md5-cache/app-portage/gentoolkit-0.4.8
index 4a74273ab453..c7018cd4c67f 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.8
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.8
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/portage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.4.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=06296208bac1822c7477c841098c248e
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.5.0-r2 b/metadata/md5-cache/app-portage/gentoolkit-0.5.0-r2
index 6e4232002077..6d42221abff6 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.5.0-r2
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.5.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f61a4579eabe134eb7edd00e0e1b28e3
diff --git a/metadata/md5-cache/app-portage/gentoolkit-9999 b/metadata/md5-cache/app-portage/gentoolkit-9999
index 7c3587088ee7..18bc7506b6eb 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-9999
+++ b/metadata/md5-cache/app-portage/gentoolkit-9999
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/portage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7b7b5d3a13c6eb5881ea52527a4fdcb4
diff --git a/metadata/md5-cache/app-portage/gentoopm-0.3.1 b/metadata/md5-cache/app-portage/gentoopm-0.3.1
index 7321b352ffc3..b48e09ca8de2 100644
--- a/metadata/md5-cache/app-portage/gentoopm-0.3.1
+++ b/metadata/md5-cache/app-portage/gentoopm-0.3.1
@@ -11,5 +11,5 @@ RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[python_targets_python3_6(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/gentoopm/archive/v0.3.1.tar.gz -> gentoopm-0.3.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a5fa1d49257ca19107332ec642798df
diff --git a/metadata/md5-cache/app-portage/gentoopm-0.3.2 b/metadata/md5-cache/app-portage/gentoopm-0.3.2
index 656a661c8bbf..fb2d59008fb9 100644
--- a/metadata/md5-cache/app-portage/gentoopm-0.3.2
+++ b/metadata/md5-cache/app-portage/gentoopm-0.3.2
@@ -11,5 +11,5 @@ RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[python_targets_python3_6(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/gentoopm/archive/v0.3.2.tar.gz -> gentoopm-0.3.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d50f88da15e3646d1e9d9510c0b2243d
diff --git a/metadata/md5-cache/app-portage/gentoopm-9999 b/metadata/md5-cache/app-portage/gentoopm-9999
index 9e85c7c69f01..3f8fc35ec814 100644
--- a/metadata/md5-cache/app-portage/gentoopm-9999
+++ b/metadata/md5-cache/app-portage/gentoopm-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/portage-2.1.10.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=349a1999b9aafcc559711aeb36949569
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.4.5 b/metadata/md5-cache/app-portage/gpyutils-0.4.5
index 3a9233275f51..f35e20482aed 100644
--- a/metadata/md5-cache/app-portage/gpyutils-0.4.5
+++ b/metadata/md5-cache/app-portage/gpyutils-0.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_6(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/gpyutils/archive/v0.4.5.tar.gz -> gpyutils-0.4.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=071adf92b6c67422c7b22a938238c6e1
diff --git a/metadata/md5-cache/app-portage/gpyutils-9999 b/metadata/md5-cache/app-portage/gpyutils-9999
index bbaad1d58da1..0dc83eba72f6 100644
--- a/metadata/md5-cache/app-portage/gpyutils-9999
+++ b/metadata/md5-cache/app-portage/gpyutils-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=102df457495cf3d03e0cf3b7c5e34cc5
diff --git a/metadata/md5-cache/app-portage/grs-0.7 b/metadata/md5-cache/app-portage/grs-0.7
index a12376a4ac3e..9d7d584d4137 100644
--- a/metadata/md5-cache/app-portage/grs-0.7
+++ b/metadata/md5-cache/app-portage/grs-0.7
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-crypt/md5deep dev-lib
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/grs/grs-0.7.tar.gz https://dev.gentoo.org/~blueness/grs/ISO-1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d1e88f9d001f4cb9503ebeb02a0536ed
diff --git a/metadata/md5-cache/app-portage/grs-9999 b/metadata/md5-cache/app-portage/grs-9999
index 999443aa0b2a..d3832e27198f 100644
--- a/metadata/md5-cache/app-portage/grs-9999
+++ b/metadata/md5-cache/app-portage/grs-9999
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-crypt/md5deep dev-lib
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/grs/ISO-1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b33fd69682d931e2a691d368dc001ab8
diff --git a/metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1 b/metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
index a8dd7faa7867..86ac47574da8 100644
--- a/metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
+++ b/metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=app-portage/g-sorcery[python_targets_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jauhien/gs-elpa/archive/0.1.3.tar.gz -> gs-elpa-0.1.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=91d24ade616d2da18fc246eef2a71aa2
diff --git a/metadata/md5-cache/app-portage/layman-2.4.3 b/metadata/md5-cache/app-portage/layman-2.4.3
index 745c46622dde..85e1d9c53d63 100644
--- a/metadata/md5-cache/app-portage/layman-2.4.3
+++ b/metadata/md5-cache/app-portage/layman-2.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.4.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d8e7fc1f78ea916caa5fdafd68d50649
diff --git a/metadata/md5-cache/app-portage/layman-9999 b/metadata/md5-cache/app-portage/layman-9999
index d21b4e8eac3c..35935619e356 100644
--- a/metadata/md5-cache/app-portage/layman-9999
+++ b/metadata/md5-cache/app-portage/layman-9999
@@ -11,5 +11,5 @@ RDEPEND=cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercu
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=37630b9db515cd42888a9e6002095b95
diff --git a/metadata/md5-cache/app-portage/metagen-0.7.2 b/metadata/md5-cache/app-portage/metagen-0.7.2
index 6dfe46aaf6a8..0356263b8198 100644
--- a/metadata/md5-cache/app-portage/metagen-0.7.2
+++ b/metadata/md5-cache/app-portage/metagen-0.7.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/m/metagen/metagen-0.7.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a2df77db0a5ef6cd6c1083e9abef1a08
diff --git a/metadata/md5-cache/app-portage/metagen-9999 b/metadata/md5-cache/app-portage/metagen-9999
index 5d9b52109cee..e1623bdba104 100644
--- a/metadata/md5-cache/app-portage/metagen-9999
+++ b/metadata/md5-cache/app-portage/metagen-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9fac634b4fbb35e0a21e1056f5206546
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.3 b/metadata/md5-cache/app-portage/mirrorselect-2.2.3
index 71066ea476cf..c9dad0fc8b62 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.3
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.3[python
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-2.2.3.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=77e996329ca2ade67c73e33897832308
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1 b/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
index 84805d4da62e..4d8f25821f9c 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.3[python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/dist/mirrorselect-2.2.4.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=440bb16e54b401dccf2af8db58e51923
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r1 b/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r1
index 73fafa06fd84..19bc36f1dc8e 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r1
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)?] >=dev-python/ssl-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/dist/mirrorselect-2.2.6.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b2833937c0db9e4739c18dbd52643356
diff --git a/metadata/md5-cache/app-portage/mirrorselect-9999 b/metadata/md5-cache/app-portage/mirrorselect-9999
index dfa343ef2e56..bb2d460605b2 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-9999
+++ b/metadata/md5-cache/app-portage/mirrorselect-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)] ~dev-python/ssl-fetch-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=633fce20076bd3eacda93cd14362b091
diff --git a/metadata/md5-cache/app-portage/nattka-0.2.10 b/metadata/md5-cache/app-portage/nattka-0.2.10
index c919b46d4537..1dd0ca57bdb0 100644
--- a/metadata/md5-cache/app-portage/nattka-0.2.10
+++ b/metadata/md5-cache/app-portage/nattka-0.2.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/nattka/archive/v0.2.10.tar.gz -> nattka-0.2.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f9fb585be35a572ed227e0cf87b0cdf4
diff --git a/metadata/md5-cache/app-portage/nattka-0.2.11 b/metadata/md5-cache/app-portage/nattka-0.2.11
index 6840e6400cf4..0f7b81d8cb4d 100644
--- a/metadata/md5-cache/app-portage/nattka-0.2.11
+++ b/metadata/md5-cache/app-portage/nattka-0.2.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/nattka/archive/v0.2.11.tar.gz -> nattka-0.2.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=939ddff4be7603c95a9f452bb8a0b67c
diff --git a/metadata/md5-cache/app-portage/nattka-0.2.9 b/metadata/md5-cache/app-portage/nattka-0.2.9
index b0724cf511b6..4d9751b8c028 100644
--- a/metadata/md5-cache/app-portage/nattka-0.2.9
+++ b/metadata/md5-cache/app-portage/nattka-0.2.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/nattka/archive/v0.2.9.tar.gz -> nattka-0.2.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f9fb585be35a572ed227e0cf87b0cdf4
diff --git a/metadata/md5-cache/app-portage/nattka-9999 b/metadata/md5-cache/app-portage/nattka-9999
index d86c98fd8f11..73a6974c5d21 100644
--- a/metadata/md5-cache/app-portage/nattka-9999
+++ b/metadata/md5-cache/app-portage/nattka-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=364727685c0675123fc9f5b40421273b
diff --git a/metadata/md5-cache/app-portage/overlint-0.5.3-r1 b/metadata/md5-cache/app-portage/overlint-0.5.3-r1
index d1880e65214b..f6258af0b89b 100644
--- a/metadata/md5-cache/app-portage/overlint-0.5.3-r1
+++ b/metadata/md5-cache/app-portage/overlint-0.5.3-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage[python_targets_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://www.hartwork.org/public/overlint-0.5.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f14a9ad81f8ddc55989632f717c027db
diff --git a/metadata/md5-cache/app-portage/overlint-0.5.3-r2 b/metadata/md5-cache/app-portage/overlint-0.5.3-r2
index 4751a764b0f7..ca5eeece5dbb 100644
--- a/metadata/md5-cache/app-portage/overlint-0.5.3-r2
+++ b/metadata/md5-cache/app-portage/overlint-0.5.3-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.hartwork.org/public/overlint-0.5.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=159f569019ac5fe6b0b2bd2adc698f70
diff --git a/metadata/md5-cache/app-portage/pfl-3.1-r1 b/metadata/md5-cache/app-portage/pfl-3.1-r1
index 200931bef998..99b9ccf4da96 100644
--- a/metadata/md5-cache/app-portage/pfl-3.1-r1
+++ b/metadata/md5-cache/app-portage/pfl-3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/portagefilelist/client/archive/3.1.tar.gz -> pfl-3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=984f2fbc14a6f2635a9020114d5f0713
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.23 b/metadata/md5-cache/app-portage/repoman-2.3.23
index 2e43ff3a0f2d..9493339bcee9 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.23
+++ b/metadata/md5-cache/app-portage/repoman-2.3.23
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/portage-2.3.80[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-2.3.23.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aacd921b683c0c8b10d27f1cc48512e6
diff --git a/metadata/md5-cache/app-portage/repoman-3.0.1 b/metadata/md5-cache/app-portage/repoman-3.0.1
index f53c338cbf3b..3de11b0b1136 100644
--- a/metadata/md5-cache/app-portage/repoman-3.0.1
+++ b/metadata/md5-cache/app-portage/repoman-3.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/portage-3.0.4[python_targets_pypy3(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-3.0.1.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fc7d83a83d17e349ab9595a0f64601c2
diff --git a/metadata/md5-cache/app-portage/repoman-3.0.2 b/metadata/md5-cache/app-portage/repoman-3.0.2
index 5cee9d79e4a6..39102081e8a3 100644
--- a/metadata/md5-cache/app-portage/repoman-3.0.2
+++ b/metadata/md5-cache/app-portage/repoman-3.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/portage-3.0.4[python_targets_pypy3(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-3.0.2.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fc7d83a83d17e349ab9595a0f64601c2
diff --git a/metadata/md5-cache/app-portage/repoman-9999 b/metadata/md5-cache/app-portage/repoman-9999
index c7b461bfe308..e12723d26485 100644
--- a/metadata/md5-cache/app-portage/repoman-9999
+++ b/metadata/md5-cache/app-portage/repoman-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/portage-3.0.4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-3.6.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=02534f963787d0719f914591658fea4b
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.6 b/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.6
index 7cf203bd4498..3cc3a2bb2a94 100644
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.6
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mgorny/smart-live-rebuild/archive/v1.3.6.tar.gz -> smart-live-rebuild-1.3.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=812751d529db891b81d33b5724eb6b87
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-9999 b/metadata/md5-cache/app-portage/smart-live-rebuild-9999
index 9ca05a8f0b5e..369fc7e95aa9 100644
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-9999
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=731b36057fa5c1d6c2640bc9fc99b871
diff --git a/metadata/md5-cache/app-portage/tatt-0.7-r1 b/metadata/md5-cache/app-portage/tatt-0.7-r1
index 45a1bb2c049c..1e7751162ead 100644
--- a/metadata/md5-cache/app-portage/tatt-0.7-r1
+++ b/metadata/md5-cache/app-portage/tatt-0.7-r1
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=arch testing tool
 EAPI=7
 HOMEPAGE=https://github.com/gentoo/tatt
-IUSE=+templates python_targets_python3_6 python_targets_python3_7
+IUSE=+templates python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=app-portage/eix app-portage/gentoolkit[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-client/pybugz python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=app-portage/eix app-portage/gentoolkit[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] www-client/pybugz python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/tatt/archive/v0.7.tar.gz -> tatt-0.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=08cd1af5d3e1d9a3373583679e295e2e
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=925ad863b0578aff67d313c54291ac0c
diff --git a/metadata/md5-cache/app-portage/tatt-0.8 b/metadata/md5-cache/app-portage/tatt-0.8
new file mode 100644
index 000000000000..d5b975116a42
--- /dev/null
+++ b/metadata/md5-cache/app-portage/tatt-0.8
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Arch testing tool
+EAPI=7
+HOMEPAGE=https://github.com/gentoo/tatt
+IUSE=+templates python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=app-portage/eix app-portage/gentoolkit[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-portage/nattka[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] www-client/pybugz python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/gentoo/tatt/archive/v0.8.tar.gz -> tatt-0.8.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=45dfc9e16d650714ce873e7b4122e753
diff --git a/metadata/md5-cache/app-portage/tatt-9999 b/metadata/md5-cache/app-portage/tatt-9999
index 3ef83fd7a337..fcdc43aa9042 100644
--- a/metadata/md5-cache/app-portage/tatt-9999
+++ b/metadata/md5-cache/app-portage/tatt-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=app-portage/eix app-portage/gentoolkit[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-portage/nattka[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] www-client/pybugz python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f0c9bb8927bca1f887bf0d7fa52a7033
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 73e7123c217b..23a71acb63ed 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/powerline-2.7-r1 b/metadata/md5-cache/app-shells/powerline-2.7-r1
index 30529368bdf3..55bb8189c03e 100644
--- a/metadata/md5-cache/app-shells/powerline-2.7-r1
+++ b/metadata/md5-cache/app-shells/powerline-2.7-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/powerline-status/powerline-status-2.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=aa3256e687f611dd975d71e933361d0d
diff --git a/metadata/md5-cache/app-shells/powerline-2.7-r2 b/metadata/md5-cache/app-shells/powerline-2.7-r2
index 2855f87657b2..f0d505c2d18b 100644
--- a/metadata/md5-cache/app-shells/powerline-2.7-r2
+++ b/metadata/md5-cache/app-shells/powerline-2.7-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/powerline-status/powerline-status-2.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=41263b1448d2475ce9ffec5591ba83b6
diff --git a/metadata/md5-cache/app-shells/powerline-9999 b/metadata/md5-cache/app-shells/powerline-9999
index 149165e97d2f..2db9959fe6e3 100644
--- a/metadata/md5-cache/app-shells/powerline-9999
+++ b/metadata/md5-cache/app-shells/powerline-9999
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=The ultimate statusline/prompt utility.
 EAPI=7
 HOMEPAGE=https://github.com/powerline/powerline
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d1af3bcccd96efb7635fcf9b0ddab070
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e0b9eaa2ab714441fca95f5e031026ad
diff --git a/metadata/md5-cache/app-shells/thefuck-3.27 b/metadata/md5-cache/app-shells/thefuck-3.27
deleted file mode 100644
index 5ef5e7d2fa88..000000000000
--- a/metadata/md5-cache/app-shells/thefuck-3.27
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/psutil[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/colorama[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyte[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest-mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Magnificent app which corrects your previous console command
-EAPI=7
-HOMEPAGE=https://github.com/nvbn/thefuck
-IUSE=test python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/psutil[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/colorama[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyte[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nvbn/thefuck/archive/3.27.tar.gz -> thefuck-3.27.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c65a56a47a8c69900390d7554c64d209
diff --git a/metadata/md5-cache/app-shells/thefuck-3.28 b/metadata/md5-cache/app-shells/thefuck-3.28
index 79611a5610f4..279fa9354165 100644
--- a/metadata/md5-cache/app-shells/thefuck-3.28
+++ b/metadata/md5-cache/app-shells/thefuck-3.28
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/colorama[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyte[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/colorama[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyte[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Magnificent app which corrects your previous console command
 EAPI=7
 HOMEPAGE=https://github.com/nvbn/thefuck
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/colorama[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyte[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/colorama[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyte[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nvbn/thefuck/archive/3.28.tar.gz -> thefuck-3.28.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4f691d50e1c20ab1f260c346ed8948c3
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=96ed1172c8963e528fa4ef6e6250ea49
diff --git a/metadata/md5-cache/app-shells/thefuck-3.30 b/metadata/md5-cache/app-shells/thefuck-3.30
new file mode 100644
index 000000000000..47d4626369c4
--- /dev/null
+++ b/metadata/md5-cache/app-shells/thefuck-3.30
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/colorama[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyte[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=Magnificent app which corrects your previous console command
+EAPI=7
+HOMEPAGE=https://github.com/nvbn/thefuck
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/colorama[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyte[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nvbn/thefuck/archive/3.30.tar.gz -> thefuck-3.30.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3223c31309981bc447c873019beb91df
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 38474f256b7f..358801023257 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/capyt-1.1.1 b/metadata/md5-cache/app-text/capyt-1.1.1
index 5e30f04be926..41670ebf1d67 100644
--- a/metadata/md5-cache/app-text/capyt-1.1.1
+++ b/metadata/md5-cache/app-text/capyt-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/lbatalha/capyt/archive/1.1-1.tar.gz -> capyt-1.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f0f802a0e4a6201d98212731ce29aed8
diff --git a/metadata/md5-cache/app-text/dblatex-0.3.11 b/metadata/md5-cache/app-text/dblatex-0.3.11
index c6e3772d6b0d..b0eb8ccc46d2 100644
--- a/metadata/md5-cache/app-text/dblatex-0.3.11
+++ b/metadata/md5-cache/app-text/dblatex-0.3.11
@@ -11,5 +11,5 @@ RDEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/dblatex/dblatex/dblatex-0.3.11/dblatex-0.3.11py3.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d052587085c3fd340bcdfc4a13109af4
diff --git a/metadata/md5-cache/app-text/dblatex-0.3.11-r1 b/metadata/md5-cache/app-text/dblatex-0.3.11-r1
index 8c8b5122bdc7..072157549038 100644
--- a/metadata/md5-cache/app-text/dblatex-0.3.11-r1
+++ b/metadata/md5-cache/app-text/dblatex-0.3.11-r1
@@ -11,5 +11,5 @@ RDEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/dblatex/dblatex/dblatex-0.3.11/dblatex-0.3.11py3.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=22d93344e0d89f89935d467025dd1fd4
diff --git a/metadata/md5-cache/app-text/dos2unix-7.4.2 b/metadata/md5-cache/app-text/dos2unix-7.4.2
index 39c26f19ad9c..3fbf330a7f6b 100644
--- a/metadata/md5-cache/app-text/dos2unix-7.4.2
+++ b/metadata/md5-cache/app-text/dos2unix-7.4.2
@@ -5,11 +5,11 @@ DESCRIPTION=Convert DOS or MAC text files to UNIX format or vice versa
 EAPI=7
 HOMEPAGE=http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/
 IUSE=debug nls test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD-2
 RDEPEND=!app-text/hd2u virtual/libintl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-7.4.2.tar.gz mirror://sourceforge/dos2unix/dos2unix-7.4.2.tar.gz
 _eclasses_=l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=044695d6892e2fd08eb398f94909adf3
+_md5_=d81bb517cedba3ec2f4d53853c8a9244
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r2 b/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r2
index c3db3a73fceb..7ffe410629a7 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r2
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Interpreter for the PostScript language and PDF
 EAPI=7
 HOMEPAGE=https://ghostscript.com/
 IUSE=cups dbus gtk l10n_de static-libs unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=AGPL-3 CPL-1.0
 RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/openjpeg-2.1.0:2= >=media-libs/tiff-4.0.1:0= >=sys-libs/zlib-1.2.7 virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) unicode? ( net-dns/libidn:0= ) X? ( x11-libs/libXt x11-libs/libXext ) app-text/poppler-data >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts )
 SLOT=0
 SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/ghostscript-9.53.3.tar.xz https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/ghostscript-gpl-9.53-patchset-01.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=885e40b72a2346876f4b56200783711e
+_md5_=52a7cbcedaecee7d3cd4d2fabcb012c9
diff --git a/metadata/md5-cache/app-text/grip-4.5.2-r1 b/metadata/md5-cache/app-text/grip-4.5.2-r1
index fc1afe39e970..2fbc58bc4c9e 100644
--- a/metadata/md5-cache/app-text/grip-4.5.2-r1
+++ b/metadata/md5-cache/app-text/grip-4.5.2-r1
@@ -11,5 +11,5 @@ RDEPEND=!media-sound/grip >=dev-python/docopt-0.4.0 >=dev-python/flask-0.10.1 >=
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grip/grip-4.5.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9d3fada3e52b8c5479a301bb729c1800
diff --git a/metadata/md5-cache/app-text/htmlmin-0.1.12 b/metadata/md5-cache/app-text/htmlmin-0.1.12
index 614faf826d2a..91fe333918a5 100644
--- a/metadata/md5-cache/app-text/htmlmin-0.1.12
+++ b/metadata/md5-cache/app-text/htmlmin-0.1.12
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/mankyd/htmlmin/archive/220b1d16442eb4b6fafed338ee3b61f698a01e63.tar.gz -> htmlmin-0.1.12.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a3d9e9abc3ffcf72c98d036aa63dae46
diff --git a/metadata/md5-cache/app-text/krop-0.5.1-r1 b/metadata/md5-cache/app-text/krop-0.5.1-r1
index 960b27527604..a75a8bd0bf42 100644
--- a/metadata/md5-cache/app-text/krop-0.5.1-r1
+++ b/metadata/md5-cache/app-text/krop-0.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-poppler-qt5[python_targets_python3_6(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=http://arminstraub.com/downloads/krop/krop-0.5.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ddcbe4588c338cbb0393b57e2d7a289b
diff --git a/metadata/md5-cache/app-text/krop-0.6.0 b/metadata/md5-cache/app-text/krop-0.6.0
index 55fd35f0af77..8829165aaec2 100644
--- a/metadata/md5-cache/app-text/krop-0.6.0
+++ b/metadata/md5-cache/app-text/krop-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-poppler-qt5[python_targets_python3_6(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/arminstraub/krop/archive/v0.6.0.tar.gz -> krop-0.6.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=964f4982d772330cdb97c90628b5789c
diff --git a/metadata/md5-cache/app-text/krop-9999 b/metadata/md5-cache/app-text/krop-9999
index a631cb182a99..5ff164ab68e0 100644
--- a/metadata/md5-cache/app-text/krop-9999
+++ b/metadata/md5-cache/app-text/krop-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/python-poppler-qt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyPDF2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),gui,widgets] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=964f4982d772330cdb97c90628b5789c
diff --git a/metadata/md5-cache/app-text/liblangtag-0.6.3 b/metadata/md5-cache/app-text/liblangtag-0.6.3
index 5ddeac161a98..17b2596fa468 100644
--- a/metadata/md5-cache/app-text/liblangtag-0.6.3
+++ b/metadata/md5-cache/app-text/liblangtag-0.6.3
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gettext doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection-common )
+BDEPEND=sys-devel/gettext sys-devel/libtool doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection-common )
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) test? ( dev-libs/check )
 DESCRIPTION=An interface library to access tags for identifying languages
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://bitbucket.org/tagoh/liblangtag/downloads/liblangtag-0.6.3.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d9ef9d5db85261fc2e3dd11949f6cd9
+_md5_=06025966dd8b4be28348cc2222d67920
diff --git a/metadata/md5-cache/app-text/nfoview-1.27.1 b/metadata/md5-cache/app-text/nfoview-1.27.1
index 85f8059c6549..c9332b0b7346 100644
--- a/metadata/md5-cache/app-text/nfoview-1.27.1
+++ b/metadata/md5-cache/app-text/nfoview-1.27.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/otsaloma/nfoview/archive/1.27.1.tar.gz -> nfoview-1.27.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=968ac7c07529c7576a9faed8f822d923
diff --git a/metadata/md5-cache/app-text/nfoview-1.28 b/metadata/md5-cache/app-text/nfoview-1.28
index 6d1454aa640d..202f6e4aca3d 100644
--- a/metadata/md5-cache/app-text/nfoview-1.28
+++ b/metadata/md5-cache/app-text/nfoview-1.28
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/otsaloma/nfoview/archive/1.28.tar.gz -> nfoview-1.28.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d07a7760fb67270705bc5088da4e38e0
diff --git a/metadata/md5-cache/app-text/nfoview-9999 b/metadata/md5-cache/app-text/nfoview-9999
index b722e582a274..fac2a8144f40 100644
--- a/metadata/md5-cache/app-text/nfoview-9999
+++ b/metadata/md5-cache/app-text/nfoview-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-fonts/terminus-font python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b1571c60e4794e30ab2e0b19b189fc3
diff --git a/metadata/md5-cache/app-text/paperwork-1.3.1 b/metadata/md5-cache/app-text/paperwork-1.3.1
index 28bc6e2f9008..6ac6fc094f34 100644
--- a/metadata/md5-cache/app-text/paperwork-1.3.1
+++ b/metadata/md5-cache/app-text/paperwork-1.3.1
@@ -11,5 +11,5 @@ RDEPEND=~app-text/paperwork-backend-1.3.1[python_targets_python3_6(-)?,python_ta
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork/paperwork-1.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a3797e2e54febb95b5e5c46e1ef5468e
diff --git a/metadata/md5-cache/app-text/paperwork-backend-1.3.1 b/metadata/md5-cache/app-text/paperwork-backend-1.3.1
index 4687bb6dec61..6b8cc8e043b6 100644
--- a/metadata/md5-cache/app-text/paperwork-backend-1.3.1
+++ b/metadata/md5-cache/app-text/paperwork-backend-1.3.1
@@ -11,5 +11,5 @@ RDEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork-backend/paperwork-backend-1.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=70286756e84c59bc2bbafbb11ff0f354
diff --git a/metadata/md5-cache/app-text/paperwork-backend-1.3.1-r1 b/metadata/md5-cache/app-text/paperwork-backend-1.3.1-r1
index 5a981967e2ab..77bf38373cce 100644
--- a/metadata/md5-cache/app-text/paperwork-backend-1.3.1-r1
+++ b/metadata/md5-cache/app-text/paperwork-backend-1.3.1-r1
@@ -11,5 +11,5 @@ RDEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork-backend/paperwork-backend-1.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0234cea9feb861d67ec49a0cd0d3c8a7
diff --git a/metadata/md5-cache/app-text/pdfarranger-1.3.1 b/metadata/md5-cache/app-text/pdfarranger-1.3.1
index 7f09f45907c0..1e641d041e48 100644
--- a/metadata/md5-cache/app-text/pdfarranger-1.3.1
+++ b/metadata/md5-cache/app-text/pdfarranger-1.3.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pikepdf[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jeromerobert/pdfarranger/archive/1.3.1.tar.gz -> pdfarranger-1.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6267cd865e66dc86ae884a6cc34d476f
diff --git a/metadata/md5-cache/app-text/pdfarranger-1.5.3-r1 b/metadata/md5-cache/app-text/pdfarranger-1.5.3-r1
index 91e05c3a41f3..f8809915388a 100644
--- a/metadata/md5-cache/app-text/pdfarranger-1.5.3-r1
+++ b/metadata/md5-cache/app-text/pdfarranger-1.5.3-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pikepdf[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jeromerobert/pdfarranger/archive/1.5.3.tar.gz -> pdfarranger-1.5.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e9e3144dc6ff16093bdc595ca400b70f
diff --git a/metadata/md5-cache/app-text/pdfarranger-1.6.2 b/metadata/md5-cache/app-text/pdfarranger-1.6.2
index 1b3938a339ca..ff5f52cbad80 100644
--- a/metadata/md5-cache/app-text/pdfarranger-1.6.2
+++ b/metadata/md5-cache/app-text/pdfarranger-1.6.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pikepdf[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jeromerobert/pdfarranger/archive/1.6.2.tar.gz -> pdfarranger-1.6.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e9e3144dc6ff16093bdc595ca400b70f
diff --git a/metadata/md5-cache/app-text/pdfminer-20191020 b/metadata/md5-cache/app-text/pdfminer-20191020
index 78bbab821c5f..429d193c1932 100644
--- a/metadata/md5-cache/app-text/pdfminer-20191020
+++ b/metadata/md5-cache/app-text/pdfminer-20191020
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdfminer/pdfminer-20191020.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3437df2f26988e6c1591d347b173519b
diff --git a/metadata/md5-cache/app-text/pelican-4.2.0 b/metadata/md5-cache/app-text/pelican-4.2.0
index 4f14c12c2ff8..f1d4563c682c 100644
--- a/metadata/md5-cache/app-text/pelican-4.2.0
+++ b/metadata/md5-cache/app-text/pelican-4.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/getpelican/pelican/archive/4.2.0.tar.gz -> pelican-4.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=101292b69b2cda602b786f7e43816864
diff --git a/metadata/md5-cache/app-text/pelican-4.5.1 b/metadata/md5-cache/app-text/pelican-4.5.1
index f29a85705da2..16fdb28136a3 100644
--- a/metadata/md5-cache/app-text/pelican-4.5.1
+++ b/metadata/md5-cache/app-text/pelican-4.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/getpelican/pelican/archive/4.5.1.tar.gz -> pelican-4.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=14a4913b349875940926261c91287e6a
diff --git a/metadata/md5-cache/app-text/pelican-9999 b/metadata/md5-cache/app-text/pelican-9999
index 1c2018e132b1..f476522feea6 100644
--- a/metadata/md5-cache/app-text/pelican-9999
+++ b/metadata/md5-cache/app-text/pelican-9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e49811ec4997d178e5db0dab7849d038
diff --git a/metadata/md5-cache/app-text/poppler-20.12.0 b/metadata/md5-cache/app-text/poppler-20.12.0
new file mode 100644
index 000000000000..51cb26626c17
--- /dev/null
+++ b/metadata/md5-cache/app-text/poppler-20.12.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 )
+DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
+EAPI=7
+HOMEPAGE=https://poppler.freedesktop.org/
+IUSE=cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
+RESTRICT=test
+SLOT=0/105
+SRC_URI=https://poppler.freedesktop.org/poppler-20.12.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2d9900d653196f4dabf76f15c095a7a4
diff --git a/metadata/md5-cache/app-text/poppler-9999 b/metadata/md5-cache/app-text/poppler-9999
index d5a6e591160c..896088f67d67 100644
--- a/metadata/md5-cache/app-text/poppler-9999
+++ b/metadata/md5-cache/app-text/poppler-9999
@@ -11,4 +11,4 @@ RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-lib
 RESTRICT=test
 SLOT=0/9999
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=88d347fbcd5b3949003bdc3d2c9860aa
+_md5_=2d9900d653196f4dabf76f15c095a7a4
diff --git a/metadata/md5-cache/app-text/pytextile-3.0.3 b/metadata/md5-cache/app-text/pytextile-3.0.3
index 8f0cf6571034..72c9e245274d 100644
--- a/metadata/md5-cache/app-text/pytextile-3.0.3
+++ b/metadata/md5-cache/app-text/pytextile-3.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/textile/python-textile/archive/3.0.3.tar.gz -> pytextile-3.0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6873fd17491428d15c1058bf9906ddfd
diff --git a/metadata/md5-cache/app-text/pytextile-4.0.1 b/metadata/md5-cache/app-text/pytextile-4.0.1
index 4146ecbcff34..42a6e110bc45 100644
--- a/metadata/md5-cache/app-text/pytextile-4.0.1
+++ b/metadata/md5-cache/app-text/pytextile-4.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/textile/python-textile/archive/4.0.1.tar.gz -> pytextile-4.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f07c3f12de81ef55ecad779e6b5bbc8a
diff --git a/metadata/md5-cache/app-text/qpdf-10.0.4 b/metadata/md5-cache/app-text/qpdf-10.0.4
index 56f36f9f2070..f6a39eef960d 100644
--- a/metadata/md5-cache/app-text/qpdf-10.0.4
+++ b/metadata/md5-cache/app-text/qpdf-10.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line tool for structural, content-preserving transformation
 EAPI=7
 HOMEPAGE=http://qpdf.sourceforge.net/
 IUSE=doc examples libressl ssl test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
 LICENSE=|| ( Apache-2.0 Artistic-2 )
 RDEPEND=net-libs/gnutls:0= sys-libs/zlib virtual/jpeg:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 RESTRICT=!test? ( test )
 SLOT=0/28
 SRC_URI=mirror://sourceforge/qpdf/qpdf-10.0.4.tar.gz
-_md5_=66742acaf5cd1b8ddafd3e4c87e4d856
+_md5_=5e9ab75af3c0cddfc5b80ec1cee29596
diff --git a/metadata/md5-cache/app-text/restview-2.9.2 b/metadata/md5-cache/app-text/restview-2.9.2
index 3602f1be0df5..64c86a484ab9 100644
--- a/metadata/md5-cache/app-text/restview-2.9.2
+++ b/metadata/md5-cache/app-text/restview-2.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/restview/restview-2.9.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=02d9576e60b3dc7849b44b16be62e1ce
diff --git a/metadata/md5-cache/app-text/rnc2rng-2.6.1 b/metadata/md5-cache/app-text/rnc2rng-2.6.1
index 65237d8da626..f7153118293d 100644
--- a/metadata/md5-cache/app-text/rnc2rng-2.6.1
+++ b/metadata/md5-cache/app-text/rnc2rng-2.6.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rnc2rng/rnc2rng-2.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2b7d6dba30bc5eff505021d8f0695851
diff --git a/metadata/md5-cache/app-text/rnc2rng-2.6.2 b/metadata/md5-cache/app-text/rnc2rng-2.6.2
index ea294741c030..8fd46faa9ea4 100644
--- a/metadata/md5-cache/app-text/rnc2rng-2.6.2
+++ b/metadata/md5-cache/app-text/rnc2rng-2.6.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rnc2rng/rnc2rng-2.6.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7df6d61d911da3fab1173fedeaa0c419
diff --git a/metadata/md5-cache/app-text/rnc2rng-2.6.4 b/metadata/md5-cache/app-text/rnc2rng-2.6.4
index 59038c79bf62..020feb7cb014 100644
--- a/metadata/md5-cache/app-text/rnc2rng-2.6.4
+++ b/metadata/md5-cache/app-text/rnc2rng-2.6.4
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rply[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/rply[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=RELAX NG Compact to regular syntax conversion library
 EAPI=7
 HOMEPAGE=https://github.com/djc/rnc2rng
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/rply[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/rply[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rnc2rng/rnc2rng-2.6.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e9ce133668b5c304f11a20d0f81ac22d
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5e957835955412644f05f54d44109f8f
diff --git a/metadata/md5-cache/app-text/rpl-1.6.7 b/metadata/md5-cache/app-text/rpl-1.6.7
index 8f9e104e675f..d60ad9bff575 100644
--- a/metadata/md5-cache/app-text/rpl-1.6.7
+++ b/metadata/md5-cache/app-text/rpl-1.6.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=http://deb.debian.org/debian/pool/main/r/rpl/rpl_1.6.7.orig.tar.gz -> rpl-1.6.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=561ab1b6cd2ccdf873b9d45b6ad7cec0
diff --git a/metadata/md5-cache/app-text/sword-modules-2.1 b/metadata/md5-cache/app-text/sword-modules-2.2
similarity index 95%
rename from metadata/md5-cache/app-text/sword-modules-2.1
rename to metadata/md5-cache/app-text/sword-modules-2.2
index 47e2bc2c70ba..faa6d1d50113 100644
--- a/metadata/md5-cache/app-text/sword-modules-2.1
+++ b/metadata/md5-cache/app-text/sword-modules-2.2
@@ -5,6 +5,6 @@ HOMEPAGE=https://www.crosswire.org/sword/modules/
 IUSE=-esoteric l10n_af l10n_ar l10n_az l10n_be l10n_bea l10n_bg l10n_bla l10n_br l10n_ch l10n_chr l10n_ckb l10n_cop l10n_cs l10n_cu l10n_cy l10n_da l10n_de l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_ga l10n_gd l10n_gez l10n_got l10n_grc l10n_gv l10n_he l10n_hi l10n_hr l10n_ht l10n_hu l10n_hy l10n_it l10n_ja l10n_kek l10n_kk l10n_km l10n_ko l10n_kpg l10n_ktu l10n_la l10n_ln l10n_lt l10n_lv l10n_mg l10n_mi l10n_ml l10n_mn l10n_my l10n_nb l10n_nd l10n_nl l10n_nn l10n_pl l10n_pon l10n_pot l10n_ppk l10n_prs l10n_pt l10n_rmq l10n_ro l10n_ru l10n_sl l10n_sml l10n_sn l10n_so l10n_sq l10n_sr l10n_sv l10n_sw l10n_syr l10n_th l10n_tl l10n_tlh l10n_tr l10n_tsg l10n_ug l10n_uk l10n_ur l10n_vi l10n_vls l10n_zh
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=metapackage
-RDEPEND=|| ( app-dicts/sword-Eusebian_num app-dicts/sword-Eusebian_vs ) app-dicts/sword-Personal esoteric? ( app-dicts/sword-Phaistos app-dicts/sword-Sentiment ) l10n_af? ( app-dicts/sword-Afr1953 ) l10n_ar? ( app-dicts/sword-AraNAV app-dicts/sword-AraSVD app-dicts/sword-alzat ) l10n_az? ( app-dicts/sword-Azeri app-dicts/sword-NorthernAzeri ) l10n_be? ( app-dicts/sword-Bela ) l10n_bea? ( app-dicts/sword-BeaMRK ) l10n_bg? ( app-dicts/sword-BulVeren ) l10n_bla? ( app-dicts/sword-BlaMat ) l10n_br? ( app-dicts/sword-BretonNT app-dicts/sword-br_en ) l10n_ch? ( app-dicts/sword-Chamorro ) l10n_chr? ( app-dicts/sword-Che1860 ) l10n_ckb? ( app-dicts/sword-Sorani ) l10n_cop? ( app-dicts/sword-CopNT app-dicts/sword-CopSahBible2 app-dicts/sword-CopSahHorner app-dicts/sword-CopSahidicMSS app-dicts/sword-CopSahidica app-dicts/sword-SahidicBible ) l10n_cs? ( app-dicts/sword-CzeB21 app-dicts/sword-CzeBKR app-dicts/sword-CzeCEP app-dicts/sword-CzeCSP ) l10n_cu? ( app-dicts/sword-CSlElizabeth ) l10n_cy? ( app-dicts/sword-WelBeiblNet ) l10n_da? ( app-dicts/sword-DaNT1819 app-dicts/sword-DaOT1871NT1907 app-dicts/sword-DaOT1931NT1907 ) l10n_de? ( app-dicts/sword-GerAlbrecht app-dicts/sword-GerAugustinus app-dicts/sword-GerElb1871 app-dicts/sword-GerElb1905 app-dicts/sword-GerGruenewald app-dicts/sword-GerLeoNA28 app-dicts/sword-GerLeoRP18 app-dicts/sword-GerLut1545 app-dicts/sword-GerLutherpredigten app-dicts/sword-GerNeUe app-dicts/sword-GerReinhardt app-dicts/sword-GerSch app-dicts/sword-GerTafel app-dicts/sword-GerTextbibel app-dicts/sword-MAK app-dicts/sword-Rieger ) l10n_el? ( app-dicts/sword-GreVamvas ) l10n_en? ( app-dicts/sword-2BabDict app-dicts/sword-AB app-dicts/sword-ABP app-dicts/sword-ABS_Essay_GoodSam_SWB app-dicts/sword-ACV app-dicts/sword-AKJV app-dicts/sword-ASV app-dicts/sword-Abbott app-dicts/sword-AbbottSmith app-dicts/sword-AbbottSmithStrongs app-dicts/sword-AmTract app-dicts/sword-Anderson app-dicts/sword-BBE app-dicts/sword-BDBGlosses_Strongs app-dicts/sword-BWE app-dicts/sword-BaptistConfession1689 app-dicts/sword-Barnes app-dicts/sword-Burkitt app-dicts/sword-CBC app-dicts/sword-CPDV app-dicts/sword-Catena app-dicts/sword-Cawdrey app-dicts/sword-Clarke app-dicts/sword-Common app-dicts/sword-Concord app-dicts/sword-DBD app-dicts/sword-DRC app-dicts/sword-DTN app-dicts/sword-Daily app-dicts/sword-Darby app-dicts/sword-DarkNightOfTheSoul app-dicts/sword-Diaglott app-dicts/sword-Dodson app-dicts/sword-EMBReality app-dicts/sword-EMTV app-dicts/sword-Easton app-dicts/sword-Etheridge app-dicts/sword-Family app-dicts/sword-Finney app-dicts/sword-Geneva app-dicts/sword-Geneva1599 app-dicts/sword-Godbey app-dicts/sword-GodsWord app-dicts/sword-Heretics app-dicts/sword-Hitchcock app-dicts/sword-ISBE app-dicts/sword-ISV app-dicts/sword-Imitation app-dicts/sword-Institutes app-dicts/sword-JCRHoliness app-dicts/sword-JEAffections app-dicts/sword-JESermons app-dicts/sword-JFB app-dicts/sword-JOChrist app-dicts/sword-JOCommGod app-dicts/sword-JOGlory app-dicts/sword-JOMortSin app-dicts/sword-JPS app-dicts/sword-JST app-dicts/sword-Josephus app-dicts/sword-Jubilee2000 app-dicts/sword-KD app-dicts/sword-KJV app-dicts/sword-KJVA app-dicts/sword-KJVPCE app-dicts/sword-LEB app-dicts/sword-LITV app-dicts/sword-LO app-dicts/sword-LawGospel app-dicts/sword-Leeser app-dicts/sword-Lightfoot app-dicts/sword-Luther app-dicts/sword-MHC app-dicts/sword-MHCC app-dicts/sword-MKJV app-dicts/sword-MLStrong app-dicts/sword-MollColossians app-dicts/sword-Montgomery app-dicts/sword-Murdock app-dicts/sword-NETfree app-dicts/sword-NETnotesfree app-dicts/sword-NETtext app-dicts/sword-NHEB app-dicts/sword-NHEBJE app-dicts/sword-NHEBME app-dicts/sword-Nave app-dicts/sword-Noyes app-dicts/sword-OEB app-dicts/sword-OEBcth app-dicts/sword-OSHM app-dicts/sword-OrthJBC app-dicts/sword-Orthodoxy app-dicts/sword-PNT app-dicts/sword-Packard app-dicts/sword-Passion app-dicts/sword-Pilgrim app-dicts/sword-Practice app-dicts/sword-QuotingPassages app-dicts/sword-RKJNT app-dicts/sword-RNKJV app-dicts/sword-RWP app-dicts/sword-RWebster app-dicts/sword-RecVer app-dicts/sword-Robinson app-dicts/sword-Rotherham app-dicts/sword-SAOA app-dicts/sword-SME app-dicts/sword-SPE app-dicts/sword-Scofield app-dicts/sword-Smith app-dicts/sword-Spurious app-dicts/sword-StrongsGreek app-dicts/sword-StrongsHebrew app-dicts/sword-TCR app-dicts/sword-TDavid app-dicts/sword-TFG app-dicts/sword-TSK app-dicts/sword-Torrey app-dicts/sword-Twenty app-dicts/sword-Tyndale app-dicts/sword-UKJV app-dicts/sword-Webster app-dicts/sword-Webster1806 app-dicts/sword-Webster1913 app-dicts/sword-Wesley app-dicts/sword-Westminster app-dicts/sword-Westminster21 app-dicts/sword-Weymouth app-dicts/sword-Worsley app-dicts/sword-Wycliffe app-dicts/sword-YLT ) l10n_eo? ( app-dicts/sword-Esperanto ) l10n_es? ( app-dicts/sword-SpaRV app-dicts/sword-SpaRV1865 app-dicts/sword-SpaRV1909 app-dicts/sword-SpaRVG app-dicts/sword-SpaTDP app-dicts/sword-SpaVNT ) l10n_et? ( app-dicts/sword-Est ) l10n_eu? ( app-dicts/sword-BasHautin app-dicts/sword-en_eu ) l10n_fa? ( app-dicts/sword-FarHezareNoh app-dicts/sword-FarOPV app-dicts/sword-FarTPV ) l10n_fi? ( app-dicts/sword-FinBiblia app-dicts/sword-FinPR app-dicts/sword-FinPR92 app-dicts/sword-FinRK app-dicts/sword-FinSTLK2017 ) l10n_fr? ( app-dicts/sword-FreBBB app-dicts/sword-FreBDM1707 app-dicts/sword-FreBDM1744 app-dicts/sword-FreBailly app-dicts/sword-FreCJE app-dicts/sword-FreCrampon app-dicts/sword-FreDAW app-dicts/sword-FreGBM app-dicts/sword-FreGeneve1669 app-dicts/sword-FreJND app-dicts/sword-FreKhan app-dicts/sword-FreLSN1872 app-dicts/sword-FreLXX app-dicts/sword-FreOltramare1874 app-dicts/sword-FrePGR app-dicts/sword-FrePilgrim app-dicts/sword-FreSegond1910 app-dicts/sword-FreStapfer1889 app-dicts/sword-FreSynodale1921 ) l10n_ga? ( app-dicts/sword-IriODomhnuill ) l10n_gd? ( app-dicts/sword-ScotsGaelic ) l10n_gez? ( app-dicts/sword-Geez ) l10n_got? ( app-dicts/sword-Wulfila ) l10n_grc? ( app-dicts/sword-ABPGRK app-dicts/sword-Antoniades app-dicts/sword-Byz app-dicts/sword-Elzevir app-dicts/sword-GreekHebrew app-dicts/sword-LXX app-dicts/sword-MorphGNT app-dicts/sword-Nestle1904 app-dicts/sword-OxfordTR app-dicts/sword-SBLGNT app-dicts/sword-SBLGNTApp app-dicts/sword-TNT app-dicts/sword-TR app-dicts/sword-Tisch app-dicts/sword-VarApp app-dicts/sword-WHNU app-dicts/sword-f35 ) l10n_gv? ( app-dicts/sword-ManxGaelic ) l10n_he? ( app-dicts/sword-Aleppo app-dicts/sword-HebDelitzsch app-dicts/sword-HebModern app-dicts/sword-HebrewGreek app-dicts/sword-MapM app-dicts/sword-OSHB app-dicts/sword-SP app-dicts/sword-SPDSS app-dicts/sword-SPMT app-dicts/sword-SPVar app-dicts/sword-WLC ) l10n_hi? ( app-dicts/sword-HinERV ) l10n_hr? ( app-dicts/sword-CroSaric ) l10n_ht? ( app-dicts/sword-Haitian ) l10n_hu? ( app-dicts/sword-HunKar app-dicts/sword-HunUj ) l10n_hy? ( app-dicts/sword-ArmEastern app-dicts/sword-ArmWestern ) l10n_it? ( app-dicts/sword-ItDizGreco app-dicts/sword-ItNomiBibbia app-dicts/sword-ItaDio app-dicts/sword-ItaRive ) l10n_ja? ( app-dicts/sword-JapBungo app-dicts/sword-JapDenmo app-dicts/sword-JapKougo app-dicts/sword-JapMeiji app-dicts/sword-JapRaguet ) l10n_kek? ( app-dicts/sword-Kekchi ) l10n_kk? ( app-dicts/sword-Kaz ) l10n_km? ( app-dicts/sword-KhmerNT ) l10n_ko? ( app-dicts/sword-KorHKJV app-dicts/sword-KorRV ) l10n_kpg? ( app-dicts/sword-Kapingamarangi ) l10n_ktu? ( app-dicts/sword-KtuVb ) l10n_la? ( app-dicts/sword-VulgClementine app-dicts/sword-VulgConte app-dicts/sword-VulgGlossa app-dicts/sword-VulgHetzenauer app-dicts/sword-VulgSistine app-dicts/sword-Vulgate app-dicts/sword-Vulgate_HebPs app-dicts/sword-la_en ) l10n_ln? ( app-dicts/sword-LinVB ) l10n_lt? ( app-dicts/sword-LtKBB ) l10n_lv? ( app-dicts/sword-Latvian app-dicts/sword-LvGluck8 ) l10n_mg? ( app-dicts/sword-Mg1865 ) l10n_mi? ( app-dicts/sword-Maori ) l10n_ml? ( app-dicts/sword-Mal1910 ) l10n_mn? ( app-dicts/sword-MonKJV ) l10n_my? ( app-dicts/sword-BurCBCM app-dicts/sword-BurJudson ) l10n_nb? ( app-dicts/sword-NorBroed app-dicts/sword-Norsk ) l10n_nd? ( app-dicts/sword-Ndebele ) l10n_nl? ( app-dicts/sword-DutKant app-dicts/sword-DutSVV app-dicts/sword-NlCanisius1939 ) l10n_nn? ( app-dicts/sword-NorSMB ) l10n_pl? ( app-dicts/sword-PolGdanska app-dicts/sword-PolUGdanska ) l10n_pon? ( app-dicts/sword-PohnOld app-dicts/sword-Pohnpeian ) l10n_pot? ( app-dicts/sword-PotLykins ) l10n_ppk? ( app-dicts/sword-Uma ) l10n_prs? ( app-dicts/sword-Dari ) l10n_pt? ( app-dicts/sword-PorAR app-dicts/sword-PorAlmeida1911 app-dicts/sword-PorBLivre app-dicts/sword-PorBLivreTR app-dicts/sword-PorCap app-dicts/sword-PorIBP ) l10n_rmq? ( app-dicts/sword-Calo ) l10n_ro? ( app-dicts/sword-RomCor ) l10n_ru? ( app-dicts/sword-RusCARS app-dicts/sword-RusCARSA app-dicts/sword-RusCARSADICT app-dicts/sword-RusCARSDict app-dicts/sword-RusCARST app-dicts/sword-RusCARSTDICT app-dicts/sword-RusMakarij app-dicts/sword-RusSynodal app-dicts/sword-RusSynodalLIO app-dicts/sword-RusVZh ) l10n_sl? ( app-dicts/sword-SloKJV app-dicts/sword-SloKJVA app-dicts/sword-SloOjacano app-dicts/sword-SloStritar ) l10n_sml? ( app-dicts/sword-sml_BL_2008 ) l10n_sn? ( app-dicts/sword-Shona ) l10n_so? ( app-dicts/sword-SomKQA ) l10n_sq? ( app-dicts/sword-Alb ) l10n_sr? ( app-dicts/sword-SrKDEkavski app-dicts/sword-SrKDIjekav ) l10n_sv? ( app-dicts/sword-Swe1917 app-dicts/sword-Swe1917Of app-dicts/sword-SweFolk1998 app-dicts/sword-SweKarlXII app-dicts/sword-SweKarlXII1873 ) l10n_sw? ( app-dicts/sword-Swahili ) l10n_syr? ( app-dicts/sword-Peshitta ) l10n_th? ( app-dicts/sword-ThaiKJV ) l10n_tl? ( app-dicts/sword-TagAngBiblia app-dicts/sword-Tagalog ) l10n_tlh? ( app-dicts/sword-KLV app-dicts/sword-KLVen_iklingon app-dicts/sword-KLViklingon_en ) l10n_tr? ( app-dicts/sword-TurHADI app-dicts/sword-TurNTB ) l10n_tsg? ( app-dicts/sword-Tausug ) l10n_ug? ( app-dicts/sword-UyCyr ) l10n_uk? ( app-dicts/sword-UkrKulish app-dicts/sword-Ukrainian ) l10n_ur? ( app-dicts/sword-UrduGeo app-dicts/sword-UrduGeoDeva app-dicts/sword-UrduGeoRoman ) l10n_vi? ( app-dicts/sword-FVDPVietAnh app-dicts/sword-VieStrongsGreek app-dicts/sword-Viet app-dicts/sword-VietLCCMN app-dicts/sword-VietLCCMNCT app-dicts/sword-VietNVB ) l10n_vls? ( app-dicts/sword-vlsJoNT ) l10n_zh? ( app-dicts/sword-ChiNCVs app-dicts/sword-ChiNCVt app-dicts/sword-ChiUn app-dicts/sword-ChiUnL app-dicts/sword-ChiUns app-dicts/sword-ZhEnglish app-dicts/sword-ZhHanzi app-dicts/sword-ZhPinyin )
+RDEPEND=|| ( app-dicts/sword-Eusebian_num app-dicts/sword-Eusebian_vs ) app-dicts/sword-Personal esoteric? ( app-dicts/sword-Phaistos app-dicts/sword-Sentiment ) l10n_af? ( app-dicts/sword-Afr1953 ) l10n_ar? ( app-dicts/sword-AraNAV app-dicts/sword-AraSVD app-dicts/sword-alzat ) l10n_az? ( app-dicts/sword-Azeri app-dicts/sword-NorthernAzeri ) l10n_be? ( app-dicts/sword-Bela ) l10n_bea? ( app-dicts/sword-BeaMRK ) l10n_bg? ( app-dicts/sword-BulVeren ) l10n_bla? ( app-dicts/sword-BlaMat ) l10n_br? ( app-dicts/sword-BretonNT app-dicts/sword-br_en ) l10n_ch? ( app-dicts/sword-Chamorro ) l10n_chr? ( app-dicts/sword-Che1860 ) l10n_ckb? ( app-dicts/sword-Sorani ) l10n_cop? ( app-dicts/sword-CopNT app-dicts/sword-CopSahBible2 app-dicts/sword-CopSahHorner app-dicts/sword-CopSahidicMSS app-dicts/sword-CopSahidica app-dicts/sword-SahidicBible ) l10n_cs? ( app-dicts/sword-CzeB21 app-dicts/sword-CzeBKR app-dicts/sword-CzeCEP app-dicts/sword-CzeCSP ) l10n_cu? ( app-dicts/sword-CSlElizabeth ) l10n_cy? ( app-dicts/sword-WelBeiblNet ) l10n_da? ( app-dicts/sword-DaNT1819 app-dicts/sword-DaOT1871NT1907 app-dicts/sword-DaOT1931NT1907 ) l10n_de? ( app-dicts/sword-GerAlbrecht app-dicts/sword-GerAugustinus app-dicts/sword-GerElb1871 app-dicts/sword-GerElb1905 app-dicts/sword-GerGruenewald app-dicts/sword-GerLeoNA28 app-dicts/sword-GerLeoRP18 app-dicts/sword-GerLut1545 app-dicts/sword-GerLutherpredigten app-dicts/sword-GerNeUe app-dicts/sword-GerReinhardt app-dicts/sword-GerSch app-dicts/sword-GerTafel app-dicts/sword-GerTextbibel app-dicts/sword-MAK app-dicts/sword-Rieger ) l10n_el? ( app-dicts/sword-GreVamvas ) l10n_en? ( app-dicts/sword-2BabDict app-dicts/sword-AB app-dicts/sword-ABP app-dicts/sword-ABS_Essay_GoodSam_SWB app-dicts/sword-ACV app-dicts/sword-AKJV app-dicts/sword-ASV app-dicts/sword-Abbott app-dicts/sword-AbbottSmith app-dicts/sword-AbbottSmithStrongs app-dicts/sword-AmTract app-dicts/sword-Anderson app-dicts/sword-BBE app-dicts/sword-BDBGlosses_Strongs app-dicts/sword-BWE app-dicts/sword-BaptistConfession1689 app-dicts/sword-Barnes app-dicts/sword-Burkitt app-dicts/sword-CBC app-dicts/sword-CPDV app-dicts/sword-Catena app-dicts/sword-Cawdrey app-dicts/sword-Clarke app-dicts/sword-Common app-dicts/sword-Concord app-dicts/sword-DBD app-dicts/sword-DRC app-dicts/sword-DTN app-dicts/sword-Daily app-dicts/sword-Darby app-dicts/sword-DarkNightOfTheSoul app-dicts/sword-Diaglott app-dicts/sword-Dodson app-dicts/sword-EMBReality app-dicts/sword-EMTV app-dicts/sword-Easton app-dicts/sword-Etheridge app-dicts/sword-Family app-dicts/sword-Finney app-dicts/sword-Geneva app-dicts/sword-Geneva1599 app-dicts/sword-Godbey app-dicts/sword-GodsWord app-dicts/sword-Heretics app-dicts/sword-Hitchcock app-dicts/sword-ISBE app-dicts/sword-ISV app-dicts/sword-Imitation app-dicts/sword-Institutes app-dicts/sword-JCRHoliness app-dicts/sword-JEAffections app-dicts/sword-JESermons app-dicts/sword-JFB app-dicts/sword-JOChrist app-dicts/sword-JOCommGod app-dicts/sword-JOGlory app-dicts/sword-JOMortSin app-dicts/sword-JPS app-dicts/sword-JST app-dicts/sword-Josephus app-dicts/sword-Jubilee2000 app-dicts/sword-KD app-dicts/sword-KJV app-dicts/sword-KJVA app-dicts/sword-KJVPCE app-dicts/sword-LEB app-dicts/sword-LITV app-dicts/sword-LO app-dicts/sword-LawGospel app-dicts/sword-Leeser app-dicts/sword-Lightfoot app-dicts/sword-Luther app-dicts/sword-MHC app-dicts/sword-MHCC app-dicts/sword-MKJV app-dicts/sword-MLStrong app-dicts/sword-MollColossians app-dicts/sword-Montgomery app-dicts/sword-Murdock app-dicts/sword-NETfree app-dicts/sword-NETnotesfree app-dicts/sword-NETtext app-dicts/sword-NHEB app-dicts/sword-NHEBJE app-dicts/sword-NHEBME app-dicts/sword-Nave app-dicts/sword-Noyes app-dicts/sword-OEB app-dicts/sword-OEBcth app-dicts/sword-OSHM app-dicts/sword-OrthJBC app-dicts/sword-Orthodoxy app-dicts/sword-PNT app-dicts/sword-Packard app-dicts/sword-Passion app-dicts/sword-Pilgrim app-dicts/sword-Practice app-dicts/sword-QuotingPassages app-dicts/sword-RKJNT app-dicts/sword-RNKJV app-dicts/sword-RWP app-dicts/sword-RWebster app-dicts/sword-RecVer app-dicts/sword-Robinson app-dicts/sword-Rotherham app-dicts/sword-SAOA app-dicts/sword-SME app-dicts/sword-SPE app-dicts/sword-Scofield app-dicts/sword-Smith app-dicts/sword-Spurious app-dicts/sword-StrongsGreek app-dicts/sword-StrongsHebrew app-dicts/sword-TCR app-dicts/sword-TDavid app-dicts/sword-TFG app-dicts/sword-TSK app-dicts/sword-Torrey app-dicts/sword-Twenty app-dicts/sword-Tyndale app-dicts/sword-UKJV app-dicts/sword-Webster app-dicts/sword-Webster1806 app-dicts/sword-Webster1913 app-dicts/sword-Wesley app-dicts/sword-Westminster app-dicts/sword-Westminster21 app-dicts/sword-Weymouth app-dicts/sword-Worsley app-dicts/sword-Wycliffe app-dicts/sword-YLT ) l10n_eo? ( app-dicts/sword-Esperanto ) l10n_es? ( app-dicts/sword-SpaRV app-dicts/sword-SpaRV1865 app-dicts/sword-SpaRV1909 app-dicts/sword-SpaRVG app-dicts/sword-SpaTDP app-dicts/sword-SpaVNT ) l10n_et? ( app-dicts/sword-Est ) l10n_eu? ( app-dicts/sword-BasHautin app-dicts/sword-en_eu ) l10n_fa? ( app-dicts/sword-FarHezareNoh app-dicts/sword-FarOPV app-dicts/sword-FarTPV ) l10n_fi? ( app-dicts/sword-FinBiblia app-dicts/sword-FinPR app-dicts/sword-FinPR92 app-dicts/sword-FinRK app-dicts/sword-FinSTLK2017 ) l10n_fr? ( app-dicts/sword-FreBBB app-dicts/sword-FreBDM1707 app-dicts/sword-FreBDM1744 app-dicts/sword-FreBailly app-dicts/sword-FreCJE app-dicts/sword-FreCrampon app-dicts/sword-FreDAW app-dicts/sword-FreGBM app-dicts/sword-FreGeneve1669 app-dicts/sword-FreJND app-dicts/sword-FreKhan app-dicts/sword-FreLSN1872 app-dicts/sword-FreLXX app-dicts/sword-FreOltramare1874 app-dicts/sword-FrePGR app-dicts/sword-FrePilgrim app-dicts/sword-FreSegond1910 app-dicts/sword-FreStapfer1889 app-dicts/sword-FreSynodale1921 ) l10n_ga? ( app-dicts/sword-IriODomhnuill ) l10n_gd? ( app-dicts/sword-ScotsGaelic ) l10n_gez? ( app-dicts/sword-Geez ) l10n_got? ( app-dicts/sword-Wulfila ) l10n_grc? ( app-dicts/sword-ABPGRK app-dicts/sword-Antoniades app-dicts/sword-Byz app-dicts/sword-Elzevir app-dicts/sword-GreekHebrew app-dicts/sword-LXX app-dicts/sword-MorphGNT app-dicts/sword-Nestle1904 app-dicts/sword-OxfordTR app-dicts/sword-SBLGNT app-dicts/sword-SBLGNTApp app-dicts/sword-TNT app-dicts/sword-TR app-dicts/sword-Tisch app-dicts/sword-VarApp app-dicts/sword-WHNU app-dicts/sword-f35 ) l10n_gv? ( app-dicts/sword-ManxGaelic ) l10n_he? ( app-dicts/sword-Aleppo app-dicts/sword-HebDelitzsch app-dicts/sword-HebModern app-dicts/sword-HebrewGreek app-dicts/sword-MapM app-dicts/sword-OSHB app-dicts/sword-SP app-dicts/sword-SPDSS app-dicts/sword-SPMT app-dicts/sword-SPVar app-dicts/sword-WLC ) l10n_hi? ( app-dicts/sword-HinERV ) l10n_hr? ( app-dicts/sword-CroSaric ) l10n_ht? ( app-dicts/sword-Haitian ) l10n_hu? ( app-dicts/sword-HunKar app-dicts/sword-HunUj ) l10n_hy? ( app-dicts/sword-ArmEastern app-dicts/sword-ArmWestern ) l10n_it? ( app-dicts/sword-ItDizGreco app-dicts/sword-ItNomiBibbia app-dicts/sword-ItaDio app-dicts/sword-ItaRive ) l10n_ja? ( app-dicts/sword-JapBungo app-dicts/sword-JapDenmo app-dicts/sword-JapKougo app-dicts/sword-JapMeiji app-dicts/sword-JapRaguet ) l10n_kek? ( app-dicts/sword-Kekchi ) l10n_kk? ( app-dicts/sword-Kaz ) l10n_km? ( app-dicts/sword-KhmerNT ) l10n_ko? ( app-dicts/sword-KorHKJV app-dicts/sword-KorRV ) l10n_kpg? ( app-dicts/sword-Kapingamarangi ) l10n_ktu? ( app-dicts/sword-KtuVb ) l10n_la? ( app-dicts/sword-VulgClementine app-dicts/sword-VulgConte app-dicts/sword-VulgGlossa app-dicts/sword-VulgHetzenauer app-dicts/sword-VulgSistine app-dicts/sword-Vulgate app-dicts/sword-Vulgate_HebPs app-dicts/sword-la_en ) l10n_ln? ( app-dicts/sword-LinVB ) l10n_lt? ( app-dicts/sword-LtKBB ) l10n_lv? ( app-dicts/sword-Latvian app-dicts/sword-LvGluck8 ) l10n_mg? ( app-dicts/sword-Mg1865 ) l10n_mi? ( app-dicts/sword-Maori ) l10n_ml? ( app-dicts/sword-Mal1910 ) l10n_mn? ( app-dicts/sword-MonKJV ) l10n_my? ( app-dicts/sword-BurCBCM app-dicts/sword-BurJudson ) l10n_nb? ( app-dicts/sword-NorBroed app-dicts/sword-Norsk ) l10n_nd? ( app-dicts/sword-Ndebele ) l10n_nl? ( app-dicts/sword-DutKant app-dicts/sword-DutSVV app-dicts/sword-NlCanisius1939 ) l10n_nn? ( app-dicts/sword-NorSMB ) l10n_pl? ( app-dicts/sword-PolGdanska app-dicts/sword-PolUGdanska ) l10n_pon? ( app-dicts/sword-PohnOld app-dicts/sword-Pohnpeian ) l10n_pot? ( app-dicts/sword-PotLykins ) l10n_ppk? ( app-dicts/sword-Uma ) l10n_prs? ( app-dicts/sword-Dari ) l10n_pt? ( app-dicts/sword-PorAR app-dicts/sword-PorAlmeida1911 app-dicts/sword-PorBLivre app-dicts/sword-PorBLivreTR app-dicts/sword-PorCap app-dicts/sword-PorIBP ) l10n_rmq? ( app-dicts/sword-Calo ) l10n_ro? ( app-dicts/sword-RomCor ) l10n_ru? ( app-dicts/sword-RusCARS app-dicts/sword-RusCARSA app-dicts/sword-RusCARSADICT app-dicts/sword-RusCARSDict app-dicts/sword-RusCARST app-dicts/sword-RusCARSTDICT app-dicts/sword-RusMakarij app-dicts/sword-RusSynodal app-dicts/sword-RusSynodalLIO app-dicts/sword-RusVZh ) l10n_sl? ( app-dicts/sword-SloKJV app-dicts/sword-SloKJVA app-dicts/sword-SloOjacano app-dicts/sword-SloStritar ) l10n_sml? ( app-dicts/sword-sml_BL_2008 ) l10n_sn? ( app-dicts/sword-Shona ) l10n_so? ( app-dicts/sword-SomKQA ) l10n_sq? ( app-dicts/sword-Alb ) l10n_sr? ( app-dicts/sword-SrKDEkavski app-dicts/sword-SrKDIjekav ) l10n_sv? ( app-dicts/sword-Swe1917 app-dicts/sword-Swe1917Of app-dicts/sword-SweFolk1998 app-dicts/sword-SweKarlXII app-dicts/sword-SweKarlXII1873 ) l10n_sw? ( app-dicts/sword-Swahili ) l10n_syr? ( app-dicts/sword-Peshitta ) l10n_th? ( app-dicts/sword-ThaiKJV ) l10n_tl? ( app-dicts/sword-TagAngBiblia app-dicts/sword-Tagalog ) l10n_tlh? ( app-dicts/sword-KLV app-dicts/sword-KLVen_iklingon app-dicts/sword-KLViklingon_en ) l10n_tr? ( app-dicts/sword-TurHADI app-dicts/sword-TurNTB ) l10n_tsg? ( app-dicts/sword-Tausug ) l10n_ug? ( app-dicts/sword-UyCyr ) l10n_uk? ( app-dicts/sword-UkrKulish app-dicts/sword-Ukrainian ) l10n_ur? ( app-dicts/sword-UrduGeo app-dicts/sword-UrduGeoDeva app-dicts/sword-UrduGeoRoman ) l10n_vi? ( app-dicts/sword-FVDPVietAnh app-dicts/sword-VieRobinson app-dicts/sword-VieStrongsGreek app-dicts/sword-Viet app-dicts/sword-VietLCCMN app-dicts/sword-VietLCCMNCT app-dicts/sword-VietNVB ) l10n_vls? ( app-dicts/sword-vlsJoNT ) l10n_zh? ( app-dicts/sword-ChiNCVs app-dicts/sword-ChiNCVt app-dicts/sword-ChiUn app-dicts/sword-ChiUnL app-dicts/sword-ChiUns app-dicts/sword-ZhEnglish app-dicts/sword-ZhHanzi app-dicts/sword-ZhPinyin )
 SLOT=0
-_md5_=ec43f99d2913910639b58fa699472cb1
+_md5_=bb0c90be4e809c384784de654e3c26ff
diff --git a/metadata/md5-cache/app-text/txt2tags-3.3 b/metadata/md5-cache/app-text/txt2tags-3.3
index bea199d20ebc..0eb913031ae4 100644
--- a/metadata/md5-cache/app-text/txt2tags-3.3
+++ b/metadata/md5-cache/app-text/txt2tags-3.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jendrikseipp/txt2tags/archive/3.3.tar.gz -> txt2tags-3.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ef825e4bf634c3b685f37b1beb243694
diff --git a/metadata/md5-cache/app-text/txt2tags-3.7 b/metadata/md5-cache/app-text/txt2tags-3.7
index 2dd4254f7c3d..156214de80b8 100644
--- a/metadata/md5-cache/app-text/txt2tags-3.7
+++ b/metadata/md5-cache/app-text/txt2tags-3.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://codeload.github.com/txt2tags/txt2tags/tar.gz/3.7 -> txt2tags-3.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=85d1336740531186ef44af1b58b5ed8e
diff --git a/metadata/md5-cache/app-text/xapers-0.9.0 b/metadata/md5-cache/app-text/xapers-0.9.0
index a19a26d2cbc4..d6f9ac32bd70 100644
--- a/metadata/md5-cache/app-text/xapers-0.9.0
+++ b/metadata/md5-cache/app-text/xapers-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/jrollins/xapers/-/archive/0.9.0/xapers-0.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c53f9d3ab23aa319f25b00e5cfcb5fff
diff --git a/metadata/md5-cache/app-text/xchm-1.31 b/metadata/md5-cache/app-text/xchm-1.31
index bc2782f9b8da..d93eb678898c 100644
--- a/metadata/md5-cache/app-text/xchm-1.31
+++ b/metadata/md5-cache/app-text/xchm-1.31
@@ -5,10 +5,10 @@ DESCRIPTION=Utility for viewing Compiled HTML Help (CHM) files
 EAPI=7
 HOMEPAGE=https://github.com/rzvncj/xCHM/
 IUSE=nls
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/chmlib-0.36 x11-libs/wxGTK:3.0-gtk3[X] nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://github.com/rzvncj/xCHM/releases/download/1.31/xchm-1.31.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c3501ab96a153283b7d883d53a759464
+_md5_=22ace8608f9e53ab53beee0f84c27ce7
diff --git a/metadata/md5-cache/app-text/xlsx2csv-0.7.6 b/metadata/md5-cache/app-text/xlsx2csv-0.7.6
index 9ed40e3408e4..f194d9d371b9 100644
--- a/metadata/md5-cache/app-text/xlsx2csv-0.7.6
+++ b/metadata/md5-cache/app-text/xlsx2csv-0.7.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlsx2csv/xlsx2csv-0.7.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=81f52048331e8fecee8db02fbb03c41f
diff --git a/metadata/md5-cache/app-text/xmldiff-2.3 b/metadata/md5-cache/app-text/xmldiff-2.3
index 8dd089b28d3f..1f40c8658ef1 100644
--- a/metadata/md5-cache/app-text/xmldiff-2.3
+++ b/metadata/md5-cache/app-text/xmldiff-2.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Shoobx/xmldiff/archive/2.3.tar.gz -> xmldiff-2.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9fca32f7b0a2a62e0faccf3f71f56b9b
diff --git a/metadata/md5-cache/app-text/xmldiff-2.4 b/metadata/md5-cache/app-text/xmldiff-2.4
index d1bbf5e5451f..91af4d18e761 100644
--- a/metadata/md5-cache/app-text/xmldiff-2.4
+++ b/metadata/md5-cache/app-text/xmldiff-2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Shoobx/xmldiff/archive/2.4.tar.gz -> xmldiff-2.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7617a49aee0afc5ad0398d4506ba71b9
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 6ab3ca7372f1..7b2da67cf29e 100644
Binary files a/metadata/md5-cache/app-vim/Manifest.gz and b/metadata/md5-cache/app-vim/Manifest.gz differ
diff --git a/metadata/md5-cache/app-vim/pyclewn-2.1-r2 b/metadata/md5-cache/app-vim/pyclewn-2.1-r2
index 48bcf23eda30..6b02cca68cf9 100644
--- a/metadata/md5-cache/app-vim/pyclewn-2.1-r2
+++ b/metadata/md5-cache/app-vim/pyclewn-2.1-r2
@@ -11,5 +11,5 @@ RDEPEND=|| ( app-editors/vim app-editors/gvim[netbeans] ) app-arch/vimball || (
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyclewn/pyclewn-2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
 _md5_=42c3d11242118df86822cdaa9fff4cc4
diff --git a/metadata/md5-cache/app-vim/pydoc-2.0-r2 b/metadata/md5-cache/app-vim/pydoc-2.0-r2
index 765485c4b0eb..6df1eca2b9fb 100644
--- a/metadata/md5-cache/app-vim/pydoc-2.0-r2
+++ b/metadata/md5-cache/app-vim/pydoc-2.0-r2
@@ -3,12 +3,12 @@ DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: integrates python documentation view and search tool
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=910 https://github.com/fs111/pydoc.vim
-IUSE=python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/fs111/pydoc.vim/tarball/2.0 -> pydoc-2.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=1f8e4392040ae940506f765631d8da62
+_md5_=a8863f2638f27f64584b4ecd1091f199
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index e7e11c864baa..a8fe83ec2e09 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/argparse-2.1 b/metadata/md5-cache/dev-cpp/argparse-2.1
new file mode 100644
index 000000000000..213fdef1f399
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/argparse-2.1
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker
+EAPI=7
+HOMEPAGE=https://github.com/p-ranav/argparse
+IUSE=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 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/p-ranav/argparse/archive/v2.1.tar.gz -> argparse-2.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9ce99019c0c54910bcc51676b357bd6b
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index b2415e747b23..c42631fd5aa1 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/barman-2.10 b/metadata/md5-cache/dev-db/barman-2.10
index 35199af7e264..0c705356624e 100644
--- a/metadata/md5-cache/dev-db/barman-2.10
+++ b/metadata/md5-cache/dev-db/barman-2.10
@@ -10,5 +10,5 @@ RDEPEND=dev-python/boto[python_targets_python3_6(-)?,python_targets_python3_7(-)
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/pgbarman/2.10/barman-2.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6ac2b2bf5a4bb23c88a996d0a3df0a80
diff --git a/metadata/md5-cache/dev-db/mongodb-4.4.1 b/metadata/md5-cache/dev-db/mongodb-4.4.1
index ed54de780f90..359c571e0fa0 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.4.1
+++ b/metadata/md5-cache/dev-db/mongodb-4.4.1
@@ -5,7 +5,7 @@ DESCRIPTION=A high-performance, open source, schema-free document-oriented datab
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
 IUSE=debug kerberos libressl lto ssl test +tools
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=tools? ( >=app-admin/mongo-tools-100 )
 RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.6.2:= >=dev-libs/boost-1.70:=[threads(+),nls] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.4.1.tar.gz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=29b4c9f8423785716f258c55d330cdc4
+_md5_=c863bd00ce2dec83887713cd6608b5f4
diff --git a/metadata/md5-cache/dev-db/mycli-1.20.1 b/metadata/md5-cache/dev-db/mycli-1.20.1
index 77a886e447d8..a76e17965343 100644
--- a/metadata/md5-cache/dev-db/mycli-1.20.1
+++ b/metadata/md5-cache/dev-db/mycli-1.20.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/mycli/archive/v1.20.1.tar.gz -> mycli-1.20.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9d24f734e93842c89f82eb72d42fbb75
diff --git a/metadata/md5-cache/dev-db/mycli-1.21.1-r1 b/metadata/md5-cache/dev-db/mycli-1.21.1-r1
index b99cd011e31f..79c92b870fd3 100644
--- a/metadata/md5-cache/dev-db/mycli-1.21.1-r1
+++ b/metadata/md5-cache/dev-db/mycli-1.21.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/mycli/archive/v1.21.1.tar.gz -> mycli-1.21.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b75e7750a68ba8fd937081e085801508
diff --git a/metadata/md5-cache/dev-db/mycli-9999 b/metadata/md5-cache/dev-db/mycli-9999
index 43a7025c3075..d2acda83a73e 100644
--- a/metadata/md5-cache/dev-db/mycli-9999
+++ b/metadata/md5-cache/dev-db/mycli-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( >=dev-python/cli_helpers-1.1.0[python_
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=551b24d802b4d0dcd8d84c86a4fa446d
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.22 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.22
index 89c58f100ded..6c44a7566c2a 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.22
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.22
@@ -5,10 +5,10 @@ DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
 EAPI=7
 HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
 IUSE=+legacy libressl
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=Artistic GPL-2
 RDEPEND=dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.22-src.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5bc7f6b58d79b9c303a120c30e654359
+_md5_=cfe4623e07c267bf423784b1baf4500f
diff --git a/metadata/md5-cache/dev-db/mytop-1.9.1 b/metadata/md5-cache/dev-db/mytop-1.9.1
index 6928bc63f76b..4d26e52a61cc 100644
--- a/metadata/md5-cache/dev-db/mytop-1.9.1
+++ b/metadata/md5-cache/dev-db/mytop-1.9.1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/DBD-mysql virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/
 DESCRIPTION=mytop - a top clone for mysql
 EAPI=6
 HOMEPAGE=http://www.mysqlfanboy.com/mytop-3/
-KEYWORDS=~alpha ~amd64 ppc sparc ~x86
+KEYWORDS=~alpha ~amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/DBD-mysql virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes dev-lang/perl:=
 SLOT=0
 SRC_URI=http://www.mysqlfanboy.com/mytop-3/mytop-1.9.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=01fad64abc5bc9fec9ad891b161b1d58
+_md5_=176794e7adac14e78dabc80cb97185d0
diff --git a/metadata/md5-cache/dev-db/pg_activity-1.6.2 b/metadata/md5-cache/dev-db/pg_activity-1.6.2
index 9862af3a0a18..b5afccbde182 100644
--- a/metadata/md5-cache/dev-db/pg_activity-1.6.2
+++ b/metadata/md5-cache/dev-db/pg_activity-1.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/dalibo/pg_activity/archive/v1.6.2.tar.gz -> pg_activity-1.6.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=20a2c4be6526a16bcc3be2318ee2068f
diff --git a/metadata/md5-cache/dev-db/pg_top-4.0.0 b/metadata/md5-cache/dev-db/pg_top-4.0.0
index d50bea6c38a1..b7b9d1e8b0a1 100644
--- a/metadata/md5-cache/dev-db/pg_top-4.0.0
+++ b/metadata/md5-cache/dev-db/pg_top-4.0.0
@@ -4,10 +4,10 @@ DEPEND=dev-db/postgresql:=
 DESCRIPTION='top' for PostgreSQL
 EAPI=7
 HOMEPAGE=https://pg_top.gitlab.io/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=BSD
 RDEPEND=dev-db/postgresql:=
 SLOT=0
 SRC_URI=https://pg_top.gitlab.io/source/pg_top-4.0.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=977981817233c4a6bfe12863f1866a2b
+_md5_=8099a376bc0fee0b8d6de5651e617d53
diff --git a/metadata/md5-cache/dev-db/pgcli-2.2.0 b/metadata/md5-cache/dev-db/pgcli-2.2.0
index ad8f689a03a2..f6bea0bdb13a 100644
--- a/metadata/md5-cache/dev-db/pgcli-2.2.0
+++ b/metadata/md5-cache/dev-db/pgcli-2.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/pgcli/archive/v2.2.0.tar.gz -> pgcli-2.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=032e1115c01093cb14c38cdef6c21ab5
diff --git a/metadata/md5-cache/dev-db/pgcli-3.0.0 b/metadata/md5-cache/dev-db/pgcli-3.0.0
index 9f3a7b9debce..cf32f7b7b56a 100644
--- a/metadata/md5-cache/dev-db/pgcli-3.0.0
+++ b/metadata/md5-cache/dev-db/pgcli-3.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/pgcli/archive/v3.0.0.tar.gz -> pgcli-3.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=84d1685973510e76fc6f29c0f5c7606d
diff --git a/metadata/md5-cache/dev-db/pgxnclient-1.3-r2 b/metadata/md5-cache/dev-db/pgxnclient-1.3-r2
index b779579ce255..81ee437e32ad 100644
--- a/metadata/md5-cache/dev-db/pgxnclient-1.3-r2
+++ b/metadata/md5-cache/dev-db/pgxnclient-1.3-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pgxnclient/pgxnclient-1.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=364323f5b4a48d137b3f8c1638ba1d66
diff --git a/metadata/md5-cache/dev-db/postgresql-9999 b/metadata/md5-cache/dev-db/postgresql-9999
index d0f48804deea..ef628b5e2ff8 100644
--- a/metadata/md5-cache/dev-db/postgresql-9999
+++ b/metadata/md5-cache/dev-db/postgresql-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) >=dev-lang/perl-5.8 app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-dtd:4.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets app-text/openjade dev-libs/libxml2 dev-libs/libxslt sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) >=dev-lang/perl-5.8 app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-dtd:4.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets app-text/openjade dev-libs/libxml2 dev-libs/libxslt sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
+IUSE=debug icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=POSTGRESQL GPL-2
 PROPERTIES=live
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=9999
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	226d8d2ff588bdfd7d188512dbdb189d	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7212bff35debcfd4b423b4a471094cf9
+_md5_=201b1cb05ea08646626129d9c1d089dc
diff --git a/metadata/md5-cache/dev-db/qdbm-1.8.78-r2 b/metadata/md5-cache/dev-db/qdbm-1.8.78-r2
index 1c839872136e..e65d1c3d4626 100644
--- a/metadata/md5-cache/dev-db/qdbm-1.8.78-r2
+++ b/metadata/md5-cache/dev-db/qdbm-1.8.78-r2
@@ -11,4 +11,4 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/
 SLOT=0
 SRC_URI=https://fallabs.com/qdbm/qdbm-1.8.78.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=85bd8ac440caa54016dc96e923079441
+_md5_=208261612d05a316edf0cc8b6ef98e6c
diff --git a/metadata/md5-cache/dev-db/sadisplay-0.4.9 b/metadata/md5-cache/dev-db/sadisplay-0.4.9
index 5ef3914c62f0..f388d9ef51af 100644
--- a/metadata/md5-cache/dev-db/sadisplay-0.4.9
+++ b/metadata/md5-cache/dev-db/sadisplay-0.4.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sadisplay/sadisplay-0.4.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=10ceec7518f0e13e4680fc03c99a364d
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 15b73cd8795d..71bd3aa63eb0 100644
Binary files a/metadata/md5-cache/dev-embedded/Manifest.gz and b/metadata/md5-cache/dev-embedded/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-embedded/esptool-2.8 b/metadata/md5-cache/dev-embedded/esptool-2.8
index 201ed614cc88..88c45c8aa5e0 100644
--- a/metadata/md5-cache/dev-embedded/esptool-2.8
+++ b/metadata/md5-cache/dev-embedded/esptool-2.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressif/esptool/archive/v2.8.tar.gz -> esptool-2.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=90a899f3f47428b0bff4f6244534039a
diff --git a/metadata/md5-cache/dev-embedded/esptool-2.8-r1 b/metadata/md5-cache/dev-embedded/esptool-2.8-r1
index 797783ae253c..d692a97f4afc 100644
--- a/metadata/md5-cache/dev-embedded/esptool-2.8-r1
+++ b/metadata/md5-cache/dev-embedded/esptool-2.8-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressif/esptool/archive/v2.8.tar.gz -> esptool-2.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b955c1b8ba6469ae68b6d6d5eb8c33ba
diff --git a/metadata/md5-cache/dev-embedded/esptool-2.8-r2 b/metadata/md5-cache/dev-embedded/esptool-2.8-r2
index 23c3e4e231fb..3349988d48f8 100644
--- a/metadata/md5-cache/dev-embedded/esptool-2.8-r2
+++ b/metadata/md5-cache/dev-embedded/esptool-2.8-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressif/esptool/archive/v2.8.tar.gz -> esptool-2.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8198dfd816f1cf2d545faad73d8eb51f
diff --git a/metadata/md5-cache/dev-embedded/esptool-3.0 b/metadata/md5-cache/dev-embedded/esptool-3.0
index a8dff7d00a0a..bdae8fd7dde2 100644
--- a/metadata/md5-cache/dev-embedded/esptool-3.0
+++ b/metadata/md5-cache/dev-embedded/esptool-3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressif/esptool/archive/v3.0.tar.gz -> esptool-3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=51988cbc7ffb566978519094f99ada36
diff --git a/metadata/md5-cache/dev-embedded/nodemcu-uploader-0.4.3-r1 b/metadata/md5-cache/dev-embedded/nodemcu-uploader-0.4.3-r1
index 25524f2f8388..fe803c907d8f 100644
--- a/metadata/md5-cache/dev-embedded/nodemcu-uploader-0.4.3-r1
+++ b/metadata/md5-cache/dev-embedded/nodemcu-uploader-0.4.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/n/nodemcu-uploader/nodemcu-uploader-0.4.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9aa85d20918098bf294eed1b5c185101
diff --git a/metadata/md5-cache/dev-embedded/platformio-5.0.1 b/metadata/md5-cache/dev-embedded/platformio-5.0.1
index be8c8aefac35..bdf7810d7593 100644
--- a/metadata/md5-cache/dev-embedded/platformio-5.0.1
+++ b/metadata/md5-cache/dev-embedded/platformio-5.0.1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-python/setuptools[python_targets_p
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/platformio/platformio-5.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a8392e01f930ee4c6d9a71ffcd7c2b16
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index f1e40b359e6c..85f354b7bdb1 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/bcprov-1.40-r2 b/metadata/md5-cache/dev-java/bcprov-1.40-r2
deleted file mode 100644
index 5d881afa6ef1..000000000000
--- a/metadata/md5-cache/dev-java/bcprov-1.40-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.40
-SRC_URI=http://central.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.40/bcprov-jdk16-1.40-sources.jar
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=eb592b91484f4dbcd88b9cda8cc2e7d7
diff --git a/metadata/md5-cache/dev-java/bcprov-1.48-r2 b/metadata/md5-cache/dev-java/bcprov-1.48-r2
deleted file mode 100644
index 4c0289ce4648..000000000000
--- a/metadata/md5-cache/dev-java/bcprov-1.48-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.48
-SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-148.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4f0f6acbd68cf227e8529441aadbb3cd
diff --git a/metadata/md5-cache/dev-java/bcprov-1.49-r4 b/metadata/md5-cache/dev-java/bcprov-1.49-r4
deleted file mode 100644
index a2f77f86ae58..000000000000
--- a/metadata/md5-cache/dev-java/bcprov-1.49-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.49
-SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-149.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=05d15815191905e7c2466055088ae55c
diff --git a/metadata/md5-cache/dev-java/bcprov-1.50-r3 b/metadata/md5-cache/dev-java/bcprov-1.50-r3
deleted file mode 100644
index ffc5606df2d7..000000000000
--- a/metadata/md5-cache/dev-java/bcprov-1.50-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-150.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=746fc90464034a0baad875e30ec310d1
diff --git a/metadata/md5-cache/dev-java/dnsjava-2.1.8 b/metadata/md5-cache/dev-java/dnsjava-2.1.8
index 85a18bffab91..17f0002a73b6 100644
--- a/metadata/md5-cache/dev-java/dnsjava-2.1.8
+++ b/metadata/md5-cache/dev-java/dnsjava-2.1.8
@@ -4,11 +4,11 @@ DESCRIPTION=An implementation of DNS in Java
 EAPI=6
 HOMEPAGE=http://www.dnsjava.org/
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.dnsjava.org/download/dnsjava-2.1.8.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dfec1a12c4fd08e541c1c2498a26e58b
+_md5_=3de6b50eebd6e852884c5022c7dcce3a
diff --git a/metadata/md5-cache/dev-java/eclipsito-0_pre20130713 b/metadata/md5-cache/dev-java/eclipsito-0_pre20130713
deleted file mode 100644
index ff27440fb484..000000000000
--- a/metadata/md5-cache/dev-java/eclipsito-0_pre20130713
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A small subset of Eclipse core libraries for modular applications
-EAPI=5
-HOMEPAGE=https://code.google.com/p/eclipsito/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/eclipsito-0_pre20130713.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e543daefe08ec4c5f47812db799b2afb
diff --git a/metadata/md5-cache/dev-java/java-config-2.3.1 b/metadata/md5-cache/dev-java/java-config-2.3.1
index 0e3c5e085ab4..f292a3fab4d1 100644
--- a/metadata/md5-cache/dev-java/java-config-2.3.1
+++ b/metadata/md5-cache/dev-java/java-config-2.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://gitweb.gentoo.org/proj/java-config.git/snapshot/java-config-2.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=03f5ae36a0e50224aa2bcae1af32dc76
diff --git a/metadata/md5-cache/dev-java/java-config-9999 b/metadata/md5-cache/dev-java/java-config-9999
index 42bec61777a8..00a131a479e1 100644
--- a/metadata/md5-cache/dev-java/java-config-9999
+++ b/metadata/md5-cache/dev-java/java-config-9999
@@ -11,5 +11,5 @@ RDEPEND=!dev-java/java-config-wrapper sys-apps/baselayout-java sys-apps/portage[
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dd8d32abd163781a66c002054d05e6c4
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.6.3 b/metadata/md5-cache/dev-java/javatoolkit-0.6.3
index 2e5b0904cb7a..56c3f854be3f 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.3
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.3.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=42bf01a8c7d972f4b64c6cf9d4f705fd
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.6.4 b/metadata/md5-cache/dev-java/javatoolkit-0.6.4
index 6ffb0bdaf5ca..55703dc474cc 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.4
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.4.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f18856799c0b539108d93f6fe490b36
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 5be36efa799b..9eaa6e9b7914 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/fpc-2.6.4 b/metadata/md5-cache/dev-lang/fpc-2.6.4
deleted file mode 100644
index ca4c29a86997..000000000000
--- a/metadata/md5-cache/dev-lang/fpc-2.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare pretend unpack
-DESCRIPTION=Free Pascal Compiler
-EAPI=5
-HOMEPAGE=https://www.freepascal.org/
-IUSE=doc ide source
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2 LGPL-2.1-with-linking-exception
-RDEPEND=ide? ( !dev-lang/fpc-ide )
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://sourceforge/freepascal/fpcbuild-2.6.4.tar.gz mirror://sourceforge/freepascal/fpc-2.6.4.source.tar.gz amd64? ( mirror://sourceforge/freepascal/fpc-2.6.4.x86_64-linux.tar ) arm? ( mirror://sourceforge/freepascal/fpc-2.6.4.arm-linux.tar ) ppc? ( mirror://sourceforge/freepascal/fpc-2.6.4.powerpc-linux.tar ) ppc64? ( mirror://sourceforge/freepascal/fpc-2.6.4.powerpc64-linux.tar ) sparc? ( mirror://sourceforge/freepascal/fpc-2.6.2.sparc-linux.tar ) x86? ( mirror://sourceforge/freepascal/fpc-2.6.4.i386-linux.tar ) doc? ( mirror://sourceforge/freepascal/Documentation/2.6.4/doc-html.tar.gz -> fpc-2.6.4-doc-html.tar.gz https://dev.gentoo.org/~radhermit/distfiles/fpc-2.6.4-fpctoc.htx.bz2 )
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=99d3ef3f6531d01c1ed0492895706478
diff --git a/metadata/md5-cache/dev-lang/fpc-3.0.0 b/metadata/md5-cache/dev-lang/fpc-3.0.0
deleted file mode 100644
index 8d42c6448a76..000000000000
--- a/metadata/md5-cache/dev-lang/fpc-3.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare pretend unpack
-DESCRIPTION=Free Pascal Compiler
-EAPI=5
-HOMEPAGE=https://www.freepascal.org/
-IUSE=doc ide source
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1-with-linking-exception
-RDEPEND=ide? ( !dev-lang/fpc-ide )
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://sourceforge/freepascal/fpcbuild-3.0.0.tar.gz mirror://sourceforge/freepascal/fpc-3.0.0.source.tar.gz amd64? ( mirror://sourceforge/freepascal/fpc-3.0.0.x86_64-linux.tar ) x86? ( mirror://sourceforge/freepascal/fpc-3.0.0.i386-linux.tar ) doc? ( mirror://sourceforge/freepascal/Documentation/3.0.0/doc-html.tar.gz -> fpc-3.0.0-doc-html.tar.gz )
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bedaa549488ad9785b1100d5016bffc4
diff --git a/metadata/md5-cache/dev-lang/fpc-3.0.2 b/metadata/md5-cache/dev-lang/fpc-3.0.2
deleted file mode 100644
index f479f172d609..000000000000
--- a/metadata/md5-cache/dev-lang/fpc-3.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare pretend unpack
-DESCRIPTION=Free Pascal Compiler
-EAPI=5
-HOMEPAGE=https://www.freepascal.org/
-IUSE=doc ide source
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1-with-linking-exception
-RDEPEND=ide? ( !dev-lang/fpc-ide )
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://sourceforge/freepascal/fpcbuild-3.0.2.tar.gz mirror://sourceforge/freepascal/fpc-3.0.2.source.tar.gz amd64? ( mirror://sourceforge/freepascal/fpc-3.0.2.x86_64-linux.tar ) x86? ( mirror://sourceforge/freepascal/fpc-3.0.2.i386-linux.tar ) doc? ( mirror://sourceforge/freepascal/Documentation/3.0.2/doc-html.tar.gz -> fpc-3.0.2-doc-html.tar.gz )
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=86dc3782712334a0524e5d3773994696
diff --git a/metadata/md5-cache/dev-lang/fpc-3.0.2-r1 b/metadata/md5-cache/dev-lang/fpc-3.0.2-r1
deleted file mode 100644
index f2c1d283b994..000000000000
--- a/metadata/md5-cache/dev-lang/fpc-3.0.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare pretend unpack
-DESCRIPTION=Free Pascal Compiler
-EAPI=5
-HOMEPAGE=https://www.freepascal.org/
-IUSE=doc ide source
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1-with-linking-exception
-RDEPEND=ide? ( !dev-lang/fpc-ide )
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://sourceforge/freepascal/fpcbuild-3.0.2.tar.gz mirror://sourceforge/freepascal/fpc-3.0.2.source.tar.gz amd64? ( mirror://sourceforge/freepascal/fpc-3.0.2.x86_64-linux.tar ) x86? ( mirror://sourceforge/freepascal/fpc-3.0.2.i386-linux.tar ) doc? ( mirror://sourceforge/freepascal/Documentation/3.0.2/doc-html.tar.gz -> fpc-3.0.2-doc-html.tar.gz )
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3629ef6c52b6e2ce3b958c62b9cb14f2
diff --git a/metadata/md5-cache/dev-lang/hy-0.14.0 b/metadata/md5-cache/dev-lang/hy-0.14.0
index 09c930a786b6..ce7dea3e82cb 100644
--- a/metadata/md5-cache/dev-lang/hy-0.14.0
+++ b/metadata/md5-cache/dev-lang/hy-0.14.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.14.0.tar.gz -> hy-0.14.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61b06988f28316e39ae0546e267e5058
diff --git a/metadata/md5-cache/dev-lang/hy-0.15.0 b/metadata/md5-cache/dev-lang/hy-0.15.0
index 5a0a523b49f2..5d8946214d6d 100644
--- a/metadata/md5-cache/dev-lang/hy-0.15.0
+++ b/metadata/md5-cache/dev-lang/hy-0.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.15.0.tar.gz -> hy-0.15.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ff793b457d61d05439b93377ffca3b45
diff --git a/metadata/md5-cache/dev-lang/hy-0.16.0 b/metadata/md5-cache/dev-lang/hy-0.16.0
index c8f080610383..c73081c5f521 100644
--- a/metadata/md5-cache/dev-lang/hy-0.16.0
+++ b/metadata/md5-cache/dev-lang/hy-0.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.16.0.tar.gz -> hy-0.16.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a9c244d7992902954b580a006c4eacf3
diff --git a/metadata/md5-cache/dev-lang/hy-0.17.0 b/metadata/md5-cache/dev-lang/hy-0.17.0
index addb74db68d9..a8f225fe814a 100644
--- a/metadata/md5-cache/dev-lang/hy-0.17.0
+++ b/metadata/md5-cache/dev-lang/hy-0.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.17.0.tar.gz -> hy-0.17.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2c31785f04b1df5e165e1f16cd6a431d
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.15.0 b/metadata/md5-cache/dev-lang/jsonnet-0.15.0
index d8d49c82c1d8..0cf120c301d7 100644
--- a/metadata/md5-cache/dev-lang/jsonnet-0.15.0
+++ b/metadata/md5-cache/dev-lang/jsonnet-0.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/jsonnet/archive/v0.15.0.tar.gz -> jsonnet-0.15.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2ae3beabd4aff89ec9c32879cc8bf61d
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.16.0 b/metadata/md5-cache/dev-lang/jsonnet-0.16.0
index e4e3914d034a..1b809cca8d0f 100644
--- a/metadata/md5-cache/dev-lang/jsonnet-0.16.0
+++ b/metadata/md5-cache/dev-lang/jsonnet-0.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/jsonnet/archive/v0.16.0.tar.gz -> jsonnet-0.16.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3bb94f6728cdeb5a7d3e4300096d5afb
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.16.0-r2 b/metadata/md5-cache/dev-lang/jsonnet-0.16.0-r2
index 985165fb7eaa..c350182a52f4 100644
--- a/metadata/md5-cache/dev-lang/jsonnet-0.16.0-r2
+++ b/metadata/md5-cache/dev-lang/jsonnet-0.16.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_6 python
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/jsonnet/archive/v0.16.0.tar.gz -> jsonnet-0.16.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3e7f705018f3fa54beb731d4c7389b29
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.17.0-r1 b/metadata/md5-cache/dev-lang/jsonnet-0.17.0-r1
index 3abb5c193aec..1a1b5c8cc458 100644
--- a/metadata/md5-cache/dev-lang/jsonnet-0.17.0-r1
+++ b/metadata/md5-cache/dev-lang/jsonnet-0.17.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_6 python
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/jsonnet/archive/v0.17.0.tar.gz -> jsonnet-0.17.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=60e1de49931f32592c9d5c31a3af9de2
diff --git a/metadata/md5-cache/dev-lang/lfe-0.10.1 b/metadata/md5-cache/dev-lang/lfe-0.10.1
deleted file mode 100644
index 9874cd7f236a..000000000000
--- a/metadata/md5-cache/dev-lang/lfe-0.10.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/erlang
-DESCRIPTION=Lisp-flavoured Erlang
-EAPI=5
-HOMEPAGE=http://lfe.github.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/rvirding/lfe/archive/v0.10.1.zip -> lfe-0.10.1.zip
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=14abc867a7d827346c69e557f7427410
diff --git a/metadata/md5-cache/dev-lang/lfe-0.7 b/metadata/md5-cache/dev-lang/lfe-0.7
deleted file mode 100644
index d6209c30bfb8..000000000000
--- a/metadata/md5-cache/dev-lang/lfe-0.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-lang/erlang
-DESCRIPTION=Lisp-flavoured Erlang
-EAPI=5
-HOMEPAGE=http://lfe.github.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/rvirding/lfe/archive/v0.7a.zip -> lfe-0.7a.zip
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f7516d4befcf1dafa573f9f5a618683
diff --git a/metadata/md5-cache/dev-lang/lfe-1.0 b/metadata/md5-cache/dev-lang/lfe-1.0
deleted file mode 100644
index 3c45c2d32a6c..000000000000
--- a/metadata/md5-cache/dev-lang/lfe-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/erlang
-DESCRIPTION=Lisp-flavoured Erlang
-EAPI=5
-HOMEPAGE=http://lfe.github.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/rvirding/lfe/archive/v1.0.zip -> lfe-1.0.zip
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=916ec18494330028d4fa26a6abb3094f
diff --git a/metadata/md5-cache/dev-lang/nwcc-0.8.2 b/metadata/md5-cache/dev-lang/nwcc-0.8.2
deleted file mode 100644
index dd17256b2a8c..000000000000
--- a/metadata/md5-cache/dev-lang/nwcc-0.8.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Nils Weller's C Compiler
-EAPI=5
-HOMEPAGE=http://nwcc.sourceforge.net/index.html
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=http://downloads.sourceforge.net/project/nwcc/nwcc/nwcc%200.8.2/nwcc_0.8.2.tar.gz
-_md5_=391f8ab0abf826e537d5c2732e18935b
diff --git a/metadata/md5-cache/dev-lang/parrot-7.1.0-r1 b/metadata/md5-cache/dev-lang/parrot-7.1.0-r1
deleted file mode 100644
index c814909b9588..000000000000
--- a/metadata/md5-cache/dev-lang/parrot-7.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-lang/perl[doc?] sys-libs/readline:0= dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
-DESCRIPTION=Virtual machine designed to compile and execute bytecode for dynamic languages
-EAPI=5
-HOMEPAGE=http://www.parrot.org/
-IUSE=opengl nls doc examples gdbm gmp ssl +unicode pcre
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=Artistic-2
-RDEPEND=sys-libs/readline:0= dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
-RESTRICT=test
-SLOT=0/7.1.0
-SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/7.1.0/parrot-7.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=518482d271a1f6a994093ca5342e388b
diff --git a/metadata/md5-cache/dev-lang/parrot-7.11.0-r1 b/metadata/md5-cache/dev-lang/parrot-7.11.0-r1
deleted file mode 100644
index 33623fe02cdc..000000000000
--- a/metadata/md5-cache/dev-lang/parrot-7.11.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-lang/perl[doc?] sys-libs/readline:0= dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
-DESCRIPTION=Virtual machine designed to compile and execute bytecode for dynamic languages
-EAPI=5
-HOMEPAGE=http://www.parrot.org/
-IUSE=opengl nls doc examples gdbm +gmp ssl +unicode pcre
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=Artistic-2
-RDEPEND=sys-libs/readline:0= dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
-RESTRICT=test
-SLOT=0/7.11.0
-SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/7.11.0/parrot-7.11.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d6f93a57d9db39c2f671af50271c7ecf
diff --git a/metadata/md5-cache/dev-lang/parrot-7.5.0-r1 b/metadata/md5-cache/dev-lang/parrot-7.5.0-r1
deleted file mode 100644
index 0a38ae69edc5..000000000000
--- a/metadata/md5-cache/dev-lang/parrot-7.5.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-lang/perl[doc?] sys-libs/readline:0= dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
-DESCRIPTION=Virtual machine designed to compile and execute bytecode for dynamic languages
-EAPI=5
-HOMEPAGE=http://www.parrot.org/
-IUSE=opengl nls doc examples gdbm +gmp ssl +unicode pcre
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=Artistic-2
-RDEPEND=sys-libs/readline:0= dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
-RESTRICT=test
-SLOT=0/7.5.0
-SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/7.5.0/parrot-7.5.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d6f93a57d9db39c2f671af50271c7ecf
diff --git a/metadata/md5-cache/dev-lang/parrot-8.1.0-r1 b/metadata/md5-cache/dev-lang/parrot-8.1.0-r1
deleted file mode 100644
index 2109174b0b6f..000000000000
--- a/metadata/md5-cache/dev-lang/parrot-8.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-lang/perl[doc?] sys-libs/readline:0= dev-libs/libffi net-libs/libnsl:0= opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
-DESCRIPTION=Virtual machine designed to compile and execute bytecode for dynamic languages
-EAPI=5
-HOMEPAGE=http://www.parrot.org/
-IUSE=opengl nls doc examples gdbm +gmp ssl +unicode pcre
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=Artistic-2
-RDEPEND=sys-libs/readline:0= dev-libs/libffi net-libs/libnsl:0= opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4:0= ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
-RESTRICT=test
-SLOT=0/8.1.0
-SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/8.1.0/parrot-8.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=14b57230717024cb94ac8fadac1337e6
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 3cce78c94c84..42c8c6ef2e36 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/botan-2.17.2 b/metadata/md5-cache/dev-libs/botan-2.17.2
index 1ad0efe916bd..fcf100be520e 100644
--- a/metadata/md5-cache/dev-libs/botan-2.17.2
+++ b/metadata/md5-cache/dev-libs/botan-2.17.2
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] || ( ( dev-lang/python:3.8 doc? ( dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ) ( dev-lang/python:3.7 doc? ( dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) )
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] || ( ( dev-lang/python:3.9 doc? ( dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ) ( dev-lang/python:3.8 doc? ( dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ) ( dev-lang/python:3.7 doc? ( dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) )
 DEFINED_PHASES=configure install test
-DEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
+DEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
 DESCRIPTION=C++ crypto library
 EAPI=7
 HOMEPAGE=https://botan.randombit.net/
-IUSE=bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib python_targets_python3_7 python_targets_python3_8
+IUSE=bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
 LICENSE=BSD-2
-RDEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
-REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
+RDEPEND=boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) sqlite? ( dev-db/sqlite:3= ) zlib? ( >=sys-libs/zlib-1.2.3:= )
+REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=2/2.17
 SRC_URI=https://botan.randombit.net/releases/Botan-2.17.2.tar.xz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2e3dab1aa986a0b7cd353154d3e7885b
+_md5_=1a86a6a2663de1755cf5486becadae7c
diff --git a/metadata/md5-cache/dev-libs/capnproto-0.6.0 b/metadata/md5-cache/dev-libs/capnproto-0.6.0
deleted file mode 100644
index 30cc2cce2be2..000000000000
--- a/metadata/md5-cache/dev-libs/capnproto-0.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=test? ( dev-cpp/gtest ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=RPC/Serialization system with capabilities support
-EAPI=5
-HOMEPAGE=https://capnproto.org
-IUSE=static-libs test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/060
-SRC_URI=https://github.com/sandstorm-io/capnproto/archive/v0.6.0.tar.gz -> capnproto-0.6.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1aec681d65d5ee91477cec7398cb551f
diff --git a/metadata/md5-cache/dev-libs/capnproto-0.6.1 b/metadata/md5-cache/dev-libs/capnproto-0.6.1
deleted file mode 100644
index 2da7f7317e65..000000000000
--- a/metadata/md5-cache/dev-libs/capnproto-0.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=test? ( dev-cpp/gtest ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=RPC/Serialization system with capabilities support
-EAPI=5
-HOMEPAGE=https://capnproto.org
-IUSE=static-libs test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/061
-SRC_URI=https://github.com/sandstorm-io/capnproto/archive/v0.6.1.tar.gz -> capnproto-0.6.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bfd78fa27e6b93642d9cbb6682d17a3f
diff --git a/metadata/md5-cache/dev-libs/capstone-4.0.2-r2 b/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
index ee54143f2d38..8a3cebee678e 100644
--- a/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
+++ b/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 py
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://github.com/aquynh/capstone/archive/4.0.2.tar.gz -> capstone-4.0.2.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=38df7da94da317c91264c1518a7bb530
diff --git a/metadata/md5-cache/dev-libs/concurrencykit-0.7.0-r1 b/metadata/md5-cache/dev-libs/concurrencykit-0.7.0-r1
index 8cc30d9df3d0..2e6656687509 100644
--- a/metadata/md5-cache/dev-libs/concurrencykit-0.7.0-r1
+++ b/metadata/md5-cache/dev-libs/concurrencykit-0.7.0-r1
@@ -8,4 +8,4 @@ RDEPEND=!sys-cluster/charm
 SLOT=0
 SRC_URI=https://github.com/concurrencykit/ck/archive/0.7.0.tar.gz -> concurrencykit-0.7.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1b2f98c3087653d2a0be933671800745
+_md5_=2e7fc3603824d0cc087340db11be665c
diff --git a/metadata/md5-cache/dev-libs/distorm64-3.5.0 b/metadata/md5-cache/dev-libs/distorm64-3.5.0
index 2d72ab7b273f..88eca79af216 100644
--- a/metadata/md5-cache/dev-libs/distorm64-3.5.0
+++ b/metadata/md5-cache/dev-libs/distorm64-3.5.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/distorm3/distorm3-3.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9ffb15bae6e2d63e71c19311d09f9f3a
diff --git a/metadata/md5-cache/dev-libs/efl-1.25.1-r10 b/metadata/md5-cache/dev-libs/efl-1.25.1-r10
index ee8ceaf7ce7c..b7ca159b7fd5 100644
--- a/metadata/md5-cache/dev-libs/efl-1.25.1-r10
+++ b/metadata/md5-cache/dev-libs/efl-1.25.1-r10
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.25.1.tar.xz
 _eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f4f64c320928f7115a67cd9fab7e0c7
+_md5_=c6a179f9627bc23ee12752274c3a5349
diff --git a/metadata/md5-cache/dev-libs/ell-0.35 b/metadata/md5-cache/dev-libs/ell-0.35
new file mode 100644
index 000000000000..e1257103b71e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ell-0.35
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=glib? ( dev-libs/glib: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(-)?] ) test? ( sys-apps/dbus )
+DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
+EAPI=7
+HOMEPAGE=https://01.org/ell
+IUSE=glib pie test kernel_linux 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
+LICENSE=LGPL-2.1
+RDEPEND=glib? ( dev-libs/glib: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(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.35.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2eff5eb3bc2f6b5f1ad8d82bac749661
diff --git a/metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1 b/metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1
index b2e69c2009a1..69433b39dc41 100644
--- a/metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1
+++ b/metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=A Comprehensive Open Source Library for Galois Field Arithmetic
 EAPI=7
 HOMEPAGE=http://jerasure.org
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/gf-complete-2.0.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8bb5cd38d4662c9ddd3b0b1d8ba59b1f
+_md5_=6933a18c1bb5a2ad2a820d02fc347fe0
diff --git a/metadata/md5-cache/dev-libs/gmime-3.2.7 b/metadata/md5-cache/dev-libs/gmime-3.2.7
index 1afecef9072f..66362a36ee4f 100644
--- a/metadata/md5-cache/dev-libs/gmime-3.2.7
+++ b/metadata/md5-cache/dev-libs/gmime-3.2.7
@@ -4,11 +4,11 @@ DESCRIPTION=Utilities for creating and parsing messages using MIME
 EAPI=6
 HOMEPAGE=http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/
 IUSE=crypt doc idn static-libs test +vala
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib crypt? ( >=app-crypt/gpgme-1.8.0:1= ) idn? ( net-dns/libidn2:= ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) >=dev-libs/gobject-introspection-1.30.0:= )
 RESTRICT=!test? ( test )
 SLOT=3.0
 SRC_URI=mirror://gnome/sources/gmime/3.2/gmime-3.2.7.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71eaaa4a53f32649f1d798f38ce91e5e
+_md5_=0ddc77411e8db647d7788aa582fe84b6
diff --git a/metadata/md5-cache/dev-libs/keystone-0.9.1 b/metadata/md5-cache/dev-libs/keystone-0.9.1
index 4d39d18e6bb3..a865461c4074 100644
--- a/metadata/md5-cache/dev-libs/keystone-0.9.1
+++ b/metadata/md5-cache/dev-libs/keystone-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 ) || ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 )
 SLOT=0
 SRC_URI=https://github.com/keystone-engine/keystone/archive/0.9.1.tar.gz -> keystone-0.9.1.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1f0f62d8ced17411fa2f20d43e87c5a
diff --git a/metadata/md5-cache/dev-libs/keystone-0.9.1-r1 b/metadata/md5-cache/dev-libs/keystone-0.9.1-r1
index 1f3fdc3d2f42..2d3b274fc606 100644
--- a/metadata/md5-cache/dev-libs/keystone-0.9.1-r1
+++ b/metadata/md5-cache/dev-libs/keystone-0.9.1-r1
@@ -11,5 +11,5 @@ RDEPEND=<sys-devel/llvm-11:= || ( sys-devel/llvm:8[llvm_targets_AArch64?,llvm_ta
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/keystone-engine/keystone/archive/0.9.1.tar.gz -> keystone-0.9.1.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=84fbad9a0728d07ec6c1bbfcf7c5bc53
diff --git a/metadata/md5-cache/dev-libs/keystone-9999 b/metadata/md5-cache/dev-libs/keystone-9999
index 0cf9d3009061..50cba8ff28a8 100644
--- a/metadata/md5-cache/dev-libs/keystone-9999
+++ b/metadata/md5-cache/dev-libs/keystone-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=<sys-devel/llvm-11:= || ( sys-devel/llvm:8[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] sys-devel/llvm:9[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] sys-devel/llvm:10[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=84fbad9a0728d07ec6c1bbfcf7c5bc53
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.14-r1 b/metadata/md5-cache/dev-libs/libdnet-1.14-r1
index 88aced26c10b..7cfa8e522900 100644
--- a/metadata/md5-cache/dev-libs/libdnet-1.14-r1
+++ b/metadata/md5-cache/dev-libs/libdnet-1.14-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ofalk/libdnet/archive/libdnet-1.14.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=23c8fb1aa05457eff9b5ff88066a5cb9
diff --git a/metadata/md5-cache/dev-libs/libdnet-9999 b/metadata/md5-cache/dev-libs/libdnet-9999
index 4fa8f3fa7115..4feb5871c181 100644
--- a/metadata/md5-cache/dev-libs/libdnet-9999
+++ b/metadata/md5-cache/dev-libs/libdnet-9999
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fd8d7691a92c452a7fd936b33d0cbaab
diff --git a/metadata/md5-cache/dev-libs/libinput-1.16.3 b/metadata/md5-cache/dev-libs/libinput-1.16.3
index 9395b2bc6df5..e8818c60d22e 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.16.3
+++ b/metadata/md5-cache/dev-libs/libinput-1.16.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library to handle input devices in Wayland
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput
 IUSE=doc input_devices_wacom test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.16.3.tar.xz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=7a08b4ebb32f03e8a5305e448642745d
+_md5_=950a44d2f51f1570f1a73370bb0a3ede
diff --git a/metadata/md5-cache/dev-libs/libintl-0.21 b/metadata/md5-cache/dev-libs/libintl-0.21
index 746b14d0b62f..b88d2657597c 100644
--- a/metadata/md5-cache/dev-libs/libintl-0.21
+++ b/metadata/md5-cache/dev-libs/libintl-0.21
@@ -5,10 +5,10 @@ DESCRIPTION=the GNU international library (split out of gettext)
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gettext/
 IUSE=static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/libiconv-0-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(-)?] !sys-libs/glibc !sys-libs/musl !<sys-devel/gettext-0.19.6-r1
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.21.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=c9eebd883649643c5fb9d7076b5cd500
+_md5_=b6e724b66f2819d48746bad34b892812
diff --git a/metadata/md5-cache/dev-libs/liblouis-3.10.0 b/metadata/md5-cache/dev-libs/liblouis-3.10.0
index 78fd9ad87be4..faff7b519f99 100644
--- a/metadata/md5-cache/dev-libs/liblouis-3.10.0
+++ b/metadata/md5-cache/dev-libs/liblouis-3.10.0
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6[wide-unicode(+
 REQUIRED_USE=python? ( || ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/liblouis/liblouis/archive/v3.10.0.tar.gz -> liblouis-3.10.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=42194760bb9d3a366afacf45e4375ddd
diff --git a/metadata/md5-cache/dev-libs/liblouis-3.13.0 b/metadata/md5-cache/dev-libs/liblouis-3.13.0
index 338798d80c0c..e2e1827bee28 100644
--- a/metadata/md5-cache/dev-libs/liblouis-3.13.0
+++ b/metadata/md5-cache/dev-libs/liblouis-3.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 py
 RESTRICT=!test? ( test )
 SLOT=0/20
 SRC_URI=https://github.com/liblouis/liblouis/releases/download/v3.13.0/liblouis-3.13.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=096c234c456c1e22ab0b5fbb06e088d4
diff --git a/metadata/md5-cache/dev-libs/libmanette-0.2.4 b/metadata/md5-cache/dev-libs/libmanette-0.2.4
index eb195012b72c..2ac91e40a4fe 100644
--- a/metadata/md5-cache/dev-libs/libmanette-0.2.4
+++ b/metadata/md5-cache/dev-libs/libmanette-0.2.4
@@ -5,11 +5,11 @@ DESCRIPTION=Simple GObject game controller library
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/aplazas/libmanette
 IUSE=+introspection +udev +vala
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.50:2 udev? ( dev-libs/libgudev[introspection?] ) dev-libs/libevdev introspection? ( >=dev-libs/gobject-introspection-1.56:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libmanette/0.2/libmanette-0.2.4.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=10dc1012d76e37e30cf32101ee0316c8
+_md5_=25dab7a6ed4b1290b94aa980cac6f629
diff --git a/metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha b/metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha
index ccded35cb453..1b278b892e6c 100644
--- a/metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha
+++ b/metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha
@@ -4,9 +4,9 @@ DESCRIPTION=A library for Microsoft compression formats
 EAPI=7
 HOMEPAGE=https://www.cabextract.org.uk/libmspack/
 IUSE=debug doc 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=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://www.cabextract.org.uk/libmspack/libmspack-0.10.1alpha.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5422a482a2186dcfda2a4661d733f8b3
+_md5_=a9a25cb9b25e5229acfc8fec26cb053a
diff --git a/metadata/md5-cache/dev-libs/libnl-3.5.0 b/metadata/md5-cache/dev-libs/libnl-3.5.0
index 8b30274c4583..e19ff4689a7a 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.5.0
+++ b/metadata/md5-cache/dev-libs/libnl-3.5.0
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=3
 SRC_URI=https://github.com/thom311/libnl/releases/download/libnl3_5_0/libnl-3.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=38a69c802a94e0ad5feac41a91da8a3a
diff --git a/metadata/md5-cache/dev-libs/libnl-99999999 b/metadata/md5-cache/dev-libs/libnl-99999999
index a1aa894117ae..11fdfb3e39b1 100644
--- a/metadata/md5-cache/dev-libs/libnl-99999999
+++ b/metadata/md5-cache/dev-libs/libnl-99999999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=3
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1280766ce97f57290b6fce28a38b3283
diff --git a/metadata/md5-cache/dev-libs/libprelude-4.0.0 b/metadata/md5-cache/dev-libs/libprelude-4.0.0
index baba2e8d25a9..1b48696cd9db 100644
--- a/metadata/md5-cache/dev-libs/libprelude-4.0.0
+++ b/metadata/md5-cache/dev-libs/libprelude-4.0.0
@@ -10,5 +10,5 @@ RDEPEND=net-libs/gnutls:= lua? ( dev-lang/lua:* ) perl? ( dev-lang/perl:= virtua
 REQUIRED_USE=python? ( || ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/4.0.0/libprelude-4.0.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7c34e97c35c51be7c5c4aa115e87684
diff --git a/metadata/md5-cache/dev-libs/libprelude-4.1.0 b/metadata/md5-cache/dev-libs/libprelude-4.1.0
index d77be12d770e..736348c1b485 100644
--- a/metadata/md5-cache/dev-libs/libprelude-4.1.0
+++ b/metadata/md5-cache/dev-libs/libprelude-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=net-libs/gnutls:= lua? ( dev-lang/lua:* ) perl? ( dev-lang/perl:= virtua
 REQUIRED_USE=python? ( || ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/4.1.0/libprelude-4.1.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=794faa1122ca11fe8d588fe0a1827e90
diff --git a/metadata/md5-cache/dev-libs/libprelude-5.1.1 b/metadata/md5-cache/dev-libs/libprelude-5.1.1
index 13871ee257df..908880372e7a 100644
--- a/metadata/md5-cache/dev-libs/libprelude-5.1.1
+++ b/metadata/md5-cache/dev-libs/libprelude-5.1.1
@@ -11,5 +11,5 @@ RDEPEND=net-libs/gnutls:= lua? ( dev-lang/lua:* ) perl? ( dev-lang/perl:= ) pyth
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.1.0/libprelude-5.1.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0eb0eab5b6529638fbdb07bd74cd4731
diff --git a/metadata/md5-cache/dev-libs/libprelude-5.2.0 b/metadata/md5-cache/dev-libs/libprelude-5.2.0
index a171e5a282bd..5fd4b9173583 100644
--- a/metadata/md5-cache/dev-libs/libprelude-5.2.0
+++ b/metadata/md5-cache/dev-libs/libprelude-5.2.0
@@ -11,5 +11,5 @@ RDEPEND=net-libs/gnutls:= lua? ( dev-lang/lua:* ) perl? ( dev-lang/perl:= ) pyth
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/libprelude-5.2.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3f425d901fa6788d2fe4c8682603b685
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-4.0.0-r1 b/metadata/md5-cache/dev-libs/libpreludedb-4.0.0-r1
index b3a1a324b2d7..9876310fd3ec 100644
--- a/metadata/md5-cache/dev-libs/libpreludedb-4.0.0-r1
+++ b/metadata/md5-cache/dev-libs/libpreludedb-4.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-libs/libprelude-4.0.0 net-libs/gnutls:= mysql? ( dev-db/mysql-conne
 REQUIRED_USE=python? ( || ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/4.0.0/libpreludedb-4.0.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f583ce4b71c813df43ad548f89133d6
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-4.1.0-r1 b/metadata/md5-cache/dev-libs/libpreludedb-4.1.0-r1
index fbf3a2a1982e..a77aa7c7e1a7 100644
--- a/metadata/md5-cache/dev-libs/libpreludedb-4.1.0-r1
+++ b/metadata/md5-cache/dev-libs/libpreludedb-4.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-libs/libprelude-4.1.0 net-libs/gnutls:= mysql? ( dev-db/mysql-conne
 REQUIRED_USE=python? ( || ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/4.1.0/libpreludedb-4.1.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ea6e2edd3d83e9b2b0c9abd413202cff
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-5.1.0 b/metadata/md5-cache/dev-libs/libpreludedb-5.1.0
index ce3d520dde91..6cb44ce3b0da 100644
--- a/metadata/md5-cache/dev-libs/libpreludedb-5.1.0
+++ b/metadata/md5-cache/dev-libs/libpreludedb-5.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libprelude-5.1.0 <dev-libs/libprelude-6 net-libs/gnutls:= mys
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.1.0/libpreludedb-5.1.0.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/libpreludedb-5.1.0-update_m4_postgresql.patch
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f696c3f0ba03088e81ba7cb534a4d1a7
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-5.2.0 b/metadata/md5-cache/dev-libs/libpreludedb-5.2.0
index 9e4f4215756e..d4d8a2490553 100644
--- a/metadata/md5-cache/dev-libs/libpreludedb-5.2.0
+++ b/metadata/md5-cache/dev-libs/libpreludedb-5.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libprelude-5.2.0 <dev-libs/libprelude-6 net-libs/gnutls:= mys
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/libpreludedb-5.2.0.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/libpreludedb-5.1.0-update_m4_postgresql.patch
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=46bf643eddc6167a2d9f13cd3579d7b4
diff --git a/metadata/md5-cache/dev-libs/libpy-0.2.5-r1 b/metadata/md5-cache/dev-libs/libpy-0.2.5-r1
index 8f452d0f2bd8..ed67ad90fd61 100644
--- a/metadata/md5-cache/dev-libs/libpy-0.2.5-r1
+++ b/metadata/md5-cache/dev-libs/libpy-0.2.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( sparsehash ) || ( python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/quantopian/libpy/archive/0.2.5.tar.gz -> libpy-0.2.5.tar.gz test? ( https://github.com/google/googletest/archive/23b2a3b1cf803999fb38175f6e9e038a4495c8a5.tar.gz -> gtest-23b2a3b1cf803999fb38175f6e9e038a4495c8a5.tar.gz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=42b907304b113b2a8ecbd897313e805a
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.10-r3 b/metadata/md5-cache/dev-libs/libxml2-2.9.10-r4
similarity index 99%
rename from metadata/md5-cache/dev-libs/libxml2-2.9.10-r3
rename to metadata/md5-cache/dev-libs/libxml2-2.9.10-r4
index 08b01ee6d589..071b0059b9f9 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.10-r3
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.10-r4
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.10.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.10-r1-patchset.tar.xz 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 http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8e682e6fbc0079bc867dc18632590522
+_md5_=4ad3243acf624a75d21753b6347308bf
diff --git a/metadata/md5-cache/dev-libs/marisa-0.2.5 b/metadata/md5-cache/dev-libs/marisa-0.2.5
index 2b94f43f7b8e..73c0e2b50754 100644
--- a/metadata/md5-cache/dev-libs/marisa-0.2.5
+++ b/metadata/md5-cache/dev-libs/marisa-0.2.5
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/s-yata/marisa-trie/archive/v0.2.5.tar.gz -> marisa-0.2.5.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1c6d8fce73495f01c5b5a6bddfabcc5c
diff --git a/metadata/md5-cache/dev-libs/marisa-0.2.6 b/metadata/md5-cache/dev-libs/marisa-0.2.6
index bbb8b530fc1f..95b4197e3fef 100644
--- a/metadata/md5-cache/dev-libs/marisa-0.2.6
+++ b/metadata/md5-cache/dev-libs/marisa-0.2.6
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/s-yata/marisa-trie/archive/v0.2.6.tar.gz -> marisa-0.2.6.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f35ec484f46ca0f64a15b9bb875e4193
diff --git a/metadata/md5-cache/dev-libs/marisa-9999 b/metadata/md5-cache/dev-libs/marisa-9999
index 6c5cfe39faf1..677dc770fdae 100644
--- a/metadata/md5-cache/dev-libs/marisa-9999
+++ b/metadata/md5-cache/dev-libs/marisa-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c119273b817bd9fe8498e92a38adc8a6
diff --git a/metadata/md5-cache/dev-libs/mpc-1.2.1 b/metadata/md5-cache/dev-libs/mpc-1.2.1
index e99999477482..3c10046a75e7 100644
--- a/metadata/md5-cache/dev-libs/mpc-1.2.1
+++ b/metadata/md5-cache/dev-libs/mpc-1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=A library for multiprecision complex arithmetic with exact rounding
 EAPI=7
 HOMEPAGE=http://mpc.multiprecision.org/
 IUSE=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=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-5.0.0: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(-)?,static-libs?] >=dev-libs/mpfr-4.1.0: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(-)?,static-libs?]
 SLOT=0/3
 SRC_URI=mirror://gnu/mpc/mpc-1.2.1.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=27b63d59080697f3c16c78ef9125335e
+_md5_=01293fb15789e30b0a30f1b67d4cbb61
diff --git a/metadata/md5-cache/dev-libs/nss-3.59 b/metadata/md5-cache/dev-libs/nss-3.59-r1
similarity index 98%
rename from metadata/md5-cache/dev-libs/nss-3.59
rename to metadata/md5-cache/dev-libs/nss-3.59-r1
index 90f8eb7aaaa8..026a206b87e2 100644
--- a/metadata/md5-cache/dev-libs/nss-3.59
+++ b/metadata/md5-cache/dev-libs/nss-3.59-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_59_RTM/src/nss-3.59.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c5a01b40e3decaac64b2166fd6f3cbff
+_md5_=25e220296f698a561c97a4e9ade52f09
diff --git a/metadata/md5-cache/dev-libs/pigpio-76 b/metadata/md5-cache/dev-libs/pigpio-76
index bc71ddd454d5..f59a00a5b27b 100644
--- a/metadata/md5-cache/dev-libs/pigpio-76
+++ b/metadata/md5-cache/dev-libs/pigpio-76
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/joan2937/pigpio/archive/v76.tar.gz -> pigpio-76.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c051105b149a593a97dbd033e2f4c08b
diff --git a/metadata/md5-cache/dev-libs/pigpio-77 b/metadata/md5-cache/dev-libs/pigpio-77
index 3baffbdc93d9..4b1ceb39dd05 100644
--- a/metadata/md5-cache/dev-libs/pigpio-77
+++ b/metadata/md5-cache/dev-libs/pigpio-77
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/joan2937/pigpio/archive/v77.tar.gz -> pigpio-77.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c051105b149a593a97dbd033e2f4c08b
diff --git a/metadata/md5-cache/dev-libs/pigpio-78 b/metadata/md5-cache/dev-libs/pigpio-78
index 59694e313325..d35464fd4666 100644
--- a/metadata/md5-cache/dev-libs/pigpio-78
+++ b/metadata/md5-cache/dev-libs/pigpio-78
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/joan2937/pigpio/archive/v78.tar.gz -> pigpio-78.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c051105b149a593a97dbd033e2f4c08b
diff --git a/metadata/md5-cache/dev-libs/popt-1.18 b/metadata/md5-cache/dev-libs/popt-1.18
index b39135fe1365..dac0831984b3 100644
--- a/metadata/md5-cache/dev-libs/popt-1.18
+++ b/metadata/md5-cache/dev-libs/popt-1.18
@@ -5,10 +5,10 @@ DESCRIPTION=Parse Options - Command line parser
 EAPI=7
 HOMEPAGE=https://github.com/rpm-software-management/popt
 IUSE=nls 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=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=nls? ( >=virtual/libintl-0-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(-)?] )
 SLOT=0
 SRC_URI=http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=39626e2ee1a8d14dc0d8e39594e9f314
+_md5_=e12d890cc82ab2dafd3c890b1d9f4ad1
diff --git a/metadata/md5-cache/dev-libs/rocksdb-6.14.6 b/metadata/md5-cache/dev-libs/rocksdb-6.14.6
new file mode 100644
index 000000000000..70b40120a268
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocksdb-6.14.6
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= dev-python/zstandard:= sys-libs/zlib:= jemalloc? ( dev-libs/jemalloc:= ) dev-cpp/gflags
+DESCRIPTION=Embeddable, persistent key-value store for fast storage
+EAPI=7
+HOMEPAGE=http://rocksdb.org https://github.com/facebook/rocksdb/
+IUSE=cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= dev-python/zstandard:= sys-libs/zlib:= jemalloc? ( dev-libs/jemalloc:= )
+SLOT=0
+SRC_URI=https://github.com/facebook/rocksdb/archive/v6.14.6.tar.gz -> rocksdb-6.14.6.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=315aee198dd4667d4c0b45f6a97e4b39
diff --git a/metadata/md5-cache/dev-libs/volume_key-0.3.12-r1 b/metadata/md5-cache/dev-libs/volume_key-0.3.12-r1
index 875dd13ebae2..9b05d090b0c8 100644
--- a/metadata/md5-cache/dev-libs/volume_key-0.3.12-r1
+++ b/metadata/md5-cache/dev-libs/volume_key-0.3.12-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Library for manipulating and storing storage volume encryption keys
 EAPI=7
 HOMEPAGE=https://pagure.io/volume_key
 IUSE=test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-crypt/gpgme dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-apps/util-linux sys-fs/cryptsetup:=
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.pagure.org/volume_key/volume_key-0.3.12.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9fdd8b723e8af312243e2fae0fd38ec2
+_md5_=9be2374e9f62b5e522e11f050d3acbd5
diff --git a/metadata/md5-cache/dev-libs/weston-9.0.0 b/metadata/md5-cache/dev-libs/weston-9.0.0
index 366a0d6199e1..b407af162b3b 100644
--- a/metadata/md5-cache/dev-libs/weston-9.0.0
+++ b/metadata/md5-cache/dev-libs/weston-9.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=Wayland reference compositor
 EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
 IUSE=colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk +launch lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test wayland-compositor webp +X xwayland
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm x86
 LICENSE=MIT CC-BY-SA-3.0
 RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.18 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.2:= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
 REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/weston-9.0.0.tar.xz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d0b53b132250270e1fbb8cb910dd626f
+_md5_=068d2eb2edf3ab69f9a04a7545fb10c0
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.17 b/metadata/md5-cache/dev-libs/xapian-1.4.17
index ab567f9f97d5..9bf9a293b127 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.17
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.17
@@ -4,10 +4,10 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=7
 HOMEPAGE=https://www.xapian.org/
 IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote 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 ~s390 sparc x86 ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0/30
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.17/xapian-core-1.4.17.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f1ffb928423eede1a7dec3f1d0540d93
+_md5_=3a47251f7ca374bd60e3160274fd8f39
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 9b184815b845..3405106e38be 100644
Binary files a/metadata/md5-cache/dev-lua/Manifest.gz and b/metadata/md5-cache/dev-lua/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r1 b/metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r1
index bfc3f95f36e8..014484dab84e 100644
--- a/metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r1
+++ b/metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Command line argument parser for the Lua Programming Language
 EAPI=7
 HOMEPAGE=https://github.com/mpeterv/argparse
 IUSE=doc luajit test
-KEYWORDS=~amd64 ~arm ~arm64 ppc ppc64 ~x86
+KEYWORDS=~amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:= luajit? ( dev-lang/luajit:2 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mpeterv/argparse/archive/0.6.0.tar.gz -> lua-argparse-0.6.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=65400a8221eedd0df1c9fa140b264985
+_md5_=35435ed9f7c862a237374e79e7cbca77
diff --git a/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.8 b/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.8
new file mode 100644
index 000000000000..add530265069
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.8
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-lang/perl )
+DEFINED_PHASES=compile install prepare test
+DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 )
+DESCRIPTION=A fast JSON encoding/parsing module for Lua
+EAPI=7
+HOMEPAGE=https://www.kyne.com.au/~mark/software/lua-cjson.php https://github.com/openresty/lua-cjson
+IUSE=+internal-fpconv luajit test +threads
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 )
+REQUIRED_USE=threads? ( internal-fpconv )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/openresty/lua-cjson/archive/2.1.0.8.tar.gz -> lua-cjson-2.1.0.8.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1c9dfc222fc83c7e3c3ec800ed1e6b67
diff --git a/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.8-r100 b/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.8-r100
new file mode 100644
index 000000000000..848f0b0c9757
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.8-r100
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-lang/perl )
+DEFINED_PHASES=compile install prepare test
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DESCRIPTION=A fast JSON encoding/parsing module for Lua
+EAPI=7
+HOMEPAGE=https://www.kyne.com.au/~mark/software/lua-cjson.php https://github.com/openresty/lua-cjson
+IUSE=+internal-fpconv test +threads lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=threads? ( internal-fpconv ) || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/openresty/lua-cjson/archive/2.1.0.8.tar.gz -> lua-cjson-2.1.0.8.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ba7a88083d720fab902d5b6017f4c339
diff --git a/metadata/md5-cache/dev-lua/lua-utf8-0.1.3 b/metadata/md5-cache/dev-lua/lua-utf8-0.1.3
index f39cacaec758..986995ec3445 100644
--- a/metadata/md5-cache/dev-lua/lua-utf8-0.1.3
+++ b/metadata/md5-cache/dev-lua/lua-utf8-0.1.3
@@ -5,11 +5,11 @@ DESCRIPTION=A UTF-8 support module for Lua and LuaJIT
 EAPI=7
 HOMEPAGE=https://github.com/starwing/luautf8
 IUSE=luajit test
-KEYWORDS=~amd64 ~arm ~arm64 ppc ppc64 ~x86
+KEYWORDS=~amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/starwing/luautf8/archive/0.1.3.tar.gz -> lua-utf8-0.1.3.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2dbef4c7a5bdab80633cec43f29f1a69
+_md5_=1f7b2e9f41b4b385f8b28def31d721a6
diff --git a/metadata/md5-cache/dev-lua/luacheck-0.23.0-r1 b/metadata/md5-cache/dev-lua/luacheck-0.23.0-r1
index 57c061bce892..ad3eb11670b4 100644
--- a/metadata/md5-cache/dev-lua/luacheck-0.23.0-r1
+++ b/metadata/md5-cache/dev-lua/luacheck-0.23.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=A tool for linting and static analysis of Lua code
 EAPI=7
 HOMEPAGE=https://github.com/mpeterv/luacheck
 IUSE=doc luajit test
-KEYWORDS=~amd64 ~arm ppc64
+KEYWORDS=~amd64 arm ppc64
 LICENSE=MIT
 RDEPEND=dev-lua/lua-argparse[luajit(-)=] dev-lua/luafilesystem[luajit(-)=] dev-lua/lua-utf8[luajit(-)=] !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mpeterv/luacheck/archive/0.23.0.tar.gz -> luacheck-0.23.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a57ef9fd5352cfcf93fcee5a49d23683
+_md5_=1141d252e38d42b70c991c45515ac0f1
diff --git a/metadata/md5-cache/dev-lua/luacov-0.14.0 b/metadata/md5-cache/dev-lua/luacov-0.14.0
new file mode 100644
index 000000000000..4b604dbd1ba0
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luacov-0.14.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig test? ( dev-lua/busted luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) )
+DEFINED_PHASES=install test
+DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 )
+DESCRIPTION=A simple coverage analyzer for Lua scripts
+EAPI=7
+HOMEPAGE=https://github.com/keplerproject/luacov
+IUSE=luajit test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/keplerproject/luacov/archive/v0.14.0.tar.gz -> luacov-0.14.0.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=93b4f86dd78a44db1bf3eda8096c940e
diff --git a/metadata/md5-cache/dev-lua/luacov-0.14.0-r100 b/metadata/md5-cache/dev-lua/luacov-0.14.0-r100
new file mode 100644
index 000000000000..556c4ca595a4
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luacov-0.14.0-r100
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) )
+DEFINED_PHASES=install test
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DESCRIPTION=A simple coverage analyzer for Lua scripts
+EAPI=7
+HOMEPAGE=https://github.com/keplerproject/luacov
+IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/keplerproject/luacov/archive/v0.14.0.tar.gz -> luacov-0.14.0.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=afc062d92af0bec402c533b8a799f5e9
diff --git a/metadata/md5-cache/dev-lua/lualdap-1.2.0 b/metadata/md5-cache/dev-lua/lualdap-1.2.0
deleted file mode 100644
index 9052979f2a01..000000000000
--- a/metadata/md5-cache/dev-lua/lualdap-1.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-lang/lua:* net-nds/openldap net-nds/openldap virtual/pkgconfig
-DESCRIPTION=Simple interface from Lua to OpenLDAP
-EAPI=5
-HOMEPAGE=https://git.zx2c4.com/lualdap/about/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/lua:* net-nds/openldap
-SLOT=0
-SRC_URI=https://git.zx2c4.com/lualdap/snapshot/lualdap-1.2.0.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5e7964b2e1d531e17c4e2b054de1fa77
diff --git a/metadata/md5-cache/dev-lua/lualdap-1.2.5 b/metadata/md5-cache/dev-lua/lualdap-1.2.5
new file mode 100644
index 000000000000..cf681deb4228
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/lualdap-1.2.5
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig test? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) net-nds/openldap )
+DEFINED_PHASES=compile install test
+DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) net-nds/openldap
+DESCRIPTION=A lua binding for the OpenLDAP client libraries
+EAPI=7
+HOMEPAGE=https://github.com/lualdap/lualdap
+IUSE=luajit test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) net-nds/openldap
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/lualdap/lualdap/archive/v1.2.5.tar.gz -> lualdap-1.2.5.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e3e450556cc45b90a2f761aad56948a2
diff --git a/metadata/md5-cache/dev-lua/lualdap-1.2.5-r100 b/metadata/md5-cache/dev-lua/lualdap-1.2.5-r100
new file mode 100644
index 000000000000..2a0357779c8a
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/lualdap-1.2.5-r100
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( net-nds/openldap lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) )
+DEFINED_PHASES=compile install prepare
+DEPEND=net-nds/openldap lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DESCRIPTION=A lua binding for the OpenLDAP client libraries
+EAPI=7
+HOMEPAGE=https://github.com/lualdap/lualdap
+IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=net-nds/openldap lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/lualdap/lualdap/archive/v1.2.5.tar.gz -> lualdap-1.2.5.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d74feb551ef30f49a691ee2b49096340
diff --git a/metadata/md5-cache/dev-lua/luaossl-20150727 b/metadata/md5-cache/dev-lua/luaossl-20150727
deleted file mode 100644
index ca87fba56ebe..000000000000
--- a/metadata/md5-cache/dev-lua/luaossl-20150727
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:0 ) dev-libs/openssl:0[-bindist] !dev-lua/lua-openssl virtual/pkgconfig
-DESCRIPTION=Most comprehensive OpenSSL module in the Lua universe.
-EAPI=5
-HOMEPAGE=https://github.com/wahern/luaossl
-IUSE=luajit
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:0 ) dev-libs/openssl:0[-bindist] !dev-lua/lua-openssl
-SLOT=0
-SRC_URI=https://github.com/wahern/luaossl/archive/rel-20150727.tar.gz -> luaossl-20150727.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cf95b176765fb740e6c3611626a70311
diff --git a/metadata/md5-cache/dev-lua/luaossl-20180708 b/metadata/md5-cache/dev-lua/luaossl-20180708
deleted file mode 100644
index 67eb1a7a817d..000000000000
--- a/metadata/md5-cache/dev-lua/luaossl-20180708
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:0 ) dev-libs/openssl:0[-bindist] !dev-lua/lua-openssl virtual/pkgconfig
-DESCRIPTION=Most comprehensive OpenSSL module in the Lua universe.
-EAPI=7
-HOMEPAGE=https://github.com/wahern/luaossl
-IUSE=luajit
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:0 ) dev-libs/openssl:0[-bindist] !dev-lua/lua-openssl
-SLOT=0
-SRC_URI=https://github.com/wahern/luaossl/archive/rel-20180708.tar.gz -> luaossl-rel-20180708.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1d43a1618e5e7e4fe0f1e7e38a6dbcd1
diff --git a/metadata/md5-cache/dev-lua/luaossl-20181207 b/metadata/md5-cache/dev-lua/luaossl-20181207
deleted file mode 100644
index ed3d081ed8a1..000000000000
--- a/metadata/md5-cache/dev-lua/luaossl-20181207
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:0 ) dev-libs/openssl:0[-bindist] !dev-lua/lua-openssl virtual/pkgconfig
-DESCRIPTION=Most comprehensive OpenSSL module in the Lua universe.
-EAPI=7
-HOMEPAGE=https://github.com/wahern/luaossl
-IUSE=luajit
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:0 ) dev-libs/openssl:0[-bindist] !dev-lua/lua-openssl
-SLOT=0
-SRC_URI=https://github.com/wahern/luaossl/archive/rel-20181207.tar.gz -> luaossl-rel-20181207.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=92a79699dab36d6b397d70b719b2225d
diff --git a/metadata/md5-cache/dev-lua/luaossl-20190731 b/metadata/md5-cache/dev-lua/luaossl-20190731
deleted file mode 100644
index 8b18d5da3660..000000000000
--- a/metadata/md5-cache/dev-lua/luaossl-20190731
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:0 ) dev-libs/openssl:0[-bindist] !dev-lua/lua-openssl virtual/pkgconfig
-DESCRIPTION=Most comprehensive OpenSSL module in the Lua universe.
-EAPI=7
-HOMEPAGE=https://github.com/wahern/luaossl
-IUSE=luajit
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:0 ) dev-libs/openssl:0[-bindist] !dev-lua/lua-openssl
-SLOT=0
-SRC_URI=https://github.com/wahern/luaossl/archive/rel-20190731.tar.gz -> luaossl-rel-20190731.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=92a79699dab36d6b397d70b719b2225d
diff --git a/metadata/md5-cache/dev-lua/luaossl-20200709 b/metadata/md5-cache/dev-lua/luaossl-20200709
new file mode 100644
index 000000000000..ee67a519ad1c
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luaossl-20200709
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/openssl:0[-bindist] !dev-lua/luacrypto !dev-lua/lua-openssl !dev-lua/luasec luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 )
+DESCRIPTION=Most comprehensive OpenSSL module in the Lua universe
+EAPI=7
+HOMEPAGE=https://github.com/wahern/luaossl
+IUSE=examples luajit
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/openssl:0[-bindist] !dev-lua/luacrypto !dev-lua/lua-openssl !dev-lua/luasec luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 )
+SLOT=0
+SRC_URI=https://github.com/wahern/luaossl/archive/rel-20200709.tar.gz -> luaossl-rel-20200709.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e671800928536581fd078e8d6d76d54b
diff --git a/metadata/md5-cache/dev-lua/luaossl-20200709-r100 b/metadata/md5-cache/dev-lua/luaossl-20200709-r100
new file mode 100644
index 000000000000..64e03accf4f6
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luaossl-20200709-r100
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/openssl:0[-bindist] !dev-lua/luacrypto !dev-lua/lua-openssl !dev-lua/luasec lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DESCRIPTION=Most comprehensive OpenSSL module in the Lua universe
+EAPI=7
+HOMEPAGE=https://github.com/wahern/luaossl
+IUSE=examples lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/openssl:0[-bindist] !dev-lua/luacrypto !dev-lua/lua-openssl !dev-lua/luasec lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+SLOT=0
+SRC_URI=https://github.com/wahern/luaossl/archive/rel-20200709.tar.gz -> luaossl-rel-20200709.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a2657f97ef11c4428da36fdb40700ca0
diff --git a/metadata/md5-cache/dev-lua/luaposix-35.0 b/metadata/md5-cache/dev-lua/luaposix-35.0
index e432e3dd3678..8c7cacc162a0 100644
--- a/metadata/md5-cache/dev-lua/luaposix-35.0
+++ b/metadata/md5-cache/dev-lua/luaposix-35.0
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/lua:0= dev-lua/lua-bit32
+DEPEND=dev-lang/lua:0=
 DESCRIPTION=Bindings for POSIX APIs
 EAPI=7
 HOMEPAGE=https://luaposix.github.io/luaposix/ https://github.com/luaposix/luaposix
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/lua:0= dev-lua/lua-bit32
 SLOT=0
 SRC_URI=https://github.com/luaposix/luaposix/archive/v35.0.tar.gz -> luaposix-35.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=220605325496d4d999e1670a7340f217
+_md5_=b6d9122dc9b7d3b82f847eb37611d178
diff --git a/metadata/md5-cache/dev-lua/luaposix-35.0-r100 b/metadata/md5-cache/dev-lua/luaposix-35.0-r100
new file mode 100644
index 000000000000..da8b96c75327
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luaposix-35.0-r100
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
+DESCRIPTION=Bindings for POSIX APIs
+EAPI=7
+HOMEPAGE=https://luaposix.github.io/luaposix/ https://github.com/luaposix/luaposix
+IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) lua_targets_lua5-1? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_targets_luajit? ( dev-lua/lua-bit32[lua_targets_luajit(-)] )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/luaposix/luaposix/archive/v35.0.tar.gz -> luaposix-35.0.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=293b1d9f5c5441a578ca1ca89340c225
diff --git a/metadata/md5-cache/dev-lua/luarocks-3.4.0 b/metadata/md5-cache/dev-lua/luarocks-3.4.0
index dd3a16417807..875c2365f640 100644
--- a/metadata/md5-cache/dev-lua/luarocks-3.4.0
+++ b/metadata/md5-cache/dev-lua/luarocks-3.4.0
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig test? ( dev-lua/busted dev-lua/busted-htest luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:0 ) )
-DEFINED_PHASES=configure install test
+DEFINED_PHASES=configure install prepare test
 DEPEND=net-misc/curl libressl? ( dev-libs/libressl:0 ) !libressl? ( dev-libs/openssl:0 ) luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:0 )
 DESCRIPTION=A package manager for the Lua programming language
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://luarocks.org/releases/luarocks-3.4.0.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0c2ceb46acfd6981e3c2356d10a61d3d
+_md5_=9bd4d69cf2cad0f63ed4cf5fbdb7faaa
diff --git a/metadata/md5-cache/dev-lua/mpack-1.0.8 b/metadata/md5-cache/dev-lua/mpack-1.0.8-r1
similarity index 63%
rename from metadata/md5-cache/dev-lua/mpack-1.0.8
rename to metadata/md5-cache/dev-lua/mpack-1.0.8-r1
index 0067414478eb..fdc345042c01 100644
--- a/metadata/md5-cache/dev-lua/mpack-1.0.8
+++ b/metadata/md5-cache/dev-lua/mpack-1.0.8-r1
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig test? ( dev-lua/busted dev-libs/libmpack luajit? ( >=dev-lang/lua-5.1:= ) !luajit? ( dev-lang/luajit:2= ) )
+BDEPEND=virtual/pkgconfig test? ( dev-lua/busted dev-libs/libmpack luajit? ( dev-lang/luajit:2= ) !luajit? ( >=dev-lang/lua-5.1:= ) )
 DEFINED_PHASES=compile install test
-DEPEND=dev-libs/libmpack luajit? ( >=dev-lang/lua-5.1:= ) !luajit? ( dev-lang/luajit:2= )
+DEPEND=dev-libs/libmpack luajit? ( dev-lang/luajit:2= ) !luajit? ( >=dev-lang/lua-5.1:= )
 DESCRIPTION=Lua bindings for libmpack
 EAPI=7
 HOMEPAGE=https://github.com/libmpack/libmpack/
 IUSE=luajit test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=dev-libs/libmpack luajit? ( >=dev-lang/lua-5.1:= ) !luajit? ( dev-lang/luajit:2= )
+RDEPEND=dev-libs/libmpack luajit? ( dev-lang/luajit:2= ) !luajit? ( >=dev-lang/lua-5.1:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libmpack/libmpack-lua/archive/1.0.8.tar.gz -> mpack-1.0.8.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5af26da32e9708d1a647bf651be44189
+_md5_=a75760ebb2b417e3855618c4f5cce830
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index d68b9129fe62..ed8070b08fef 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/biniou-1.0.12 b/metadata/md5-cache/dev-ml/biniou-1.0.12
deleted file mode 100644
index a7ea299fc034..000000000000
--- a/metadata/md5-cache/dev-ml/biniou-1.0.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A binary data serialization format inspired by JSON for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/mjambon/biniou
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?]
-SLOT=0/1.0.12
-SRC_URI=https://github.com/mjambon/biniou/archive/v1.0.12.tar.gz -> biniou-1.0.12.tar.gz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=918cdf4fdd785509dd6d863cf65ca27a
diff --git a/metadata/md5-cache/dev-ml/biniou-1.0.13 b/metadata/md5-cache/dev-ml/biniou-1.0.13
deleted file mode 100644
index bfd48a9c0b0e..000000000000
--- a/metadata/md5-cache/dev-ml/biniou-1.0.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A binary data serialization format inspired by JSON for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/mjambon/biniou
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?]
-SLOT=0/1.0.13
-SRC_URI=https://github.com/mjambon/biniou/archive/v1.0.13.tar.gz -> biniou-1.0.13.tar.gz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=2d42a0143d49d564efa6218f47916204
diff --git a/metadata/md5-cache/dev-ml/biniou-1.1.0 b/metadata/md5-cache/dev-ml/biniou-1.1.0
deleted file mode 100644
index 8ab968809307..000000000000
--- a/metadata/md5-cache/dev-ml/biniou-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?] dev-ml/jbuilder dev-ml/opam >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A binary data serialization format inspired by JSON for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/mjambon/biniou
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?]
-SLOT=0/1.1.0
-SRC_URI=https://github.com/mjambon/biniou/archive/v1.1.0.tar.gz -> biniou-1.1.0.tar.gz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=0737b25fd7076c9b7fd353f69672dcb4
diff --git a/metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0-r1 b/metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0-r1
index ece887024af7..487cddb167d8 100644
--- a/metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0-r1
+++ b/metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Ocaml bindings for the cairo vector graphics library
 EAPI=7
 HOMEPAGE=https://www.cairographics.org/cairo-ocaml/
 IUSE=doc examples gtk pango
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:= x11-libs/cairo gtk? ( dev-ml/lablgtk:2= ) pango? ( x11-libs/pango )
 SLOT=0/1.2.0
 SRC_URI=https://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-1.2.0.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	findlib	17c71a5d96323df925f9f6db1215668a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=03d2a65ae09b5132526e5dbed1dd8886
+_md5_=fa50ff201bbcd3e2cb276f1cc597e7b4
diff --git a/metadata/md5-cache/dev-ml/cppo-1.6.6 b/metadata/md5-cache/dev-ml/cppo-1.6.6
index ef2c57eff9c3..f94cd7bd2f72 100644
--- a/metadata/md5-cache/dev-ml/cppo-1.6.6
+++ b/metadata/md5-cache/dev-ml/cppo-1.6.6
@@ -5,10 +5,10 @@ DESCRIPTION=An equivalent of the C preprocessor for OCaml programs
 EAPI=7
 HOMEPAGE=https://github.com/ocaml-community/cppo/
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-ml/ocamlbuild dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/1.6.6
 SRC_URI=https://github.com/ocaml-community/cppo/archive/v1.6.6.tar.gz -> cppo-1.6.6.tar.gz
 _eclasses_=dune	31e50aa986270c1f8ba957a9dd3f6fcf
-_md5_=62495275fb55fc0d2ec89534b126d3e2
+_md5_=af5f420f2edb9eea41e3260314589d2e
diff --git a/metadata/md5-cache/dev-ml/csv-1.5 b/metadata/md5-cache/dev-ml/csv-1.5
deleted file mode 100644
index be48e55e6862..000000000000
--- a/metadata/md5-cache/dev-ml/csv-1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=A pure OCaml library to read and write CSV files
-EAPI=5
-HOMEPAGE=https://github.com/Chris00/ocaml-csv
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/1.5
-SRC_URI=https://github.com/Chris00/ocaml-csv/releases/download/1.5/csv-1.5.tar.gz
-_eclasses_=base	a3f380d8a13f148f16d76fe39e90f451	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	oasis	54418322bbbf713ed1a0222b8c6593c0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7eecf398f6f1ab0cb7e76a9704061e26
diff --git a/metadata/md5-cache/dev-ml/csv-1.6 b/metadata/md5-cache/dev-ml/csv-1.6
deleted file mode 100644
index 5b16ec6b8dd8..000000000000
--- a/metadata/md5-cache/dev-ml/csv-1.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=lwt? ( dev-ml/lwt:= ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=A pure OCaml library to read and write CSV files
-EAPI=5
-HOMEPAGE=https://github.com/Chris00/ocaml-csv
-IUSE=+lwt +ocamlopt debug doc test
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=lwt? ( dev-ml/lwt:= ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/1.6
-SRC_URI=https://github.com/Chris00/ocaml-csv/releases/download/1.6/csv-1.6.tar.gz
-_eclasses_=base	a3f380d8a13f148f16d76fe39e90f451	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	oasis	54418322bbbf713ed1a0222b8c6593c0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b7846eaaef4cb64d34d3ef6d65a69a49
diff --git a/metadata/md5-cache/dev-ml/dune-2.7.1 b/metadata/md5-cache/dev-ml/dune-2.7.1
index eaf3b39de226..8fe8f851835f 100644
--- a/metadata/md5-cache/dev-ml/dune-2.7.1
+++ b/metadata/md5-cache/dev-ml/dune-2.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=A composable build system for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/dune
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-lang/ocaml !dev-ml/jbuilder
 RESTRICT=test
 SLOT=0/2.7.1
 SRC_URI=https://github.com/ocaml/dune/archive/2.7.1.tar.gz -> dune-2.7.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=6fc6a64b18c35200e7a40357a65362d0
+_md5_=93863525f2b541bcda0269e65c0ddfaf
diff --git a/metadata/md5-cache/dev-ml/easy-format-1.0.2 b/metadata/md5-cache/dev-ml/easy-format-1.0.2
deleted file mode 100644
index 9dcac8dea3bd..000000000000
--- a/metadata/md5-cache/dev-ml/easy-format-1.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Pretty-printing library for OCaml
-EAPI=5
-HOMEPAGE=http://mjambon.com/easy-format.html
-IUSE=examples +ocamlopt
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-lang/ocaml:=[ocamlopt?]
-SLOT=0/1.0.2
-SRC_URI=http://mjambon.com/releases/easy-format/easy-format-1.0.2.tar.gz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=efc71a1d6389ea34bfdd4d040edd7f3b
diff --git a/metadata/md5-cache/dev-ml/extlib-1.7.2 b/metadata/md5-cache/dev-ml/extlib-1.7.2
deleted file mode 100644
index 3a3377da6017..000000000000
--- a/metadata/md5-cache/dev-ml/extlib-1.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] dev-ml/cppo:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Standard library extensions for O'Caml
-EAPI=5
-HOMEPAGE=https://github.com/ygrek/ocaml-extlib
-IUSE=doc +ocamlopt
-KEYWORDS=~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] dev-ml/cppo:=
-SLOT=0/1.7.2
-SRC_URI=https://github.com/ygrek/ocaml-extlib/archive/1.7.2.tar.gz -> extlib-1.7.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=702af8f70a166ed08becd850ea8fd1c4
diff --git a/metadata/md5-cache/dev-ml/extlib-1.7.7 b/metadata/md5-cache/dev-ml/extlib-1.7.7
index 5ba668d060a0..172e1b871f5a 100644
--- a/metadata/md5-cache/dev-ml/extlib-1.7.7
+++ b/metadata/md5-cache/dev-ml/extlib-1.7.7
@@ -5,10 +5,10 @@ DESCRIPTION=Standard library extensions for O'Caml
 EAPI=7
 HOMEPAGE=https://github.com/ygrek/ocaml-extlib
 IUSE=doc +ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.7.7
 SRC_URI=https://github.com/ygrek/ocaml-extlib/archive/1.7.7.tar.gz -> extlib-1.7.7.tar.gz
 _eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=68c23c3ae1f3f718e967fc9a0853a3cd
+_md5_=93d9373ec0154b16d195ec3f8ecd911e
diff --git a/metadata/md5-cache/dev-ml/findlib-1.8.1-r1 b/metadata/md5-cache/dev-ml/findlib-1.8.1-r1
index 6d3dd5e4aa21..3185d88b69fe 100644
--- a/metadata/md5-cache/dev-ml/findlib-1.8.1-r1
+++ b/metadata/md5-cache/dev-ml/findlib-1.8.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=OCaml tool to find/use non-standard packages
 EAPI=7
 HOMEPAGE=http://projects.camlcity.org/projects/findlib.html
 IUSE=doc +ocamlopt tk
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.08.1-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
 SLOT=0
 SRC_URI=http://download.camlcity.org/download/findlib-1.8.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d80fe9dd9ad3393ffa5ec76acd48a46d
+_md5_=80a1e112dc061892815d65c0f7550970
diff --git a/metadata/md5-cache/dev-ml/iTeML-2.5 b/metadata/md5-cache/dev-ml/iTeML-2.5
deleted file mode 100644
index 4833ab667b2d..000000000000
--- a/metadata/md5-cache/dev-ml/iTeML-2.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/qcheck-0.5:= dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Inline (Unit) Tests for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/vincent-hugot/iTeML
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/qcheck-0.5:=
-SLOT=0/2.5
-SRC_URI=https://github.com/vincent-hugot/iTeML/archive/v2.5.tar.gz -> iTeML-2.5.tar.gz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=8b17093b979998210dd621ee22e3b8da
diff --git a/metadata/md5-cache/dev-ml/iTeML-2.6 b/metadata/md5-cache/dev-ml/iTeML-2.6
deleted file mode 100644
index 2b7f99e3a096..000000000000
--- a/metadata/md5-cache/dev-ml/iTeML-2.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/qcheck-0.5:= dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Inline (Unit) Tests for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/vincent-hugot/iTeML
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/qcheck-0.5:=
-SLOT=0/2.6
-SRC_URI=https://github.com/vincent-hugot/iTeML/archive/v2.6.tar.gz -> iTeML-2.6.tar.gz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=8b17093b979998210dd621ee22e3b8da
diff --git a/metadata/md5-cache/dev-ml/lwt-3.0.0 b/metadata/md5-cache/dev-ml/lwt-3.0.0
deleted file mode 100644
index 4af526b7a47b..000000000000
--- a/metadata/md5-cache/dev-ml/lwt-3.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/libev >=dev-lang/ocaml-4.02:= dev-ml/result:= ppx? ( dev-ml/ppx_tools:= ) camlp4? ( dev-ml/camlp4:= ) dev-ml/cppo >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Cooperative light-weight thread library for OCaml
-EAPI=5
-HOMEPAGE=http://ocsigen.org/lwt
-IUSE=+camlp4 +ppx +ocamlopt debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-libs/libev >=dev-lang/ocaml-4.02:= dev-ml/result:= ppx? ( dev-ml/ppx_tools:= ) camlp4? ( dev-ml/camlp4:= ) !<www-servers/ocsigen-1.1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/3.0.0
-SRC_URI=https://github.com/ocsigen/lwt/archive/3.0.0.tar.gz -> lwt-3.0.0.tar.gz
-_eclasses_=base	a3f380d8a13f148f16d76fe39e90f451	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	oasis	54418322bbbf713ed1a0222b8c6593c0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=96d6618de5ea94439776e574164b421b
diff --git a/metadata/md5-cache/dev-ml/lwt-3.1.0 b/metadata/md5-cache/dev-ml/lwt-3.1.0
deleted file mode 100644
index 9d9d03394936..000000000000
--- a/metadata/md5-cache/dev-ml/lwt-3.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-lang/ocaml-4.02:= dev-ml/result:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_tools_versioned:= libev? ( dev-libs/libev ) camlp4? ( dev-ml/camlp4:= ) dev-ml/cppo dev-ml/findlib dev-ml/jbuilder dev-ml/opam
-DESCRIPTION=Cooperative light-weight thread library for OCaml
-EAPI=5
-HOMEPAGE=http://ocsigen.org/lwt
-IUSE=+camlp4 +libev
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.02:= dev-ml/result:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_tools_versioned:= libev? ( dev-libs/libev ) camlp4? ( dev-ml/camlp4:= ) !<www-servers/ocsigen-1.1
-SLOT=0/3.1.0
-SRC_URI=https://github.com/ocsigen/lwt/archive/3.1.0.tar.gz -> lwt-3.1.0.tar.gz
-_md5_=050daec4f3a4ae27fb69a6e096eaa46d
diff --git a/metadata/md5-cache/dev-ml/lwt_ssl-1.0.1 b/metadata/md5-cache/dev-ml/lwt_ssl-1.0.1
deleted file mode 100644
index 8bf19f0d9e55..000000000000
--- a/metadata/md5-cache/dev-ml/lwt_ssl-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/lwt-3.0.0:= >=dev-ml/ocaml-ssl-0.4.0:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=GLib integration for Lwt
-EAPI=5
-HOMEPAGE=http://ocsigen.org/lwt
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64 ~arm ~ppc
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-ml/lwt-3.0.0:= >=dev-ml/ocaml-ssl-0.4.0:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/1.0.1
-SRC_URI=https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_ssl-1.0.1.tar.gz
-_eclasses_=base	a3f380d8a13f148f16d76fe39e90f451	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	oasis	54418322bbbf713ed1a0222b8c6593c0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0dff6c27265e7fca48a22fb6000cf2a2
diff --git a/metadata/md5-cache/dev-ml/oasis-0.4.8 b/metadata/md5-cache/dev-ml/oasis-0.4.8
deleted file mode 100644
index a6f4f0968e30..000000000000
--- a/metadata/md5-cache/dev-ml/oasis-0.4.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/ocaml-data-notation-0.0.11:= dev-ml/ocamlbuild:=[ocamlopt] >=dev-ml/findlib-1.3.1 dev-ml/ocamlify dev-ml/ocamlmod !<sci-chemistry/oasis-4.0-r3 test? ( >=dev-ml/ocaml-fileutils-0.4.2 >=dev-ml/ounit-2.0.0 >=dev-ml/ocaml-expect-0.0.4 dev-ml/pcre-ocaml dev-ml/extlib ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Tool to integrate a configure, build and install system in OCaml project
-EAPI=5
-HOMEPAGE=http://oasis.forge.ocamlcore.org/index.php
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-ml/ocaml-data-notation-0.0.11:= dev-ml/ocamlbuild:=[ocamlopt] >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test ) strip
-SLOT=0/0.4.8
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1669/oasis-0.4.8.tar.gz
-_eclasses_=base	a3f380d8a13f148f16d76fe39e90f451	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	oasis	54418322bbbf713ed1a0222b8c6593c0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7ec28108f0313052a142781b2d0b02b3
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.3 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.3
deleted file mode 100644
index c5400a38656a..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] dev-libs/libffi test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Library for binding to C libraries using pure OCaml
-EAPI=5
-HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
-IUSE=test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] dev-libs/libffi
-RESTRICT=!test? ( test )
-SLOT=0/0.11.3
-SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.11.3.tar.gz -> ocaml-ctypes-0.11.3.tar.gz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=0cdd1d47480eaaceae1fb83f8fcdd7b5
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.12.1 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.12.1
deleted file mode 100644
index 34e88514ad0f..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] dev-libs/libffi dev-ml/integers:= test? ( dev-ml/ounit dev-ml/lwt ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Library for binding to C libraries using pure OCaml
-EAPI=5
-HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] dev-libs/libffi dev-ml/integers:=
-RESTRICT=!test? ( test )
-SLOT=0/0.12.1
-SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.12.1.tar.gz -> ocaml-ctypes-0.12.1.tar.gz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=53342471716ec82472ba39746d885046
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.13.0 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.13.0
deleted file mode 100644
index 02d3026433d6..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] dev-libs/libffi dev-ml/integers:= test? ( dev-ml/ounit dev-ml/lwt ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Library for binding to C libraries using pure OCaml
-EAPI=5
-HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] dev-libs/libffi dev-ml/integers:=
-RESTRICT=!test? ( test )
-SLOT=0/0.13.0
-SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.13.0.tar.gz -> ocaml-ctypes-0.13.0.tar.gz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=53342471716ec82472ba39746d885046
diff --git a/metadata/md5-cache/dev-ml/ocaml-dispatch-0.3.0 b/metadata/md5-cache/dev-ml/ocaml-dispatch-0.3.0
deleted file mode 100644
index 5242af7339ab..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-dispatch-0.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=javascript? ( dev-ml/js_of_ocaml:=[ppx,ocamlopt?] ) dev-ml/result:=[ocamlopt?] test? ( dev-ml/ounit[ocamlopt?] ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Path-based dispatching for client- and server-side applications
-EAPI=5
-HOMEPAGE=https://github.com/inhabitedtype/ocaml-dispatch
-IUSE=javascript +ocamlopt debug doc test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=javascript? ( dev-ml/js_of_ocaml:=[ppx,ocamlopt?] ) dev-ml/result:=[ocamlopt?] >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/0.3.0
-SRC_URI=https://github.com/inhabitedtype/ocaml-dispatch/archive/0.3.0.tar.gz -> ocaml-dispatch-0.3.0.tar.gz
-_eclasses_=base	a3f380d8a13f148f16d76fe39e90f451	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	oasis	54418322bbbf713ed1a0222b8c6593c0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a905da72b9363914dad5d686a7176dd6
diff --git a/metadata/md5-cache/dev-ml/ocaml-expat-1.0.0 b/metadata/md5-cache/dev-ml/ocaml-expat-1.0.0
deleted file mode 100644
index 4300cbf12349..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-expat-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?] test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml bindings for expat
-EAPI=5
-HOMEPAGE=https://github.com/whitequark/ocaml-expat
-IUSE=doc +ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/1.0.0
-SRC_URI=https://github.com/whitequark/ocaml-expat/archive/v1.0.0.tar.gz -> ocaml-expat-1.0.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a6d17d3e66d9ed1d794b78cb238e4f50
diff --git a/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0 b/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0
deleted file mode 100644
index 02eb7c620d4d..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?] test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml bindings for expat
-EAPI=5
-HOMEPAGE=https://github.com/whitequark/ocaml-expat
-IUSE=doc +ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/1.1.0
-SRC_URI=https://github.com/whitequark/ocaml-expat/archive/v1.1.0.tar.gz -> ocaml-expat-1.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a6d17d3e66d9ed1d794b78cb238e4f50
diff --git a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.1 b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.1
deleted file mode 100644
index 72fa4ab91f2c..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] >=dev-ml/ounit-2.0.0 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Pure OCaml functions to manipulate real file (POSIX like) and filename
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/ocaml-fileutils
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/0.5.1
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1651/ocaml-fileutils-0.5.1.tar.gz
-_eclasses_=base	a3f380d8a13f148f16d76fe39e90f451	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	oasis	54418322bbbf713ed1a0222b8c6593c0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9b898c5e3b0e8ea0c83259cc0f46ea6d
diff --git a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.2 b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.2
deleted file mode 100644
index 937045d51004..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] >=dev-ml/ounit-2.0.0 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Pure OCaml functions to manipulate real file (POSIX like) and filename
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/ocaml-fileutils
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/0.5.2
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1695/ocaml-fileutils-0.5.2.tar.gz
-_eclasses_=base	a3f380d8a13f148f16d76fe39e90f451	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	oasis	54418322bbbf713ed1a0222b8c6593c0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4fa950af6203a24b43d7c6a3af3cff4f
diff --git a/metadata/md5-cache/dev-ml/ocaml-hashcons-1.2 b/metadata/md5-cache/dev-ml/ocaml-hashcons-1.2
deleted file mode 100644
index 5bbaacbff69c..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-hashcons-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/ocaml:=[ocamlopt?] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml hash-consing library
-EAPI=5
-HOMEPAGE=https://github.com/backtracking/ocaml-hashcons
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-lang/ocaml:=[ocamlopt?]
-SLOT=0/1.2
-SRC_URI=https://github.com/backtracking/ocaml-hashcons/archive/1.2.tar.gz -> ocaml-hashcons-1.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	findlib	17c71a5d96323df925f9f6db1215668a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0d1738214c2a8dbeb35fbe1e9118c68c
diff --git a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.2 b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.2
deleted file mode 100644
index 98c20efb5b96..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-db/sqlite-3.3.3 >=dev-ml/findlib-1.3.2 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=A package for ocaml that provides access to SQLite databases
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/sqlite3-ocaml/
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-db/sqlite-3.3.3 >=dev-ml/findlib-1.3.2 >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/4.1.2
-SRC_URI=https://github.com/mmottl/sqlite3-ocaml/releases/download/v4.1.2/sqlite3-ocaml-4.1.2.tar.gz
-_eclasses_=base	a3f380d8a13f148f16d76fe39e90f451	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	oasis	54418322bbbf713ed1a0222b8c6593c0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=84f7acbbc7b41d1e596c9a49e6d17121
diff --git a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.3 b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.3
deleted file mode 100644
index 650539e365e3..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-db/sqlite-3.3.3 >=dev-ml/findlib-1.3.2 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=A package for ocaml that provides access to SQLite databases
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/sqlite3-ocaml/
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-db/sqlite-3.3.3 >=dev-ml/findlib-1.3.2 >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/4.1.3
-SRC_URI=https://github.com/mmottl/sqlite3-ocaml/releases/download/v4.1.3/sqlite3-ocaml-4.1.3.tar.gz
-_eclasses_=base	a3f380d8a13f148f16d76fe39e90f451	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	oasis	54418322bbbf713ed1a0222b8c6593c0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=84f7acbbc7b41d1e596c9a49e6d17121
diff --git a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.2.0 b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.2.0
deleted file mode 100644
index b84aad06b785..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-db/sqlite-3.3.3 dev-ml/jbuilder dev-ml/base dev-ml/stdio dev-ml/configurator >=dev-ml/findlib-1.3.2 >=dev-lang/ocaml-4:= dev-ml/opam-installer
-DESCRIPTION=A package for ocaml that provides access to SQLite databases
-EAPI=5
-HOMEPAGE=http://mmottl.github.io/sqlite3-ocaml/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-db/sqlite-3.3.3 >=dev-lang/ocaml-4:=
-SLOT=0/4.2.0
-SRC_URI=https://github.com/mmottl/sqlite3-ocaml/releases/download/4.2.0/sqlite3-4.2.0.tbz
-_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
-_md5_=44715ecd1904679f92c6006b7c107848
diff --git a/metadata/md5-cache/dev-ml/ocamlmod-0.0.8 b/metadata/md5-cache/dev-ml/ocamlmod-0.0.8
deleted file mode 100644
index d997f7a971d0..000000000000
--- a/metadata/md5-cache/dev-ml/ocamlmod-0.0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Generate OCaml modules from source files
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/ocamlmod/
-IUSE=+ocamlopt debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/0.0.8
-SRC_URI=https://forge.ocamlcore.org/frs/download.php/1544/ocamlmod-0.0.8.tar.gz
-_eclasses_=base	a3f380d8a13f148f16d76fe39e90f451	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	oasis	54418322bbbf713ed1a0222b8c6593c0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=532c026b62d58bf4b2620042a5f13cf3
diff --git a/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.03.0 b/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.03.0
deleted file mode 100644
index d4246cc14c2b..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.03.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Tools for authors of ppx rewriters
-EAPI=5
-HOMEPAGE=https://github.com/alainfrisch/ppx_tools
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?]
-SLOT=0/5.0.4.03.0
-SRC_URI=https://github.com/alainfrisch/ppx_tools/archive/5.0+4.03.0.tar.gz -> ppx_tools-5.0.4.03.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c9beeeaee3d66f98c97cbef90c0d647c
diff --git a/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.05.0 b/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.05.0
deleted file mode 100644
index 606818570d4a..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.05.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND==dev-lang/ocaml-4.05*:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Tools for authors of ppx rewriters
-EAPI=5
-HOMEPAGE=https://github.com/alainfrisch/ppx_tools
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND==dev-lang/ocaml-4.05*:=[ocamlopt?]
-SLOT=0/5.0.4.05.0
-SRC_URI=https://github.com/alainfrisch/ppx_tools/archive/5.0+4.05.0.tar.gz -> ppx_tools-5.0.4.05.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f235b5dab749d8a1dc37210691c7ebb5
diff --git a/metadata/md5-cache/dev-ml/ppx_tools-5.3.4.08.0 b/metadata/md5-cache/dev-ml/ppx_tools-5.3.4.08.0
deleted file mode 100644
index 30f08d3002fd..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_tools-5.3.4.08.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Tools for authors of ppx rewriters
-EAPI=7
-HOMEPAGE=https://github.com/alainfrisch/ppx_tools
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/ocaml:=[ocamlopt?]
-SLOT=0/5.3.4.08.0
-SRC_URI=https://github.com/alainfrisch/ppx_tools/archive/5.3+4.08.0.tar.gz -> ppx_tools-5.3.4.08.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=39ba17f3c0cb2ec896824a689ce31d7c
diff --git a/metadata/md5-cache/dev-ml/qcheck-0.6 b/metadata/md5-cache/dev-ml/qcheck-0.6
deleted file mode 100644
index 7cb79d53afdd..000000000000
--- a/metadata/md5-cache/dev-ml/qcheck-0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/ounit:= !<dev-ml/iTeML-2.5 dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=QuickCheck inspired property-based testing for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/c-cube/qcheck/
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-ml/ounit:= !<dev-ml/iTeML-2.5 >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/0.6
-SRC_URI=https://github.com/c-cube/qcheck/archive/0.6.tar.gz -> qcheck-0.6.tar.gz
-_eclasses_=base	a3f380d8a13f148f16d76fe39e90f451	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	oasis	54418322bbbf713ed1a0222b8c6593c0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=972dcb87593ab4bf6d333df0e473be11
diff --git a/metadata/md5-cache/dev-perl/File-Next-1.180.0-r1 b/metadata/md5-cache/dev-perl/File-Next-1.180.0-r1
index 03dfdd2266ee..cd8541974369 100644
--- a/metadata/md5-cache/dev-perl/File-Next-1.180.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Next-1.180.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=An iterator-based module for finding files
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-Next
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=Artistic-2 GPL-2+
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/File-Next-1.18.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=23fa23c5727b971e141463c3a51c5575
+_md5_=8cf191f3c6db4b66b4a1646151b246e8
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 961545362da8..e10176319257 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-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 0a5c354270fa..19c747ae254c 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/doctrine-1.2.5 b/metadata/md5-cache/dev-php/doctrine-1.2.5
deleted file mode 100644
index ab8af64a8552..000000000000
--- a/metadata/md5-cache/dev-php/doctrine-1.2.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/php-5.2.3:*[cli,pdo]
-DESCRIPTION=An object relational mapper for PHP5
-EAPI=5
-HOMEPAGE=https://www.doctrine-project.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 MIT BSD
-RDEPEND=>=dev-lang/php-5.2.3:*[cli,pdo]
-SLOT=0
-SRC_URI=https://github.com/doctrine/doctrine1/archive/v1.2.5.tar.gz -> doctrine-1.2.5.tar.gz
-_md5_=aaee163cac291cc4f91083d34984c585
diff --git a/metadata/md5-cache/dev-php/doctrine-2.4.6 b/metadata/md5-cache/dev-php/doctrine-2.4.6
deleted file mode 100644
index 6d4e7437bf1e..000000000000
--- a/metadata/md5-cache/dev-php/doctrine-2.4.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/php-5.3.2:*[cli,pdo]
-DESCRIPTION=An object relational mapper for PHP5
-EAPI=5
-HOMEPAGE=https://www.doctrine-project.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 MIT BSD
-RDEPEND=>=dev-lang/php-5.3.2:*[cli,pdo]
-SLOT=2
-SRC_URI=https://github.com/doctrine/doctrine2/archive/v2.4.6.tar.gz -> doctrine-2.4.6.tar.gz
-_md5_=4abb522e51f1e897e9c329e48629e992
diff --git a/metadata/md5-cache/dev-php/pecl-yaml-2.1.0 b/metadata/md5-cache/dev-php/pecl-yaml-2.1.0
index 0c03192e1009..1a4304a3d590 100644
--- a/metadata/md5-cache/dev-php/pecl-yaml-2.1.0
+++ b/metadata/md5-cache/dev-php/pecl-yaml-2.1.0
@@ -5,11 +5,11 @@ DESCRIPTION=YAML 1.1 (YAML Ain't Markup Language) serialization for PHP
 EAPI=7
 HOMEPAGE=https://pecl.php.net/yaml
 IUSE=php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php5-6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libyaml-0.1.0 php_targets_php5-6? ( dev-php/pecl-yaml:0[php_targets_php5-6] ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php5-6? ( dev-lang/php:5.6 )
 REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php5-6 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/yaml-2.1.0.tgz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=29d112fadbd044a6bbe382dabdd5bd78
+_md5_=cc040ad864bb72272d437c8cd06d0e9f
diff --git a/metadata/md5-cache/dev-python/3to2-1.1.1-r1 b/metadata/md5-cache/dev-python/3to2-1.1.1-r1
index a1f40b7e2fab..3296b5d1be7e 100644
--- a/metadata/md5-cache/dev-python/3to2-1.1.1-r1
+++ b/metadata/md5-cache/dev-python/3to2-1.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/3/3to2/3to2-1.1.1.zip
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9b059fadc243bde8f42ace1c58238099
diff --git a/metadata/md5-cache/dev-python/APScheduler-3.6.3 b/metadata/md5-cache/dev-python/APScheduler-3.6.3
index ad2e673f788c..2178f6778c93 100644
--- a/metadata/md5-cache/dev-python/APScheduler-3.6.3
+++ b/metadata/md5-cache/dev-python/APScheduler-3.6.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/A/APScheduler/APScheduler-3.6.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f4e22c6fe8e6a9608af7c3357186c5ca
diff --git a/metadata/md5-cache/dev-python/Babel-2.8.0-r2 b/metadata/md5-cache/dev-python/Babel-2.8.0-r2
index 86abec0fe3ac..6acf79230afa 100644
--- a/metadata/md5-cache/dev-python/Babel-2.8.0-r2
+++ b/metadata/md5-cache/dev-python/Babel-2.8.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/B/Babel/Babel-2.8.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0303c00112d6cea82b7cde5d456411d2
diff --git a/metadata/md5-cache/dev-python/Babel-2.8.1 b/metadata/md5-cache/dev-python/Babel-2.8.1
index faa4dcc99d76..f9081af601f4 100644
--- a/metadata/md5-cache/dev-python/Babel-2.8.1
+++ b/metadata/md5-cache/dev-python/Babel-2.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/B/Babel/Babel-2.8.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0f92077713d7788a41c5601cbf9e5b81
diff --git a/metadata/md5-cache/dev-python/BitVector-3.4.9 b/metadata/md5-cache/dev-python/BitVector-3.4.9
index 6b64c09b1daf..2f3e392ddcec 100644
--- a/metadata/md5-cache/dev-python/BitVector-3.4.9
+++ b/metadata/md5-cache/dev-python/BitVector-3.4.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://engineering.purdue.edu/kak/dist/BitVector-3.4.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7eda308e4ae8df90826f8b96733e5dac
diff --git a/metadata/md5-cache/dev-python/GitPython-3.1.11 b/metadata/md5-cache/dev-python/GitPython-3.1.11
index e1561eb5d0ea..dec92f812fbe 100644
--- a/metadata/md5-cache/dev-python/GitPython-3.1.11
+++ b/metadata/md5-cache/dev-python/GitPython-3.1.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/G/GitPython/GitPython-3.1.11.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/GitPython-3.1.11.gitbundle https://dev.gentoo.org/~mgorny/dist/gitdb-4.0.5.gitbundle https://dev.gentoo.org/~mgorny/dist/smmap-3.0.4.gitbundle )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2c29ec60c28d62c1e0df37efdae15371
diff --git a/metadata/md5-cache/dev-python/GridDataFormats-0.4.0-r1 b/metadata/md5-cache/dev-python/GridDataFormats-0.4.0-r1
index 69756cd35448..00f9f5ac9a03 100644
--- a/metadata/md5-cache/dev-python/GridDataFormats-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/GridDataFormats-0.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.0.3[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/G/GridDataFormats/GridDataFormats-0.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=773e0c6a153becdd3135396681612fdd
diff --git a/metadata/md5-cache/dev-python/HeapDict-1.0.0 b/metadata/md5-cache/dev-python/HeapDict-1.0.0
index 11fbdb3651a9..1515616eba30 100644
--- a/metadata/md5-cache/dev-python/HeapDict-1.0.0
+++ b/metadata/md5-cache/dev-python/HeapDict-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/H/HeapDict/HeapDict-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=567bac06d3b9e5e7dc2f0b1e29434c6e
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 444308005ce0..7023c8b6fc12 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/MechanicalSoup-0.12.0 b/metadata/md5-cache/dev-python/MechanicalSoup-0.12.0
index f9175ad5a920..ef94e26fb0fb 100644
--- a/metadata/md5-cache/dev-python/MechanicalSoup-0.12.0
+++ b/metadata/md5-cache/dev-python/MechanicalSoup-0.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/MechanicalSoup/MechanicalSoup-0.12.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fb099edff5d0dd91c3e340bfb3cd798a
diff --git a/metadata/md5-cache/dev-python/PyContracts-1.8.14-r1 b/metadata/md5-cache/dev-python/PyContracts-1.8.14-r1
index 45023921be7c..2cbbe9a57045 100644
--- a/metadata/md5-cache/dev-python/PyContracts-1.8.14-r1
+++ b/metadata/md5-cache/dev-python/PyContracts-1.8.14-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyContracts/PyContracts-1.8.14.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dc3757828353ee4daed5fef8c989c9f7
diff --git a/metadata/md5-cache/dev-python/PyECLib-1.6.0 b/metadata/md5-cache/dev-python/PyECLib-1.6.0
index 0f3163762ba5..af83ffb10aaf 100644
--- a/metadata/md5-cache/dev-python/PyECLib-1.6.0
+++ b/metadata/md5-cache/dev-python/PyECLib-1.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyeclib/pyeclib-1.6.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=58b73501417d8faeb339c62a089bd7ae
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.53 b/metadata/md5-cache/dev-python/PyGithub-1.53
index 755adb9aeb27..099a636ca989 100644
--- a/metadata/md5-cache/dev-python/PyGithub-1.53
+++ b/metadata/md5-cache/dev-python/PyGithub-1.53
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyGithub/PyGithub/archive/v1.53.tar.gz -> PyGithub-1.53.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c797dfaf7fef86366682417f63031666
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.54 b/metadata/md5-cache/dev-python/PyGithub-1.54
index 722ba7494c93..a2812e3a404e 100644
--- a/metadata/md5-cache/dev-python/PyGithub-1.54
+++ b/metadata/md5-cache/dev-python/PyGithub-1.54
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyGithub/PyGithub/archive/v1.54.tar.gz -> PyGithub-1.54.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d50c050cc487e8f59b9dc44a829ff66b
diff --git a/metadata/md5-cache/dev-python/PyICU-2.5 b/metadata/md5-cache/dev-python/PyICU-2.5
index bb4a48ea957e..41afcd9ba24d 100644
--- a/metadata/md5-cache/dev-python/PyICU-2.5
+++ b/metadata/md5-cache/dev-python/PyICU-2.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyICU/PyICU-2.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2c1824f59b816a3e073ae597ea2914f4
diff --git a/metadata/md5-cache/dev-python/PyPDF2-1.26.0 b/metadata/md5-cache/dev-python/PyPDF2-1.26.0
index e569d9373624..d91d21b7e694 100644
--- a/metadata/md5-cache/dev-python/PyPDF2-1.26.0
+++ b/metadata/md5-cache/dev-python/PyPDF2-1.26.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyPDF2/PyPDF2-1.26.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=048e27546e73547ec1a0531ddd9ca6c2
diff --git a/metadata/md5-cache/dev-python/PyRSS2Gen-1.1-r1 b/metadata/md5-cache/dev-python/PyRSS2Gen-1.1-r1
index f634ab1afd2f..b3685619f02c 100644
--- a/metadata/md5-cache/dev-python/PyRSS2Gen-1.1-r1
+++ b/metadata/md5-cache/dev-python/PyRSS2Gen-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=http://www.dalkescientific.com/Python/PyRSS2Gen-1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0a5ca8243df60d6b6b6c79f5484e2e86
diff --git a/metadata/md5-cache/dev-python/PySDL2-0.9.7 b/metadata/md5-cache/dev-python/PySDL2-0.9.7
index 9b23c3a50c6f..1187f868a32f 100644
--- a/metadata/md5-cache/dev-python/PySDL2-0.9.7
+++ b/metadata/md5-cache/dev-python/PySDL2-0.9.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PySDL2/PySDL2-0.9.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=880527e990bc8fcb9135a2719df657d5
diff --git a/metadata/md5-cache/dev-python/PySensors-0.0.4 b/metadata/md5-cache/dev-python/PySensors-0.0.4
index dc3f80c95f9a..2aaad233807c 100644
--- a/metadata/md5-cache/dev-python/PySensors-0.0.4
+++ b/metadata/md5-cache/dev-python/PySensors-0.0.4
@@ -1,14 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Python bindings to libsensors (via ctypes)
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pypi.org/project/PySensors/
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1
-RDEPEND=>=sys-apps/lm-sensors-3 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=sys-apps/lm-sensors-3 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PySensors/PySensors-0.0.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=843ee0e2e7428a59809fb619d7252685
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9980ed543471f97e587e95cab09923e2
diff --git a/metadata/md5-cache/dev-python/PySocks-1.7.1-r1 b/metadata/md5-cache/dev-python/PySocks-1.7.1-r1
index 553119369c06..9513fcf3f702 100644
--- a/metadata/md5-cache/dev-python/PySocks-1.7.1-r1
+++ b/metadata/md5-cache/dev-python/PySocks-1.7.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/P/PySocks/PySocks-1.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d7514b7b05a4a98532090cf11ec0af48
diff --git a/metadata/md5-cache/dev-python/PyUtilib-5.7.2 b/metadata/md5-cache/dev-python/PyUtilib-5.7.2
index deca4125a53c..dd7c9d1b2be0 100644
--- a/metadata/md5-cache/dev-python/PyUtilib-5.7.2
+++ b/metadata/md5-cache/dev-python/PyUtilib-5.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/PyUtilib/pyutilib/archive/5.7.2.tar.gz -> PyUtilib-5.7.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=67c3a584c9934f5579c2e1ac69abebf7
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=07bc5c490e65d8a57e3e87bcb63feee5
diff --git a/metadata/md5-cache/dev-python/QtPy-1.9.0-r2 b/metadata/md5-cache/dev-python/QtPy-1.9.0-r2
index 1fc4be3e3023..af445d3651c9 100644
--- a/metadata/md5-cache/dev-python/QtPy-1.9.0-r2
+++ b/metadata/md5-cache/dev-python/QtPy-1.9.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/Q/QtPy/QtPy-1.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=642be8545632d0c589bcf0fe47a645a1
diff --git a/metadata/md5-cache/dev-python/Rx-3.1.0 b/metadata/md5-cache/dev-python/Rx-3.1.0
index 7d0018abfea0..a2d44c4db760 100644
--- a/metadata/md5-cache/dev-python/Rx-3.1.0
+++ b/metadata/md5-cache/dev-python/Rx-3.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ReactiveX/RxPY/archive/v3.1.0.tar.gz -> Rx-3.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=0276464f412addd237c00007153ac2eb
diff --git a/metadata/md5-cache/dev-python/SaltTesting-2018.9.21 b/metadata/md5-cache/dev-python/SaltTesting-2018.9.21
index daa905ed71bd..7d2893c1410e 100644
--- a/metadata/md5-cache/dev-python/SaltTesting-2018.9.21
+++ b/metadata/md5-cache/dev-python/SaltTesting-2018.9.21
@@ -10,5 +10,5 @@ RDEPEND=dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/saltstack/salt-testing/archive/v2018.9.21.tar.gz -> SaltTesting-2018.9.21.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4869fb55e5d5cf735eb83fc8c22eeb5a
diff --git a/metadata/md5-cache/dev-python/WSME-0.10.0 b/metadata/md5-cache/dev-python/WSME-0.10.0
index 03e523cfce23..f49f1bb3e325 100644
--- a/metadata/md5-cache/dev-python/WSME-0.10.0
+++ b/metadata/md5-cache/dev-python/WSME-0.10.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.3[python_targets_python3_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WSME/WSME-0.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=29fc32895b162fcf77f2bc93320bd3b6
diff --git a/metadata/md5-cache/dev-python/XenAPI-2.14 b/metadata/md5-cache/dev-python/XenAPI-2.14
index a0c6690e3436..f3fda89067b8 100644
--- a/metadata/md5-cache/dev-python/XenAPI-2.14
+++ b/metadata/md5-cache/dev-python/XenAPI-2.14
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/X/XenAPI/XenAPI-2.14.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8585d2d0671c6b07bdb59dfb040b3f77
diff --git a/metadata/md5-cache/dev-python/absl-py-0.10.0 b/metadata/md5-cache/dev-python/absl-py-0.10.0
index 6632f70f61cb..7abf3c3e1f07 100644
--- a/metadata/md5-cache/dev-python/absl-py-0.10.0
+++ b/metadata/md5-cache/dev-python/absl-py-0.10.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/abseil/abseil-py/archive/pypi-v0.10.0.tar.gz -> absl-py-0.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fc94618a30ab723cad750610ad106484
diff --git a/metadata/md5-cache/dev-python/aiocontextvars-0.2.2 b/metadata/md5-cache/dev-python/aiocontextvars-0.2.2
index 87d81e1abc5e..82403cccbf36 100644
--- a/metadata/md5-cache/dev-python/aiocontextvars-0.2.2
+++ b/metadata/md5-cache/dev-python/aiocontextvars-0.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fantix/aiocontextvars/archive/v0.2.2.tar.gz -> aiocontextvars-0.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8e2706fa9538cf1995abd9dd609fef8d
diff --git a/metadata/md5-cache/dev-python/aiodns-2.0.0-r1 b/metadata/md5-cache/dev-python/aiodns-2.0.0-r1
index 2c206a8c2db1..0390b0497388 100644
--- a/metadata/md5-cache/dev-python/aiodns-2.0.0-r1
+++ b/metadata/md5-cache/dev-python/aiodns-2.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/aiodns/aiodns-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=69c6bcb8224077f04140e1d03dca3cab
diff --git a/metadata/md5-cache/dev-python/aiofiles-0.5.0 b/metadata/md5-cache/dev-python/aiofiles-0.5.0
index 7d1dbc13e7c6..45d06253148a 100644
--- a/metadata/md5-cache/dev-python/aiofiles-0.5.0
+++ b/metadata/md5-cache/dev-python/aiofiles-0.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Tinche/aiofiles/archive/v0.5.0.tar.gz -> aiofiles-0.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1c7370d72bc09b50de8fc03c6173c81f
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.6.2-r1 b/metadata/md5-cache/dev-python/aiohttp-3.6.2-r1
index 8829fc0493ab..7a525c933e36 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.6.2-r1
+++ b/metadata/md5-cache/dev-python/aiohttp-3.6.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.6.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=73bbfb2cac10779961389496ce26706c
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.7.1-r1 b/metadata/md5-cache/dev-python/aiohttp-3.7.1-r1
index 13dde8993e39..5a0333dc9b1b 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.7.1-r1
+++ b/metadata/md5-cache/dev-python/aiohttp-3.7.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=82ac1f94c2954ab3c91e2fe5c26c259c
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.7.2-r1 b/metadata/md5-cache/dev-python/aiohttp-3.7.2-r1
index e31ff9625a64..11e724db666e 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.7.2-r1
+++ b/metadata/md5-cache/dev-python/aiohttp-3.7.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.7.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b6a88ef57eee5863c28b708ce8429052
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.7.3 b/metadata/md5-cache/dev-python/aiohttp-3.7.3
index 86977ec99039..85cdbacbb421 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.7.3
+++ b/metadata/md5-cache/dev-python/aiohttp-3.7.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.7.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b6a88ef57eee5863c28b708ce8429052
diff --git a/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1 b/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1
index 878dbcc5c73b..8305436fa9e2 100644
--- a/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1
+++ b/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/aiohttp-cors/archive/v0.7.0.tar.gz -> aiohttp-cors-0.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=50a150b0da7ea058fd10de550af31e8d
diff --git a/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0 b/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0
index 56ade478fbed..7af675e93d26 100644
--- a/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0
+++ b/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp-jinja2/aiohttp-jinja2-0.15.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=731aa3dfe1ca276358dafc2c57b3b079
diff --git a/metadata/md5-cache/dev-python/aiohttp-socks-0.5.5 b/metadata/md5-cache/dev-python/aiohttp-socks-0.5.5
index 078e2d144dba..623e784644ed 100644
--- a/metadata/md5-cache/dev-python/aiohttp-socks-0.5.5
+++ b/metadata/md5-cache/dev-python/aiohttp-socks-0.5.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/romis2012/aiohttp-socks/archive/v0.5.5.tar.gz -> aiohttp-socks-0.5.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7672fca38fd20e484dd415cef01e54d5
diff --git a/metadata/md5-cache/dev-python/aiorpcX-0.18.4-r1 b/metadata/md5-cache/dev-python/aiorpcX-0.18.4-r1
index 4bdf389a0d3b..b128626c2aca 100644
--- a/metadata/md5-cache/dev-python/aiorpcX-0.18.4-r1
+++ b/metadata/md5-cache/dev-python/aiorpcX-0.18.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kyuupichan/aiorpcX/archive/0.18.4.tar.gz -> aiorpcX-0.18.4.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fed755b6a5ef5931de5c556fa43ba16b
diff --git a/metadata/md5-cache/dev-python/aiosmtpd-1.2 b/metadata/md5-cache/dev-python/aiosmtpd-1.2
index 376412800956..7e6969900222 100644
--- a/metadata/md5-cache/dev-python/aiosmtpd-1.2
+++ b/metadata/md5-cache/dev-python/aiosmtpd-1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/atpublic[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiosmtpd/aiosmtpd-1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=20c072aafab997807374614ff82b34b0
diff --git a/metadata/md5-cache/dev-python/aiosmtpd-1.2.2 b/metadata/md5-cache/dev-python/aiosmtpd-1.2.2
index e2b3e7491e2c..8adc741ee69b 100644
--- a/metadata/md5-cache/dev-python/aiosmtpd-1.2.2
+++ b/metadata/md5-cache/dev-python/aiosmtpd-1.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiosmtpd/aiosmtpd-1.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=adfa2a46c8c6c78d5463b21c4eb04330
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.12 b/metadata/md5-cache/dev-python/alabaster-0.7.12
index 738b3fa6bdff..c05c1233def5 100644
--- a/metadata/md5-cache/dev-python/alabaster-0.7.12
+++ b/metadata/md5-cache/dev-python/alabaster-0.7.12
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/a/alabaster/alabaster-0.7.12.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=707b207e309f0fd064ff1e43f5594369
diff --git a/metadata/md5-cache/dev-python/alagitpull-0.0.23-r1 b/metadata/md5-cache/dev-python/alagitpull-0.0.23-r1
index a0aeb76d4400..1140e0523fa0 100644
--- a/metadata/md5-cache/dev-python/alagitpull-0.0.23-r1
+++ b/metadata/md5-cache/dev-python/alagitpull-0.0.23-r1
@@ -10,5 +10,5 @@ RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/git-pull/alagitpull/archive/v0.0.23.tar.gz -> alagitpull-0.0.23.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8af1d9aa3d3cf2e750f88decf178448e
diff --git a/metadata/md5-cache/dev-python/alembic-1.4.3 b/metadata/md5-cache/dev-python/alembic-1.4.3
index 394a2cbe31a0..e311fb917e7f 100644
--- a/metadata/md5-cache/dev-python/alembic-1.4.3
+++ b/metadata/md5-cache/dev-python/alembic-1.4.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/alembic/alembic-1.4.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5dca3f06fde549b3f64591db8160f7ae
diff --git a/metadata/md5-cache/dev-python/ament_package-0.9.2 b/metadata/md5-cache/dev-python/ament_package-0.9.2
index 7969071bb84a..0fb7ccdb2924 100644
--- a/metadata/md5-cache/dev-python/ament_package-0.9.2
+++ b/metadata/md5-cache/dev-python/ament_package-0.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_package/archive/0.9.2.tar.gz -> ament_package-0.9.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=88af5b34160509ea6b2c0184d5ea2046
diff --git a/metadata/md5-cache/dev-python/amodem-1.15.1 b/metadata/md5-cache/dev-python/amodem-1.15.1
index 7c501cb554e4..d9fae8f3ab2a 100644
--- a/metadata/md5-cache/dev-python/amodem-1.15.1
+++ b/metadata/md5-cache/dev-python/amodem-1.15.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/romanz/amodem/archive/v1.15.1.tar.gz -> amodem-1.15.1.tar.gz mirror://pypi/a/amodem/amodem-1.15.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7a38969d3eeea668088d66056a6341e8
diff --git a/metadata/md5-cache/dev-python/aniso8601-8.0.0 b/metadata/md5-cache/dev-python/aniso8601-8.0.0
index d378c741b847..be593dc101dd 100644
--- a/metadata/md5-cache/dev-python/aniso8601-8.0.0
+++ b/metadata/md5-cache/dev-python/aniso8601-8.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aniso8601/aniso8601-8.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bb1fa2f4dcb0c544e5eab3948c4157be
diff --git a/metadata/md5-cache/dev-python/ansi-0.1.5 b/metadata/md5-cache/dev-python/ansi-0.1.5
index 9c53f01644b4..3f84a4353cda 100644
--- a/metadata/md5-cache/dev-python/ansi-0.1.5
+++ b/metadata/md5-cache/dev-python/ansi-0.1.5
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/tehmaze/ansi/archive/ansi-0.1.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6cc38c5c74317b51dbc40abb7fe08be7
diff --git a/metadata/md5-cache/dev-python/ansi2html-1.5.2-r2 b/metadata/md5-cache/dev-python/ansi2html-1.5.2-r2
index 030341592af5..6043e12a5ca0 100644
--- a/metadata/md5-cache/dev-python/ansi2html-1.5.2-r2
+++ b/metadata/md5-cache/dev-python/ansi2html-1.5.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansi2html/ansi2html-1.5.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=241d63f487fbbc4dd36bbb8b05bc3c41
diff --git a/metadata/md5-cache/dev-python/ansi2html-1.6.0 b/metadata/md5-cache/dev-python/ansi2html-1.6.0
index 1e896150ce06..a535fad1eba4 100644
--- a/metadata/md5-cache/dev-python/ansi2html-1.6.0
+++ b/metadata/md5-cache/dev-python/ansi2html-1.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansi2html/ansi2html-1.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cdc121b979f23d608c4fc4d08ae196a8
diff --git a/metadata/md5-cache/dev-python/ansicolor-0.2.6-r1 b/metadata/md5-cache/dev-python/ansicolor-0.2.6-r1
index 5405a6df9966..6b7bc8ce631a 100644
--- a/metadata/md5-cache/dev-python/ansicolor-0.2.6-r1
+++ b/metadata/md5-cache/dev-python/ansicolor-0.2.6-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansicolor/ansicolor-0.2.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2bac9c7c795bf56d74473c3e3c2e90e1
diff --git a/metadata/md5-cache/dev-python/ansicolor-9999 b/metadata/md5-cache/dev-python/ansicolor-9999
index 2789341d80b5..bb5c614b0f71 100644
--- a/metadata/md5-cache/dev-python/ansicolor-9999
+++ b/metadata/md5-cache/dev-python/ansicolor-9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ad07e654c41212e1aa2bd0d7f9f5833d
diff --git a/metadata/md5-cache/dev-python/anyqt-0.0.8-r1 b/metadata/md5-cache/dev-python/anyqt-0.0.8-r1
index df7b76e6cdab..ffcf78b1bcd0 100644
--- a/metadata/md5-cache/dev-python/anyqt-0.0.8-r1
+++ b/metadata/md5-cache/dev-python/anyqt-0.0.8-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ales-erjavec/anyqt/archive/0.0.8.tar.gz -> anyqt-0.0.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4f4182b8ec5e686d169f83fc3dad8db3
diff --git a/metadata/md5-cache/dev-python/aodhclient-1.2.0 b/metadata/md5-cache/dev-python/aodhclient-1.2.0
index 51f8e18ce917..e2d7ab1fbc3c 100644
--- a/metadata/md5-cache/dev-python/aodhclient-1.2.0
+++ b/metadata/md5-cache/dev-python/aodhclient-1.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aodhclient/aodhclient-1.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ae0972fe650baa6f81dbddd6349b5f66
diff --git a/metadata/md5-cache/dev-python/aodhclient-2.1.1 b/metadata/md5-cache/dev-python/aodhclient-2.1.1
index 73b201570e33..bc1faf16873c 100644
--- a/metadata/md5-cache/dev-python/aodhclient-2.1.1
+++ b/metadata/md5-cache/dev-python/aodhclient-2.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aodhclient/aodhclient-2.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b1c5fa70ca6bb64aa59dd2120969f71e
diff --git a/metadata/md5-cache/dev-python/apipkg-1.5-r1 b/metadata/md5-cache/dev-python/apipkg-1.5-r1
index 1043f2e13079..e850702f5668 100644
--- a/metadata/md5-cache/dev-python/apipkg-1.5-r1
+++ b/metadata/md5-cache/dev-python/apipkg-1.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/apipkg/apipkg-1.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=255daf95d0ec99e70fd3fb42ee85788c
diff --git a/metadata/md5-cache/dev-python/apispec-3.3.0 b/metadata/md5-cache/dev-python/apispec-3.3.0
index 38969704909d..a83cc1184386 100644
--- a/metadata/md5-cache/dev-python/apispec-3.3.0
+++ b/metadata/md5-cache/dev-python/apispec-3.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marshmallow-code/apispec/archive/3.3.0.tar.gz -> apispec-3.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a677f58a4ee855a7d4ea7a5c361b43e9
diff --git a/metadata/md5-cache/dev-python/appdirs-1.4.4-r1 b/metadata/md5-cache/dev-python/appdirs-1.4.4-r1
index 71d0e202a727..d821d91cfa28 100644
--- a/metadata/md5-cache/dev-python/appdirs-1.4.4-r1
+++ b/metadata/md5-cache/dev-python/appdirs-1.4.4-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/ActiveState/appdirs/archive/1.4.4.tar.gz -> appdirs-1.4.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4f847678508937fcb61d9d37aff67c91
diff --git a/metadata/md5-cache/dev-python/apsw-3.32.2_p1 b/metadata/md5-cache/dev-python/apsw-3.32.2_p1
index 4d65574b8461..b10a8672415a 100644
--- a/metadata/md5-cache/dev-python/apsw-3.32.2_p1
+++ b/metadata/md5-cache/dev-python/apsw-3.32.2_p1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-db/sqlite-3.32.2 python_targets_python3_6? ( dev-lang/python:3.6 )
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/rogerbinns/apsw/releases/download/3.32.2-r1/apsw-3.32.2-r1.zip -> apsw-3.32.2_p1.zip
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=92d3e75fc659604eccbfecc250ad94d3
diff --git a/metadata/md5-cache/dev-python/argcomplete-1.12.0-r1 b/metadata/md5-cache/dev-python/argcomplete-1.12.0-r1
index 153713fc42c2..f5bf309d4cd1 100644
--- a/metadata/md5-cache/dev-python/argcomplete-1.12.0-r1
+++ b/metadata/md5-cache/dev-python/argcomplete-1.12.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argcomplete/argcomplete-1.12.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8121949d54ca1e1a22e72b31a759e967
diff --git a/metadata/md5-cache/dev-python/argcomplete-1.12.1-r1 b/metadata/md5-cache/dev-python/argcomplete-1.12.1-r1
index c94af1960775..179eb59c3ee3 100644
--- a/metadata/md5-cache/dev-python/argcomplete-1.12.1-r1
+++ b/metadata/md5-cache/dev-python/argcomplete-1.12.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argcomplete/argcomplete-1.12.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=15bfd381257e1a5e5e1c2649671df140
diff --git a/metadata/md5-cache/dev-python/argcomplete-1.12.2 b/metadata/md5-cache/dev-python/argcomplete-1.12.2
index a1f066bc0d08..604681deb6fc 100644
--- a/metadata/md5-cache/dev-python/argcomplete-1.12.2
+++ b/metadata/md5-cache/dev-python/argcomplete-1.12.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argcomplete/argcomplete-1.12.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6e8bbc454f2227793fc438146a6cecec
diff --git a/metadata/md5-cache/dev-python/argh-0.26.2-r2 b/metadata/md5-cache/dev-python/argh-0.26.2-r2
index 15a01d7e0c29..8101d8629ef4 100644
--- a/metadata/md5-cache/dev-python/argh-0.26.2-r2
+++ b/metadata/md5-cache/dev-python/argh-0.26.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argh/argh-0.26.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=122dce7be6e012de9c4b3acf371daf06
diff --git a/metadata/md5-cache/dev-python/argon2-cffi-20.1.0 b/metadata/md5-cache/dev-python/argon2-cffi-20.1.0
index 0583acd6ee87..76fbba5c19fe 100644
--- a/metadata/md5-cache/dev-python/argon2-cffi-20.1.0
+++ b/metadata/md5-cache/dev-python/argon2-cffi-20.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argon2-cffi/argon2-cffi-20.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=121a2ff924a63b4c17bbbf3075b48c03
diff --git a/metadata/md5-cache/dev-python/argparse-manpage-1.4 b/metadata/md5-cache/dev-python/argparse-manpage-1.4
index 84dfdbc97fc3..2973edd2b190 100644
--- a/metadata/md5-cache/dev-python/argparse-manpage-1.4
+++ b/metadata/md5-cache/dev-python/argparse-manpage-1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/praiskup/argparse-manpage/archive/v1.4.tar.gz -> argparse-manpage-1.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f2935f043ed2514bf0db3830c1883718
diff --git a/metadata/md5-cache/dev-python/arpeggio-1.10.0 b/metadata/md5-cache/dev-python/arpeggio-1.10.0
index 48e08d7f89af..42429e32c129 100644
--- a/metadata/md5-cache/dev-python/arpeggio-1.10.0
+++ b/metadata/md5-cache/dev-python/arpeggio-1.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/textX/Arpeggio/archive/1.10.0.tar.gz -> Arpeggio-1.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2cfdd374a8d9fcb7e68b61a14d041387
diff --git a/metadata/md5-cache/dev-python/arpeggio-1.9.2 b/metadata/md5-cache/dev-python/arpeggio-1.9.2
index efcedef12869..80a8347668d6 100644
--- a/metadata/md5-cache/dev-python/arpeggio-1.9.2
+++ b/metadata/md5-cache/dev-python/arpeggio-1.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/igordejanovic/Arpeggio/archive/v1.9.2.tar.gz -> arpeggio-1.9.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a1abd415f239945063c825e9e6685efa
diff --git a/metadata/md5-cache/dev-python/arrow-0.17.0 b/metadata/md5-cache/dev-python/arrow-0.17.0
index e14f5d0cf21c..b7053ae9ebf0 100644
--- a/metadata/md5-cache/dev-python/arrow-0.17.0
+++ b/metadata/md5-cache/dev-python/arrow-0.17.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/arrow/arrow-0.17.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=66d7248c661448b369a76e00b1664688
diff --git a/metadata/md5-cache/dev-python/asgiref-3.3.0 b/metadata/md5-cache/dev-python/asgiref-3.3.0
index 0c57145cc826..408f5664ae6a 100644
--- a/metadata/md5-cache/dev-python/asgiref-3.3.0
+++ b/metadata/md5-cache/dev-python/asgiref-3.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/asgiref/asgiref-3.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bbd3c3cf049f96e8a02efe4a598624fd
diff --git a/metadata/md5-cache/dev-python/asgiref-3.3.1 b/metadata/md5-cache/dev-python/asgiref-3.3.1
index d57d33bf9492..7227946898e9 100644
--- a/metadata/md5-cache/dev-python/asgiref-3.3.1
+++ b/metadata/md5-cache/dev-python/asgiref-3.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/asgiref/asgiref-3.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7f7eedf2ad627edd9d7af25cb3eb0c91
diff --git a/metadata/md5-cache/dev-python/asn1crypto-0.24.0 b/metadata/md5-cache/dev-python/asn1crypto-0.24.0
index cb41ac58361f..a2b54398e2da 100644
--- a/metadata/md5-cache/dev-python/asn1crypto-0.24.0
+++ b/metadata/md5-cache/dev-python/asn1crypto-0.24.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wbond/asn1crypto/archive/0.24.0.tar.gz -> asn1crypto-0.24.0.gh.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b9b454e46294edba0b778fe92d58c390
diff --git a/metadata/md5-cache/dev-python/asn1crypto-1.4.0 b/metadata/md5-cache/dev-python/asn1crypto-1.4.0
new file mode 100644
index 000000000000..538834b1d40c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/asn1crypto-1.4.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python ASN.1 library with a focus on performance and a pythonic API
+EAPI=7
+HOMEPAGE=https://github.com/wbond/asn1crypto/ https://pypi.org/project/asn1crypto/
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/wbond/asn1crypto/archive/1.4.0.tar.gz -> asn1crypto-1.4.0.gh.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fc63055eac19f968200f02c73f5d52f9
diff --git a/metadata/md5-cache/dev-python/asteval-0.9.18 b/metadata/md5-cache/dev-python/asteval-0.9.18
index 0d7fb4b4edad..9e11ccd12397 100644
--- a/metadata/md5-cache/dev-python/asteval-0.9.18
+++ b/metadata/md5-cache/dev-python/asteval-0.9.18
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/asteval/asteval-0.9.18.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=050c5aedd5c12aaef37896bd263c0829
diff --git a/metadata/md5-cache/dev-python/astor-0.8.1 b/metadata/md5-cache/dev-python/astor-0.8.1
index 676d23bbdbcf..8614bdf44137 100644
--- a/metadata/md5-cache/dev-python/astor-0.8.1
+++ b/metadata/md5-cache/dev-python/astor-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astor/astor-0.8.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=614b4fb52e8e09f1a4f2a9e0e730c246
diff --git a/metadata/md5-cache/dev-python/astroid-2.4.2-r1 b/metadata/md5-cache/dev-python/astroid-2.4.2-r1
index 1710ef2e1f7d..b19eea16c739 100644
--- a/metadata/md5-cache/dev-python/astroid-2.4.2-r1
+++ b/metadata/md5-cache/dev-python/astroid-2.4.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroid/astroid-2.4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cfc2adb351ca558a0bef6969574e553b
diff --git a/metadata/md5-cache/dev-python/asttokens-2.0.4 b/metadata/md5-cache/dev-python/asttokens-2.0.4
index ed18572725d9..4ba0371c8d64 100644
--- a/metadata/md5-cache/dev-python/asttokens-2.0.4
+++ b/metadata/md5-cache/dev-python/asttokens-2.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gristlabs/asttokens/archive/v2.0.4.tar.gz -> asttokens-2.0.4.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=205eec9cf11d1c938ab79f8653aee2ef
diff --git a/metadata/md5-cache/dev-python/astunparse-1.6.3 b/metadata/md5-cache/dev-python/astunparse-1.6.3
index 5bed0e71ea54..9d10339d0746 100644
--- a/metadata/md5-cache/dev-python/astunparse-1.6.3
+++ b/metadata/md5-cache/dev-python/astunparse-1.6.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astunparse/astunparse-1.6.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=51d3baacfbb810a45f48ba0db45566c9
diff --git a/metadata/md5-cache/dev-python/async_generator-1.10 b/metadata/md5-cache/dev-python/async_generator-1.10
index 3be015a08343..c7f1a57c044c 100644
--- a/metadata/md5-cache/dev-python/async_generator-1.10
+++ b/metadata/md5-cache/dev-python/async_generator-1.10
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/a/async_generator/async_generator-1.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1c44f8e3fd5bad3184798bd598252169
diff --git a/metadata/md5-cache/dev-python/async_timeout-3.0.1 b/metadata/md5-cache/dev-python/async_timeout-3.0.1
index bc839cd82fd3..8371da8a42b6 100644
--- a/metadata/md5-cache/dev-python/async_timeout-3.0.1
+++ b/metadata/md5-cache/dev-python/async_timeout-3.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/async_timeout/async-timeout-3.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1eba73522f760e2c8b9d9b45975ae1e8
diff --git a/metadata/md5-cache/dev-python/atomicwrites-1.4.0-r1 b/metadata/md5-cache/dev-python/atomicwrites-1.4.0-r1
index 92488c5ebae5..25f101db7b6c 100644
--- a/metadata/md5-cache/dev-python/atomicwrites-1.4.0-r1
+++ b/metadata/md5-cache/dev-python/atomicwrites-1.4.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/atomicwrites/atomicwrites-1.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b041c5e40da6219c33a3b96698c2141a
diff --git a/metadata/md5-cache/dev-python/atpublic-1.0 b/metadata/md5-cache/dev-python/atpublic-1.0
index 41d24bd4dbd1..501b1e1a242e 100644
--- a/metadata/md5-cache/dev-python/atpublic-1.0
+++ b/metadata/md5-cache/dev-python/atpublic-1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/atpublic/atpublic-1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=eda0a4913b76e1833cd1e47732499795
diff --git a/metadata/md5-cache/dev-python/attrs-20.1.0-r1 b/metadata/md5-cache/dev-python/attrs-20.1.0-r1
index 0cc0e7cb106a..d3ffeed397fe 100644
--- a/metadata/md5-cache/dev-python/attrs-20.1.0-r1
+++ b/metadata/md5-cache/dev-python/attrs-20.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/attrs/attrs-20.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8554da663f3720587a11ea459e422975
diff --git a/metadata/md5-cache/dev-python/attrs-20.2.0-r1 b/metadata/md5-cache/dev-python/attrs-20.2.0-r1
index 19cbff14722a..9ad60fc043e5 100644
--- a/metadata/md5-cache/dev-python/attrs-20.2.0-r1
+++ b/metadata/md5-cache/dev-python/attrs-20.2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/attrs/attrs-20.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=acb0a8246445cf8eacbe53858be8983b
diff --git a/metadata/md5-cache/dev-python/attrs-20.3.0 b/metadata/md5-cache/dev-python/attrs-20.3.0
index 143d572e61e9..2d446b6850e4 100644
--- a/metadata/md5-cache/dev-python/attrs-20.3.0
+++ b/metadata/md5-cache/dev-python/attrs-20.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/attrs/attrs-20.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cc33caed4224daccac2d6a7222af20d4
diff --git a/metadata/md5-cache/dev-python/audioread-2.1.8-r2 b/metadata/md5-cache/dev-python/audioread-2.1.8-r2
index 2d7a25de3b03..58c659f81acd 100644
--- a/metadata/md5-cache/dev-python/audioread-2.1.8-r2
+++ b/metadata/md5-cache/dev-python/audioread-2.1.8-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/audioread/audioread-2.1.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=efaa3d77186be7364e8b5e0ea0ae8440
diff --git a/metadata/md5-cache/dev-python/authheaders-0.13.0 b/metadata/md5-cache/dev-python/authheaders-0.13.0
index 184235a1665d..be233360ac48 100644
--- a/metadata/md5-cache/dev-python/authheaders-0.13.0
+++ b/metadata/md5-cache/dev-python/authheaders-0.13.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/a/authheaders/authheaders-0.13.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9c18975b365a975b97ee39ece891040c
diff --git a/metadata/md5-cache/dev-python/authres-1.2.0 b/metadata/md5-cache/dev-python/authres-1.2.0
index 042cbdfbb5bd..6b477fd58ad4 100644
--- a/metadata/md5-cache/dev-python/authres-1.2.0
+++ b/metadata/md5-cache/dev-python/authres-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/a/authres/authres-1.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0504bfab114643935e93b5805c33293e
diff --git a/metadata/md5-cache/dev-python/autobahn-20.4.3 b/metadata/md5-cache/dev-python/autobahn-20.4.3
index 8ce1f1b0b46e..1b99762aa950 100644
--- a/metadata/md5-cache/dev-python/autobahn-20.4.3
+++ b/metadata/md5-cache/dev-python/autobahn-20.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-20.4.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1f9e64d686f8f625ac551d23b1f762d4
diff --git a/metadata/md5-cache/dev-python/autobahn-20.7.1 b/metadata/md5-cache/dev-python/autobahn-20.7.1
index ab95b2bf2af5..9504942e296d 100644
--- a/metadata/md5-cache/dev-python/autobahn-20.7.1
+++ b/metadata/md5-cache/dev-python/autobahn-20.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-20.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d0a1051ebbfae3d75a5e25f5a6ecb3ed
diff --git a/metadata/md5-cache/dev-python/automat-20.2.0 b/metadata/md5-cache/dev-python/automat-20.2.0
index cccd0b9c2f61..4facbe2be15b 100644
--- a/metadata/md5-cache/dev-python/automat-20.2.0
+++ b/metadata/md5-cache/dev-python/automat-20.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/A/Automat/Automat-20.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=af86162c73de52ac7f29b1e861673fce
diff --git a/metadata/md5-cache/dev-python/automaton-1.12.1 b/metadata/md5-cache/dev-python/automaton-1.12.1
index 087605d51e4d..e1911575fbe5 100644
--- a/metadata/md5-cache/dev-python/automaton-1.12.1
+++ b/metadata/md5-cache/dev-python/automaton-1.12.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/automaton/automaton-1.12.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e1dfcb324be386f7b3208898e0dd3742
diff --git a/metadata/md5-cache/dev-python/automaton-2.2.0 b/metadata/md5-cache/dev-python/automaton-2.2.0
index d011662a3a43..a579d3dcb311 100644
--- a/metadata/md5-cache/dev-python/automaton-2.2.0
+++ b/metadata/md5-cache/dev-python/automaton-2.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/a/automaton/automaton-2.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f255f893cafc0ae94ade997ed09eeb78
diff --git a/metadata/md5-cache/dev-python/autopep8-1.5.4 b/metadata/md5-cache/dev-python/autopep8-1.5.4
index c6a107a3d690..f189e8b4dc8e 100644
--- a/metadata/md5-cache/dev-python/autopep8-1.5.4
+++ b/metadata/md5-cache/dev-python/autopep8-1.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autopep8/autopep8-1.5.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9dc3af2d827b64996703196b8d365163
diff --git a/metadata/md5-cache/dev-python/autopep8-9999 b/metadata/md5-cache/dev-python/autopep8-9999
index 60879faa57cf..3706ee93ecd9 100644
--- a/metadata/md5-cache/dev-python/autopep8-9999
+++ b/metadata/md5-cache/dev-python/autopep8-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pycodestyle-2.6.0[python_targets_pypy3(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c06aa2496a404d1a5af2bd48b6ceaa7f
diff --git a/metadata/md5-cache/dev-python/autoprop-1.0.2 b/metadata/md5-cache/dev-python/autoprop-1.0.2
index a4ff2b44d15b..0d9dddfa3b7a 100644
--- a/metadata/md5-cache/dev-python/autoprop-1.0.2
+++ b/metadata/md5-cache/dev-python/autoprop-1.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autoprop/autoprop-1.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2e3541c3633e2fb9d5497afe3c6e3f5d
diff --git a/metadata/md5-cache/dev-python/awesome-slugify-1.6.5 b/metadata/md5-cache/dev-python/awesome-slugify-1.6.5
index f9f680d5b41a..0770f24000db 100644
--- a/metadata/md5-cache/dev-python/awesome-slugify-1.6.5
+++ b/metadata/md5-cache/dev-python/awesome-slugify-1.6.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/regex >=dev-python/unidecode-0.04.14 <dev-python/unidecode-0.
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/a/awesome-slugify/awesome-slugify-1.6.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6a45918c7e404f833f0fb3896315284c
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.27.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.27.0
index e1bb183eefaf..a0f676420075 100644
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.27.0
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.27.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/serverless-application-model/archive/v1.27.0.tar.gz -> aws-sam-translator-1.27.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7ff2658129f138d8ceefff53832b8de9
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.28.1 b/metadata/md5-cache/dev-python/aws-sam-translator-1.28.1
index d7925f0daad2..8833d41b689c 100644
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.28.1
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.28.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/serverless-application-model/archive/v1.28.1.tar.gz -> aws-sam-translator-1.28.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0650f7a652ac0f96752cd1afceebefb9
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.29.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.29.0
index 20a3c23da197..ecaaed37d66b 100644
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.29.0
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.29.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/serverless-application-model/archive/v1.29.0.tar.gz -> aws-sam-translator-1.29.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0650f7a652ac0f96752cd1afceebefb9
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.30.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.30.0
index fd3849358863..758ca50d452a 100644
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.30.0
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.30.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/serverless-application-model/archive/v1.30.0.tar.gz -> aws-sam-translator-1.30.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0650f7a652ac0f96752cd1afceebefb9
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.30.1 b/metadata/md5-cache/dev-python/aws-sam-translator-1.30.1
index f921073f90d7..5786cc12454a 100644
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.30.1
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.30.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/serverless-application-model/archive/v1.30.1.tar.gz -> aws-sam-translator-1.30.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0650f7a652ac0f96752cd1afceebefb9
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.31.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.31.0
index 1c00d4894086..86880c279af1 100644
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.31.0
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.31.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/awslabs/serverless-application-model/archive/v1.31.0.tar.gz -> aws-sam-translator-1.31.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0650f7a652ac0f96752cd1afceebefb9
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.32.0-r1 b/metadata/md5-cache/dev-python/aws-sam-translator-1.32.0-r1
new file mode 100644
index 000000000000..90a2a3ded06a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.32.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/parameterized[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/boto3-1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templates
+EAPI=7
+HOMEPAGE=https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/boto3-1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/awslabs/serverless-application-model/archive/v1.32.0.tar.gz -> aws-sam-translator-1.32.0.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3cad31f50245818a886769693eadebd6
diff --git a/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.6.0 b/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.6.0
index 1db13dd4825e..eedb938ca022 100644
--- a/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.6.0
+++ b/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-xray-sdk-python/archive/2.6.0.tar.gz -> aws-xray-sdk-python-2.6.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=56eb8d4e6cfb84e5923db0aa6e75fcb4
diff --git a/metadata/md5-cache/dev-python/awscli-1.18.160 b/metadata/md5-cache/dev-python/awscli-1.18.160
index 3adfe7ed28e3..8f0d89578aae 100644
--- a/metadata/md5-cache/dev-python/awscli-1.18.160
+++ b/metadata/md5-cache/dev-python/awscli-1.18.160
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/aws/aws-cli/archive/1.18.160.tar.gz -> awscli-1.18.160.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=be39310083bd6809c7b5c0d63b9c722a
diff --git a/metadata/md5-cache/dev-python/babelfish-0.5.5-r1 b/metadata/md5-cache/dev-python/babelfish-0.5.5-r1
index 35ca280b04fd..b00d20a6dc9a 100644
--- a/metadata/md5-cache/dev-python/babelfish-0.5.5-r1
+++ b/metadata/md5-cache/dev-python/babelfish-0.5.5-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/babelfish/babelfish-0.5.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=00fc6d2b58309d7632c899e9d211e278
diff --git a/metadata/md5-cache/dev-python/babelfish-9999 b/metadata/md5-cache/dev-python/babelfish-9999
index 315c5ea9066e..98ada60b1b88 100644
--- a/metadata/md5-cache/dev-python/babelfish-9999
+++ b/metadata/md5-cache/dev-python/babelfish-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9b629f3ad713684955d47be5284b5a1c
diff --git a/metadata/md5-cache/dev-python/backcall-0.2.0 b/metadata/md5-cache/dev-python/backcall-0.2.0
index 52aa3a22b90e..a60a2550cade 100644
--- a/metadata/md5-cache/dev-python/backcall-0.2.0
+++ b/metadata/md5-cache/dev-python/backcall-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backcall/backcall-0.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=559429c42a155191a3ebd83b8c8393aa
diff --git a/metadata/md5-cache/dev-python/backports-1.0-r1 b/metadata/md5-cache/dev-python/backports-1.0-r1
index bef40c98a22e..25785966523e 100644
--- a/metadata/md5-cache/dev-python/backports-1.0-r1
+++ b/metadata/md5-cache/dev-python/backports-1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=!<dev-python/backports-lzma-0.0.2-r1 python_targets_pypy3? ( >=dev-pytho
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/dist/backports-1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a7ba678cb00ab0da1d5186a17757312d
diff --git a/metadata/md5-cache/dev-python/backports-csv-1.0.7 b/metadata/md5-cache/dev-python/backports-csv-1.0.7
index 59c559aec2c9..e82656d41732 100644
--- a/metadata/md5-cache/dev-python/backports-csv-1.0.7
+++ b/metadata/md5-cache/dev-python/backports-csv-1.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.csv/backports.csv-1.0.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=62d04b97b4cdd5bf95a72649ed8e8b6b
diff --git a/metadata/md5-cache/dev-python/backports-os-0.1.1 b/metadata/md5-cache/dev-python/backports-os-0.1.1
index 85a9990d6c7e..024a6e2a01ef 100644
--- a/metadata/md5-cache/dev-python/backports-os-0.1.1
+++ b/metadata/md5-cache/dev-python/backports-os-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/backports[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pjdelport/backports.os/archive/v0.1.1.tar.gz -> backports-os-0.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0b97035845c26bbf4e3617e47b43631b
diff --git a/metadata/md5-cache/dev-python/backports-tempfile-1.0 b/metadata/md5-cache/dev-python/backports-tempfile-1.0
index 202448613704..d2c42f9b336f 100644
--- a/metadata/md5-cache/dev-python/backports-tempfile-1.0
+++ b/metadata/md5-cache/dev-python/backports-tempfile-1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.tempfile/backports.tempfile-1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c08ee341bcba522eaef6ca454bf6c7a9
diff --git a/metadata/md5-cache/dev-python/backports-weakref-1.0_p1 b/metadata/md5-cache/dev-python/backports-weakref-1.0_p1
index dd61cf2b9488..1e23d44fd8e1 100644
--- a/metadata/md5-cache/dev-python/backports-weakref-1.0_p1
+++ b/metadata/md5-cache/dev-python/backports-weakref-1.0_p1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.weakref/backports.weakref-1.0.post1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4c9f8ee8078ff4a0d8856e98016c394c
diff --git a/metadata/md5-cache/dev-python/bandit-1.6.2-r1 b/metadata/md5-cache/dev-python/bandit-1.6.2-r1
index 5e441ec2671c..28aa582d7a86 100644
--- a/metadata/md5-cache/dev-python/bandit-1.6.2-r1
+++ b/metadata/md5-cache/dev-python/bandit-1.6.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bandit/bandit-1.6.2.tar.gz https://github.com/PyCQA/bandit/commit/45494c94d59eea5ddbe0204f3781b90108cbde30.patch -> bandit-1.6.2_py38-1.patch https://github.com/PyCQA/bandit/commit/3d0824676974e7e2e9635c10bc4f12e261f1dbdf.patch -> bandit-1.6.2_py38-2.patch
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=97c532d36823b3defb5ce149d5a73eb1
diff --git a/metadata/md5-cache/dev-python/bareos-19.2.8 b/metadata/md5-cache/dev-python/bareos-19.2.8
index 0ca11de89562..1dbbf04214e4 100644
--- a/metadata/md5-cache/dev-python/bareos-19.2.8
+++ b/metadata/md5-cache/dev-python/bareos-19.2.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/bareos/bareos/archive/Release/19.2.8.tar.gz -> bareos-19.2.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7157e3a21fa23aead748d08faf8da466
diff --git a/metadata/md5-cache/dev-python/bashate-0.6.0 b/metadata/md5-cache/dev-python/bashate-0.6.0
index 698014f920ed..19bb387b6851 100644
--- a/metadata/md5-cache/dev-python/bashate-0.6.0
+++ b/metadata/md5-cache/dev-python/bashate-0.6.0
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !~dev-python/pbr-2.1.0
 DESCRIPTION=A pep8 equivalent for bash scripts
 EAPI=7
 HOMEPAGE=https://pypi.org/project/bashate/
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/Babel-2.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/Babel-2.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !~dev-python/Babel-2.4.0 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/bashate/bashate-0.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=764d9bcb15e2494a55ab9c97be7862db
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=bc277a19c33d8a10bcee1b820147f828
diff --git a/metadata/md5-cache/dev-python/basho-erlastic-2.1.1 b/metadata/md5-cache/dev-python/basho-erlastic-2.1.1
index 0f1b544b89f2..96e5e951f5c9 100644
--- a/metadata/md5-cache/dev-python/basho-erlastic-2.1.1
+++ b/metadata/md5-cache/dev-python/basho-erlastic-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/basho-erlastic/basho-erlastic-2.1.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6ca056cd0575eef31bf27bc4fa1fed17
diff --git a/metadata/md5-cache/dev-python/bcrypt-3.1.7-r2 b/metadata/md5-cache/dev-python/bcrypt-3.1.7-r2
index 879e78f3cb47..1788d4a2f1c0 100644
--- a/metadata/md5-cache/dev-python/bcrypt-3.1.7-r2
+++ b/metadata/md5-cache/dev-python/bcrypt-3.1.7-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bcrypt/bcrypt-3.1.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8e239c220e459091a02b91ee17baf2c6
diff --git a/metadata/md5-cache/dev-python/bcrypt-3.2.0 b/metadata/md5-cache/dev-python/bcrypt-3.2.0
index 5d0801ad18ad..0a2fa6334060 100644
--- a/metadata/md5-cache/dev-python/bcrypt-3.2.0
+++ b/metadata/md5-cache/dev-python/bcrypt-3.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bcrypt/bcrypt-3.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=117444cc6f214e9a67c1efa63d579578
diff --git a/metadata/md5-cache/dev-python/beagle-0.3.0 b/metadata/md5-cache/dev-python/beagle-0.3.0
index 82be3404c64b..b16daa4d2676 100644
--- a/metadata/md5-cache/dev-python/beagle-0.3.0
+++ b/metadata/md5-cache/dev-python/beagle-0.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/beagle/beagle-0.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=da7d48bc762df31dd2451c9ff0f201fb
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.9.3 b/metadata/md5-cache/dev-python/beautifulsoup-4.9.3
index e80d2963df72..e4676d3226ba 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-4.9.3
+++ b/metadata/md5-cache/dev-python/beautifulsoup-4.9.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.9.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c3975f651c7cb19243b560ac2a5b23e8
diff --git a/metadata/md5-cache/dev-python/bert-2.2.0 b/metadata/md5-cache/dev-python/bert-2.2.0
index e150e1479573..9cbc3382fa9f 100644
--- a/metadata/md5-cache/dev-python/bert-2.2.0
+++ b/metadata/md5-cache/dev-python/bert-2.2.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bert/bert-2.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=75ddaaf7878c6d2aeba383e576071f41
diff --git a/metadata/md5-cache/dev-python/betamax-0.8.1 b/metadata/md5-cache/dev-python/betamax-0.8.1
index c6d7ba1043df..42eed8b44106 100644
--- a/metadata/md5-cache/dev-python/betamax-0.8.1
+++ b/metadata/md5-cache/dev-python/betamax-0.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/betamax/betamax-0.8.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1feff285bc0dbd91bab06054c6716344
diff --git a/metadata/md5-cache/dev-python/betamax-matchers-0.4.0 b/metadata/md5-cache/dev-python/betamax-matchers-0.4.0
index ce7d0485f7c7..64ed5d49531e 100644
--- a/metadata/md5-cache/dev-python/betamax-matchers-0.4.0
+++ b/metadata/md5-cache/dev-python/betamax-matchers-0.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/betamax-matchers/betamax-matchers-0.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4b9c1f5f33ad57c37d9c7ae2634f9258
diff --git a/metadata/md5-cache/dev-python/bibtexparser-1.1.0 b/metadata/md5-cache/dev-python/bibtexparser-1.1.0
index 708dbf1d20d9..b22265960adb 100644
--- a/metadata/md5-cache/dev-python/bibtexparser-1.1.0
+++ b/metadata/md5-cache/dev-python/bibtexparser-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sciunto-org/python-bibtexparser/archive/v1.1.0.tar.gz -> bibtexparser-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7aed08b6798b6bc4c2f05c93d07aa3d9
diff --git a/metadata/md5-cache/dev-python/billiard-3.6.0.0 b/metadata/md5-cache/dev-python/billiard-3.6.0.0
index 86adfde275a8..2a78d2361979 100644
--- a/metadata/md5-cache/dev-python/billiard-3.6.0.0
+++ b/metadata/md5-cache/dev-python/billiard-3.6.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/billiard/billiard-3.6.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ea2b6b95701682d970acb37551bf97b4
diff --git a/metadata/md5-cache/dev-python/binaryornot-0.4.4-r1 b/metadata/md5-cache/dev-python/binaryornot-0.4.4-r1
index 64ac7f118317..a5f68b7308af 100644
--- a/metadata/md5-cache/dev-python/binaryornot-0.4.4-r1
+++ b/metadata/md5-cache/dev-python/binaryornot-0.4.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/binaryornot/binaryornot-0.4.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=78a6e9e51ef6bec917d5ea7595a1826d
diff --git a/metadata/md5-cache/dev-python/bitarray-0.8.3 b/metadata/md5-cache/dev-python/bitarray-0.8.3
deleted file mode 100644
index 162aa8ed9416..000000000000
--- a/metadata/md5-cache/dev-python/bitarray-0.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=efficient arrays of booleans -- C extension
-EAPI=6
-HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bitarray/bitarray-0.8.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f3075a77bd43016048021e02046977b0
diff --git a/metadata/md5-cache/dev-python/bitarray-1.6.1 b/metadata/md5-cache/dev-python/bitarray-1.6.1
index e482ccc0ae86..8e6e9a966e01 100644
--- a/metadata/md5-cache/dev-python/bitarray-1.6.1
+++ b/metadata/md5-cache/dev-python/bitarray-1.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=efficient arrays of booleans -- C extension
 EAPI=7
 HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=PSF-2
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bitarray/bitarray-1.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=764f02a2294aef58856603aa084b7145
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ffd455466bddb4e24cb7c0a048bdd480
diff --git a/metadata/md5-cache/dev-python/bitstring-3.1.7 b/metadata/md5-cache/dev-python/bitstring-3.1.7
index e3da3c8896e3..760642224871 100644
--- a/metadata/md5-cache/dev-python/bitstring-3.1.7
+++ b/metadata/md5-cache/dev-python/bitstring-3.1.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/scott-griffiths/bitstring/archive/bitstring-3.1.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f0d12dd5c19fc88f5242bca5033f55b6
diff --git a/metadata/md5-cache/dev-python/black-20.8_beta1 b/metadata/md5-cache/dev-python/black-20.8_beta1
index 4a403cbae528..c9032e47bd26 100644
--- a/metadata/md5-cache/dev-python/black-20.8_beta1
+++ b/metadata/md5-cache/dev-python/black-20.8_beta1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/psf/black/archive/20.8b1.tar.gz -> black-20.8b1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=eaf26fe4865348c677b7b5a75b1f378c
diff --git a/metadata/md5-cache/dev-python/bleach-3.2.1 b/metadata/md5-cache/dev-python/bleach-3.2.1
index 37dc5c6fb5a1..25a64fa76669 100644
--- a/metadata/md5-cache/dev-python/bleach-3.2.1
+++ b/metadata/md5-cache/dev-python/bleach-3.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bleach/bleach-3.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c241006c97e1c85c441d68c1ec5c88dd
diff --git a/metadata/md5-cache/dev-python/blessed-1.17.11 b/metadata/md5-cache/dev-python/blessed-1.17.11
index df1928da9975..db02a28b7e93 100644
--- a/metadata/md5-cache/dev-python/blessed-1.17.11
+++ b/metadata/md5-cache/dev-python/blessed-1.17.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blessed/blessed-1.17.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d6ca03c39aa213731dd09bbed8fd6552
diff --git a/metadata/md5-cache/dev-python/blessed-1.17.12 b/metadata/md5-cache/dev-python/blessed-1.17.12
index 979edfa7de0d..5b976f4b897d 100644
--- a/metadata/md5-cache/dev-python/blessed-1.17.12
+++ b/metadata/md5-cache/dev-python/blessed-1.17.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blessed/blessed-1.17.12.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d6ca03c39aa213731dd09bbed8fd6552
diff --git a/metadata/md5-cache/dev-python/blessings-1.7-r1 b/metadata/md5-cache/dev-python/blessings-1.7-r1
index 7063a75c0872..4dcd1c8058b3 100644
--- a/metadata/md5-cache/dev-python/blessings-1.7-r1
+++ b/metadata/md5-cache/dev-python/blessings-1.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/erikrose/blessings/archive/1.7.tar.gz -> blessings-1.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=72c007399e3ba40659eb3e7183cadfb1
diff --git a/metadata/md5-cache/dev-python/blinker-1.4-r2 b/metadata/md5-cache/dev-python/blinker-1.4-r2
index 4cc57016f79c..693401a75d49 100644
--- a/metadata/md5-cache/dev-python/blinker-1.4-r2
+++ b/metadata/md5-cache/dev-python/blinker-1.4-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blinker/blinker-1.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=43d3182ee151a7819bdfb00fc5f977f2
diff --git a/metadata/md5-cache/dev-python/blockdiag-2.0.1 b/metadata/md5-cache/dev-python/blockdiag-2.0.1
index bf05e47d98a6..a01b897c193f 100644
--- a/metadata/md5-cache/dev-python/blockdiag-2.0.1
+++ b/metadata/md5-cache/dev-python/blockdiag-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blockdiag/blockdiag-2.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=87e64c240babb1c8342cac788a6329ce
diff --git a/metadata/md5-cache/dev-python/blosc-1.9.2 b/metadata/md5-cache/dev-python/blosc-1.9.2
index 0007b6b0b29d..eae213745e28 100644
--- a/metadata/md5-cache/dev-python/blosc-1.9.2
+++ b/metadata/md5-cache/dev-python/blosc-1.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blosc/blosc-1.9.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c07a43914e1169a52e018e3aa9749952
diff --git a/metadata/md5-cache/dev-python/bluelet-0.2.0 b/metadata/md5-cache/dev-python/bluelet-0.2.0
index d810927f34d0..1279a86853c3 100644
--- a/metadata/md5-cache/dev-python/bluelet-0.2.0
+++ b/metadata/md5-cache/dev-python/bluelet-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/sampsyo/bluelet/archive/v0.2.0.tar.gz -> bluelet-0.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4fe39bd5b06a7dcf93c7688d00400311
diff --git a/metadata/md5-cache/dev-python/blurb-1.0.7 b/metadata/md5-cache/dev-python/blurb-1.0.7
index 862100d4aed3..126afa2ddaa4 100644
--- a/metadata/md5-cache/dev-python/blurb-1.0.7
+++ b/metadata/md5-cache/dev-python/blurb-1.0.7
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Tool to create and manage NEWS blurbs for CPython
 EAPI=7
 HOMEPAGE=https://github.com/python/core-workflow/tree/master/blurb
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/29/4f/268f9aa095cbcf53253c665fd0f5103f22dccf246fe317ab9c5c481b38f5/blurb-1.0.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e78c654d6a29cc488738e9dc2674968d
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=99425636e79278d987a3a596da593297
diff --git a/metadata/md5-cache/dev-python/booleanOperations-0.9.0-r1 b/metadata/md5-cache/dev-python/booleanOperations-0.9.0-r1
index b04ca1d43e3b..6a95b2043fb0 100644
--- a/metadata/md5-cache/dev-python/booleanOperations-0.9.0-r1
+++ b/metadata/md5-cache/dev-python/booleanOperations-0.9.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/typemytype/booleanOperations/archive/0.9.0.tar.gz -> booleanOperations-0.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d41e3adf949cbae1ab075c23036f7a7c
diff --git a/metadata/md5-cache/dev-python/boto-2.49.0-r3 b/metadata/md5-cache/dev-python/boto-2.49.0-r3
index d4b918d24267..0b631830703d 100644
--- a/metadata/md5-cache/dev-python/boto-2.49.0-r3
+++ b/metadata/md5-cache/dev-python/boto-2.49.0-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/boto/boto-2.49.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5b5770cbebd40e8530163419f8fe0d7f
diff --git a/metadata/md5-cache/dev-python/boto3-1.15.18 b/metadata/md5-cache/dev-python/boto3-1.15.18
index ae71eac9ddfb..bca59c3a93ca 100644
--- a/metadata/md5-cache/dev-python/boto3-1.15.18
+++ b/metadata/md5-cache/dev-python/boto3-1.15.18
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.15.18.tar.gz -> boto3-1.15.18.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7fe2402bd1ee789893cb4bb3b4de36f1
diff --git a/metadata/md5-cache/dev-python/boto3-1.16.16 b/metadata/md5-cache/dev-python/boto3-1.16.16
index 647a813dedde..ddbd088386c3 100644
--- a/metadata/md5-cache/dev-python/boto3-1.16.16
+++ b/metadata/md5-cache/dev-python/boto3-1.16.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.16.16.tar.gz -> boto3-1.16.16.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=53909f2d22ada8f7f100ce8183ef9cfc
diff --git a/metadata/md5-cache/dev-python/boto3-1.16.20 b/metadata/md5-cache/dev-python/boto3-1.16.20
index eef809481df7..235ef48f8aa8 100644
--- a/metadata/md5-cache/dev-python/boto3-1.16.20
+++ b/metadata/md5-cache/dev-python/boto3-1.16.20
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.16.20.tar.gz -> boto3-1.16.20.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=53909f2d22ada8f7f100ce8183ef9cfc
diff --git a/metadata/md5-cache/dev-python/boto3-1.16.21 b/metadata/md5-cache/dev-python/boto3-1.16.21
index 132b673a048e..4006660e77c8 100644
--- a/metadata/md5-cache/dev-python/boto3-1.16.21
+++ b/metadata/md5-cache/dev-python/boto3-1.16.21
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.16.21.tar.gz -> boto3-1.16.21.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=53909f2d22ada8f7f100ce8183ef9cfc
diff --git a/metadata/md5-cache/dev-python/boto3-1.16.22 b/metadata/md5-cache/dev-python/boto3-1.16.22
index 4d937244bd6a..c0fa71de0cf6 100644
--- a/metadata/md5-cache/dev-python/boto3-1.16.22
+++ b/metadata/md5-cache/dev-python/boto3-1.16.22
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.16.22.tar.gz -> boto3-1.16.22.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=53909f2d22ada8f7f100ce8183ef9cfc
diff --git a/metadata/md5-cache/dev-python/boto3-1.16.23 b/metadata/md5-cache/dev-python/boto3-1.16.23
index 0026f9a788a2..7005315cf41d 100644
--- a/metadata/md5-cache/dev-python/boto3-1.16.23
+++ b/metadata/md5-cache/dev-python/boto3-1.16.23
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.16.23.tar.gz -> boto3-1.16.23.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=53909f2d22ada8f7f100ce8183ef9cfc
diff --git a/metadata/md5-cache/dev-python/boto3-1.16.24 b/metadata/md5-cache/dev-python/boto3-1.16.24
index bdb9dd65e30c..2c92bc2731a7 100644
--- a/metadata/md5-cache/dev-python/boto3-1.16.24
+++ b/metadata/md5-cache/dev-python/boto3-1.16.24
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.16.24.tar.gz -> boto3-1.16.24.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=53909f2d22ada8f7f100ce8183ef9cfc
diff --git a/metadata/md5-cache/dev-python/boto3-1.16.25 b/metadata/md5-cache/dev-python/boto3-1.16.25
index 8851ecc978ec..899f1bab7739 100644
--- a/metadata/md5-cache/dev-python/boto3-1.16.25
+++ b/metadata/md5-cache/dev-python/boto3-1.16.25
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.16.25.tar.gz -> boto3-1.16.25.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=53909f2d22ada8f7f100ce8183ef9cfc
diff --git a/metadata/md5-cache/dev-python/boto3-1.16.26 b/metadata/md5-cache/dev-python/boto3-1.16.26
new file mode 100644
index 000000000000..2649b5f5af71
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.16.26
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/botocore-1.19.26[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.19.26[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.16.26.tar.gz -> boto3-1.16.26.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=53909f2d22ada8f7f100ce8183ef9cfc
diff --git a/metadata/md5-cache/dev-python/boto3-1.16.28 b/metadata/md5-cache/dev-python/boto3-1.16.28
new file mode 100644
index 000000000000..7f6d8644ef44
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.16.28
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/botocore-1.19.28[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.19.28[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.16.28.tar.gz -> boto3-1.16.28.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=53909f2d22ada8f7f100ce8183ef9cfc
diff --git a/metadata/md5-cache/dev-python/boto3-1.16.9 b/metadata/md5-cache/dev-python/boto3-1.16.9
index 817117077ffd..4718a22774cb 100644
--- a/metadata/md5-cache/dev-python/boto3-1.16.9
+++ b/metadata/md5-cache/dev-python/boto3-1.16.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.16.9.tar.gz -> boto3-1.16.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7fe2402bd1ee789893cb4bb3b4de36f1
diff --git a/metadata/md5-cache/dev-python/boto3-9999 b/metadata/md5-cache/dev-python/boto3-9999
index 60d202219646..9322309ff4ac 100644
--- a/metadata/md5-cache/dev-python/boto3-9999
+++ b/metadata/md5-cache/dev-python/boto3-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/botocore-9999[python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=50835cc9437821027072d1224222211d
diff --git a/metadata/md5-cache/dev-python/botocore-1.18.18 b/metadata/md5-cache/dev-python/botocore-1.18.18
index fd02b80d0d9b..3051494be6f8 100644
--- a/metadata/md5-cache/dev-python/botocore-1.18.18
+++ b/metadata/md5-cache/dev-python/botocore-1.18.18
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.18.18.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e93fbacf75af38c4b23e57bc3d57937e
diff --git a/metadata/md5-cache/dev-python/botocore-1.19.16 b/metadata/md5-cache/dev-python/botocore-1.19.16
index 71754d3654c1..be4a4681c237 100644
--- a/metadata/md5-cache/dev-python/botocore-1.19.16
+++ b/metadata/md5-cache/dev-python/botocore-1.19.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.19.16.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f5530f62319f8a88c8d1822506f374be
diff --git a/metadata/md5-cache/dev-python/botocore-1.19.20 b/metadata/md5-cache/dev-python/botocore-1.19.20
index c5c44442e126..12ebe6f2d9cc 100644
--- a/metadata/md5-cache/dev-python/botocore-1.19.20
+++ b/metadata/md5-cache/dev-python/botocore-1.19.20
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.19.20.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f5530f62319f8a88c8d1822506f374be
diff --git a/metadata/md5-cache/dev-python/botocore-1.19.21 b/metadata/md5-cache/dev-python/botocore-1.19.21
index 1ca6dbed4b04..7174328d6c62 100644
--- a/metadata/md5-cache/dev-python/botocore-1.19.21
+++ b/metadata/md5-cache/dev-python/botocore-1.19.21
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.19.21.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f5530f62319f8a88c8d1822506f374be
diff --git a/metadata/md5-cache/dev-python/botocore-1.19.22 b/metadata/md5-cache/dev-python/botocore-1.19.22
index 3bf094d9a1b3..f47176c55461 100644
--- a/metadata/md5-cache/dev-python/botocore-1.19.22
+++ b/metadata/md5-cache/dev-python/botocore-1.19.22
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.19.22.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f5530f62319f8a88c8d1822506f374be
diff --git a/metadata/md5-cache/dev-python/botocore-1.19.23 b/metadata/md5-cache/dev-python/botocore-1.19.23
index 904fcc19a43e..a00bce2dfc85 100644
--- a/metadata/md5-cache/dev-python/botocore-1.19.23
+++ b/metadata/md5-cache/dev-python/botocore-1.19.23
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.19.23.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f5530f62319f8a88c8d1822506f374be
diff --git a/metadata/md5-cache/dev-python/botocore-1.19.24 b/metadata/md5-cache/dev-python/botocore-1.19.24
index 6e8598c24651..c0fee261bcb6 100644
--- a/metadata/md5-cache/dev-python/botocore-1.19.24
+++ b/metadata/md5-cache/dev-python/botocore-1.19.24
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.19.24.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f5530f62319f8a88c8d1822506f374be
diff --git a/metadata/md5-cache/dev-python/botocore-1.19.25 b/metadata/md5-cache/dev-python/botocore-1.19.25
index 4e29746ff445..86ba45dc7a69 100644
--- a/metadata/md5-cache/dev-python/botocore-1.19.25
+++ b/metadata/md5-cache/dev-python/botocore-1.19.25
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.19.25.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f5530f62319f8a88c8d1822506f374be
diff --git a/metadata/md5-cache/dev-python/botocore-1.19.26 b/metadata/md5-cache/dev-python/botocore-1.19.26
new file mode 100644
index 000000000000..3371f8d63536
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.19.26
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.19.26.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f5530f62319f8a88c8d1822506f374be
diff --git a/metadata/md5-cache/dev-python/botocore-1.19.28 b/metadata/md5-cache/dev-python/botocore-1.19.28
new file mode 100644
index 000000000000..d2f2dea131e0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.19.28
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.19.28.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f5530f62319f8a88c8d1822506f374be
diff --git a/metadata/md5-cache/dev-python/botocore-1.19.9 b/metadata/md5-cache/dev-python/botocore-1.19.9
index ae648f60a942..9aff8a83a2ac 100644
--- a/metadata/md5-cache/dev-python/botocore-1.19.9
+++ b/metadata/md5-cache/dev-python/botocore-1.19.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.19.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=64db6d1726def68e54953fd30352cb49
diff --git a/metadata/md5-cache/dev-python/botocore-9999 b/metadata/md5-cache/dev-python/botocore-9999
index fbb3a9d3844b..af522a1d4791 100644
--- a/metadata/md5-cache/dev-python/botocore-9999
+++ b/metadata/md5-cache/dev-python/botocore-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=822198a331fbb23b20dc209e8c36ee41
diff --git a/metadata/md5-cache/dev-python/bottle-0.12.18-r1 b/metadata/md5-cache/dev-python/bottle-0.12.18-r1
index 967f5293844b..ec73854642d6 100644
--- a/metadata/md5-cache/dev-python/bottle-0.12.18-r1
+++ b/metadata/md5-cache/dev-python/bottle-0.12.18-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bottle/bottle-0.12.18.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=197c9b0ec16c6bb502479d79a5b4c6b5
diff --git a/metadata/md5-cache/dev-python/bottle-0.12.19 b/metadata/md5-cache/dev-python/bottle-0.12.19
index 947e5bfb5c13..61fbf528010c 100644
--- a/metadata/md5-cache/dev-python/bottle-0.12.19
+++ b/metadata/md5-cache/dev-python/bottle-0.12.19
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bottle/bottle-0.12.19.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=92b796dd6926a4af09c66657f7468f96
diff --git a/metadata/md5-cache/dev-python/bottleneck-1.3.2 b/metadata/md5-cache/dev-python/bottleneck-1.3.2
index 535df3c895f3..dd4a09081750 100644
--- a/metadata/md5-cache/dev-python/bottleneck-1.3.2
+++ b/metadata/md5-cache/dev-python/bottleneck-1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kwgoodman/bottleneck/archive/v1.3.2.tar.gz -> bottleneck-1.3.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=94f02e749620a63a92c4cdb014cce5e1
diff --git a/metadata/md5-cache/dev-python/bpython-0.20 b/metadata/md5-cache/dev-python/bpython-0.20
index 6bad42ff8c40..3b4457a0442f 100644
--- a/metadata/md5-cache/dev-python/bpython-0.20
+++ b/metadata/md5-cache/dev-python/bpython-0.20
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bpython/bpython-0.20.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=193d7a3b15cd32890971a1e9c68a9697
diff --git a/metadata/md5-cache/dev-python/bpython-0.20.1 b/metadata/md5-cache/dev-python/bpython-0.20.1
new file mode 100644
index 000000000000..05f395326961
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bpython-0.20.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( dev-python/sphinx ) test? ( >=dev-python/curtsies-0.2.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/greenlet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jedi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urwid[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/watchdog[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Syntax highlighting and autocompletion for the Python interpreter
+EAPI=7
+HOMEPAGE=https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/
+IUSE=doc test doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/curtsies-0.2.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/greenlet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jedi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urwid[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/watchdog[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/bpython/bpython-0.20.1.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b4f66c877495de207e77ac8493399453
diff --git a/metadata/md5-cache/dev-python/braintree-4.4.0 b/metadata/md5-cache/dev-python/braintree-4.4.0
index 5663c2cde322..03cc173f8959 100644
--- a/metadata/md5-cache/dev-python/braintree-4.4.0
+++ b/metadata/md5-cache/dev-python/braintree-4.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/requests-0.11.1[python_targets_python3_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/braintree/braintree-4.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e025761afbb3a934bbff37de3ee884a3
diff --git a/metadata/md5-cache/dev-python/breathe-4.14.1 b/metadata/md5-cache/dev-python/breathe-4.14.1
index 4a837e23343b..40103e6f12e9 100644
--- a/metadata/md5-cache/dev-python/breathe-4.14.1
+++ b/metadata/md5-cache/dev-python/breathe-4.14.1
@@ -10,5 +10,5 @@ RDEPEND=app-doc/doxygen dev-python/docutils[python_targets_python3_6(-)?,python_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/breathe/breathe-4.14.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5c60ff4be9832d93ebd01cdbbfb1d18b
diff --git a/metadata/md5-cache/dev-python/breathe-4.22.1 b/metadata/md5-cache/dev-python/breathe-4.22.1
index 9106094fecf0..7cf2d2541f95 100644
--- a/metadata/md5-cache/dev-python/breathe-4.22.1
+++ b/metadata/md5-cache/dev-python/breathe-4.22.1
@@ -10,5 +10,5 @@ RDEPEND=app-doc/doxygen dev-python/docutils[python_targets_python3_6(-)?,python_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/breathe/breathe-4.22.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8167b9b28b6999e036e8dc6823fee35f
diff --git a/metadata/md5-cache/dev-python/brotlicffi-0.8.0 b/metadata/md5-cache/dev-python/brotlicffi-0.8.0
new file mode 100644
index 000000000000..cf1f2da85dd4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/brotlicffi-0.8.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-arch/brotli:= virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=Python binding to the Brotli library
+EAPI=7
+HOMEPAGE=https://github.com/python-hyper/brotlipy/ https://pypi.python.org/pypi/brotlipy
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=app-arch/brotli:= virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-hyper/brotlicffi/archive/v0.8.0.tar.gz -> brotlicffi-0.8.0.gh.tar.gz test? ( https://github.com/google/brotli/archive/46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz -> brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz )
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f71c66f6f9b80cc594d2ae1f7c8d2e05
diff --git a/metadata/md5-cache/dev-python/brotlipy-0.7.0-r3 b/metadata/md5-cache/dev-python/brotlipy-0.7.0-r3
index dfadbe0087ac..6254453ff4c7 100644
--- a/metadata/md5-cache/dev-python/brotlipy-0.7.0-r3
+++ b/metadata/md5-cache/dev-python/brotlipy-0.7.0-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/brotlipy/archive/v0.7.0.tar.gz -> brotlipy-0.7.0.tar.gz https://github.com/google/brotli/archive/46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz -> brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fbc29de6e0f12400240064145c48bdad
diff --git a/metadata/md5-cache/dev-python/bsddb3-6.2.7 b/metadata/md5-cache/dev-python/bsddb3-6.2.7
index 41cd769750ed..6b7ec1f7283c 100644
--- a/metadata/md5-cache/dev-python/bsddb3-6.2.7
+++ b/metadata/md5-cache/dev-python/bsddb3-6.2.7
@@ -11,5 +11,5 @@ RDEPEND=<sys-libs/db-6.3:= || ( sys-libs/db:6.2 sys-libs/db:6.1 sys-libs/db:5.3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bsddb3/bsddb3-6.2.7.tar.gz
-_eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=46c50972171820edd1cee7a0bf8958cc
diff --git a/metadata/md5-cache/dev-python/cached-property-1.5.2 b/metadata/md5-cache/dev-python/cached-property-1.5.2
index c85a9d43c3e4..97a6ecd616b9 100644
--- a/metadata/md5-cache/dev-python/cached-property-1.5.2
+++ b/metadata/md5-cache/dev-python/cached-property-1.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cached-property/cached-property-1.5.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=018230ec8b6cf46cbef08ddb39d18d92
diff --git a/metadata/md5-cache/dev-python/cachelib-0.1 b/metadata/md5-cache/dev-python/cachelib-0.1
index 7590c68895aa..3e5edcbc4e38 100644
--- a/metadata/md5-cache/dev-python/cachelib-0.1
+++ b/metadata/md5-cache/dev-python/cachelib-0.1
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of cache libraries in the same API interface. Extracted from werkzeug
 EAPI=7
 HOMEPAGE=https://pypi.org/project/cachelib/ https://github.com/pallets/cachelib
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cachelib/cachelib-0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=dbc818151dffc165e3ec4adf402f692d
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=53feb00e3589fd4e3b4edf5641adbbff
diff --git a/metadata/md5-cache/dev-python/cachetools-4.1.1 b/metadata/md5-cache/dev-python/cachetools-4.1.1
index 6c6cfc52f610..114170a87efb 100644
--- a/metadata/md5-cache/dev-python/cachetools-4.1.1
+++ b/metadata/md5-cache/dev-python/cachetools-4.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cachetools/cachetools-4.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dc10d49ab7f328d9b89b87847cef9362
diff --git a/metadata/md5-cache/dev-python/cairocffi-1.1.0 b/metadata/md5-cache/dev-python/cairocffi-1.1.0
index 67370f6129d1..df3ad7f5a387 100644
--- a/metadata/md5-cache/dev-python/cairocffi-1.1.0
+++ b/metadata/md5-cache/dev-python/cairocffi-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=c56f9ae0a9e4f6c138e1d3ee4f1473ba
diff --git a/metadata/md5-cache/dev-python/cairocffi-1.2.0 b/metadata/md5-cache/dev-python/cairocffi-1.2.0
index 819bb352bbb9..5182b0874dee 100644
--- a/metadata/md5-cache/dev-python/cairocffi-1.2.0
+++ b/metadata/md5-cache/dev-python/cairocffi-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-1.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=7b55d73696dfed87869403e562461af0
diff --git a/metadata/md5-cache/dev-python/capturer-3.0 b/metadata/md5-cache/dev-python/capturer-3.0
index e26d76ab3776..7d658734c7f9 100644
--- a/metadata/md5-cache/dev-python/capturer-3.0
+++ b/metadata/md5-cache/dev-python/capturer-3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/capturer/capturer-3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0291ac462f7e5f89ffe74191814e3065
diff --git a/metadata/md5-cache/dev-python/carbon-1.1.5 b/metadata/md5-cache/dev-python/carbon-1.1.5
index 23c094cdb770..010f9f4ad5ef 100644
--- a/metadata/md5-cache/dev-python/carbon-1.1.5
+++ b/metadata/md5-cache/dev-python/carbon-1.1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/twisted[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/c/carbon/carbon-1.1.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=161fff861e7f699cc226b6bc0f70de0a
diff --git a/metadata/md5-cache/dev-python/case-1.5.3 b/metadata/md5-cache/dev-python/case-1.5.3
index e16e261b07c7..184e5c788f68 100644
--- a/metadata/md5-cache/dev-python/case-1.5.3
+++ b/metadata/md5-cache/dev-python/case-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/nose-1.3.7[python_targets_pypy3(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/c/case/case-1.5.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5b894e81eb92bedfe8fcf01d058ed7be
diff --git a/metadata/md5-cache/dev-python/castellan-1.2.2 b/metadata/md5-cache/dev-python/castellan-1.2.2
index 1138c50256ab..3799cc09864e 100644
--- a/metadata/md5-cache/dev-python/castellan-1.2.2
+++ b/metadata/md5-cache/dev-python/castellan-1.2.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/castellan/castellan-1.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3ab1d261e614c275baa3a0a2612a1d23
diff --git a/metadata/md5-cache/dev-python/castellan-3.6.0 b/metadata/md5-cache/dev-python/castellan-3.6.0
index d1bc73a57e15..206c72861dbc 100644
--- a/metadata/md5-cache/dev-python/castellan-3.6.0
+++ b/metadata/md5-cache/dev-python/castellan-3.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/c/castellan/castellan-3.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=53e4d572a23c32ecc414188447d624f4
diff --git a/metadata/md5-cache/dev-python/casttube-0.2.0 b/metadata/md5-cache/dev-python/casttube-0.2.0
index 3b7014b43968..9bd0f774f314 100644
--- a/metadata/md5-cache/dev-python/casttube-0.2.0
+++ b/metadata/md5-cache/dev-python/casttube-0.2.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=casttube provides a way to interact with the Youtube Chromecast api.
 EAPI=7
 HOMEPAGE=https://github.com/ur1katz/casttube
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/c/casttube/casttube-0.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=924902403a977f122331173d29744d1c
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2257e21e0dbf8b72fd7da10a2c554a40
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-0.4.23 b/metadata/md5-cache/dev-python/catkin_pkg-0.4.23
index 194457897682..9c7317ffc9db 100644
--- a/metadata/md5-cache/dev-python/catkin_pkg-0.4.23
+++ b/metadata/md5-cache/dev-python/catkin_pkg-0.4.23
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/catkin_pkg/archive/0.4.23.tar.gz -> catkin_pkg-0.4.23-gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e71d305426a21c605d7eadaa3ace4740
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-9999 b/metadata/md5-cache/dev-python/catkin_pkg-9999
index 691c58c2e294..4c397b05d634 100644
--- a/metadata/md5-cache/dev-python/catkin_pkg-9999
+++ b/metadata/md5-cache/dev-python/catkin_pkg-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e71d305426a21c605d7eadaa3ace4740
diff --git a/metadata/md5-cache/dev-python/cbor-1.0.0-r1 b/metadata/md5-cache/dev-python/cbor-1.0.0-r1
index 11268c76bd27..27b942f7234b 100644
--- a/metadata/md5-cache/dev-python/cbor-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/cbor-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/brianolson/cbor_py/archive/b3af679e7cf3e12d50acb83c3c591fc5db9a658d.tar.gz -> cbor-1.0.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=41ecfe24733c0e94bc416ff7249776ec
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c0efadc6b49b57f9178248fd2d46bb93
diff --git a/metadata/md5-cache/dev-python/cbor2-5.1.2 b/metadata/md5-cache/dev-python/cbor2-5.1.2
index 368b261677d8..96cf99158956 100644
--- a/metadata/md5-cache/dev-python/cbor2-5.1.2
+++ b/metadata/md5-cache/dev-python/cbor2-5.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cbor2/cbor2-5.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6073c39296eedd58b12ff5b2e20bd086
diff --git a/metadata/md5-cache/dev-python/cbor2-5.2.0 b/metadata/md5-cache/dev-python/cbor2-5.2.0
index 6cb8e06ac7d1..d11f2a23ed8b 100644
--- a/metadata/md5-cache/dev-python/cbor2-5.2.0
+++ b/metadata/md5-cache/dev-python/cbor2-5.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cbor2/cbor2-5.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2e80b021a0d3da617219450973e199ff
diff --git a/metadata/md5-cache/dev-python/celery-4.3.0 b/metadata/md5-cache/dev-python/celery-4.3.0
index 64e519f08e90..048eccf2e1bb 100644
--- a/metadata/md5-cache/dev-python/celery-4.3.0
+++ b/metadata/md5-cache/dev-python/celery-4.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/celery/celery/archive/v4.3.0.tar.gz -> celery-4.3.0.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=39924a36a82b391a354494be134569b3
diff --git a/metadata/md5-cache/dev-python/certifi-10001 b/metadata/md5-cache/dev-python/certifi-10001
index ce1715220502..022f87b716bf 100644
--- a/metadata/md5-cache/dev-python/certifi-10001
+++ b/metadata/md5-cache/dev-python/certifi-10001
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/certifi-shim/archive/v10001.tar.gz -> certifi-shim-10001.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=06c0d0169a9d384a3960abf96309e19b
diff --git a/metadata/md5-cache/dev-python/certifi-10001-r1 b/metadata/md5-cache/dev-python/certifi-10001-r1
index 3a57fde3f2a1..d84f0aa5b527 100644
--- a/metadata/md5-cache/dev-python/certifi-10001-r1
+++ b/metadata/md5-cache/dev-python/certifi-10001-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/certifi-shim/archive/v10001.tar.gz -> certifi-shim-10001.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=139f94eb1aaac356ea7cd43f717f4fc3
diff --git a/metadata/md5-cache/dev-python/cffi-1.14.0-r3 b/metadata/md5-cache/dev-python/cffi-1.14.0-r3
index bfb1eeaeffb1..ba1e150d5aa7 100644
--- a/metadata/md5-cache/dev-python/cffi-1.14.0-r3
+++ b/metadata/md5-cache/dev-python/cffi-1.14.0-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0/1.14.0
 SRC_URI=mirror://pypi/c/cffi/cffi-1.14.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cd4eb2f1649bf3612020b87046131c68
diff --git a/metadata/md5-cache/dev-python/cfn-python-lint-0.39.0 b/metadata/md5-cache/dev-python/cfn-python-lint-0.39.0
index a06ba642feee..a9829417d679 100644
--- a/metadata/md5-cache/dev-python/cfn-python-lint-0.39.0
+++ b/metadata/md5-cache/dev-python/cfn-python-lint-0.39.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws-cloudformation/cfn-python-lint/archive/v0.39.0.tar.gz -> cfn-python-lint-0.39.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b625c313a5310602289123cc3bb7b333
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cbf7fcb7c00d77069ec7d0eb0d0a776a
diff --git a/metadata/md5-cache/dev-python/cfn-python-lint-0.41.0 b/metadata/md5-cache/dev-python/cfn-python-lint-0.41.0
index 4d34befe44fc..8d3cc8cb7f22 100644
--- a/metadata/md5-cache/dev-python/cfn-python-lint-0.41.0
+++ b/metadata/md5-cache/dev-python/cfn-python-lint-0.41.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws-cloudformation/cfn-python-lint/archive/v0.41.0.tar.gz -> cfn-python-lint-0.41.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=399c664fde2ee517fd6520dfcc990e0e
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c23590cef985a7b9830eb01a05d4ad00
diff --git a/metadata/md5-cache/dev-python/cfn-python-lint-0.42.0 b/metadata/md5-cache/dev-python/cfn-python-lint-0.42.0
index 5637a9dae5f2..6d56318a334a 100644
--- a/metadata/md5-cache/dev-python/cfn-python-lint-0.42.0
+++ b/metadata/md5-cache/dev-python/cfn-python-lint-0.42.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws-cloudformation/cfn-python-lint/archive/v0.42.0.tar.gz -> cfn-python-lint-0.42.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=399c664fde2ee517fd6520dfcc990e0e
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c23590cef985a7b9830eb01a05d4ad00
diff --git a/metadata/md5-cache/dev-python/cgroup-utils-0.8 b/metadata/md5-cache/dev-python/cgroup-utils-0.8
index bc6cb95a9443..de71cd419614 100644
--- a/metadata/md5-cache/dev-python/cgroup-utils-0.8
+++ b/metadata/md5-cache/dev-python/cgroup-utils-0.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/peo3/cgroup-utils/archive/v0.8.tar.gz -> cgroup-utils-0.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2078a2b05cf8e26e44549b765f2073ea
diff --git a/metadata/md5-cache/dev-python/chai-1.1.2 b/metadata/md5-cache/dev-python/chai-1.1.2
index 797f286d8b49..6932c69bb348 100644
--- a/metadata/md5-cache/dev-python/chai-1.1.2
+++ b/metadata/md5-cache/dev-python/chai-1.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/chai/chai-1.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f16a06e27d9c66e0b2f3f4c15c1b260c
diff --git a/metadata/md5-cache/dev-python/chainmap-1.0.3 b/metadata/md5-cache/dev-python/chainmap-1.0.3
index 37b11167183e..c141ad092d7e 100644
--- a/metadata/md5-cache/dev-python/chainmap-1.0.3
+++ b/metadata/md5-cache/dev-python/chainmap-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/c/chainmap/chainmap-1.0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=90ea2e891d8752deafa2aa17fc397bc1
diff --git a/metadata/md5-cache/dev-python/chameleon-3.8.1 b/metadata/md5-cache/dev-python/chameleon-3.8.1
index b4cd6944c406..cd3075afdc3e 100644
--- a/metadata/md5-cache/dev-python/chameleon-3.8.1
+++ b/metadata/md5-cache/dev-python/chameleon-3.8.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/malthe/chameleon/archive/3.8.1.tar.gz -> chameleon-3.8.1.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8f6b0a5e7969d1e6f2d3313ab5e0f225
diff --git a/metadata/md5-cache/dev-python/characteristic-14.3.0-r3 b/metadata/md5-cache/dev-python/characteristic-14.3.0-r3
index 0f0c498331e3..2e43210b2aa3 100644
--- a/metadata/md5-cache/dev-python/characteristic-14.3.0-r3
+++ b/metadata/md5-cache/dev-python/characteristic-14.3.0-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/characteristic/characteristic-14.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=60ac286fc6daf578963c140298b72f81
diff --git a/metadata/md5-cache/dev-python/chardet-3.0.4-r1 b/metadata/md5-cache/dev-python/chardet-3.0.4-r1
index 2743729c71fb..1d01cee2714c 100644
--- a/metadata/md5-cache/dev-python/chardet-3.0.4-r1
+++ b/metadata/md5-cache/dev-python/chardet-3.0.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/chardet/chardet/archive/3.0.4.tar.gz -> chardet-3.0.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87ea9b9f9747abc799b823875571fd6b
diff --git a/metadata/md5-cache/dev-python/chart-studio-1.1.0 b/metadata/md5-cache/dev-python/chart-studio-1.1.0
index 896927fa93d8..31a6f6b2cd4a 100644
--- a/metadata/md5-cache/dev-python/chart-studio-1.1.0
+++ b/metadata/md5-cache/dev-python/chart-studio-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/plotly[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/c/chart-studio/chart-studio-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ef2e5234e3d7058e6052f132f18d38e0
diff --git a/metadata/md5-cache/dev-python/cheetah-2.4.4-r1 b/metadata/md5-cache/dev-python/cheetah-2.4.4-r1
index 8498b37b1953..85feba30df64 100644
--- a/metadata/md5-cache/dev-python/cheetah-2.4.4-r1
+++ b/metadata/md5-cache/dev-python/cheetah-2.4.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cheetah/Cheetah-2.4.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fdaf33bab25692042da800eea3939117
diff --git a/metadata/md5-cache/dev-python/cheetah3-3.2.4 b/metadata/md5-cache/dev-python/cheetah3-3.2.4
index 935ed17d784b..b40f4612f848 100644
--- a/metadata/md5-cache/dev-python/cheetah3-3.2.4
+++ b/metadata/md5-cache/dev-python/cheetah3-3.2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/markdown[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/CheetahTemplate3/cheetah3/archive/3.2.4.tar.gz -> cheetah3-3.2.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=24e7888af376eb823d9e39bc58113431
diff --git a/metadata/md5-cache/dev-python/cheetah3-3.2.6 b/metadata/md5-cache/dev-python/cheetah3-3.2.6
index 750bbad25122..a512fe96a6ac 100644
--- a/metadata/md5-cache/dev-python/cheetah3-3.2.6
+++ b/metadata/md5-cache/dev-python/cheetah3-3.2.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/markdown[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/CheetahTemplate3/cheetah3/archive/3.2.6.tar.gz -> cheetah3-3.2.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fa3abad8992b19546abfed498a151e8c
diff --git a/metadata/md5-cache/dev-python/cheroot-8.4.4 b/metadata/md5-cache/dev-python/cheroot-8.4.4
index 60ec3fcfb362..fd6cb2efa6e3 100644
--- a/metadata/md5-cache/dev-python/cheroot-8.4.4
+++ b/metadata/md5-cache/dev-python/cheroot-8.4.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cheroot/cheroot-8.4.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3f15844f81d4155dc680acb87f0a44b2
diff --git a/metadata/md5-cache/dev-python/cheroot-8.4.5 b/metadata/md5-cache/dev-python/cheroot-8.4.5
index 7658ffa5de9d..e0f89eb09b03 100644
--- a/metadata/md5-cache/dev-python/cheroot-8.4.5
+++ b/metadata/md5-cache/dev-python/cheroot-8.4.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cheroot/cheroot-8.4.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b3053ec89baca61581db1384a9c105c9
diff --git a/metadata/md5-cache/dev-python/cheroot-8.4.8 b/metadata/md5-cache/dev-python/cheroot-8.4.8
index da68863a2f6e..579a63c1c21a 100644
--- a/metadata/md5-cache/dev-python/cheroot-8.4.8
+++ b/metadata/md5-cache/dev-python/cheroot-8.4.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cheroot/cheroot-8.4.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b3053ec89baca61581db1384a9c105c9
diff --git a/metadata/md5-cache/dev-python/cherrypy-18.6.0 b/metadata/md5-cache/dev-python/cherrypy-18.6.0
index c6d18779e7fc..e2e35115c5b9 100644
--- a/metadata/md5-cache/dev-python/cherrypy-18.6.0
+++ b/metadata/md5-cache/dev-python/cherrypy-18.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/CherryPy/CherryPy-18.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1a45ae0d506d187d8014391e88291c27
diff --git a/metadata/md5-cache/dev-python/chump-1.6.0-r1 b/metadata/md5-cache/dev-python/chump-1.6.0-r1
index 7ce30f240762..34b1684c0114 100644
--- a/metadata/md5-cache/dev-python/chump-1.6.0-r1
+++ b/metadata/md5-cache/dev-python/chump-1.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/c/chump/chump-1.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0598d086682e05242b30b95363a64ae4
diff --git a/metadata/md5-cache/dev-python/citeproc-py-0.4.0-r1 b/metadata/md5-cache/dev-python/citeproc-py-0.4.0-r1
index d649ffb05d5d..acb9a9b859bc 100644
--- a/metadata/md5-cache/dev-python/citeproc-py-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/citeproc-py-0.4.0-r1
@@ -1,14 +1,14 @@
-BDEPEND=app-text/rnc2rng[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=app-text/rnc2rng[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Yet another Python CSL Processor
 EAPI=7
 HOMEPAGE=https://pypi.python.org/pypi/citeproc-py
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=app-text/rnc2rng[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=app-text/rnc2rng[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/c/citeproc-py/citeproc-py-0.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1c14a61667fc3bff8ec6d00957e3bc30
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2555e399b1a5adfaa27fbbded189e0d0
diff --git a/metadata/md5-cache/dev-python/cjkwrap-2.2-r1 b/metadata/md5-cache/dev-python/cjkwrap-2.2-r1
index 33615987f41e..ee0647f50b89 100644
--- a/metadata/md5-cache/dev-python/cjkwrap-2.2-r1
+++ b/metadata/md5-cache/dev-python/cjkwrap-2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/fgallaire/cjkwrap/archive/v2.2.tar.gz -> cjkwrap-2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2ca4e8ab331e817a949c862b70bfc71b
diff --git a/metadata/md5-cache/dev-python/cli_helpers-2.1.0 b/metadata/md5-cache/dev-python/cli_helpers-2.1.0
index efd54f06f7b3..c7260c292c31 100644
--- a/metadata/md5-cache/dev-python/cli_helpers-2.1.0
+++ b/metadata/md5-cache/dev-python/cli_helpers-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/cli_helpers/archive/v2.1.0.tar.gz -> cli_helpers-2.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6b2ac322da57ca9dc9bfe90c5ba89c3e
diff --git a/metadata/md5-cache/dev-python/cli_helpers-9999 b/metadata/md5-cache/dev-python/cli_helpers-9999
index 13507c3f8331..5d6160657823 100644
--- a/metadata/md5-cache/dev-python/cli_helpers-9999
+++ b/metadata/md5-cache/dev-python/cli_helpers-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/configobj-5.0.5[python_targets_python3_6(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f4cf027cf72f22ff4cd3d6d7743255df
diff --git a/metadata/md5-cache/dev-python/click-6.7-r2 b/metadata/md5-cache/dev-python/click-6.7-r2
index 25581d8e5b3f..e63ad20c6dd2 100644
--- a/metadata/md5-cache/dev-python/click-6.7-r2
+++ b/metadata/md5-cache/dev-python/click-6.7-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/click/click-6.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fac2f8664ec21baf698b041406c803a2
diff --git a/metadata/md5-cache/dev-python/click-7.1.2-r1 b/metadata/md5-cache/dev-python/click-7.1.2-r1
index b3f1fc67f15d..3f061f25c429 100644
--- a/metadata/md5-cache/dev-python/click-7.1.2-r1
+++ b/metadata/md5-cache/dev-python/click-7.1.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/click/archive/7.1.2.tar.gz -> click-7.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8cd90c92145919aeccdf1093ed2cfcc5
diff --git a/metadata/md5-cache/dev-python/click-default-group-1.2.2 b/metadata/md5-cache/dev-python/click-default-group-1.2.2
index 9b92fd60341e..ccb884b19380 100644
--- a/metadata/md5-cache/dev-python/click-default-group-1.2.2
+++ b/metadata/md5-cache/dev-python/click-default-group-1.2.2
@@ -4,12 +4,12 @@ DESCRIPTION=Extends click. Group to invoke a command without explicit subcommand
 EAPI=7
 HOMEPAGE=https://github.com/click-contrib/click-default-group
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=dev-python/click[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/click-contrib/click-default-group/archive/v1.2.2.tar.gz -> click-default-group-1.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5d05a6f3f1e33fa826ef87ef5100c26a
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5ba826463e80f18bdd9ddad9ae48934b
diff --git a/metadata/md5-cache/dev-python/click-log-0.3.2 b/metadata/md5-cache/dev-python/click-log-0.3.2
index 5259e8af9180..0fd7cb953dff 100644
--- a/metadata/md5-cache/dev-python/click-log-0.3.2
+++ b/metadata/md5-cache/dev-python/click-log-0.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/click-log/click-log-0.3.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e6580bd4ff1d20da29e2d89cb57916f9
diff --git a/metadata/md5-cache/dev-python/click-plugins-1.0.3 b/metadata/md5-cache/dev-python/click-plugins-1.0.3
index 979b947cf2f5..ea6e357d5aaa 100644
--- a/metadata/md5-cache/dev-python/click-plugins-1.0.3
+++ b/metadata/md5-cache/dev-python/click-plugins-1.0.3
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/c/click-plugins/click-plugins-1.0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1c9c3063ba0e1de42c2533d6aa2b3387
diff --git a/metadata/md5-cache/dev-python/click-plugins-1.1.1 b/metadata/md5-cache/dev-python/click-plugins-1.1.1
index af9ce158524d..9e974dfec25f 100644
--- a/metadata/md5-cache/dev-python/click-plugins-1.1.1
+++ b/metadata/md5-cache/dev-python/click-plugins-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/click-plugins/click-plugins-1.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9b539287856703b78a24a95d5ad29ce0
diff --git a/metadata/md5-cache/dev-python/click-threading-0.4.4 b/metadata/md5-cache/dev-python/click-threading-0.4.4
index 551e6c9d4d5b..253d2e1819db 100644
--- a/metadata/md5-cache/dev-python/click-threading-0.4.4
+++ b/metadata/md5-cache/dev-python/click-threading-0.4.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/click-contrib/click-threading/archive/0.4.4.tar.gz -> click-threading-0.4.4-gh.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=065c276651de986463c1116227f59c05
diff --git a/metadata/md5-cache/dev-python/cliff-3.4.0 b/metadata/md5-cache/dev-python/cliff-3.4.0
index f1ba84644d6d..99788e36ae37 100644
--- a/metadata/md5-cache/dev-python/cliff-3.4.0
+++ b/metadata/md5-cache/dev-python/cliff-3.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cliff/cliff-3.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c3411b9c0061f87c40102fd5a44b8387
diff --git a/metadata/md5-cache/dev-python/cliff-3.5.0 b/metadata/md5-cache/dev-python/cliff-3.5.0
index 971dea8bf2f6..1c2fc49dce59 100644
--- a/metadata/md5-cache/dev-python/cliff-3.5.0
+++ b/metadata/md5-cache/dev-python/cliff-3.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cliff/cliff-3.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=795cef2850a41831961d3c2289b6cea0
diff --git a/metadata/md5-cache/dev-python/clint-0.5.1-r3 b/metadata/md5-cache/dev-python/clint-0.5.1-r3
index ae7543793608..be10c027c99a 100644
--- a/metadata/md5-cache/dev-python/clint-0.5.1-r3
+++ b/metadata/md5-cache/dev-python/clint-0.5.1-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kennethreitz/clint/archive/v0.5.1.tar.gz -> clint-0.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d1e9a3b4e516596cca3acf26aa9a130c
diff --git a/metadata/md5-cache/dev-python/cloudpickle-1.6.0 b/metadata/md5-cache/dev-python/cloudpickle-1.6.0
index 44634f3b2cdb..e009911f0a36 100644
--- a/metadata/md5-cache/dev-python/cloudpickle-1.6.0
+++ b/metadata/md5-cache/dev-python/cloudpickle-1.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cloudpickle/cloudpickle-1.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ba35f2077d7d52e2fbb6cb845c1497ba
diff --git a/metadata/md5-cache/dev-python/cmd2-1.3.11 b/metadata/md5-cache/dev-python/cmd2-1.3.11
index c4520cf01abc..4bb89f206e82 100644
--- a/metadata/md5-cache/dev-python/cmd2-1.3.11
+++ b/metadata/md5-cache/dev-python/cmd2-1.3.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cmd2/cmd2-1.3.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=c0b7041670cb7e0622cb91a2df288e6e
diff --git a/metadata/md5-cache/dev-python/cmd2-1.3.8 b/metadata/md5-cache/dev-python/cmd2-1.3.8
index cc3a9d2f1a12..83649d2e4d4d 100644
--- a/metadata/md5-cache/dev-python/cmd2-1.3.8
+++ b/metadata/md5-cache/dev-python/cmd2-1.3.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cmd2/cmd2-1.3.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=8389d388c547b117d854b3da5b38cbcd
diff --git a/metadata/md5-cache/dev-python/cmd2-1.4.0 b/metadata/md5-cache/dev-python/cmd2-1.4.0
index dc9cc23c9ca3..ebcae01585df 100644
--- a/metadata/md5-cache/dev-python/cmd2-1.4.0
+++ b/metadata/md5-cache/dev-python/cmd2-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cmd2/cmd2-1.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=5fc83463735def0bd303aa2ae30c7baf
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_md5_=cdeddf85feb28ac63ff7d94767567c59
diff --git a/metadata/md5-cache/dev-python/collective-checkdocs-0.2-r1 b/metadata/md5-cache/dev-python/collective-checkdocs-0.2-r1
index d728a5e0d4cd..39af501b0a30 100644
--- a/metadata/md5-cache/dev-python/collective-checkdocs-0.2-r1
+++ b/metadata/md5-cache/dev-python/collective-checkdocs-0.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/collective.checkdocs/collective.checkdocs-0.2.zip
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b46b75c11e7b5374d5e045c477b0cabf
diff --git a/metadata/md5-cache/dev-python/colorama-0.4.3-r1 b/metadata/md5-cache/dev-python/colorama-0.4.3-r1
index 739aee18ae1d..ac222d46ea85 100644
--- a/metadata/md5-cache/dev-python/colorama-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/colorama-0.4.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tartley/colorama/archive/0.4.3.tar.gz -> colorama-0.4.3.github.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8f297d95d851d3f5508559ebd4df2025
diff --git a/metadata/md5-cache/dev-python/colorama-0.4.4 b/metadata/md5-cache/dev-python/colorama-0.4.4
index 515ba5463992..4c0f8c022384 100644
--- a/metadata/md5-cache/dev-python/colorama-0.4.4
+++ b/metadata/md5-cache/dev-python/colorama-0.4.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tartley/colorama/archive/0.4.4.tar.gz -> colorama-0.4.4.github.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8f297d95d851d3f5508559ebd4df2025
diff --git a/metadata/md5-cache/dev-python/colorclass-2.2.0-r1 b/metadata/md5-cache/dev-python/colorclass-2.2.0-r1
index 9f1642a14488..55cd77f9437a 100644
--- a/metadata/md5-cache/dev-python/colorclass-2.2.0-r1
+++ b/metadata/md5-cache/dev-python/colorclass-2.2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Robpol86/colorclass/archive/v2.2.0.tar.gz -> colorclass-2.2.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a1ebbc37bd5ffeaaf3e8daefc480d64b
diff --git a/metadata/md5-cache/dev-python/coloredlogs-14.0 b/metadata/md5-cache/dev-python/coloredlogs-14.0
index 48ae084b5728..5b9917bcae4e 100644
--- a/metadata/md5-cache/dev-python/coloredlogs-14.0
+++ b/metadata/md5-cache/dev-python/coloredlogs-14.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/coloredlogs/coloredlogs-14.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ebb52edf7c57ade1c3675ad76e18f3e7
diff --git a/metadata/md5-cache/dev-python/colorlog-3.1.4 b/metadata/md5-cache/dev-python/colorlog-3.1.4
index 130239ebae72..59faee5dc2a7 100644
--- a/metadata/md5-cache/dev-python/colorlog-3.1.4
+++ b/metadata/md5-cache/dev-python/colorlog-3.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/colorlog/colorlog-3.1.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9899804f82aedd8b7e4cdae3fc947ff1
diff --git a/metadata/md5-cache/dev-python/colorspacious-1.1.2 b/metadata/md5-cache/dev-python/colorspacious-1.1.2
index 95534cfabac8..1f05c57b8e7c 100644
--- a/metadata/md5-cache/dev-python/colorspacious-1.1.2
+++ b/metadata/md5-cache/dev-python/colorspacious-1.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/colorspacious/colorspacious-1.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=84c34e9ff941f5ef747c7a7c13b10010
diff --git a/metadata/md5-cache/dev-python/commonmark-0.9.1 b/metadata/md5-cache/dev-python/commonmark-0.9.1
index 6ea9dd045f8a..b17398787eca 100644
--- a/metadata/md5-cache/dev-python/commonmark-0.9.1
+++ b/metadata/md5-cache/dev-python/commonmark-0.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/commonmark/commonmark-0.9.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9950d7fac892e9eec016d91b732018c4
diff --git a/metadata/md5-cache/dev-python/configargparse-1.2.3 b/metadata/md5-cache/dev-python/configargparse-1.2.3
index 2115480e2cd4..7c3b456363bc 100644
--- a/metadata/md5-cache/dev-python/configargparse-1.2.3
+++ b/metadata/md5-cache/dev-python/configargparse-1.2.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bw2/ConfigArgParse/archive/1.2.3.tar.gz -> ConfigArgParse-1.2.3.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a56d00af18e15fa26a6d48d104768949
diff --git a/metadata/md5-cache/dev-python/configclass-0.2.0 b/metadata/md5-cache/dev-python/configclass-0.2.0
index 517ed8ecaea1..874362c6407e 100644
--- a/metadata/md5-cache/dev-python/configclass-0.2.0
+++ b/metadata/md5-cache/dev-python/configclass-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/schettino72/configclass/archive/0.2.0.tar.gz -> configclass-0.2.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e45b950be0943ac579aa7dbf0b60504e
diff --git a/metadata/md5-cache/dev-python/configobj-5.0.6 b/metadata/md5-cache/dev-python/configobj-5.0.6
deleted file mode 100644
index cba5cb55fba6..000000000000
--- a/metadata/md5-cache/dev-python/configobj-5.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=Simple config file reader and writer
-EAPI=5
-HOMEPAGE=http://www.voidspace.org.uk/python/configobj.html https://pypi.org/project/configobj/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/c/configobj/configobj-5.0.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfd3ec4f12d802b41bb6711f219c1e72
diff --git a/metadata/md5-cache/dev-python/configobj-5.0.6-r1 b/metadata/md5-cache/dev-python/configobj-5.0.6-r1
index 2cb9d9ebebdf..c081cb8a721c 100644
--- a/metadata/md5-cache/dev-python/configobj-5.0.6-r1
+++ b/metadata/md5-cache/dev-python/configobj-5.0.6-r1
@@ -4,12 +4,12 @@ DESCRIPTION=Simple config file reader and writer
 EAPI=7
 HOMEPAGE=http://www.voidspace.org.uk/python/configobj.html https://pypi.org/project/configobj/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/DiffSK/configobj/archive/v5.0.6.tar.gz -> configobj-5.0.6.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bb8702bc1e06b276654b3cfcf1e61875
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=abe905e3b2078c76327b4f01cc9e3bec
diff --git a/metadata/md5-cache/dev-python/configshell-fb-1.1.28 b/metadata/md5-cache/dev-python/configshell-fb-1.1.28
index b5cb43d6d8a6..14934ec920a8 100644
--- a/metadata/md5-cache/dev-python/configshell-fb-1.1.28
+++ b/metadata/md5-cache/dev-python/configshell-fb-1.1.28
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyparsing[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/c/configshell-fb/configshell-fb-1.1.28.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=268542dea3bc3cf722bc53857bfc9a0d
diff --git a/metadata/md5-cache/dev-python/confuse-1.0.0 b/metadata/md5-cache/dev-python/confuse-1.0.0
index c3942dd3cae4..81c39e5341b0 100644
--- a/metadata/md5-cache/dev-python/confuse-1.0.0
+++ b/metadata/md5-cache/dev-python/confuse-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beetbox/confuse/archive/v1.0.0.tar.gz -> confuse-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1dd9a26f6d771464328c657e6bfbd19b
diff --git a/metadata/md5-cache/dev-python/confuse-1.4.0 b/metadata/md5-cache/dev-python/confuse-1.4.0
index 4e8f727b180b..aaee3f91372b 100644
--- a/metadata/md5-cache/dev-python/confuse-1.4.0
+++ b/metadata/md5-cache/dev-python/confuse-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beetbox/confuse/archive/v1.4.0.tar.gz -> confuse-1.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6c1357b5e5508d1c318a4620d2233229
diff --git a/metadata/md5-cache/dev-python/consonance-0.1.3-r1 b/metadata/md5-cache/dev-python/consonance-0.1.3-r1
index dd1d6ef9cc43..0d5a3abcf171 100644
--- a/metadata/md5-cache/dev-python/consonance-0.1.3-r1
+++ b/metadata/md5-cache/dev-python/consonance-0.1.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tgalal/consonance/archive/0.1.3.tar.gz -> consonance-0.1.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4546dd5b5a95e8211ac9cd206a7250ce
diff --git a/metadata/md5-cache/dev-python/constantly-15.1.0-r1 b/metadata/md5-cache/dev-python/constantly-15.1.0-r1
index 7c14cf7364be..9cd437c2fa12 100644
--- a/metadata/md5-cache/dev-python/constantly-15.1.0-r1
+++ b/metadata/md5-cache/dev-python/constantly-15.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/twisted/constantly/archive/15.1.0.tar.gz -> constantly-15.1.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=80bf96b699297ade48e27d5246a30954
diff --git a/metadata/md5-cache/dev-python/construct-2.10.56 b/metadata/md5-cache/dev-python/construct-2.10.56
index 0bf3d80eaa66..fe6e61b0f920 100644
--- a/metadata/md5-cache/dev-python/construct-2.10.56
+++ b/metadata/md5-cache/dev-python/construct-2.10.56
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/construct/construct/archive/v2.10.56.tar.gz -> construct-2.10.56.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=df0adb438898ad73ebc5fcaa3c115efc
diff --git a/metadata/md5-cache/dev-python/contextlib2-0.6.0_p1-r1 b/metadata/md5-cache/dev-python/contextlib2-0.6.0_p1-r1
index c4866632e5ef..5ede9a8f8e9e 100644
--- a/metadata/md5-cache/dev-python/contextlib2-0.6.0_p1-r1
+++ b/metadata/md5-cache/dev-python/contextlib2-0.6.0_p1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/contextlib2/contextlib2-0.6.0.post1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=317935a3fc105029254b3ad661ec5c80
diff --git a/metadata/md5-cache/dev-python/contextvars-2.4 b/metadata/md5-cache/dev-python/contextvars-2.4
index 29d0c63ce362..6bef7fee8f3b 100644
--- a/metadata/md5-cache/dev-python/contextvars-2.4
+++ b/metadata/md5-cache/dev-python/contextvars-2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/MagicStack/contextvars/archive/v2.4.tar.gz -> contextvars-2.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ed8b00c205c85f845938b41b13e8d60f
diff --git a/metadata/md5-cache/dev-python/cookies-2.2.1-r1 b/metadata/md5-cache/dev-python/cookies-2.2.1-r1
index 026e3b0ac388..8f82cb21946d 100644
--- a/metadata/md5-cache/dev-python/cookies-2.2.1-r1
+++ b/metadata/md5-cache/dev-python/cookies-2.2.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cookies/cookies-2.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=220a07f44c63d2152bee77319fc8f726
diff --git a/metadata/md5-cache/dev-python/coreapi-2.3.3-r1 b/metadata/md5-cache/dev-python/coreapi-2.3.3-r1
index 9b5c9dc94e97..a7d2ca52dda5 100644
--- a/metadata/md5-cache/dev-python/coreapi-2.3.3-r1
+++ b/metadata/md5-cache/dev-python/coreapi-2.3.3-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/coreschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/itypes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/uritemplate[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/coreschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/itypes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/uritemplate[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Python client library for Core API
 EAPI=7
 HOMEPAGE=https://github.com/core-api/python-client
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/coreschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/itypes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/uritemplate[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/coreschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/itypes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/uritemplate[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/c/coreapi/coreapi-2.3.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a0178d031de72b949cfb41e287e9aa14
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0da73ac67903b0ddf151e1d34003bfe8
diff --git a/metadata/md5-cache/dev-python/coreschema-0.0.4 b/metadata/md5-cache/dev-python/coreschema-0.0.4
index a6f2faf3b2a5..83c862deba6a 100644
--- a/metadata/md5-cache/dev-python/coreschema-0.0.4
+++ b/metadata/md5-cache/dev-python/coreschema-0.0.4
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Core Schema
 EAPI=7
 HOMEPAGE=https://github.com/core-api/python-coreschema
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/c/coreschema/coreschema-0.0.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5bf7b7c6e4b484429c2e482e3ba968f4
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=33728c227edee29c7f1df5f88a4ce0b6
diff --git a/metadata/md5-cache/dev-python/couchdb-python-1.1 b/metadata/md5-cache/dev-python/couchdb-python-1.1
index 020278222184..b94b3a3ca862 100644
--- a/metadata/md5-cache/dev-python/couchdb-python-1.1
+++ b/metadata/md5-cache/dev-python/couchdb-python-1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/CouchDB/CouchDB-1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=63252336ae9bbe80adad736f38b1320f
diff --git a/metadata/md5-cache/dev-python/cov-core-1.15.0-r2 b/metadata/md5-cache/dev-python/cov-core-1.15.0-r2
index 11fd3b22d3af..356d26370dbf 100644
--- a/metadata/md5-cache/dev-python/cov-core-1.15.0-r2
+++ b/metadata/md5-cache/dev-python/cov-core-1.15.0-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/coverage-3.6[python_targets_pypy3(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cov-core/cov-core-1.15.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=02035f85f47b396becf15676ce6ee1e7
diff --git a/metadata/md5-cache/dev-python/coverage-4.5.4 b/metadata/md5-cache/dev-python/coverage-4.5.4
index 558df2027698..964fe9d59940 100644
--- a/metadata/md5-cache/dev-python/coverage-4.5.4
+++ b/metadata/md5-cache/dev-python/coverage-4.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-4.5.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=858a838576efc6f2a8589365f7092e98
diff --git a/metadata/md5-cache/dev-python/coverage-5.3 b/metadata/md5-cache/dev-python/coverage-5.3
index 240cf60fd39c..66542e1e4742 100644
--- a/metadata/md5-cache/dev-python/coverage-5.3
+++ b/metadata/md5-cache/dev-python/coverage-5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-5.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a525dbfbd51b1470f0bfbd1a2fb4200b
diff --git a/metadata/md5-cache/dev-python/cppy-1.1.0 b/metadata/md5-cache/dev-python/cppy-1.1.0
index da1d68b0b23a..e2a6146dce8e 100644
--- a/metadata/md5-cache/dev-python/cppy-1.1.0
+++ b/metadata/md5-cache/dev-python/cppy-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cppy/cppy-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=73f8b5374d49931dad5078eea627275d
diff --git a/metadata/md5-cache/dev-python/crcmod-1.7-r4 b/metadata/md5-cache/dev-python/crcmod-1.7-r4
index 891f7e4ab6aa..895e82fa8d2d 100644
--- a/metadata/md5-cache/dev-python/crcmod-1.7-r4
+++ b/metadata/md5-cache/dev-python/crcmod-1.7-r4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://sourceforge/crcmod/crcmod-1.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f847f497b8fc279045db106c71d7f44
diff --git a/metadata/md5-cache/dev-python/croniter-0.3.30 b/metadata/md5-cache/dev-python/croniter-0.3.30
index cb0de01265c5..5757a2c86efa 100644
--- a/metadata/md5-cache/dev-python/croniter-0.3.30
+++ b/metadata/md5-cache/dev-python/croniter-0.3.30
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/croniter/croniter-0.3.30.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3eec38cc5188eb18745d1e41695c2815
diff --git a/metadata/md5-cache/dev-python/cryptography-3.2 b/metadata/md5-cache/dev-python/cryptography-3.2
index eb3be69e6b40..c7f75fa5454c 100644
--- a/metadata/md5-cache/dev-python/cryptography-3.2
+++ b/metadata/md5-cache/dev-python/cryptography-3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-3.2.tar.gz test? ( mirror://pypi/c/cryptography_vectors/cryptography_vectors-3.2.tar.gz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=190ec9c90a0f12a38665c165310c0649
diff --git a/metadata/md5-cache/dev-python/cryptography-3.2.1 b/metadata/md5-cache/dev-python/cryptography-3.2.1
index 2b0c3d63520f..f6ecd7cb4e90 100644
--- a/metadata/md5-cache/dev-python/cryptography-3.2.1
+++ b/metadata/md5-cache/dev-python/cryptography-3.2.1
@@ -5,12 +5,12 @@ DESCRIPTION=Library providing cryptographic recipes and primitives
 EAPI=7
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
 IUSE=libressl idna test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~x64-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 ~x64-solaris
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=>=dev-python/six-1.4.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] idna? ( >=dev-python/idna-2.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.8:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.8:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( >=dev-python/cffi-1.8:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( >=dev-python/cffi-1.8:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) !libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-3.2.1.tar.gz test? ( mirror://pypi/c/cryptography_vectors/cryptography_vectors-3.2.1.tar.gz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8c066c6a4d7028ddfdda080d2c8ba621
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e8691d7ab27a4de62184316ef4112f98
diff --git a/metadata/md5-cache/dev-python/css-parser-1.0.4-r1 b/metadata/md5-cache/dev-python/css-parser-1.0.4-r1
index 04656d75d599..b8386b3c411e 100644
--- a/metadata/md5-cache/dev-python/css-parser-1.0.4-r1
+++ b/metadata/md5-cache/dev-python/css-parser-1.0.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/css-parser/css-parser-1.0.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2c5a01e651e0dd9c21fd8c0040ebffad
diff --git a/metadata/md5-cache/dev-python/cssselect-1.1.0-r1 b/metadata/md5-cache/dev-python/cssselect-1.1.0-r1
index f518465e0cfb..7d051b4bfea0 100644
--- a/metadata/md5-cache/dev-python/cssselect-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/cssselect-1.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/scrapy/cssselect/archive/v1.1.0.tar.gz -> cssselect-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=948f25b2a7baac7aec36163eb1fc538b
diff --git a/metadata/md5-cache/dev-python/cssselect2-0.3.0 b/metadata/md5-cache/dev-python/cssselect2-0.3.0
index f4e8b0aa21c1..2090a9a282ef 100644
--- a/metadata/md5-cache/dev-python/cssselect2-0.3.0
+++ b/metadata/md5-cache/dev-python/cssselect2-0.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cssselect2/cssselect2-0.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=52f3907a0975cbea4a4936652cdf0eac
diff --git a/metadata/md5-cache/dev-python/cssselect2-0.4.1 b/metadata/md5-cache/dev-python/cssselect2-0.4.1
index ab5f9707e7a2..10775ff65686 100644
--- a/metadata/md5-cache/dev-python/cssselect2-0.4.1
+++ b/metadata/md5-cache/dev-python/cssselect2-0.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cssselect2/cssselect2-0.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d2be392465a157ee603fc0b7b89d6360
diff --git a/metadata/md5-cache/dev-python/cssutils-1.0.2-r2 b/metadata/md5-cache/dev-python/cssutils-1.0.2-r2
index 86e75016eda6..be145a72c017 100644
--- a/metadata/md5-cache/dev-python/cssutils-1.0.2-r2
+++ b/metadata/md5-cache/dev-python/cssutils-1.0.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cssutils/cssutils-1.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7466e38604e3cdfaf9963706ef9ccfd6
diff --git a/metadata/md5-cache/dev-python/csv23-0.3.2-r1 b/metadata/md5-cache/dev-python/csv23-0.3.2-r1
index 6a60576ada5a..5db27890f759 100644
--- a/metadata/md5-cache/dev-python/csv23-0.3.2-r1
+++ b/metadata/md5-cache/dev-python/csv23-0.3.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xflr6/csv23/archive/v0.3.2.tar.gz -> csv23-0.3.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bf21d8d38b1562799e34e992a8899ab2
diff --git a/metadata/md5-cache/dev-python/ctypescrypto-0.5 b/metadata/md5-cache/dev-python/ctypescrypto-0.5
index 45e64743dc4e..a89f09482c0c 100644
--- a/metadata/md5-cache/dev-python/ctypescrypto-0.5
+++ b/metadata/md5-cache/dev-python/ctypescrypto-0.5
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python interface to some openssl function based on ctypes module
 EAPI=7
 HOMEPAGE=https://github.com/vbwagner/ctypescrypto
-IUSE=gost test python_targets_python3_6 python_targets_python3_7
+IUSE=gost test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=gost? ( dev-libs/gost-engine:= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=test? ( gost ) || ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=gost? ( dev-libs/gost-engine:= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=test? ( gost ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vbwagner/ctypescrypto/archive/v0.5.tar.gz -> ctypescrypto-0.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0996ba717b95c15e77994965983535a2
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4edef51ff3af522d7c94183495369ca7
diff --git a/metadata/md5-cache/dev-python/ctypescrypto-9999 b/metadata/md5-cache/dev-python/ctypescrypto-9999
index cb981768f804..049a3f2aa5c3 100644
--- a/metadata/md5-cache/dev-python/ctypescrypto-9999
+++ b/metadata/md5-cache/dev-python/ctypescrypto-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-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
 DESCRIPTION=Python interface to some openssl function based on ctypes module
 EAPI=7
 HOMEPAGE=https://github.com/vbwagner/ctypescrypto
-IUSE=gost test python_targets_python3_6 python_targets_python3_7
+IUSE=gost test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=gost? ( dev-libs/gost-engine:= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=test? ( gost ) || ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=gost? ( dev-libs/gost-engine:= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=test? ( gost ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0996ba717b95c15e77994965983535a2
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4edef51ff3af522d7c94183495369ca7
diff --git a/metadata/md5-cache/dev-python/ctypesgen-1.0.2 b/metadata/md5-cache/dev-python/ctypesgen-1.0.2
index 7d22c9467016..e02e5a7b0acf 100644
--- a/metadata/md5-cache/dev-python/ctypesgen-1.0.2
+++ b/metadata/md5-cache/dev-python/ctypesgen-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/davidjamesca/ctypesgen/archive/ctypesgen-1.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e021eb38b27b0e4350e8960e97ccfd17
diff --git a/metadata/md5-cache/dev-python/cursive-0.2.2 b/metadata/md5-cache/dev-python/cursive-0.2.2
index 91d356b20bb6..e973d75e59a3 100644
--- a/metadata/md5-cache/dev-python/cursive-0.2.2
+++ b/metadata/md5-cache/dev-python/cursive-0.2.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cursive/cursive-0.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8bd00209f9130eff44abd684428ff3bd
diff --git a/metadata/md5-cache/dev-python/cursive-0.2.2-r1 b/metadata/md5-cache/dev-python/cursive-0.2.2-r1
index e0b3dead8cac..508300d64716 100644
--- a/metadata/md5-cache/dev-python/cursive-0.2.2-r1
+++ b/metadata/md5-cache/dev-python/cursive-0.2.2-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Cursive implements OpenStack-specific validation of digital signatur
 EAPI=7
 HOMEPAGE=https://github.com/openstack/cursive
 IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-1.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-1.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-1.14.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/castellan-0.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cursive/cursive-0.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a8e1883ec6f0a4bfa8f9774f7c827d86
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a72ed4de8c3e8634fa1e59ecf931d8df
diff --git a/metadata/md5-cache/dev-python/curtsies-0.3.0-r2 b/metadata/md5-cache/dev-python/curtsies-0.3.0-r2
index d7c643a9c30d..e82d011b7596 100644
--- a/metadata/md5-cache/dev-python/curtsies-0.3.0-r2
+++ b/metadata/md5-cache/dev-python/curtsies-0.3.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/curtsies/curtsies-0.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f2417f4db91d4d6d4b2598a0ca482721
diff --git a/metadata/md5-cache/dev-python/curtsies-0.3.4 b/metadata/md5-cache/dev-python/curtsies-0.3.4
new file mode 100644
index 000000000000..c2053b314142
--- /dev/null
+++ b/metadata/md5-cache/dev-python/curtsies-0.3.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/blessings-1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wcwidth-0.1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyte[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=Curses-like terminal wrapper, with colored strings
+EAPI=7
+HOMEPAGE=https://github.com/thomasballinger/curtsies
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/blessings-1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wcwidth-0.1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/curtsies/curtsies-0.3.4.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=375929588e054e342e234602fc733fda
diff --git a/metadata/md5-cache/dev-python/cvxopt-1.2.5-r1 b/metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
index 956e9f295c59..7d1d9128838e 100644
--- a/metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
+++ b/metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cvxopt/cvxopt/archive/1.2.5.tar.gz -> cvxopt-1.2.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=eb16fcc502cd8b1586788367b38d6235
diff --git a/metadata/md5-cache/dev-python/cx_Freeze-6.1 b/metadata/md5-cache/dev-python/cx_Freeze-6.1
index 1987a3155b7a..f7c83385a03d 100644
--- a/metadata/md5-cache/dev-python/cx_Freeze-6.1
+++ b/metadata/md5-cache/dev-python/cx_Freeze-6.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cx_Freeze/cx_Freeze-6.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79bfdd48292ba982043e1a8491d887bf
diff --git a/metadata/md5-cache/dev-python/cycler-0.10.0-r1 b/metadata/md5-cache/dev-python/cycler-0.10.0-r1
index f926e7a983b4..1ab2fcd5f3b2 100644
--- a/metadata/md5-cache/dev-python/cycler-0.10.0-r1
+++ b/metadata/md5-cache/dev-python/cycler-0.10.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/matplotlib/cycler/archive/v0.10.0.tar.gz -> cycler-0.10.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1742ae9c7e6ba28e3e04d2193636ef29
diff --git a/metadata/md5-cache/dev-python/cython-0.29.15 b/metadata/md5-cache/dev-python/cython-0.29.15
index 26507cf1c2ab..05b7c1c9cd18 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.15
+++ b/metadata/md5-cache/dev-python/cython-0.29.15
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cython/cython/archive/0.29.15.tar.gz -> cython-0.29.15.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fb8644e9cc458aa27584ac8029c03a2c
diff --git a/metadata/md5-cache/dev-python/cython-0.29.21 b/metadata/md5-cache/dev-python/cython-0.29.21
index 05918a05819e..06d45865b50d 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.21
+++ b/metadata/md5-cache/dev-python/cython-0.29.21
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cython/cython/archive/0.29.21.tar.gz -> cython-0.29.21.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a64c91de1c2cf27bb2a6bb36127d6c2b
diff --git a/metadata/md5-cache/dev-python/cython-0.29.21-r1 b/metadata/md5-cache/dev-python/cython-0.29.21-r1
index 6981d8d25b66..eb3999b95054 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.21-r1
+++ b/metadata/md5-cache/dev-python/cython-0.29.21-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cython/cython/archive/0.29.21.tar.gz -> cython-0.29.21.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5904c47bd5efb3ecf9be26effc194a46
diff --git a/metadata/md5-cache/dev-python/cytoolz-0.10.0 b/metadata/md5-cache/dev-python/cytoolz-0.10.0
index f6a016554621..2fa294118917 100644
--- a/metadata/md5-cache/dev-python/cytoolz-0.10.0
+++ b/metadata/md5-cache/dev-python/cytoolz-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cytoolz/cytoolz-0.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e4af7e59f0a4efb9904cf1ac3777711e
diff --git a/metadata/md5-cache/dev-python/daemonize-2.5.0 b/metadata/md5-cache/dev-python/daemonize-2.5.0
index 90cc55c7a111..942a4cea333b 100644
--- a/metadata/md5-cache/dev-python/daemonize-2.5.0
+++ b/metadata/md5-cache/dev-python/daemonize-2.5.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/thesharp/daemonize/archive/v2.5.0.tar.gz -> daemonize-2.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4e2807738b8ff844a288b5e52592634c
diff --git a/metadata/md5-cache/dev-python/dask-2.30.0 b/metadata/md5-cache/dev-python/dask-2.30.0
index 2e6cef758951..4ea856b82a07 100644
--- a/metadata/md5-cache/dev-python/dask-2.30.0
+++ b/metadata/md5-cache/dev-python/dask-2.30.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dask/dask-2.30.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=63b152d5c421c443000a51d277b9867d
diff --git a/metadata/md5-cache/dev-python/dataclasses-0.7 b/metadata/md5-cache/dev-python/dataclasses-0.7
index 8160188f2984..379f873aa2fe 100644
--- a/metadata/md5-cache/dev-python/dataclasses-0.7
+++ b/metadata/md5-cache/dev-python/dataclasses-0.7
@@ -4,11 +4,11 @@ DESCRIPTION=A backport of the dataclasses module for Python 3.6
 EAPI=7
 HOMEPAGE=https://pypi.org/project/dataclasses/ https://github.com/ericvsmith/dataclasses
 IUSE=python_targets_python3_6
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dataclasses/dataclasses-0.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=407cf96c2be976957a9b866ab929554b
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3d6127440c7edb8cdec6ee3df4fe43f0
diff --git a/metadata/md5-cache/dev-python/dbusmock-0.19 b/metadata/md5-cache/dev-python/dbusmock-0.19
index ebc753fcb438..5353a8a74d7c 100644
--- a/metadata/md5-cache/dev-python/dbusmock-0.19
+++ b/metadata/md5-cache/dev-python/dbusmock-0.19
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martinpitt/python-dbusmock/releases/download/0.19/python-dbusmock-0.19.tar.gz -> dbusmock-0.19.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=947fb751193520eeacf57a4f33730b8f
diff --git a/metadata/md5-cache/dev-python/dbutils-1.3 b/metadata/md5-cache/dev-python/dbutils-1.3
index 6923f3453119..9bf30189e071 100644
--- a/metadata/md5-cache/dev-python/dbutils-1.3
+++ b/metadata/md5-cache/dev-python/dbutils-1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dbutils/DBUtils-1.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c0825cfd6215b9ca8cc2d13632bbf569
diff --git a/metadata/md5-cache/dev-python/dbutils-2.0 b/metadata/md5-cache/dev-python/dbutils-2.0
index 9c6fb9570cf6..beee6faacd75 100644
--- a/metadata/md5-cache/dev-python/dbutils-2.0
+++ b/metadata/md5-cache/dev-python/dbutils-2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dbutils/DBUtils-2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f43dd9741938eefb0094a5d7e71faec2
diff --git a/metadata/md5-cache/dev-python/ddt-1.2.2 b/metadata/md5-cache/dev-python/ddt-1.2.2
index 1678f92989e3..48996acd705a 100644
--- a/metadata/md5-cache/dev-python/ddt-1.2.2
+++ b/metadata/md5-cache/dev-python/ddt-1.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/datadriventests/ddt/archive/1.2.2.tar.gz -> ddt-1.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d1572816b373e0c161a94ef302640517
diff --git a/metadata/md5-cache/dev-python/debtcollector-2.2.0 b/metadata/md5-cache/dev-python/debtcollector-2.2.0
index ead6e63cf005..23ac9c506737 100644
--- a/metadata/md5-cache/dev-python/debtcollector-2.2.0
+++ b/metadata/md5-cache/dev-python/debtcollector-2.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/debtcollector/debtcollector-2.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=61c9d8fdcf1881e5d2c416880db1b879
diff --git a/metadata/md5-cache/dev-python/decorator-4.4.2-r1 b/metadata/md5-cache/dev-python/decorator-4.4.2-r1
index 3d4cc5ad6c17..84883eaac75e 100644
--- a/metadata/md5-cache/dev-python/decorator-4.4.2-r1
+++ b/metadata/md5-cache/dev-python/decorator-4.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/decorator/decorator-4.4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=836bae18e703cafb931dc5d10232784e
diff --git a/metadata/md5-cache/dev-python/defcon-0.6.0-r1 b/metadata/md5-cache/dev-python/defcon-0.6.0-r1
index 0179d5bb92c8..d99b712e7b0e 100644
--- a/metadata/md5-cache/dev-python/defcon-0.6.0-r1
+++ b/metadata/md5-cache/dev-python/defcon-0.6.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/typesupply/defcon/archive/0.6.0.tar.gz -> defcon-0.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3742c4ea8593e424bdff3f16a4ff19fe
diff --git a/metadata/md5-cache/dev-python/defusedxml-0.7.0_rc1 b/metadata/md5-cache/dev-python/defusedxml-0.7.0_rc1
index ddcdaafa919c..b7fe88f36acf 100644
--- a/metadata/md5-cache/dev-python/defusedxml-0.7.0_rc1
+++ b/metadata/md5-cache/dev-python/defusedxml-0.7.0_rc1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_tar
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/tiran/defusedxml/archive/v0.7.0.rc1.tar.gz -> defusedxml-0.7.0.rc1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=47250f84763f405ae17f7b8a2c774530
diff --git a/metadata/md5-cache/dev-python/denonavr-0.9.5 b/metadata/md5-cache/dev-python/denonavr-0.9.5
index cb69a045054d..8267091fc5fb 100644
--- a/metadata/md5-cache/dev-python/denonavr-0.9.5
+++ b/metadata/md5-cache/dev-python/denonavr-0.9.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/denonavr/denonavr-0.9.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=91aac56772362ea51b74bd6962b4847d
diff --git a/metadata/md5-cache/dev-python/denonavr-0.9.7 b/metadata/md5-cache/dev-python/denonavr-0.9.7
index 86c282430baa..531c2f1c1ae7 100644
--- a/metadata/md5-cache/dev-python/denonavr-0.9.7
+++ b/metadata/md5-cache/dev-python/denonavr-0.9.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/denonavr/denonavr-0.9.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f7c368e56b3fb14fcf1a2ecbda92a511
diff --git a/metadata/md5-cache/dev-python/deprecated-1.2.10 b/metadata/md5-cache/dev-python/deprecated-1.2.10
index a2a6d2d9bf00..4979365a645f 100644
--- a/metadata/md5-cache/dev-python/deprecated-1.2.10
+++ b/metadata/md5-cache/dev-python/deprecated-1.2.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tantale/deprecated/archive/v1.2.10.tar.gz -> deprecated-1.2.10.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=45ca3ee984b6154ec3be0fdd3081ecf9
diff --git a/metadata/md5-cache/dev-python/deprecation-2.1.0 b/metadata/md5-cache/dev-python/deprecation-2.1.0
index b9f92a2cd995..e96dfabde78c 100644
--- a/metadata/md5-cache/dev-python/deprecation-2.1.0
+++ b/metadata/md5-cache/dev-python/deprecation-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/deprecation/deprecation-2.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=38db7e9679fa26107f1bdfaf8a27a66b
diff --git a/metadata/md5-cache/dev-python/dicttoxml-1.7.4-r1 b/metadata/md5-cache/dev-python/dicttoxml-1.7.4-r1
index f82b1e3ba3e9..d2660de0611b 100644
--- a/metadata/md5-cache/dev-python/dicttoxml-1.7.4-r1
+++ b/metadata/md5-cache/dev-python/dicttoxml-1.7.4-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dicttoxml/dicttoxml-1.7.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e4be315b8d698edca355274766420085
diff --git a/metadata/md5-cache/dev-python/diff-cover-2.3.0 b/metadata/md5-cache/dev-python/diff-cover-2.3.0
index 66061c23526b..153ae707b020 100644
--- a/metadata/md5-cache/dev-python/diff-cover-2.3.0
+++ b/metadata/md5-cache/dev-python/diff-cover-2.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Bachmann1234/diff-cover/archive/v2.3.0.tar.gz -> diff-cover-2.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3daa67a84b7c5f16a084d4ee99ccad01
diff --git a/metadata/md5-cache/dev-python/diff-match-patch-20181111 b/metadata/md5-cache/dev-python/diff-match-patch-20181111
index e27acf3c4a43..0d2cdfb88e37 100644
--- a/metadata/md5-cache/dev-python/diff-match-patch-20181111
+++ b/metadata/md5-cache/dev-python/diff-match-patch-20181111
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/diff-match-patch/diff-match-patch-20181111.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=23e30b9b9c2fa44aeb36c27be3142376
diff --git a/metadata/md5-cache/dev-python/diff-match-patch-20200713 b/metadata/md5-cache/dev-python/diff-match-patch-20200713
index 61fe22bdafe1..47984e746c1f 100644
--- a/metadata/md5-cache/dev-python/diff-match-patch-20200713
+++ b/metadata/md5-cache/dev-python/diff-match-patch-20200713
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/diff-match-patch/diff-match-patch-20200713.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5b6592ce3d161973ae69472e8aa467af
diff --git a/metadata/md5-cache/dev-python/dill-0.3.2 b/metadata/md5-cache/dev-python/dill-0.3.2
index ea3aeca69b9f..23756f3f325c 100644
--- a/metadata/md5-cache/dev-python/dill-0.3.2
+++ b/metadata/md5-cache/dev-python/dill-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/uqfoundation/dill/archive/dill-0.3.2.tar.gz -> dill-0.3.2.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d089de3bdc29635e4b58be48600d82be
diff --git a/metadata/md5-cache/dev-python/dill-0.3.3 b/metadata/md5-cache/dev-python/dill-0.3.3
index 082db8178506..02868c8d15fa 100644
--- a/metadata/md5-cache/dev-python/dill-0.3.3
+++ b/metadata/md5-cache/dev-python/dill-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/uqfoundation/dill/archive/dill-0.3.3.tar.gz -> dill-0.3.3.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8e2caf75028547dd3eea8002e56c1f71
diff --git a/metadata/md5-cache/dev-python/discogs-client-2.2.2 b/metadata/md5-cache/dev-python/discogs-client-2.2.2
index b9c768dd166f..da3342ba2203 100644
--- a/metadata/md5-cache/dev-python/discogs-client-2.2.2
+++ b/metadata/md5-cache/dev-python/discogs-client-2.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/discogs-client/discogs-client-2.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=528e146f500db21d4d8e2c303b83cdbb
diff --git a/metadata/md5-cache/dev-python/diskcache-5.0.3 b/metadata/md5-cache/dev-python/diskcache-5.0.3
index 5cfb1b9c6795..3249dade69e7 100644
--- a/metadata/md5-cache/dev-python/diskcache-5.0.3
+++ b/metadata/md5-cache/dev-python/diskcache-5.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grantjenks/python-diskcache/archive/v5.0.3.tar.gz -> diskcache-5.0.3.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3083792104230e789237b919a0380597
diff --git a/metadata/md5-cache/dev-python/diskcache-5.1.0 b/metadata/md5-cache/dev-python/diskcache-5.1.0
index 4be5a0d93d8d..e5e87a3a4419 100644
--- a/metadata/md5-cache/dev-python/diskcache-5.1.0
+++ b/metadata/md5-cache/dev-python/diskcache-5.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grantjenks/python-diskcache/archive/v5.1.0.tar.gz -> diskcache-5.1.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3083792104230e789237b919a0380597
diff --git a/metadata/md5-cache/dev-python/dissononce-0.34.3-r1 b/metadata/md5-cache/dev-python/dissononce-0.34.3-r1
index 7893ad1cb787..9c093c76909e 100644
--- a/metadata/md5-cache/dev-python/dissononce-0.34.3-r1
+++ b/metadata/md5-cache/dev-python/dissononce-0.34.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tgalal/dissononce/archive/0.34.3.tar.gz -> dissononce-0.34.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a8a9a92a4a1e82263b029a09b1d546b6
diff --git a/metadata/md5-cache/dev-python/distlib-0.3.1-r1 b/metadata/md5-cache/dev-python/distlib-0.3.1-r1
index b5c21251eef8..f0355acdef86 100644
--- a/metadata/md5-cache/dev-python/distlib-0.3.1-r1
+++ b/metadata/md5-cache/dev-python/distlib-0.3.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://bitbucket.org/pypa/distlib/get/0.3.1.tar.bz2 -> distlib-0.3.1.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=5b89c2eafa1d7181f437071dcec0c2ec
diff --git a/metadata/md5-cache/dev-python/distro-1.5.0-r1 b/metadata/md5-cache/dev-python/distro-1.5.0-r1
index e877e6e9e788..80572e2237e1 100644
--- a/metadata/md5-cache/dev-python/distro-1.5.0-r1
+++ b/metadata/md5-cache/dev-python/distro-1.5.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/distro/distro-1.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=be2054751b666372a59b876bd5ccefac
diff --git a/metadata/md5-cache/dev-python/dj-database-url-0.5.0 b/metadata/md5-cache/dev-python/dj-database-url-0.5.0
index 7fb99874797c..61b547f9ddec 100644
--- a/metadata/md5-cache/dev-python/dj-database-url-0.5.0
+++ b/metadata/md5-cache/dev-python/dj-database-url-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/jacobian/dj-database-url/archive/v0.5.0.tar.gz -> dj-database-url-0.5.0.gh.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=73f5775a49fd0a9f117af5608c06577b
diff --git a/metadata/md5-cache/dev-python/django-2.2.16 b/metadata/md5-cache/dev-python/django-2.2.16
index f996d6a217d7..7d47e1ab0913 100644
--- a/metadata/md5-cache/dev-python/django-2.2.16
+++ b/metadata/md5-cache/dev-python/django-2.2.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/2.2/Django-2.2.16.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cd6d1cd5561ec334b410c41a81710162
diff --git a/metadata/md5-cache/dev-python/django-2.2.17 b/metadata/md5-cache/dev-python/django-2.2.17
index afd33c8053f2..464c6b0cafbd 100644
--- a/metadata/md5-cache/dev-python/django-2.2.17
+++ b/metadata/md5-cache/dev-python/django-2.2.17
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/2.2/Django-2.2.17.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-2.2.17.checksum.txt )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=89aba8c058c9a014ea273cd23e0b1b09
diff --git a/metadata/md5-cache/dev-python/django-3.0.10-r1 b/metadata/md5-cache/dev-python/django-3.0.10-r1
index a57c7b4703c6..52c4f001990c 100644
--- a/metadata/md5-cache/dev-python/django-3.0.10-r1
+++ b/metadata/md5-cache/dev-python/django-3.0.10-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/3.0/Django-3.0.10.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=499bd32ebf7ab3adc31332f7f339d790
diff --git a/metadata/md5-cache/dev-python/django-3.0.11 b/metadata/md5-cache/dev-python/django-3.0.11
index 9978c9025988..96757a6edd23 100644
--- a/metadata/md5-cache/dev-python/django-3.0.11
+++ b/metadata/md5-cache/dev-python/django-3.0.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/3.0/Django-3.0.11.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.0.11.checksum.txt )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=6029c9fdd373f03308249fbb9929a262
diff --git a/metadata/md5-cache/dev-python/django-3.1.1-r1 b/metadata/md5-cache/dev-python/django-3.1.1-r1
index 834f8db2dc68..3f1abf6c4982 100644
--- a/metadata/md5-cache/dev-python/django-3.1.1-r1
+++ b/metadata/md5-cache/dev-python/django-3.1.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/3.1/Django-3.1.1.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=748d7b9ff25c8d7ec1badbf7f8543a9a
diff --git a/metadata/md5-cache/dev-python/django-3.1.2-r1 b/metadata/md5-cache/dev-python/django-3.1.2-r1
index 3e37945258a5..2b2bcc16906b 100644
--- a/metadata/md5-cache/dev-python/django-3.1.2-r1
+++ b/metadata/md5-cache/dev-python/django-3.1.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/3.1/Django-3.1.2.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4c630f804508e8080d2d6fccf539cf70
diff --git a/metadata/md5-cache/dev-python/django-3.1.3 b/metadata/md5-cache/dev-python/django-3.1.3
index 8f583c72e6f3..7436936e22ae 100644
--- a/metadata/md5-cache/dev-python/django-3.1.3
+++ b/metadata/md5-cache/dev-python/django-3.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/3.1/Django-3.1.3.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.1.3.checksum.txt )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=b65097ef87eaa7f88938f34b2d416092
diff --git a/metadata/md5-cache/dev-python/django-3.1.4 b/metadata/md5-cache/dev-python/django-3.1.4
new file mode 100644
index 000000000000..57cd239a3478
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-3.1.4
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/asgiref[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlparse-0.2.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[webp,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/selenium[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/tblib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/gettext ) verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 ) doc? ( dev-python/sphinx ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DESCRIPTION=High-level Python web framework
+EAPI=7
+HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
+IUSE=doc sqlite test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=dev-python/asgiref[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlparse-0.2.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://media.djangoproject.com/releases/3.1/Django-3.1.4.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.1.4.checksum.txt )
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_md5_=ae1b1d5c7ea489d032f760e501766068
diff --git a/metadata/md5-cache/dev-python/django-allauth-0.42.0 b/metadata/md5-cache/dev-python/django-allauth-0.42.0
index 797401248e15..20b6a8afe7a7 100644
--- a/metadata/md5-cache/dev-python/django-allauth-0.42.0
+++ b/metadata/md5-cache/dev-python/django-allauth-0.42.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/django[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-allauth/django-allauth-0.42.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d148ddf38a09d59b7497b5f06789533b
diff --git a/metadata/md5-cache/dev-python/django-appconf-1.0.4 b/metadata/md5-cache/dev-python/django-appconf-1.0.4
index e1191cd5174a..083858ea4bb2 100644
--- a/metadata/md5-cache/dev-python/django-appconf-1.0.4
+++ b/metadata/md5-cache/dev-python/django-appconf-1.0.4
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-appconf/django-appconf-1.0.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b081d450666c2bc4e4bb8c76cf61983e
diff --git a/metadata/md5-cache/dev-python/django-auth-ldap-2.1.0 b/metadata/md5-cache/dev-python/django-auth-ldap-2.1.0
index 18d29e67db9c..461a8717ba33 100644
--- a/metadata/md5-cache/dev-python/django-auth-ldap-2.1.0
+++ b/metadata/md5-cache/dev-python/django-auth-ldap-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-auth-ldap/django-auth-ldap-2.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e56c7e68e37be5c82f451c9ef218e2dd
diff --git a/metadata/md5-cache/dev-python/django-cacheops-4.2 b/metadata/md5-cache/dev-python/django-cacheops-4.2
index 8121a45f2346..f6f7fffe04d8 100644
--- a/metadata/md5-cache/dev-python/django-cacheops-4.2
+++ b/metadata/md5-cache/dev-python/django-cacheops-4.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.8[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-cacheops/django-cacheops-4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=827a21fd098f6002f3dd9a6ff2a1d5ba
diff --git a/metadata/md5-cache/dev-python/django-compressor-2.4 b/metadata/md5-cache/dev-python/django-compressor-2.4
index cdea2185a417..d22b740a5795 100644
--- a/metadata/md5-cache/dev-python/django-compressor-2.4
+++ b/metadata/md5-cache/dev-python/django-compressor-2.4
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django_compressor/django_compressor-2.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=83db2bcc3e01422c059f33a28c9390a7
diff --git a/metadata/md5-cache/dev-python/django-cors-headers-3.2.1 b/metadata/md5-cache/dev-python/django-cors-headers-3.2.1
index 7d15bd855565..a47a21994166 100644
--- a/metadata/md5-cache/dev-python/django-cors-headers-3.2.1
+++ b/metadata/md5-cache/dev-python/django-cors-headers-3.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-cors-headers/django-cors-headers-3.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fe61d64a30c71b2934f0763a0b715925
diff --git a/metadata/md5-cache/dev-python/django-debug-toolbar-3.1 b/metadata/md5-cache/dev-python/django-debug-toolbar-3.1
index 5f6a1d3be5b3..84fc6891621a 100644
--- a/metadata/md5-cache/dev-python/django-debug-toolbar-3.1
+++ b/metadata/md5-cache/dev-python/django-debug-toolbar-3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/django-debug-toolbar/django-debug-toolbar/archive/3.1.tar.gz -> django-debug-toolbar-3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=de444ae24fe438db75117b53b2cd2180
diff --git a/metadata/md5-cache/dev-python/django-extensions-3.0.9 b/metadata/md5-cache/dev-python/django-extensions-3.0.9
index 7c1b7280878f..4911144ea91d 100644
--- a/metadata/md5-cache/dev-python/django-extensions-3.0.9
+++ b/metadata/md5-cache/dev-python/django-extensions-3.0.9
@@ -11,5 +11,5 @@ RDEPEND=dev-python/django[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-extensions/django-extensions-3.0.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=33ffe0d5a1774d12fc340528b451866d
diff --git a/metadata/md5-cache/dev-python/django-filter-2.2.0 b/metadata/md5-cache/dev-python/django-filter-2.2.0
index 0c9876cabaa9..cb74f5a32d00 100644
--- a/metadata/md5-cache/dev-python/django-filter-2.2.0
+++ b/metadata/md5-cache/dev-python/django-filter-2.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-filter/django-filter-2.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=69b527c18b0ad26202109e8f2778149d
diff --git a/metadata/md5-cache/dev-python/django-gravatar2-1.4.4 b/metadata/md5-cache/dev-python/django-gravatar2-1.4.4
index 76b5740355cd..cc5afaed6cbf 100644
--- a/metadata/md5-cache/dev-python/django-gravatar2-1.4.4
+++ b/metadata/md5-cache/dev-python/django-gravatar2-1.4.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/django[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-gravatar2/django-gravatar2-1.4.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0d534a17b4aed5ca55725002d5dda20c
diff --git a/metadata/md5-cache/dev-python/django-haystack-3.0 b/metadata/md5-cache/dev-python/django-haystack-3.0
index 661add3ae259..035eef32b9c1 100644
--- a/metadata/md5-cache/dev-python/django-haystack-3.0
+++ b/metadata/md5-cache/dev-python/django-haystack-3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/django-haystack/django-haystack-3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9e3064cc2b3106e39e3241c201971b75
diff --git a/metadata/md5-cache/dev-python/django-js-asset-1.2.2 b/metadata/md5-cache/dev-python/django-js-asset-1.2.2
index 50032496bacd..171babd4fcc6 100644
--- a/metadata/md5-cache/dev-python/django-js-asset-1.2.2
+++ b/metadata/md5-cache/dev-python/django-js-asset-1.2.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.17[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-js-asset/django-js-asset-1.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d286127112f583225cb37d9fca8c5141
diff --git a/metadata/md5-cache/dev-python/django-mptt-0.11.0 b/metadata/md5-cache/dev-python/django-mptt-0.11.0
index 94fe78ac3a07..ef0776f9ae7d 100644
--- a/metadata/md5-cache/dev-python/django-mptt-0.11.0
+++ b/metadata/md5-cache/dev-python/django-mptt-0.11.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-mptt/django-mptt-0.11.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=62833edeb8c7b52a0a62a52d670ee0ad
diff --git a/metadata/md5-cache/dev-python/django-otp-1.0.2 b/metadata/md5-cache/dev-python/django-otp-1.0.2
index a712058c0b31..75ffa06611e5 100644
--- a/metadata/md5-cache/dev-python/django-otp-1.0.2
+++ b/metadata/md5-cache/dev-python/django-otp-1.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/django-otp/django-otp/archive/v1.0.2.tar.gz -> django-otp-1.0.2.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=60621c036379cb9bd360f7d991a1dac1
diff --git a/metadata/md5-cache/dev-python/django-pglocks-1.0.4 b/metadata/md5-cache/dev-python/django-pglocks-1.0.4
index dbaf54cbdc6f..5103d51bc845 100644
--- a/metadata/md5-cache/dev-python/django-pglocks-1.0.4
+++ b/metadata/md5-cache/dev-python/django-pglocks-1.0.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/six-1.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-pglocks/django-pglocks-1.0.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=35cb4b8258c7788f8563be8da7f3f071
diff --git a/metadata/md5-cache/dev-python/django-picklefield-3.0.1 b/metadata/md5-cache/dev-python/django-picklefield-3.0.1
index f98442b60edc..c850fe091a3d 100644
--- a/metadata/md5-cache/dev-python/django-picklefield-3.0.1
+++ b/metadata/md5-cache/dev-python/django-picklefield-3.0.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-picklefield/django-picklefield-3.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=847c86087af9d5f7197acb184fa4a1d0
diff --git a/metadata/md5-cache/dev-python/django-prometheus-2.0.0 b/metadata/md5-cache/dev-python/django-prometheus-2.0.0
index c8089397c74f..e11a099446fd 100644
--- a/metadata/md5-cache/dev-python/django-prometheus-2.0.0
+++ b/metadata/md5-cache/dev-python/django-prometheus-2.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/prometheus_client-0.7[python_targets_python3_6(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-prometheus/django-prometheus-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=df343835b11feccd6d48cb2defd92710
diff --git a/metadata/md5-cache/dev-python/django-q-1.3.3 b/metadata/md5-cache/dev-python/django-q-1.3.3
index 160ddc9acd55..8f37417aebe0 100644
--- a/metadata/md5-cache/dev-python/django-q-1.3.3
+++ b/metadata/md5-cache/dev-python/django-q-1.3.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/django[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-q/django-q-1.3.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5305fefb4f9cd9726f75e0b6a4153cd3
diff --git a/metadata/md5-cache/dev-python/django-redis-4.10.0 b/metadata/md5-cache/dev-python/django-redis-4.10.0
index 894a89ffe935..b1b936f817d2 100644
--- a/metadata/md5-cache/dev-python/django-redis-4.10.0
+++ b/metadata/md5-cache/dev-python/django-redis-4.10.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-redis/django-redis-4.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6c6ea3bfed79e91487ae32024a6f3869
diff --git a/metadata/md5-cache/dev-python/django-rq-2.3.2 b/metadata/md5-cache/dev-python/django-rq-2.3.2
index 76822fe8a6b5..22a68b39d107 100644
--- a/metadata/md5-cache/dev-python/django-rq-2.3.2
+++ b/metadata/md5-cache/dev-python/django-rq-2.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/django-2.0[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-rq/django-rq-2.3.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=89c06dac612486ca16b4981007c317de
diff --git a/metadata/md5-cache/dev-python/django-sortedm2m-3.0.2 b/metadata/md5-cache/dev-python/django-sortedm2m-3.0.2
index 20eb80db1ea7..fe74829751c5 100644
--- a/metadata/md5-cache/dev-python/django-sortedm2m-3.0.2
+++ b/metadata/md5-cache/dev-python/django-sortedm2m-3.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jazzband/django-sortedm2m/archive/3.0.2.tar.gz -> django-sortedm2m-3.0.2.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=33fb8f58f3c1946a3590b6b4fb28bbe8
diff --git a/metadata/md5-cache/dev-python/django-tables2-2.2.1 b/metadata/md5-cache/dev-python/django-tables2-2.2.1
index 90462de3831a..543017fd7aec 100644
--- a/metadata/md5-cache/dev-python/django-tables2-2.2.1
+++ b/metadata/md5-cache/dev-python/django-tables2-2.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11 python_targets_python3_6? ( dev-lang/python:3.6
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-tables2/django-tables2-2.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=495e52891d8394b5a6fcf4722880bf12
diff --git a/metadata/md5-cache/dev-python/django-tagging-0.5.0 b/metadata/md5-cache/dev-python/django-tagging-0.5.0
index 39cc0b41a239..3faf32cd88a0 100644
--- a/metadata/md5-cache/dev-python/django-tagging-0.5.0
+++ b/metadata/md5-cache/dev-python/django-tagging-0.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-tagging/django-tagging-0.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7b5bcd0f19b6defb09ca75a454611974
diff --git a/metadata/md5-cache/dev-python/django-taggit-1.2.0 b/metadata/md5-cache/dev-python/django-taggit-1.2.0
index 5b5555f1c236..e0965ec6f89f 100644
--- a/metadata/md5-cache/dev-python/django-taggit-1.2.0
+++ b/metadata/md5-cache/dev-python/django-taggit-1.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-taggit/django-taggit-1.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=124f12b4e9e2f1ea70b736dcac73aeea
diff --git a/metadata/md5-cache/dev-python/django-taggit-serializer-0.1.7 b/metadata/md5-cache/dev-python/django-taggit-serializer-0.1.7
index 5a823ea31b85..55d8924cfa5c 100644
--- a/metadata/md5-cache/dev-python/django-taggit-serializer-0.1.7
+++ b/metadata/md5-cache/dev-python/django-taggit-serializer-0.1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-taggit-serializer/django-taggit-serializer-0.1.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dca94a2e3e38ed5b348da6855d9cd5bb
diff --git a/metadata/md5-cache/dev-python/django-timezone-field-4.0 b/metadata/md5-cache/dev-python/django-timezone-field-4.0
index 39087838350b..4f6002bf9bff 100644
--- a/metadata/md5-cache/dev-python/django-timezone-field-4.0
+++ b/metadata/md5-cache/dev-python/django-timezone-field-4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-2.2[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-timezone-field/django-timezone-field-4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4e33ea4b57e2293fba6ef1987afc8629
diff --git a/metadata/md5-cache/dev-python/django_polymorphic-3.0.0 b/metadata/md5-cache/dev-python/django_polymorphic-3.0.0
index ca1b78cc4c01..3b1b3369d987 100644
--- a/metadata/md5-cache/dev-python/django_polymorphic-3.0.0
+++ b/metadata/md5-cache/dev-python/django_polymorphic-3.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/django-polymorphic/django-polymorphic/archive/3.0.0.tar.gz -> django_polymorphic-3.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=948bb1fe4dd231e2e81a91ec22198a9d
diff --git a/metadata/md5-cache/dev-python/djangorestframework-3.11.1 b/metadata/md5-cache/dev-python/djangorestframework-3.11.1
index 0fca6e5d9796..183b68528407 100644
--- a/metadata/md5-cache/dev-python/djangorestframework-3.11.1
+++ b/metadata/md5-cache/dev-python/djangorestframework-3.11.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/djangorestframework/djangorestframework-3.11.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d0e08ee187bfa117c909287560229354
diff --git a/metadata/md5-cache/dev-python/dkimpy-1.0.5 b/metadata/md5-cache/dev-python/dkimpy-1.0.5
index c39620f55b1e..6357b4b1db09 100644
--- a/metadata/md5-cache/dev-python/dkimpy-1.0.5
+++ b/metadata/md5-cache/dev-python/dkimpy-1.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dkimpy/dkimpy-1.0.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=47b6f54aaab81146da9505e782919050
diff --git a/metadata/md5-cache/dev-python/dns-lexicon-3.3.4 b/metadata/md5-cache/dev-python/dns-lexicon-3.3.4
index d6f31cc93294..c473b3a25fcb 100644
--- a/metadata/md5-cache/dev-python/dns-lexicon-3.3.4
+++ b/metadata/md5-cache/dev-python/dns-lexicon-3.3.4
@@ -1,14 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Manipulate DNS records on various DNS providers in a standardized/agnostic way
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pypi.org/project/dns-lexicon/
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/tldextract[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/tldextract[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dns-lexicon/dns-lexicon-3.3.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=14ae8b1938ce73cb8baa9289af36e6e7
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=140507c63b515be4a73a467bd22f06b4
diff --git a/metadata/md5-cache/dev-python/dnspython-1.16.0-r1 b/metadata/md5-cache/dev-python/dnspython-1.16.0-r1
index 1313694173f2..1b7d39eeffc1 100644
--- a/metadata/md5-cache/dev-python/dnspython-1.16.0-r1
+++ b/metadata/md5-cache/dev-python/dnspython-1.16.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycryptodome[python_targets_pypy3(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/rthalley/dnspython/archive/v1.16.0.tar.gz -> dnspython-1.16.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d2e9a22397b8afc5a97ec692d4ce221e
diff --git a/metadata/md5-cache/dev-python/dnspython-2.0.0 b/metadata/md5-cache/dev-python/dnspython-2.0.0
index f8bbcf542081..d86ad57c5b46 100644
--- a/metadata/md5-cache/dev-python/dnspython-2.0.0
+++ b/metadata/md5-cache/dev-python/dnspython-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rthalley/dnspython/archive/v2.0.0.tar.gz -> dnspython-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cd55efa79331afd260612b248f59ec60
diff --git a/metadata/md5-cache/dev-python/doc8-0.6.0 b/metadata/md5-cache/dev-python/doc8-0.6.0
index bf23c12eab65..f29946c637bc 100644
--- a/metadata/md5-cache/dev-python/doc8-0.6.0
+++ b/metadata/md5-cache/dev-python/doc8-0.6.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.6[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/doc8/doc8-0.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7756ae5de08820a5b796b847250a29aa
diff --git a/metadata/md5-cache/dev-python/docker-py-4.3.1 b/metadata/md5-cache/dev-python/docker-py-4.3.1
index 1ed91cf2a82f..3e412dd8f651 100644
--- a/metadata/md5-cache/dev-python/docker-py-4.3.1
+++ b/metadata/md5-cache/dev-python/docker-py-4.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/docker-py/archive/4.3.1.tar.gz -> docker-py-4.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=850ed5b19f8cc2fe9789650ed7298da1
diff --git a/metadata/md5-cache/dev-python/docker-py-4.4.0 b/metadata/md5-cache/dev-python/docker-py-4.4.0
index 5bda1fcedc8d..af6d9f6c36b8 100644
--- a/metadata/md5-cache/dev-python/docker-py-4.4.0
+++ b/metadata/md5-cache/dev-python/docker-py-4.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/docker-py/archive/4.4.0.tar.gz -> docker-py-4.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a1bccecac50cc35e3f7d6ef1769d4643
diff --git a/metadata/md5-cache/dev-python/docker-pycreds-0.4.0 b/metadata/md5-cache/dev-python/docker-pycreds-0.4.0
index fe4fc220f5c3..ecaabcb83125 100644
--- a/metadata/md5-cache/dev-python/docker-pycreds-0.4.0
+++ b/metadata/md5-cache/dev-python/docker-pycreds-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.4.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docker-pycreds/docker-pycreds-0.4.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a386a5e6a5f4ad49af29b82434db447a
diff --git a/metadata/md5-cache/dev-python/dockerpty-0.4.1-r1 b/metadata/md5-cache/dev-python/dockerpty-0.4.1-r1
index 6f07d527bccf..abefe7258e85 100644
--- a/metadata/md5-cache/dev-python/dockerpty-0.4.1-r1
+++ b/metadata/md5-cache/dev-python/dockerpty-0.4.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/d11wtq/dockerpty/archive/v0.4.1.tar.gz -> dockerpty-0.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2ec89e86e00fa89dedbbd854eba575e7
diff --git a/metadata/md5-cache/dev-python/docopt-0.6.2-r3 b/metadata/md5-cache/dev-python/docopt-0.6.2-r3
index 0f18f1525462..b7e37a1f8a4a 100644
--- a/metadata/md5-cache/dev-python/docopt-0.6.2-r3
+++ b/metadata/md5-cache/dev-python/docopt-0.6.2-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docopt/docopt/archive/0.6.2.tar.gz -> docopt-0.6.2.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=18fda3774ce60aedba4a374c139b2eee
diff --git a/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2 b/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
index 5b2a6da271c0..20591a224117 100644
--- a/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
+++ b/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=267be38fcb10f3335f46e9821980932c
diff --git a/metadata/md5-cache/dev-python/docutils-0.16-r1 b/metadata/md5-cache/dev-python/docutils-0.16-r1
index 10c54aa1d2df..37617d901eb1 100644
--- a/metadata/md5-cache/dev-python/docutils-0.16-r1
+++ b/metadata/md5-cache/dev-python/docutils-0.16-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docutils/docutils-0.16.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=37bc1cebd848bce100aa6ef5bbba3661
diff --git a/metadata/md5-cache/dev-python/docutils-glep-1.2 b/metadata/md5-cache/dev-python/docutils-glep-1.2
index fc710d82dc93..ffa2cfd34f3b 100644
--- a/metadata/md5-cache/dev-python/docutils-glep-1.2
+++ b/metadata/md5-cache/dev-python/docutils-glep-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/docutils-0.10[python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docutils_glep/docutils_glep-1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=08448aadad26ca3ef85029bd856e4c0b
diff --git a/metadata/md5-cache/dev-python/dogpile-cache-1.0.2 b/metadata/md5-cache/dev-python/dogpile-cache-1.0.2
index 3dfd48ce9de5..7959c496bdee 100644
--- a/metadata/md5-cache/dev-python/dogpile-cache-1.0.2
+++ b/metadata/md5-cache/dev-python/dogpile-cache-1.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dogpile.cache/dogpile.cache-1.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ad20bf6a4073b7a92f88ab4d7169557b
diff --git a/metadata/md5-cache/dev-python/dogpile-cache-1.1.0 b/metadata/md5-cache/dev-python/dogpile-cache-1.1.0
index 67cdea9e0616..40d205e99cd5 100644
--- a/metadata/md5-cache/dev-python/dogpile-cache-1.1.0
+++ b/metadata/md5-cache/dev-python/dogpile-cache-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dogpile.cache/dogpile.cache-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=05cc4b690f368b7d1fb602d19692c228
diff --git a/metadata/md5-cache/dev-python/dogpile-cache-1.1.1 b/metadata/md5-cache/dev-python/dogpile-cache-1.1.1
index cfe64bc71e84..df36186f6312 100644
--- a/metadata/md5-cache/dev-python/dogpile-cache-1.1.1
+++ b/metadata/md5-cache/dev-python/dogpile-cache-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dogpile.cache/dogpile.cache-1.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=05cc4b690f368b7d1fb602d19692c228
diff --git a/metadata/md5-cache/dev-python/doit-0.33.1 b/metadata/md5-cache/dev-python/doit-0.33.1
index 9981b2dc7bc0..755dc69641d5 100644
--- a/metadata/md5-cache/dev-python/doit-0.33.1
+++ b/metadata/md5-cache/dev-python/doit-0.33.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/doit/doit-0.33.1.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=42f0863bd3247027f884719ec70013cc
diff --git a/metadata/md5-cache/dev-python/doit-py-0.5.0 b/metadata/md5-cache/dev-python/doit-py-0.5.0
index 146e2e3f318c..846a1f00ee40 100644
--- a/metadata/md5-cache/dev-python/doit-py-0.5.0
+++ b/metadata/md5-cache/dev-python/doit-py-0.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pydoit/doit-py/archive/0.5.0.tar.gz -> doit-py-0.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fa90fa1f8f7430e8994fd2b2e4d09882
diff --git a/metadata/md5-cache/dev-python/dominate-2.6.0 b/metadata/md5-cache/dev-python/dominate-2.6.0
index 4c5d39b124fa..ca70d2848ec4 100644
--- a/metadata/md5-cache/dev-python/dominate-2.6.0
+++ b/metadata/md5-cache/dev-python/dominate-2.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dominate/dominate-2.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c92becd550cad41f71c1a5e162431389
diff --git a/metadata/md5-cache/dev-python/doublex-1.9.2 b/metadata/md5-cache/dev-python/doublex-1.9.2
index 541a1d9d2e6d..d059c1d0ca97 100644
--- a/metadata/md5-cache/dev-python/doublex-1.9.2
+++ b/metadata/md5-cache/dev-python/doublex-1.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/DavidVilla/python-doublex/get/v1.9.2.tar.gz -> doublex-1.9.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=57bb5c5181561beac28678037165a732
diff --git a/metadata/md5-cache/dev-python/doublex-expects-0.7.1 b/metadata/md5-cache/dev-python/doublex-expects-0.7.1
index 8ee9d8324903..4d4a40f69ba8 100644
--- a/metadata/md5-cache/dev-python/doublex-expects-0.7.1
+++ b/metadata/md5-cache/dev-python/doublex-expects-0.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jaimegildesagredo/doublex-expects/archive/v0.7.1.tar.gz -> doublex-expects-0.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5b6d901cbee9914acd7e9e5e46abb325
diff --git a/metadata/md5-cache/dev-python/drf-yasg-1.17.1 b/metadata/md5-cache/dev-python/drf-yasg-1.17.1
index 8477ee6280fe..f17ac0cdd139 100644
--- a/metadata/md5-cache/dev-python/drf-yasg-1.17.1
+++ b/metadata/md5-cache/dev-python/drf-yasg-1.17.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/coreapi-2.3.3[python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/drf-yasg/drf-yasg-1.17.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=36a63403cfe5ffe213b21f57bcf20032
diff --git a/metadata/md5-cache/dev-python/duecredit-0.7.0 b/metadata/md5-cache/dev-python/duecredit-0.7.0
index 4867fde527df..aaaf0aefd7dc 100644
--- a/metadata/md5-cache/dev-python/duecredit-0.7.0
+++ b/metadata/md5-cache/dev-python/duecredit-0.7.0
@@ -1,14 +1,14 @@
-BDEPEND=>=dev-python/citeproc-py-0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=>=dev-python/citeproc-py-0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Publications (and donations) tracer
 EAPI=7
 HOMEPAGE=https://github.com/duecredit/duecredit
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/citeproc-py-0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/citeproc-py-0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/d/duecredit/duecredit-0.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ec12dc1adeecd126905fd64aa3494148
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d4edfd2153d0fdf668825559aeb650bd
diff --git a/metadata/md5-cache/dev-python/dugong-3.7.3 b/metadata/md5-cache/dev-python/dugong-3.7.3
index 9b397eff8c5f..c29f43cfa7f1 100644
--- a/metadata/md5-cache/dev-python/dugong-3.7.3
+++ b/metadata/md5-cache/dev-python/dugong-3.7.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dugong/dugong-3.7.3.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=80b94365ef1333571f530459b41e6598
diff --git a/metadata/md5-cache/dev-python/dulwich-0.20.6 b/metadata/md5-cache/dev-python/dulwich-0.20.6
index c61b5f4b3294..105105fc9f07 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.20.6
+++ b/metadata/md5-cache/dev-python/dulwich-0.20.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.20.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9b067d28cb30bcfc5861b884377ab6d9
diff --git a/metadata/md5-cache/dev-python/easy-thumbnails-2.7 b/metadata/md5-cache/dev-python/easy-thumbnails-2.7
index 45b1551a6f3f..830025b3cdfc 100644
--- a/metadata/md5-cache/dev-python/easy-thumbnails-2.7
+++ b/metadata/md5-cache/dev-python/easy-thumbnails-2.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/easy-thumbnails/easy-thumbnails-2.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9a81f21ffa6a1e303cfa2a7aa738ab67
diff --git a/metadata/md5-cache/dev-python/easy-thumbnails-2.7.1 b/metadata/md5-cache/dev-python/easy-thumbnails-2.7.1
index c8d514b9c1c0..3f9263831a39 100644
--- a/metadata/md5-cache/dev-python/easy-thumbnails-2.7.1
+++ b/metadata/md5-cache/dev-python/easy-thumbnails-2.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/easy-thumbnails/easy-thumbnails-2.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c6485d1305e8099aafc52e55507f40a2
diff --git a/metadata/md5-cache/dev-python/easyprocess-0.3 b/metadata/md5-cache/dev-python/easyprocess-0.3
index 9851b0a8f016..072b6f042cf2 100644
--- a/metadata/md5-cache/dev-python/easyprocess-0.3
+++ b/metadata/md5-cache/dev-python/easyprocess-0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ponty/EasyProcess/archive/0.3.tar.gz -> easyprocess-0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c518db070327e3f09c6a8e3753d34163
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.16 b/metadata/md5-cache/dev-python/ebuildtester-0.1.16
index a7b91a12c592..809c218be985 100644
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.16
+++ b/metadata/md5-cache/dev-python/ebuildtester-0.1.16
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ebuildtester/ebuildtester-0.1.16.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bc55e743dfd7338dc5e2ee8be5942ca5
diff --git a/metadata/md5-cache/dev-python/ecdsa-0.14.1-r2 b/metadata/md5-cache/dev-python/ecdsa-0.14.1-r2
index a8ec71da7e49..58296dfc8f54 100644
--- a/metadata/md5-cache/dev-python/ecdsa-0.14.1-r2
+++ b/metadata/md5-cache/dev-python/ecdsa-0.14.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ecdsa/ecdsa-0.14.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=96bf6441615d1ad596a6860d3688687c
diff --git a/metadata/md5-cache/dev-python/ecdsa-0.15-r1 b/metadata/md5-cache/dev-python/ecdsa-0.15-r1
index 913529876f9e..7c254f48a597 100644
--- a/metadata/md5-cache/dev-python/ecdsa-0.15-r1
+++ b/metadata/md5-cache/dev-python/ecdsa-0.15-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ecdsa/ecdsa-0.15.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0b5fd2a74e469e4dca21461707ea77c6
diff --git a/metadata/md5-cache/dev-python/ecdsa-0.16.0-r1 b/metadata/md5-cache/dev-python/ecdsa-0.16.0-r1
index 48c62d3db6be..05ddf34356b0 100644
--- a/metadata/md5-cache/dev-python/ecdsa-0.16.0-r1
+++ b/metadata/md5-cache/dev-python/ecdsa-0.16.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ecdsa/ecdsa-0.16.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ec3f555784a5532693cc810703de2b1c
diff --git a/metadata/md5-cache/dev-python/ecdsa-0.16.1 b/metadata/md5-cache/dev-python/ecdsa-0.16.1
index 091a60368735..c7a3a88151c1 100644
--- a/metadata/md5-cache/dev-python/ecdsa-0.16.1
+++ b/metadata/md5-cache/dev-python/ecdsa-0.16.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ecdsa/ecdsa-0.16.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ec3f555784a5532693cc810703de2b1c
diff --git a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0 b/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
index 5d25e2eff594..02f73b0529d6 100644
--- a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
+++ b/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-core-py/archive/v0.12.0.tar.gz -> editorconfig-core-py-0.12.0.tar.gz test? ( https://github.com/editorconfig/editorconfig-core-test/archive/abb579e00f2deeede91cb485e53512efab9c6474.tar.gz -> editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8cf41a53d3e42ee3c864367d657cf637
diff --git a/metadata/md5-cache/dev-python/elasticsearch-curator-5.8.1-r1 b/metadata/md5-cache/dev-python/elasticsearch-curator-5.8.1-r1
index e27ff4a0a1c1..b3a9319b1c01 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-curator-5.8.1-r1
+++ b/metadata/md5-cache/dev-python/elasticsearch-curator-5.8.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/curator/archive/v5.8.1.tar.gz -> elasticsearch-curator-5.8.1.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.3.2-linux-x86_64.tar.gz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0021a3472fc444edac2007b98ae680c8
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-7.7.0 b/metadata/md5-cache/dev-python/elasticsearch-py-7.7.0
index 36a3e26c53fc..cb4a39a8cb44 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-py-7.7.0
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-7.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/7.7.0.tar.gz -> elasticsearch-py-7.7.0.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9d9a27dcbb6f24d978a37cedf6d670dd
diff --git a/metadata/md5-cache/dev-python/elementpath-2.0.3 b/metadata/md5-cache/dev-python/elementpath-2.0.3
index 580bcf09169d..4d07a23b2abf 100644
--- a/metadata/md5-cache/dev-python/elementpath-2.0.3
+++ b/metadata/md5-cache/dev-python/elementpath-2.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/elementpath/elementpath-2.0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6507f59ab10e5ba2c8b229ec4e01447b
diff --git a/metadata/md5-cache/dev-python/elementpath-2.0.4 b/metadata/md5-cache/dev-python/elementpath-2.0.4
index c7e555e8667f..74a43f8b793f 100644
--- a/metadata/md5-cache/dev-python/elementpath-2.0.4
+++ b/metadata/md5-cache/dev-python/elementpath-2.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/elementpath/elementpath-2.0.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=83602abc9c5d00a0602d36ff1beb3d62
diff --git a/metadata/md5-cache/dev-python/emcee-3.0.2 b/metadata/md5-cache/dev-python/emcee-3.0.2
index ead0b7eac556..59fca4027ee6 100644
--- a/metadata/md5-cache/dev-python/emcee-3.0.2
+++ b/metadata/md5-cache/dev-python/emcee-3.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/emcee/emcee-3.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8615c877fc8e4fbbae05febeeb28e8e5
diff --git a/metadata/md5-cache/dev-python/emoji-0.5.4 b/metadata/md5-cache/dev-python/emoji-0.5.4
index b22ec07282ed..c0a537ee115a 100644
--- a/metadata/md5-cache/dev-python/emoji-0.5.4
+++ b/metadata/md5-cache/dev-python/emoji-0.5.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/e/emoji/emoji-0.5.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8a8499bbb4c084a865780fb54ecf13f5
diff --git a/metadata/md5-cache/dev-python/empy-3.3.4 b/metadata/md5-cache/dev-python/empy-3.3.4
index 29508f001b47..f9d3dae05f99 100644
--- a/metadata/md5-cache/dev-python/empy-3.3.4
+++ b/metadata/md5-cache/dev-python/empy-3.3.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=http://www.alcyone.com/software/empy/empy-3.3.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=659eec68eefe8802002631bc1894b7d5
diff --git a/metadata/md5-cache/dev-python/entrypoint2-0.2.1 b/metadata/md5-cache/dev-python/entrypoint2-0.2.1
index a5a03ff39e1d..4ee38ef7859c 100644
--- a/metadata/md5-cache/dev-python/entrypoint2-0.2.1
+++ b/metadata/md5-cache/dev-python/entrypoint2-0.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ponty/entrypoint2/archive/0.2.1.tar.gz -> entrypoint2-0.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b6c33877f76ab012d34a65090f971ee5
diff --git a/metadata/md5-cache/dev-python/entrypoint2-0.2.3 b/metadata/md5-cache/dev-python/entrypoint2-0.2.3
index 6d85c92b83a3..7812b811fd6c 100644
--- a/metadata/md5-cache/dev-python/entrypoint2-0.2.3
+++ b/metadata/md5-cache/dev-python/entrypoint2-0.2.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ponty/entrypoint2/archive/0.2.3.tar.gz -> entrypoint2-0.2.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ebe7f69eecef30c50a6522267cbe4bb6
diff --git a/metadata/md5-cache/dev-python/entrypoints-0.3-r2 b/metadata/md5-cache/dev-python/entrypoints-0.3-r2
index f2dfd30df1f9..6a485edd2c65 100644
--- a/metadata/md5-cache/dev-python/entrypoints-0.3-r2
+++ b/metadata/md5-cache/dev-python/entrypoints-0.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/entrypoints/entrypoints-0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3e5cea0e878c084c64454eb70a4aeb29
diff --git a/metadata/md5-cache/dev-python/enzyme-0.4.1-r2 b/metadata/md5-cache/dev-python/enzyme-0.4.1-r2
index d7b60ec3a803..82c34f892980 100644
--- a/metadata/md5-cache/dev-python/enzyme-0.4.1-r2
+++ b/metadata/md5-cache/dev-python/enzyme-0.4.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/enzyme/enzyme-0.4.1.tar.gz test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0b203553a5c7814ad6cc3aa8db63c6cb
diff --git a/metadata/md5-cache/dev-python/enzyme-9999 b/metadata/md5-cache/dev-python/enzyme-9999
index dce79b91451a..9acd71fc5ed2 100644
--- a/metadata/md5-cache/dev-python/enzyme-9999
+++ b/metadata/md5-cache/dev-python/enzyme-9999
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d20120e06d28c706df975cebea40d30a
diff --git a/metadata/md5-cache/dev-python/eradicate-2.0.0 b/metadata/md5-cache/dev-python/eradicate-2.0.0
index 4ab0aa2125d2..bb476ca2c633 100644
--- a/metadata/md5-cache/dev-python/eradicate-2.0.0
+++ b/metadata/md5-cache/dev-python/eradicate-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/myint/eradicate/archive/v2.0.0.tar.gz -> eradicate-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a6adc0fa002f4ed2ff1c5de9bede8a55
diff --git a/metadata/md5-cache/dev-python/errorhandler-2.0.1 b/metadata/md5-cache/dev-python/errorhandler-2.0.1
index f0728e8f62b3..151aaaa45462 100644
--- a/metadata/md5-cache/dev-python/errorhandler-2.0.1
+++ b/metadata/md5-cache/dev-python/errorhandler-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/errorhandler/errorhandler-2.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f1cdae2b2a4caf9a16ab464bd3fc9394
diff --git a/metadata/md5-cache/dev-python/et_xmlfile-1.0.1 b/metadata/md5-cache/dev-python/et_xmlfile-1.0.1
index bb6e3e94724f..a9ab0d4a8bc7 100644
--- a/metadata/md5-cache/dev-python/et_xmlfile-1.0.1
+++ b/metadata/md5-cache/dev-python/et_xmlfile-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/et_xmlfile/et_xmlfile-1.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a5c673dd9af66e5083c7f0c52a2fe170
diff --git a/metadata/md5-cache/dev-python/eventlet-0.26.1 b/metadata/md5-cache/dev-python/eventlet-0.26.1
index 13f2cd3124f0..c6e10eca8d12 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.26.1
+++ b/metadata/md5-cache/dev-python/eventlet-0.26.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.26.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5289e9fec117611245bc48f02af62713
diff --git a/metadata/md5-cache/dev-python/exam-0.10.6 b/metadata/md5-cache/dev-python/exam-0.10.6
index e16923f6485c..155cfb3a4e30 100644
--- a/metadata/md5-cache/dev-python/exam-0.10.6
+++ b/metadata/md5-cache/dev-python/exam-0.10.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/exam/exam-0.10.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c2ccdf079b7ec042667dcb0e7b92d254
diff --git a/metadata/md5-cache/dev-python/exdown-0.7.0 b/metadata/md5-cache/dev-python/exdown-0.7.0
index cd9f7bd365c9..dbd8cb5ae46d 100644
--- a/metadata/md5-cache/dev-python/exdown-0.7.0
+++ b/metadata/md5-cache/dev-python/exdown-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nschloe/exdown/archive/v0.7.0.tar.gz -> exdown-0.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=96260646355b6808ed40a5527a887f4a
diff --git a/metadata/md5-cache/dev-python/execnet-1.7.1-r1 b/metadata/md5-cache/dev-python/execnet-1.7.1-r1
index 7e3fdf3642d5..b7d211db09cd 100644
--- a/metadata/md5-cache/dev-python/execnet-1.7.1-r1
+++ b/metadata/md5-cache/dev-python/execnet-1.7.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/execnet/execnet-1.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d8fe9610048a81ac32b45dcde400089b
diff --git a/metadata/md5-cache/dev-python/executing-0.5.3 b/metadata/md5-cache/dev-python/executing-0.5.3
index 446b2b9f25b6..3f94bf30e1d9 100644
--- a/metadata/md5-cache/dev-python/executing-0.5.3
+++ b/metadata/md5-cache/dev-python/executing-0.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alexmojaki/executing/archive/v0.5.3.tar.gz -> executing-0.5.3.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=05ef436ec1974b22e555edeac604f40a
diff --git a/metadata/md5-cache/dev-python/expects-0.9.0 b/metadata/md5-cache/dev-python/expects-0.9.0
index a14aee28aa8f..22b2b439e45a 100644
--- a/metadata/md5-cache/dev-python/expects-0.9.0
+++ b/metadata/md5-cache/dev-python/expects-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/expects/expects-0.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=05788efff46c5be3d5056bf7e414cd51
diff --git a/metadata/md5-cache/dev-python/extras-1.0.0-r1 b/metadata/md5-cache/dev-python/extras-1.0.0-r1
index dc388a3167a8..33e1459795a7 100644
--- a/metadata/md5-cache/dev-python/extras-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/extras-1.0.0-r1
@@ -4,12 +4,12 @@ DESCRIPTION=Useful extra bits for Python that should be in the standard library
 EAPI=7
 HOMEPAGE=https://github.com/testing-cabal/extras/ https://pypi.org/project/extras/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/extras/extras-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e73a7fb0cfa3d2c57a38735311adb75c
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e2b4477ac8e6fa69d93c6b74bef5983d
diff --git a/metadata/md5-cache/dev-python/eyeD3-0.8.11-r1 b/metadata/md5-cache/dev-python/eyeD3-0.8.11-r1
index 20eb9b858892..544b46f543c2 100644
--- a/metadata/md5-cache/dev-python/eyeD3-0.8.11-r1
+++ b/metadata/md5-cache/dev-python/eyeD3-0.8.11-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-magic[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0.7
 SRC_URI=https://github.com/nicfit/eyeD3/archive/v0.8.11.tar.gz -> eyeD3-0.8.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=20b1c7a37ceacfa95e7571baa63b770f
diff --git a/metadata/md5-cache/dev-python/eyeD3-0.9.5 b/metadata/md5-cache/dev-python/eyeD3-0.9.5
index b1fe6f3dbf16..81f88e63311a 100644
--- a/metadata/md5-cache/dev-python/eyeD3-0.9.5
+++ b/metadata/md5-cache/dev-python/eyeD3-0.9.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0.7
 SRC_URI=https://github.com/nicfit/eyeD3/archive/v0.9.5.tar.gz -> eyeD3-0.9.5.tar.gz test? ( https://eyed3.nicfit.net/releases/eyeD3-test-data.tgz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4b6c585f3368d3f3cf4945634c15cd2e
diff --git a/metadata/md5-cache/dev-python/fakeredis-1.4.4 b/metadata/md5-cache/dev-python/fakeredis-1.4.4
index 08c0c69d1ead..32d0e1889d81 100644
--- a/metadata/md5-cache/dev-python/fakeredis-1.4.4
+++ b/metadata/md5-cache/dev-python/fakeredis-1.4.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jamesls/fakeredis/archive/1.4.4.tar.gz -> fakeredis-1.4.4.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5f2d0a7bd5886407653841e51d5d9fc3
diff --git a/metadata/md5-cache/dev-python/fakeredis-1.4.5 b/metadata/md5-cache/dev-python/fakeredis-1.4.5
index 0c096b9d9e0c..9c86e1694245 100644
--- a/metadata/md5-cache/dev-python/fakeredis-1.4.5
+++ b/metadata/md5-cache/dev-python/fakeredis-1.4.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jamesls/fakeredis/archive/1.4.5.tar.gz -> fakeredis-1.4.5.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cfaf70c00bcc435a804dfb499b27aa0f
diff --git a/metadata/md5-cache/dev-python/falcon-2.0.0 b/metadata/md5-cache/dev-python/falcon-2.0.0
index f4d7b4262259..c37e596c979e 100644
--- a/metadata/md5-cache/dev-python/falcon-2.0.0
+++ b/metadata/md5-cache/dev-python/falcon-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/racker/falcon/archive/2.0.0.tar.gz -> falcon-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=899650e7b88fdb5b0100d7088123f4b4
diff --git a/metadata/md5-cache/dev-python/fasteners-0.15 b/metadata/md5-cache/dev-python/fasteners-0.15
index 9a2e5dc42fe8..a88d8a33dd96 100644
--- a/metadata/md5-cache/dev-python/fasteners-0.15
+++ b/metadata/md5-cache/dev-python/fasteners-0.15
@@ -4,12 +4,12 @@ DESCRIPTION=Python package that provides useful locks
 EAPI=7
 HOMEPAGE=https://github.com/harlowja/fasteners
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/monotonic-0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fasteners/fasteners-0.15.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8df331053a3930b3d687d35bcbd26404
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=030438c4380b6a0685e1b1bf3df87a57
diff --git a/metadata/md5-cache/dev-python/fastjsonschema-2.14.5 b/metadata/md5-cache/dev-python/fastjsonschema-2.14.5
index cc45418e7e14..7922fa13479c 100644
--- a/metadata/md5-cache/dev-python/fastjsonschema-2.14.5
+++ b/metadata/md5-cache/dev-python/fastjsonschema-2.14.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/horejsek/python-fastjsonschema/archive/v2.14.5.tar.gz -> python-fastjsonschema-2.14.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9fa21c437ed1bf7482c5da626261dfdd
diff --git a/metadata/md5-cache/dev-python/fcl-0.0.12 b/metadata/md5-cache/dev-python/fcl-0.0.12
index c7c4b7554218..0700d81f3f54 100644
--- a/metadata/md5-cache/dev-python/fcl-0.0.12
+++ b/metadata/md5-cache/dev-python/fcl-0.0.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-fcl/python-fcl-0.0.12.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6021398340679537002880637ec2ea54
diff --git a/metadata/md5-cache/dev-python/feedgenerator-1.9.1-r1 b/metadata/md5-cache/dev-python/feedgenerator-1.9.1-r1
index b00eea33aee1..a6a6cd6de840 100644
--- a/metadata/md5-cache/dev-python/feedgenerator-1.9.1-r1
+++ b/metadata/md5-cache/dev-python/feedgenerator-1.9.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/feedgenerator/feedgenerator-1.9.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1b91ee66d0ae9fa3e93555ea068cc06a
diff --git a/metadata/md5-cache/dev-python/feedparser-5.2.1 b/metadata/md5-cache/dev-python/feedparser-5.2.1
index df5cba0ae862..d48f75e40f22 100644
--- a/metadata/md5-cache/dev-python/feedparser-5.2.1
+++ b/metadata/md5-cache/dev-python/feedparser-5.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/f/feedparser/feedparser-5.2.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c2d26e15ece27ba9cf4d8943ae79aad6
diff --git a/metadata/md5-cache/dev-python/feedparser-6.0.2 b/metadata/md5-cache/dev-python/feedparser-6.0.2
index 7f17aa20fa40..c610594ea4f0 100644
--- a/metadata/md5-cache/dev-python/feedparser-6.0.2
+++ b/metadata/md5-cache/dev-python/feedparser-6.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kurtmckee/feedparser/archive/6.0.2.tar.gz -> feedparser-6.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7972499a84721d9f22a22134a073719a
diff --git a/metadata/md5-cache/dev-python/fido2-0.7.3 b/metadata/md5-cache/dev-python/fido2-0.7.3
index 3ad8f9481916..bdfa73ad3f4a 100644
--- a/metadata/md5-cache/dev-python/fido2-0.7.3
+++ b/metadata/md5-cache/dev-python/fido2-0.7.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Yubico/python-fido2/releases/download/0.7.3/fido2-0.7.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=29e7ed817a7345896558935a0f0b7ec7
diff --git a/metadata/md5-cache/dev-python/fido2-0.8.1 b/metadata/md5-cache/dev-python/fido2-0.8.1
index db0a2298cb07..cabeeebe014d 100644
--- a/metadata/md5-cache/dev-python/fido2-0.8.1
+++ b/metadata/md5-cache/dev-python/fido2-0.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Yubico/python-fido2/releases/download/0.8.1/fido2-0.8.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=29e7ed817a7345896558935a0f0b7ec7
diff --git a/metadata/md5-cache/dev-python/fields-5.0.0-r2 b/metadata/md5-cache/dev-python/fields-5.0.0-r2
index e62d666038ce..e0cab36ff12f 100644
--- a/metadata/md5-cache/dev-python/fields-5.0.0-r2
+++ b/metadata/md5-cache/dev-python/fields-5.0.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fields/fields-5.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1739c5f11bd62fc723fe7897021339cc
diff --git a/metadata/md5-cache/dev-python/filelock-3.0.12-r1 b/metadata/md5-cache/dev-python/filelock-3.0.12-r1
index 825eb1bfea21..22ece753fd54 100644
--- a/metadata/md5-cache/dev-python/filelock-3.0.12-r1
+++ b/metadata/md5-cache/dev-python/filelock-3.0.12-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/benediktschmitt/py-filelock/archive/v3.0.12.tar.gz -> py-filelock-3.0.12.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8500a700e6ec6c02d2953d0ac5667276
diff --git a/metadata/md5-cache/dev-python/filetype-1.0.7 b/metadata/md5-cache/dev-python/filetype-1.0.7
index a9d47265a74b..ef82249a4af3 100644
--- a/metadata/md5-cache/dev-python/filetype-1.0.7
+++ b/metadata/md5-cache/dev-python/filetype-1.0.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/f/filetype/filetype-1.0.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=97182f14825d9a7f78dac0b043303b41
diff --git a/metadata/md5-cache/dev-python/findimports-1.5.2 b/metadata/md5-cache/dev-python/findimports-1.5.2
index d1de92c726ad..3e39a44ca786 100644
--- a/metadata/md5-cache/dev-python/findimports-1.5.2
+++ b/metadata/md5-cache/dev-python/findimports-1.5.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/mgedmin/findimports/archive/1.5.2.tar.gz -> findimports-1.5.2.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ff93709a2a4e2912034ea0a065b6b0bb
diff --git a/metadata/md5-cache/dev-python/fitsio-0.9.11 b/metadata/md5-cache/dev-python/fitsio-0.9.11
index 339c67699476..fe51ffcd2150 100644
--- a/metadata/md5-cache/dev-python/fitsio-0.9.11
+++ b/metadata/md5-cache/dev-python/fitsio-0.9.11
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.11[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/esheldon/fitsio/archive/v0.9.11.tar.gz -> fitsio-0.9.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=03389005ef49994345badcc6cc3cca55
diff --git a/metadata/md5-cache/dev-python/fixtures-3.0.0-r1 b/metadata/md5-cache/dev-python/fixtures-3.0.0-r1
index 626b9cd7210a..eea77a030d90 100644
--- a/metadata/md5-cache/dev-python/fixtures-3.0.0-r1
+++ b/metadata/md5-cache/dev-python/fixtures-3.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fixtures/fixtures-3.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c0310b30d2f2171dd668947ccee79e27
diff --git a/metadata/md5-cache/dev-python/flake8-3.8.1 b/metadata/md5-cache/dev-python/flake8-3.8.1
index 50c7b80e6d1a..31e8de1558df 100644
--- a/metadata/md5-cache/dev-python/flake8-3.8.1
+++ b/metadata/md5-cache/dev-python/flake8-3.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-3.8.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e579a26103706975b57bf85dc2ebff18
diff --git a/metadata/md5-cache/dev-python/flake8-3.8.3-r1 b/metadata/md5-cache/dev-python/flake8-3.8.3-r1
index 7dcc0b276e4a..5e6a7d84a121 100644
--- a/metadata/md5-cache/dev-python/flake8-3.8.3-r1
+++ b/metadata/md5-cache/dev-python/flake8-3.8.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-3.8.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f10d9a5364119083e71eaa89b7bcf4ed
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5bcd887941201cfb8115dbb83e9f0bf2
diff --git a/metadata/md5-cache/dev-python/flake8-import-order-0.18 b/metadata/md5-cache/dev-python/flake8-import-order-0.18
index b002a3fda395..5b98ef90aee5 100644
--- a/metadata/md5-cache/dev-python/flake8-import-order-0.18
+++ b/metadata/md5-cache/dev-python/flake8-import-order-0.18
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8-import-order/flake8-import-order-0.18.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6b8555997398d007a98157cad87cc7cb
diff --git a/metadata/md5-cache/dev-python/flake8-polyfill-1.0.2 b/metadata/md5-cache/dev-python/flake8-polyfill-1.0.2
index b6dc99bb709b..15dde924afd2 100644
--- a/metadata/md5-cache/dev-python/flake8-polyfill-1.0.2
+++ b/metadata/md5-cache/dev-python/flake8-polyfill-1.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8-polyfill/flake8-polyfill-1.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0750368568a6fabf47bd7d15d7d73a85
diff --git a/metadata/md5-cache/dev-python/flaky-3.7.0-r1 b/metadata/md5-cache/dev-python/flaky-3.7.0-r1
index 8cfc70b34a24..7dda13b2f418 100644
--- a/metadata/md5-cache/dev-python/flaky-3.7.0-r1
+++ b/metadata/md5-cache/dev-python/flaky-3.7.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flaky/flaky-3.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=590ad37c0a2099b597b849ec9c3ae62e
diff --git a/metadata/md5-cache/dev-python/flask-1.1.2-r1 b/metadata/md5-cache/dev-python/flask-1.1.2-r1
index 550747c05172..77daa3c05378 100644
--- a/metadata/md5-cache/dev-python/flask-1.1.2-r1
+++ b/metadata/md5-cache/dev-python/flask-1.1.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask/Flask-1.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2ae5e05a627f2d2f47feac885511bcfe
diff --git a/metadata/md5-cache/dev-python/flask-9999 b/metadata/md5-cache/dev-python/flask-9999
index e517917fcc7c..da871112c013 100644
--- a/metadata/md5-cache/dev-python/flask-9999
+++ b/metadata/md5-cache/dev-python/flask-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/click[python_targets_pypy3(-)?,python_targets_python3_6(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b363df81104b34861d132f71439efcca
diff --git a/metadata/md5-cache/dev-python/flask-api-2.0 b/metadata/md5-cache/dev-python/flask-api-2.0
index d430bd45902f..d6f5a39f3623 100644
--- a/metadata/md5-cache/dev-python/flask-api-2.0
+++ b/metadata/md5-cache/dev-python/flask-api-2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flask-api/flask-api/archive/v2.0.tar.gz -> flask-api-2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d1b89ec087912522f9150403268548bf
diff --git a/metadata/md5-cache/dev-python/flask-assets-0.12 b/metadata/md5-cache/dev-python/flask-assets-0.12
index 3a2530c8aa7e..a59e0afcc72a 100644
--- a/metadata/md5-cache/dev-python/flask-assets-0.12
+++ b/metadata/md5-cache/dev-python/flask-assets-0.12
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/flask-0.8 dev-python/webassets python_targets_python3_6? (
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/miracle2k/flask-assets/archive/0.12.tar.gz -> flask-assets-0.12.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2faac71cc64a57dccfc6d0c85711a41e
diff --git a/metadata/md5-cache/dev-python/flask-babel-2.0.0 b/metadata/md5-cache/dev-python/flask-babel-2.0.0
index 11e45304b6ad..81150654f31a 100644
--- a/metadata/md5-cache/dev-python/flask-babel-2.0.0
+++ b/metadata/md5-cache/dev-python/flask-babel-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Babel/Flask-Babel-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5deb4602e6a4cf5227618ce600d87d60
diff --git a/metadata/md5-cache/dev-python/flask-babelex-0.9.4 b/metadata/md5-cache/dev-python/flask-babelex-0.9.4
index c67cd0de2eb2..1486b34fe106 100644
--- a/metadata/md5-cache/dev-python/flask-babelex-0.9.4
+++ b/metadata/md5-cache/dev-python/flask-babelex-0.9.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-BabelEx/Flask-BabelEx-0.9.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=60e1838d95b4febaf8dfaccc157073e7
diff --git a/metadata/md5-cache/dev-python/flask-compress-1.8.0 b/metadata/md5-cache/dev-python/flask-compress-1.8.0
index b112a4373f68..4b2e838cd700 100644
--- a/metadata/md5-cache/dev-python/flask-compress-1.8.0
+++ b/metadata/md5-cache/dev-python/flask-compress-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Compress/Flask-Compress-1.8.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=24b299b7f12a7366451f4534806cc0c5
diff --git a/metadata/md5-cache/dev-python/flask-cors-2.1.0 b/metadata/md5-cache/dev-python/flask-cors-2.1.0
index 8827f11cc2bb..ed00b8aa9b88 100644
--- a/metadata/md5-cache/dev-python/flask-cors-2.1.0
+++ b/metadata/md5-cache/dev-python/flask-cors-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Cors/Flask-Cors-2.1.0.tar.gz -> flask-cors-2.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b5d1753f3b17216473ed857ac65eea9
diff --git a/metadata/md5-cache/dev-python/flask-cors-3.0.9 b/metadata/md5-cache/dev-python/flask-cors-3.0.9
new file mode 100644
index 000000000000..9dd0e36cc3a5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-cors-3.0.9
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/packaging[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Flask extension for Cross Origin Resource Sharing (CORS)
+EAPI=7
+HOMEPAGE=https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors/
+IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/corydolphin/flask-cors/archive/3.0.9.tar.gz -> flask-cors-3.0.9.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c9b21032261505250350e22e9403b7e2
diff --git a/metadata/md5-cache/dev-python/flask-debug-0.4.3-r1 b/metadata/md5-cache/dev-python/flask-debug-0.4.3-r1
index c0d6b5462719..493a6ce41297 100644
--- a/metadata/md5-cache/dev-python/flask-debug-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/flask-debug-0.4.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mbr/Flask-Debug/archive/0.4.3.tar.gz -> flask-debug-0.4.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a7958f2339e282c393842b15d0398dab
diff --git a/metadata/md5-cache/dev-python/flask-gravatar-0.5.0 b/metadata/md5-cache/dev-python/flask-gravatar-0.5.0
index 00cc86ad227a..abd7f469a66d 100644
--- a/metadata/md5-cache/dev-python/flask-gravatar-0.5.0
+++ b/metadata/md5-cache/dev-python/flask-gravatar-0.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Gravatar/Flask-Gravatar-0.5.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2dc4926c5f80fc8504957da78486b693
diff --git a/metadata/md5-cache/dev-python/flask-htmlmin-2.0.2 b/metadata/md5-cache/dev-python/flask-htmlmin-2.0.2
index 51b2dab54bee..9d81d262b1bd 100644
--- a/metadata/md5-cache/dev-python/flask-htmlmin-2.0.2
+++ b/metadata/md5-cache/dev-python/flask-htmlmin-2.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hamidfzm/Flask-HTMLmin/archive/v2.0.2.tar.gz -> Flask-HTMLmin-2.0.2.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a9b03c59ebec6120d70babb91d4cc7b0
diff --git a/metadata/md5-cache/dev-python/flask-login-0.5.0 b/metadata/md5-cache/dev-python/flask-login-0.5.0
index 395c771ca6f9..448cafeb4f0c 100644
--- a/metadata/md5-cache/dev-python/flask-login-0.5.0
+++ b/metadata/md5-cache/dev-python/flask-login-0.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxcountryman/flask-login/archive/0.5.0.tar.gz -> flask-login-0.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b73576270056fbe392ed3ef7d34c4718
diff --git a/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1 b/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
index 42a4b2a56a11..4d9dc5c0e8c7 100644
--- a/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
+++ b/metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Mail/Flask-Mail-0.9.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f2de9e001dab9a0b483dbbfc1a4d9ce
diff --git a/metadata/md5-cache/dev-python/flask-migrate-2.5.2 b/metadata/md5-cache/dev-python/flask-migrate-2.5.2
index e5104d6a841e..fdd13c12c4e1 100644
--- a/metadata/md5-cache/dev-python/flask-migrate-2.5.2
+++ b/metadata/md5-cache/dev-python/flask-migrate-2.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Migrate/Flask-Migrate-2.5.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e1a0e3a10291004dc262338eb3fc5f1e
diff --git a/metadata/md5-cache/dev-python/flask-mongoengine-0.9.5 b/metadata/md5-cache/dev-python/flask-mongoengine-0.9.5
index b7499624448c..bc8d4af2a5b7 100644
--- a/metadata/md5-cache/dev-python/flask-mongoengine-0.9.5
+++ b/metadata/md5-cache/dev-python/flask-mongoengine-0.9.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/MongoEngine/flask-mongoengine/archive/v0.9.5.tar.gz -> flask-mongoengine-0.9.5.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=312566bd9aaaf38e46c403c6d88c94ac
diff --git a/metadata/md5-cache/dev-python/flask-mongoengine-1.0.0 b/metadata/md5-cache/dev-python/flask-mongoengine-1.0.0
index 02623d0b4eda..f2b9ac7ba9d4 100644
--- a/metadata/md5-cache/dev-python/flask-mongoengine-1.0.0
+++ b/metadata/md5-cache/dev-python/flask-mongoengine-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/MongoEngine/flask-mongoengine/archive/v1.0.0.tar.gz -> flask-mongoengine-1.0.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e296437b80c8c5c22fd033ec398836ab
diff --git a/metadata/md5-cache/dev-python/flask-nav-0.6-r2 b/metadata/md5-cache/dev-python/flask-nav-0.6-r2
index cf87f05d202c..e69199bb3756 100644
--- a/metadata/md5-cache/dev-python/flask-nav-0.6-r2
+++ b/metadata/md5-cache/dev-python/flask-nav-0.6-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mbr/flask-nav/archive/0.6.tar.gz -> flask-nav-0.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6a397f8faa0fa27a8074f4b79cb35169
diff --git a/metadata/md5-cache/dev-python/flask-paginate-0.7.0 b/metadata/md5-cache/dev-python/flask-paginate-0.7.0
index 1500b864883c..1c1b1bcad013 100644
--- a/metadata/md5-cache/dev-python/flask-paginate-0.7.0
+++ b/metadata/md5-cache/dev-python/flask-paginate-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lixxu/flask-paginate/archive/0.7.0.tar.gz -> flask-paginate-0.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5909c2f01ad5fb45b08efd202fb6a410
diff --git a/metadata/md5-cache/dev-python/flask-paranoid-0.2.0-r1 b/metadata/md5-cache/dev-python/flask-paranoid-0.2.0-r1
index 91f248e53147..3a891c3d50d8 100644
--- a/metadata/md5-cache/dev-python/flask-paranoid-0.2.0-r1
+++ b/metadata/md5-cache/dev-python/flask-paranoid-0.2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miguelgrinberg/flask-paranoid/archive/v0.2.tar.gz -> flask-paranoid-0.2.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=365bc82eca04f79300a82993c4eab01b
diff --git a/metadata/md5-cache/dev-python/flask-principal-0.4.0-r1 b/metadata/md5-cache/dev-python/flask-principal-0.4.0-r1
index 9a805904a85a..19d930d10403 100644
--- a/metadata/md5-cache/dev-python/flask-principal-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/flask-principal-0.4.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mattupstate/flask-principal/archive/0.4.0.tar.gz -> flask-principal-0.4.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d2b1f3abc9cdf46a206389d29b98781c
diff --git a/metadata/md5-cache/dev-python/flask-restful-0.3.8 b/metadata/md5-cache/dev-python/flask-restful-0.3.8
index 33468aef1f00..7147fc492c0c 100644
--- a/metadata/md5-cache/dev-python/flask-restful-0.3.8
+++ b/metadata/md5-cache/dev-python/flask-restful-0.3.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/twilio/flask-restful/archive/0.3.8.tar.gz -> flask-restful-0.3.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0149313166576fbfe35289a5ea9b73fb
diff --git a/metadata/md5-cache/dev-python/flask-script-2.0.6 b/metadata/md5-cache/dev-python/flask-script-2.0.6
index 85d355062215..15cab67e3898 100644
--- a/metadata/md5-cache/dev-python/flask-script-2.0.6
+++ b/metadata/md5-cache/dev-python/flask-script-2.0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Script/Flask-Script-2.0.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=90fa0f4bb6346409ad1aa132909bbced
diff --git a/metadata/md5-cache/dev-python/flask-security-3.4.4 b/metadata/md5-cache/dev-python/flask-security-3.4.4
index d5c7556e40b3..6de39f0dbc4b 100644
--- a/metadata/md5-cache/dev-python/flask-security-3.4.4
+++ b/metadata/md5-cache/dev-python/flask-security-3.4.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Flask-Middleware/flask-security/archive/3.4.4.tar.gz -> flask-security-3.4.4.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=834563ae5058264dab20691319dc31c2
diff --git a/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2 b/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
index 3e3293235659..32b40aac0238 100644
--- a/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
+++ b/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Sphinx-Themes/Flask-Sphinx-Themes-1.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=645e92c4007d6185b3f72b261aeeda79
diff --git a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4 b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4
index 7e8cfc2ffda2..4c210c9e0655 100644
--- a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4
+++ b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-SQLAlchemy/Flask-SQLAlchemy-2.4.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c4ade6137dbe681c53da724e8058cc04
diff --git a/metadata/md5-cache/dev-python/flask-wtf-0.14.3 b/metadata/md5-cache/dev-python/flask-wtf-0.14.3
index e849ca794b69..aa063c634d25 100644
--- a/metadata/md5-cache/dev-python/flask-wtf-0.14.3
+++ b/metadata/md5-cache/dev-python/flask-wtf-0.14.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-WTF/Flask-WTF-0.14.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=229d067a73141c8c6444a46b841ec1ed
diff --git a/metadata/md5-cache/dev-python/flatbuffers-1.12 b/metadata/md5-cache/dev-python/flatbuffers-1.12
index e95e80fb3eba..f1f7699b73dc 100644
--- a/metadata/md5-cache/dev-python/flatbuffers-1.12
+++ b/metadata/md5-cache/dev-python/flatbuffers-1.12
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flatbuffers/flatbuffers-1.12.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a3bcd6e8b54e578b9c221b7c5892129f
diff --git a/metadata/md5-cache/dev-python/fleep-1.0.1 b/metadata/md5-cache/dev-python/fleep-1.0.1
index a8d06683e8cd..e02374420e41 100644
--- a/metadata/md5-cache/dev-python/fleep-1.0.1
+++ b/metadata/md5-cache/dev-python/fleep-1.0.1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=File format determination library for Python
 EAPI=7
 HOMEPAGE=https://github.com/floyernick/fleep-py
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fleep/fleep-1.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9aff90a02f83c5528cb2a5f8aaa17234
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cf78353824b874cd9e51241d837733a1
diff --git a/metadata/md5-cache/dev-python/fleep-9999 b/metadata/md5-cache/dev-python/fleep-9999
index ae8bd47c1903..0d581bf2e4d6 100644
--- a/metadata/md5-cache/dev-python/fleep-9999
+++ b/metadata/md5-cache/dev-python/fleep-9999
@@ -1,13 +1,13 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-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
 DESCRIPTION=File format determination library for Python
 EAPI=7
 HOMEPAGE=https://github.com/floyernick/fleep-py
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9aff90a02f83c5528cb2a5f8aaa17234
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cf78353824b874cd9e51241d837733a1
diff --git a/metadata/md5-cache/dev-python/flexmock-0.10.4 b/metadata/md5-cache/dev-python/flexmock-0.10.4
index 79935e202742..096d709cf84f 100644
--- a/metadata/md5-cache/dev-python/flexmock-0.10.4
+++ b/metadata/md5-cache/dev-python/flexmock-0.10.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flexmock/flexmock-0.10.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4af948e1bf71e78c6e5387d14cc3fddb
diff --git a/metadata/md5-cache/dev-python/flit-2.1.0 b/metadata/md5-cache/dev-python/flit-2.1.0
index 545758096c80..6b8adaef934c 100644
--- a/metadata/md5-cache/dev-python/flit-2.1.0
+++ b/metadata/md5-cache/dev-python/flit-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flit/flit-2.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=399e4c8c8c91298ec4bd99424b834176
diff --git a/metadata/md5-cache/dev-python/flit_core-2.1.0 b/metadata/md5-cache/dev-python/flit_core-2.1.0
index b34964b21a20..4fb04e1bb7ca 100644
--- a/metadata/md5-cache/dev-python/flit_core-2.1.0
+++ b/metadata/md5-cache/dev-python/flit_core-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flit_core/flit_core-2.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1f61e98c26ed72d4f9df3ca479e0a47d
diff --git a/metadata/md5-cache/dev-python/flufl-bounce-3.0.1 b/metadata/md5-cache/dev-python/flufl-bounce-3.0.1
index 69e7bc1514d5..daca34c419e1 100644
--- a/metadata/md5-cache/dev-python/flufl-bounce-3.0.1
+++ b/metadata/md5-cache/dev-python/flufl-bounce-3.0.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/atpublic[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flufl.bounce/flufl.bounce-3.0.1.tar.gz -> flufl-bounce-3.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8cbbdd8cf3ad23c8edb00723f1228a78
diff --git a/metadata/md5-cache/dev-python/flufl-i18n-2.0.2 b/metadata/md5-cache/dev-python/flufl-i18n-2.0.2
index 8f48b36aa8d8..bea6280a886e 100644
--- a/metadata/md5-cache/dev-python/flufl-i18n-2.0.2
+++ b/metadata/md5-cache/dev-python/flufl-i18n-2.0.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/atpublic[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flufl.i18n/flufl.i18n-2.0.2.tar.gz -> flufl-i18n-2.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2cd0aa909fe2e161a32eadcab5a4dee0
diff --git a/metadata/md5-cache/dev-python/flufl-lock-5.0.1 b/metadata/md5-cache/dev-python/flufl-lock-5.0.1
index 2b57669e6dd0..01818af69030 100644
--- a/metadata/md5-cache/dev-python/flufl-lock-5.0.1
+++ b/metadata/md5-cache/dev-python/flufl-lock-5.0.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/atpublic[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flufl.lock/flufl.lock-5.0.1.tar.gz -> flufl-lock-5.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=78ec6d44ed96e489aaf2aea885a0ba76
diff --git a/metadata/md5-cache/dev-python/fonttools-4.1.0 b/metadata/md5-cache/dev-python/fonttools-4.1.0
index f2bc1b22dca1..84bbb20d56c8 100644
--- a/metadata/md5-cache/dev-python/fonttools-4.1.0
+++ b/metadata/md5-cache/dev-python/fonttools-4.1.0
@@ -5,12 +5,12 @@ DESCRIPTION=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
 EAPI=7
 HOMEPAGE=https://github.com/fonttools/fonttools/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/4.1.0.tar.gz -> fonttools-4.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=b37f6c0709858c97651c70dbe79d6605
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_md5_=05431b6ab17acc9228e04851a75b4a33
diff --git a/metadata/md5-cache/dev-python/fqdn-1.5.0 b/metadata/md5-cache/dev-python/fqdn-1.5.0
index 6f790df0817f..90cca96d1833 100644
--- a/metadata/md5-cache/dev-python/fqdn-1.5.0
+++ b/metadata/md5-cache/dev-python/fqdn-1.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/guyhughes/fqdn/archive/v1.5.0.tar.gz -> fqdn-1.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b95a0184238205be3b0515fc6295415f
diff --git a/metadata/md5-cache/dev-python/freezegun-0.3.15-r1 b/metadata/md5-cache/dev-python/freezegun-0.3.15-r1
index fcd449611ffe..d9c6fd607dff 100644
--- a/metadata/md5-cache/dev-python/freezegun-0.3.15-r1
+++ b/metadata/md5-cache/dev-python/freezegun-0.3.15-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/freezegun/freezegun-0.3.15.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4d09ffa2901bba80d529cb03581a2700
diff --git a/metadata/md5-cache/dev-python/freezegun-1.0.0-r1 b/metadata/md5-cache/dev-python/freezegun-1.0.0-r1
index 2aba2a3eafe8..8210e1de2cc0 100644
--- a/metadata/md5-cache/dev-python/freezegun-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/freezegun-1.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/freezegun/freezegun-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1af81c9546a4609594ebdabfae385288
diff --git a/metadata/md5-cache/dev-python/frozen-flask-0.15 b/metadata/md5-cache/dev-python/frozen-flask-0.15
index 7260545fd92b..e423720f6b65 100644
--- a/metadata/md5-cache/dev-python/frozen-flask-0.15
+++ b/metadata/md5-cache/dev-python/frozen-flask-0.15
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Frozen-Flask/Frozen-Flask-0.15.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cba41e86aaa6d74a11672b528b2fee74
diff --git a/metadata/md5-cache/dev-python/frozendict-1.2 b/metadata/md5-cache/dev-python/frozendict-1.2
index 4d099fa74c6d..898d29b3f607 100644
--- a/metadata/md5-cache/dev-python/frozendict-1.2
+++ b/metadata/md5-cache/dev-python/frozendict-1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/frozendict/frozendict-1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=881e9c603ee307b376fa2711b7474174
diff --git a/metadata/md5-cache/dev-python/fs-2.4.11 b/metadata/md5-cache/dev-python/fs-2.4.11
index c6075449fa88..be7ac3e2f84f 100644
--- a/metadata/md5-cache/dev-python/fs-2.4.11
+++ b/metadata/md5-cache/dev-python/fs-2.4.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyFilesystem/pyfilesystem2/archive/v2.4.11.tar.gz -> fs-2.4.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d753f5595e01708c8b3ddd6b476b33d3
diff --git a/metadata/md5-cache/dev-python/fsspec-0.8.2 b/metadata/md5-cache/dev-python/fsspec-0.8.2
index 51faa4f5de33..49444796d003 100644
--- a/metadata/md5-cache/dev-python/fsspec-0.8.2
+++ b/metadata/md5-cache/dev-python/fsspec-0.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intake/filesystem_spec/archive/0.8.2.tar.gz -> filesystem_spec-0.8.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ed52175195f0ea20941c7e6b1c9f0f71
diff --git a/metadata/md5-cache/dev-python/fudge-1.1.1 b/metadata/md5-cache/dev-python/fudge-1.1.1
index 425a96a95b20..f9917d9e7181 100644
--- a/metadata/md5-cache/dev-python/fudge-1.1.1
+++ b/metadata/md5-cache/dev-python/fudge-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fudge/fudge-1.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d361b0355d9b848efcd8efef4160da5c
diff --git a/metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1 b/metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
index 12b6e778e201..0a7fa0a24b08 100644
--- a/metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
+++ b/metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcparserlib/funcparserlib-0.3.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=65297e4c65879ec66a11e8d160d3438c
diff --git a/metadata/md5-cache/dev-python/funcsigs-1.0.2-r2 b/metadata/md5-cache/dev-python/funcsigs-1.0.2-r2
index 2d6b4fa588c4..8e334d687062 100644
--- a/metadata/md5-cache/dev-python/funcsigs-1.0.2-r2
+++ b/metadata/md5-cache/dev-python/funcsigs-1.0.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcsigs/funcsigs-1.0.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a4052523782ba0212b445ec62eaebf03
diff --git a/metadata/md5-cache/dev-python/funcy-1.10.1 b/metadata/md5-cache/dev-python/funcy-1.10.1
index 0991b4d95120..0f8a0979cb1f 100644
--- a/metadata/md5-cache/dev-python/funcy-1.10.1
+++ b/metadata/md5-cache/dev-python/funcy-1.10.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcy/funcy-1.10.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6835418e80e6d5ceb3aab85a5f403895
diff --git a/metadata/md5-cache/dev-python/funcy-1.14 b/metadata/md5-cache/dev-python/funcy-1.14
index 674ee5c9c5cf..4542fe48146f 100644
--- a/metadata/md5-cache/dev-python/funcy-1.14
+++ b/metadata/md5-cache/dev-python/funcy-1.14
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcy/funcy-1.14.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=34d008503360934ade592637a7f3ba5c
diff --git a/metadata/md5-cache/dev-python/fuse-python-1.0.0 b/metadata/md5-cache/dev-python/fuse-python-1.0.0
index 405edd18f2fb..095e4608d2dc 100644
--- a/metadata/md5-cache/dev-python/fuse-python-1.0.0
+++ b/metadata/md5-cache/dev-python/fuse-python-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=sys-fs/fuse:0= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/libfuse/python-fuse/archive/v1.0.0.tar.gz -> fuse-python-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d18334862a3eee0b803d723de13fa98a
diff --git a/metadata/md5-cache/dev-python/fusepy-3.0.1 b/metadata/md5-cache/dev-python/fusepy-3.0.1
index 3e6a69acc023..5a40e603d3b2 100644
--- a/metadata/md5-cache/dev-python/fusepy-3.0.1
+++ b/metadata/md5-cache/dev-python/fusepy-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-fs/fuse-2.9.7:0 !dev-python/fuse-python python_targets_python3_6?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fusepy/fusepy-3.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=13ac0eb45a51de7835fa97058addd524
diff --git a/metadata/md5-cache/dev-python/future-0.18.2-r1 b/metadata/md5-cache/dev-python/future-0.18.2-r1
index a115f6a48304..50b2dd26cb33 100644
--- a/metadata/md5-cache/dev-python/future-0.18.2-r1
+++ b/metadata/md5-cache/dev-python/future-0.18.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/future/future-0.18.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5b69c8cea7da5d7f54309cbcc24f36cb
diff --git a/metadata/md5-cache/dev-python/futurist-1.8.1 b/metadata/md5-cache/dev-python/futurist-1.8.1
index 7c3e606b29eb..a4e6c1c2f6ee 100644
--- a/metadata/md5-cache/dev-python/futurist-1.8.1
+++ b/metadata/md5-cache/dev-python/futurist-1.8.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/futurist/futurist-1.8.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d46ddc2b792a32fed607b8a6d34195d6
diff --git a/metadata/md5-cache/dev-python/futurist-2.3.0 b/metadata/md5-cache/dev-python/futurist-2.3.0
index 37c8ced2bafc..fc39b9b907e7 100644
--- a/metadata/md5-cache/dev-python/futurist-2.3.0
+++ b/metadata/md5-cache/dev-python/futurist-2.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/futurist/futurist-2.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f66c981761d772f8b0e92bdc77b03080
diff --git a/metadata/md5-cache/dev-python/fuzzywuzzy-0.18.0 b/metadata/md5-cache/dev-python/fuzzywuzzy-0.18.0
index 441db0fd1405..2cb6cd988c89 100644
--- a/metadata/md5-cache/dev-python/fuzzywuzzy-0.18.0
+++ b/metadata/md5-cache/dev-python/fuzzywuzzy-0.18.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fuzzywuzzy/fuzzywuzzy-0.18.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=02c657f00b0c5e09d8f3381c0bef26df
diff --git a/metadata/md5-cache/dev-python/gast-0.2.2 b/metadata/md5-cache/dev-python/gast-0.2.2
deleted file mode 100644
index aabdbba3906d..000000000000
--- a/metadata/md5-cache/dev-python/gast-0.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)
-EAPI=7
-HOMEPAGE=https://pypi.org/project/gast/
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/g/gast/gast-0.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8d25ac3717687dd2ff5053264712de6d
diff --git a/metadata/md5-cache/dev-python/gast-0.3.3 b/metadata/md5-cache/dev-python/gast-0.3.3
deleted file mode 100644
index 61e8d9fff9e2..000000000000
--- a/metadata/md5-cache/dev-python/gast-0.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)
-EAPI=7
-HOMEPAGE=https://pypi.org/project/gast/
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/g/gast/gast-0.3.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=84e2fa2b33e90ce7790ebc29d6cc6bc4
diff --git a/metadata/md5-cache/dev-python/gast-0.3.3-r1 b/metadata/md5-cache/dev-python/gast-0.3.3-r1
index 3c08b9c64689..d47524637996 100644
--- a/metadata/md5-cache/dev-python/gast-0.3.3-r1
+++ b/metadata/md5-cache/dev-python/gast-0.3.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A generic AST to represent Python2 and Python3's Abstract Syntax Tre
 EAPI=7
 HOMEPAGE=https://pypi.org/project/gast/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gast/gast-0.3.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1d69f95cea12ca3b70b7c0257a9bb2ef
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4a317e3820fd376dde350d8d48235226
diff --git a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5-r1 b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5-r1
index 4a35a786d4b4..d2707962a78a 100644
--- a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5-r1
+++ b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8cec0c9e8da7b58bb7cb70fd3897d7a7
diff --git a/metadata/md5-cache/dev-python/genshi-0.7.3-r1 b/metadata/md5-cache/dev-python/genshi-0.7.3-r1
index 5dd04b10469b..f349454149e3 100644
--- a/metadata/md5-cache/dev-python/genshi-0.7.3-r1
+++ b/metadata/md5-cache/dev-python/genshi-0.7.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/G/Genshi/Genshi-0.7.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8d64e67bf978a974573b3328670f5970
diff --git a/metadata/md5-cache/dev-python/genson-1.1.0 b/metadata/md5-cache/dev-python/genson-1.1.0
index 00513b7296c7..29e9f36781ec 100644
--- a/metadata/md5-cache/dev-python/genson-1.1.0
+++ b/metadata/md5-cache/dev-python/genson-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/genson/genson-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2fe52e95e80fc9f7e8180de731159d9d
diff --git a/metadata/md5-cache/dev-python/genty-1.3.2-r1 b/metadata/md5-cache/dev-python/genty-1.3.2-r1
index bf85f58a40d4..ac9b7be4bcb4 100644
--- a/metadata/md5-cache/dev-python/genty-1.3.2-r1
+++ b/metadata/md5-cache/dev-python/genty-1.3.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/genty/genty-1.3.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c6a179fa35845560b615457d78c95581
diff --git a/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1 b/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
index 102756e23cc7..07f476ba98dd 100644
--- a/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
+++ b/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxmind/geoip-api-python/archive/v1.3.2.tar.gz -> geoip-api-python-1.3.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=304e04fd9f61f750bce40b6911bc2401
diff --git a/metadata/md5-cache/dev-python/gevent-20.9.0 b/metadata/md5-cache/dev-python/gevent-20.9.0
index 2c612d15b792..60c45653a577 100644
--- a/metadata/md5-cache/dev-python/gevent-20.9.0
+++ b/metadata/md5-cache/dev-python/gevent-20.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent/gevent-20.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c18594b14f70d8bf2697e7805bfb688c
diff --git a/metadata/md5-cache/dev-python/gevent-websocket-0.10.1 b/metadata/md5-cache/dev-python/gevent-websocket-0.10.1
index 15d56f0dfa07..d5e2f62756a2 100644
--- a/metadata/md5-cache/dev-python/gevent-websocket-0.10.1
+++ b/metadata/md5-cache/dev-python/gevent-websocket-0.10.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/gevent[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent-websocket/gevent-websocket-0.10.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=179ef37ef3793c51265864497f41acd1
diff --git a/metadata/md5-cache/dev-python/geventhttpclient-1.4.4-r1 b/metadata/md5-cache/dev-python/geventhttpclient-1.4.4-r1
index 1d4926f8f9a3..84fbc46cc3c7 100644
--- a/metadata/md5-cache/dev-python/geventhttpclient-1.4.4-r1
+++ b/metadata/md5-cache/dev-python/geventhttpclient-1.4.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/geventhttpclient/geventhttpclient-1.4.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6bf44abefcfe1d443f892c1753457854
diff --git a/metadata/md5-cache/dev-python/git-review-1.28.0 b/metadata/md5-cache/dev-python/git-review-1.28.0
index 33849c3e9d4e..ede2e7d81f64 100644
--- a/metadata/md5-cache/dev-python/git-review-1.28.0
+++ b/metadata/md5-cache/dev-python/git-review-1.28.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/requests-1.1[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/git-review/git-review-1.28.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=293a8ce51ec49b95296555f6060c4d69
diff --git a/metadata/md5-cache/dev-python/gitdb-4.0.5 b/metadata/md5-cache/dev-python/gitdb-4.0.5
index 289af1c0708c..1d453688c5ae 100644
--- a/metadata/md5-cache/dev-python/gitdb-4.0.5
+++ b/metadata/md5-cache/dev-python/gitdb-4.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gitdb/gitdb-4.0.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4efee14dcefb8f8e8771d1d374001bd9
diff --git a/metadata/md5-cache/dev-python/gitdb2-2.0.3 b/metadata/md5-cache/dev-python/gitdb2-2.0.3
index 6dfb2325be85..b7a0c14fe8e9 100644
--- a/metadata/md5-cache/dev-python/gitdb2-2.0.3
+++ b/metadata/md5-cache/dev-python/gitdb2-2.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gitdb2/gitdb2-2.0.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e059b938aecd40e4bb59ad83ea7e03d
diff --git a/metadata/md5-cache/dev-python/github3-1.3.0 b/metadata/md5-cache/dev-python/github3-1.3.0
index d00257727b84..84e91b810f7b 100644
--- a/metadata/md5-cache/dev-python/github3-1.3.0
+++ b/metadata/md5-cache/dev-python/github3-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sigmavirus24/github3.py/archive/1.3.0.tar.gz -> github3-1.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=abe82ff6ac2debcd810a9588af426405
diff --git a/metadata/md5-cache/dev-python/glance_store-1.0.1 b/metadata/md5-cache/dev-python/glance_store-1.0.1
index d24f85d4f563..76ac3444f081 100644
--- a/metadata/md5-cache/dev-python/glance_store-1.0.1
+++ b/metadata/md5-cache/dev-python/glance_store-1.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/glance_store/glance_store-1.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9c03cabb66bed5dd8d5a5bfd2ac35e1d
diff --git a/metadata/md5-cache/dev-python/glance_store-2.3.0 b/metadata/md5-cache/dev-python/glance_store-2.3.0
index c37953397c47..f989a52ba56f 100644
--- a/metadata/md5-cache/dev-python/glance_store-2.3.0
+++ b/metadata/md5-cache/dev-python/glance_store-2.3.0
@@ -5,11 +5,11 @@ DESCRIPTION=A library for glance
 EAPI=7
 HOMEPAGE=https://github.com/openstack/glance_store
 IUSE=cinder swift vmware python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/eventlet-0.18.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] cinder? ( >=dev-python/python-cinderclient-4.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-brick-2.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-privsep-1.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) swift? ( >=dev-python/httplib2-0.9.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) vmware? ( >=dev-python/oslo-vmware-2.17.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/glance_store/glance_store-2.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=26609ec8480d1384ea234f83d9231274
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=addf4cc7715f1160421c1dc73c7ab883
diff --git a/metadata/md5-cache/dev-python/glooey-0.3.4 b/metadata/md5-cache/dev-python/glooey-0.3.4
index 75eea51cea5a..cf7c78f96133 100644
--- a/metadata/md5-cache/dev-python/glooey-0.3.4
+++ b/metadata/md5-cache/dev-python/glooey-0.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/glooey/glooey-0.3.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=2342471488261287f6dc34e4dca289dc
diff --git a/metadata/md5-cache/dev-python/gmpy-2.0.8-r2 b/metadata/md5-cache/dev-python/gmpy-2.0.8-r2
index d40c700b7882..b8c2334298e6 100644
--- a/metadata/md5-cache/dev-python/gmpy-2.0.8-r2
+++ b/metadata/md5-cache/dev-python/gmpy-2.0.8-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/mpc-1.0.2:= >=dev-libs/mpfr-3.1.2:= !mpir? ( dev-libs/gmp:0=
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=2
 SRC_URI=mirror://pypi/g/gmpy2/gmpy2-2.0.8.zip
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=594fd1c05216c99f0f84d3e3ef451a6f
diff --git a/metadata/md5-cache/dev-python/google-api-core-1.17.0 b/metadata/md5-cache/dev-python/google-api-core-1.17.0
index 8a303d41f0d9..15591b261b5e 100644
--- a/metadata/md5-cache/dev-python/google-api-core-1.17.0
+++ b/metadata/md5-cache/dev-python/google-api-core-1.17.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/googleapis/python-api-core/archive/v1.17.0.tar.gz -> google-api-core-1.17.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c77cb2f0edbf4039482ed0a10392a706
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.8.3-r1 b/metadata/md5-cache/dev-python/google-api-python-client-1.8.3-r1
index f7de419855c9..5a0f4e742736 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-1.8.3-r1
+++ b/metadata/md5-cache/dev-python/google-api-python-client-1.8.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/google-api-python-client/archive/v1.8.3.tar.gz -> google-api-python-client-1.8.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4026f205f0ebd2ba02f3b7d3fd3cfe88
diff --git a/metadata/md5-cache/dev-python/google-apitools-0.5.31 b/metadata/md5-cache/dev-python/google-apitools-0.5.31
index f551480f0a6e..7c7ff07f1c76 100644
--- a/metadata/md5-cache/dev-python/google-apitools-0.5.31
+++ b/metadata/md5-cache/dev-python/google-apitools-0.5.31
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/apitools/archive/v0.5.31.tar.gz -> google-apitools-0.5.31.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=feb35975e146fee6fb75f89ec07480d6
diff --git a/metadata/md5-cache/dev-python/google-auth-1.20.1 b/metadata/md5-cache/dev-python/google-auth-1.20.1
index 8104a1cc113c..2ee037e51422 100644
--- a/metadata/md5-cache/dev-python/google-auth-1.20.1
+++ b/metadata/md5-cache/dev-python/google-auth-1.20.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-1.20.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=816348332d0343ebf87bbb8f02669128
diff --git a/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.4 b/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.4
index 7edd93e37155..c74a3cc2de7d 100644
--- a/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.4
+++ b/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2/archive/v0.0.4.tar.gz -> google-auth-httplib2-0.0.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8df19021dea73aa94d645c9befd4f380
diff --git a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1-r1 b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1-r1
index b9b8b968fed4..5a8765ae3554 100644
--- a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1-r1
+++ b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/google-auth-oauthlib/google-auth-oauthlib/google-auth-oauthlib-0.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=691a8a5f7af21831906194d243a9c5da
diff --git a/metadata/md5-cache/dev-python/google-pasta-0.1.1 b/metadata/md5-cache/dev-python/google-pasta-0.1.1
index bf43c1e17c8d..39f84b385e9e 100644
--- a/metadata/md5-cache/dev-python/google-pasta-0.1.1
+++ b/metadata/md5-cache/dev-python/google-pasta-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-pasta/google-pasta-0.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6bad3324a8e43c5b3d8c200c1ba97412
diff --git a/metadata/md5-cache/dev-python/google-pasta-0.2.0 b/metadata/md5-cache/dev-python/google-pasta-0.2.0
index cd191d1ea7b5..ae3f1b486c16 100644
--- a/metadata/md5-cache/dev-python/google-pasta-0.2.0
+++ b/metadata/md5-cache/dev-python/google-pasta-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-pasta/google-pasta-0.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b593d6ad820059eb2f87bfeecd6dafc3
diff --git a/metadata/md5-cache/dev-python/google-reauth-python-0.1.0-r1 b/metadata/md5-cache/dev-python/google-reauth-python-0.1.0-r1
index 7d229186e67e..a886c9e719a0 100644
--- a/metadata/md5-cache/dev-python/google-reauth-python-0.1.0-r1
+++ b/metadata/md5-cache/dev-python/google-reauth-python-0.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/google-reauth-python/archive/0.1.0.tar.gz -> google-reauth-python-0.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b2bd021be573df0ce3fc662b6a522099
diff --git a/metadata/md5-cache/dev-python/googleapis-common-protos-1.51.0 b/metadata/md5-cache/dev-python/googleapis-common-protos-1.51.0
index d218345d7cf2..48cdc8e1590c 100644
--- a/metadata/md5-cache/dev-python/googleapis-common-protos-1.51.0
+++ b/metadata/md5-cache/dev-python/googleapis-common-protos-1.51.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/namespace-google[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/googleapis-common-protos/googleapis-common-protos-1.51.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7b22d68ff75f3d151663051b2bc170ed
diff --git a/metadata/md5-cache/dev-python/graphviz-0.14.2 b/metadata/md5-cache/dev-python/graphviz-0.14.2
index 4596a4ad2f94..cbf2a2eac507 100644
--- a/metadata/md5-cache/dev-python/graphviz-0.14.2
+++ b/metadata/md5-cache/dev-python/graphviz-0.14.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/graphviz/graphviz-0.14.2.zip
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ea1c1dbfe89ed3c1cd343a89220da961
diff --git a/metadata/md5-cache/dev-python/graphviz-0.15 b/metadata/md5-cache/dev-python/graphviz-0.15
index 21b5050ada20..339bcbbdeea6 100644
--- a/metadata/md5-cache/dev-python/graphviz-0.15
+++ b/metadata/md5-cache/dev-python/graphviz-0.15
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/graphviz/graphviz-0.15.zip
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a854cbd6156fc99d4eb1b17c64c8f38d
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.17 b/metadata/md5-cache/dev-python/greenlet-0.4.17
index 2dba42bef7e5..0ecf785e1d81 100644
--- a/metadata/md5-cache/dev-python/greenlet-0.4.17
+++ b/metadata/md5-cache/dev-python/greenlet-0.4.17
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/greenlet/greenlet-0.4.17.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cca0fd09f5109d174972c9139d299739
diff --git a/metadata/md5-cache/dev-python/greenstalk-1.0.1 b/metadata/md5-cache/dev-python/greenstalk-1.0.1
index 57a63057180a..ea6a69bf8bc0 100644
--- a/metadata/md5-cache/dev-python/greenstalk-1.0.1
+++ b/metadata/md5-cache/dev-python/greenstalk-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mayhewj/greenstalk/archive/v1.0.1.tar.gz -> greenstalk-1.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=88bd3c49e98511498d7a59e5fd8751d9
diff --git a/metadata/md5-cache/dev-python/grpcio-1.28.1 b/metadata/md5-cache/dev-python/grpcio-1.28.1
index 8d757fd0e586..fa0b6563b0ae 100644
--- a/metadata/md5-cache/dev-python/grpcio-1.28.1
+++ b/metadata/md5-cache/dev-python/grpcio-1.28.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-python/cython-0.28.3[python_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio/grpcio-1.28.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=20e5cafc16a69e8338154a7bd6f7eb6c
diff --git a/metadata/md5-cache/dev-python/grpcio-1.32.0-r1 b/metadata/md5-cache/dev-python/grpcio-1.32.0-r1
index 5cf1cca5c6a3..1c97053f9519 100644
--- a/metadata/md5-cache/dev-python/grpcio-1.32.0-r1
+++ b/metadata/md5-cache/dev-python/grpcio-1.32.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-python/cython-0.28.3[python_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio/grpcio-1.32.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3b1cd3a6647bc5cbb9140ae728cc7b44
diff --git a/metadata/md5-cache/dev-python/grpcio-testing-1.32.0 b/metadata/md5-cache/dev-python/grpcio-testing-1.32.0
index 44a31b3ceaf8..decca519744b 100644
--- a/metadata/md5-cache/dev-python/grpcio-testing-1.32.0
+++ b/metadata/md5-cache/dev-python/grpcio-testing-1.32.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-python/grpcio-1.32.0[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio-testing/grpcio-testing-1.32.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d0e93c282ae9b2652c96ccd56962a672
diff --git a/metadata/md5-cache/dev-python/grpcio-tools-1.32.0 b/metadata/md5-cache/dev-python/grpcio-tools-1.32.0
index ecbb3bfbd242..5f1542cdf7b6 100644
--- a/metadata/md5-cache/dev-python/grpcio-tools-1.32.0
+++ b/metadata/md5-cache/dev-python/grpcio-tools-1.32.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio-tools/grpcio-tools-1.32.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0ad93750a634143dba0c04ecb6990574
diff --git a/metadata/md5-cache/dev-python/gsd-1.5.3-r1 b/metadata/md5-cache/dev-python/gsd-1.5.3-r1
index 7f3a493b000a..45821ac199e9 100644
--- a/metadata/md5-cache/dev-python/gsd-1.5.3-r1
+++ b/metadata/md5-cache/dev-python/gsd-1.5.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://glotzerlab.engin.umich.edu/Downloads/gsd/gsd-v1.5.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e98b1725b6a4b5ee9273d3caa2460c07
diff --git a/metadata/md5-cache/dev-python/guessit-3.1.1 b/metadata/md5-cache/dev-python/guessit-3.1.1
index 0d21e02aac38..0b30af7132a9 100644
--- a/metadata/md5-cache/dev-python/guessit-3.1.1
+++ b/metadata/md5-cache/dev-python/guessit-3.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/guessit/guessit-3.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0a31a7f71dac3c3691dc7c0f2552ac30
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 8b22973c8abd..92f9a4e45156 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
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/sphinx-1.2[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ee02f4427a3d1156d511b12225dc340e
diff --git a/metadata/md5-cache/dev-python/h11-0.11.0 b/metadata/md5-cache/dev-python/h11-0.11.0
index 1c4c204226af..41878cda3396 100644
--- a/metadata/md5-cache/dev-python/h11-0.11.0
+++ b/metadata/md5-cache/dev-python/h11-0.11.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/h11/h11-0.11.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3ccbe67e0c428f09f3a62fd6db5be53a
diff --git a/metadata/md5-cache/dev-python/h5py-2.10.0-r1 b/metadata/md5-cache/dev-python/h5py-2.10.0-r1
index a7df16740192..b4f53acb01cf 100644
--- a/metadata/md5-cache/dev-python/h5py-2.10.0-r1
+++ b/metadata/md5-cache/dev-python/h5py-2.10.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/h5py/h5py-2.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=05d2622f2fc5126caa7ecb6cb40cab07
diff --git a/metadata/md5-cache/dev-python/hacking-2.0.0 b/metadata/md5-cache/dev-python/hacking-2.0.0
index 1ba7047bd363..aa6d2d6a5099 100644
--- a/metadata/md5-cache/dev-python/hacking-2.0.0
+++ b/metadata/md5-cache/dev-python/hacking-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hacking/hacking-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fe7fa6ae4098c14d50767270f166f32e
diff --git a/metadata/md5-cache/dev-python/hcloud-python-1.10.0 b/metadata/md5-cache/dev-python/hcloud-python-1.10.0
index 5ab141c66daf..a4d812c8f6bf 100644
--- a/metadata/md5-cache/dev-python/hcloud-python-1.10.0
+++ b/metadata/md5-cache/dev-python/hcloud-python-1.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hetznercloud/hcloud-python/archive/v1.10.0.tar.gz -> hcloud-python-1.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=91c7d3d4d930bae436de4615dbdab9a9
diff --git a/metadata/md5-cache/dev-python/hcloud-python-1.9.0 b/metadata/md5-cache/dev-python/hcloud-python-1.9.0
index f916c0bb8444..e0e872c7ab54 100644
--- a/metadata/md5-cache/dev-python/hcloud-python-1.9.0
+++ b/metadata/md5-cache/dev-python/hcloud-python-1.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hetznercloud/hcloud-python/archive/v1.9.0.tar.gz -> hcloud-python-1.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2f950a6bdecfb27bddd72b36af0e18d4
diff --git a/metadata/md5-cache/dev-python/helpdev-0.7.1 b/metadata/md5-cache/dev-python/helpdev-0.7.1
index 49ea6f378e34..99a4ce39a1ef 100644
--- a/metadata/md5-cache/dev-python/helpdev-0.7.1
+++ b/metadata/md5-cache/dev-python/helpdev-0.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/helpdev/helpdev-0.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=82b3f8d3bc166877ebb1ca37b859ad74
diff --git a/metadata/md5-cache/dev-python/hgdistver-0.25 b/metadata/md5-cache/dev-python/hgdistver-0.25
index 7f62ff1a17a2..2952550d40f2 100644
--- a/metadata/md5-cache/dev-python/hgdistver-0.25
+++ b/metadata/md5-cache/dev-python/hgdistver-0.25
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hgdistver/hgdistver-0.25.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c4de6aadf527893e7c915eb14b3f529
diff --git a/metadata/md5-cache/dev-python/hiredis-1.0.1 b/metadata/md5-cache/dev-python/hiredis-1.0.1
index 65cb65930989..017f8c3e9c76 100644
--- a/metadata/md5-cache/dev-python/hiredis-1.0.1
+++ b/metadata/md5-cache/dev-python/hiredis-1.0.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/hiredis:0/0.14 python_targets_python3_6? ( dev-lang/python:3.6
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hiredis/hiredis-1.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=63f343d56fe1d86784db5c6456178e49
diff --git a/metadata/md5-cache/dev-python/hiredis-1.0.1-r1 b/metadata/md5-cache/dev-python/hiredis-1.0.1-r1
index c4f32cc38713..389595a13bfd 100644
--- a/metadata/md5-cache/dev-python/hiredis-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/hiredis-1.0.1-r1
@@ -11,5 +11,5 @@ RDEPEND=system-libs? ( dev-libs/hiredis:0/0.14 ) python_targets_python3_6? ( dev
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hiredis/hiredis-1.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3ae2ceec02006a8a8a46a5524e0b6685
diff --git a/metadata/md5-cache/dev-python/hiredis-1.1.0 b/metadata/md5-cache/dev-python/hiredis-1.1.0
index e9720ec368bd..427122438267 100644
--- a/metadata/md5-cache/dev-python/hiredis-1.1.0
+++ b/metadata/md5-cache/dev-python/hiredis-1.1.0
@@ -11,5 +11,5 @@ RDEPEND=system-libs? ( dev-libs/hiredis:0/0.14 ) python_targets_python3_6? ( dev
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hiredis/hiredis-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4d6b32cdebc631213a4d156d99f2193a
diff --git a/metadata/md5-cache/dev-python/hpack-3.0.0 b/metadata/md5-cache/dev-python/hpack-3.0.0
index 6acec81c9493..91db31c4881c 100644
--- a/metadata/md5-cache/dev-python/hpack-3.0.0
+++ b/metadata/md5-cache/dev-python/hpack-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/hpack/archive/v3.0.0.tar.gz -> hpack-3.0.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ffdf57b772e75d65dae8371956fcc12a
diff --git a/metadata/md5-cache/dev-python/hpack-4.0.0 b/metadata/md5-cache/dev-python/hpack-4.0.0
index e5fe44fc73be..1d01ec0f3cad 100644
--- a/metadata/md5-cache/dev-python/hpack-4.0.0
+++ b/metadata/md5-cache/dev-python/hpack-4.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/hpack/archive/v4.0.0.tar.gz -> hpack-4.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=003a2c6c5c28138a112d9e296fa88c30
diff --git a/metadata/md5-cache/dev-python/html2text-2020.1.16-r1 b/metadata/md5-cache/dev-python/html2text-2020.1.16-r1
index 749c16c5293b..eb2b3166fef5 100644
--- a/metadata/md5-cache/dev-python/html2text-2020.1.16-r1
+++ b/metadata/md5-cache/dev-python/html2text-2020.1.16-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/html2text/html2text-2020.1.16.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5f1704326d22b8627f6d6d353545e1af
diff --git a/metadata/md5-cache/dev-python/html5-parser-0.4.9 b/metadata/md5-cache/dev-python/html5-parser-0.4.9
index 5f774216e33d..e7ffaaeeff93 100644
--- a/metadata/md5-cache/dev-python/html5-parser-0.4.9
+++ b/metadata/md5-cache/dev-python/html5-parser-0.4.9
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2:= dev-python/chardet[python_targets_python3_6(-)?,pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/h/html5-parser/html5-parser-0.4.9.tar.gz -> html5-parser-0.4.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b0d53c7df6007f0b16842caf7cea0219
diff --git a/metadata/md5-cache/dev-python/html5lib-1.1 b/metadata/md5-cache/dev-python/html5lib-1.1
index 7cd403293557..93016b2d6ffe 100644
--- a/metadata/md5-cache/dev-python/html5lib-1.1
+++ b/metadata/md5-cache/dev-python/html5lib-1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/html5lib/html5lib-1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b7bc4b353a4c205120a9cc90bd18711b
diff --git a/metadata/md5-cache/dev-python/httmock-1.2.5 b/metadata/md5-cache/dev-python/httmock-1.2.5
index e8bbfbde5a42..5052a8ca58f2 100644
--- a/metadata/md5-cache/dev-python/httmock-1.2.5
+++ b/metadata/md5-cache/dev-python/httmock-1.2.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/patrys/httmock/archive/1.2.5.tar.gz -> httmock-1.2.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=37ddea29fe55b17f577fe959e521702a
diff --git a/metadata/md5-cache/dev-python/http-parser-0.9.0 b/metadata/md5-cache/dev-python/http-parser-0.9.0
index 4041c2bb5c10..461bb1c603a3 100644
--- a/metadata/md5-cache/dev-python/http-parser-0.9.0
+++ b/metadata/md5-cache/dev-python/http-parser-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/benoitc/http-parser/archive/0.9.0.tar.gz -> http-parser-0.9.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=86f58ac358ec09c0ac3c2f1de17a0608
diff --git a/metadata/md5-cache/dev-python/httpauth-0.3 b/metadata/md5-cache/dev-python/httpauth-0.3
index 71bd2b973e07..df0308cb96fd 100644
--- a/metadata/md5-cache/dev-python/httpauth-0.3
+++ b/metadata/md5-cache/dev-python/httpauth-0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpauth/httpauth-0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9e33afbeac6141dc0caff1cd2fc34d6d
diff --git a/metadata/md5-cache/dev-python/httpbin-0.7.0-r1 b/metadata/md5-cache/dev-python/httpbin-0.7.0-r1
index 58e48a22e830..63eb061391c7 100644
--- a/metadata/md5-cache/dev-python/httpbin-0.7.0-r1
+++ b/metadata/md5-cache/dev-python/httpbin-0.7.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpbin/httpbin-0.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ea6fc43ac0483f38b5827265bd2bd578
diff --git a/metadata/md5-cache/dev-python/httpbin-0.7.0-r2 b/metadata/md5-cache/dev-python/httpbin-0.7.0-r2
new file mode 100644
index 000000000000..10809560ee99
--- /dev/null
+++ b/metadata/md5-cache/dev-python/httpbin-0.7.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/decorator[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/werkzeug-0.14.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=HTTP Request and Response Service
+EAPI=7
+HOMEPAGE=https://github.com/postmanlabs/httpbin https://pypi.org/project/httpbin/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=MIT
+RDEPEND=dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/decorator[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/werkzeug-0.14.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/h/httpbin/httpbin-0.7.0.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0e0c35a58700dd4e163f207fc003bf46
diff --git a/metadata/md5-cache/dev-python/httplib2-0.18.1-r1 b/metadata/md5-cache/dev-python/httplib2-0.18.1-r1
index e09a17d3ea15..5941657e61c7 100644
--- a/metadata/md5-cache/dev-python/httplib2-0.18.1-r1
+++ b/metadata/md5-cache/dev-python/httplib2-0.18.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httplib2/httplib2-0.18.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f3ba62de0207ba02a2cb7d453a0b3983
diff --git a/metadata/md5-cache/dev-python/httpretty-0.9.6 b/metadata/md5-cache/dev-python/httpretty-0.9.6
index 27438c06da98..05b0e3717cbc 100644
--- a/metadata/md5-cache/dev-python/httpretty-0.9.6
+++ b/metadata/md5-cache/dev-python/httpretty-0.9.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-0.9.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fde8330d5086fb9401a9e727aa64a9de
diff --git a/metadata/md5-cache/dev-python/httpretty-1.0.2-r1 b/metadata/md5-cache/dev-python/httpretty-1.0.2-r1
index 070aed361188..f78b5342aeaf 100644
--- a/metadata/md5-cache/dev-python/httpretty-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/httpretty-1.0.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-1.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ab821b73920a59e531ab7962113a9c4a
diff --git a/metadata/md5-cache/dev-python/httpretty-1.0.3 b/metadata/md5-cache/dev-python/httpretty-1.0.3
index 0cf92d343a46..f6d06601015b 100644
--- a/metadata/md5-cache/dev-python/httpretty-1.0.3
+++ b/metadata/md5-cache/dev-python/httpretty-1.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-1.0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=af824ad5aafa58a9c4e31af8f06c68f1
diff --git a/metadata/md5-cache/dev-python/httpstat-1.3.0 b/metadata/md5-cache/dev-python/httpstat-1.3.0
index 4479084f3ffb..089cfbd127ca 100644
--- a/metadata/md5-cache/dev-python/httpstat-1.3.0
+++ b/metadata/md5-cache/dev-python/httpstat-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/reorx/httpstat/archive/1.3.0.tar.gz -> httpstat-1.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bc04ea18a4542888ca48954dcd37719c
diff --git a/metadata/md5-cache/dev-python/humanfriendly-8.2 b/metadata/md5-cache/dev-python/humanfriendly-8.2
index c0532e6cd24e..8cd3c6b3279e 100644
--- a/metadata/md5-cache/dev-python/humanfriendly-8.2
+++ b/metadata/md5-cache/dev-python/humanfriendly-8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/humanfriendly/humanfriendly-8.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=eb0db93c6970468184f457b73d8e4604
diff --git a/metadata/md5-cache/dev-python/humanize-3.1.0 b/metadata/md5-cache/dev-python/humanize-3.1.0
index 70ffbaa3622e..f5703401e36a 100644
--- a/metadata/md5-cache/dev-python/humanize-3.1.0
+++ b/metadata/md5-cache/dev-python/humanize-3.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/humanize/humanize-3.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b747686b8e7ba21dc308841bfd8d1f2f
diff --git a/metadata/md5-cache/dev-python/hyper-h2-3.2.0 b/metadata/md5-cache/dev-python/hyper-h2-3.2.0
index ca4aa428e132..b87258e1ff88 100644
--- a/metadata/md5-cache/dev-python/hyper-h2-3.2.0
+++ b/metadata/md5-cache/dev-python/hyper-h2-3.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/hyper-h2/archive/v3.2.0.tar.gz -> hyper-h2-3.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bf53453a3daed6008462ada065c79258
diff --git a/metadata/md5-cache/dev-python/hyper-h2-4.0.0 b/metadata/md5-cache/dev-python/hyper-h2-4.0.0
index 7f4220becfa8..50ba4b547e55 100644
--- a/metadata/md5-cache/dev-python/hyper-h2-4.0.0
+++ b/metadata/md5-cache/dev-python/hyper-h2-4.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/hyper-h2/archive/v4.0.0.tar.gz -> hyper-h2-4.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b17ca8921f04cf6d9515aa4a74c64f64
diff --git a/metadata/md5-cache/dev-python/hyperframe-5.2.0 b/metadata/md5-cache/dev-python/hyperframe-5.2.0
index 6227324f564e..40cd6fe6634b 100644
--- a/metadata/md5-cache/dev-python/hyperframe-5.2.0
+++ b/metadata/md5-cache/dev-python/hyperframe-5.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperframe/hyperframe-5.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ce44070b0bcaba69dd9a1676b9676bae
diff --git a/metadata/md5-cache/dev-python/hyperframe-6.0.0 b/metadata/md5-cache/dev-python/hyperframe-6.0.0
index 8f3db3f32e76..f768f41c2b90 100644
--- a/metadata/md5-cache/dev-python/hyperframe-6.0.0
+++ b/metadata/md5-cache/dev-python/hyperframe-6.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperframe/hyperframe-6.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ce44070b0bcaba69dd9a1676b9676bae
diff --git a/metadata/md5-cache/dev-python/hyperlink-20.0.1 b/metadata/md5-cache/dev-python/hyperlink-20.0.1
index ffd675181bca..b25ccec561f7 100644
--- a/metadata/md5-cache/dev-python/hyperlink-20.0.1
+++ b/metadata/md5-cache/dev-python/hyperlink-20.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperlink/hyperlink-20.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4315793e3a7710902efeef61728985e3
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.24.4 b/metadata/md5-cache/dev-python/hypothesis-5.24.4
index 766535bacb3c..cede02f114f3 100644
--- a/metadata/md5-cache/dev-python/hypothesis-5.24.4
+++ b/metadata/md5-cache/dev-python/hypothesis-5.24.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.24.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8c3ac97c34d14941ceffd552a249eede
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.35.4 b/metadata/md5-cache/dev-python/hypothesis-5.35.4
index d99c08da0e0c..e8966cfe13c5 100644
--- a/metadata/md5-cache/dev-python/hypothesis-5.35.4
+++ b/metadata/md5-cache/dev-python/hypothesis-5.35.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.35.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b68dac9d59c95834ec4e5d7484028ebc
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.36.2 b/metadata/md5-cache/dev-python/hypothesis-5.36.2
index 696b91eb175d..2e15a97e4a3e 100644
--- a/metadata/md5-cache/dev-python/hypothesis-5.36.2
+++ b/metadata/md5-cache/dev-python/hypothesis-5.36.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.36.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d068b8753a13a0e289076e7fbb98cc6a
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.37.5 b/metadata/md5-cache/dev-python/hypothesis-5.37.5
index 3a56b6908bc6..a4b91615424a 100644
--- a/metadata/md5-cache/dev-python/hypothesis-5.37.5
+++ b/metadata/md5-cache/dev-python/hypothesis-5.37.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.37.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ad2cb62737b0018755b4f1f621d78d39
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.41.0 b/metadata/md5-cache/dev-python/hypothesis-5.41.0
index f476e3e81763..4b901b43ff26 100644
--- a/metadata/md5-cache/dev-python/hypothesis-5.41.0
+++ b/metadata/md5-cache/dev-python/hypothesis-5.41.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.41.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=86947594f6cd3764c5a4fb23dea5b8e0
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.41.1 b/metadata/md5-cache/dev-python/hypothesis-5.41.1
index adda0e2f9f86..c22696020301 100644
--- a/metadata/md5-cache/dev-python/hypothesis-5.41.1
+++ b/metadata/md5-cache/dev-python/hypothesis-5.41.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.41.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=86947594f6cd3764c5a4fb23dea5b8e0
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.41.2 b/metadata/md5-cache/dev-python/hypothesis-5.41.2
index 843857c24b84..573ee1e59ec7 100644
--- a/metadata/md5-cache/dev-python/hypothesis-5.41.2
+++ b/metadata/md5-cache/dev-python/hypothesis-5.41.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.41.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=86947594f6cd3764c5a4fb23dea5b8e0
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.41.3 b/metadata/md5-cache/dev-python/hypothesis-5.41.3
index c10993b20ad4..8e144deb7160 100644
--- a/metadata/md5-cache/dev-python/hypothesis-5.41.3
+++ b/metadata/md5-cache/dev-python/hypothesis-5.41.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.41.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cfee05718e71de734964203283068061
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.41.4 b/metadata/md5-cache/dev-python/hypothesis-5.41.4
index 50950717862d..426aeee07566 100644
--- a/metadata/md5-cache/dev-python/hypothesis-5.41.4
+++ b/metadata/md5-cache/dev-python/hypothesis-5.41.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.41.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cfee05718e71de734964203283068061
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=763ab15b706893c9e7445e0fde3c7c8f
diff --git a/metadata/md5-cache/dev-python/icalendar-4.0.7 b/metadata/md5-cache/dev-python/icalendar-4.0.7
index 21d3506e2759..0422da2bb5d9 100644
--- a/metadata/md5-cache/dev-python/icalendar-4.0.7
+++ b/metadata/md5-cache/dev-python/icalendar-4.0.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/icalendar/icalendar-4.0.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a0b7704cb36039f84f0123d601f371b4
diff --git a/metadata/md5-cache/dev-python/idna-2.10-r1 b/metadata/md5-cache/dev-python/idna-2.10-r1
index 77aa396f77c7..03f394ea66b0 100644
--- a/metadata/md5-cache/dev-python/idna-2.10-r1
+++ b/metadata/md5-cache/dev-python/idna-2.10-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/i/idna/idna-2.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=989e4b25d3f02d63e2ee00443a08c902
diff --git a/metadata/md5-cache/dev-python/idna-ssl-1.1.0-r1 b/metadata/md5-cache/dev-python/idna-ssl-1.1.0-r1
index 96f94bd02e8d..75b689e1e1b0 100644
--- a/metadata/md5-cache/dev-python/idna-ssl-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/idna-ssl-1.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/idna-ssl/archive/v1.1.0.tar.gz -> idna-ssl-1.1.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4432bd8c9481ec77054abad4e33ed249
diff --git a/metadata/md5-cache/dev-python/ifaddr-0.1.6 b/metadata/md5-cache/dev-python/ifaddr-0.1.6
index f36b7fca42a5..7085ec06fe37 100644
--- a/metadata/md5-cache/dev-python/ifaddr-0.1.6
+++ b/metadata/md5-cache/dev-python/ifaddr-0.1.6
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ifaddr/ifaddr-0.1.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=39f517c305c682ac47e691ef918611a0
diff --git a/metadata/md5-cache/dev-python/ifaddr-0.1.7 b/metadata/md5-cache/dev-python/ifaddr-0.1.7
index 0cfe9b570eab..b5c4c3e94c1d 100644
--- a/metadata/md5-cache/dev-python/ifaddr-0.1.7
+++ b/metadata/md5-cache/dev-python/ifaddr-0.1.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ifaddr/ifaddr-0.1.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1893fd2bc2b55c5f3ab432e568a2e51c
diff --git a/metadata/md5-cache/dev-python/ijson-3.1.1 b/metadata/md5-cache/dev-python/ijson-3.1.1
index 97da2cbd0b55..522f04bf28c5 100644
--- a/metadata/md5-cache/dev-python/ijson-3.1.1
+++ b/metadata/md5-cache/dev-python/ijson-3.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ICRAR/ijson/archive/v3.1.1.tar.gz -> ijson-3.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9cb66c8e6fe60c9a147476f9ab0830d3
diff --git a/metadata/md5-cache/dev-python/imageio-2.6.1 b/metadata/md5-cache/dev-python/imageio-2.6.1
index e8a1d213bc9e..ac104ae66c89 100644
--- a/metadata/md5-cache/dev-python/imageio-2.6.1
+++ b/metadata/md5-cache/dev-python/imageio-2.6.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/imageio/imageio/archive/v2.6.1.tar.gz -> imageio-2.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4aea1dc3ac8c6756b3b393015033ce
diff --git a/metadata/md5-cache/dev-python/imagesize-1.1.0 b/metadata/md5-cache/dev-python/imagesize-1.1.0
index 1dc781f2ddc7..8c0f5f518351 100644
--- a/metadata/md5-cache/dev-python/imagesize-1.1.0
+++ b/metadata/md5-cache/dev-python/imagesize-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/imagesize/imagesize-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=21ca56af0bad0245c6d829b044f103c4
diff --git a/metadata/md5-cache/dev-python/imagesize-1.2.0 b/metadata/md5-cache/dev-python/imagesize-1.2.0
index fe0d0432da2a..c278b0ce0194 100644
--- a/metadata/md5-cache/dev-python/imagesize-1.2.0
+++ b/metadata/md5-cache/dev-python/imagesize-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/imagesize/imagesize-1.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1096595e6b359f691d3f1ce9bdf32a48
diff --git a/metadata/md5-cache/dev-python/imapclient-2.1.0 b/metadata/md5-cache/dev-python/imapclient-2.1.0
index 3a6d8eeed1b4..f362dc197b2e 100644
--- a/metadata/md5-cache/dev-python/imapclient-2.1.0
+++ b/metadata/md5-cache/dev-python/imapclient-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/mjs/imapclient/archive/2.1.0.tar.gz -> imapclient-2.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0f1494e69d317b941346ef116f6102a1
diff --git a/metadata/md5-cache/dev-python/iminuit-1.3.8 b/metadata/md5-cache/dev-python/iminuit-1.3.8
index 4b4033e10892..d489b72c6888 100644
--- a/metadata/md5-cache/dev-python/iminuit-1.3.8
+++ b/metadata/md5-cache/dev-python/iminuit-1.3.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/iminuit/iminuit-1.3.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=bd5e9ae68d8f680478b8c0b57865b42f
diff --git a/metadata/md5-cache/dev-python/immutables-0.14 b/metadata/md5-cache/dev-python/immutables-0.14
index 2e125f52c6b7..acb5a1eb1f05 100644
--- a/metadata/md5-cache/dev-python/immutables-0.14
+++ b/metadata/md5-cache/dev-python/immutables-0.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/MagicStack/immutables/archive/v0.14.tar.gz -> immutables-0.14.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e2e27800963f34b310001f07ee33f93c
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-1.7.0-r2 b/metadata/md5-cache/dev-python/importlib_metadata-1.7.0-r2
index 4d1f7f307fd7..7df2a241455b 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-1.7.0-r2
+++ b/metadata/md5-cache/dev-python/importlib_metadata-1.7.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-1.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=75495096970552b6ee1308214e086f30
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-2.0.0 b/metadata/md5-cache/dev-python/importlib_metadata-2.0.0
index c4192d9ade65..b12447adecd4 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-2.0.0
+++ b/metadata/md5-cache/dev-python/importlib_metadata-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=49535bba59f9cb81859d27baa3ff490b
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-3.1.0 b/metadata/md5-cache/dev-python/importlib_metadata-3.1.0
index 0a7b5754a1a1..b9e9d80875f2 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-3.1.0
+++ b/metadata/md5-cache/dev-python/importlib_metadata-3.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-3.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7257cc04ba27878a0a57a9474b14f528
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-3.0.0 b/metadata/md5-cache/dev-python/importlib_metadata-3.1.1
similarity index 55%
rename from metadata/md5-cache/dev-python/importlib_metadata-3.0.0
rename to metadata/md5-cache/dev-python/importlib_metadata-3.1.1
index 67e3697cbb10..1413d550075e 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-3.0.0
+++ b/metadata/md5-cache/dev-python/importlib_metadata-3.1.1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/importlib_resources-1.3.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyfakefs[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/rst-linker[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/rst-linker[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/rst-linker[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/rst-linker[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/importlib_resources-1.3.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyfakefs[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/jaraco-packaging[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/rst-linker[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/jaraco-packaging[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/rst-linker[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/jaraco-packaging[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/rst-linker[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/jaraco-packaging[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/rst-linker[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Read metadata from Python packages
 EAPI=7
 HOMEPAGE=https://github.com/python/importlib_metadata
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-3.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=64a280c90b0d34f3ae9e9a63e45727ea
+SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-3.1.1.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b118f23cb8f4408151aa7b2004c43140
diff --git a/metadata/md5-cache/dev-python/importlib_resources-1.5.0-r2 b/metadata/md5-cache/dev-python/importlib_resources-1.5.0-r2
index 20e778a6095e..e5d1c08feabe 100644
--- a/metadata/md5-cache/dev-python/importlib_resources-1.5.0-r2
+++ b/metadata/md5-cache/dev-python/importlib_resources-1.5.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_resources/importlib_resources-1.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e09afe65ccb3b5e926f7b3a40e1c6e77
diff --git a/metadata/md5-cache/dev-python/importlib_resources-3.3.0 b/metadata/md5-cache/dev-python/importlib_resources-3.3.0
index 6572ed330411..f02b3692bea4 100644
--- a/metadata/md5-cache/dev-python/importlib_resources-3.3.0
+++ b/metadata/md5-cache/dev-python/importlib_resources-3.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_resources/importlib_resources-3.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7294108c2ddf7adfa6ec5e8c719ca85e
diff --git a/metadata/md5-cache/dev-python/imread-0.7.3 b/metadata/md5-cache/dev-python/imread-0.7.3
index b9c4c9a70ff8..e31f231930b3 100644
--- a/metadata/md5-cache/dev-python/imread-0.7.3
+++ b/metadata/md5-cache/dev-python/imread-0.7.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luispedro/imread/archive/v0.7.3.tar.gz -> imread-0.7.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8f42738b23b08e2319cac3a95f10e31b
diff --git a/metadata/md5-cache/dev-python/incremental-17.5.0 b/metadata/md5-cache/dev-python/incremental-17.5.0
index 77549c480ac0..ba3611e1511e 100644
--- a/metadata/md5-cache/dev-python/incremental-17.5.0
+++ b/metadata/md5-cache/dev-python/incremental-17.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/i/incremental/incremental-17.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f1e6caaf26701b0d4ec93a6ba0d0174
diff --git a/metadata/md5-cache/dev-python/indexed_gzip-0.8.10 b/metadata/md5-cache/dev-python/indexed_gzip-0.8.10
index 9eea98430cd7..6c3a7976282d 100644
--- a/metadata/md5-cache/dev-python/indexed_gzip-0.8.10
+++ b/metadata/md5-cache/dev-python/indexed_gzip-0.8.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pauldmccarthy/indexed_gzip/archive/v0.8.10.tar.gz -> indexed_gzip-0.8.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=af593433c194bde15a4d9f06e81854ac
diff --git a/metadata/md5-cache/dev-python/inflect-4.1.0 b/metadata/md5-cache/dev-python/inflect-4.1.0
index f619e1a3cc69..5ffb89e90bee 100644
--- a/metadata/md5-cache/dev-python/inflect-4.1.0
+++ b/metadata/md5-cache/dev-python/inflect-4.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/inflect/inflect-4.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ae26f99f8b7b499f06951f2045dbc086
diff --git a/metadata/md5-cache/dev-python/inflect-5.0.2 b/metadata/md5-cache/dev-python/inflect-5.0.2
index 980e27d497db..78a6f19bf7a8 100644
--- a/metadata/md5-cache/dev-python/inflect-5.0.2
+++ b/metadata/md5-cache/dev-python/inflect-5.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/inflect/inflect-5.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=80e0be3282464b6b82883c58d6832aac
diff --git a/metadata/md5-cache/dev-python/inflection-0.5.1 b/metadata/md5-cache/dev-python/inflection-0.5.1
index e55e1d970d1a..b5f952da6c88 100644
--- a/metadata/md5-cache/dev-python/inflection-0.5.1
+++ b/metadata/md5-cache/dev-python/inflection-0.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/inflection/inflection-0.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=50517b734c0255e53a8f855119baddb9
diff --git a/metadata/md5-cache/dev-python/influxdb-5.3.0-r1 b/metadata/md5-cache/dev-python/influxdb-5.3.0-r1
index adf518a8e720..46677397965d 100644
--- a/metadata/md5-cache/dev-python/influxdb-5.3.0-r1
+++ b/metadata/md5-cache/dev-python/influxdb-5.3.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/influxdb/influxdb-5.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e2b4de57940cc2fef83503776d884d1e
diff --git a/metadata/md5-cache/dev-python/iniconfig-1.0.0 b/metadata/md5-cache/dev-python/iniconfig-1.0.0
index 91f42a7f3ad4..c45b3d2a8e08 100644
--- a/metadata/md5-cache/dev-python/iniconfig-1.0.0
+++ b/metadata/md5-cache/dev-python/iniconfig-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/iniconfig/iniconfig-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d95b60aad919c0585e62387914b60aed
diff --git a/metadata/md5-cache/dev-python/iniparse-0.4-r2 b/metadata/md5-cache/dev-python/iniparse-0.4-r2
index 11fd910645b2..e411c13a4697 100644
--- a/metadata/md5-cache/dev-python/iniparse-0.4-r2
+++ b/metadata/md5-cache/dev-python/iniparse-0.4-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/i/iniparse/iniparse-0.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=46be9041c4bf2e70a7d78990ccdea124
diff --git a/metadata/md5-cache/dev-python/iniparse-0.5 b/metadata/md5-cache/dev-python/iniparse-0.5
index 442f4243f9c2..5826f21fa39b 100644
--- a/metadata/md5-cache/dev-python/iniparse-0.5
+++ b/metadata/md5-cache/dev-python/iniparse-0.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/six-1.10.0[python_targets_python3_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/i/iniparse/iniparse-0.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=33bea70fa0c836c8eee452b45e69ce49
diff --git a/metadata/md5-cache/dev-python/intelhex-2.3.0 b/metadata/md5-cache/dev-python/intelhex-2.3.0
index 528aa66a0ed3..fc8f0d4c5e81 100644
--- a/metadata/md5-cache/dev-python/intelhex-2.3.0
+++ b/metadata/md5-cache/dev-python/intelhex-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/I/IntelHex/intelhex-2.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=306b106801ffaa17e33c6f1b676a2706
diff --git a/metadata/md5-cache/dev-python/intervaltree-3.0.2 b/metadata/md5-cache/dev-python/intervaltree-3.0.2
index 3454f72bcacc..6a12d47198e6 100644
--- a/metadata/md5-cache/dev-python/intervaltree-3.0.2
+++ b/metadata/md5-cache/dev-python/intervaltree-3.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/intervaltree/intervaltree-3.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=11c37e14176fc769a14c3f165949d32b
diff --git a/metadata/md5-cache/dev-python/intreehooks-1.0 b/metadata/md5-cache/dev-python/intreehooks-1.0
index 07b9d587103f..45ca556ba74d 100644
--- a/metadata/md5-cache/dev-python/intreehooks-1.0
+++ b/metadata/md5-cache/dev-python/intreehooks-1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/intreehooks/intreehooks-1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=862ae25bdb814f2c8df1d7446607f6cb
diff --git a/metadata/md5-cache/dev-python/iocapture-0.1.2-r2 b/metadata/md5-cache/dev-python/iocapture-0.1.2-r2
index 04a180780b7c..98f4d37cf375 100644
--- a/metadata/md5-cache/dev-python/iocapture-0.1.2-r2
+++ b/metadata/md5-cache/dev-python/iocapture-0.1.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oinume/iocapture/archive/0.1.2.tar.gz -> iocapture-0.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=baf52e3ccdf5ffa07f193de0cf005e83
diff --git a/metadata/md5-cache/dev-python/ioflo-2.0.0 b/metadata/md5-cache/dev-python/ioflo-2.0.0
index dee8105eece0..11e8e09f0bc1 100644
--- a/metadata/md5-cache/dev-python/ioflo-2.0.0
+++ b/metadata/md5-cache/dev-python/ioflo-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ioflo/ioflo/archive/v2.0.0.tar.gz -> ioflo-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1cfb5a7b0cd8fd290be46d09546e98ab
diff --git a/metadata/md5-cache/dev-python/ioflo-2.0.2 b/metadata/md5-cache/dev-python/ioflo-2.0.2
index e59908714796..4ecb7ae670ac 100644
--- a/metadata/md5-cache/dev-python/ioflo-2.0.2
+++ b/metadata/md5-cache/dev-python/ioflo-2.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ioflo/ioflo/archive/v2.0.2.tar.gz -> ioflo-2.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7ff6f77b654492a4a20385185e796183
diff --git a/metadata/md5-cache/dev-python/ipaddr-2.2.0-r1 b/metadata/md5-cache/dev-python/ipaddr-2.2.0-r1
index 27f175bfb03a..7b8537ef2f72 100644
--- a/metadata/md5-cache/dev-python/ipaddr-2.2.0-r1
+++ b/metadata/md5-cache/dev-python/ipaddr-2.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipaddr/ipaddr-2.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8e1b6774d12e4488f2c25ae740d6288d
diff --git a/metadata/md5-cache/dev-python/ipdb-0.10.3-r1 b/metadata/md5-cache/dev-python/ipdb-0.10.3-r1
index 68b807ae080a..3ee73ede2770 100644
--- a/metadata/md5-cache/dev-python/ipdb-0.10.3-r1
+++ b/metadata/md5-cache/dev-python/ipdb-0.10.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ipython[python_targets_python3_7(-)?,python_targets_python3_8
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipdb/ipdb-0.10.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bf3eeebe536556e5cf8543aac5953425
diff --git a/metadata/md5-cache/dev-python/ipy-1.00 b/metadata/md5-cache/dev-python/ipy-1.00
index f29937b7a343..7c0f8a55055e 100644
--- a/metadata/md5-cache/dev-python/ipy-1.00
+++ b/metadata/md5-cache/dev-python/ipy-1.00
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/I/IPy/IPy-1.00.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2b49c504645970dc94623620a20c395b
diff --git a/metadata/md5-cache/dev-python/ipykernel-5.3.4 b/metadata/md5-cache/dev-python/ipykernel-5.3.4
index 1cb8f34c2ba0..0129638eff08 100644
--- a/metadata/md5-cache/dev-python/ipykernel-5.3.4
+++ b/metadata/md5-cache/dev-python/ipykernel-5.3.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-5.3.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=df4ac41fa6900353a263037da942742e
diff --git a/metadata/md5-cache/dev-python/ipykernel-5.3.4-r1 b/metadata/md5-cache/dev-python/ipykernel-5.3.4-r1
index 70e8c4388d03..aa04221d36c7 100644
--- a/metadata/md5-cache/dev-python/ipykernel-5.3.4-r1
+++ b/metadata/md5-cache/dev-python/ipykernel-5.3.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-5.3.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=af2357f65097a8f2a4b40523241b24fe
diff --git a/metadata/md5-cache/dev-python/ipyparallel-6.3.0 b/metadata/md5-cache/dev-python/ipyparallel-6.3.0
index b90e7584ccab..84bafa88bf10 100644
--- a/metadata/md5-cache/dev-python/ipyparallel-6.3.0
+++ b/metadata/md5-cache/dev-python/ipyparallel-6.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipyparallel/ipyparallel-6.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b7e49378974044d52bca34da1224b741
diff --git a/metadata/md5-cache/dev-python/ipyparallel-6.3.0-r1 b/metadata/md5-cache/dev-python/ipyparallel-6.3.0-r1
index 92cde0ac1d5d..2e0e1f7812d1 100644
--- a/metadata/md5-cache/dev-python/ipyparallel-6.3.0-r1
+++ b/metadata/md5-cache/dev-python/ipyparallel-6.3.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipyparallel/ipyparallel-6.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=930fabd07c29462023e2c0f1e9c688fc
diff --git a/metadata/md5-cache/dev-python/ipython-7.16.1 b/metadata/md5-cache/dev-python/ipython-7.16.1
index d877237a5deb..66c11deb45a8 100644
--- a/metadata/md5-cache/dev-python/ipython-7.16.1
+++ b/metadata/md5-cache/dev-python/ipython-7.16.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-7.16.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=dfecf31f1ed580259dd7d020ae5cfcfd
diff --git a/metadata/md5-cache/dev-python/ipython-7.18.1 b/metadata/md5-cache/dev-python/ipython-7.18.1
index b37f2b8c12c5..cc4dad2cbe7f 100644
--- a/metadata/md5-cache/dev-python/ipython-7.18.1
+++ b/metadata/md5-cache/dev-python/ipython-7.18.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-7.18.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=f64fc73f1b408ab57a8a5f393a18ee49
diff --git a/metadata/md5-cache/dev-python/ipython-7.19.0 b/metadata/md5-cache/dev-python/ipython-7.19.0
index 9dc89cc27e18..c43e192b1d05 100644
--- a/metadata/md5-cache/dev-python/ipython-7.19.0
+++ b/metadata/md5-cache/dev-python/ipython-7.19.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-7.19.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=a8fa2b07669a14558698e7558e7507f0
diff --git a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r1 b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r1
index ea4bc9785344..1125a419b900 100644
--- a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r1
+++ b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython_genutils/ipython_genutils-0.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=aacd62a9cc1785e683bd9409a830cdbb
diff --git a/metadata/md5-cache/dev-python/ipywidgets-7.5.1 b/metadata/md5-cache/dev-python/ipywidgets-7.5.1
index 5b1716e6b5f7..d2f3813b0364 100644
--- a/metadata/md5-cache/dev-python/ipywidgets-7.5.1
+++ b/metadata/md5-cache/dev-python/ipywidgets-7.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipywidgets/ipywidgets-7.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ec4fc62d66f0ee18d8ea6fd6c416b56e
diff --git a/metadata/md5-cache/dev-python/ipywidgets-7.5.1-r1 b/metadata/md5-cache/dev-python/ipywidgets-7.5.1-r1
index 988dba007c4c..dea7984601be 100644
--- a/metadata/md5-cache/dev-python/ipywidgets-7.5.1-r1
+++ b/metadata/md5-cache/dev-python/ipywidgets-7.5.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipywidgets/ipywidgets-7.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1041604a1292b6755e59b3f4a4bb6940
diff --git a/metadata/md5-cache/dev-python/irc-19.0.1 b/metadata/md5-cache/dev-python/irc-19.0.1
index bae5f6d7b8f5..bc03e4363517 100644
--- a/metadata/md5-cache/dev-python/irc-19.0.1
+++ b/metadata/md5-cache/dev-python/irc-19.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/irc/irc-19.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2ec8df7a23fa79a791869015fbc2437a
diff --git a/metadata/md5-cache/dev-python/iso8601-0.1.12-r1 b/metadata/md5-cache/dev-python/iso8601-0.1.12-r1
index fa3cb9fceab2..c6f2baea5551 100644
--- a/metadata/md5-cache/dev-python/iso8601-0.1.12-r1
+++ b/metadata/md5-cache/dev-python/iso8601-0.1.12-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/iso8601/iso8601-0.1.12.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5c94cf4cacb38cd95aa66d2aa884abcf
diff --git a/metadata/md5-cache/dev-python/isodate-0.6.0-r1 b/metadata/md5-cache/dev-python/isodate-0.6.0-r1
index 8259b1831189..13a849dbe10a 100644
--- a/metadata/md5-cache/dev-python/isodate-0.6.0-r1
+++ b/metadata/md5-cache/dev-python/isodate-0.6.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/isodate/isodate-0.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e1d4c0b6fa4f2b7b0593b4647e9ee071
diff --git a/metadata/md5-cache/dev-python/isort-4.3.15 b/metadata/md5-cache/dev-python/isort-4.3.15
index 514d2eab4fe2..4d54424d3042 100644
--- a/metadata/md5-cache/dev-python/isort-4.3.15
+++ b/metadata/md5-cache/dev-python/isort-4.3.15
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/isort/isort-4.3.15.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=085e9a991b7472063a273b6bad5c492f
diff --git a/metadata/md5-cache/dev-python/isort-4.3.21_p2-r1 b/metadata/md5-cache/dev-python/isort-4.3.21_p2-r1
index 9204b0592dee..a00541175798 100644
--- a/metadata/md5-cache/dev-python/isort-4.3.21_p2-r1
+++ b/metadata/md5-cache/dev-python/isort-4.3.21_p2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/timothycrosley/isort/archive/4.3.21-2.tar.gz -> isort-4.3.21_p2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c9b46e0a1bbc6d6cb78868184084e0eb
diff --git a/metadata/md5-cache/dev-python/isort-5.6.3 b/metadata/md5-cache/dev-python/isort-5.6.3
index 89ccbc72c48e..154367e11dd6 100644
--- a/metadata/md5-cache/dev-python/isort-5.6.3
+++ b/metadata/md5-cache/dev-python/isort-5.6.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/isort/isort-5.6.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f4dfe4a29c0b565c7b18ec6945a9e1cd
diff --git a/metadata/md5-cache/dev-python/itsdangerous-1.1.0-r1 b/metadata/md5-cache/dev-python/itsdangerous-1.1.0-r1
index 58287bc774a1..031e67af6c5d 100644
--- a/metadata/md5-cache/dev-python/itsdangerous-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/itsdangerous-1.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/itsdangerous/itsdangerous-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2d6e138857e4e67c33d3ec58f0f5e0e8
diff --git a/metadata/md5-cache/dev-python/itypes-1.1.0 b/metadata/md5-cache/dev-python/itypes-1.1.0
index 997ccc593515..c5fdacfe5cf9 100644
--- a/metadata/md5-cache/dev-python/itypes-1.1.0
+++ b/metadata/md5-cache/dev-python/itypes-1.1.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=basic immutable container types for python
 EAPI=7
 HOMEPAGE=https://github.com/tomchristie/itypes
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/i/itypes/itypes-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5a1ffaefe5a6ed25e457388c8324e7bf
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a2bf08048215d54cc8c5642f59f19277
diff --git a/metadata/md5-cache/dev-python/jaraco-classes-3.1.0 b/metadata/md5-cache/dev-python/jaraco-classes-3.1.0
index e50f868d6adf..382bb423ed5c 100644
--- a/metadata/md5-cache/dev-python/jaraco-classes-3.1.0
+++ b/metadata/md5-cache/dev-python/jaraco-classes-3.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.classes/jaraco.classes-3.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=77cb63c66a171d91b82b29cfc229dac9
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-3.0.0 b/metadata/md5-cache/dev-python/jaraco-collections-3.0.0
index fd5e0115ab85..26686a199cc2 100644
--- a/metadata/md5-cache/dev-python/jaraco-collections-3.0.0
+++ b/metadata/md5-cache/dev-python/jaraco-collections-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.collections/jaraco.collections-3.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c152f8c0d987fca750d48bc4afb464ef
diff --git a/metadata/md5-cache/dev-python/jaraco-context-3.0.0 b/metadata/md5-cache/dev-python/jaraco-context-3.0.0
index 34f19c286a37..cac7bde2e344 100644
--- a/metadata/md5-cache/dev-python/jaraco-context-3.0.0
+++ b/metadata/md5-cache/dev-python/jaraco-context-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.context/jaraco.context-3.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6927ee65dccf66c8ddf0fad181449e63
diff --git a/metadata/md5-cache/dev-python/jaraco-envs-2.0.0 b/metadata/md5-cache/dev-python/jaraco-envs-2.0.0
index 07f30623979b..af37c9a746c1 100644
--- a/metadata/md5-cache/dev-python/jaraco-envs-2.0.0
+++ b/metadata/md5-cache/dev-python/jaraco-envs-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.envs/jaraco.envs-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=eb6228d56115dcb1408803be342905d3
diff --git a/metadata/md5-cache/dev-python/jaraco-functools-3.0.1 b/metadata/md5-cache/dev-python/jaraco-functools-3.0.1
index 3a382da7c7d2..67535fa8c50e 100644
--- a/metadata/md5-cache/dev-python/jaraco-functools-3.0.1
+++ b/metadata/md5-cache/dev-python/jaraco-functools-3.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.functools/jaraco.functools-3.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4d9da5157042a6c52ea9331dfc1db24b
diff --git a/metadata/md5-cache/dev-python/jaraco-itertools-5.0.0 b/metadata/md5-cache/dev-python/jaraco-itertools-5.0.0
index 92e067c659e1..32f13d23d0be 100644
--- a/metadata/md5-cache/dev-python/jaraco-itertools-5.0.0
+++ b/metadata/md5-cache/dev-python/jaraco-itertools-5.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.itertools/jaraco.itertools-5.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7d79e36d581d6b64cc0353ea067361d1
diff --git a/metadata/md5-cache/dev-python/jaraco-logging-3.0.0-r1 b/metadata/md5-cache/dev-python/jaraco-logging-3.0.0-r1
index 5f858e95fad9..08407a1e56cb 100644
--- a/metadata/md5-cache/dev-python/jaraco-logging-3.0.0-r1
+++ b/metadata/md5-cache/dev-python/jaraco-logging-3.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.logging/jaraco.logging-3.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7fa930147854395a5a78a2f7a58be982
diff --git a/metadata/md5-cache/dev-python/jaraco-packaging-8.1.0-r1 b/metadata/md5-cache/dev-python/jaraco-packaging-8.1.0-r1
index e5185ff3aeb0..557a55cc39c4 100644
--- a/metadata/md5-cache/dev-python/jaraco-packaging-8.1.0-r1
+++ b/metadata/md5-cache/dev-python/jaraco-packaging-8.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.packaging/jaraco.packaging-8.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1e2778570f5d9ef32435dc6164e932b4
diff --git a/metadata/md5-cache/dev-python/jaraco-packaging-8.1.1 b/metadata/md5-cache/dev-python/jaraco-packaging-8.1.1
index 1cae66e2c346..ba5b955d3c33 100644
--- a/metadata/md5-cache/dev-python/jaraco-packaging-8.1.1
+++ b/metadata/md5-cache/dev-python/jaraco-packaging-8.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.packaging/jaraco.packaging-8.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f8658a8fd6db3a1d9b5c622c3910dacd
diff --git a/metadata/md5-cache/dev-python/jaraco-stream-3.0.0 b/metadata/md5-cache/dev-python/jaraco-stream-3.0.0
index 1f5dcfbba293..1ee42c48baa3 100644
--- a/metadata/md5-cache/dev-python/jaraco-stream-3.0.0
+++ b/metadata/md5-cache/dev-python/jaraco-stream-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.stream/jaraco.stream-3.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e9d4e5b00c54d64b1c480ebee0fcb64a
diff --git a/metadata/md5-cache/dev-python/jaraco-text-3.2.0 b/metadata/md5-cache/dev-python/jaraco-text-3.2.0
index 25ab492af269..01f55a1275d0 100644
--- a/metadata/md5-cache/dev-python/jaraco-text-3.2.0
+++ b/metadata/md5-cache/dev-python/jaraco-text-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.text/jaraco.text-3.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b9aa132fc6d5a63b925567d97e45c516
diff --git a/metadata/md5-cache/dev-python/jdcal-1.4.1 b/metadata/md5-cache/dev-python/jdcal-1.4.1
index 92d131d8c0b8..a562587fbfe0 100644
--- a/metadata/md5-cache/dev-python/jdcal-1.4.1
+++ b/metadata/md5-cache/dev-python/jdcal-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jdcal/jdcal-1.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f298b381646c7cc27909f5b2510b401f
diff --git a/metadata/md5-cache/dev-python/jedi-0.17.1-r1 b/metadata/md5-cache/dev-python/jedi-0.17.1-r1
index f5105f2bea7e..332a7aa1b025 100644
--- a/metadata/md5-cache/dev-python/jedi-0.17.1-r1
+++ b/metadata/md5-cache/dev-python/jedi-0.17.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.17.1.tar.gz -> jedi-0.17.1.tar.gz https://github.com/davidhalter/typeshed/archive/jedi_v0.16.0.tar.gz -> typeshed-jedi_v0.16.0.tar.gz https://github.com/davidhalter/django-stubs/archive/v1.5.0.tar.gz -> django-stubs-1.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=351b6a6fd0537709011fd52d19546d75
diff --git a/metadata/md5-cache/dev-python/jedi-0.17.2-r1 b/metadata/md5-cache/dev-python/jedi-0.17.2-r1
index dbf2c45d84e5..f426e219265d 100644
--- a/metadata/md5-cache/dev-python/jedi-0.17.2-r1
+++ b/metadata/md5-cache/dev-python/jedi-0.17.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.17.2.tar.gz -> jedi-0.17.2.tar.gz https://github.com/davidhalter/typeshed/archive/jedi_v0.16.0.tar.gz -> typeshed-jedi_v0.16.0.tar.gz https://github.com/davidhalter/django-stubs/archive/v1.5.0.tar.gz -> django-stubs-1.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9c68cac321b4b5225af1c1c7688e7cd5
diff --git a/metadata/md5-cache/dev-python/jeepney-0.4.3 b/metadata/md5-cache/dev-python/jeepney-0.4.3
index 7d178a4ced29..66b285a44848 100644
--- a/metadata/md5-cache/dev-python/jeepney-0.4.3
+++ b/metadata/md5-cache/dev-python/jeepney-0.4.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jeepney/jeepney-0.4.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2bbbe86e4188a797363cf201a3c73bbf
diff --git a/metadata/md5-cache/dev-python/jeepney-0.5.0 b/metadata/md5-cache/dev-python/jeepney-0.5.0
index 29457641cc4b..4f1d8f6b54da 100644
--- a/metadata/md5-cache/dev-python/jeepney-0.5.0
+++ b/metadata/md5-cache/dev-python/jeepney-0.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jeepney/jeepney-0.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5434d3667467e1491d4442dc8c10ae16
diff --git a/metadata/md5-cache/dev-python/jeepney-0.6.0 b/metadata/md5-cache/dev-python/jeepney-0.6.0
index 70af94885b98..36429aadd30d 100644
--- a/metadata/md5-cache/dev-python/jeepney-0.6.0
+++ b/metadata/md5-cache/dev-python/jeepney-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jeepney/jeepney-0.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cbd0fc831d394c971cfd5198e2a20b3c
diff --git a/metadata/md5-cache/dev-python/jellyfish-0.8.2 b/metadata/md5-cache/dev-python/jellyfish-0.8.2
index 6a4c6118a803..16aa99538480 100644
--- a/metadata/md5-cache/dev-python/jellyfish-0.8.2
+++ b/metadata/md5-cache/dev-python/jellyfish-0.8.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jellyfish/jellyfish-0.8.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8a6ca5343a17918d78e0f3721e2d9bfd
diff --git a/metadata/md5-cache/dev-python/jikanpy-4.2.1 b/metadata/md5-cache/dev-python/jikanpy-4.2.1
index 8e68fee03144..d0be6a2ad49d 100644
--- a/metadata/md5-cache/dev-python/jikanpy-4.2.1
+++ b/metadata/md5-cache/dev-python/jikanpy-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/aiohttp[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/abhinavk99/jikanpy/archive/v4.2.1.tar.gz -> jikanpy-4.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0ab07ac94f02657c647cae0525749a8e
diff --git a/metadata/md5-cache/dev-python/jinja-2.11.2-r1 b/metadata/md5-cache/dev-python/jinja-2.11.2-r1
index 566ce3821cdc..8e857eb88ac7 100644
--- a/metadata/md5-cache/dev-python/jinja-2.11.2-r1
+++ b/metadata/md5-cache/dev-python/jinja-2.11.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/jinja/archive/2.11.2.tar.gz -> jinja-2.11.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a71883c0a1bf5f4e8e119e04f3dce607
diff --git a/metadata/md5-cache/dev-python/jinja2-time-0.2.0 b/metadata/md5-cache/dev-python/jinja2-time-0.2.0
index 09b9e0976fd4..2e06f1959c29 100644
--- a/metadata/md5-cache/dev-python/jinja2-time-0.2.0
+++ b/metadata/md5-cache/dev-python/jinja2-time-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jinja2-time/jinja2-time-0.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c9b16b54ab647c122aba1f3ac45e8f5a
diff --git a/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0 b/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
index c380bf9c49fe..c1b8e90ede91 100644
--- a/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
+++ b/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/inflect[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jinja2_pluralize/jinja2_pluralize-0.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=44604ef94d3cc4da973abc44ca292e6b
diff --git a/metadata/md5-cache/dev-python/jmespath-0.10.0 b/metadata/md5-cache/dev-python/jmespath-0.10.0
index a1acf2db1b41..3cf9aa2cf7b8 100644
--- a/metadata/md5-cache/dev-python/jmespath-0.10.0
+++ b/metadata/md5-cache/dev-python/jmespath-0.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 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	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a754acd0058eb97a74f99ae284075270
diff --git a/metadata/md5-cache/dev-python/joblib-0.17.0 b/metadata/md5-cache/dev-python/joblib-0.17.0
index deaef76814e5..e8ae3a4fa59f 100644
--- a/metadata/md5-cache/dev-python/joblib-0.17.0
+++ b/metadata/md5-cache/dev-python/joblib-0.17.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joblib/joblib/archive/0.17.0.tar.gz -> joblib-0.17.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f59cc81a64d5628c6b05fed4e95c91a3
diff --git a/metadata/md5-cache/dev-python/josepy-1.4.0 b/metadata/md5-cache/dev-python/josepy-1.4.0
index cfdb172d78fc..8a298c077750 100644
--- a/metadata/md5-cache/dev-python/josepy-1.4.0
+++ b/metadata/md5-cache/dev-python/josepy-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/josepy/josepy-1.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fe8a65e9f022bc8f5d6cdb8d41419a28
diff --git a/metadata/md5-cache/dev-python/josepy-1.5.0 b/metadata/md5-cache/dev-python/josepy-1.5.0
new file mode 100644
index 000000000000..7e4a5883a3db
--- /dev/null
+++ b/metadata/md5-cache/dev-python/josepy-1.5.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/cryptography-0.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.13[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=JOSE protocol implementation in Python
+EAPI=7
+HOMEPAGE=https://github.com/certbot/josepy
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-0.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.13[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/josepy/josepy-1.5.0.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2ccbeee3dfc4bd3f63876a1c78d3cb71
diff --git a/metadata/md5-cache/dev-python/jsmin-2.2.2 b/metadata/md5-cache/dev-python/jsmin-2.2.2
index 1eb80266e492..6aa21cff0210 100644
--- a/metadata/md5-cache/dev-python/jsmin-2.2.2
+++ b/metadata/md5-cache/dev-python/jsmin-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsmin/jsmin-2.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9f829f8820bedac8cf0c220d7a1ffb38
diff --git a/metadata/md5-cache/dev-python/json-rpc-1.13.0 b/metadata/md5-cache/dev-python/json-rpc-1.13.0
index f2eb15aa4d3c..eb9a548e11ee 100644
--- a/metadata/md5-cache/dev-python/json-rpc-1.13.0
+++ b/metadata/md5-cache/dev-python/json-rpc-1.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/json-rpc/json-rpc-1.13.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c9ad8558972d038267b4de824121abb0
diff --git a/metadata/md5-cache/dev-python/jsondiff-1.2.0 b/metadata/md5-cache/dev-python/jsondiff-1.2.0
index 17d807f2645f..b9865fc87db4 100644
--- a/metadata/md5-cache/dev-python/jsondiff-1.2.0
+++ b/metadata/md5-cache/dev-python/jsondiff-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fzumstein/jsondiff/archive/v1.2.0.tar.gz -> jsondiff-1.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=895aa5d28ed5e36faf34312c38266f2d
diff --git a/metadata/md5-cache/dev-python/jsonext-0.4.2 b/metadata/md5-cache/dev-python/jsonext-0.4.2
index 5daafc7e44e6..6d7f72e36456 100644
--- a/metadata/md5-cache/dev-python/jsonext-0.4.2
+++ b/metadata/md5-cache/dev-python/jsonext-0.4.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonext/jsonext-0.4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fe6800d47e986504e30df7d57b916972
diff --git a/metadata/md5-cache/dev-python/jsonmerge-1.6.0 b/metadata/md5-cache/dev-python/jsonmerge-1.6.0
index bbf70d4d7810..5093161d5d42 100644
--- a/metadata/md5-cache/dev-python/jsonmerge-1.6.0
+++ b/metadata/md5-cache/dev-python/jsonmerge-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/jsonschema[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonmerge/jsonmerge-1.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=64d38080f24c0bdfd6e99512560a6b3d
diff --git a/metadata/md5-cache/dev-python/jsonpatch-1.26 b/metadata/md5-cache/dev-python/jsonpatch-1.26
index a642970d64cf..2041ea5cfa1a 100644
--- a/metadata/md5-cache/dev-python/jsonpatch-1.26
+++ b/metadata/md5-cache/dev-python/jsonpatch-1.26
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stefankoegl/python-json-patch/archive/v1.26.tar.gz -> jsonpatch-1.26.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6a3dde95402930bce42501dc547c9039
diff --git a/metadata/md5-cache/dev-python/jsonpatch-1.27 b/metadata/md5-cache/dev-python/jsonpatch-1.27
index aea866ca995c..53db87b472b2 100644
--- a/metadata/md5-cache/dev-python/jsonpatch-1.27
+++ b/metadata/md5-cache/dev-python/jsonpatch-1.27
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stefankoegl/python-json-patch/archive/v1.27.tar.gz -> jsonpatch-1.27.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e0a0e63e99d2cb1cd8b6ffdda6016a60
diff --git a/metadata/md5-cache/dev-python/jsonpatch-1.28 b/metadata/md5-cache/dev-python/jsonpatch-1.28
new file mode 100644
index 000000000000..ffc20f5db865
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonpatch-1.28
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/jsonpointer-1.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04
+EAPI=7
+HOMEPAGE=https://github.com/stefankoegl/python-json-patch
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/jsonpointer-1.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/stefankoegl/python-json-patch/archive/v1.28.tar.gz -> jsonpatch-1.28.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e0a0e63e99d2cb1cd8b6ffdda6016a60
diff --git a/metadata/md5-cache/dev-python/jsonpickle-1.4.1-r2 b/metadata/md5-cache/dev-python/jsonpickle-1.4.1-r2
index 0e9f7f4bdd55..bac8f05f6ffd 100644
--- a/metadata/md5-cache/dev-python/jsonpickle-1.4.1-r2
+++ b/metadata/md5-cache/dev-python/jsonpickle-1.4.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-1.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=40f0cc2afc52d2e8fd819099261cbd48
diff --git a/metadata/md5-cache/dev-python/jsonpickle-1.4.2 b/metadata/md5-cache/dev-python/jsonpickle-1.4.2
index 61f94801b71f..8c006d66ddc9 100644
--- a/metadata/md5-cache/dev-python/jsonpickle-1.4.2
+++ b/metadata/md5-cache/dev-python/jsonpickle-1.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-1.4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5ddeca333d6f45d38b15b0f4fdb5f30a
diff --git a/metadata/md5-cache/dev-python/jsonpointer-2.0-r1 b/metadata/md5-cache/dev-python/jsonpointer-2.0-r1
index fee71694056d..8be73dada20a 100644
--- a/metadata/md5-cache/dev-python/jsonpointer-2.0-r1
+++ b/metadata/md5-cache/dev-python/jsonpointer-2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpointer/jsonpointer-2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=887c35a80c2797b65cdd708e48d66858
diff --git a/metadata/md5-cache/dev-python/jsonref-0.1 b/metadata/md5-cache/dev-python/jsonref-0.1
index 3b26bc9afd8e..12442efc616c 100644
--- a/metadata/md5-cache/dev-python/jsonref-0.1
+++ b/metadata/md5-cache/dev-python/jsonref-0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonref/jsonref-0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c00f1ad6905ccac1066a78ad42cd64c6
diff --git a/metadata/md5-cache/dev-python/jsonrpclib-0.4.1 b/metadata/md5-cache/dev-python/jsonrpclib-0.4.1
index f5ccf512b90c..7281cbaa21a6 100644
--- a/metadata/md5-cache/dev-python/jsonrpclib-0.4.1
+++ b/metadata/md5-cache/dev-python/jsonrpclib-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tcalmant/jsonrpclib/archive/v0.4.1.tar.gz -> jsonrpclib-0.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=56524b1850d291940003c2dca44e7b30
diff --git a/metadata/md5-cache/dev-python/jsonrpclib-0.4.2 b/metadata/md5-cache/dev-python/jsonrpclib-0.4.2
index 31b97d045f51..e6ae4a9a32a4 100644
--- a/metadata/md5-cache/dev-python/jsonrpclib-0.4.2
+++ b/metadata/md5-cache/dev-python/jsonrpclib-0.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tcalmant/jsonrpclib/archive/v0.4.2.tar.gz -> jsonrpclib-0.4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=543c5a5a22c65f1a6afa22dffb53d462
diff --git a/metadata/md5-cache/dev-python/jsonrpclib-9999 b/metadata/md5-cache/dev-python/jsonrpclib-9999
index 8e0fddae6118..974bf9c134f7 100644
--- a/metadata/md5-cache/dev-python/jsonrpclib-9999
+++ b/metadata/md5-cache/dev-python/jsonrpclib-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/simplejson[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cc404ec4ee7c66215696b08bc43adcc4
diff --git a/metadata/md5-cache/dev-python/jsonschema-3.2.0 b/metadata/md5-cache/dev-python/jsonschema-3.2.0
index 0396913239db..1d5ba4a7c2b9 100644
--- a/metadata/md5-cache/dev-python/jsonschema-3.2.0
+++ b/metadata/md5-cache/dev-python/jsonschema-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-3.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f557f48b5fe89d229a9ca0ef240f8dd3
diff --git a/metadata/md5-cache/dev-python/jsonxs-0.6 b/metadata/md5-cache/dev-python/jsonxs-0.6
index fed7b28a7850..78e52e9a4879 100644
--- a/metadata/md5-cache/dev-python/jsonxs-0.6
+++ b/metadata/md5-cache/dev-python/jsonxs-0.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonxs/jsonxs-0.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3605b5ba612fd0c41ea375cc9a5ba2ab
diff --git a/metadata/md5-cache/dev-python/junit-xml-1.9 b/metadata/md5-cache/dev-python/junit-xml-1.9
index e3b443e7b1e1..f0993774d494 100644
--- a/metadata/md5-cache/dev-python/junit-xml-1.9
+++ b/metadata/md5-cache/dev-python/junit-xml-1.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kyrus/python-junit-xml/archive/19d3cc333d35dfd2d17d75c506336c15e5c6685a.tar.gz -> junit-xml-1.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0157959adae6c67bc7b305929773a30e
diff --git a/metadata/md5-cache/dev-python/jupyter-1.0.0-r3 b/metadata/md5-cache/dev-python/jupyter-1.0.0-r3
index 0747556f5753..298ce765a6cc 100644
--- a/metadata/md5-cache/dev-python/jupyter-1.0.0-r3
+++ b/metadata/md5-cache/dev-python/jupyter-1.0.0-r3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/notebook[python_targets_python3_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter/jupyter-1.0.0.tar.gz https://patch-diff.githubusercontent.com/raw/jupyter/jupyter/pull/198.patch -> jupyter-1.0.0-file-colision.patch
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a468bb96a0cc1b0754066f9a359725de
diff --git a/metadata/md5-cache/dev-python/jupyter_client-6.1.6-r1 b/metadata/md5-cache/dev-python/jupyter_client-6.1.6-r1
index db3a1cc1e8bb..c1cb8e5e0862 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-6.1.6-r1
+++ b/metadata/md5-cache/dev-python/jupyter_client-6.1.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-6.1.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f7264bbae116246a489ddb4c9a5ce8ae
diff --git a/metadata/md5-cache/dev-python/jupyter_client-6.1.6-r2 b/metadata/md5-cache/dev-python/jupyter_client-6.1.6-r2
index b26f2ba3f414..f9d5935feb84 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-6.1.6-r2
+++ b/metadata/md5-cache/dev-python/jupyter_client-6.1.6-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-6.1.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=47c31c43e6bcb181b8fb2bc8057e9e7a
diff --git a/metadata/md5-cache/dev-python/jupyter_console-6.1.0-r2 b/metadata/md5-cache/dev-python/jupyter_console-6.1.0-r2
index 260e1b2de5e2..c73e5b76619c 100644
--- a/metadata/md5-cache/dev-python/jupyter_console-6.1.0-r2
+++ b/metadata/md5-cache/dev-python/jupyter_console-6.1.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_console/jupyter_console-6.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=21ad08545bb6bc53d86a5cd8fe21628d
diff --git a/metadata/md5-cache/dev-python/jupyter_core-4.6.3 b/metadata/md5-cache/dev-python/jupyter_core-4.6.3
index 7c66dde03851..05789958bfc9 100644
--- a/metadata/md5-cache/dev-python/jupyter_core-4.6.3
+++ b/metadata/md5-cache/dev-python/jupyter_core-4.6.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_core/jupyter_core-4.6.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f387f34f31d5cc2abefd770ddd56882d
diff --git a/metadata/md5-cache/dev-python/jupyter_core-4.6.3-r1 b/metadata/md5-cache/dev-python/jupyter_core-4.6.3-r1
index 93671fd06656..a3d876802334 100644
--- a/metadata/md5-cache/dev-python/jupyter_core-4.6.3-r1
+++ b/metadata/md5-cache/dev-python/jupyter_core-4.6.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_core/jupyter_core-4.6.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f8d2d70c06ee6f933f8e7b802290ef95
diff --git a/metadata/md5-cache/dev-python/jupyterlab_pygments-0.1.2 b/metadata/md5-cache/dev-python/jupyterlab_pygments-0.1.2
index f370d73c74ef..686d8618776b 100644
--- a/metadata/md5-cache/dev-python/jupyterlab_pygments-0.1.2
+++ b/metadata/md5-cache/dev-python/jupyterlab_pygments-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/jupyterlab/jupyterlab_pygments/archive/0.1.2.tar.gz -> jupyterlab_pygments-0.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=823dd2d63cd0c882e8ac91f9a7f1efce
diff --git a/metadata/md5-cache/dev-python/jwcrypto-0.8.0 b/metadata/md5-cache/dev-python/jwcrypto-0.8.0
index bf23075eb31f..e3e5fba33242 100644
--- a/metadata/md5-cache/dev-python/jwcrypto-0.8.0
+++ b/metadata/md5-cache/dev-python/jwcrypto-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/latchset/jwcrypto/archive/v0.8.0.tar.gz -> jwcrypto-0.8.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=eeded8562cf2807811548fc9aa509298
diff --git a/metadata/md5-cache/dev-python/kafka-python-1.4.7 b/metadata/md5-cache/dev-python/kafka-python-1.4.7
index 91d6ed5d7f71..7ed778a8e4f0 100644
--- a/metadata/md5-cache/dev-python/kafka-python-1.4.7
+++ b/metadata/md5-cache/dev-python/kafka-python-1.4.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dpkp/kafka-python/archive/1.4.7.tar.gz -> kafka-python-1.4.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=af46e30dae337d4088b5129d7a2bd2a0
diff --git a/metadata/md5-cache/dev-python/kaitaistruct-0.8 b/metadata/md5-cache/dev-python/kaitaistruct-0.8
index f5e3111bbad1..7afca49200ca 100644
--- a/metadata/md5-cache/dev-python/kaitaistruct-0.8
+++ b/metadata/md5-cache/dev-python/kaitaistruct-0.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/k/kaitaistruct/kaitaistruct-0.8.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3924023f7ed9977b3583c19b7780d0bd
diff --git a/metadata/md5-cache/dev-python/kaitaistruct-0.9 b/metadata/md5-cache/dev-python/kaitaistruct-0.9
index 1e4333dc7ba3..210ec63a00e9 100644
--- a/metadata/md5-cache/dev-python/kaitaistruct-0.9
+++ b/metadata/md5-cache/dev-python/kaitaistruct-0.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/k/kaitaistruct/kaitaistruct-0.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e5da17ae45683a3cb8a19360d67f2b67
diff --git a/metadata/md5-cache/dev-python/kaptan-0.5.12-r1 b/metadata/md5-cache/dev-python/kaptan-0.5.12-r1
index c37e8cdb20b7..842036e3dede 100644
--- a/metadata/md5-cache/dev-python/kaptan-0.5.12-r1
+++ b/metadata/md5-cache/dev-python/kaptan-0.5.12-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/kaptan/kaptan-0.5.12.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=05c3e5b557aeff2d8e8863aeca99c0f3
diff --git a/metadata/md5-cache/dev-python/kazoo-2.8.0 b/metadata/md5-cache/dev-python/kazoo-2.8.0
index 514bfa8b5ed3..e6631e50c137 100644
--- a/metadata/md5-cache/dev-python/kazoo-2.8.0
+++ b/metadata/md5-cache/dev-python/kazoo-2.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/kazoo/kazoo-2.8.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9645b8bb46bf0a91a0c392cbda11ebbb
diff --git a/metadata/md5-cache/dev-python/kconfiglib-14.1.0 b/metadata/md5-cache/dev-python/kconfiglib-14.1.0
index b4feae8ce69f..ff09d6468e8a 100644
--- a/metadata/md5-cache/dev-python/kconfiglib-14.1.0
+++ b/metadata/md5-cache/dev-python/kconfiglib-14.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ncurses] ) python_ta
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/ulfalizer/Kconfiglib/archive/v14.1.0.tar.gz -> kconfiglib-14.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=90acfaa101ce500325b5f87da670b5a0
diff --git a/metadata/md5-cache/dev-python/keep-2.10 b/metadata/md5-cache/dev-python/keep-2.10
index 39c715d4e84d..eab8fb84b1aa 100644
--- a/metadata/md5-cache/dev-python/keep-2.10
+++ b/metadata/md5-cache/dev-python/keep-2.10
@@ -10,5 +10,5 @@ RDEPEND=dev-python/click[python_targets_python3_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keep/keep-2.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f96f80e833e10040f79d3fa2e1e35bc7
diff --git a/metadata/md5-cache/dev-python/keep-2.9 b/metadata/md5-cache/dev-python/keep-2.9
index 0055db2a4023..bcbc58a776bf 100644
--- a/metadata/md5-cache/dev-python/keep-2.9
+++ b/metadata/md5-cache/dev-python/keep-2.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/click[python_targets_python3_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keep/keep-2.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f96f80e833e10040f79d3fa2e1e35bc7
diff --git a/metadata/md5-cache/dev-python/keyring-21.4.0 b/metadata/md5-cache/dev-python/keyring-21.4.0
index 07fd2a8e7695..530f107184f6 100644
--- a/metadata/md5-cache/dev-python/keyring-21.4.0
+++ b/metadata/md5-cache/dev-python/keyring-21.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jaraco/keyring/archive/v21.4.0.tar.gz -> keyring-21.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=11eecabe4b1a9f40090d4558caadc9f6
diff --git a/metadata/md5-cache/dev-python/keyring-21.5.0 b/metadata/md5-cache/dev-python/keyring-21.5.0
index 1f7a34a1a960..cb25255c8e45 100644
--- a/metadata/md5-cache/dev-python/keyring-21.5.0
+++ b/metadata/md5-cache/dev-python/keyring-21.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jaraco/keyring/archive/v21.5.0.tar.gz -> keyring-21.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9d89afa39a5d3bd6893dcbaefd7fba94
diff --git a/metadata/md5-cache/dev-python/keystoneauth-4.2.1 b/metadata/md5-cache/dev-python/keystoneauth-4.2.1
index 5f2349b4dcdc..e0d7a4fff224 100644
--- a/metadata/md5-cache/dev-python/keystoneauth-4.2.1
+++ b/metadata/md5-cache/dev-python/keystoneauth-4.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystoneauth1/keystoneauth1-4.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7feffea6d36175c5154b8cc56972fcf3
diff --git a/metadata/md5-cache/dev-python/keystonemiddleware-9.1.0 b/metadata/md5-cache/dev-python/keystonemiddleware-9.1.0
index 08f6afe67060..bba6708f7e3a 100644
--- a/metadata/md5-cache/dev-python/keystonemiddleware-9.1.0
+++ b/metadata/md5-cache/dev-python/keystonemiddleware-9.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystonemiddleware/keystonemiddleware-9.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=08d2354926615af48154bbb3a8d831e6
diff --git a/metadata/md5-cache/dev-python/kiwisolver-1.3.0 b/metadata/md5-cache/dev-python/kiwisolver-1.3.0
index 39abb6f28730..4c4ce5fddba6 100644
--- a/metadata/md5-cache/dev-python/kiwisolver-1.3.0
+++ b/metadata/md5-cache/dev-python/kiwisolver-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nucleic/kiwi/archive/1.3.0.tar.gz -> kiwisolver-1.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1f73c692529de67ab4bbd046ee73c404
diff --git a/metadata/md5-cache/dev-python/kiwisolver-1.3.1 b/metadata/md5-cache/dev-python/kiwisolver-1.3.1
index e7724fcea16b..64c3bc0fd864 100644
--- a/metadata/md5-cache/dev-python/kiwisolver-1.3.1
+++ b/metadata/md5-cache/dev-python/kiwisolver-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nucleic/kiwi/archive/1.3.1.tar.gz -> kiwisolver-1.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=980c7afcf06a533ef47914329f7412e4
diff --git a/metadata/md5-cache/dev-python/klein-20.6.0 b/metadata/md5-cache/dev-python/klein-20.6.0
index a568795c8d17..477ed5cfd675 100644
--- a/metadata/md5-cache/dev-python/klein-20.6.0
+++ b/metadata/md5-cache/dev-python/klein-20.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/klein/klein-20.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4e21a5e621de735d27b3f3d7100c39a6
diff --git a/metadata/md5-cache/dev-python/kombu-4.6.8 b/metadata/md5-cache/dev-python/kombu-4.6.8
deleted file mode 100644
index 8b073d5e4044..000000000000
--- a/metadata/md5-cache/dev-python/kombu-4.6.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/importlib_metadata-0.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/py-amqp-2.5.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/py-amqp-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyro-4.76:4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqs? ( >=dev-python/boto3-1.4.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) msgpack? ( >=dev-python/msgpack-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mongodb? ( >=dev-python/pymongo-3.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) redis? ( >=dev-python/redis-py-3.3.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) yaml? ( >=dev-python/pyyaml-3.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/setuptools-20.6.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/case-1.5.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx_celery-1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=AMQP Messaging Framework for Python
-EAPI=7
-HOMEPAGE=https://pypi.org/project/kombu/ https://github.com/celery/kombu
-IUSE=doc examples mongodb msgpack redis sqs test yaml python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/importlib_metadata-0.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/py-amqp-2.5.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/py-amqp-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyro-4.76:4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqs? ( >=dev-python/boto3-1.4.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) msgpack? ( >=dev-python/msgpack-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mongodb? ( >=dev-python/pymongo-3.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) redis? ( >=dev-python/redis-py-3.3.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) yaml? ( >=dev-python/pyyaml-3.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/k/kombu/kombu-4.6.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1d3b7c9d1e74aa6a7f67cb693cf6c9f8
diff --git a/metadata/md5-cache/dev-python/kombu-5.0.1 b/metadata/md5-cache/dev-python/kombu-5.0.1
index 84cdaecefc14..6158349c4c02 100644
--- a/metadata/md5-cache/dev-python/kombu-5.0.1
+++ b/metadata/md5-cache/dev-python/kombu-5.0.1
@@ -5,12 +5,12 @@ DESCRIPTION=AMQP Messaging Framework for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/kombu/ https://github.com/celery/kombu
 IUSE=doc examples mongodb msgpack redis sqs test yaml python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/importlib_metadata-0.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/py-amqp-2.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/py-amqp-2.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyro-4.76:4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sqs? ( >=dev-python/boto3-1.4.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) msgpack? ( >=dev-python/msgpack-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) mongodb? ( >=dev-python/pymongo-3.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) redis? ( >=dev-python/redis-py-3.3.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) yaml? ( >=dev-python/pyyaml-3.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/kombu/kombu-5.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9587941720ad7e5037f66f5b42db53ec
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=dd63ae5489c4692001a4d5c2a2fad486
diff --git a/metadata/md5-cache/dev-python/lark-parser-0.7.8 b/metadata/md5-cache/dev-python/lark-parser-0.7.8
index d94821c89496..a7c4befd9110 100644
--- a/metadata/md5-cache/dev-python/lark-parser-0.7.8
+++ b/metadata/md5-cache/dev-python/lark-parser-0.7.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lark-parser/lark-parser-0.7.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1a3cdc14d07a7c64c6100e2cf9c5759f
diff --git a/metadata/md5-cache/dev-python/latexcodec-2.0.0 b/metadata/md5-cache/dev-python/latexcodec-2.0.0
index fe34f99e7388..f1961284057a 100644
--- a/metadata/md5-cache/dev-python/latexcodec-2.0.0
+++ b/metadata/md5-cache/dev-python/latexcodec-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/latexcodec/latexcodec-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fbfe2b61408eaf0e35a228f941944009
diff --git a/metadata/md5-cache/dev-python/lazr-config-2.2.2 b/metadata/md5-cache/dev-python/lazr-config-2.2.2
index 983689f350c6..da8db898964b 100644
--- a/metadata/md5-cache/dev-python/lazr-config-2.2.2
+++ b/metadata/md5-cache/dev-python/lazr-config-2.2.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lazr.config/lazr.config-2.2.2.tar.gz -> lazr-config-2.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b2d41786a20ce3b3b9bd8ea82ae90c18
diff --git a/metadata/md5-cache/dev-python/lazr-delegates-2.0.4 b/metadata/md5-cache/dev-python/lazr-delegates-2.0.4
index 97117926224b..2fea98c4e8d0 100644
--- a/metadata/md5-cache/dev-python/lazr-delegates-2.0.4
+++ b/metadata/md5-cache/dev-python/lazr-delegates-2.0.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lazr.delegates/lazr.delegates-2.0.4.tar.gz -> lazr-delegates-2.0.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dac42d4cbff42577647583cf134ce298
diff --git a/metadata/md5-cache/dev-python/lazy-object-proxy-1.5.0 b/metadata/md5-cache/dev-python/lazy-object-proxy-1.5.0
index 937a44874cf6..d565e625ddbd 100644
--- a/metadata/md5-cache/dev-python/lazy-object-proxy-1.5.0
+++ b/metadata/md5-cache/dev-python/lazy-object-proxy-1.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lazy-object-proxy/lazy-object-proxy-1.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=732fc87fb26f37ee14938f9a2983ebe9
diff --git a/metadata/md5-cache/dev-python/lcdproc-0.03_p20150508 b/metadata/md5-cache/dev-python/lcdproc-0.03_p20150508
index caecd582ef10..354da28c6107 100644
--- a/metadata/md5-cache/dev-python/lcdproc-0.03_p20150508
+++ b/metadata/md5-cache/dev-python/lcdproc-0.03_p20150508
@@ -10,5 +10,5 @@ RDEPEND=app-misc/lcdproc python_targets_python3_6? ( dev-lang/python:3.6 ) pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/jinglemansweep/lcdproc/archive/973628fc326177c9deaf3f2e1a435159eb565ae0.tar.gz -> lcdproc-0.03_p20150508.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5131608b56774638f6e3e2458a54a6fe
diff --git a/metadata/md5-cache/dev-python/ldap3-2.7 b/metadata/md5-cache/dev-python/ldap3-2.7
index 23a1ec055eb0..1b2c216de1da 100644
--- a/metadata/md5-cache/dev-python/ldap3-2.7
+++ b/metadata/md5-cache/dev-python/ldap3-2.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cannatag/ldap3/archive/v2.7.tar.gz -> ldap3-2.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=19ed3bd0e1667d5bbabacb0439b82e63
diff --git a/metadata/md5-cache/dev-python/ldap3-2.8.1 b/metadata/md5-cache/dev-python/ldap3-2.8.1
index a611c173d611..69cff7703418 100644
--- a/metadata/md5-cache/dev-python/ldap3-2.8.1
+++ b/metadata/md5-cache/dev-python/ldap3-2.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cannatag/ldap3/archive/v2.8.1.tar.gz -> ldap3-2.8.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=78facdf13bf0e093a79f0e69d6d1adee
diff --git a/metadata/md5-cache/dev-python/ldappool-2.4.1 b/metadata/md5-cache/dev-python/ldappool-2.4.1
index f1b2a1e0146c..7bd11c7801a2 100644
--- a/metadata/md5-cache/dev-python/ldappool-2.4.1
+++ b/metadata/md5-cache/dev-python/ldappool-2.4.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/python-ldap-3.0.0[python_targets_python3_6(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/l/ldappool/ldappool-2.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3e3eb7a9bba3945c4ec195fd1afe7f14
diff --git a/metadata/md5-cache/dev-python/lesscpy-0.14.0 b/metadata/md5-cache/dev-python/lesscpy-0.14.0
index d8a26bed3745..0befa5d1c3da 100644
--- a/metadata/md5-cache/dev-python/lesscpy-0.14.0
+++ b/metadata/md5-cache/dev-python/lesscpy-0.14.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lesscpy/lesscpy-0.14.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=af04a4b21e428731163e1d0ee69dac99
diff --git a/metadata/md5-cache/dev-python/libarchive-c-2.9 b/metadata/md5-cache/dev-python/libarchive-c-2.9
index 4199a12e3f7a..6c093072cd3c 100644
--- a/metadata/md5-cache/dev-python/libarchive-c-2.9
+++ b/metadata/md5-cache/dev-python/libarchive-c-2.9
@@ -10,5 +10,5 @@ RDEPEND=app-arch/libarchive python_targets_python3_6? ( dev-lang/python:3.6 ) py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/l/libarchive-c/libarchive-c-2.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=68342c028e5ba2130100107d60a1d588
diff --git a/metadata/md5-cache/dev-python/libcloud-3.1.0 b/metadata/md5-cache/dev-python/libcloud-3.1.0
index 5e2330c22cec..f55e53137b55 100644
--- a/metadata/md5-cache/dev-python/libcloud-3.1.0
+++ b/metadata/md5-cache/dev-python/libcloud-3.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/libcloud/apache-libcloud-3.1.0.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=67f935e3633f28af0d7f8a170a1eb54a
diff --git a/metadata/md5-cache/dev-python/liblarch-3.0.1 b/metadata/md5-cache/dev-python/liblarch-3.0.1
index f05f83455fa6..a7c8e1cb8a14 100644
--- a/metadata/md5-cache/dev-python/liblarch-3.0.1
+++ b/metadata/md5-cache/dev-python/liblarch-3.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getting-things-gnome/liblarch/archive/v3.0.1.tar.gz -> liblarch-3.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=06866863eb446d1aabd3719ad64bb9b4
diff --git a/metadata/md5-cache/dev-python/libnacl-1.6.1 b/metadata/md5-cache/dev-python/libnacl-1.6.1
index fc47541e63b8..8496c6508a2f 100644
--- a/metadata/md5-cache/dev-python/libnacl-1.6.1
+++ b/metadata/md5-cache/dev-python/libnacl-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libsodium python_targets_python3_6? ( dev-lang/python:3.6 ) pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/saltstack/libnacl/archive/v1.6.1.tar.gz -> libnacl-1.6.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1057c8ba06eb7da799e34dc413563005
diff --git a/metadata/md5-cache/dev-python/libnacl-1.7.2 b/metadata/md5-cache/dev-python/libnacl-1.7.2
index 57425a032954..6f1a72247d22 100644
--- a/metadata/md5-cache/dev-python/libnacl-1.7.2
+++ b/metadata/md5-cache/dev-python/libnacl-1.7.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libsodium python_targets_python3_6? ( dev-lang/python:3.6 ) pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/saltstack/libnacl/archive/v1.7.2.tar.gz -> libnacl-1.7.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=25b9ff49f3597fa056c42df40297d4f4
diff --git a/metadata/md5-cache/dev-python/libpillowfight-0.3.0 b/metadata/md5-cache/dev-python/libpillowfight-0.3.0
index aeb8636748bb..206232794a03 100644
--- a/metadata/md5-cache/dev-python/libpillowfight-0.3.0
+++ b/metadata/md5-cache/dev-python/libpillowfight-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypillowfight/pypillowfight-0.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f792a96b801e1d1aaf32423d08384f8c
diff --git a/metadata/md5-cache/dev-python/libpy_simdjson-0.4.0 b/metadata/md5-cache/dev-python/libpy_simdjson-0.4.0
index eb07710e9ae4..ecc4acf013a1 100644
--- a/metadata/md5-cache/dev-python/libpy_simdjson-0.4.0
+++ b/metadata/md5-cache/dev-python/libpy_simdjson-0.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gerrymanoim/libpy_simdjson/archive/0.4.0.tar.gz -> libpy_simdjson-0.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=69b6a06c1d42119fe399392e52dd60b7
diff --git a/metadata/md5-cache/dev-python/libsass-0.20.0 b/metadata/md5-cache/dev-python/libsass-0.20.0
index c0cf431fdbb3..26e3c66e1b4f 100644
--- a/metadata/md5-cache/dev-python/libsass-0.20.0
+++ b/metadata/md5-cache/dev-python/libsass-0.20.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/libsass/libsass-0.20.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d46e584d8503897d188b8b9d903efe4d
diff --git a/metadata/md5-cache/dev-python/libsass-0.20.1 b/metadata/md5-cache/dev-python/libsass-0.20.1
index 54c7d28188f8..b0a39f790bb6 100644
--- a/metadata/md5-cache/dev-python/libsass-0.20.1
+++ b/metadata/md5-cache/dev-python/libsass-0.20.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/libsass/libsass-0.20.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=959a104292c9104f06ea75bc01181854
diff --git a/metadata/md5-cache/dev-python/libtmux-0.8.3 b/metadata/md5-cache/dev-python/libtmux-0.8.3
index fa63df6f23c4..b66047ef3c48 100644
--- a/metadata/md5-cache/dev-python/libtmux-0.8.3
+++ b/metadata/md5-cache/dev-python/libtmux-0.8.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tmux-python/libtmux/archive/v0.8.3.tar.gz -> libtmux-v0.8.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e74c914fe46b8bec88144dc88699dbaf
diff --git a/metadata/md5-cache/dev-python/libtmux-0.8.5 b/metadata/md5-cache/dev-python/libtmux-0.8.5
index e3ae86e3dd73..477c17e2b849 100644
--- a/metadata/md5-cache/dev-python/libtmux-0.8.5
+++ b/metadata/md5-cache/dev-python/libtmux-0.8.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tmux-python/libtmux/archive/v0.8.5.tar.gz -> libtmux-v0.8.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6de17b023fd84de9e1f4854d67667c94
diff --git a/metadata/md5-cache/dev-python/libvirt-python-6.7.0 b/metadata/md5-cache/dev-python/libvirt-python-6.7.0
index e6bcb7218716..96e196cf50e7 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-6.7.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-6.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-6.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=58c9cf349f2d0a227857ce3d4e008785
diff --git a/metadata/md5-cache/dev-python/libvirt-python-6.8.0 b/metadata/md5-cache/dev-python/libvirt-python-6.8.0
index 4e3d4f094e16..da3975ef8450 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-6.8.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-6.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-6.8.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=58c9cf349f2d0a227857ce3d4e008785
diff --git a/metadata/md5-cache/dev-python/libvirt-python-6.9.0 b/metadata/md5-cache/dev-python/libvirt-python-6.9.0
index 1f2202a1e9c0..56211aa238c3 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-6.9.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-6.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-6.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=98dfdc0d09ef9a7754e41f47bf528742
diff --git a/metadata/md5-cache/dev-python/libvirt-python-9999 b/metadata/md5-cache/dev-python/libvirt-python-9999
index 24045e37a79a..e8c4df67b2b0 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-9999
+++ b/metadata/md5-cache/dev-python/libvirt-python-9999
@@ -11,5 +11,5 @@ RDEPEND=app-emulation/libvirt:=[-python(-)] python_targets_python3_6? ( dev-lang
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9f00eb458ece44d86d76694e5d4eaf07
diff --git a/metadata/md5-cache/dev-python/line_profiler-3.0.2 b/metadata/md5-cache/dev-python/line_profiler-3.0.2
index 7500a5726fa9..b740cf6d0f78 100644
--- a/metadata/md5-cache/dev-python/line_profiler-3.0.2
+++ b/metadata/md5-cache/dev-python/line_profiler-3.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/line_profiler/line_profiler-3.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=61d979e676f2c89e7296b39b5060d6bc
diff --git a/metadata/md5-cache/dev-python/linecache2-1.0.0-r1 b/metadata/md5-cache/dev-python/linecache2-1.0.0-r1
index 9b5224efa6be..fb34c98c22ad 100644
--- a/metadata/md5-cache/dev-python/linecache2-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/linecache2-1.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/linecache2/linecache2-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f265b6f4fc070ca7b205e375373bfe04
diff --git a/metadata/md5-cache/dev-python/lit-10.0.1 b/metadata/md5-cache/dev-python/lit-10.0.1
index b695dcb71ff5..e5477261bf59 100644
--- a/metadata/md5-cache/dev-python/lit-10.0.1
+++ b/metadata/md5-cache/dev-python/lit-10.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=710831df34a60390ae4cf1ebf4bbfe99
diff --git a/metadata/md5-cache/dev-python/lit-11.0.0 b/metadata/md5-cache/dev-python/lit-11.0.0
index 051ae0565495..1bce43a11631 100644
--- a/metadata/md5-cache/dev-python/lit-11.0.0
+++ b/metadata/md5-cache/dev-python/lit-11.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=710831df34a60390ae4cf1ebf4bbfe99
diff --git a/metadata/md5-cache/dev-python/lit-11.0.1.9999 b/metadata/md5-cache/dev-python/lit-11.0.1.9999
index 2e61963476cc..7a34f06c5343 100644
--- a/metadata/md5-cache/dev-python/lit-11.0.1.9999
+++ b/metadata/md5-cache/dev-python/lit-11.0.1.9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b60d0945034a1736ab6ba38655095a4c
diff --git a/metadata/md5-cache/dev-python/lit-11.0.1_rc1 b/metadata/md5-cache/dev-python/lit-11.0.1_rc1
index e3f091bd112b..002c00a932db 100644
--- a/metadata/md5-cache/dev-python/lit-11.0.1_rc1
+++ b/metadata/md5-cache/dev-python/lit-11.0.1_rc1
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.1-rc1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b60d0945034a1736ab6ba38655095a4c
diff --git a/metadata/md5-cache/dev-python/lit-12.0.0.9999 b/metadata/md5-cache/dev-python/lit-12.0.0.9999
index 2e61963476cc..7a34f06c5343 100644
--- a/metadata/md5-cache/dev-python/lit-12.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-12.0.0.9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b60d0945034a1736ab6ba38655095a4c
diff --git a/metadata/md5-cache/dev-python/lit-9.0.1 b/metadata/md5-cache/dev-python/lit-9.0.1
index 6ee43ed9bfea..dd6e066f5e2f 100644
--- a/metadata/md5-cache/dev-python/lit-9.0.1
+++ b/metadata/md5-cache/dev-python/lit-9.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	llvm.org	f9a86faa44b9076b1603ff7c37564776	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ab8d534c5670a2ea435ddddb0484001f
diff --git a/metadata/md5-cache/dev-python/livereload-2.6.1 b/metadata/md5-cache/dev-python/livereload-2.6.1
index 0dcef9206200..f8feaa828260 100644
--- a/metadata/md5-cache/dev-python/livereload-2.6.1
+++ b/metadata/md5-cache/dev-python/livereload-2.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lepture/python-livereload/archive/v2.6.1.tar.gz -> livereload-2.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=81f4f0f5a1188f8ab340836d1fa071f8
diff --git a/metadata/md5-cache/dev-python/llfuse-1.3.6 b/metadata/md5-cache/dev-python/llfuse-1.3.6
index 4e1782b75fc1..fa4d2d240f3a 100644
--- a/metadata/md5-cache/dev-python/llfuse-1.3.6
+++ b/metadata/md5-cache/dev-python/llfuse-1.3.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/llfuse/llfuse-1.3.6.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9e7eb3c4d154b719f929921a7f59bb13
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.34.0 b/metadata/md5-cache/dev-python/llvmlite-0.34.0
index e609433e3a77..9ea45d0f2b6b 100644
--- a/metadata/md5-cache/dev-python/llvmlite-0.34.0
+++ b/metadata/md5-cache/dev-python/llvmlite-0.34.0
@@ -11,5 +11,5 @@ RDEPEND=sys-devel/llvm:10 sys-libs/zlib:0= python_targets_python3_6? ( dev-lang/
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/numba/llvmlite/archive/v0.34.0.tar.gz -> llvmlite-0.34.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5fbbe054b709bd39ac50a0c6bd770660
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.35.0 b/metadata/md5-cache/dev-python/llvmlite-0.35.0
new file mode 100644
index 000000000000..01c4f72a73ac
--- /dev/null
+++ b/metadata/md5-cache/dev-python/llvmlite-0.35.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-devel/llvm:10 sys-libs/zlib:0= !!sys-devel/llvm:0
+DESCRIPTION=Python wrapper around the llvm C++ library
+EAPI=7
+HOMEPAGE=https://llvmlite.pydata.org/
+IUSE=examples python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=sys-devel/llvm:10 sys-libs/zlib:0= python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/numba/llvmlite/archive/v0.35.0.tar.gz -> llvmlite-0.35.0.gh.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0df37fc9bfcc50791f07ed8c318228bd
diff --git a/metadata/md5-cache/dev-python/lmdb-1.0.0 b/metadata/md5-cache/dev-python/lmdb-1.0.0
index 5abbfedc7665..95e200c18951 100644
--- a/metadata/md5-cache/dev-python/lmdb-1.0.0
+++ b/metadata/md5-cache/dev-python/lmdb-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lmdb/lmdb-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=74453b840df4c8819bf95f1838fcd2c8
diff --git a/metadata/md5-cache/dev-python/lmfit-1.0.1 b/metadata/md5-cache/dev-python/lmfit-1.0.1
index 20e880b7159b..5504b35ea5ea 100644
--- a/metadata/md5-cache/dev-python/lmfit-1.0.1
+++ b/metadata/md5-cache/dev-python/lmfit-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lmfit/lmfit-1.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f9da0fa870528abde1e53e4420051f0d
diff --git a/metadata/md5-cache/dev-python/locket-0.2.0-r1 b/metadata/md5-cache/dev-python/locket-0.2.0-r1
index 7dedb7edca6e..7b86fd1f4dfe 100644
--- a/metadata/md5-cache/dev-python/locket-0.2.0-r1
+++ b/metadata/md5-cache/dev-python/locket-0.2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mwilliamson/locket.py/archive/0.2.0.tar.gz -> locket.py-0.2.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=be5580e8af525c5d423df4712ae2aa4a
diff --git a/metadata/md5-cache/dev-python/lockfile-0.12.2-r2 b/metadata/md5-cache/dev-python/lockfile-0.12.2-r2
index 7f8c30f9774d..88da5073271b 100644
--- a/metadata/md5-cache/dev-python/lockfile-0.12.2-r2
+++ b/metadata/md5-cache/dev-python/lockfile-0.12.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lockfile/lockfile-0.12.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3cbf4c53fed029e58458875b06fb9156
diff --git a/metadata/md5-cache/dev-python/logbook-1.5.3 b/metadata/md5-cache/dev-python/logbook-1.5.3
index 05411432bfac..c0cbec676263 100644
--- a/metadata/md5-cache/dev-python/logbook-1.5.3
+++ b/metadata/md5-cache/dev-python/logbook-1.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getlogbook/logbook/archive/1.5.3.tar.gz -> logbook-1.5.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9be7e7ad69ecbf38a6420b94489661f9
diff --git a/metadata/md5-cache/dev-python/logfury-0.1.2-r1 b/metadata/md5-cache/dev-python/logfury-0.1.2-r1
index c1d04fe5a3a9..60b6ee10f3a5 100644
--- a/metadata/md5-cache/dev-python/logfury-0.1.2-r1
+++ b/metadata/md5-cache/dev-python/logfury-0.1.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ppolewicz/logfury/archive/0.1.2.tar.gz -> logfury-0.1.2.gh.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0e35cab08d53952345c1ba6b315c1b51
diff --git a/metadata/md5-cache/dev-python/loguru-0.5.3 b/metadata/md5-cache/dev-python/loguru-0.5.3
index f268b953656a..e5f904ea6867 100644
--- a/metadata/md5-cache/dev-python/loguru-0.5.3
+++ b/metadata/md5-cache/dev-python/loguru-0.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Delgan/loguru/archive/0.5.3.tar.gz -> loguru-0.5.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0bfb906dd3a494500ed106bc1a49c312
diff --git a/metadata/md5-cache/dev-python/logutils-0.3.5 b/metadata/md5-cache/dev-python/logutils-0.3.5
index f0551174a507..dc5bbf0b98a9 100644
--- a/metadata/md5-cache/dev-python/logutils-0.3.5
+++ b/metadata/md5-cache/dev-python/logutils-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/l/logutils/logutils-0.3.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7d1e06168eb5b916c944f26b591c9324
diff --git a/metadata/md5-cache/dev-python/loky-2.9.0 b/metadata/md5-cache/dev-python/loky-2.9.0
index c08079ac192c..e842eeb9722b 100644
--- a/metadata/md5-cache/dev-python/loky-2.9.0
+++ b/metadata/md5-cache/dev-python/loky-2.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joblib/loky/archive/2.9.0.tar.gz -> loky-2.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b9aa31ec4628365cd04aa636db20743d
diff --git a/metadata/md5-cache/dev-python/lunr-0.5.6 b/metadata/md5-cache/dev-python/lunr-0.5.6
index 4aa43e83b9ca..a97a2cc1a3c3 100644
--- a/metadata/md5-cache/dev-python/lunr-0.5.6
+++ b/metadata/md5-cache/dev-python/lunr-0.5.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lunr/lunr-0.5.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d35f985f31bf36eb4c7ba4bb952ed7ed
diff --git a/metadata/md5-cache/dev-python/lxml-4.6.1 b/metadata/md5-cache/dev-python/lxml-4.6.1
index 2baf3a59c6a7..b96d9fe0da7e 100644
--- a/metadata/md5-cache/dev-python/lxml-4.6.1
+++ b/metadata/md5-cache/dev-python/lxml-4.6.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxml/lxml/archive/lxml-4.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bde4459062a520679c52cd7de584f526
diff --git a/metadata/md5-cache/dev-python/lxml-4.6.2 b/metadata/md5-cache/dev-python/lxml-4.6.2
index ca6bdb58838a..395ae31d1bf2 100644
--- a/metadata/md5-cache/dev-python/lxml-4.6.2
+++ b/metadata/md5-cache/dev-python/lxml-4.6.2
@@ -5,12 +5,12 @@ DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
 EAPI=7
 HOMEPAGE=https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml
 IUSE=doc examples +threads test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD ElementTree GPL-2 PSF-2
 RDEPEND=>=dev-libs/libxml2-2.9.5 >=dev-libs/libxslt-1.1.28 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxml/lxml/archive/lxml-4.6.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=41e888aa3d63b7ecc20051a9afb7ec76
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=903e085dfc589afa911cf0654e41225e
diff --git a/metadata/md5-cache/dev-python/lz4-3.0.2 b/metadata/md5-cache/dev-python/lz4-3.0.2
index be44fabc5121..98ba0e8090bd 100644
--- a/metadata/md5-cache/dev-python/lz4-3.0.2
+++ b/metadata/md5-cache/dev-python/lz4-3.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lz4/lz4-3.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0dcdb1b3c3d7d79fd80fec6cd9084656
diff --git a/metadata/md5-cache/dev-python/lz4-3.1.1 b/metadata/md5-cache/dev-python/lz4-3.1.1
index 730756b6ef40..1dffa04d52c5 100644
--- a/metadata/md5-cache/dev-python/lz4-3.1.1
+++ b/metadata/md5-cache/dev-python/lz4-3.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lz4/lz4-3.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=39524afe2d472a72449571b08a0c11f3
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.35.2-r1 b/metadata/md5-cache/dev-python/m2crypto-0.35.2-r1
index 34022166c706..7a5b75fa3504 100644
--- a/metadata/md5-cache/dev-python/m2crypto-0.35.2-r1
+++ b/metadata/md5-cache/dev-python/m2crypto-0.35.2-r1
@@ -11,5 +11,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/M/M2Crypto/M2Crypto-0.35.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bbc88d1326c25c8abd7417a802172feb
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.36.0-r1 b/metadata/md5-cache/dev-python/m2crypto-0.36.0-r1
index 00dac28f2df1..200726a07201 100644
--- a/metadata/md5-cache/dev-python/m2crypto-0.36.0-r1
+++ b/metadata/md5-cache/dev-python/m2crypto-0.36.0-r1
@@ -11,5 +11,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/M/M2Crypto/M2Crypto-0.36.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=08538c1d20bdbd726c13f4c86ab7c3d0
diff --git a/metadata/md5-cache/dev-python/m2r-0.2.1 b/metadata/md5-cache/dev-python/m2r-0.2.1
index 7365d28b8023..446fc91e0553 100644
--- a/metadata/md5-cache/dev-python/m2r-0.2.1
+++ b/metadata/md5-cache/dev-python/m2r-0.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miyakogi/m2r/archive/v0.2.1.tar.gz -> m2r-0.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=226c9fdeebaa2ab0d7c5cb6dce8d6f35
diff --git a/metadata/md5-cache/dev-python/mako-1.1.3-r1 b/metadata/md5-cache/dev-python/mako-1.1.3-r1
index 1efd64e5cc52..1be563ce2f45 100644
--- a/metadata/md5-cache/dev-python/mako-1.1.3-r1
+++ b/metadata/md5-cache/dev-python/mako-1.1.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Mako/Mako-1.1.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d7af6896ae316717bf25b7a4b3be7a00
diff --git a/metadata/md5-cache/dev-python/mamba-0.11.1 b/metadata/md5-cache/dev-python/mamba-0.11.1
index 38d7124584e5..27e4fd4ebf1c 100644
--- a/metadata/md5-cache/dev-python/mamba-0.11.1
+++ b/metadata/md5-cache/dev-python/mamba-0.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nestorsalceda/mamba/archive/v0.11.1.tar.gz -> mamba-0.11.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d061381683b3c81c61ef824895495111
diff --git a/metadata/md5-cache/dev-python/mando-0.6.4 b/metadata/md5-cache/dev-python/mando-0.6.4
index bf301084025c..6a791c77dd6d 100644
--- a/metadata/md5-cache/dev-python/mando-0.6.4
+++ b/metadata/md5-cache/dev-python/mando-0.6.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rubik/mando/archive/v0.6.4.tar.gz -> mando-0.6.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=96455e2f8bb751d4862773148343beb8
diff --git a/metadata/md5-cache/dev-python/manuel-1.9.0 b/metadata/md5-cache/dev-python/manuel-1.9.0
index 2d6ee414bb0a..59c4ddd3721d 100644
--- a/metadata/md5-cache/dev-python/manuel-1.9.0
+++ b/metadata/md5-cache/dev-python/manuel-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/manuel/manuel-1.9.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6446a5bd824158f59f691d57f1681906
diff --git a/metadata/md5-cache/dev-python/markdown-2.6.11 b/metadata/md5-cache/dev-python/markdown-2.6.11
index 83a9370cf7bc..2395a389ef6f 100644
--- a/metadata/md5-cache/dev-python/markdown-2.6.11
+++ b/metadata/md5-cache/dev-python/markdown-2.6.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-2.6.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64a4bee03fac6975cf0d2b142c2b4102
diff --git a/metadata/md5-cache/dev-python/markdown-3.3.3 b/metadata/md5-cache/dev-python/markdown-3.3.3
index 386ef00d4e6d..0a917f96e114 100644
--- a/metadata/md5-cache/dev-python/markdown-3.3.3
+++ b/metadata/md5-cache/dev-python/markdown-3.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-3.3.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=45dc1b7d95fbba741e6e6921c05f8aa9
diff --git a/metadata/md5-cache/dev-python/markdown2-2.3.10 b/metadata/md5-cache/dev-python/markdown2-2.3.10
index 8a0b0c0075bb..a3c4fab9b1b3 100644
--- a/metadata/md5-cache/dev-python/markdown2-2.3.10
+++ b/metadata/md5-cache/dev-python/markdown2-2.3.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/markdown2/markdown2-2.3.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=796eb233f05516568c2bf41a9590abdf
diff --git a/metadata/md5-cache/dev-python/markdown2-2.3.9 b/metadata/md5-cache/dev-python/markdown2-2.3.9
index f4fcec0662b0..76d104e9cba6 100644
--- a/metadata/md5-cache/dev-python/markdown2-2.3.9
+++ b/metadata/md5-cache/dev-python/markdown2-2.3.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/markdown2/markdown2-2.3.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2abd393dd7de43e5143eaac8cf29a22c
diff --git a/metadata/md5-cache/dev-python/markups-3.0.0-r1 b/metadata/md5-cache/dev-python/markups-3.0.0-r1
index bd39206cf1c4..c7ad335cabe9 100644
--- a/metadata/md5-cache/dev-python/markups-3.0.0-r1
+++ b/metadata/md5-cache/dev-python/markups-3.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markups/Markups-3.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b7c4efeb00279abc40c1c12270f2303c
diff --git a/metadata/md5-cache/dev-python/markupsafe-1.1.1-r1 b/metadata/md5-cache/dev-python/markupsafe-1.1.1-r1
index d27d47d54991..0a41004406de 100644
--- a/metadata/md5-cache/dev-python/markupsafe-1.1.1-r1
+++ b/metadata/md5-cache/dev-python/markupsafe-1.1.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/MarkupSafe/MarkupSafe-1.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=397ab25096c17b7746f77a44c3a39c6b
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.5.1 b/metadata/md5-cache/dev-python/marshmallow-3.5.1
index 44af9a6156e6..0a7400aeeece 100644
--- a/metadata/md5-cache/dev-python/marshmallow-3.5.1
+++ b/metadata/md5-cache/dev-python/marshmallow-3.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/marshmallow/marshmallow-3.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1f4b7a1bd07431b0785dc7ed4cafd853
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.2.2-r2 b/metadata/md5-cache/dev-python/matplotlib-3.2.2-r2
index 87a95f261d79..0637d36de2ab 100644
--- a/metadata/md5-cache/dev-python/matplotlib-3.2.2-r2
+++ b/metadata/md5-cache/dev-python/matplotlib-3.2.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-3.2.2.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8b439f69d03871baf81167caa0ead8cc
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.3.0-r1 b/metadata/md5-cache/dev-python/matplotlib-3.3.0-r1
index 3678ec170616..d7e7bcb76ba1 100644
--- a/metadata/md5-cache/dev-python/matplotlib-3.3.0-r1
+++ b/metadata/md5-cache/dev-python/matplotlib-3.3.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-3.3.0.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d7cd9556fe1bb09317cc5d048b76fab6
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.3.2 b/metadata/md5-cache/dev-python/matplotlib-3.3.2
index 1dd7ea07aee9..dc7d74e642e1 100644
--- a/metadata/md5-cache/dev-python/matplotlib-3.3.2
+++ b/metadata/md5-cache/dev-python/matplotlib-3.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-3.3.2.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e321426e2b506b93b50d6208309db56e
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.3.3 b/metadata/md5-cache/dev-python/matplotlib-3.3.3
index 5bc37bce1b5c..2046d9aefdcd 100644
--- a/metadata/md5-cache/dev-python/matplotlib-3.3.3
+++ b/metadata/md5-cache/dev-python/matplotlib-3.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-3.3.3.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a8111166b47e473e6e56e95609239dd6
diff --git a/metadata/md5-cache/dev-python/matterhook-0.2 b/metadata/md5-cache/dev-python/matterhook-0.2
index 8e6406007f4b..28f23aea48a4 100644
--- a/metadata/md5-cache/dev-python/matterhook-0.2
+++ b/metadata/md5-cache/dev-python/matterhook-0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/m/matterhook/matterhook-0.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=96e27f670bfa1ec77f7cc3dde74da1fd
diff --git a/metadata/md5-cache/dev-python/mccabe-0.6.1-r1 b/metadata/md5-cache/dev-python/mccabe-0.6.1-r1
index a10f2cfb6333..89c635a3da3f 100644
--- a/metadata/md5-cache/dev-python/mccabe-0.6.1-r1
+++ b/metadata/md5-cache/dev-python/mccabe-0.6.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mccabe/mccabe-0.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2152e72dc28a2c754f46baefeed06251
diff --git a/metadata/md5-cache/dev-python/mccabe-0.6.1-r2 b/metadata/md5-cache/dev-python/mccabe-0.6.1-r2
index 34e9fd770371..386f26cb50f3 100644
--- a/metadata/md5-cache/dev-python/mccabe-0.6.1-r2
+++ b/metadata/md5-cache/dev-python/mccabe-0.6.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mccabe/mccabe-0.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=904ed0592cecc05cb2f1c2db8a6760cc
diff --git a/metadata/md5-cache/dev-python/mdx_gh_links-0.2 b/metadata/md5-cache/dev-python/mdx_gh_links-0.2
index f084ee8af200..10ee2cc331fb 100644
--- a/metadata/md5-cache/dev-python/mdx_gh_links-0.2
+++ b/metadata/md5-cache/dev-python/mdx_gh_links-0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/markdown[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mdx_gh_links/mdx_gh_links-0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d7772831f0aef50a2c9768bd980f7d77
diff --git a/metadata/md5-cache/dev-python/mecab-python-0.996 b/metadata/md5-cache/dev-python/mecab-python-0.996
index 08c794756ec7..7c00b2193ca3 100644
--- a/metadata/md5-cache/dev-python/mecab-python-0.996
+++ b/metadata/md5-cache/dev-python/mecab-python-0.996
@@ -11,5 +11,5 @@ RDEPEND=~app-text/mecab-0.996 python_targets_python3_6? ( dev-lang/python:3.6 )
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mecab/mecab-python-0.996.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a7ae5766ab4d16a7014c8cda61d128b2
diff --git a/metadata/md5-cache/dev-python/mechanize-0.4.5 b/metadata/md5-cache/dev-python/mechanize-0.4.5
index 542d5a935512..260075e37b80 100644
--- a/metadata/md5-cache/dev-python/mechanize-0.4.5
+++ b/metadata/md5-cache/dev-python/mechanize-0.4.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/html5lib-0.999999999[python_targets_python3_6(-)?,python_ta
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mechanize/mechanize-0.4.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=eae115a893d1c2ba653f59603ca9d1c6
diff --git a/metadata/md5-cache/dev-python/mediafile-0.2.0 b/metadata/md5-cache/dev-python/mediafile-0.2.0
deleted file mode 100644
index 444aefd5acb0..000000000000
--- a/metadata/md5-cache/dev-python/mediafile-0.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx ) test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=media-libs/mutagen-1.33.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Read and write audio files' tags in Python
-EAPI=7
-HOMEPAGE=https://github.com/beetbox/mediafile
-IUSE=doc test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=media-libs/mutagen-1.33.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/beetbox/mediafile/archive/v0.2.0.tar.gz -> mediafile-0.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e6e0c8cf5962889a952c324242c9f6f8
diff --git a/metadata/md5-cache/dev-python/mediafile-0.6.0 b/metadata/md5-cache/dev-python/mediafile-0.6.0
new file mode 100644
index 000000000000..9fd17f29b8c1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mediafile-0.6.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( dev-python/sphinx ) test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyproject2setuppy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=media-libs/mutagen-1.33.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Read and write audio files' tags in Python
+EAPI=7
+HOMEPAGE=https://github.com/beetbox/mediafile
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=media-libs/mutagen-1.33.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/beetbox/mediafile/archive/v0.6.0.tar.gz -> mediafile-0.6.0.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=005f1f889c0990ce668a92aa7bae8b05
diff --git a/metadata/md5-cache/dev-python/memory_profiler-0.57 b/metadata/md5-cache/dev-python/memory_profiler-0.57
index 78aebe388229..2658bd78ef27 100644
--- a/metadata/md5-cache/dev-python/memory_profiler-0.57
+++ b/metadata/md5-cache/dev-python/memory_profiler-0.57
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pythonprofilers/memory_profiler/archive/v0.57.tar.gz -> memory_profiler-0.57.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cb3f7b1f68e70570cad09ea6aa6dfba6
diff --git a/metadata/md5-cache/dev-python/mergedict-1.0.0 b/metadata/md5-cache/dev-python/mergedict-1.0.0
index 4319cd6f420d..4ff0fb011e8b 100644
--- a/metadata/md5-cache/dev-python/mergedict-1.0.0
+++ b/metadata/md5-cache/dev-python/mergedict-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mergedict/mergedict-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1b3a34445972986e11f4708fc8460b60
diff --git a/metadata/md5-cache/dev-python/metakernel-0.25.0-r1 b/metadata/md5-cache/dev-python/metakernel-0.25.0-r1
index 2e68968209d5..06a0d3bcf680 100644
--- a/metadata/md5-cache/dev-python/metakernel-0.25.0-r1
+++ b/metadata/md5-cache/dev-python/metakernel-0.25.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/metakernel/metakernel-0.25.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2b18dceb26adc40dd281a1c458572eab
diff --git a/metadata/md5-cache/dev-python/micawber-0.5.1 b/metadata/md5-cache/dev-python/micawber-0.5.1
index 405d3c9f20fb..6526c252ada2 100644
--- a/metadata/md5-cache/dev-python/micawber-0.5.1
+++ b/metadata/md5-cache/dev-python/micawber-0.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/coleifer/micawber/archive/0.5.1.tar.gz -> micawber-0.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=316df5bb174850c4f4689b09c06f9dbb
diff --git a/metadata/md5-cache/dev-python/microversion-parse-1.0.1 b/metadata/md5-cache/dev-python/microversion-parse-1.0.1
index 0e5cbc8d6801..f5eae53af6d3 100644
--- a/metadata/md5-cache/dev-python/microversion-parse-1.0.1
+++ b/metadata/md5-cache/dev-python/microversion-parse-1.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-5.0[python_targets_python3_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/m/microversion_parse/microversion_parse-1.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f37372bcf6be9571819bd57e9a596b1c
diff --git a/metadata/md5-cache/dev-python/mimerender-0.6.0 b/metadata/md5-cache/dev-python/mimerender-0.6.0
index a63312de7f53..41c64dadb68c 100644
--- a/metadata/md5-cache/dev-python/mimerender-0.6.0
+++ b/metadata/md5-cache/dev-python/mimerender-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martinblech/mimerender/archive/v0.6.0.tar.gz -> mimerender-0.6.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fcd32dc49d5a1eb7ef361d358978799e
diff --git a/metadata/md5-cache/dev-python/minidb-2.0.4 b/metadata/md5-cache/dev-python/minidb-2.0.4
index 817d47dfa2cb..ea7d69a8914e 100644
--- a/metadata/md5-cache/dev-python/minidb-2.0.4
+++ b/metadata/md5-cache/dev-python/minidb-2.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/minidb/minidb-2.0.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f4619e5e98e8c4441be9effdea1d2f56
diff --git a/metadata/md5-cache/dev-python/minimock-1.2.8-r1 b/metadata/md5-cache/dev-python/minimock-1.2.8-r1
index 45e7c06cd16b..c421bcb7fbd7 100644
--- a/metadata/md5-cache/dev-python/minimock-1.2.8-r1
+++ b/metadata/md5-cache/dev-python/minimock-1.2.8-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/M/MiniMock/MiniMock-1.2.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2fa8035dffdda3454d1cb03489b30e64
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.1.20201016 b/metadata/md5-cache/dev-python/miniupnpc-2.1.20201016
index 6fdf4ce7889d..7622b2c69cb6 100644
--- a/metadata/md5-cache/dev-python/miniupnpc-2.1.20201016
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.1.20201016
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/miniupnpc-2.1.20201016:0= python_targets_pypy3? ( >=dev-pytho
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20201016.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.1.20201016.tar.gz.sig )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=6a2912e0ef3ff11f066cecabdce1d425
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.2.0 b/metadata/md5-cache/dev-python/miniupnpc-2.2.0
index dffdc871fd86..3ea354007fd1 100644
--- a/metadata/md5-cache/dev-python/miniupnpc-2.2.0
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/miniupnpc-2.2.0:0= python_targets_pypy3? ( >=dev-python/pypy3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.2.0.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.2.0.tar.gz.sig )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=21ad37e49eea6a0f31f15ea5f684ad7b
diff --git a/metadata/md5-cache/dev-python/misaka-2.1.1 b/metadata/md5-cache/dev-python/misaka-2.1.1
index f82a2d7aaab6..a8bab3dce2f1 100644
--- a/metadata/md5-cache/dev-python/misaka-2.1.1
+++ b/metadata/md5-cache/dev-python/misaka-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/FSX/misaka/archive/v2.1.1.tar.gz -> misaka-2.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7e3fb6348c83fc3b2a25e4a29685b38c
diff --git a/metadata/md5-cache/dev-python/mistune-0.8.4-r1 b/metadata/md5-cache/dev-python/mistune-0.8.4-r1
index 28a18af79846..d61b4e630efc 100644
--- a/metadata/md5-cache/dev-python/mistune-0.8.4-r1
+++ b/metadata/md5-cache/dev-python/mistune-0.8.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mistune/mistune-0.8.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=46f08130b0ee5f1641b686a52da318f7
diff --git a/metadata/md5-cache/dev-python/mkautodoc-0.1.0 b/metadata/md5-cache/dev-python/mkautodoc-0.1.0
index 48c2c9d488c4..55cd475aa818 100644
--- a/metadata/md5-cache/dev-python/mkautodoc-0.1.0
+++ b/metadata/md5-cache/dev-python/mkautodoc-0.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tomchristie/mkautodoc/archive/0.1.0.tar.gz -> mkautodoc-0.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2f15b6a87acabf6a9be46434da715ff5
diff --git a/metadata/md5-cache/dev-python/mkdocs-1.1 b/metadata/md5-cache/dev-python/mkdocs-1.1
index 829805bef399..fb7ecf4907f3 100644
--- a/metadata/md5-cache/dev-python/mkdocs-1.1
+++ b/metadata/md5-cache/dev-python/mkdocs-1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mkdocs/mkdocs/archive/1.1.tar.gz -> mkdocs-1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=637a44926f2f8c0671ce384892d968f9
diff --git a/metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1 b/metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1
index a2b8ca3d4c90..1a999cef4ae1 100644
--- a/metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1
+++ b/metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/mkdocs/mkdocs-bootstrap/archive/1.1.tar.gz -> mkdocs-bootstrap-1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=471be7cd44593f52680680f7dce5ae73
diff --git a/metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1 b/metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1
index e8a04f9e5935..22a82840efe6 100644
--- a/metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1
+++ b/metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/mkdocs/mkdocs-bootswatch/archive/1.1.tar.gz -> mkdocs-bootswatch-1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=99473c55b851834fefa2dafd34e60114
diff --git a/metadata/md5-cache/dev-python/mmtf-python-1.1.2-r1 b/metadata/md5-cache/dev-python/mmtf-python-1.1.2-r1
index 45a1591d68b8..55e0e76f2f8f 100644
--- a/metadata/md5-cache/dev-python/mmtf-python-1.1.2-r1
+++ b/metadata/md5-cache/dev-python/mmtf-python-1.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/msgpack[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mmtf-python/mmtf-python-1.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=eed1ab7d868fba085fa42560b5978e51
diff --git a/metadata/md5-cache/dev-python/mock-3.0.5-r2 b/metadata/md5-cache/dev-python/mock-3.0.5-r2
index 934a7a766f21..501ef841772f 100644
--- a/metadata/md5-cache/dev-python/mock-3.0.5-r2
+++ b/metadata/md5-cache/dev-python/mock-3.0.5-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.9[python_targets_pypy3(-)?,python_targets_python3_6(-
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/testing-cabal/mock/archive/3.0.5.tar.gz -> mock-3.0.5.gh.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e85340a8f5916b8485fc9b856277694
diff --git a/metadata/md5-cache/dev-python/mongoengine-0.20.0 b/metadata/md5-cache/dev-python/mongoengine-0.20.0
index 2f8236d8972b..55a2c6923ad2 100644
--- a/metadata/md5-cache/dev-python/mongoengine-0.20.0
+++ b/metadata/md5-cache/dev-python/mongoengine-0.20.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/MongoEngine/mongoengine/archive/v0.20.0.tar.gz -> mongoengine-0.20.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9d5acda2f6de27e7864b50fd6b360f53
diff --git a/metadata/md5-cache/dev-python/mongoengine-0.21.0 b/metadata/md5-cache/dev-python/mongoengine-0.21.0
index 979315f7d2be..606f9e54d718 100644
--- a/metadata/md5-cache/dev-python/mongoengine-0.21.0
+++ b/metadata/md5-cache/dev-python/mongoengine-0.21.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/MongoEngine/mongoengine/archive/v0.21.0.tar.gz -> mongoengine-0.21.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=865fd0b5c96728c27b62dcc3e081c7e1
diff --git a/metadata/md5-cache/dev-python/mongomock-3.21.0 b/metadata/md5-cache/dev-python/mongomock-3.21.0
index 03531d43df6c..a6cc44b62082 100644
--- a/metadata/md5-cache/dev-python/mongomock-3.21.0
+++ b/metadata/md5-cache/dev-python/mongomock-3.21.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mongomock/mongomock-3.21.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6380bbeb5d82dad9fe5327bbea530b1f
diff --git a/metadata/md5-cache/dev-python/monotonic-1.5-r1 b/metadata/md5-cache/dev-python/monotonic-1.5-r1
index ec79ea92f4e7..09ae4d133006 100644
--- a/metadata/md5-cache/dev-python/monotonic-1.5-r1
+++ b/metadata/md5-cache/dev-python/monotonic-1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/m/monotonic/monotonic-1.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e2ba570e187413be322cda58f86622e8
diff --git a/metadata/md5-cache/dev-python/more-itertools-8.5.0 b/metadata/md5-cache/dev-python/more-itertools-8.5.0
index 296ad37c48a2..edef30c22211 100644
--- a/metadata/md5-cache/dev-python/more-itertools-8.5.0
+++ b/metadata/md5-cache/dev-python/more-itertools-8.5.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/m/more-itertools/more-itertools-8.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f5c042c330e9010ac288fdffe4a632c4
diff --git a/metadata/md5-cache/dev-python/more-itertools-8.6.0 b/metadata/md5-cache/dev-python/more-itertools-8.6.0
index 0f229192474c..5f9bee2794e9 100644
--- a/metadata/md5-cache/dev-python/more-itertools-8.6.0
+++ b/metadata/md5-cache/dev-python/more-itertools-8.6.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/m/more-itertools/more-itertools-8.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4d10470518ce8e5baca0f8734159445b
diff --git a/metadata/md5-cache/dev-python/moto-1.3.14-r3 b/metadata/md5-cache/dev-python/moto-1.3.14-r3
index e6926a99e5b4..3fe88cc47b7d 100644
--- a/metadata/md5-cache/dev-python/moto-1.3.14-r3
+++ b/metadata/md5-cache/dev-python/moto-1.3.14-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/moto/moto-1.3.14.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9c05e3845b13e4e7d6cc2f237aae2aaa
diff --git a/metadata/md5-cache/dev-python/moto-1.3.16-r1 b/metadata/md5-cache/dev-python/moto-1.3.16-r1
index f08b965a3436..0b4b261efdd2 100644
--- a/metadata/md5-cache/dev-python/moto-1.3.16-r1
+++ b/metadata/md5-cache/dev-python/moto-1.3.16-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/moto/moto-1.3.16.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dafe049bc06544fca02c75aa9b9c151c
diff --git a/metadata/md5-cache/dev-python/moviepy-1.0.1-r1 b/metadata/md5-cache/dev-python/moviepy-1.0.1-r1
index 39b4097dd76d..1525dc6c317e 100644
--- a/metadata/md5-cache/dev-python/moviepy-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/moviepy-1.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Zulko/moviepy/archive/v1.0.1.tar.gz -> moviepy-1.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=119b67e0c87487f33966759a472a4c4c
diff --git a/metadata/md5-cache/dev-python/mox3-0.24.0 b/metadata/md5-cache/dev-python/mox3-0.24.0
index dba9225f7463..130f1490c583 100644
--- a/metadata/md5-cache/dev-python/mox3-0.24.0
+++ b/metadata/md5-cache/dev-python/mox3-0.24.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mox3/mox3-0.24.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f59ba1bfacdec4405f7530093d2c6253
diff --git a/metadata/md5-cache/dev-python/mpdlcd-0.5.2 b/metadata/md5-cache/dev-python/mpdlcd-0.5.2
index bf2be65bcf67..57692a2fb130 100644
--- a/metadata/md5-cache/dev-python/mpdlcd-0.5.2
+++ b/metadata/md5-cache/dev-python/mpdlcd-0.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rbarrois/mpdlcd/archive/mpdlcd-0.5.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=303b86e797a087496a0963e7e9667969
diff --git a/metadata/md5-cache/dev-python/mpi4py-3.0.3 b/metadata/md5-cache/dev-python/mpi4py-3.0.3
index 126ffd4d983c..0b99b32e13de 100644
--- a/metadata/md5-cache/dev-python/mpi4py-3.0.3
+++ b/metadata/md5-cache/dev-python/mpi4py-3.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mpi4py/mpi4py-3.0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b0d8ed84ee043c4ba12371d4f9d20853
diff --git a/metadata/md5-cache/dev-python/mpmath-1.1.0 b/metadata/md5-cache/dev-python/mpmath-1.1.0
index c79a75fb0634..bee855a6ffe3 100644
--- a/metadata/md5-cache/dev-python/mpmath-1.1.0
+++ b/metadata/md5-cache/dev-python/mpmath-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fredrik-johansson/mpmath/archive/1.1.0.tar.gz -> mpmath-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5458b8b1f1b6e7f2d3d86947deb7c687
diff --git a/metadata/md5-cache/dev-python/msgpack-0.6.2 b/metadata/md5-cache/dev-python/msgpack-0.6.2
index 780a19b792d2..52e5b438c86b 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.6.2
+++ b/metadata/md5-cache/dev-python/msgpack-0.6.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/msgpack/msgpack-0.6.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f2f5b1faab07d605f5226975acb2b6b6
diff --git a/metadata/md5-cache/dev-python/msgpack-1.0.0 b/metadata/md5-cache/dev-python/msgpack-1.0.0
index 3049cd74bb9c..f847ff9fb7d5 100644
--- a/metadata/md5-cache/dev-python/msgpack-1.0.0
+++ b/metadata/md5-cache/dev-python/msgpack-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/msgpack/msgpack-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=95e46d50783c4b4abdcbee2a040d8632
diff --git a/metadata/md5-cache/dev-python/mss-6.0.0 b/metadata/md5-cache/dev-python/mss-6.0.0
index 94e8c76fb148..2d87925728fc 100644
--- a/metadata/md5-cache/dev-python/mss-6.0.0
+++ b/metadata/md5-cache/dev-python/mss-6.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/BoboTiG/python-mss/archive/v6.0.0.tar.gz -> mss-6.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=8ac8bbce489e026fb2754142e4d59f43
diff --git a/metadata/md5-cache/dev-python/multidict-5.0.0 b/metadata/md5-cache/dev-python/multidict-5.0.0
index 3e75ec893c19..5425b8bc9370 100644
--- a/metadata/md5-cache/dev-python/multidict-5.0.0
+++ b/metadata/md5-cache/dev-python/multidict-5.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v5.0.0.tar.gz -> multidict-5.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8c0380d687153842fc92ec79b92a3c6a
diff --git a/metadata/md5-cache/dev-python/munch-2.5.0-r1 b/metadata/md5-cache/dev-python/munch-2.5.0-r1
index f77746a17e3d..e3f9db095c0f 100644
--- a/metadata/md5-cache/dev-python/munch-2.5.0-r1
+++ b/metadata/md5-cache/dev-python/munch-2.5.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/munch/munch-2.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=67b67ecd84b5bbcd062e1ccc327a8652
diff --git a/metadata/md5-cache/dev-python/munkres-1.1.2 b/metadata/md5-cache/dev-python/munkres-1.1.2
index 5b68323cbd48..c637a4c60fb3 100644
--- a/metadata/md5-cache/dev-python/munkres-1.1.2
+++ b/metadata/md5-cache/dev-python/munkres-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/bmc/munkres/archive/release-1.1.2.tar.gz -> munkres-1.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9c8859009013a006f73b1a10ce420138
diff --git a/metadata/md5-cache/dev-python/mygpoclient-1.8 b/metadata/md5-cache/dev-python/mygpoclient-1.8
index ce8081b6df0a..fd8f6f630d63 100644
--- a/metadata/md5-cache/dev-python/mygpoclient-1.8
+++ b/metadata/md5-cache/dev-python/mygpoclient-1.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gpodder/mygpoclient/archive/1.8.tar.gz -> mygpoclient-1.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a86baff3ef339e8d67ddf22c8d9df6a0
diff --git a/metadata/md5-cache/dev-python/mypy-0.782 b/metadata/md5-cache/dev-python/mypy-0.782
index 0808e053cffa..97022766fa66 100644
--- a/metadata/md5-cache/dev-python/mypy-0.782
+++ b/metadata/md5-cache/dev-python/mypy-0.782
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mypy/mypy-0.782.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=45a9551fce7c13f560b28b2985d5cb5d
diff --git a/metadata/md5-cache/dev-python/mypy-0.790 b/metadata/md5-cache/dev-python/mypy-0.790
index b37e30024561..f0396b9d4205 100644
--- a/metadata/md5-cache/dev-python/mypy-0.790
+++ b/metadata/md5-cache/dev-python/mypy-0.790
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy/archive/v0.790.tar.gz -> mypy-0.790.tar.gz https://api.github.com/repos/python/typeshed/tarball/5be9c91 -> mypy-typeshed-5be9c91.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=68a3c326c00eb4a6e1dd896d997ec753
diff --git a/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1 b/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
index a7e0b8be0a80..1c37e1e2f042 100644
--- a/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy_extensions/archive/0.4.3.tar.gz -> mypy_extensions-0.4.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=61dab822c740a57ab95c0717fe422808
diff --git a/metadata/md5-cache/dev-python/mysql-connector-python-8.0.22 b/metadata/md5-cache/dev-python/mysql-connector-python-8.0.22
index b0768c8faac5..acabb43c3d7d 100644
--- a/metadata/md5-cache/dev-python/mysql-connector-python-8.0.22
+++ b/metadata/md5-cache/dev-python/mysql-connector-python-8.0.22
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-8.0.22.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a1f1ebb99620e84bb7481755207a91f1
diff --git a/metadata/md5-cache/dev-python/mysqlclient-1.4.6-r1 b/metadata/md5-cache/dev-python/mysqlclient-1.4.6-r1
index dcfdb0607ad1..91b5bbc04855 100644
--- a/metadata/md5-cache/dev-python/mysqlclient-1.4.6-r1
+++ b/metadata/md5-cache/dev-python/mysqlclient-1.4.6-r1
@@ -10,5 +10,5 @@ RDEPEND=!dev-python/mysql-python dev-db/mysql-connector-c:0= python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mysqlclient/mysqlclient-1.4.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5cb98bdf6c92d3e447dd7e81e003a383
diff --git a/metadata/md5-cache/dev-python/nagiosplugin-1.3.2-r1 b/metadata/md5-cache/dev-python/nagiosplugin-1.3.2-r1
index fe6cac289ca7..ea750c63672a 100644
--- a/metadata/md5-cache/dev-python/nagiosplugin-1.3.2-r1
+++ b/metadata/md5-cache/dev-python/nagiosplugin-1.3.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nagiosplugin/nagiosplugin-1.3.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e0a5e5d61d7f4684bdcbc5700fcff3ea
diff --git a/metadata/md5-cache/dev-python/natsort-7.0.1 b/metadata/md5-cache/dev-python/natsort-7.0.1
index 4057cf756261..14de1654f7a0 100644
--- a/metadata/md5-cache/dev-python/natsort-7.0.1
+++ b/metadata/md5-cache/dev-python/natsort-7.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/natsort/natsort-7.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c11cc859cb082f24944fe1a3ed901009
diff --git a/metadata/md5-cache/dev-python/nbclient-0.5.1 b/metadata/md5-cache/dev-python/nbclient-0.5.1
index 53f74d834dd1..0523f8de79af 100644
--- a/metadata/md5-cache/dev-python/nbclient-0.5.1
+++ b/metadata/md5-cache/dev-python/nbclient-0.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupyter/nbclient/archive/0.5.1.tar.gz -> nbclient-0.5.1.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=26ecf72af3a9f4fc8cf35590457f9b65
diff --git a/metadata/md5-cache/dev-python/nbconvert-5.6.1 b/metadata/md5-cache/dev-python/nbconvert-5.6.1
index 25b588730399..2175bf9c3364 100644
--- a/metadata/md5-cache/dev-python/nbconvert-5.6.1
+++ b/metadata/md5-cache/dev-python/nbconvert-5.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbconvert/nbconvert-5.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5618c4a4074be1bea88908a5472aa160
diff --git a/metadata/md5-cache/dev-python/nbconvert-6.0.7 b/metadata/md5-cache/dev-python/nbconvert-6.0.7
index dc973c29a710..54daa4ade01d 100644
--- a/metadata/md5-cache/dev-python/nbconvert-6.0.7
+++ b/metadata/md5-cache/dev-python/nbconvert-6.0.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbconvert/nbconvert-6.0.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8f35094d13c3a513d22949ea47fef956
diff --git a/metadata/md5-cache/dev-python/nbdime-2.0.0-r1 b/metadata/md5-cache/dev-python/nbdime-2.0.0-r1
index b7cbe12f7950..2e68fefa5f07 100644
--- a/metadata/md5-cache/dev-python/nbdime-2.0.0-r1
+++ b/metadata/md5-cache/dev-python/nbdime-2.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbdime/nbdime-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ca964cbb64bfc1aaf25489b02e7610c5
diff --git a/metadata/md5-cache/dev-python/nbformat-5.0.7 b/metadata/md5-cache/dev-python/nbformat-5.0.7
index 2b09120ff573..3a4f304f6a00 100644
--- a/metadata/md5-cache/dev-python/nbformat-5.0.7
+++ b/metadata/md5-cache/dev-python/nbformat-5.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupyter/nbformat/archive/5.0.7.tar.gz -> nbformat-5.0.7.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3b2b6621ba6c47571435ce7ed223a5fe
diff --git a/metadata/md5-cache/dev-python/nbformat-5.0.8 b/metadata/md5-cache/dev-python/nbformat-5.0.8
index 462f9719ae12..958cdabff367 100644
--- a/metadata/md5-cache/dev-python/nbformat-5.0.8
+++ b/metadata/md5-cache/dev-python/nbformat-5.0.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupyter/nbformat/archive/5.0.8.tar.gz -> nbformat-5.0.8.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=101de32e97d3594bf71f40849a084a81
diff --git a/metadata/md5-cache/dev-python/nbsphinx-0.7.1-r1 b/metadata/md5-cache/dev-python/nbsphinx-0.7.1-r1
index 6eda552bf8ec..01ec39746be2 100644
--- a/metadata/md5-cache/dev-python/nbsphinx-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/nbsphinx-0.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docutils[python_targets_python3_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbsphinx/nbsphinx-0.7.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5bcc856ebcf2de05e25cd152a9095b61
diff --git a/metadata/md5-cache/dev-python/nbval-0.9.1-r1 b/metadata/md5-cache/dev-python/nbval-0.9.1-r1
index d6ebc9dee864..335a49fc64e6 100644
--- a/metadata/md5-cache/dev-python/nbval-0.9.1-r1
+++ b/metadata/md5-cache/dev-python/nbval-0.9.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbval/nbval-0.9.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=668bc553bbb9e63b9201db586548a6e6
diff --git a/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.0 b/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.0
index 7f542281ed9b..b01b707fb8a9 100644
--- a/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.0
+++ b/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyopenssl[python_targets_python3_6(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/ndg-httpsclient/ndg_httpsclient-0.4.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=80bf3c1ee6c81e70ba11fe4e656defa7
diff --git a/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.2-r1 b/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.2-r1
index 84c1857ae4c6..61a60d2200a9 100644
--- a/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.2-r1
+++ b/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/ndg-httpsclient/ndg_httpsclient-0.4.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=10dd7b7e7ab03195450fa3f5efed1c41
diff --git a/metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1 b/metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
index 43cd590d5638..e3c71b2bbed1 100644
--- a/metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
+++ b/metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/ndg-httpsclient/ndg_httpsclient-0.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5891d4594b85ff257f107f3bc05d14d6
diff --git a/metadata/md5-cache/dev-python/neovim-remote-2.4.0 b/metadata/md5-cache/dev-python/neovim-remote-2.4.0
index da9b31fdd3f3..fe3e3e00a650 100644
--- a/metadata/md5-cache/dev-python/neovim-remote-2.4.0
+++ b/metadata/md5-cache/dev-python/neovim-remote-2.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mhinz/neovim-remote/archive/v2.4.0.tar.gz -> neovim-remote-2.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9ccd05f8586f4c284d2a36310c08ec39
diff --git a/metadata/md5-cache/dev-python/neovim-remote-9999 b/metadata/md5-cache/dev-python/neovim-remote-9999
index a99295c86323..0ee2207d9cc0 100644
--- a/metadata/md5-cache/dev-python/neovim-remote-9999
+++ b/metadata/md5-cache/dev-python/neovim-remote-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/pynvim[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=638911481a9b9eb12d14ecc5a5953ecc
diff --git a/metadata/md5-cache/dev-python/nest_asyncio-1.4.2 b/metadata/md5-cache/dev-python/nest_asyncio-1.4.2
index 93b726a6d42e..08e6cec9cbe3 100644
--- a/metadata/md5-cache/dev-python/nest_asyncio-1.4.2
+++ b/metadata/md5-cache/dev-python/nest_asyncio-1.4.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nest_asyncio/nest_asyncio-1.4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4efdb23cd92580c154e61127c94077d8
diff --git a/metadata/md5-cache/dev-python/nest_asyncio-1.4.3 b/metadata/md5-cache/dev-python/nest_asyncio-1.4.3
index 832a36b3f3f5..e9ff94d7272d 100644
--- a/metadata/md5-cache/dev-python/nest_asyncio-1.4.3
+++ b/metadata/md5-cache/dev-python/nest_asyncio-1.4.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nest_asyncio/nest_asyncio-1.4.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=73229ef51c4a109f660fec120c0709a8
diff --git a/metadata/md5-cache/dev-python/netaddr-0.8.0 b/metadata/md5-cache/dev-python/netaddr-0.8.0
index c2d84c7f5525..87cd710fb25c 100644
--- a/metadata/md5-cache/dev-python/netaddr-0.8.0
+++ b/metadata/md5-cache/dev-python/netaddr-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netaddr/netaddr/archive/0.8.0.tar.gz -> netaddr-0.8.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0647d2b3fc8c16e5a0351259f3dc3dc6
diff --git a/metadata/md5-cache/dev-python/netcdf4-python-1.2.2-r1 b/metadata/md5-cache/dev-python/netcdf4-python-1.2.2-r1
index 3edbed158805..7d7c85a1edd5 100644
--- a/metadata/md5-cache/dev-python/netcdf4-python-1.2.2-r1
+++ b/metadata/md5-cache/dev-python/netcdf4-python-1.2.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/netCDF4/netCDF4-1.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f35547ded278e608685ec1e86e1bda03
diff --git a/metadata/md5-cache/dev-python/netifaces-0.10.9 b/metadata/md5-cache/dev-python/netifaces-0.10.9
index 61f5d2ce3992..402fd26b96d0 100644
--- a/metadata/md5-cache/dev-python/netifaces-0.10.9
+++ b/metadata/md5-cache/dev-python/netifaces-0.10.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netifaces/netifaces-0.10.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=adcaf95caf0abfbc89169583469b745d
diff --git a/metadata/md5-cache/dev-python/networkx-2.5 b/metadata/md5-cache/dev-python/networkx-2.5
index 0b4a89da1e60..474b920f5167 100644
--- a/metadata/md5-cache/dev-python/networkx-2.5
+++ b/metadata/md5-cache/dev-python/networkx-2.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-2.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=90fb097eca6fe9c9f5f7e42baa3ecd93
diff --git a/metadata/md5-cache/dev-python/neutron-lib-2.3.0 b/metadata/md5-cache/dev-python/neutron-lib-2.3.0
deleted file mode 100644
index 0e2950647a1f..000000000000
--- a/metadata/md5-cache/dev-python/neutron-lib-2.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0
-DESCRIPTION=Neutron shared routines and utilities.
-EAPI=7
-HOMEPAGE=https://github.com/openstack/neutron-lib
-IUSE=python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pecan-1.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pecan-1.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pecan-1.0.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pecan-1.0.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pecan-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-ken-0.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.37.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setproctitle-1.1.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-traits-0.9.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/n/neutron-lib/neutron-lib-2.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4ef75ce4c6e74161000fbe07dcfd0421
diff --git a/metadata/md5-cache/dev-python/neutron-lib-2.6.1 b/metadata/md5-cache/dev-python/neutron-lib-2.6.1
index 86622b3e9af5..74ffee53f7f5 100644
--- a/metadata/md5-cache/dev-python/neutron-lib-2.6.1
+++ b/metadata/md5-cache/dev-python/neutron-lib-2.6.1
@@ -5,11 +5,11 @@ DESCRIPTION=Neutron shared routines and utilities.
 EAPI=7
 HOMEPAGE=https://github.com/openstack/neutron-lib
 IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pecan-1.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pecan-1.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pecan-1.0.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pecan-1.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pecan-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-ken-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-db-4.44.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-messaging-7.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setproctitle-1.1.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-traits-0.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/webob-1.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/n/neutron-lib/neutron-lib-2.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=76d88f3244f3fe7baa6bbcf50868e9f1
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=10bc1173eb6ecc37370fad85e3d611df
diff --git a/metadata/md5-cache/dev-python/nltk-3.5 b/metadata/md5-cache/dev-python/nltk-3.5
index 663da1c484b2..cc00af56f73b 100644
--- a/metadata/md5-cache/dev-python/nltk-3.5
+++ b/metadata/md5-cache/dev-python/nltk-3.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nltk/nltk/archive/3.5.tar.gz -> nltk-3.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=074b3fa221c811dc5e48c15ef3a08f39
diff --git a/metadata/md5-cache/dev-python/nnpy-1.4.2 b/metadata/md5-cache/dev-python/nnpy-1.4.2
index 379709ab2bc0..2fc2dbd24799 100644
--- a/metadata/md5-cache/dev-python/nnpy-1.4.2
+++ b/metadata/md5-cache/dev-python/nnpy-1.4.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/cffi:=[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/nanomsg/nnpy/archive/1.4.2.tar.gz -> nnpy-1.4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2208defb1baeb3036114043114da1629
diff --git a/metadata/md5-cache/dev-python/node-semver-0.8.0 b/metadata/md5-cache/dev-python/node-semver-0.8.0
index 8d3bb4c79b8e..e6ff8e56915a 100644
--- a/metadata/md5-cache/dev-python/node-semver-0.8.0
+++ b/metadata/md5-cache/dev-python/node-semver-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/podhmo/python-semver/archive/0.8.0.tar.gz -> node-semver-0.8.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b696b1f045589c35e97d6c61ee033704
diff --git a/metadata/md5-cache/dev-python/nodeenv-1.3.5 b/metadata/md5-cache/dev-python/nodeenv-1.3.5
index b83a772ffea5..ced06b7b7713 100644
--- a/metadata/md5-cache/dev-python/nodeenv-1.3.5
+++ b/metadata/md5-cache/dev-python/nodeenv-1.3.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ekalinin/nodeenv/archive/1.3.5.tar.gz -> nodeenv-1.3.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fe076b08ad274328d64d11c500f14c20
diff --git a/metadata/md5-cache/dev-python/nose-1.3.7-r6 b/metadata/md5-cache/dev-python/nose-1.3.7-r6
index 9e6816473022..a8b8c1b17609 100644
--- a/metadata/md5-cache/dev-python/nose-1.3.7-r6
+++ b/metadata/md5-cache/dev-python/nose-1.3.7-r6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose/nose-1.3.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4c0a38d1fa14d5c3d2d55b6c2ea1a2bc
diff --git a/metadata/md5-cache/dev-python/nose-1.3.7-r7 b/metadata/md5-cache/dev-python/nose-1.3.7-r7
index f1389ae58318..fc20832e7df2 100644
--- a/metadata/md5-cache/dev-python/nose-1.3.7-r7
+++ b/metadata/md5-cache/dev-python/nose-1.3.7-r7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose/nose-1.3.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fc15d44f13231f295df814f8d033fcb0
diff --git a/metadata/md5-cache/dev-python/nose-cover3-0.1.0-r1 b/metadata/md5-cache/dev-python/nose-cover3-0.1.0-r1
index 37fe4aa9a5c2..cfe5708aa0e7 100644
--- a/metadata/md5-cache/dev-python/nose-cover3-0.1.0-r1
+++ b/metadata/md5-cache/dev-python/nose-cover3-0.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,py
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose-cover3/nose-cover3-0.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25e6a962dd831cda61ac2776b55ea0e8
diff --git a/metadata/md5-cache/dev-python/nose-exclude-0.5.0-r1 b/metadata/md5-cache/dev-python/nose-exclude-0.5.0-r1
index cbe531f2a7c9..d86c933d1ed8 100644
--- a/metadata/md5-cache/dev-python/nose-exclude-0.5.0-r1
+++ b/metadata/md5-cache/dev-python/nose-exclude-0.5.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,py
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose-exclude/nose-exclude-0.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=67ca28d8645ec7c87ce05f8104473395
diff --git a/metadata/md5-cache/dev-python/nose-parameterized-0.5.0 b/metadata/md5-cache/dev-python/nose-parameterized-0.5.0
index 50b23e817848..f0f802a345fe 100644
--- a/metadata/md5-cache/dev-python/nose-parameterized-0.5.0
+++ b/metadata/md5-cache/dev-python/nose-parameterized-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose-parameterized/nose-parameterized-0.5.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb6747d044b59b5a6a0883568306de80
diff --git a/metadata/md5-cache/dev-python/nose-random-1.0.0 b/metadata/md5-cache/dev-python/nose-random-1.0.0
index b9bf704de64f..87fbc061d3c9 100644
--- a/metadata/md5-cache/dev-python/nose-random-1.0.0
+++ b/metadata/md5-cache/dev-python/nose-random-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/fzumstein/nose-random/archive/1.0.0.tar.gz -> nose-random-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c60d658dd66a07c49e19d62d3c6fd42f
diff --git a/metadata/md5-cache/dev-python/nose-show-skipped-0.1 b/metadata/md5-cache/dev-python/nose-show-skipped-0.1
index a01e06e875d7..eb13bb806d60 100644
--- a/metadata/md5-cache/dev-python/nose-show-skipped-0.1
+++ b/metadata/md5-cache/dev-python/nose-show-skipped-0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose-show-skipped/nose-show-skipped-0.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=37b172b16b517ad096a2cfba23046a6f
diff --git a/metadata/md5-cache/dev-python/nose2-0.9.1-r1 b/metadata/md5-cache/dev-python/nose2-0.9.1-r1
index 733c21a40632..59215964a664 100644
--- a/metadata/md5-cache/dev-python/nose2-0.9.1-r1
+++ b/metadata/md5-cache/dev-python/nose2-0.9.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/coverage-4.4.1[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/nose-devs/nose2/archive/0.9.1.tar.gz -> nose2-0.9.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8a02108fe7d95ca92b90a1a99a042bc9
diff --git a/metadata/md5-cache/dev-python/nose2-0.9.2 b/metadata/md5-cache/dev-python/nose2-0.9.2
new file mode 100644
index 000000000000..71d8dfb0964a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nose2-0.9.2
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( >=dev-python/sphinx-1.0.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/coverage-4.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Next generation unittest with plugins
+EAPI=7
+HOMEPAGE=https://github.com/nose-devs/nose2
+IUSE=doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/coverage-4.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/nose-devs/nose2/archive/0.9.2.tar.gz -> nose2-0.9.2.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b8226e73cb367626327b5278274e57c8
diff --git a/metadata/md5-cache/dev-python/nose_fixes-1.3 b/metadata/md5-cache/dev-python/nose_fixes-1.3
index e48ae56676e8..a19c5288c0ff 100644
--- a/metadata/md5-cache/dev-python/nose_fixes-1.3
+++ b/metadata/md5-cache/dev-python/nose_fixes-1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose_fixes/nose_fixes-1.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=aee4534b26bb7712e0b2b23747290772
diff --git a/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r3 b/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r3
index 43e63c7a0d40..fbe734ed9d17 100644
--- a/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r3
+++ b/metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose_warnings_filters/nose_warnings_filters-0.1.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b98b98190abdfcb21848a6d86f176396
diff --git a/metadata/md5-cache/dev-python/nosexcover-1.0.11-r1 b/metadata/md5-cache/dev-python/nosexcover-1.0.11-r1
index 4b09aa0bf14b..981b6b0553f2 100644
--- a/metadata/md5-cache/dev-python/nosexcover-1.0.11-r1
+++ b/metadata/md5-cache/dev-python/nosexcover-1.0.11-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nosexcover/nosexcover-1.0.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4b793402f47a0f0249bf49462784076a
diff --git a/metadata/md5-cache/dev-python/notebook-6.1.3 b/metadata/md5-cache/dev-python/notebook-6.1.3
index 15027e7cca83..53416ecb360e 100644
--- a/metadata/md5-cache/dev-python/notebook-6.1.3
+++ b/metadata/md5-cache/dev-python/notebook-6.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notebook/notebook-6.1.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=262ec37eca6dd7ce3bd33623543a7a1b
diff --git a/metadata/md5-cache/dev-python/notebook-6.1.4 b/metadata/md5-cache/dev-python/notebook-6.1.4
index 62427d625804..7526b62f85db 100644
--- a/metadata/md5-cache/dev-python/notebook-6.1.4
+++ b/metadata/md5-cache/dev-python/notebook-6.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notebook/notebook-6.1.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1c51ee985151d241abae1c3ccb34b720
diff --git a/metadata/md5-cache/dev-python/notebook-6.1.5 b/metadata/md5-cache/dev-python/notebook-6.1.5
index c1b32eb07ade..348e0292415b 100644
--- a/metadata/md5-cache/dev-python/notebook-6.1.5
+++ b/metadata/md5-cache/dev-python/notebook-6.1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notebook/notebook-6.1.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4e09960ce276f5fa2fb95d28e2b619cd
diff --git a/metadata/md5-cache/dev-python/notify2-0.3.1-r2 b/metadata/md5-cache/dev-python/notify2-0.3.1-r2
index 16d16d70471d..37649a3ce499 100644
--- a/metadata/md5-cache/dev-python/notify2-0.3.1-r2
+++ b/metadata/md5-cache/dev-python/notify2-0.3.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notify2/notify2-0.3.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d6f161de8cd81b61fc43080fddad5efb
diff --git a/metadata/md5-cache/dev-python/nototools-0_pre20200207 b/metadata/md5-cache/dev-python/nototools-0_pre20200207
index 61570f068148..6e09bd6494ef 100644
--- a/metadata/md5-cache/dev-python/nototools-0_pre20200207
+++ b/metadata/md5-cache/dev-python/nototools-0_pre20200207
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/googlei18n/nototools/archive/9731cb825a5c7c7c88c043009f15d4d1e5708df1.tar.gz#/nototools-9731cb825a5c7c7c88c043009f15d4d1e5708df1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=11312c1e72103ec35f468a20b933b212
diff --git a/metadata/md5-cache/dev-python/ntlm-auth-1.5.0 b/metadata/md5-cache/dev-python/ntlm-auth-1.5.0
index 96cf65ab6059..c6740e3c06de 100644
--- a/metadata/md5-cache/dev-python/ntlm-auth-1.5.0
+++ b/metadata/md5-cache/dev-python/ntlm-auth-1.5.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/cryptography[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jborean93/ntlm-auth/archive/v1.5.0.tar.gz -> ntlm-auth-1.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=232323a0a5e3514dc446449b552f4944
diff --git a/metadata/md5-cache/dev-python/ntplib-0.3.3 b/metadata/md5-cache/dev-python/ntplib-0.3.3
index b7c4c48798c6..149c5bcf133f 100644
--- a/metadata/md5-cache/dev-python/ntplib-0.3.3
+++ b/metadata/md5-cache/dev-python/ntplib-0.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/n/ntplib/ntplib-0.3.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=46aa008edb5dabae2da69597ff9e4c16
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.9.1 b/metadata/md5-cache/dev-python/nuitka-0.6.9.1
index 7b4afa186da4..95a605e2ccbc 100644
--- a/metadata/md5-cache/dev-python/nuitka-0.6.9.1
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-util/scons[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://nuitka.net/releases/Nuitka-0.6.9.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c8606dae39057dd69e4e08446ba9611f
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.9.6 b/metadata/md5-cache/dev-python/nuitka-0.6.9.6
index fe30b1650e0c..2f310dad3092 100644
--- a/metadata/md5-cache/dev-python/nuitka-0.6.9.6
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.9.6
@@ -10,5 +10,5 @@ RDEPEND=dev-util/scons[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://nuitka.net/releases/Nuitka-0.6.9.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c8606dae39057dd69e4e08446ba9611f
diff --git a/metadata/md5-cache/dev-python/numexpr-2.7.2 b/metadata/md5-cache/dev-python/numexpr-2.7.2
index baa925a2c908..c38d7e3a292f 100644
--- a/metadata/md5-cache/dev-python/numexpr-2.7.2
+++ b/metadata/md5-cache/dev-python/numexpr-2.7.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.6[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/pydata/numexpr/archive/v2.7.2.tar.gz -> numexpr-2.7.2.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d1cb1546d37c79f207025305bb2942c5
diff --git a/metadata/md5-cache/dev-python/numpy-1.19.0 b/metadata/md5-cache/dev-python/numpy-1.19.0
index 4c5a3e277689..1790c6d609e5 100644
--- a/metadata/md5-cache/dev-python/numpy-1.19.0
+++ b/metadata/md5-cache/dev-python/numpy-1.19.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.19.0.zip doc? ( https://numpy.org/doc/1.16/numpy-html.zip -> numpy-html-1.16.4.zip https://numpy.org/doc/1.16/numpy-ref.pdf -> numpy-ref-1.16.4.pdf https://numpy.org/doc/1.16/numpy-user.pdf -> numpy-user-1.16.4.pdf )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=777c66891ae11e4796b4d88304c6ffe4
diff --git a/metadata/md5-cache/dev-python/numpy-1.19.1 b/metadata/md5-cache/dev-python/numpy-1.19.1
index 566ab4c566ff..61ab9a657837 100644
--- a/metadata/md5-cache/dev-python/numpy-1.19.1
+++ b/metadata/md5-cache/dev-python/numpy-1.19.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.19.1.zip doc? ( https://numpy.org/doc/1.16/numpy-html.zip -> numpy-html-1.16.4.zip https://numpy.org/doc/1.16/numpy-ref.pdf -> numpy-ref-1.16.4.pdf https://numpy.org/doc/1.16/numpy-user.pdf -> numpy-user-1.16.4.pdf )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d988d8e8f07ec75415a570dd288ee362
diff --git a/metadata/md5-cache/dev-python/numpy-1.19.2 b/metadata/md5-cache/dev-python/numpy-1.19.2
index a79403380819..65f0665dae6c 100644
--- a/metadata/md5-cache/dev-python/numpy-1.19.2
+++ b/metadata/md5-cache/dev-python/numpy-1.19.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.19.2.zip doc? ( https://numpy.org/doc/1.16/numpy-html.zip -> numpy-html-1.16.4.zip https://numpy.org/doc/1.16/numpy-ref.pdf -> numpy-ref-1.16.4.pdf https://numpy.org/doc/1.16/numpy-user.pdf -> numpy-user-1.16.4.pdf )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1b887adcd6da22fc20105639a6173010
diff --git a/metadata/md5-cache/dev-python/numpy-1.19.3 b/metadata/md5-cache/dev-python/numpy-1.19.3
index 678a690d9917..f253707e3f80 100644
--- a/metadata/md5-cache/dev-python/numpy-1.19.3
+++ b/metadata/md5-cache/dev-python/numpy-1.19.3
@@ -5,12 +5,12 @@ DESCRIPTION=Fast array and numerical python library
 EAPI=7
 HOMEPAGE=https://www.numpy.org
 IUSE=doc lapack test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.19.3.zip doc? ( https://numpy.org/doc/1.16/numpy-html.zip -> numpy-html-1.16.4.zip https://numpy.org/doc/1.16/numpy-ref.pdf -> numpy-ref-1.16.4.pdf https://numpy.org/doc/1.16/numpy-user.pdf -> numpy-user-1.16.4.pdf )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4f9baa27518ded2b9699f4dca9a8bbfd
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=51e71950ebc3482ebeb66ad816de04c1
diff --git a/metadata/md5-cache/dev-python/numpy-1.19.4 b/metadata/md5-cache/dev-python/numpy-1.19.4
index 6f991257491b..02058d0e1ebe 100644
--- a/metadata/md5-cache/dev-python/numpy-1.19.4
+++ b/metadata/md5-cache/dev-python/numpy-1.19.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.19.4.zip doc? ( https://numpy.org/doc/1.16/numpy-html.zip -> numpy-html-1.16.4.zip https://numpy.org/doc/1.16/numpy-ref.pdf -> numpy-ref-1.16.4.pdf https://numpy.org/doc/1.16/numpy-user.pdf -> numpy-user-1.16.4.pdf )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=db5a6ad8c084989bfd6bc683e8524842
diff --git a/metadata/md5-cache/dev-python/numpy-python2-1.16.6 b/metadata/md5-cache/dev-python/numpy-python2-1.16.6
index 5b7f4f0f04a3..8af7569aecfa 100644
--- a/metadata/md5-cache/dev-python/numpy-python2-1.16.6
+++ b/metadata/md5-cache/dev-python/numpy-python2-1.16.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.16.6.zip doc? ( https://numpy.org/doc/1.16/numpy-html.zip -> numpy-html-1.16.6.zip https://numpy.org/doc/1.16/numpy-ref.pdf -> numpy-ref-1.16.6.pdf https://numpy.org/doc/1.16/numpy-user.pdf -> numpy-user-1.16.6.pdf )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b8f01d8cbe0cdfe91ea21fafbd79526a
diff --git a/metadata/md5-cache/dev-python/numpydoc-0.9.1 b/metadata/md5-cache/dev-python/numpydoc-0.9.1
index 0bca1632ef03..9aa131a95d14 100644
--- a/metadata/md5-cache/dev-python/numpydoc-0.9.1
+++ b/metadata/md5-cache/dev-python/numpydoc-0.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpydoc/numpydoc-0.9.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7bd5f98d2cb91be2f63d6115db588412
diff --git a/metadata/md5-cache/dev-python/numpydoc-1.1.0 b/metadata/md5-cache/dev-python/numpydoc-1.1.0
index 8b250da7372e..36615ec27faa 100644
--- a/metadata/md5-cache/dev-python/numpydoc-1.1.0
+++ b/metadata/md5-cache/dev-python/numpydoc-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpydoc/numpydoc-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cb350413799c55ae3b1f096f5d5223b4
diff --git a/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1 b/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
index fb4a6589aa88..28c2d35d14bc 100644
--- a/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
+++ b/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauth2/oauth2-1.9.0.post1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b64a00a58f17c92f2598db93f12ac7c3
diff --git a/metadata/md5-cache/dev-python/oauth2client-4.1.3-r1 b/metadata/md5-cache/dev-python/oauth2client-4.1.3-r1
index b0581fa5ccc9..75353ab50f21 100644
--- a/metadata/md5-cache/dev-python/oauth2client-4.1.3-r1
+++ b/metadata/md5-cache/dev-python/oauth2client-4.1.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/googleapis/oauth2client/archive/v4.1.3.tar.gz -> oauth2client-4.1.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a277a8611db6b7a55bf20d9f73853dd2
diff --git a/metadata/md5-cache/dev-python/oauthlib-3.1.0 b/metadata/md5-cache/dev-python/oauthlib-3.1.0
index 3ca23d9e1149..8d541e67b2ab 100644
--- a/metadata/md5-cache/dev-python/oauthlib-3.1.0
+++ b/metadata/md5-cache/dev-python/oauthlib-3.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-3.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=29a173796b29cb09556b6920f63a0a30
diff --git a/metadata/md5-cache/dev-python/objgraph-3.5.0 b/metadata/md5-cache/dev-python/objgraph-3.5.0
index a100cc8613ce..fa1278749f07 100644
--- a/metadata/md5-cache/dev-python/objgraph-3.5.0
+++ b/metadata/md5-cache/dev-python/objgraph-3.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/objgraph/objgraph-3.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=68d82c635d3a798d24b3beba4a8133e6
diff --git a/metadata/md5-cache/dev-python/oct2py-5.2.0-r1 b/metadata/md5-cache/dev-python/oct2py-5.2.0-r1
index 8977f80a9bd6..7358352bdcc8 100644
--- a/metadata/md5-cache/dev-python/oct2py-5.2.0-r1
+++ b/metadata/md5-cache/dev-python/oct2py-5.2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oct2py/oct2py-5.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=93b2c2bb1bd4f44cc376b12d61d26b9a
diff --git a/metadata/md5-cache/dev-python/octave_kernel-0.32.0-r1 b/metadata/md5-cache/dev-python/octave_kernel-0.32.0-r1
index 5f24d66e71d2..78744e96b55e 100644
--- a/metadata/md5-cache/dev-python/octave_kernel-0.32.0-r1
+++ b/metadata/md5-cache/dev-python/octave_kernel-0.32.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/o/octave_kernel/octave_kernel-0.32.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cffa1dfe19a5de4b2b7083231231183e
diff --git a/metadata/md5-cache/dev-python/odfpy-1.3.6 b/metadata/md5-cache/dev-python/odfpy-1.3.6
index 02bb6960a83a..80a3180f3bfa 100644
--- a/metadata/md5-cache/dev-python/odfpy-1.3.6
+++ b/metadata/md5-cache/dev-python/odfpy-1.3.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/odfpy/odfpy-1.3.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=da3cccd456c33c01f732f3089268ed0b
diff --git a/metadata/md5-cache/dev-python/olefile-0.46-r1 b/metadata/md5-cache/dev-python/olefile-0.46-r1
index 82d8990d61a1..7ab35a1b5a3f 100644
--- a/metadata/md5-cache/dev-python/olefile-0.46-r1
+++ b/metadata/md5-cache/dev-python/olefile-0.46-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/decalage2/olefile/archive/v0.46.tar.gz -> olefile-0.46.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4f2160604883e8cadd899bc0a6474a7a
diff --git a/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.7 b/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.7
index 83c1c5a4e68a..e06aba347301 100644
--- a/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.7
+++ b/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/docopt-0.4.1[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/onkyo-eiscp/onkyo-eiscp-1.2.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7b7101ddccdb5d1c5191726a7e48b106
diff --git a/metadata/md5-cache/dev-python/openpyxl-3.0.5 b/metadata/md5-cache/dev-python/openpyxl-3.0.5
index e8fdd874ed5f..5f4408d97aed 100644
--- a/metadata/md5-cache/dev-python/openpyxl-3.0.5
+++ b/metadata/md5-cache/dev-python/openpyxl-3.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://foss.heptapod.net/openpyxl/openpyxl/-/archive/3.0.5/openpyxl-3.0.5.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f64bfff386161165113560e8ed30d166
diff --git a/metadata/md5-cache/dev-python/openstackdocstheme-2.2.5 b/metadata/md5-cache/dev-python/openstackdocstheme-2.2.5
index cea48ffd3aeb..c2a32b46561d 100644
--- a/metadata/md5-cache/dev-python/openstackdocstheme-2.2.5
+++ b/metadata/md5-cache/dev-python/openstackdocstheme-2.2.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstackdocstheme/openstackdocstheme-2.2.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5ad57ebf9f2e98b3081fce504593ccb1
diff --git a/metadata/md5-cache/dev-python/openstacksdk-0.50.0 b/metadata/md5-cache/dev-python/openstacksdk-0.50.0
index a24197ad80c7..52c18e8a229b 100644
--- a/metadata/md5-cache/dev-python/openstacksdk-0.50.0
+++ b/metadata/md5-cache/dev-python/openstacksdk-0.50.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstacksdk/openstacksdk-0.50.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f85c9297b4c0d8da6fdd8decf56da219
diff --git a/metadata/md5-cache/dev-python/opt-einsum-3.0.1-r1 b/metadata/md5-cache/dev-python/opt-einsum-3.0.1-r1
index 0a2d66361996..5f9ed2206b3b 100644
--- a/metadata/md5-cache/dev-python/opt-einsum-3.0.1-r1
+++ b/metadata/md5-cache/dev-python/opt-einsum-3.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/opt-einsum/opt_einsum-3.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4220fae3934424ed68193bfaf8f56c93
diff --git a/metadata/md5-cache/dev-python/opt-einsum-3.3.0 b/metadata/md5-cache/dev-python/opt-einsum-3.3.0
index 1ec38a1fc922..bad026616d30 100644
--- a/metadata/md5-cache/dev-python/opt-einsum-3.3.0
+++ b/metadata/md5-cache/dev-python/opt-einsum-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/opt-einsum/opt_einsum-3.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f0a575f2c5277ff8dbed032e49d7bb03
diff --git a/metadata/md5-cache/dev-python/ordered-set-4.0.1 b/metadata/md5-cache/dev-python/ordered-set-4.0.1
index 44a200545b04..976fd31b47c1 100644
--- a/metadata/md5-cache/dev-python/ordered-set-4.0.1
+++ b/metadata/md5-cache/dev-python/ordered-set-4.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/ordered-set/ordered-set-4.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dd686088072eaf8ca548d495cf8ed7b7
diff --git a/metadata/md5-cache/dev-python/ordered-set-4.0.2 b/metadata/md5-cache/dev-python/ordered-set-4.0.2
index 55a603817b03..13e90ac5b02b 100644
--- a/metadata/md5-cache/dev-python/ordered-set-4.0.2
+++ b/metadata/md5-cache/dev-python/ordered-set-4.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/ordered-set/ordered-set-4.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dd686088072eaf8ca548d495cf8ed7b7
diff --git a/metadata/md5-cache/dev-python/os-brick-2.8.2 b/metadata/md5-cache/dev-python/os-brick-2.8.2
index 22848fa36645..bcd87633cb00 100644
--- a/metadata/md5-cache/dev-python/os-brick-2.8.2
+++ b/metadata/md5-cache/dev-python/os-brick-2.8.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-brick/os-brick-2.8.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bd52b965e0376166b8f0602ca372fcb5
diff --git a/metadata/md5-cache/dev-python/os-brick-3.0.1 b/metadata/md5-cache/dev-python/os-brick-3.0.1
index 2f3b9e2427bc..e07b14319f60 100644
--- a/metadata/md5-cache/dev-python/os-brick-3.0.1
+++ b/metadata/md5-cache/dev-python/os-brick-3.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-brick/os-brick-3.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=42104459c5d96326a6d877899dee89fb
diff --git a/metadata/md5-cache/dev-python/os-brick-4.0.1 b/metadata/md5-cache/dev-python/os-brick-4.0.1
index 20b1b82c1411..b2373ad19722 100644
--- a/metadata/md5-cache/dev-python/os-brick-4.0.1
+++ b/metadata/md5-cache/dev-python/os-brick-4.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-5.4.1[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-brick/os-brick-4.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bc6235e9a0733ad2a2a4a050eb469f64
diff --git a/metadata/md5-cache/dev-python/os-client-config-2.1.0 b/metadata/md5-cache/dev-python/os-client-config-2.1.0
index 9dcdb1b8f48d..18fef2190fb7 100644
--- a/metadata/md5-cache/dev-python/os-client-config-2.1.0
+++ b/metadata/md5-cache/dev-python/os-client-config-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-client-config/os-client-config-2.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5a15e021a156f398ef50fc9b42b58923
diff --git a/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-0.1.3 b/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-0.1.3
index 6bc577967d55..2ea0c766fa88 100644
--- a/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-0.1.3
+++ b/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-0.1.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/python-novaclient-2.10.0[python_targets_python3_6(-)?,pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os_diskconfig_python_novaclient_ext/os_diskconfig_python_novaclient_ext-0.1.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cf5dba7d488109c3f4b5831c3d28347f
diff --git a/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-9999 b/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-9999
index 22ece725832a..97e25a18de2e 100644
--- a/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-9999
+++ b/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/python-novaclient-2.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d0293d31e4ebb5e81575c4e8af07c4e9
diff --git a/metadata/md5-cache/dev-python/os-ken-1.2.0 b/metadata/md5-cache/dev-python/os-ken-1.2.0
index d872b2cabaa6..d82fa0e7ab22 100644
--- a/metadata/md5-cache/dev-python/os-ken-1.2.0
+++ b/metadata/md5-cache/dev-python/os-ken-1.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-ken/os-ken-1.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=358c9260a5e539d1577e65ec4bb8e74b
diff --git a/metadata/md5-cache/dev-python/os-resource-classes-1.0.0 b/metadata/md5-cache/dev-python/os-resource-classes-1.0.0
index 03f93006bb97..e61463ecfa27 100644
--- a/metadata/md5-cache/dev-python/os-resource-classes-1.0.0
+++ b/metadata/md5-cache/dev-python/os-resource-classes-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-5.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-resource-classes/os-resource-classes-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3b36663948ee5aa7b3d3222f90ba7bef
diff --git a/metadata/md5-cache/dev-python/os-service-types-1.7.0 b/metadata/md5-cache/dev-python/os-service-types-1.7.0
index cbeab1cab6fb..584d383cce30 100644
--- a/metadata/md5-cache/dev-python/os-service-types-1.7.0
+++ b/metadata/md5-cache/dev-python/os-service-types-1.7.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-service-types/os-service-types-1.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3ad3430c0717ae9b80673d4b04da7284
diff --git a/metadata/md5-cache/dev-python/os-testr-2.0.0 b/metadata/md5-cache/dev-python/os-testr-2.0.0
index 12feb9456576..37d7b8098a17 100644
--- a/metadata/md5-cache/dev-python/os-testr-2.0.0
+++ b/metadata/md5-cache/dev-python/os-testr-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-testr/os-testr-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d2824da6781c20252eafc8dd7c530ea8
diff --git a/metadata/md5-cache/dev-python/os-traits-2.4.0 b/metadata/md5-cache/dev-python/os-traits-2.4.0
index 9a7783c1ef0d..1aa54b0e6150 100644
--- a/metadata/md5-cache/dev-python/os-traits-2.4.0
+++ b/metadata/md5-cache/dev-python/os-traits-2.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-5.4.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-traits/os-traits-2.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ce6c3f11f8bd8b76496a4eb5608e6fca
diff --git a/metadata/md5-cache/dev-python/os-vif-1.15.2 b/metadata/md5-cache/dev-python/os-vif-1.15.2
deleted file mode 100644
index 2bc47cb178f4..000000000000
--- a/metadata/md5-cache/dev-python/os-vif-1.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0
-DESCRIPTION=OpenStack Cinder brick library for managing local volume attaches
-EAPI=7
-HOMEPAGE=https://github.com/openstack/os-vif
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/netaddr-0.7.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.30.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.23.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.28.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ovsdbapp-0.12.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyroute2-0.5.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.19.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/os-vif/os_vif-1.15.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2649c7f0b0931f0114afc68099009d49
diff --git a/metadata/md5-cache/dev-python/os-vif-2.2.0 b/metadata/md5-cache/dev-python/os-vif-2.2.0
index 76c4d14c9972..f97b46600ee9 100644
--- a/metadata/md5-cache/dev-python/os-vif-2.2.0
+++ b/metadata/md5-cache/dev-python/os-vif-2.2.0
@@ -5,11 +5,11 @@ DESCRIPTION=OpenStack Cinder brick library for managing local volume attaches
 EAPI=7
 HOMEPAGE=https://github.com/openstack/os-vif
 IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-concurrency-3.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-config-5.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-3.30.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-privsep-1.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-versionedobjects-1.28.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ovsdbapp-0.12.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyroute2-0.5.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/debtcollector-1.19.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-vif/os_vif-2.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bce831d3630ee6227140487d7eb06a43
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cb67571268a95aaaf0391eb716a7281c
diff --git a/metadata/md5-cache/dev-python/os-win-4.2.0 b/metadata/md5-cache/dev-python/os-win-4.2.0
index 825c19742d9e..ab29efa067e8 100644
--- a/metadata/md5-cache/dev-python/os-win-4.2.0
+++ b/metadata/md5-cache/dev-python/os-win-4.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-win/os-win-4.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=54976aeab33733d03899131de957ddbf
diff --git a/metadata/md5-cache/dev-python/os-win-5.1.0 b/metadata/md5-cache/dev-python/os-win-5.1.0
index ef8fcecd0ff6..327b1d0a9db7 100644
--- a/metadata/md5-cache/dev-python/os-win-5.1.0
+++ b/metadata/md5-cache/dev-python/os-win-5.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-win/os-win-5.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bca7e890df087d2d0b559ba617158026
diff --git a/metadata/md5-cache/dev-python/os-xenapi-0.3.4-r1 b/metadata/md5-cache/dev-python/os-xenapi-0.3.4-r1
index 4bac4fc779dd..c31a77679c04 100644
--- a/metadata/md5-cache/dev-python/os-xenapi-0.3.4-r1
+++ b/metadata/md5-cache/dev-python/os-xenapi-0.3.4-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-xenapi/os-xenapi-0.3.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3e39dba1c4d6c5810869358ef4c0a299
diff --git a/metadata/md5-cache/dev-python/osc-lib-2.2.1 b/metadata/md5-cache/dev-python/osc-lib-2.2.1
index 06341dc4b8df..cfb21786b00b 100644
--- a/metadata/md5-cache/dev-python/osc-lib-2.2.1
+++ b/metadata/md5-cache/dev-python/osc-lib-2.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/osc-lib/osc-lib-2.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6dd13c57c688c43ba0101cd0a9a400c9
diff --git a/metadata/md5-cache/dev-python/oslo-cache-2.6.1 b/metadata/md5-cache/dev-python/oslo-cache-2.6.1
index 2bdba77fc474..61b4102238df 100644
--- a/metadata/md5-cache/dev-python/oslo-cache-2.6.1
+++ b/metadata/md5-cache/dev-python/oslo-cache-2.6.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.cache/oslo.cache-2.6.1.tar.gz -> oslo-cache-2.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8800c2c4c0c206ebc5438490284852d3
diff --git a/metadata/md5-cache/dev-python/oslo-concurrency-4.3.1 b/metadata/md5-cache/dev-python/oslo-concurrency-4.3.1
index 5c39ad177fb4..42d8051c979e 100644
--- a/metadata/md5-cache/dev-python/oslo-concurrency-4.3.1
+++ b/metadata/md5-cache/dev-python/oslo-concurrency-4.3.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.concurrency/oslo.concurrency-4.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a4932b17bf3bcd6714eae8836b0da2ff
diff --git a/metadata/md5-cache/dev-python/oslo-config-8.3.2 b/metadata/md5-cache/dev-python/oslo-config-8.3.2
index 2f8f5a40192c..2ed6f464e2a6 100644
--- a/metadata/md5-cache/dev-python/oslo-config-8.3.2
+++ b/metadata/md5-cache/dev-python/oslo-config-8.3.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.3[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.config/oslo.config-8.3.2.tar.gz -> oslo-config-8.3.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b08a6b5191f21e2b15786b7b3bf951e0
diff --git a/metadata/md5-cache/dev-python/oslo-config-8.3.3 b/metadata/md5-cache/dev-python/oslo-config-8.3.3
index 0df922c97edb..92e3b98b6c9a 100644
--- a/metadata/md5-cache/dev-python/oslo-config-8.3.3
+++ b/metadata/md5-cache/dev-python/oslo-config-8.3.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.3[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.config/oslo.config-8.3.3.tar.gz -> oslo-config-8.3.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a2f42acd80faacca74700eb5fbe70341
diff --git a/metadata/md5-cache/dev-python/oslo-context-3.1.1 b/metadata/md5-cache/dev-python/oslo-context-3.1.1
index 07b2d622b98b..5dea1eef1098 100644
--- a/metadata/md5-cache/dev-python/oslo-context-3.1.1
+++ b/metadata/md5-cache/dev-python/oslo-context-3.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.context/oslo.context-3.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1758b8c2148b7fceb8fe3737ffa1d28e
diff --git a/metadata/md5-cache/dev-python/oslo-db-8.4.0 b/metadata/md5-cache/dev-python/oslo-db-8.4.0
index ca8f0245f696..9e4ef141be24 100644
--- a/metadata/md5-cache/dev-python/oslo-db-8.4.0
+++ b/metadata/md5-cache/dev-python/oslo-db-8.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.db/oslo.db-8.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=271f541d97a32637bd7d0e0626dac76b
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-5.0.1 b/metadata/md5-cache/dev-python/oslo-i18n-5.0.1
index e10f23cfa7f4..5297ca0722b7 100644
--- a/metadata/md5-cache/dev-python/oslo-i18n-5.0.1
+++ b/metadata/md5-cache/dev-python/oslo-i18n-5.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.i18n/oslo.i18n-5.0.1.tar.gz -> oslo-i18n-5.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=f1755b21b96e25b76897da2bca90c29d
diff --git a/metadata/md5-cache/dev-python/oslo-log-4.4.0 b/metadata/md5-cache/dev-python/oslo-log-4.4.0
index 01f2534f4257..016531d6495a 100644
--- a/metadata/md5-cache/dev-python/oslo-log-4.4.0
+++ b/metadata/md5-cache/dev-python/oslo-log-4.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-3.1.1[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.log/oslo.log-4.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=289688ae4a9c2333591dbae12aa66b67
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-12.1.1 b/metadata/md5-cache/dev-python/oslo-messaging-12.1.1
deleted file mode 100644
index 47abd9aa655e..000000000000
--- a/metadata/md5-cache/dev-python/oslo-messaging-12.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Messaging API for RPC and notifications over different messaging transports
-EAPI=7
-HOMEPAGE=https://pypi.org/project/oslo.messaging/
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/futurist-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.37.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/py-amqp-2.5.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/kombu-4.6.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-12.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d00a702d144d11888147befc79127bc0
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-12.5.1 b/metadata/md5-cache/dev-python/oslo-messaging-12.5.1
index cd2b8318848d..1eb4ce64f186 100644
--- a/metadata/md5-cache/dev-python/oslo-messaging-12.5.1
+++ b/metadata/md5-cache/dev-python/oslo-messaging-12.5.1
@@ -5,11 +5,11 @@ DESCRIPTION=Messaging API for RPC and notifications over different messaging tra
 EAPI=7
 HOMEPAGE=https://pypi.org/project/oslo.messaging/
 IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/futurist-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-3.37.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/webob-1.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyyaml-3.13.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/py-amqp-2.5.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/kombu-4.6.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-12.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2daad583aa1ff66545b57976ef6b3a29
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b7007fff48d460bb5df3d78c898b20b5
diff --git a/metadata/md5-cache/dev-python/oslo-middleware-4.0.2 b/metadata/md5-cache/dev-python/oslo-middleware-4.0.2
index cf83ed9bf0e0..2354dc97f3d7 100644
--- a/metadata/md5-cache/dev-python/oslo-middleware-4.0.2
+++ b/metadata/md5-cache/dev-python/oslo-middleware-4.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.middleware/oslo.middleware-4.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cda46c5645fa394317d8e4fa81dd5d3d
diff --git a/metadata/md5-cache/dev-python/oslo-middleware-4.1.1 b/metadata/md5-cache/dev-python/oslo-middleware-4.1.1
index acabdac229b5..efdad3c34c41 100644
--- a/metadata/md5-cache/dev-python/oslo-middleware-4.1.1
+++ b/metadata/md5-cache/dev-python/oslo-middleware-4.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.middleware/oslo.middleware-4.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=57ef004810177df08a17dee5a96fae01
diff --git a/metadata/md5-cache/dev-python/oslo-policy-3.5.0 b/metadata/md5-cache/dev-python/oslo-policy-3.5.0
index 315ff9c43809..dcd8e20683e2 100644
--- a/metadata/md5-cache/dev-python/oslo-policy-3.5.0
+++ b/metadata/md5-cache/dev-python/oslo-policy-3.5.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.policy/oslo.policy-3.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bf1dbefe172e17406138eb1cfa1fa738
diff --git a/metadata/md5-cache/dev-python/oslo-privsep-1.33.3 b/metadata/md5-cache/dev-python/oslo-privsep-1.33.3
index 9a494d66b4e4..942c495cdbe5 100644
--- a/metadata/md5-cache/dev-python/oslo-privsep-1.33.3
+++ b/metadata/md5-cache/dev-python/oslo-privsep-1.33.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.privsep/oslo.privsep-1.33.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3af6b97f5ca7111632dd6b88cbbf5c9f
diff --git a/metadata/md5-cache/dev-python/oslo-privsep-2.4.0 b/metadata/md5-cache/dev-python/oslo-privsep-2.4.0
index e60200f81023..7d622e0dcbbc 100644
--- a/metadata/md5-cache/dev-python/oslo-privsep-2.4.0
+++ b/metadata/md5-cache/dev-python/oslo-privsep-2.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.privsep/oslo.privsep-2.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b51ec0ff05c51e1c1770eea1b7679605
diff --git a/metadata/md5-cache/dev-python/oslo-reports-2.2.0 b/metadata/md5-cache/dev-python/oslo-reports-2.2.0
index 11455ebc5ef6..4be1ed20eeee 100644
--- a/metadata/md5-cache/dev-python/oslo-reports-2.2.0
+++ b/metadata/md5-cache/dev-python/oslo-reports-2.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.reports/oslo.reports-2.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=44c314c39b396ac00f1692242e8bb873
diff --git a/metadata/md5-cache/dev-python/oslo-rootwrap-5.15.2 b/metadata/md5-cache/dev-python/oslo-rootwrap-5.15.2
index c16e03987705..b00fa16dc244 100644
--- a/metadata/md5-cache/dev-python/oslo-rootwrap-5.15.2
+++ b/metadata/md5-cache/dev-python/oslo-rootwrap-5.15.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.rootwrap/oslo.rootwrap-5.15.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=eeca0f9d9ee37b22f7d4193d54c5ed09
diff --git a/metadata/md5-cache/dev-python/oslo-rootwrap-6.2.0 b/metadata/md5-cache/dev-python/oslo-rootwrap-6.2.0
index 4340f8147e22..d449f6577dbb 100644
--- a/metadata/md5-cache/dev-python/oslo-rootwrap-6.2.0
+++ b/metadata/md5-cache/dev-python/oslo-rootwrap-6.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/six-1.10.0[python_targets_python3_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.rootwrap/oslo.rootwrap-6.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d36e80a7607917c342efb4b09968e5b7
diff --git a/metadata/md5-cache/dev-python/oslo-serialization-4.0.1 b/metadata/md5-cache/dev-python/oslo-serialization-4.0.1
index f6d686436bbd..4fe5f8f61273 100644
--- a/metadata/md5-cache/dev-python/oslo-serialization-4.0.1
+++ b/metadata/md5-cache/dev-python/oslo-serialization-4.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.serialization/oslo.serialization-4.0.1.tar.gz -> oslo-serialization-4.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cdfc9468c56d0d555af6041d847159be
diff --git a/metadata/md5-cache/dev-python/oslo-service-2.1.1 b/metadata/md5-cache/dev-python/oslo-service-2.1.1
index f829329f0707..2a305b31c5ba 100644
--- a/metadata/md5-cache/dev-python/oslo-service-2.1.1
+++ b/metadata/md5-cache/dev-python/oslo-service-2.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.service/oslo.service-2.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=19e5f766c422ef61c325ee7752c99b1b
diff --git a/metadata/md5-cache/dev-python/oslo-service-2.4.0 b/metadata/md5-cache/dev-python/oslo-service-2.4.0
index 2d5a73012c6b..9132c14e8f3d 100644
--- a/metadata/md5-cache/dev-python/oslo-service-2.4.0
+++ b/metadata/md5-cache/dev-python/oslo-service-2.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.service/oslo.service-2.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8133c0a82ebf7c32af05d231a12f57e0
diff --git a/metadata/md5-cache/dev-python/oslo-sphinx-4.18.0 b/metadata/md5-cache/dev-python/oslo-sphinx-4.18.0
index e9b354010285..bf478495d001 100644
--- a/metadata/md5-cache/dev-python/oslo-sphinx-4.18.0
+++ b/metadata/md5-cache/dev-python/oslo-sphinx-4.18.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslosphinx/oslosphinx-4.18.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a5cabae1d562abcccfaff3efd4a86ba2
diff --git a/metadata/md5-cache/dev-python/oslo-upgradecheck-1.1.1 b/metadata/md5-cache/dev-python/oslo-upgradecheck-1.1.1
index b5d2bd5f7b6d..a744c1426147 100644
--- a/metadata/md5-cache/dev-python/oslo-upgradecheck-1.1.1
+++ b/metadata/md5-cache/dev-python/oslo-upgradecheck-1.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.upgradecheck/oslo.upgradecheck-1.1.1.tar.gz -> oslo-upgradecheck-1.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5f028e9dfdd03d53a805109d88f40732
diff --git a/metadata/md5-cache/dev-python/oslo-utils-4.6.0 b/metadata/md5-cache/dev-python/oslo-utils-4.6.0
index b35f36189600..30ce51b8c7a5 100644
--- a/metadata/md5-cache/dev-python/oslo-utils-4.6.0
+++ b/metadata/md5-cache/dev-python/oslo-utils-4.6.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-4.6.0.tar.gz -> oslo-utils-4.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=269ffb4d2766d2e7be85c2bc97a41fe8
diff --git a/metadata/md5-cache/dev-python/oslo-versionedobjects-2.0.2 b/metadata/md5-cache/dev-python/oslo-versionedobjects-2.0.2
deleted file mode 100644
index 724a96840e0a..000000000000
--- a/metadata/md5-cache/dev-python/oslo-versionedobjects-2.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0
-DESCRIPTION=A library that provides a generic versioned and RPC-friendly object model.
-EAPI=7
-HOMEPAGE=http://docs.openstack.org/developer/oslo.versionedobjects
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.versionedobjects/oslo.versionedobjects-2.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=493d180854f8532c232a0e7d409e47eb
diff --git a/metadata/md5-cache/dev-python/oslo-versionedobjects-2.3.0 b/metadata/md5-cache/dev-python/oslo-versionedobjects-2.3.0
index e4bd52a50677..7837d9c13a56 100644
--- a/metadata/md5-cache/dev-python/oslo-versionedobjects-2.3.0
+++ b/metadata/md5-cache/dev-python/oslo-versionedobjects-2.3.0
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=A library that provides a generic versioned and RPC-friendly object model.
 EAPI=7
-HOMEPAGE=http://docs.openstack.org/developer/oslo.versionedobjects
+HOMEPAGE=https://docs.openstack.org/developer/oslo.versionedobjects
 IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/webob-1.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.versionedobjects/oslo.versionedobjects-2.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=11e5f70206555aa692794fe4390bfd03
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0ed66f495fdc483a918e13680539752e
diff --git a/metadata/md5-cache/dev-python/oslo-vmware-2.32.2 b/metadata/md5-cache/dev-python/oslo-vmware-2.32.2
index 9bdd91f65322..3d8f0f75a198 100644
--- a/metadata/md5-cache/dev-python/oslo-vmware-2.32.2
+++ b/metadata/md5-cache/dev-python/oslo-vmware-2.32.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.vmware/oslo.vmware-2.32.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=57391ef27b522990fd4ebb91c541abc2
diff --git a/metadata/md5-cache/dev-python/oslo-vmware-3.7.0 b/metadata/md5-cache/dev-python/oslo-vmware-3.7.0
index 789f83e64b02..25211929c57d 100644
--- a/metadata/md5-cache/dev-python/oslo-vmware-3.7.0
+++ b/metadata/md5-cache/dev-python/oslo-vmware-3.7.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.vmware/oslo.vmware-3.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f06af3ebd9b2234c7a89490124782654
diff --git a/metadata/md5-cache/dev-python/oslotest-4.4.1 b/metadata/md5-cache/dev-python/oslotest-4.4.1
index 6e9b515f1758..3698f95115ca 100644
--- a/metadata/md5-cache/dev-python/oslotest-4.4.1
+++ b/metadata/md5-cache/dev-python/oslotest-4.4.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/fixtures-3.0.0[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslotest/oslotest-4.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ae59806990489997c008b648e60f6bdc
diff --git a/metadata/md5-cache/dev-python/osprofiler-3.4.0 b/metadata/md5-cache/dev-python/osprofiler-3.4.0
index d1bb54b04b26..65f85d30d192 100644
--- a/metadata/md5-cache/dev-python/osprofiler-3.4.0
+++ b/metadata/md5-cache/dev-python/osprofiler-3.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/netaddr-0.7.18[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/osprofiler/osprofiler-3.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8a9a44febd91cbfcae70568f2ba70da9
diff --git a/metadata/md5-cache/dev-python/osrf_pycommon-0.1.10-r1 b/metadata/md5-cache/dev-python/osrf_pycommon-0.1.10-r1
index e1f60c820ff8..99dbc8eea5e0 100644
--- a/metadata/md5-cache/dev-python/osrf_pycommon-0.1.10-r1
+++ b/metadata/md5-cache/dev-python/osrf_pycommon-0.1.10-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/osrf/osrf_pycommon/archive/0.1.10.tar.gz -> osrf_pycommon-0.1.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=815a033323b9260f6ecdad834a55896c
diff --git a/metadata/md5-cache/dev-python/ovs-2.13.0 b/metadata/md5-cache/dev-python/ovs-2.13.0
index 4be6c671cb2e..08366c6982ff 100644
--- a/metadata/md5-cache/dev-python/ovs-2.13.0
+++ b/metadata/md5-cache/dev-python/ovs-2.13.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/sortedcontainers[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/ovs/ovs-2.13.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b03465fe5d5fedef604c3033ab215dec
diff --git a/metadata/md5-cache/dev-python/ovsdbapp-0.17.2 b/metadata/md5-cache/dev-python/ovsdbapp-0.17.2
index fee1dc1a961f..ca5923a76d87 100644
--- a/metadata/md5-cache/dev-python/ovsdbapp-0.17.2
+++ b/metadata/md5-cache/dev-python/ovsdbapp-0.17.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/ovsdbapp/ovsdbapp-0.17.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c8f24207dd910e48b07a0f41369db278
diff --git a/metadata/md5-cache/dev-python/ovsdbapp-1.5.0 b/metadata/md5-cache/dev-python/ovsdbapp-1.5.0
index 02ea7b71859a..3d5f3ea128ee 100644
--- a/metadata/md5-cache/dev-python/ovsdbapp-1.5.0
+++ b/metadata/md5-cache/dev-python/ovsdbapp-1.5.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/ovsdbapp/ovsdbapp-1.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=53786cd677a276bb474103c3270b5f52
diff --git a/metadata/md5-cache/dev-python/owslib-0.20.0 b/metadata/md5-cache/dev-python/owslib-0.20.0
index 9cf870bec73b..84e04ab42b5c 100644
--- a/metadata/md5-cache/dev-python/owslib-0.20.0
+++ b/metadata/md5-cache/dev-python/owslib-0.20.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/geopython/owslib/archive/0.20.0.tar.gz -> owslib-0.20.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=af201eac9666b2c6a30ec370ebd0564e
diff --git a/metadata/md5-cache/dev-python/packaging-20.4-r1 b/metadata/md5-cache/dev-python/packaging-20.4-r1
index d8c35a105a2c..616bd5372aaa 100644
--- a/metadata/md5-cache/dev-python/packaging-20.4-r1
+++ b/metadata/md5-cache/dev-python/packaging-20.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/packaging/packaging-20.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fbc3b4b2cbe716adf4dcfe4fa0c63bec
diff --git a/metadata/md5-cache/dev-python/packaging-20.5 b/metadata/md5-cache/dev-python/packaging-20.5
index d2bafb4e1dd1..5f136bdd8933 100644
--- a/metadata/md5-cache/dev-python/packaging-20.5
+++ b/metadata/md5-cache/dev-python/packaging-20.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/packaging/archive/20.5.tar.gz -> packaging-20.5.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=be419f13249e5193cd11377eca58ad0e
diff --git a/metadata/md5-cache/dev-python/packaging-20.7 b/metadata/md5-cache/dev-python/packaging-20.7
index 4f2e160b15c8..521303bb20d8 100644
--- a/metadata/md5-cache/dev-python/packaging-20.7
+++ b/metadata/md5-cache/dev-python/packaging-20.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/packaging/archive/20.7.tar.gz -> packaging-20.7.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=be419f13249e5193cd11377eca58ad0e
diff --git a/metadata/md5-cache/dev-python/pafy-0.5.5 b/metadata/md5-cache/dev-python/pafy-0.5.5
index 4bb1573bf585..bea1b9e3e627 100644
--- a/metadata/md5-cache/dev-python/pafy-0.5.5
+++ b/metadata/md5-cache/dev-python/pafy-0.5.5
@@ -10,5 +10,5 @@ RDEPEND=net-misc/youtube-dl[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pafy/pafy-0.5.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e9cc2645bd4852cfd55f429223839aca
diff --git a/metadata/md5-cache/dev-python/pafy-9999 b/metadata/md5-cache/dev-python/pafy-9999
index 21a59234da98..df985c39e645 100644
--- a/metadata/md5-cache/dev-python/pafy-9999
+++ b/metadata/md5-cache/dev-python/pafy-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=net-misc/youtube-dl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e9cc2645bd4852cfd55f429223839aca
diff --git a/metadata/md5-cache/dev-python/paho-mqtt-1.5.0 b/metadata/md5-cache/dev-python/paho-mqtt-1.5.0
index d007c5595ffe..7827c5ec9cdf 100644
--- a/metadata/md5-cache/dev-python/paho-mqtt-1.5.0
+++ b/metadata/md5-cache/dev-python/paho-mqtt-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse/paho.mqtt.python/archive/v1.5.0.tar.gz -> paho-mqtt-1.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ec289a0fb1fcb3d7d2b6e29d0969bfb8
diff --git a/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2 b/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
index 6e56ccf85807..08c730f0db3e 100644
--- a/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
+++ b/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_6(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/pallets/pallets-sphinx-themes/archive/1.1.2.tar.gz -> pallets-sphinx-themes-1.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4d4b81ca6dbc7f4005c410774afabe92
diff --git a/metadata/md5-cache/dev-python/pandas-1.1.2-r1 b/metadata/md5-cache/dev-python/pandas-1.1.2-r1
index 83527db9af22..b0d3b4a44ad8 100644
--- a/metadata/md5-cache/dev-python/pandas-1.1.2-r1
+++ b/metadata/md5-cache/dev-python/pandas-1.1.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-1.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=66230578c243f2817ac434360fc60664
diff --git a/metadata/md5-cache/dev-python/pandas-1.1.4-r1 b/metadata/md5-cache/dev-python/pandas-1.1.4-r1
index b9a160e3b6ad..115c8b480e14 100644
--- a/metadata/md5-cache/dev-python/pandas-1.1.4-r1
+++ b/metadata/md5-cache/dev-python/pandas-1.1.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-1.1.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=102d8cd5b0d30538dec09d89dc4735cf
diff --git a/metadata/md5-cache/dev-python/pandas-datareader-0.8.1 b/metadata/md5-cache/dev-python/pandas-datareader-0.8.1
index 9133fb392c11..0bcd470afa65 100644
--- a/metadata/md5-cache/dev-python/pandas-datareader-0.8.1
+++ b/metadata/md5-cache/dev-python/pandas-datareader-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pydata/pandas-datareader/archive/v0.8.1.tar.gz -> pandas-datareader-0.8.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f98c034ce5060102a3148479ba90822b
diff --git a/metadata/md5-cache/dev-python/pandocfilters-1.4.3 b/metadata/md5-cache/dev-python/pandocfilters-1.4.3
index 9fb3055013bf..c9b2fe1efbff 100644
--- a/metadata/md5-cache/dev-python/pandocfilters-1.4.3
+++ b/metadata/md5-cache/dev-python/pandocfilters-1.4.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandocfilters/pandocfilters-1.4.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=45d73275b5b11bc2359c4eb34afcf9ec
diff --git a/metadata/md5-cache/dev-python/parameterized-0.7.4 b/metadata/md5-cache/dev-python/parameterized-0.7.4
index 679911ca27f9..74eb57aac4f8 100644
--- a/metadata/md5-cache/dev-python/parameterized-0.7.4
+++ b/metadata/md5-cache/dev-python/parameterized-0.7.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/parameterized/parameterized-0.7.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=86b0640a8159718660c79b154c767fe6
diff --git a/metadata/md5-cache/dev-python/parametrized-0.1 b/metadata/md5-cache/dev-python/parametrized-0.1
index 5c67d04fb2ec..0544fb12956d 100644
--- a/metadata/md5-cache/dev-python/parametrized-0.1
+++ b/metadata/md5-cache/dev-python/parametrized-0.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/parametrized/parametrized-0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=764dc314ef6d30da32f4b25fc8fe86e5
diff --git a/metadata/md5-cache/dev-python/paramiko-2.7.1 b/metadata/md5-cache/dev-python/paramiko-2.7.1
index 4dcd51d99b7e..cad74cf65640 100644
--- a/metadata/md5-cache/dev-python/paramiko-2.7.1
+++ b/metadata/md5-cache/dev-python/paramiko-2.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/paramiko/paramiko/archive/2.7.1.tar.gz -> paramiko-2.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f27493fcebf8880890173916a4918592
diff --git a/metadata/md5-cache/dev-python/paramiko-2.7.2 b/metadata/md5-cache/dev-python/paramiko-2.7.2
index 3e4750549fcc..956c538b34f7 100644
--- a/metadata/md5-cache/dev-python/paramiko-2.7.2
+++ b/metadata/md5-cache/dev-python/paramiko-2.7.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/paramiko/paramiko/archive/2.7.2.tar.gz -> paramiko-2.7.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b52df6775d7da2a68bbf5b0b230e1de7
diff --git a/metadata/md5-cache/dev-python/parsedatetime-2.6 b/metadata/md5-cache/dev-python/parsedatetime-2.6
index ad968a0d715a..d566cf5a1aa3 100644
--- a/metadata/md5-cache/dev-python/parsedatetime-2.6
+++ b/metadata/md5-cache/dev-python/parsedatetime-2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bear/parsedatetime/archive/v2.6.tar.gz -> parsedatetime-2.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1286142c623803828d3d35a4aacf37cb
diff --git a/metadata/md5-cache/dev-python/parso-0.7.0-r1 b/metadata/md5-cache/dev-python/parso-0.7.0-r1
index 9ce9f9683492..faff91f7395d 100644
--- a/metadata/md5-cache/dev-python/parso-0.7.0-r1
+++ b/metadata/md5-cache/dev-python/parso-0.7.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/parso/archive/v0.7.0.tar.gz -> parso-0.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=85bbde5ae1cb0ed63630413bc7091e74
diff --git a/metadata/md5-cache/dev-python/parso-0.7.1-r1 b/metadata/md5-cache/dev-python/parso-0.7.1-r1
index 0eb4a97bcd22..b9f721748bc8 100644
--- a/metadata/md5-cache/dev-python/parso-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/parso-0.7.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/parso/archive/v0.7.1.tar.gz -> parso-0.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e4aab310c7ebfc775c49c78f26031b19
diff --git a/metadata/md5-cache/dev-python/parso-0.8.0 b/metadata/md5-cache/dev-python/parso-0.8.0
index 16f4f9cc7450..ed12928bc3e6 100644
--- a/metadata/md5-cache/dev-python/parso-0.8.0
+++ b/metadata/md5-cache/dev-python/parso-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/parso/archive/v0.8.0.tar.gz -> parso-0.8.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e4aab310c7ebfc775c49c78f26031b19
diff --git a/metadata/md5-cache/dev-python/partd-1.1.0 b/metadata/md5-cache/dev-python/partd-1.1.0
index 7efc106d71e9..ac2edf0443a2 100644
--- a/metadata/md5-cache/dev-python/partd-1.1.0
+++ b/metadata/md5-cache/dev-python/partd-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/partd/partd-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2cdaa919733344cd74b1105ed03567f6
diff --git a/metadata/md5-cache/dev-python/parver-0.3.1 b/metadata/md5-cache/dev-python/parver-0.3.1
index 684c7b0eea8b..834e6466ffb0 100644
--- a/metadata/md5-cache/dev-python/parver-0.3.1
+++ b/metadata/md5-cache/dev-python/parver-0.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RazerM/parver/archive/0.3.1.tar.gz -> parver-0.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=231cc8d1a522c8d4aaa576ba964b3132
diff --git a/metadata/md5-cache/dev-python/passlib-1.7.4 b/metadata/md5-cache/dev-python/passlib-1.7.4
index 14563dd3e61b..ea72e04eaa98 100644
--- a/metadata/md5-cache/dev-python/passlib-1.7.4
+++ b/metadata/md5-cache/dev-python/passlib-1.7.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/passlib/passlib-1.7.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8a40763ca5126687f0a2ff872a6ca979
diff --git a/metadata/md5-cache/dev-python/paste-3.5.0 b/metadata/md5-cache/dev-python/paste-3.5.0
index c8ea60c07355..b2f196284c69 100644
--- a/metadata/md5-cache/dev-python/paste-3.5.0
+++ b/metadata/md5-cache/dev-python/paste-3.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Paste/Paste-3.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bee46775156b02ed7ac1059553757ce5
diff --git a/metadata/md5-cache/dev-python/pastedeploy-2.1.1 b/metadata/md5-cache/dev-python/pastedeploy-2.1.1
index 46576503c97c..1d1360f69269 100644
--- a/metadata/md5-cache/dev-python/pastedeploy-2.1.1
+++ b/metadata/md5-cache/dev-python/pastedeploy-2.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Pylons/pastedeploy/archive/2.1.1.tar.gz -> pastedeploy-2.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d2f069ac4b3c0a4b0978254443dccbbe
diff --git a/metadata/md5-cache/dev-python/patch-ng-1.17.4 b/metadata/md5-cache/dev-python/patch-ng-1.17.4
index 9d5a42ebac91..f8232e07b322 100644
--- a/metadata/md5-cache/dev-python/patch-ng-1.17.4
+++ b/metadata/md5-cache/dev-python/patch-ng-1.17.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/conan-io/python-patch-ng/archive/1.17.4.tar.gz -> patch-ng-1.17.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=60b0403bbbd44f813a539b4acc089460
diff --git a/metadata/md5-cache/dev-python/path-and-address-2.0.1 b/metadata/md5-cache/dev-python/path-and-address-2.0.1
index 65e0c4207cca..345a2e571fd8 100644
--- a/metadata/md5-cache/dev-python/path-and-address-2.0.1
+++ b/metadata/md5-cache/dev-python/path-and-address-2.0.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/path-and-address/path-and-address-2.0.1.zip
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0e6ab6aa0c20fcaebecad65ced5fff0f
diff --git a/metadata/md5-cache/dev-python/path-py-15.0.0 b/metadata/md5-cache/dev-python/path-py-15.0.0
index bb6b0dfa48b8..575f6bcedc6d 100644
--- a/metadata/md5-cache/dev-python/path-py-15.0.0
+++ b/metadata/md5-cache/dev-python/path-py-15.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/path/path-15.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a6eeaff18eadbfc14b738bbc470dc1d4
diff --git a/metadata/md5-cache/dev-python/pathlib2-2.3.5-r1 b/metadata/md5-cache/dev-python/pathlib2-2.3.5-r1
index e2796c318540..f36d66c912b2 100644
--- a/metadata/md5-cache/dev-python/pathlib2-2.3.5-r1
+++ b/metadata/md5-cache/dev-python/pathlib2-2.3.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathlib2/pathlib2-2.3.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a76daec407abab7876ac8d2cfc0e54ad
diff --git a/metadata/md5-cache/dev-python/pathspec-0.8.0 b/metadata/md5-cache/dev-python/pathspec-0.8.0
index 108936f57239..e6c8aee70454 100644
--- a/metadata/md5-cache/dev-python/pathspec-0.8.0
+++ b/metadata/md5-cache/dev-python/pathspec-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathspec/pathspec-0.8.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5cd2122467ddeb9cac7c2fd1864f0eff
diff --git a/metadata/md5-cache/dev-python/pathtools-0.1.2-r3 b/metadata/md5-cache/dev-python/pathtools-0.1.2-r3
index 601f4366b97b..d95a9f557e29 100644
--- a/metadata/md5-cache/dev-python/pathtools-0.1.2-r3
+++ b/metadata/md5-cache/dev-python/pathtools-0.1.2-r3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathtools/pathtools-0.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=47e1d251849a4cdb70e78e47facecce7
diff --git a/metadata/md5-cache/dev-python/patsy-0.5.1 b/metadata/md5-cache/dev-python/patsy-0.5.1
index a69283c7bad5..6a6c5da019f5 100644
--- a/metadata/md5-cache/dev-python/patsy-0.5.1
+++ b/metadata/md5-cache/dev-python/patsy-0.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/patsy/patsy-0.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=43b8dc8af6e067c58208a602cdf8995f
diff --git a/metadata/md5-cache/dev-python/pbkdf2-1.3-r1 b/metadata/md5-cache/dev-python/pbkdf2-1.3-r1
index ae2b786177ec..49879e8cb940 100644
--- a/metadata/md5-cache/dev-python/pbkdf2-1.3-r1
+++ b/metadata/md5-cache/dev-python/pbkdf2-1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbkdf2/pbkdf2-1.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0ac4b2c8dc0c060514aa32bfdf42926a
diff --git a/metadata/md5-cache/dev-python/pbr-5.5.1 b/metadata/md5-cache/dev-python/pbr-5.5.1
index 4e912ffba2fb..4d97b2e47afd 100644
--- a/metadata/md5-cache/dev-python/pbr-5.5.1
+++ b/metadata/md5-cache/dev-python/pbr-5.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-5.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=21aa1827c31b75766fafe3919b03178e
diff --git a/metadata/md5-cache/dev-python/pdfrw-0.4 b/metadata/md5-cache/dev-python/pdfrw-0.4
index 37cb9b1e3d0d..87e29c2341ed 100644
--- a/metadata/md5-cache/dev-python/pdfrw-0.4
+++ b/metadata/md5-cache/dev-python/pdfrw-0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdfrw/pdfrw-0.4.tar.gz test? ( https://github.com/pmaupin/static_pdfs/archive/d646009a0e3e71daf13a52ab1029e2230920ebf4.tar.gz -> pdfrw-static_pdfs-d646009a0e3e71daf13a52ab1029e2230920ebf4.tar.gz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3e81726e04599ca6440ace00173a7167
diff --git a/metadata/md5-cache/dev-python/pebble-4.5.3 b/metadata/md5-cache/dev-python/pebble-4.5.3
index c99a18544b5b..5e908a508014 100644
--- a/metadata/md5-cache/dev-python/pebble-4.5.3
+++ b/metadata/md5-cache/dev-python/pebble-4.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pebble/Pebble-4.5.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=04f030bfda525fb8e2dcb01d296dfc34
diff --git a/metadata/md5-cache/dev-python/pecan-1.3.3-r2 b/metadata/md5-cache/dev-python/pecan-1.3.3-r2
index ae3f4ca5ffbb..ff264ef6bf9b 100644
--- a/metadata/md5-cache/dev-python/pecan-1.3.3-r2
+++ b/metadata/md5-cache/dev-python/pecan-1.3.3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/webob-1.4[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pecan/pecan-1.3.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f6d6c5cbfac89eda987cd00101b64a81
diff --git a/metadata/md5-cache/dev-python/peewee-3.13.2 b/metadata/md5-cache/dev-python/peewee-3.13.2
index 5368ae0a76af..fa4685a2bb0b 100644
--- a/metadata/md5-cache/dev-python/peewee-3.13.2
+++ b/metadata/md5-cache/dev-python/peewee-3.13.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/coleifer/peewee/archive/3.13.2.tar.gz -> peewee-3.13.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2a344db0cd33dcf84dfb3ece5543f091
diff --git a/metadata/md5-cache/dev-python/pelican-minify-0.9 b/metadata/md5-cache/dev-python/pelican-minify-0.9
index ab8afffbdcd7..a86ca507a30d 100644
--- a/metadata/md5-cache/dev-python/pelican-minify-0.9
+++ b/metadata/md5-cache/dev-python/pelican-minify-0.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pelican-minify/pelican-minify-0.9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c7d32f6ac9495ee10ecf4e2e958d4780
diff --git a/metadata/md5-cache/dev-python/pep8-1.7.1 b/metadata/md5-cache/dev-python/pep8-1.7.1
index 6c597e07f10a..fa29e7200d74 100644
--- a/metadata/md5-cache/dev-python/pep8-1.7.1
+++ b/metadata/md5-cache/dev-python/pep8-1.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pep8/pep8-1.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1fa68703d0d4638209362bdb045fe352
diff --git a/metadata/md5-cache/dev-python/pew-1.1.1 b/metadata/md5-cache/dev-python/pew-1.1.1
index 21a0bc9ff043..728188be7632 100644
--- a/metadata/md5-cache/dev-python/pew-1.1.1
+++ b/metadata/md5-cache/dev-python/pew-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pew/pew-1.1.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f5eefa31efe447cbf5161459d59718d2
diff --git a/metadata/md5-cache/dev-python/pexpect-4.8.0-r1 b/metadata/md5-cache/dev-python/pexpect-4.8.0-r1
index 76f9e4187683..2f8dfe6c43aa 100644
--- a/metadata/md5-cache/dev-python/pexpect-4.8.0-r1
+++ b/metadata/md5-cache/dev-python/pexpect-4.8.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pexpect/pexpect-4.8.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8d4cdcc7b9f51a0eec7ad5f17c423d0c
diff --git a/metadata/md5-cache/dev-python/pgspecial-1.11.10 b/metadata/md5-cache/dev-python/pgspecial-1.11.10
index beb9384cbce1..9b61e7949525 100644
--- a/metadata/md5-cache/dev-python/pgspecial-1.11.10
+++ b/metadata/md5-cache/dev-python/pgspecial-1.11.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/pgspecial/archive/v1.11.10.tar.gz -> pgspecial-1.11.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b0aa4d327350d928b6e34488483bc840
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.11 b/metadata/md5-cache/dev-python/phonenumbers-8.12.11
index 62721eb4ce59..af4d6c776725 100644
--- a/metadata/md5-cache/dev-python/phonenumbers-8.12.11
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.11
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.12.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c45db5a5eb55f31b32afb9c8b02ab157
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.12 b/metadata/md5-cache/dev-python/phonenumbers-8.12.12
index 2f25b89a372e..d05c71e93e59 100644
--- a/metadata/md5-cache/dev-python/phonenumbers-8.12.12
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.12
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.12.12.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=82a94cf3e0ff7cc68cb4b10dcbda2dd0
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.13 b/metadata/md5-cache/dev-python/phonenumbers-8.12.13
index 20a1ac3c6ab4..640fa08af797 100644
--- a/metadata/md5-cache/dev-python/phonenumbers-8.12.13
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.13
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.12.13.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=82a94cf3e0ff7cc68cb4b10dcbda2dd0
diff --git a/metadata/md5-cache/dev-python/pickleshare-0.7.5 b/metadata/md5-cache/dev-python/pickleshare-0.7.5
index 1a3afc624ea6..1f1643f85139 100644
--- a/metadata/md5-cache/dev-python/pickleshare-0.7.5
+++ b/metadata/md5-cache/dev-python/pickleshare-0.7.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pickleshare/pickleshare-0.7.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a0ce97dadcfb5ab1c11742bc785dfc74
diff --git a/metadata/md5-cache/dev-python/pid-2.2.5 b/metadata/md5-cache/dev-python/pid-2.2.5
index 2e177c1acf27..37019841b75e 100644
--- a/metadata/md5-cache/dev-python/pid-2.2.5
+++ b/metadata/md5-cache/dev-python/pid-2.2.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pid/pid-2.2.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=05dc7e225cfee226d5e7e0c28df5507a
diff --git a/metadata/md5-cache/dev-python/pid-3.0.4 b/metadata/md5-cache/dev-python/pid-3.0.4
index 7b299b7a27e3..453ad6511892 100644
--- a/metadata/md5-cache/dev-python/pid-3.0.4
+++ b/metadata/md5-cache/dev-python/pid-3.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pid/pid-3.0.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f51ad5040a46dd9cbf59752045561814
diff --git a/metadata/md5-cache/dev-python/piexif-1.1.3 b/metadata/md5-cache/dev-python/piexif-1.1.3
index f0473f5906d3..76a3b28889be 100644
--- a/metadata/md5-cache/dev-python/piexif-1.1.3
+++ b/metadata/md5-cache/dev-python/piexif-1.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/piexif/piexif-1.1.3.zip
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3ab06989c4a0cbad30c93eb3e7e89fb4
diff --git a/metadata/md5-cache/dev-python/pika-1.1.0 b/metadata/md5-cache/dev-python/pika-1.1.0
index 8332bf869c4a..74f319167009 100644
--- a/metadata/md5-cache/dev-python/pika-1.1.0
+++ b/metadata/md5-cache/dev-python/pika-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pika/pika-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=33f30571f81f70ad4036b27ca57a95c3
diff --git a/metadata/md5-cache/dev-python/pikepdf-1.18.0 b/metadata/md5-cache/dev-python/pikepdf-1.18.0
index db2f151f8e25..59f9182bb9c6 100644
--- a/metadata/md5-cache/dev-python/pikepdf-1.18.0
+++ b/metadata/md5-cache/dev-python/pikepdf-1.18.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pikepdf/pikepdf/archive/v1.18.0.tar.gz -> pikepdf-1.18.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7c831d0eab4f8db292fc1d3df49a1ce4
diff --git a/metadata/md5-cache/dev-python/pikepdf-2.2.0 b/metadata/md5-cache/dev-python/pikepdf-2.2.0
new file mode 100644
index 000000000000..56f27185c1cf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pikepdf-2.2.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/qpdf:0= dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pybind11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wheel-0.35[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pybind11-2.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools_scm-4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools_scm_git_archive[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/attrs-20.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/hypothesis-5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/hypothesis-6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pillow-5.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pytest-7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-cov-2.10.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pytest-cov-3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-xdist-1.28[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pytest-xdist-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.4.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=Python library to work with pdf files based on qpdf
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=MPL-2.0
+RDEPEND=app-text/qpdf:0= dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pybind11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pikepdf/pikepdf/archive/v2.2.0.tar.gz -> pikepdf-2.2.0.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9808510587f75445d280e8f6897d59f2
diff --git a/metadata/md5-cache/dev-python/pilkit-2.0 b/metadata/md5-cache/dev-python/pilkit-2.0
index 26adec2c4355..c15072108c35 100644
--- a/metadata/md5-cache/dev-python/pilkit-2.0
+++ b/metadata/md5-cache/dev-python/pilkit-2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/matthewwithanm/pilkit/archive/2.0.tar.gz -> pilkit-2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9981096d407168c66d36ccc0557c59f8
diff --git a/metadata/md5-cache/dev-python/pillow-7.0.0 b/metadata/md5-cache/dev-python/pillow-7.0.0
index 017e9f71d705..72214b02e6e9 100644
--- a/metadata/md5-cache/dev-python/pillow-7.0.0
+++ b/metadata/md5-cache/dev-python/pillow-7.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( jpeg tiff ) || ( python_targets_python3_6 python_targets_py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-pillow/Pillow/archive/7.0.0.tar.gz -> pillow-7.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=a18847f875b3cd914f025297ae38398d
diff --git a/metadata/md5-cache/dev-python/pillow-7.2.0 b/metadata/md5-cache/dev-python/pillow-7.2.0
index 44324511c873..945868f5da3b 100644
--- a/metadata/md5-cache/dev-python/pillow-7.2.0
+++ b/metadata/md5-cache/dev-python/pillow-7.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( jpeg tiff ) || ( python_targets_python3_6 python_targets_py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-pillow/Pillow/archive/7.2.0.tar.gz -> pillow-7.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=eb716172944c6aa4c0645aba13d46fce
diff --git a/metadata/md5-cache/dev-python/pillow-8.0.1 b/metadata/md5-cache/dev-python/pillow-8.0.1
index 9843ee6fe734..1cc1c8086eef 100644
--- a/metadata/md5-cache/dev-python/pillow-8.0.1
+++ b/metadata/md5-cache/dev-python/pillow-8.0.1
@@ -5,12 +5,12 @@ DESCRIPTION=Python Imaging Library (fork)
 EAPI=7
 HOMEPAGE=https://python-pillow.org/
 IUSE=examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=HPND
 RDEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=test? ( jpeg tiff ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-pillow/Pillow/archive/8.0.1.tar.gz -> pillow-8.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=39616cee0dca3d488674b3ea5226de43
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_md5_=51c2b50a935cc9004835021216645e0d
diff --git a/metadata/md5-cache/dev-python/pip-20.2.4 b/metadata/md5-cache/dev-python/pip-20.2.4
index 9a0fbeee5f44..7c16c13d4ccb 100644
--- a/metadata/md5-cache/dev-python/pip-20.2.4
+++ b/metadata/md5-cache/dev-python/pip-20.2.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pip/archive/20.2.4.tar.gz -> pip-20.2.4.tar.gz test? ( https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-44.0.0-py2.py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.34.2-py2.py3-none-any.whl )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5b915e69e3f9216101f4f9cff01f7856
diff --git a/metadata/md5-cache/dev-python/pipenv-2020.11.4 b/metadata/md5-cache/dev-python/pipenv-2020.11.4
index 8fda26e6873f..ba483d6053c6 100644
--- a/metadata/md5-cache/dev-python/pipenv-2020.11.4
+++ b/metadata/md5-cache/dev-python/pipenv-2020.11.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pipenv/archive/v2020.11.4.tar.gz -> pipenv-2020.11.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=283ccb7bb18180aed93764a0f51dc7b1
diff --git a/metadata/md5-cache/dev-python/pipenv-2020.8.13 b/metadata/md5-cache/dev-python/pipenv-2020.8.13
index 14afac29875a..05048416f562 100644
--- a/metadata/md5-cache/dev-python/pipenv-2020.8.13
+++ b/metadata/md5-cache/dev-python/pipenv-2020.8.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pipenv/archive/v2020.8.13.tar.gz -> pipenv-2020.8.13.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=36512a86065307a563b27b2eb9a1fdc2
diff --git a/metadata/md5-cache/dev-python/pipfile-0.0.2 b/metadata/md5-cache/dev-python/pipfile-0.0.2
index 1a0a1de04d43..e9fda5185666 100644
--- a/metadata/md5-cache/dev-python/pipfile-0.0.2
+++ b/metadata/md5-cache/dev-python/pipfile-0.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pipfile/archive/v0.0.2.tar.gz -> pipfile-0.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=02fbe416a2fe26af1fb6c8be7f644aaf
diff --git a/metadata/md5-cache/dev-python/pkgconfig-1.5.1 b/metadata/md5-cache/dev-python/pkgconfig-1.5.1
index a1b5e2617171..def75cfc4779 100644
--- a/metadata/md5-cache/dev-python/pkgconfig-1.5.1
+++ b/metadata/md5-cache/dev-python/pkgconfig-1.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/matze/pkgconfig/archive/v1.5.1.tar.gz -> pkgconfig-1.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5b74e1afea494b40323954988764f08b
diff --git a/metadata/md5-cache/dev-python/pkginfo-1.5.0.1-r1 b/metadata/md5-cache/dev-python/pkginfo-1.5.0.1-r1
index 3e98ca0299b3..6e8670f8472b 100644
--- a/metadata/md5-cache/dev-python/pkginfo-1.5.0.1-r1
+++ b/metadata/md5-cache/dev-python/pkginfo-1.5.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkginfo/pkginfo-1.5.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8d74b16b175ef3e789ef0591e062c82c
diff --git a/metadata/md5-cache/dev-python/plotly-1.9.6 b/metadata/md5-cache/dev-python/plotly-1.9.6
index b83c51e91e69..34f7c44053c3 100644
--- a/metadata/md5-cache/dev-python/plotly-1.9.6
+++ b/metadata/md5-cache/dev-python/plotly-1.9.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/plotly/plotly-1.9.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9bb1bd3caa26220f4d43eeb2dfab0f60
diff --git a/metadata/md5-cache/dev-python/plotly-4.10.0 b/metadata/md5-cache/dev-python/plotly-4.10.0
index da69c94fb0ec..5f88666a25ef 100644
--- a/metadata/md5-cache/dev-python/plotly-4.10.0
+++ b/metadata/md5-cache/dev-python/plotly-4.10.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/retrying[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/plotly/plotly-4.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=30e8b532558338ada761fde05d24daae
diff --git a/metadata/md5-cache/dev-python/plotly-geo-1.0.0 b/metadata/md5-cache/dev-python/plotly-geo-1.0.0
index b4a65e3dd0e3..baa21bc8aaab 100644
--- a/metadata/md5-cache/dev-python/plotly-geo-1.0.0
+++ b/metadata/md5-cache/dev-python/plotly-geo-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/plotly[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/plotly-geo/plotly-geo-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7fb2ebe584e713abf35161022c77b114
diff --git a/metadata/md5-cache/dev-python/pluggy-0.13.1-r1 b/metadata/md5-cache/dev-python/pluggy-0.13.1-r1
index dfcc3b255fbd..2a6427d49fd2 100644
--- a/metadata/md5-cache/dev-python/pluggy-0.13.1-r1
+++ b/metadata/md5-cache/dev-python/pluggy-0.13.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluggy/pluggy-0.13.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2e99400483a3ab683ee5d5703198b2ea
diff --git a/metadata/md5-cache/dev-python/pluginbase-1.0.0 b/metadata/md5-cache/dev-python/pluginbase-1.0.0
index 071c3f19adaa..0e489f3c05ef 100644
--- a/metadata/md5-cache/dev-python/pluginbase-1.0.0
+++ b/metadata/md5-cache/dev-python/pluginbase-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluginbase/pluginbase-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dc729dffbc81cdeb5cc227194770eb57
diff --git a/metadata/md5-cache/dev-python/plumbum-1.6.8 b/metadata/md5-cache/dev-python/plumbum-1.6.8
index d3c88694a256..cf0dc137bacb 100644
--- a/metadata/md5-cache/dev-python/plumbum-1.6.8
+++ b/metadata/md5-cache/dev-python/plumbum-1.6.8
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/tomerfiliba/plumbum/archive/v1.6.8.tar.gz -> plumbum-1.6.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=67936f7e4325caf1e4e065628dae0b25
diff --git a/metadata/md5-cache/dev-python/plumbum-1.6.9 b/metadata/md5-cache/dev-python/plumbum-1.6.9
new file mode 100644
index 000000000000..0268612db073
--- /dev/null
+++ b/metadata/md5-cache/dev-python/plumbum-1.6.9
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=A library for shell script-like programs in python
+EAPI=7
+HOMEPAGE=https://plumbum.readthedocs.io/en/latest/ https://github.com/tomerfiliba/plumbum
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/tomerfiliba/plumbum/archive/v1.6.9.tar.gz -> plumbum-1.6.9.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a089b69ac591548885d5a0902a758edd
diff --git a/metadata/md5-cache/dev-python/ply-3.11-r1 b/metadata/md5-cache/dev-python/ply-3.11-r1
index acd98c730c4a..00d988e97bb1 100644
--- a/metadata/md5-cache/dev-python/ply-3.11-r1
+++ b/metadata/md5-cache/dev-python/ply-3.11-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0/3.11
 SRC_URI=mirror://pypi/p/ply/ply-3.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97af0e4431f694c74b823eefece14ad3
diff --git a/metadata/md5-cache/dev-python/plyr-1.0.6 b/metadata/md5-cache/dev-python/plyr-1.0.6
index 065fcdad4133..b3d2227f774c 100644
--- a/metadata/md5-cache/dev-python/plyr-1.0.6
+++ b/metadata/md5-cache/dev-python/plyr-1.0.6
@@ -11,5 +11,5 @@ RDEPEND=media-libs/glyr:= python_targets_python3_6? ( dev-lang/python:3.6 ) pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/sahib/python-glyr/archive/1.0.6.tar.gz -> python-glyr-1.0.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9f41fc3617566653fd2efb976af63cc6
diff --git a/metadata/md5-cache/dev-python/plyvel-1.3.0 b/metadata/md5-cache/dev-python/plyvel-1.3.0
index 3a0f2ecd8e6e..233714ad88f6 100644
--- a/metadata/md5-cache/dev-python/plyvel-1.3.0
+++ b/metadata/md5-cache/dev-python/plyvel-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/plyvel/plyvel-1.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=15b70993e5bef750dc059d14d0773dd1
diff --git a/metadata/md5-cache/dev-python/pmw-2.0.1-r2 b/metadata/md5-cache/dev-python/pmw-2.0.1-r2
index 987715953c35..6cd924140563 100644
--- a/metadata/md5-cache/dev-python/pmw-2.0.1-r2
+++ b/metadata/md5-cache/dev-python/pmw-2.0.1-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=py3
 SRC_URI=mirror://pypi/P/Pmw/Pmw-2.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=fe5a5933461ebca8bb1a1fc06c43c3b2
diff --git a/metadata/md5-cache/dev-python/pocketlint-0.20 b/metadata/md5-cache/dev-python/pocketlint-0.20
index b25a9371cd1a..9898ef3fd4cd 100644
--- a/metadata/md5-cache/dev-python/pocketlint-0.20
+++ b/metadata/md5-cache/dev-python/pocketlint-0.20
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/pocketlint/archive/0.20.tar.gz -> pocketlint-0.20.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3ae750686fb62158d89d2cfffce4d0c0
diff --git a/metadata/md5-cache/dev-python/pockets-0.9.1 b/metadata/md5-cache/dev-python/pockets-0.9.1
index e3210ddcbf27..12f4cd866487 100644
--- a/metadata/md5-cache/dev-python/pockets-0.9.1
+++ b/metadata/md5-cache/dev-python/pockets-0.9.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pockets/pockets-0.9.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=67dba3d16f6b9e32f7b1b01fd991602a
diff --git a/metadata/md5-cache/dev-python/podcastparser-0.6.5 b/metadata/md5-cache/dev-python/podcastparser-0.6.5
index 841dce6f7c4b..d6807f22fac0 100644
--- a/metadata/md5-cache/dev-python/podcastparser-0.6.5
+++ b/metadata/md5-cache/dev-python/podcastparser-0.6.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/podcastparser/podcastparser-0.6.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5ff00a64e5270af221c4d5b2efc417ef
diff --git a/metadata/md5-cache/dev-python/polib-1.1.0-r1 b/metadata/md5-cache/dev-python/polib-1.1.0-r1
index ecf571b85a85..0d5448daad4a 100644
--- a/metadata/md5-cache/dev-python/polib-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/polib-1.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/polib/polib-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fe36f1b864d34e92295c663e9209a36b
diff --git a/metadata/md5-cache/dev-python/polygon-3.0.7 b/metadata/md5-cache/dev-python/polygon-3.0.7
index e59ed2448f4f..8bdd29b191c6 100644
--- a/metadata/md5-cache/dev-python/polygon-3.0.7
+++ b/metadata/md5-cache/dev-python/polygon-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=3
 SRC_URI=https://www.bitbucket.org/jraedler/polygon3/downloads/Polygon3-3.0.7.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7f63fa88727350acbc007d3e8bf37b32
diff --git a/metadata/md5-cache/dev-python/pony-0.7.13 b/metadata/md5-cache/dev-python/pony-0.7.13
index e3ccc466c34d..ab3f03e72ede 100644
--- a/metadata/md5-cache/dev-python/pony-0.7.13
+++ b/metadata/md5-cache/dev-python/pony-0.7.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ponyorm/pony/archive/v0.7.13.tar.gz -> pony-0.7.13.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3ce4e94675a0d7c481a6c94aae6061ca
diff --git a/metadata/md5-cache/dev-python/pony-0.7.14 b/metadata/md5-cache/dev-python/pony-0.7.14
index 597e7b8707da..67bc506f938a 100644
--- a/metadata/md5-cache/dev-python/pony-0.7.14
+++ b/metadata/md5-cache/dev-python/pony-0.7.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ponyorm/pony/archive/v0.7.14.tar.gz -> pony-0.7.14.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f6f445eabe7f7c7aca99105289df5dc0
diff --git a/metadata/md5-cache/dev-python/pooch-1.2.0 b/metadata/md5-cache/dev-python/pooch-1.2.0
index a916bfe3a790..7ae58e66f303 100644
--- a/metadata/md5-cache/dev-python/pooch-1.2.0
+++ b/metadata/md5-cache/dev-python/pooch-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/appdirs[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/fatiando/pooch/archive/v1.2.0.tar.gz -> pooch-1.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=35c8d2fe838ff19d686b2a6b0d7c5ef3
diff --git a/metadata/md5-cache/dev-python/portend-2.6 b/metadata/md5-cache/dev-python/portend-2.6
index 86532a8fb650..9a51a5988c5e 100644
--- a/metadata/md5-cache/dev-python/portend-2.6
+++ b/metadata/md5-cache/dev-python/portend-2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/portend/portend-2.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1622637657a89f53dd3cfe648b61750e
diff --git a/metadata/md5-cache/dev-python/portend-2.7.0 b/metadata/md5-cache/dev-python/portend-2.7.0
index 10c3415f948e..64c8b1271874 100644
--- a/metadata/md5-cache/dev-python/portend-2.7.0
+++ b/metadata/md5-cache/dev-python/portend-2.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/portend/portend-2.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c1a93aeed3f7ad8150de2b35ab5bc60d
diff --git a/metadata/md5-cache/dev-python/poyo-0.5.0 b/metadata/md5-cache/dev-python/poyo-0.5.0
index fa043cbbfbe9..df3c35be9f43 100644
--- a/metadata/md5-cache/dev-python/poyo-0.5.0
+++ b/metadata/md5-cache/dev-python/poyo-0.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/poyo/poyo-0.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c60c7bea78268f9e614fcfaa4eaa9059
diff --git a/metadata/md5-cache/dev-python/precis-i18n-1.0.2 b/metadata/md5-cache/dev-python/precis-i18n-1.0.2
index a2a022c9cf9a..c9132635ada1 100644
--- a/metadata/md5-cache/dev-python/precis-i18n-1.0.2
+++ b/metadata/md5-cache/dev-python/precis-i18n-1.0.2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/precis_i18n/precis_i18n-1.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dddcb765579f60975fc2bc65e06e8307
diff --git a/metadata/md5-cache/dev-python/pretend-1.0.9-r1 b/metadata/md5-cache/dev-python/pretend-1.0.9-r1
index 8223af5f9f41..8613e8b60461 100644
--- a/metadata/md5-cache/dev-python/pretend-1.0.9-r1
+++ b/metadata/md5-cache/dev-python/pretend-1.0.9-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alex/pretend/archive/v1.0.9.tar.gz -> pretend-1.0.9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=77c01c9215646ee0b297daee382fb109
diff --git a/metadata/md5-cache/dev-python/pretty-yaml-20.4.0 b/metadata/md5-cache/dev-python/pretty-yaml-20.4.0
index 62338e3cc480..9d11edfe99ea 100644
--- a/metadata/md5-cache/dev-python/pretty-yaml-20.4.0
+++ b/metadata/md5-cache/dev-python/pretty-yaml-20.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyaml/pyaml-20.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=35e847d80f33e9bdd648ad143eb8d88d
diff --git a/metadata/md5-cache/dev-python/prettytable-0.7.2-r1 b/metadata/md5-cache/dev-python/prettytable-0.7.2-r1
index 00b54446911b..f2bde1399b37 100644
--- a/metadata/md5-cache/dev-python/prettytable-0.7.2-r1
+++ b/metadata/md5-cache/dev-python/prettytable-0.7.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PrettyTable/prettytable-0.7.2.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0033c09e0c5c62cc5ad78f16fe028598
diff --git a/metadata/md5-cache/dev-python/prettytable-2.0.0 b/metadata/md5-cache/dev-python/prettytable-2.0.0
index 4933e83beaee..9e6d3980d054 100644
--- a/metadata/md5-cache/dev-python/prettytable-2.0.0
+++ b/metadata/md5-cache/dev-python/prettytable-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prettytable/prettytable-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cd596e2cc29ac341293c4d3cbb2bee0e
diff --git a/metadata/md5-cache/dev-python/priority-1.3.0 b/metadata/md5-cache/dev-python/priority-1.3.0
index 54a0852dd62c..bea2645952da 100644
--- a/metadata/md5-cache/dev-python/priority-1.3.0
+++ b/metadata/md5-cache/dev-python/priority-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/priority/priority-1.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2edd0b0fb1dd9f0fd083d262a23e530d
diff --git a/metadata/md5-cache/dev-python/process-tests-2.1.1 b/metadata/md5-cache/dev-python/process-tests-2.1.1
index e87e4a31131f..343f9c9b9b5f 100644
--- a/metadata/md5-cache/dev-python/process-tests-2.1.1
+++ b/metadata/md5-cache/dev-python/process-tests-2.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/process-tests/process-tests-2.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=729620605848a32e498ccd4f8cabe226
diff --git a/metadata/md5-cache/dev-python/progress-1.5 b/metadata/md5-cache/dev-python/progress-1.5
index a8e3ffc54ddb..b43f1222e587 100644
--- a/metadata/md5-cache/dev-python/progress-1.5
+++ b/metadata/md5-cache/dev-python/progress-1.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/progress/progress-1.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=604e4bf3e866e31ce58159296f9dd220
diff --git a/metadata/md5-cache/dev-python/progressbar-2.5 b/metadata/md5-cache/dev-python/progressbar-2.5
index 4c70187128ba..ba3334c0c349 100644
--- a/metadata/md5-cache/dev-python/progressbar-2.5
+++ b/metadata/md5-cache/dev-python/progressbar-2.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/progressbar/progressbar-2.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=af155d8407636e569aedfb6730080f54
diff --git a/metadata/md5-cache/dev-python/progressbar2-3.39.3 b/metadata/md5-cache/dev-python/progressbar2-3.39.3
index 761e41a53e7f..7f9658d4d86a 100644
--- a/metadata/md5-cache/dev-python/progressbar2-3.39.3
+++ b/metadata/md5-cache/dev-python/progressbar2-3.39.3
@@ -10,5 +10,5 @@ RDEPEND=!dev-python/progressbar[python_targets_pypy3(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/progressbar2/progressbar2-3.39.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d88d65f1d6dc51482d81390b9ef5aebe
diff --git a/metadata/md5-cache/dev-python/prometheus_client-0.8.0 b/metadata/md5-cache/dev-python/prometheus_client-0.8.0
index 4e760a844e11..b33f634d133f 100644
--- a/metadata/md5-cache/dev-python/prometheus_client-0.8.0
+++ b/metadata/md5-cache/dev-python/prometheus_client-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/prometheus/client_python/archive/v0.8.0.tar.gz -> prometheus_client-0.8.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=be37b432b147915cb37619abf4019540
diff --git a/metadata/md5-cache/dev-python/prometheus_client-0.9.0 b/metadata/md5-cache/dev-python/prometheus_client-0.9.0
index d9d7926ca6d1..0b4ab1bef021 100644
--- a/metadata/md5-cache/dev-python/prometheus_client-0.9.0
+++ b/metadata/md5-cache/dev-python/prometheus_client-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/prometheus/client_python/archive/v0.9.0.tar.gz -> prometheus_client-0.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3e43eae9d74e8d0fdef8a7b0335c718c
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-2.0.10-r1 b/metadata/md5-cache/dev-python/prompt_toolkit-2.0.10-r1
index b50059129826..cdfa4c3a983e 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-2.0.10-r1
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-2.0.10-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-2.0.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=314903cc4ea4cfd698896b4c3c123ae5
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.7 b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.7
index fbd4c81f29a4..37aa7967c8cf 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.7
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-3.0.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0e4c0da4917eadb6f3e81c436f161556
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.12.2-r1 b/metadata/md5-cache/dev-python/protobuf-python-3.12.2-r1
index 464fbda8c8d3..4a9e791508a4 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.12.2-r1
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.12.2-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0/23
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.12.2.tar.gz -> protobuf-3.12.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cca2cec87fdb78adcd367e88d5260464
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.12.4-r1 b/metadata/md5-cache/dev-python/protobuf-python-3.12.4-r1
index 21c968ab4740..ac5c8f72354b 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.12.4-r1
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.12.4-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0/23
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.12.4.tar.gz -> protobuf-3.12.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0d4675cd880edd17969cdd3d59048263
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.13.0-r1 b/metadata/md5-cache/dev-python/protobuf-python-3.13.0-r1
index ac7a42519ec1..c0e9e9f44a8c 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.13.0-r1
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.13.0-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0/24
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz -> protobuf-3.13.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8221f7904cfbfd110a52d3c5239ebd1f
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.14.0 b/metadata/md5-cache/dev-python/protobuf-python-3.14.0
index 3bb39638f115..bba398b785b6 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.14.0
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.14.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0/25
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.14.0.tar.gz -> protobuf-3.14.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=09235f901cd0f2c233e1220336779511
diff --git a/metadata/md5-cache/dev-python/protobuf-python-9999 b/metadata/md5-cache/dev-python/protobuf-python-9999
index 59733a199a07..d7f33153eaef 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-9999
+++ b/metadata/md5-cache/dev-python/protobuf-python-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-9999 dev-python/namespace-google[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0/25
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=67faa3d2ab09ee7d0f7dd281771250f3
diff --git a/metadata/md5-cache/dev-python/prov-1.5.3 b/metadata/md5-cache/dev-python/prov-1.5.3
index a86047e94f8f..a5da50e54e6a 100644
--- a/metadata/md5-cache/dev-python/prov-1.5.3
+++ b/metadata/md5-cache/dev-python/prov-1.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prov/prov-1.5.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fc5ade5c30213c9e3042541f62963bce
diff --git a/metadata/md5-cache/dev-python/pslab-python-1.0.1-r1 b/metadata/md5-cache/dev-python/pslab-python-1.0.1-r1
index 9b8095c8f620..c09e396609b7 100644
--- a/metadata/md5-cache/dev-python/pslab-python-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/pslab-python-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/fossasia/pslab-python/archive/v1.0.1.tar.gz -> pslab-python-1.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2865640a0400044a80265fff690ef5ef
diff --git a/metadata/md5-cache/dev-python/psutil-5.7.0-r1 b/metadata/md5-cache/dev-python/psutil-5.7.0-r1
index 22bca9a8ae1a..6625b8afdbf2 100644
--- a/metadata/md5-cache/dev-python/psutil-5.7.0-r1
+++ b/metadata/md5-cache/dev-python/psutil-5.7.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-5.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8852aa773cbb074c7d80d9dfde8c6031
diff --git a/metadata/md5-cache/dev-python/psutil-5.7.2-r1 b/metadata/md5-cache/dev-python/psutil-5.7.2-r1
index 3c6e93917967..155c3a6ea520 100644
--- a/metadata/md5-cache/dev-python/psutil-5.7.2-r1
+++ b/metadata/md5-cache/dev-python/psutil-5.7.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-5.7.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e0c5b76ea96ec77e0388d907278403d5
diff --git a/metadata/md5-cache/dev-python/psutil-5.7.3 b/metadata/md5-cache/dev-python/psutil-5.7.3
index 54c9f040b273..74468c6911e9 100644
--- a/metadata/md5-cache/dev-python/psutil-5.7.3
+++ b/metadata/md5-cache/dev-python/psutil-5.7.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-5.7.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8bfe98a6791fdf906aedab54b6fad1e3
diff --git a/metadata/md5-cache/dev-python/psycopg-2.8.5-r1 b/metadata/md5-cache/dev-python/psycopg-2.8.5-r1
index 756d4bf96689..9aa8e4c44dd7 100644
--- a/metadata/md5-cache/dev-python/psycopg-2.8.5-r1
+++ b/metadata/md5-cache/dev-python/psycopg-2.8.5-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-db/postgresql-8.1:* python_targets_python3_6? ( dev-lang/python:3.
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=2
 SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.8.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1ee957053592990dcac1dcf1c5440f55
diff --git a/metadata/md5-cache/dev-python/psycopg-2.8.6-r1 b/metadata/md5-cache/dev-python/psycopg-2.8.6-r1
index fbc16223917d..ab6aff464505 100644
--- a/metadata/md5-cache/dev-python/psycopg-2.8.6-r1
+++ b/metadata/md5-cache/dev-python/psycopg-2.8.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.8.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b52333ed53b5e54693ded0c35062fd51
diff --git a/metadata/md5-cache/dev-python/ptpython-2.0.6 b/metadata/md5-cache/dev-python/ptpython-2.0.6
index f052da742cfb..890136262297 100644
--- a/metadata/md5-cache/dev-python/ptpython-2.0.6
+++ b/metadata/md5-cache/dev-python/ptpython-2.0.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/ptpython/ptpython-2.0.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8b3444f8fda1009a3a6e633fbdd2957c
diff --git a/metadata/md5-cache/dev-python/ptvsd-4.3.2 b/metadata/md5-cache/dev-python/ptvsd-4.3.2
index f8d59c20dc3b..a2942229b094 100644
--- a/metadata/md5-cache/dev-python/ptvsd-4.3.2
+++ b/metadata/md5-cache/dev-python/ptvsd-4.3.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/microsoft/ptvsd/archive/v4.3.2.tar.gz -> ptvsd-4.3.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c1517c3417864afdc2332d1390c00493
diff --git a/metadata/md5-cache/dev-python/ptyprocess-0.6.0-r1 b/metadata/md5-cache/dev-python/ptyprocess-0.6.0-r1
index 078d3f0acd9c..8c7f590a66d2 100644
--- a/metadata/md5-cache/dev-python/ptyprocess-0.6.0-r1
+++ b/metadata/md5-cache/dev-python/ptyprocess-0.6.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/ptyprocess/ptyprocess-0.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=647e22ae51b7466d5be6978e62cbed1b
diff --git a/metadata/md5-cache/dev-python/publicsuffix-2.20191221 b/metadata/md5-cache/dev-python/publicsuffix-2.20191221
index 377592bb7d5d..4472e89d25dd 100644
--- a/metadata/md5-cache/dev-python/publicsuffix-2.20191221
+++ b/metadata/md5-cache/dev-python/publicsuffix-2.20191221
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/publicsuffix2/publicsuffix2-2.20191221.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e83acfbc78392310d96097685e4d6ddf
diff --git a/metadata/md5-cache/dev-python/pudb-2019.2 b/metadata/md5-cache/dev-python/pudb-2019.2
index 9d32a5df5036..3bdae0631e4f 100644
--- a/metadata/md5-cache/dev-python/pudb-2019.2
+++ b/metadata/md5-cache/dev-python/pudb-2019.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/urwid[python_targets_python3_7(-)?,python_targets_python3_8(-
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pudb/pudb-2019.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=976335cad7f4d39856b24dbbc6ed9990
diff --git a/metadata/md5-cache/dev-python/pure-sasl-0.6.1 b/metadata/md5-cache/dev-python/pure-sasl-0.6.1
index 53897e944a25..8cb0bd62d405 100644
--- a/metadata/md5-cache/dev-python/pure-sasl-0.6.1
+++ b/metadata/md5-cache/dev-python/pure-sasl-0.6.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pure-sasl/pure-sasl-0.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=edb95bca08416712dc1b3d0d7d731dce
diff --git a/metadata/md5-cache/dev-python/pushbullet-py-0.12.0 b/metadata/md5-cache/dev-python/pushbullet-py-0.12.0
index 2a267983db38..18321aa4da5b 100644
--- a/metadata/md5-cache/dev-python/pushbullet-py-0.12.0
+++ b/metadata/md5-cache/dev-python/pushbullet-py-0.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pushbullet-py/pushbullet.py-0.12.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=db935b8d03110ebb30b1860a400dd345
diff --git a/metadata/md5-cache/dev-python/pweave-0.30.3-r1 b/metadata/md5-cache/dev-python/pweave-0.30.3-r1
index 5bee2f1bc96b..e61582d6fe3e 100644
--- a/metadata/md5-cache/dev-python/pweave-0.30.3-r1
+++ b/metadata/md5-cache/dev-python/pweave-0.30.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pweave/Pweave-0.30.3.tar.gz -> pweave-0.30.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=72c72d781e92ba936182063faf5ba388
diff --git a/metadata/md5-cache/dev-python/py-1.9.0-r1 b/metadata/md5-cache/dev-python/py-1.9.0-r1
index be5403e589b0..e4cb9cfd49ee 100644
--- a/metadata/md5-cache/dev-python/py-1.9.0-r1
+++ b/metadata/md5-cache/dev-python/py-1.9.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/py/py-1.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=649fa3f514e05cd41e2061daeafae047
diff --git a/metadata/md5-cache/dev-python/py-amqp-2.5.2 b/metadata/md5-cache/dev-python/py-amqp-2.5.2
deleted file mode 100644
index 013755944ed1..000000000000
--- a/metadata/md5-cache/dev-python/py-amqp-2.5.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/vine-1.1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx_celery[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( >=dev-python/case-1.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cov[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-rerunfailures-6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=Low-level AMQP client for Python (fork of amqplib)
-EAPI=7
-HOMEPAGE=https://github.com/celery/py-amqp https://pypi.org/project/amqp/
-IUSE=doc extras test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/amqp/amqp-2.5.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e35fd48354a36a62d39c1efe21b5f17e
diff --git a/metadata/md5-cache/dev-python/py-amqp-2.6.1 b/metadata/md5-cache/dev-python/py-amqp-2.6.1
index cb0734a9009c..3bde91581455 100644
--- a/metadata/md5-cache/dev-python/py-amqp-2.6.1
+++ b/metadata/md5-cache/dev-python/py-amqp-2.6.1
@@ -5,12 +5,12 @@ DESCRIPTION=Low-level AMQP client for Python (fork of amqplib)
 EAPI=7
 HOMEPAGE=https://github.com/celery/py-amqp https://pypi.org/project/amqp/
 IUSE=doc extras test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/amqp/amqp-2.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=760565a5dad1b422c1089135dba02e22
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=549669c6126aedf765158e6a9f6c5fe8
diff --git a/metadata/md5-cache/dev-python/py-cpuinfo-6.0.0 b/metadata/md5-cache/dev-python/py-cpuinfo-6.0.0
index 7f72d8c8e596..d27d976bb631 100644
--- a/metadata/md5-cache/dev-python/py-cpuinfo-6.0.0
+++ b/metadata/md5-cache/dev-python/py-cpuinfo-6.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/py-cpuinfo/py-cpuinfo-6.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f59edeeb5f79abba5038cd3ade99c95b
diff --git a/metadata/md5-cache/dev-python/py-cpuinfo-7.0.0 b/metadata/md5-cache/dev-python/py-cpuinfo-7.0.0
index 140d7cfaaf31..279927de1fde 100644
--- a/metadata/md5-cache/dev-python/py-cpuinfo-7.0.0
+++ b/metadata/md5-cache/dev-python/py-cpuinfo-7.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/py-cpuinfo/py-cpuinfo-7.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f30b2fa29d8b5ad13333b0d3697e76ab
diff --git a/metadata/md5-cache/dev-python/py-gfm-0.1.4 b/metadata/md5-cache/dev-python/py-gfm-0.1.4
index b571dc24e968..5c0c11e3a9a6 100644
--- a/metadata/md5-cache/dev-python/py-gfm-0.1.4
+++ b/metadata/md5-cache/dev-python/py-gfm-0.1.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/markdown[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/Zopieux/py-gfm/archive/0.1.4.tar.gz -> py-gfm-0.1.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8cc5d8a2a8e9dd7912313755073ad15a
diff --git a/metadata/md5-cache/dev-python/py-ubjson-0.16.1 b/metadata/md5-cache/dev-python/py-ubjson-0.16.1
index d4ac44e6295f..db6bc3c0961c 100644
--- a/metadata/md5-cache/dev-python/py-ubjson-0.16.1
+++ b/metadata/md5-cache/dev-python/py-ubjson-0.16.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/py-ubjson/py-ubjson-0.16.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8297e97c9ceebe7faa593eaf6b86ebc7
diff --git a/metadata/md5-cache/dev-python/pyClamd-0.4.0-r2 b/metadata/md5-cache/dev-python/pyClamd-0.4.0-r2
index 3d90d22b0eb0..abd82e8f8077 100644
--- a/metadata/md5-cache/dev-python/pyClamd-0.4.0-r2
+++ b/metadata/md5-cache/dev-python/pyClamd-0.4.0-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyClamd/pyClamd-0.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9d314dc8753671125ac47dc777aa0784
diff --git a/metadata/md5-cache/dev-python/pyFFTW-0.11.1 b/metadata/md5-cache/dev-python/pyFFTW-0.11.1
index 3268ae3e50d0..a9372b6edcd5 100644
--- a/metadata/md5-cache/dev-python/pyFFTW-0.11.1
+++ b/metadata/md5-cache/dev-python/pyFFTW-0.11.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pyFFTW/pyFFTW/archive/v0.11.1.tar.gz -> pyFFTW-0.11.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=acf234892c0c70409b79780fb4b4ad19
diff --git a/metadata/md5-cache/dev-python/pyFFTW-9999 b/metadata/md5-cache/dev-python/pyFFTW-9999
index b2c20e5f6914..662e643f02dd 100644
--- a/metadata/md5-cache/dev-python/pyFFTW-9999
+++ b/metadata/md5-cache/dev-python/pyFFTW-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sci-libs/fftw-3.3:3.0= python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=acf234892c0c70409b79780fb4b4ad19
diff --git a/metadata/md5-cache/dev-python/pyGPG-0.2 b/metadata/md5-cache/dev-python/pyGPG-0.2
index 355c5af5749e..20b8b744a074 100644
--- a/metadata/md5-cache/dev-python/pyGPG-0.2
+++ b/metadata/md5-cache/dev-python/pyGPG-0.2
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gnupg python_targets_python3_6? ( dev-lang/python:3.6 ) python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/pyGPG/pyGPG-0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d90bd44e6f188f6741164ae79409b461
diff --git a/metadata/md5-cache/dev-python/pyGPG-9999 b/metadata/md5-cache/dev-python/pyGPG-9999
index 7dc5233bcbcc..eae2a4cb0b7c 100644
--- a/metadata/md5-cache/dev-python/pyGPG-9999
+++ b/metadata/md5-cache/dev-python/pyGPG-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=app-crypt/gnupg python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=59a605d8ceb38d076ac756e7c6481a4a
diff --git a/metadata/md5-cache/dev-python/pyTenable-1.1.3 b/metadata/md5-cache/dev-python/pyTenable-1.1.3
index ce2a8a57ed00..bd7c5af5fc05 100644
--- a/metadata/md5-cache/dev-python/pyTenable-1.1.3
+++ b/metadata/md5-cache/dev-python/pyTenable-1.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyTenable/pyTenable-1.1.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d026a7ed4e19c1b1151d78aa1ca4f284
diff --git a/metadata/md5-cache/dev-python/pyacoustid-1.2.0 b/metadata/md5-cache/dev-python/pyacoustid-1.2.0
index aeffdd40fb5d..c619003d0a68 100644
--- a/metadata/md5-cache/dev-python/pyacoustid-1.2.0
+++ b/metadata/md5-cache/dev-python/pyacoustid-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/audioread[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyacoustid/pyacoustid-1.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=de55af8474d643182b60526be522fe91
diff --git a/metadata/md5-cache/dev-python/pyaes-1.6.1-r2 b/metadata/md5-cache/dev-python/pyaes-1.6.1-r2
index 29faf19034cf..81f9b0c8012f 100644
--- a/metadata/md5-cache/dev-python/pyaes-1.6.1-r2
+++ b/metadata/md5-cache/dev-python/pyaes-1.6.1-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyaes/pyaes-1.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=48b6c02bd3bb6d37e55e4d8a21e670d6
diff --git a/metadata/md5-cache/dev-python/pyalsa-1.1.6-r1 b/metadata/md5-cache/dev-python/pyalsa-1.1.6-r1
index 761c516f171e..eae34f989370 100644
--- a/metadata/md5-cache/dev-python/pyalsa-1.1.6-r1
+++ b/metadata/md5-cache/dev-python/pyalsa-1.1.6-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Python bindings for ALSA library
 EAPI=7
 HOMEPAGE=https://alsa-project.org/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/pyalsa/pyalsa-1.1.6.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6420b5fc3a21cb6e64797d81c839cb9c
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4fd202aaa9b43905c8cbc6fe326ab042
diff --git a/metadata/md5-cache/dev-python/pyamg-3.2.1-r1 b/metadata/md5-cache/dev-python/pyamg-3.2.1-r1
index e6493d71182d..df74ab942d74 100644
--- a/metadata/md5-cache/dev-python/pyamg-3.2.1-r1
+++ b/metadata/md5-cache/dev-python/pyamg-3.2.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyamg/pyamg-3.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2e67f3eac7bbab38b685d7484751dadf
diff --git a/metadata/md5-cache/dev-python/pyasn1-0.4.8-r1 b/metadata/md5-cache/dev-python/pyasn1-0.4.8-r1
index 40b02f346242..51cf4263e217 100644
--- a/metadata/md5-cache/dev-python/pyasn1-0.4.8-r1
+++ b/metadata/md5-cache/dev-python/pyasn1-0.4.8-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyasn1/pyasn1-0.4.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1c9a6e29c485dbd8677fcff60906a57d
diff --git a/metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r1 b/metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r1
index c416cac12f6f..133f53574743 100644
--- a/metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r1
+++ b/metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyasn1-modules/pyasn1-modules-0.2.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=565e2732ddce95df3257fda2ac272cbe
diff --git a/metadata/md5-cache/dev-python/pyaudio-0.2.11-r1 b/metadata/md5-cache/dev-python/pyaudio-0.2.11-r1
index 590ac98881ef..794583d76ea9 100644
--- a/metadata/md5-cache/dev-python/pyaudio-0.2.11-r1
+++ b/metadata/md5-cache/dev-python/pyaudio-0.2.11-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyAudio/PyAudio-0.2.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=effc3eebfaf21e2177d875a4cb6d689f
diff --git a/metadata/md5-cache/dev-python/pybind11-2.5.0 b/metadata/md5-cache/dev-python/pybind11-2.5.0
index cea9d5daf5b7..f9a481a968e8 100644
--- a/metadata/md5-cache/dev-python/pybind11-2.5.0
+++ b/metadata/md5-cache/dev-python/pybind11-2.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pybind/pybind11/archive/v2.5.0.tar.gz -> pybind11-2.5.0.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b9ed890e6f4b6081cf5571f754bd6c7
diff --git a/metadata/md5-cache/dev-python/pybind11-2.6.0 b/metadata/md5-cache/dev-python/pybind11-2.6.0
index 205b84e9b442..e58b42232812 100644
--- a/metadata/md5-cache/dev-python/pybind11-2.6.0
+++ b/metadata/md5-cache/dev-python/pybind11-2.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pybind/pybind11/archive/v2.6.0.tar.gz -> pybind11-2.6.0.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=20b3bcefe2f92740017ebb2838330d5b
diff --git a/metadata/md5-cache/dev-python/pybind11-2.6.1 b/metadata/md5-cache/dev-python/pybind11-2.6.1
index b9369911ceea..bce7ba3c4526 100644
--- a/metadata/md5-cache/dev-python/pybind11-2.6.1
+++ b/metadata/md5-cache/dev-python/pybind11-2.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pybind/pybind11/archive/v2.6.1.tar.gz -> pybind11-2.6.1.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61d51141bca1078fbc6cd5f52da05b22
diff --git a/metadata/md5-cache/dev-python/pybluez-0.23 b/metadata/md5-cache/dev-python/pybluez-0.23
index 9e5bdd93ac41..27ac4fba8034 100644
--- a/metadata/md5-cache/dev-python/pybluez-0.23
+++ b/metadata/md5-cache/dev-python/pybluez-0.23
@@ -11,5 +11,5 @@ RDEPEND=net-wireless/bluez python_targets_python3_6? ( dev-lang/python:3.6 ) pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyBluez/PyBluez-0.23.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=12227ed1ba529a1df5369c277f994702
diff --git a/metadata/md5-cache/dev-python/pybtex-0.22.2 b/metadata/md5-cache/dev-python/pybtex-0.22.2
index 083ebf264466..70912a0134b6 100644
--- a/metadata/md5-cache/dev-python/pybtex-0.22.2
+++ b/metadata/md5-cache/dev-python/pybtex-0.22.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pybtex/pybtex-0.22.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2993ac9323ce611084963ec3ca533725
diff --git a/metadata/md5-cache/dev-python/pycadf-2.9.0-r1 b/metadata/md5-cache/dev-python/pycadf-2.9.0-r1
index de275336198d..7877fe9b4f1f 100644
--- a/metadata/md5-cache/dev-python/pycadf-2.9.0-r1
+++ b/metadata/md5-cache/dev-python/pycadf-2.9.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycadf/pycadf-2.9.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f61f321429013588595ec72fa8b04a6e
diff --git a/metadata/md5-cache/dev-python/pycadf-3.1.1 b/metadata/md5-cache/dev-python/pycadf-3.1.1
index c21590b3174c..5e26a5c03909 100644
--- a/metadata/md5-cache/dev-python/pycadf-3.1.1
+++ b/metadata/md5-cache/dev-python/pycadf-3.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycadf/pycadf-3.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8e73813045619b87df269adf6eef6d33
diff --git a/metadata/md5-cache/dev-python/pycairo-1.20.0 b/metadata/md5-cache/dev-python/pycairo-1.20.0
index 8fbad60bbde2..f183b335959c 100644
--- a/metadata/md5-cache/dev-python/pycairo-1.20.0
+++ b/metadata/md5-cache/dev-python/pycairo-1.20.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pygobject/pycairo/releases/download/v1.20.0/pycairo-1.20.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=48e0925e86a1f38011dcdcec8a897d44
diff --git a/metadata/md5-cache/dev-python/pycapnp-0.6.4 b/metadata/md5-cache/dev-python/pycapnp-0.6.4
index 0a2cf3ee9549..e9d9f8e6c3ef 100644
--- a/metadata/md5-cache/dev-python/pycapnp-0.6.4
+++ b/metadata/md5-cache/dev-python/pycapnp-0.6.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/capnproto-0.6:= python_targets_python3_6? ( dev-lang/python:3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycapnp/pycapnp-0.6.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=355b21a6711077299b471ef11eb50630
diff --git a/metadata/md5-cache/dev-python/pycares-3.1.1 b/metadata/md5-cache/dev-python/pycares-3.1.1
index d4b54f74a394..2b11f48e920b 100644
--- a/metadata/md5-cache/dev-python/pycares-3.1.1
+++ b/metadata/md5-cache/dev-python/pycares-3.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/saghul/pycares/archive/pycares-3.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=60a3fa599c896c327593b069c9a51be2
diff --git a/metadata/md5-cache/dev-python/pycdio-2.1.0 b/metadata/md5-cache/dev-python/pycdio-2.1.0
index 20fcdf9f34fa..5ca5c155a65d 100644
--- a/metadata/md5-cache/dev-python/pycdio-2.1.0
+++ b/metadata/md5-cache/dev-python/pycdio-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libcdio-2.0.0 python_targets_python3_6? ( dev-lang/python:3.6
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycdio/pycdio-2.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7a15a985779032923b8f69f61d1b447e
diff --git a/metadata/md5-cache/dev-python/pychm-0.8.6 b/metadata/md5-cache/dev-python/pychm-0.8.6
index ce0561f917db..99f122a8faa4 100644
--- a/metadata/md5-cache/dev-python/pychm-0.8.6
+++ b/metadata/md5-cache/dev-python/pychm-0.8.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dottedmag/pychm/archive/v0.8.6.tar.gz -> pychm-0.8.6.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=453c5968a450a6f4607c95b52d8d4124
diff --git a/metadata/md5-cache/dev-python/pychromecast-4.1.0 b/metadata/md5-cache/dev-python/pychromecast-4.1.0
index 521e8082c1cd..190d08c5da7f 100644
--- a/metadata/md5-cache/dev-python/pychromecast-4.1.0
+++ b/metadata/md5-cache/dev-python/pychromecast-4.1.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyChromecast/PyChromecast-4.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=81280cdf5d1aae69f32b242deb37b4e6
diff --git a/metadata/md5-cache/dev-python/pychroot-0.10.2 b/metadata/md5-cache/dev-python/pychroot-0.10.2
index dd12bfa5b9a6..e7e6b165e16d 100644
--- a/metadata/md5-cache/dev-python/pychroot-0.10.2
+++ b/metadata/md5-cache/dev-python/pychroot-0.10.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pychroot/pychroot-0.10.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ae2ec97cc12eed5c36b4eeca66158af0
diff --git a/metadata/md5-cache/dev-python/pychroot-9999 b/metadata/md5-cache/dev-python/pychroot-9999
index b7dc4e23adf2..2015be4b9cc8 100644
--- a/metadata/md5-cache/dev-python/pychroot-9999
+++ b/metadata/md5-cache/dev-python/pychroot-9999
@@ -11,5 +11,5 @@ RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ae2ec97cc12eed5c36b4eeca66158af0
diff --git a/metadata/md5-cache/dev-python/pyclipper-1.2.0 b/metadata/md5-cache/dev-python/pyclipper-1.2.0
index e9eb68482491..9c26ff60d3b8 100644
--- a/metadata/md5-cache/dev-python/pyclipper-1.2.0
+++ b/metadata/md5-cache/dev-python/pyclipper-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fonttools/pyclipper/archive/1.2.0.tar.gz -> pyclipper-1.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bc02195728616534e28bdd8b23787b0c
diff --git a/metadata/md5-cache/dev-python/pycodestyle-2.6.0 b/metadata/md5-cache/dev-python/pycodestyle-2.6.0
index 40c052b567fd..74f43fc1d0f5 100644
--- a/metadata/md5-cache/dev-python/pycodestyle-2.6.0
+++ b/metadata/md5-cache/dev-python/pycodestyle-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycodestyle/pycodestyle-2.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cb7d5a2b33f925d7a3e70a00d709c948
diff --git a/metadata/md5-cache/dev-python/pycollada-0.7.1 b/metadata/md5-cache/dev-python/pycollada-0.7.1
index 3fe6d4e6a7c5..6dcbe08904d7 100644
--- a/metadata/md5-cache/dev-python/pycollada-0.7.1
+++ b/metadata/md5-cache/dev-python/pycollada-0.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pycollada/pycollada/archive/v0.7.1.tar.gz -> pycollada-0.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5a4e5f77027c7dbff542a9d2186a4cd5
diff --git a/metadata/md5-cache/dev-python/pycountry-20.7.3 b/metadata/md5-cache/dev-python/pycountry-20.7.3
index 58e7d2e1be2b..d43b89b9a3ac 100644
--- a/metadata/md5-cache/dev-python/pycountry-20.7.3
+++ b/metadata/md5-cache/dev-python/pycountry-20.7.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycountry/pycountry-20.7.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=45ceb326a371e97dbbda173ed502d2b8
diff --git a/metadata/md5-cache/dev-python/pycparser-2.20-r1 b/metadata/md5-cache/dev-python/pycparser-2.20-r1
index 8df1abfd2e2b..e2495b277142 100644
--- a/metadata/md5-cache/dev-python/pycparser-2.20-r1
+++ b/metadata/md5-cache/dev-python/pycparser-2.20-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ply:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycparser/pycparser-2.20.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9f9fccb91944e9cf1f3e46138d0ead42
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.9.8-r1 b/metadata/md5-cache/dev-python/pycryptodome-3.9.8-r1
index 89228349f205..09d9ddb7b4a8 100644
--- a/metadata/md5-cache/dev-python/pycryptodome-3.9.8-r1
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.9.8-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycryptodome/pycryptodome-3.9.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=82e66d5fe92c7e5190e2d065928f6216
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.9.9 b/metadata/md5-cache/dev-python/pycryptodome-3.9.9
index b790a68c7f16..1bef727bea7a 100644
--- a/metadata/md5-cache/dev-python/pycryptodome-3.9.9
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.9.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Legrandin/pycryptodome/archive/v3.9.9.tar.gz -> pycryptodome-3.9.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8bbe649e1684e178b361a4e9ef90b860
diff --git a/metadata/md5-cache/dev-python/pycryptodomex-3.9.8 b/metadata/md5-cache/dev-python/pycryptodomex-3.9.8
index 7c17c76d39db..7c5c9b4a1e1c 100644
--- a/metadata/md5-cache/dev-python/pycryptodomex-3.9.8
+++ b/metadata/md5-cache/dev-python/pycryptodomex-3.9.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycryptodomex/pycryptodomex-3.9.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ba781326c1655347899ca1b47d8e080a
diff --git a/metadata/md5-cache/dev-python/pycryptodomex-3.9.9 b/metadata/md5-cache/dev-python/pycryptodomex-3.9.9
index e87a1d6ed440..094c72880467 100644
--- a/metadata/md5-cache/dev-python/pycryptodomex-3.9.9
+++ b/metadata/md5-cache/dev-python/pycryptodomex-3.9.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Legrandin/pycryptodome/archive/v3.9.9.tar.gz -> pycryptodome-3.9.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5941df6ce7bfbfa5450db945cdbac877
diff --git a/metadata/md5-cache/dev-python/pycson-0.8 b/metadata/md5-cache/dev-python/pycson-0.8
index 059c27a19521..4707e99db67e 100644
--- a/metadata/md5-cache/dev-python/pycson-0.8
+++ b/metadata/md5-cache/dev-python/pycson-0.8
@@ -11,5 +11,5 @@ RDEPEND=dev-python/speg python_targets_python3_6? ( dev-lang/python:3.6 ) python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/avakar/pycson/archive/0.8.tar.gz -> pycson-0.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=798ce95637e2965c68f1bab656dbb8d4
diff --git a/metadata/md5-cache/dev-python/pycuda-2019.1.2 b/metadata/md5-cache/dev-python/pycuda-2019.1.2
index fe45435514fe..6f4e1fdbabbd 100644
--- a/metadata/md5-cache/dev-python/pycuda-2019.1.2
+++ b/metadata/md5-cache/dev-python/pycuda-2019.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=userpriv !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycuda/pycuda-2019.1.2.tar.gz
-_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=305c2fe035a02293aa59393446c96c00
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.73-r2 b/metadata/md5-cache/dev-python/pycups-1.9.73-r2
index 12ae3fb64c6c..74cab24f953b 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.73-r2
+++ b/metadata/md5-cache/dev-python/pycups-1.9.73-r2
@@ -11,5 +11,5 @@ RDEPEND=net-print/cups python_targets_python3_6? ( dev-lang/python:3.6 ) python_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycups/pycups-1.9.73.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bde64d3bc81f5d094b5da68c283fea10
diff --git a/metadata/md5-cache/dev-python/pycurl-7.43.0.6 b/metadata/md5-cache/dev-python/pycurl-7.43.0.6
index 1aa338000bcd..624204741067 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.43.0.6
+++ b/metadata/md5-cache/dev-python/pycurl-7.43.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycurl/pycurl-7.43.0.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=748cb05ac94006432a4af24c6dff56a3
diff --git a/metadata/md5-cache/dev-python/pycxx-7.1.2-r2 b/metadata/md5-cache/dev-python/pycxx-7.1.2-r2
index 5a8e1d21afd5..f074e5c5165f 100644
--- a/metadata/md5-cache/dev-python/pycxx-7.1.2-r2
+++ b/metadata/md5-cache/dev-python/pycxx-7.1.2-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cxx/pycxx-7.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0b9f0a8d2f6b0604304696794f9204a7
diff --git a/metadata/md5-cache/dev-python/pydantic-1.6.1 b/metadata/md5-cache/dev-python/pydantic-1.6.1
index 19f314cd6843..c5950e7c5652 100644
--- a/metadata/md5-cache/dev-python/pydantic-1.6.1
+++ b/metadata/md5-cache/dev-python/pydantic-1.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/samuelcolvin/pydantic/archive/v1.6.1.tar.gz -> pydantic-1.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=653ff0de7691fccfe914438e249f8489
diff --git a/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.4.0 b/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.4.0
index 0d8b85ba3453..bac7f823d361 100644
--- a/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.4.0
+++ b/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pandas-dev/pydata-sphinx-theme/archive/v0.4.0.tar.gz -> pydata-sphinx-theme-0.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=afa9ec0866b3966d0041710d95a6e0b0
diff --git a/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.4.1 b/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.4.1
index 0a231d632ffc..59ed8e3e790a 100644
--- a/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.4.1
+++ b/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pandas-dev/pydata-sphinx-theme/archive/v0.4.1.tar.gz -> pydata-sphinx-theme-0.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0eae308c4facb2d874fba173724452d4
diff --git a/metadata/md5-cache/dev-python/pydecomp-0.3 b/metadata/md5-cache/dev-python/pydecomp-0.3
index ad7bf040e08b..c1ece838ad31 100644
--- a/metadata/md5-cache/dev-python/pydecomp-0.3
+++ b/metadata/md5-cache/dev-python/pydecomp-0.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/pydecomp/pyDeComp-0.3.tar.gz -> pydecomp-0.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=733a6e35238519d17fb654d29c150992
diff --git a/metadata/md5-cache/dev-python/pydecomp-9999 b/metadata/md5-cache/dev-python/pydecomp-9999
index 9e3f6210ef62..2e2f0deaad2e 100644
--- a/metadata/md5-cache/dev-python/pydecomp-9999
+++ b/metadata/md5-cache/dev-python/pydecomp-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4d0c1da26c3e9c849c197a6de1f154a1
diff --git a/metadata/md5-cache/dev-python/pydiff-0.2-r1 b/metadata/md5-cache/dev-python/pydiff-0.2-r1
index 853df29a1656..6c18f644296e 100644
--- a/metadata/md5-cache/dev-python/pydiff-0.2-r1
+++ b/metadata/md5-cache/dev-python/pydiff-0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pydiff/pydiff-0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c9fc81ea0b54634ee38e4c0ed7ff9bc3
diff --git a/metadata/md5-cache/dev-python/pydispatcher-2.1.2 b/metadata/md5-cache/dev-python/pydispatcher-2.1.2
index 44fb284db80f..fd7b41babc1f 100644
--- a/metadata/md5-cache/dev-python/pydispatcher-2.1.2
+++ b/metadata/md5-cache/dev-python/pydispatcher-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyPyDispatcher/PyPyDispatcher-2.1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6b420f3472261c7342f90b28150bcced
diff --git a/metadata/md5-cache/dev-python/pydns-3.2.1 b/metadata/md5-cache/dev-python/pydns-3.2.1
index 2609e84c9777..35978620edc4 100644
--- a/metadata/md5-cache/dev-python/pydns-3.2.1
+++ b/metadata/md5-cache/dev-python/pydns-3.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=3
 SRC_URI=https://launchpad.net/py3dns/trunk/3.2.1/+download/py3dns-3.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ef9c3df55e50e6dc01dd75a4732fb0b3
diff --git a/metadata/md5-cache/dev-python/pydocstyle-5.1.1 b/metadata/md5-cache/dev-python/pydocstyle-5.1.1
index c7798f2a0b1f..cf27c24765db 100644
--- a/metadata/md5-cache/dev-python/pydocstyle-5.1.1
+++ b/metadata/md5-cache/dev-python/pydocstyle-5.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyCQA/pydocstyle/archive/5.1.1.tar.gz -> pydocstyle-5.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fe5c4824da73d01c73e51954efa11192
diff --git a/metadata/md5-cache/dev-python/pydot-1.4.1 b/metadata/md5-cache/dev-python/pydot-1.4.1
index b5f1be6cb9de..0a238eaa48eb 100644
--- a/metadata/md5-cache/dev-python/pydot-1.4.1
+++ b/metadata/md5-cache/dev-python/pydot-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/erocarrera/pydot/archive/v1.4.1.tar.gz -> pydot-1.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=94877d1fb6ab1c3e3aa74765f126e904
diff --git a/metadata/md5-cache/dev-python/pydotplus-2.0.2 b/metadata/md5-cache/dev-python/pydotplus-2.0.2
index f49ba808a46d..6112b8688f39 100644
--- a/metadata/md5-cache/dev-python/pydotplus-2.0.2
+++ b/metadata/md5-cache/dev-python/pydotplus-2.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pydotplus/pydotplus-2.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5edbed3355c014e781d981b4225d3535
diff --git a/metadata/md5-cache/dev-python/pyelftools-0.26 b/metadata/md5-cache/dev-python/pyelftools-0.26
index cb6d0de29884..136c3d8f0467 100644
--- a/metadata/md5-cache/dev-python/pyelftools-0.26
+++ b/metadata/md5-cache/dev-python/pyelftools-0.26
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/eliben/pyelftools/archive/v0.26.tar.gz -> pyelftools-0.26.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bb6b57254e57cabe63e14499ed70e26b
diff --git a/metadata/md5-cache/dev-python/pyenchant-3.1.0 b/metadata/md5-cache/dev-python/pyenchant-3.1.0
index 8ec6d6e8f886..450d8371b635 100644
--- a/metadata/md5-cache/dev-python/pyenchant-3.1.0
+++ b/metadata/md5-cache/dev-python/pyenchant-3.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyenchant/pyenchant/archive/v3.1.0.tar.gz -> pyenchant-3.1.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8f181e5b1f9e5516c7c17f79519dbb80
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.1.0 b/metadata/md5-cache/dev-python/pyfakefs-4.1.0
index 219d3cd53447..41d56f05a87c 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-4.1.0
+++ b/metadata/md5-cache/dev-python/pyfakefs-4.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v4.1.0.tar.gz -> pyfakefs-4.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e3221fc7305251663ff029bc82746dd4
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.2.0 b/metadata/md5-cache/dev-python/pyfakefs-4.2.0
index 3f5a169d2523..bb029e50aa6f 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-4.2.0
+++ b/metadata/md5-cache/dev-python/pyfakefs-4.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v4.2.0.tar.gz -> pyfakefs-4.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d38052ba111a2ed277aa999a81850359
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.2.1 b/metadata/md5-cache/dev-python/pyfakefs-4.2.1
index 823b02934d4b..286d1d16030a 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-4.2.1
+++ b/metadata/md5-cache/dev-python/pyfakefs-4.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v4.2.1.tar.gz -> pyfakefs-4.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d38052ba111a2ed277aa999a81850359
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.3.0 b/metadata/md5-cache/dev-python/pyfakefs-4.3.0
index ad7b1c4a4c80..789c34a67a37 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-4.3.0
+++ b/metadata/md5-cache/dev-python/pyfakefs-4.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v4.3.0.tar.gz -> pyfakefs-4.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d38052ba111a2ed277aa999a81850359
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.3.1 b/metadata/md5-cache/dev-python/pyfakefs-4.3.1
index a48d55c6e580..8438d072b206 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-4.3.1
+++ b/metadata/md5-cache/dev-python/pyfakefs-4.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v4.3.1.tar.gz -> pyfakefs-4.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d38052ba111a2ed277aa999a81850359
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.3.2 b/metadata/md5-cache/dev-python/pyfakefs-4.3.2
index 80e1353375ce..4216cc2baef4 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-4.3.2
+++ b/metadata/md5-cache/dev-python/pyfakefs-4.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v4.3.2.tar.gz -> pyfakefs-4.3.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2b07be9d0c14443b370af32437363c0a
diff --git a/metadata/md5-cache/dev-python/pyfeyn-1.0.0-r2 b/metadata/md5-cache/dev-python/pyfeyn-1.0.0-r2
index e7c5ac7f24f6..9e438b4eefa8 100644
--- a/metadata/md5-cache/dev-python/pyfeyn-1.0.0-r2
+++ b/metadata/md5-cache/dev-python/pyfeyn-1.0.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyx-0.15[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyfeyn/pyfeyn-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c71b8a12de99188885101f66e4622bf0
diff --git a/metadata/md5-cache/dev-python/pyflakes-2.2.0 b/metadata/md5-cache/dev-python/pyflakes-2.2.0
index f58d5ac79181..3cf5a3e9abd3 100644
--- a/metadata/md5-cache/dev-python/pyflakes-2.2.0
+++ b/metadata/md5-cache/dev-python/pyflakes-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyflakes/pyflakes-2.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e66371d4caaace17e2b7cf4790d8fdbe
diff --git a/metadata/md5-cache/dev-python/pyfltk-1.3.3 b/metadata/md5-cache/dev-python/pyfltk-1.3.3
index 5e03d226e0df..f59d93c171e8 100644
--- a/metadata/md5-cache/dev-python/pyfltk-1.3.3
+++ b/metadata/md5-cache/dev-python/pyfltk-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/fltk-1.3.0:1[opengl] !dev-python/pyfltk:1 python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyfltk/pyFltk-1.3.3_py3.tar.gz -> pyFltk-1.3.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e1e9a20bae48e19403f1dc4e05608c3b
diff --git a/metadata/md5-cache/dev-python/pyformance-0.4-r1 b/metadata/md5-cache/dev-python/pyformance-0.4-r1
index 47d8b024464a..a4c82f29bdc3 100644
--- a/metadata/md5-cache/dev-python/pyformance-0.4-r1
+++ b/metadata/md5-cache/dev-python/pyformance-0.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyformance/pyformance-0.4.tar.gz https://dev.gentoo.org/~chutzpah/dist/python/pyformance-0.4-patches.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f72110925bd8f448696da9da3b8b3d48
diff --git a/metadata/md5-cache/dev-python/pyftpdlib-1.5.6-r1 b/metadata/md5-cache/dev-python/pyftpdlib-1.5.6-r1
index 615771436106..86d8c2c6d7b8 100644
--- a/metadata/md5-cache/dev-python/pyftpdlib-1.5.6-r1
+++ b/metadata/md5-cache/dev-python/pyftpdlib-1.5.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyftpdlib/pyftpdlib-1.5.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=40eb25b17e63031c5dbda4a083d24b3c
diff --git a/metadata/md5-cache/dev-python/pygal-2.4.0-r1 b/metadata/md5-cache/dev-python/pygal-2.4.0-r1
index e37dd7ab10bd..b823fe00babc 100644
--- a/metadata/md5-cache/dev-python/pygal-2.4.0-r1
+++ b/metadata/md5-cache/dev-python/pygal-2.4.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kozea/pygal/archive/2.4.0.tar.gz -> pygal-2.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=07890c835f83e4398c8f4a63e80388cc
diff --git a/metadata/md5-cache/dev-python/pygame-1.9.6-r1 b/metadata/md5-cache/dev-python/pygame-1.9.6-r1
index e73308ea346a..fc636755666c 100644
--- a/metadata/md5-cache/dev-python/pygame-1.9.6-r1
+++ b/metadata/md5-cache/dev-python/pygame-1.9.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygame/pygame-1.9.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9af9885336ba60b2e28d0d53bb17d3ca
diff --git a/metadata/md5-cache/dev-python/pygame-2.0.0 b/metadata/md5-cache/dev-python/pygame-2.0.0
index d28243b5bf0c..bc7a065db365 100644
--- a/metadata/md5-cache/dev-python/pygame-2.0.0
+++ b/metadata/md5-cache/dev-python/pygame-2.0.0
@@ -5,12 +5,12 @@ DESCRIPTION=Python bindings for SDL multimedia library
 EAPI=7
 HOMEPAGE=https://www.pygame.org/
 IUSE=doc examples midi opengl test X python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-libs/freetype >=media-libs/sdl2-image-1.2.2 >=media-libs/sdl2-mixer-1.2.4 >=media-libs/sdl2-ttf-2.0.6 >=media-libs/smpeg2-0.4.4-r1 midi? ( media-libs/portmidi ) X? ( >=media-libs/libsdl2-1.2.5[opengl?,threads,video,X] ) !X? ( >=media-libs/libsdl2-1.2.5[threads] ) media-libs/fontconfig python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pygame/pygame/releases/download/2.0.0/pygame-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=05dde2120d8ef7566beff9f4a6d0c1c0
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=201947789b00162d20f4aa18fc32ff44
diff --git a/metadata/md5-cache/dev-python/pygame-2.0.0_pre10 b/metadata/md5-cache/dev-python/pygame-2.0.0_pre10
index d1b3ec8216e9..0daee43880c1 100644
--- a/metadata/md5-cache/dev-python/pygame-2.0.0_pre10
+++ b/metadata/md5-cache/dev-python/pygame-2.0.0_pre10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pygame/pygame/releases/download/2.0.0.dev10/pygame-2.0.0.dev10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=064042614b09200999e7a0e2d64442a3
diff --git a/metadata/md5-cache/dev-python/pygame-9999 b/metadata/md5-cache/dev-python/pygame-9999
index 968f957472a2..f12643d827da 100644
--- a/metadata/md5-cache/dev-python/pygame-9999
+++ b/metadata/md5-cache/dev-python/pygame-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=54a8784338e894eb9afad65723b149e1
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r4 b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r4
index e6047e35b267..5cd118bcf6ce 100644
--- a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r4
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r4
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-python/numpy[python_targets_python3_6(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://www.renpy.org/dl/6.99.12.4/pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e8bc199b9608feb0e5aab1d83e8d04c8
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r5 b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r5
index 4388891201d0..3b66210d4695 100644
--- a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r5
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r5
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-python/numpy[python_targets_python3_6(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.renpy.org/dl/6.99.12.4/pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a157d5c3dfcc889f962ae0869fca06a9
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r1 b/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r1
index b7ee6f8344d1..87f4b15b8456 100644
--- a/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r1
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-python/numpy[python_targets_python3_6(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.renpy.org/dl/7.3.5/pygame_sdl2-2.1.0-for-renpy-7.3.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=baf8089e93b2a9df1a7aa5bbce4756e2
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2 b/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2
index 4e9f1e589d5a..bd34d9dee26b 100644
--- a/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.renpy.org/dl/7.3.5/pygame_sdl2-2.1.0-for-renpy-7.3.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c3e450d5278f7b6cda420a3d21b57fbd
diff --git a/metadata/md5-cache/dev-python/pyghmi-1.5.5 b/metadata/md5-cache/dev-python/pyghmi-1.5.5
index 942c077f6db3..802acd716cfb 100644
--- a/metadata/md5-cache/dev-python/pyghmi-1.5.5
+++ b/metadata/md5-cache/dev-python/pyghmi-1.5.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyghmi/pyghmi-1.5.5.tar.gz -> pyghmi-1.5.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7306d77a4dd8b2cb609bc6dbeee5b567
diff --git a/metadata/md5-cache/dev-python/pygit2-1.3.0 b/metadata/md5-cache/dev-python/pygit2-1.3.0
index c912b67633e9..b70424b806ab 100644
--- a/metadata/md5-cache/dev-python/pygit2-1.3.0
+++ b/metadata/md5-cache/dev-python/pygit2-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygit2/pygit2-1.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f661f6359bc6ce96d219d91b074ec0bb
diff --git a/metadata/md5-cache/dev-python/pygit2-1.4.0 b/metadata/md5-cache/dev-python/pygit2-1.4.0
index 077c0c10bd11..fd082a5abe38 100644
--- a/metadata/md5-cache/dev-python/pygit2-1.4.0
+++ b/metadata/md5-cache/dev-python/pygit2-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygit2/pygit2-1.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ce145d7f000da411477b967d4567ff60
diff --git a/metadata/md5-cache/dev-python/pyglet-1.5.10 b/metadata/md5-cache/dev-python/pyglet-1.5.10
index 4469067d72b4..62ec7a47ba52 100644
--- a/metadata/md5-cache/dev-python/pyglet-1.5.10
+++ b/metadata/md5-cache/dev-python/pyglet-1.5.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyglet/pyglet/archive/v1.5.10.tar.gz -> pyglet-1.5.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d487805a80479b0c288f78904cb65e72
diff --git a/metadata/md5-cache/dev-python/pyglet-1.5.11 b/metadata/md5-cache/dev-python/pyglet-1.5.11
index efc50bc2c21d..b71d9d6f61ee 100644
--- a/metadata/md5-cache/dev-python/pyglet-1.5.11
+++ b/metadata/md5-cache/dev-python/pyglet-1.5.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyglet/pyglet/archive/v1.5.11.tar.gz -> pyglet-1.5.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d487805a80479b0c288f78904cb65e72
diff --git a/metadata/md5-cache/dev-python/pyglet-1.5.7-r1 b/metadata/md5-cache/dev-python/pyglet-1.5.7-r1
index 39584069f1b0..7dff8de3f988 100644
--- a/metadata/md5-cache/dev-python/pyglet-1.5.7-r1
+++ b/metadata/md5-cache/dev-python/pyglet-1.5.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyglet/pyglet/archive/v1.5.7.tar.gz -> pyglet-1.5.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1c2d543566c10a1ac75af26a305bd345
diff --git a/metadata/md5-cache/dev-python/pygments-2.7.2 b/metadata/md5-cache/dev-python/pygments-2.7.2
index 6e6f1cd15f14..9c7f6c4a8151 100644
--- a/metadata/md5-cache/dev-python/pygments-2.7.2
+++ b/metadata/md5-cache/dev-python/pygments-2.7.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pygments/Pygments-2.7.2.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0a9d92fcb1e455783b7c87bb58c629c1
diff --git a/metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5 b/metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5
index 4539073061e1..31655db9bbfd 100644
--- a/metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5
+++ b/metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_6(-)
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/liluo/pygments-github-lexers/archive/v0.0.5.tar.gz -> pygments-github-lexers-0.0.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bdae17db12cb31320687bcc803c25487
diff --git a/metadata/md5-cache/dev-python/pygpgme-0.3-r2 b/metadata/md5-cache/dev-python/pygpgme-0.3-r2
index 6b40ca1fbd43..8dc3cdec4595 100644
--- a/metadata/md5-cache/dev-python/pygpgme-0.3-r2
+++ b/metadata/md5-cache/dev-python/pygpgme-0.3-r2
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/gpgme python_targets_python3_6? ( dev-lang/python:3.6 ) python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://launchpad.net/pygpgme/trunk/0.3/+download/pygpgme-0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e40a1e4a733a3b6d9c630bdb002a8d87
diff --git a/metadata/md5-cache/dev-python/pygraphviz-1.6 b/metadata/md5-cache/dev-python/pygraphviz-1.6
index 18ea95571029..3e0d469e3eba 100644
--- a/metadata/md5-cache/dev-python/pygraphviz-1.6
+++ b/metadata/md5-cache/dev-python/pygraphviz-1.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygraphviz/pygraphviz-1.6.zip
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0a6ac923bf49a0ce16368c12c037ee06
diff --git a/metadata/md5-cache/dev-python/pygresql-5.2 b/metadata/md5-cache/dev-python/pygresql-5.2
index 60fe219c805e..ca6d29236f43 100644
--- a/metadata/md5-cache/dev-python/pygresql-5.2
+++ b/metadata/md5-cache/dev-python/pygresql-5.2
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyGreSQL/PyGreSQL-5.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	9613fb90112e2a521b6a8315187c2966	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	9613fb90112e2a521b6a8315187c2966	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d171d4ca1695d198436a2d10fa2f144d
diff --git a/metadata/md5-cache/dev-python/pygresql-5.2.1 b/metadata/md5-cache/dev-python/pygresql-5.2.1
index d7c800b52aaa..815a7075ed62 100644
--- a/metadata/md5-cache/dev-python/pygresql-5.2.1
+++ b/metadata/md5-cache/dev-python/pygresql-5.2.1
@@ -11,5 +11,5 @@ RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyGreSQL/PyGreSQL-5.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	9613fb90112e2a521b6a8315187c2966	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	9613fb90112e2a521b6a8315187c2966	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b1db1fc5f32cff5dfc2873dbe04f1683
diff --git a/metadata/md5-cache/dev-python/pyh2o-1 b/metadata/md5-cache/dev-python/pyh2o-1
index f7ad8722db25..b1b71b8a9b4b 100644
--- a/metadata/md5-cache/dev-python/pyh2o-1
+++ b/metadata/md5-cache/dev-python/pyh2o-1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/pyh2o/archive/v1.tar.gz -> pyh2o-1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5083efdfcf55e965bfe655000e551921
diff --git a/metadata/md5-cache/dev-python/pyhamcrest-2.0.2 b/metadata/md5-cache/dev-python/pyhamcrest-2.0.2
index 730ea586d2c1..8f66bd818325 100644
--- a/metadata/md5-cache/dev-python/pyhamcrest-2.0.2
+++ b/metadata/md5-cache/dev-python/pyhamcrest-2.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hamcrest/PyHamcrest/archive/V2.0.2.tar.gz -> PyHamcrest-2.0.2.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=32484674c3efe91874c0aa38b3f6139e
diff --git a/metadata/md5-cache/dev-python/pyinotify-0.9.6 b/metadata/md5-cache/dev-python/pyinotify-0.9.6
index cc79eedcb421..b87cf5c39b15 100644
--- a/metadata/md5-cache/dev-python/pyinotify-0.9.6
+++ b/metadata/md5-cache/dev-python/pyinotify-0.9.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=http://seb.dbzteam.org/pub/pyinotify/releases/pyinotify-0.9.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d76cd046ba82406548bf114606171153
diff --git a/metadata/md5-cache/dev-python/pyjwt-1.7.1-r1 b/metadata/md5-cache/dev-python/pyjwt-1.7.1-r1
index 38e86c588821..83e4faaa261b 100644
--- a/metadata/md5-cache/dev-python/pyjwt-1.7.1-r1
+++ b/metadata/md5-cache/dev-python/pyjwt-1.7.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyJWT/PyJWT-1.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=aa90da7c915df2d59397647267c245f2
diff --git a/metadata/md5-cache/dev-python/pykerberos-1.3.0 b/metadata/md5-cache/dev-python/pykerberos-1.3.0
index 3de3b576f331..8374b3df443f 100644
--- a/metadata/md5-cache/dev-python/pykerberos-1.3.0
+++ b/metadata/md5-cache/dev-python/pykerberos-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/apple/ccs-pykerberos/archive/PyKerberos-1.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d3740e3d0de0d88a15608795aec062fd
diff --git a/metadata/md5-cache/dev-python/pykerberos-1.3.0-r1 b/metadata/md5-cache/dev-python/pykerberos-1.3.0-r1
index 6ba84a6ed679..00902ff33ad8 100644
--- a/metadata/md5-cache/dev-python/pykerberos-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/pykerberos-1.3.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/apple/ccs-pykerberos/archive/PyKerberos-1.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0d5e4a685310498d0ef2d27d1fdb5d1a
diff --git a/metadata/md5-cache/dev-python/pykka-2.0.2 b/metadata/md5-cache/dev-python/pykka-2.0.2
index 3555ba9496b9..d7f27ffef897 100644
--- a/metadata/md5-cache/dev-python/pykka-2.0.2
+++ b/metadata/md5-cache/dev-python/pykka-2.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pykka/Pykka-2.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bc367478a765dc445dd907c0274fa64b
diff --git a/metadata/md5-cache/dev-python/pykka-2.0.3 b/metadata/md5-cache/dev-python/pykka-2.0.3
index 529bb4768f4e..faba0578dba8 100644
--- a/metadata/md5-cache/dev-python/pykka-2.0.3
+++ b/metadata/md5-cache/dev-python/pykka-2.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pykka/Pykka-2.0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bd8d8138d593541ffbc6458bdf50c3c5
diff --git a/metadata/md5-cache/dev-python/pykwalify-1.7.0 b/metadata/md5-cache/dev-python/pykwalify-1.7.0
index e627f510c5ee..cac4bac7e93e 100644
--- a/metadata/md5-cache/dev-python/pykwalify-1.7.0
+++ b/metadata/md5-cache/dev-python/pykwalify-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pykwalify/pykwalify-1.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e51b27fa5e95c553267efddeea5ce347
diff --git a/metadata/md5-cache/dev-python/pylama-7.7.1-r1 b/metadata/md5-cache/dev-python/pylama-7.7.1-r1
index cbedd6e8c448..7413d4c16095 100644
--- a/metadata/md5-cache/dev-python/pylama-7.7.1-r1
+++ b/metadata/md5-cache/dev-python/pylama-7.7.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/klen/pylama/archive/7.7.1.tar.gz -> pylama-7.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d481b64a631712cbba1717d79730f0df
diff --git a/metadata/md5-cache/dev-python/pylast-4.0.0 b/metadata/md5-cache/dev-python/pylast-4.0.0
index 3b94af030f65..eba27da583c2 100644
--- a/metadata/md5-cache/dev-python/pylast-4.0.0
+++ b/metadata/md5-cache/dev-python/pylast-4.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pylast/pylast/archive/4.0.0.tar.gz -> pylast-4.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b0737dd796e5573e8364262b2b8c0d21
diff --git a/metadata/md5-cache/dev-python/pylatex-1.4.0 b/metadata/md5-cache/dev-python/pylatex-1.4.0
index d2056e3eebe2..9f1a4b0f5298 100644
--- a/metadata/md5-cache/dev-python/pylatex-1.4.0
+++ b/metadata/md5-cache/dev-python/pylatex-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JelteF/PyLaTeX/archive/v1.4.0.tar.gz -> pylatex-1.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f012e4a7b2d37b3756d8dc491936afc7
diff --git a/metadata/md5-cache/dev-python/pylatex-1.4.1 b/metadata/md5-cache/dev-python/pylatex-1.4.1
index 641b1ae43d9c..22cd1bfc0bba 100644
--- a/metadata/md5-cache/dev-python/pylatex-1.4.1
+++ b/metadata/md5-cache/dev-python/pylatex-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JelteF/PyLaTeX/archive/v1.4.1.tar.gz -> pylatex-1.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e4d4aee271cc2e59388a865406debe67
diff --git a/metadata/md5-cache/dev-python/pylibacl-0.5.3 b/metadata/md5-cache/dev-python/pylibacl-0.5.3
index e053f470879b..a3438a68ad5a 100644
--- a/metadata/md5-cache/dev-python/pylibacl-0.5.3
+++ b/metadata/md5-cache/dev-python/pylibacl-0.5.3
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/acl python_targets_python3_6? ( dev-lang/python:3.6 ) python_ta
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/iustin/pylibacl/archive/pylibacl-v0.5.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ff24b171f5bdbc0a99c901dfa0aae823
diff --git a/metadata/md5-cache/dev-python/pylibacl-0.5.4_p20191217 b/metadata/md5-cache/dev-python/pylibacl-0.5.4_p20191217
index ebfcf31fd7e5..634a9994b872 100644
--- a/metadata/md5-cache/dev-python/pylibacl-0.5.4_p20191217
+++ b/metadata/md5-cache/dev-python/pylibacl-0.5.4_p20191217
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/iustin/pylibacl/archive/2ae494bd2e3303141a703f32e44263e083c1ffb0.tar.gz -> pylibacl-0.5.4_p20191217.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cd770223367d88f0151e5a5225805d93
diff --git a/metadata/md5-cache/dev-python/pylibacl-0.6.0 b/metadata/md5-cache/dev-python/pylibacl-0.6.0
index 6df42082aca7..73ff5dc47426 100644
--- a/metadata/md5-cache/dev-python/pylibacl-0.6.0
+++ b/metadata/md5-cache/dev-python/pylibacl-0.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/iustin/pylibacl/archive/v0.6.0.tar.gz -> pylibacl-0.6.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=152ad89d765ca818e114139941adcc96
diff --git a/metadata/md5-cache/dev-python/pylibmc-1.6.1-r1 b/metadata/md5-cache/dev-python/pylibmc-1.6.1-r1
index 44a841e71417..53aef838b9eb 100644
--- a/metadata/md5-cache/dev-python/pylibmc-1.6.1-r1
+++ b/metadata/md5-cache/dev-python/pylibmc-1.6.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lericson/pylibmc/archive/1.6.1.tar.gz -> pylibmc-1.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e2e1c90ea8c7e24a3fdbc9efa167b4a5
diff --git a/metadata/md5-cache/dev-python/pylint-2.6.0 b/metadata/md5-cache/dev-python/pylint-2.6.0
index e9faa7b51928..b41ef22aa2ff 100644
--- a/metadata/md5-cache/dev-python/pylint-2.6.0
+++ b/metadata/md5-cache/dev-python/pylint-2.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pylint/pylint-2.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=38b526e2c34f90eb4a58fff74e89ac84
diff --git a/metadata/md5-cache/dev-python/pylru-1.2.0 b/metadata/md5-cache/dev-python/pylru-1.2.0
index 1792e0c18698..ce48fc92837f 100644
--- a/metadata/md5-cache/dev-python/pylru-1.2.0
+++ b/metadata/md5-cache/dev-python/pylru-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pylru/pylru-1.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=eebdba759b2e145c299a49fc66cfea9c
diff --git a/metadata/md5-cache/dev-python/pyls-black-0.4.6 b/metadata/md5-cache/dev-python/pyls-black-0.4.6
index f1df7dac8d33..b07b1b8750c3 100644
--- a/metadata/md5-cache/dev-python/pyls-black-0.4.6
+++ b/metadata/md5-cache/dev-python/pyls-black-0.4.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rupert/pyls-black/archive/v0.4.6.tar.gz -> pyls-black-0.4.6-gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1160146986f7691d874b00802bfc66d9
diff --git a/metadata/md5-cache/dev-python/pyls-spyder-0.1.1 b/metadata/md5-cache/dev-python/pyls-spyder-0.1.1
index c24135bcd33f..d908ee8a40ef 100644
--- a/metadata/md5-cache/dev-python/pyls-spyder-0.1.1
+++ b/metadata/md5-cache/dev-python/pyls-spyder-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/pyls-spyder/archive/v0.1.1.tar.gz -> pyls-spyder-0.1.1-gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b61f158205d9157fca0b19bcd1fc04b8
diff --git a/metadata/md5-cache/dev-python/pymad-0.10 b/metadata/md5-cache/dev-python/pymad-0.10
index e2d751a33a65..caf325cb14f7 100644
--- a/metadata/md5-cache/dev-python/pymad-0.10
+++ b/metadata/md5-cache/dev-python/pymad-0.10
@@ -11,5 +11,5 @@ RDEPEND=media-libs/libmad python_targets_python3_6? ( dev-lang/python:3.6 ) pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/jaqx0r/pymad/archive/version/0.10.tar.gz -> pymad-0.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=17e9a5f427d7b27bbfba568cb0f779cf
diff --git a/metadata/md5-cache/dev-python/pymdstat-0.4.2-r1 b/metadata/md5-cache/dev-python/pymdstat-0.4.2-r1
index b0ceb17f3a3c..07a275035bee 100644
--- a/metadata/md5-cache/dev-python/pymdstat-0.4.2-r1
+++ b/metadata/md5-cache/dev-python/pymdstat-0.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/nicolargo/pymdstat/archive/v0.4.2.tar.gz -> pymdstat-0.4.2-r1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=609a5827a78b405e1ce3534e7c3bc5d7
diff --git a/metadata/md5-cache/dev-python/pymediainfo-4.3 b/metadata/md5-cache/dev-python/pymediainfo-4.3
index e8bfb47e141c..b4c9f3dc5fa0 100644
--- a/metadata/md5-cache/dev-python/pymediainfo-4.3
+++ b/metadata/md5-cache/dev-python/pymediainfo-4.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymediainfo/pymediainfo-4.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f725db484c85a2686aa78b5b4161ff0f
diff --git a/metadata/md5-cache/dev-python/pymediainfo-5.0.3 b/metadata/md5-cache/dev-python/pymediainfo-5.0.3
index cc70e2bb4968..2770441fd40e 100644
--- a/metadata/md5-cache/dev-python/pymediainfo-5.0.3
+++ b/metadata/md5-cache/dev-python/pymediainfo-5.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymediainfo/pymediainfo-5.0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f725db484c85a2686aa78b5b4161ff0f
diff --git a/metadata/md5-cache/dev-python/pymetar-1.1-r1 b/metadata/md5-cache/dev-python/pymetar-1.1-r1
index 89e127a182b6..e115d491ced6 100644
--- a/metadata/md5-cache/dev-python/pymetar-1.1-r1
+++ b/metadata/md5-cache/dev-python/pymetar-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.schwarzvogel.de/pkgs/pymetar-1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=65a31eb179853fd1f1a4b486a2183c3f
diff --git a/metadata/md5-cache/dev-python/pymilter-1.0.4-r1 b/metadata/md5-cache/dev-python/pymilter-1.0.4-r1
index 06dfdd43cbef..ce68cbfbe14d 100644
--- a/metadata/md5-cache/dev-python/pymilter-1.0.4-r1
+++ b/metadata/md5-cache/dev-python/pymilter-1.0.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sdgathman/pymilter/archive/pymilter-1.0.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=24f230fa3cb6d6a86a70e6115aeb59b8
diff --git a/metadata/md5-cache/dev-python/pymongo-3.11.0-r1 b/metadata/md5-cache/dev-python/pymongo-3.11.0-r1
index d4647625879e..badd131100b6 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.11.0-r1
+++ b/metadata/md5-cache/dev-python/pymongo-3.11.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymongo/pymongo-3.11.0.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f37f05cf5e38ff312c28fc2ba8b78b5b
diff --git a/metadata/md5-cache/dev-python/pymongo-3.11.1 b/metadata/md5-cache/dev-python/pymongo-3.11.1
index 396f595a585e..4490f9974d0f 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.11.1
+++ b/metadata/md5-cache/dev-python/pymongo-3.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-python-driver/archive/3.11.1.tar.gz -> mongo-python-driver-3.11.1.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=58bb5bf090fa917198bfbac25a69c9a6
diff --git a/metadata/md5-cache/dev-python/pymountboot-0.2.3 b/metadata/md5-cache/dev-python/pymountboot-0.2.3
index 6a9b15a5c078..af128b40b8d3 100644
--- a/metadata/md5-cache/dev-python/pymountboot-0.2.3
+++ b/metadata/md5-cache/dev-python/pymountboot-0.2.3
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 python_targets_python3_6? ( dev-lang/python:3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/pymountboot/archive/v0.2.3.tar.gz -> pymountboot-0.2.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=95f0c7e6937d8cd51602ff44412be1e6
diff --git a/metadata/md5-cache/dev-python/pymountboot-9999 b/metadata/md5-cache/dev-python/pymountboot-9999
index 320af8f7d322..8d30b9667a20 100644
--- a/metadata/md5-cache/dev-python/pymountboot-9999
+++ b/metadata/md5-cache/dev-python/pymountboot-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/util-linux-2.20 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=851dc8b59c94d5536cf0ca21a440f015
diff --git a/metadata/md5-cache/dev-python/pympler-0.6 b/metadata/md5-cache/dev-python/pympler-0.6
index cba222177125..3880a809f0ee 100644
--- a/metadata/md5-cache/dev-python/pympler-0.6
+++ b/metadata/md5-cache/dev-python/pympler-0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pympler/pympler/archive/0.6.tar.gz -> pympler-0.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=435f30ef977a094e8cb1718ce3025d93
diff --git a/metadata/md5-cache/dev-python/pymssql-2.1.3 b/metadata/md5-cache/dev-python/pymssql-2.1.3
index 18dfa30e5c17..e44e092a0163 100644
--- a/metadata/md5-cache/dev-python/pymssql-2.1.3
+++ b/metadata/md5-cache/dev-python/pymssql-2.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pymssql/pymssql-2.1.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=38a10176d7804c012a5315798fe03b84
diff --git a/metadata/md5-cache/dev-python/pymysql-0.10.1 b/metadata/md5-cache/dev-python/pymysql-0.10.1
index c4eb77858045..a34a54d10e75 100644
--- a/metadata/md5-cache/dev-python/pymysql-0.10.1
+++ b/metadata/md5-cache/dev-python/pymysql-0.10.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyMySQL/PyMySQL/archive/v0.10.1.tar.gz -> pymysql-0.10.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1ff0b306ddc0f754b7ab7e0f99306537
diff --git a/metadata/md5-cache/dev-python/pynacl-1.4.0 b/metadata/md5-cache/dev-python/pynacl-1.4.0
index 3a5807181987..1e84bb79ccb9 100644
--- a/metadata/md5-cache/dev-python/pynacl-1.4.0
+++ b/metadata/md5-cache/dev-python/pynacl-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyca/pynacl/archive/1.4.0.tar.gz -> pynacl-1.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=72055dfdfe0ee29c8a0966126ff315cc
diff --git a/metadata/md5-cache/dev-python/pynput-1.6.8 b/metadata/md5-cache/dev-python/pynput-1.6.8
index e9ad5cfeecf6..b6e362d601cb 100644
--- a/metadata/md5-cache/dev-python/pynput-1.6.8
+++ b/metadata/md5-cache/dev-python/pynput-1.6.8
@@ -11,5 +11,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/moses-palmer/pynput/archive/v1.6.8.tar.gz -> pynput-1.6.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bb547e33df87669d6e172ae0e804c8f3
diff --git a/metadata/md5-cache/dev-python/pynput-9999 b/metadata/md5-cache/dev-python/pynput-9999
index cd9f52a9c9eb..4acdfaec1e2c 100644
--- a/metadata/md5-cache/dev-python/pynput-9999
+++ b/metadata/md5-cache/dev-python/pynput-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-xlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bb547e33df87669d6e172ae0e804c8f3
diff --git a/metadata/md5-cache/dev-python/pynvim-0.4.1 b/metadata/md5-cache/dev-python/pynvim-0.4.1
index 5d8d5024643a..44fe4e675175 100644
--- a/metadata/md5-cache/dev-python/pynvim-0.4.1
+++ b/metadata/md5-cache/dev-python/pynvim-0.4.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( app-editors/neovim )
+DEPEND=dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( app-editors/neovim )
 DESCRIPTION=Python client for Neovim
 EAPI=7
 HOMEPAGE=https://github.com/neovim/pynvim
-IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neovim/pynvim/archive/0.4.1.tar.gz -> pynvim-0.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=32d307a71518f3693da50dce3d0d1f83
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c0af9f98de697fc448427412f02a8af4
diff --git a/metadata/md5-cache/dev-python/pynvim-0.4.2 b/metadata/md5-cache/dev-python/pynvim-0.4.2
new file mode 100644
index 000000000000..9cb9b4d42d8a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pynvim-0.4.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( app-editors/neovim )
+DESCRIPTION=Python client for Neovim
+EAPI=7
+HOMEPAGE=https://github.com/neovim/pynvim
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/neovim/pynvim/archive/0.4.2.tar.gz -> pynvim-0.4.2.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f69fa60f2971eb2c30756ecb8f59e832
diff --git a/metadata/md5-cache/dev-python/pyocr-0.7.2 b/metadata/md5-cache/dev-python/pyocr-0.7.2
index 8326bc4557e0..e9e7d028cafe 100644
--- a/metadata/md5-cache/dev-python/pyocr-0.7.2
+++ b/metadata/md5-cache/dev-python/pyocr-0.7.2
@@ -11,5 +11,5 @@ RDEPEND=cuneiform? ( app-text/cuneiform ) tesseract? ( app-text/tesseract ) dev-
 REQUIRED_USE=|| ( cuneiform tesseract ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyocr/pyocr-0.7.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3643a7b3d9a86bfbc4edeae79b6e33d3
diff --git a/metadata/md5-cache/dev-python/pyopencl-2020.2 b/metadata/md5-cache/dev-python/pyopencl-2020.2
index 81de77d3c8a9..e1f274424589 100644
--- a/metadata/md5-cache/dev-python/pyopencl-2020.2
+++ b/metadata/md5-cache/dev-python/pyopencl-2020.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2020.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=18f6cdb16a7f1fc68da3b6fa6602329d
diff --git a/metadata/md5-cache/dev-python/pyopencl-2020.2.2 b/metadata/md5-cache/dev-python/pyopencl-2020.2.2
index 7e81512b85bd..86e6a692814b 100644
--- a/metadata/md5-cache/dev-python/pyopencl-2020.2.2
+++ b/metadata/md5-cache/dev-python/pyopencl-2020.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2020.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7324729b4f2c6d748562fba3ecb74097
diff --git a/metadata/md5-cache/dev-python/pyopengl-3.1.0-r1 b/metadata/md5-cache/dev-python/pyopengl-3.1.0-r1
index 98563d2eecdd..f8e50eb853ca 100644
--- a/metadata/md5-cache/dev-python/pyopengl-3.1.0-r1
+++ b/metadata/md5-cache/dev-python/pyopengl-3.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? (
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyOpenGL/PyOpenGL-3.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8e5951bdb43441eaf613dc81c9073e09
diff --git a/metadata/md5-cache/dev-python/pyopengl-3.1.5 b/metadata/md5-cache/dev-python/pyopengl-3.1.5
index 00e37b095408..62868b3c80b2 100644
--- a/metadata/md5-cache/dev-python/pyopengl-3.1.5
+++ b/metadata/md5-cache/dev-python/pyopengl-3.1.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyOpenGL/PyOpenGL-3.1.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=756c35cdcf6e7d1d4f6d9b4f19b63c96
diff --git a/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.5 b/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.5
index e63e4f152fc8..0c55c8787cc9 100644
--- a/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.5
+++ b/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mcfletch/pyopengl/archive/02d11dad9ff18e50db10e975c4756e17bf198464.tar.gz -> pyopengl-3.1.5.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=8d1dc57f5be78b9a4518aae7573a43fe
diff --git a/metadata/md5-cache/dev-python/pyopenssl-19.1.0-r1 b/metadata/md5-cache/dev-python/pyopenssl-19.1.0-r1
index fb829aac16e2..df5fec17d246 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-19.1.0-r1
+++ b/metadata/md5-cache/dev-python/pyopenssl-19.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-19.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=45cf37272c5d313dccbed93606aca595
diff --git a/metadata/md5-cache/dev-python/pyopenssl-20.0.0 b/metadata/md5-cache/dev-python/pyopenssl-20.0.0-r1
similarity index 98%
rename from metadata/md5-cache/dev-python/pyopenssl-20.0.0
rename to metadata/md5-cache/dev-python/pyopenssl-20.0.0-r1
index e61fae379931..7ffef9f61242 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-20.0.0
+++ b/metadata/md5-cache/dev-python/pyopenssl-20.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-20.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=20235421784567258e47fc8a65cd63d6
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=dd1271a25b86a25ec7155195ba2e0eda
diff --git a/metadata/md5-cache/dev-python/pyotp-2.4.1 b/metadata/md5-cache/dev-python/pyotp-2.4.1
index 7e6222a28261..a83d2a821088 100644
--- a/metadata/md5-cache/dev-python/pyotp-2.4.1
+++ b/metadata/md5-cache/dev-python/pyotp-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyotp/pyotp-2.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=499b6dd36f8652967481c52f2b924ce4
diff --git a/metadata/md5-cache/dev-python/pypam-0.5.0-r6 b/metadata/md5-cache/dev-python/pypam-0.5.0-r6
index 6af8ff206eab..3ee625983238 100644
--- a/metadata/md5-cache/dev-python/pypam-0.5.0-r6
+++ b/metadata/md5-cache/dev-python/pypam-0.5.0-r6
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/pam-0.64 python_targets_python3_6? ( dev-lang/python:3.6 ) py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=http://www.pangalactic.org/PyPAM/PyPAM-0.5.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2e336a8b60992f11f0afd1651d9c228e
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.4.7-r1 b/metadata/md5-cache/dev-python/pyparsing-2.4.7-r1
index f21685c690c8..ba50049ba405 100644
--- a/metadata/md5-cache/dev-python/pyparsing-2.4.7-r1
+++ b/metadata/md5-cache/dev-python/pyparsing-2.4.7-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/pyparsing/pyparsing/archive/pyparsing_2.4.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e8e0198e0dd565bf5b4ac73e5d8ca812
diff --git a/metadata/md5-cache/dev-python/pyparted-3.11.6 b/metadata/md5-cache/dev-python/pyparted-3.11.6
index 5305b9403272..b19cbd0248a6 100644
--- a/metadata/md5-cache/dev-python/pyparted-3.11.6
+++ b/metadata/md5-cache/dev-python/pyparted-3.11.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dcantrell/pyparted/archive/v3.11.6.tar.gz -> pyparted-3.11.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cc62477a36a2a6071e902c11ee0515b1
diff --git a/metadata/md5-cache/dev-python/pyparted-3.11.7 b/metadata/md5-cache/dev-python/pyparted-3.11.7
index d71025ac54da..2d77486404b0 100644
--- a/metadata/md5-cache/dev-python/pyparted-3.11.7
+++ b/metadata/md5-cache/dev-python/pyparted-3.11.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dcantrell/pyparted/archive/v3.11.7.tar.gz -> pyparted-3.11.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4341aae24a3274e1189955c8ac422ea3
diff --git a/metadata/md5-cache/dev-python/pypax-0.9.5 b/metadata/md5-cache/dev-python/pypax-0.9.5
index 1be3afcd9d04..5f2a19f7e3a3 100644
--- a/metadata/md5-cache/dev-python/pypax-0.9.5
+++ b/metadata/md5-cache/dev-python/pypax-0.9.5
@@ -10,5 +10,5 @@ RDEPEND=ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) python_targets_pyt
 REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/elfix/elfix-0.9.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53003bdda6b19ad9168d7fe99ccc1732
diff --git a/metadata/md5-cache/dev-python/pypax-9999 b/metadata/md5-cache/dev-python/pypax-9999
index ee6089f0af16..63f4a31ce8f6 100644
--- a/metadata/md5-cache/dev-python/pypax-9999
+++ b/metadata/md5-cache/dev-python/pypax-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d194828d4fb3772ffd388780218e7dc2
diff --git a/metadata/md5-cache/dev-python/pypcap-1.2.3 b/metadata/md5-cache/dev-python/pypcap-1.2.3
index c9f20b8a63ca..1e7736bfd4b0 100644
--- a/metadata/md5-cache/dev-python/pypcap-1.2.3
+++ b/metadata/md5-cache/dev-python/pypcap-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libpcap python_targets_python3_6? ( dev-lang/python:3.6 ) pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pynetwork/pypcap/archive/v1.2.3.tar.gz -> pypcap-1.2.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7f6e63c7bc5192a702f9e2ead4002059
diff --git a/metadata/md5-cache/dev-python/pypeg2-2.15.2-r1 b/metadata/md5-cache/dev-python/pypeg2-2.15.2-r1
index f30c135a1f76..6edb65f79e90 100644
--- a/metadata/md5-cache/dev-python/pypeg2-2.15.2-r1
+++ b/metadata/md5-cache/dev-python/pypeg2-2.15.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyPEG2/pyPEG2-2.15.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=693cb7c56729de48a54fff496c3b015c
diff --git a/metadata/md5-cache/dev-python/pyperclip-1.7.0 b/metadata/md5-cache/dev-python/pyperclip-1.7.0
index d4295151991b..ae8a8b6a3f2b 100644
--- a/metadata/md5-cache/dev-python/pyperclip-1.7.0
+++ b/metadata/md5-cache/dev-python/pyperclip-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyperclip/pyperclip-1.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=f2fc54a08e4a75b762f65367add91a5f
diff --git a/metadata/md5-cache/dev-python/pyphen-0.10.0 b/metadata/md5-cache/dev-python/pyphen-0.10.0
index 8aa8a51bcc4e..99d4320bb2b3 100644
--- a/metadata/md5-cache/dev-python/pyphen-0.10.0
+++ b/metadata/md5-cache/dev-python/pyphen-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kozea/Pyphen/archive/0.10.0.tar.gz -> pyphen-0.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1b68180e480596488ab984a8d3e1b5f9
diff --git a/metadata/md5-cache/dev-python/pyphen-0.9.5 b/metadata/md5-cache/dev-python/pyphen-0.9.5
index f05c98aa33bf..8629f7faf15e 100644
--- a/metadata/md5-cache/dev-python/pyphen-0.9.5
+++ b/metadata/md5-cache/dev-python/pyphen-0.9.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kozea/Pyphen/archive/0.9.5.tar.gz -> pyphen-0.9.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=689979dabbd5ef8ecc2045961a030d8b
diff --git a/metadata/md5-cache/dev-python/pypiserver-1.4.2 b/metadata/md5-cache/dev-python/pypiserver-1.4.2
index 440d9fb886b7..2074fc4bab34 100644
--- a/metadata/md5-cache/dev-python/pypiserver-1.4.2
+++ b/metadata/md5-cache/dev-python/pypiserver-1.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypiserver/pypiserver/archive/v1.4.2.tar.gz -> pypiserver-1.4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f66ba9da639424d110f4da37b5cbf13d
diff --git a/metadata/md5-cache/dev-python/pypng-0.0.20 b/metadata/md5-cache/dev-python/pypng-0.0.20
index b16f8bdc96e3..6f1e3fdcc279 100644
--- a/metadata/md5-cache/dev-python/pypng-0.0.20
+++ b/metadata/md5-cache/dev-python/pypng-0.0.20
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypng/pypng-0.0.20.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4fc0021e80ee912a6da45a860c786c19
diff --git a/metadata/md5-cache/dev-python/pypowervm-1.1.24 b/metadata/md5-cache/dev-python/pypowervm-1.1.24
index b5ae2ec90382..f831ae519d06 100644
--- a/metadata/md5-cache/dev-python/pypowervm-1.1.24
+++ b/metadata/md5-cache/dev-python/pypowervm-1.1.24
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypowervm/pypowervm-1.1.24.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=504700176c4b636f66e2ffa2d19a5a5b
diff --git a/metadata/md5-cache/dev-python/pyprof2calltree-1.4.4 b/metadata/md5-cache/dev-python/pyprof2calltree-1.4.4
index 97aa960897c2..4ebbe9f59177 100644
--- a/metadata/md5-cache/dev-python/pyprof2calltree-1.4.4
+++ b/metadata/md5-cache/dev-python/pyprof2calltree-1.4.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/pwaller/pyprof2calltree/archive/v1.4.4.tar.gz -> pyprof2calltree-1.4.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9d98171721e5b588d600772bddac7d28
diff --git a/metadata/md5-cache/dev-python/pyproj-2.6.1_p1 b/metadata/md5-cache/dev-python/pyproj-2.6.1_p1
index 4587c5411009..31441a85c690 100644
--- a/metadata/md5-cache/dev-python/pyproj-2.6.1_p1
+++ b/metadata/md5-cache/dev-python/pyproj-2.6.1_p1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyproj/pyproj-2.6.1.post1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c58714680ebc89e6884c49665da25065
diff --git a/metadata/md5-cache/dev-python/pyproject2setuppy-8 b/metadata/md5-cache/dev-python/pyproject2setuppy-8
index 8bc5f7b22db7..5f7d347a1424 100644
--- a/metadata/md5-cache/dev-python/pyproject2setuppy-8
+++ b/metadata/md5-cache/dev-python/pyproject2setuppy-8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/pyproject2setuppy/archive/v8.tar.gz -> pyproject2setuppy-8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1a01da3a58fe4c073c23d9fbbcfa37b6
diff --git a/metadata/md5-cache/dev-python/pyproject2setuppy-9 b/metadata/md5-cache/dev-python/pyproject2setuppy-9
index 02250e342298..ca7019e18b40 100644
--- a/metadata/md5-cache/dev-python/pyproject2setuppy-9
+++ b/metadata/md5-cache/dev-python/pyproject2setuppy-9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/pyproject2setuppy/archive/v9.tar.gz -> pyproject2setuppy-9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d9ac5eaf27557d2779b59aed65112f87
diff --git a/metadata/md5-cache/dev-python/pypugjs-5.9.5 b/metadata/md5-cache/dev-python/pypugjs-5.9.5
index 6cf952179c0e..98dea913520f 100644
--- a/metadata/md5-cache/dev-python/pypugjs-5.9.5
+++ b/metadata/md5-cache/dev-python/pypugjs-5.9.5
@@ -11,5 +11,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/kakulukia/pypugjs/archive/v5.9.5.tar.gz -> pypugjs-5.9.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c1aad744092f228be321acf178492a52
diff --git a/metadata/md5-cache/dev-python/pyqrcode-1.2.1-r1 b/metadata/md5-cache/dev-python/pyqrcode-1.2.1-r1
index 9dc4003f6269..27fa9997539f 100644
--- a/metadata/md5-cache/dev-python/pyqrcode-1.2.1-r1
+++ b/metadata/md5-cache/dev-python/pyqrcode-1.2.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mnooner256/pyqrcode/archive/674a77b5eaf850d063f518bd90c243ee34ad6b5d.tar.gz -> pyqrcode-1.2.1.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=91f194b2cabaed754f7032bbdc96e608
diff --git a/metadata/md5-cache/dev-python/pyqt-distutils-0.7.3 b/metadata/md5-cache/dev-python/pyqt-distutils-0.7.3
index f375be5f56db..92b7a77402c4 100644
--- a/metadata/md5-cache/dev-python/pyqt-distutils-0.7.3
+++ b/metadata/md5-cache/dev-python/pyqt-distutils-0.7.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ColinDuquesnoy/pyqt_distutils/archive/0.7.3.tar.gz -> pyqt-distutils-0.7.3.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=246a07d488b4fb9594cef77aa4a56e74
diff --git a/metadata/md5-cache/dev-python/pyqtgraph-0.11.0_rc0 b/metadata/md5-cache/dev-python/pyqtgraph-0.11.0_rc0
index 99b3834f7e56..3c77700f8777 100644
--- a/metadata/md5-cache/dev-python/pyqtgraph-0.11.0_rc0
+++ b/metadata/md5-cache/dev-python/pyqtgraph-0.11.0_rc0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/pyqtgraph/pyqtgraph/archive/pyqtgraph-0.11.0rc0.tar.gz -> pyqtgraph-0.11.0_rc0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1051701509ebd281f1695fbcf2526cd6
diff --git a/metadata/md5-cache/dev-python/pyquery-1.4.1-r1 b/metadata/md5-cache/dev-python/pyquery-1.4.1-r1
index a3b174d12a28..9e0160a97fbf 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.4.1-r1
+++ b/metadata/md5-cache/dev-python/pyquery-1.4.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyquery/pyquery-1.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=63ed6d4bf0de8aea17439446859f05c6
diff --git a/metadata/md5-cache/dev-python/pyquery-1.4.3 b/metadata/md5-cache/dev-python/pyquery-1.4.3
index 4b13fa7bad68..dcc8504819c4 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.4.3
+++ b/metadata/md5-cache/dev-python/pyquery-1.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyquery/pyquery-1.4.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=885d00e89b5454591ea230814c1379cb
diff --git a/metadata/md5-cache/dev-python/pyre2-1.0.7 b/metadata/md5-cache/dev-python/pyre2-1.0.7
index dceeab26726c..fc78f429a6bb 100644
--- a/metadata/md5-cache/dev-python/pyre2-1.0.7
+++ b/metadata/md5-cache/dev-python/pyre2-1.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facebook/pyre2/archive/v1.0.7.tar.gz -> pyre2-1.0.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=488998b6fb7a3868ed715e46163f4871
diff --git a/metadata/md5-cache/dev-python/pyrfc3339-1.1 b/metadata/md5-cache/dev-python/pyrfc3339-1.1
index cdd585d4beff..20cceded193f 100644
--- a/metadata/md5-cache/dev-python/pyrfc3339-1.1
+++ b/metadata/md5-cache/dev-python/pyrfc3339-1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyRFC3339/pyRFC3339-1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d32621cca68e6840a895f704f42ff05c
diff --git a/metadata/md5-cache/dev-python/pyro-4.80 b/metadata/md5-cache/dev-python/pyro-4.80
index fbb5e8b037ab..9830b418b323 100644
--- a/metadata/md5-cache/dev-python/pyro-4.80
+++ b/metadata/md5-cache/dev-python/pyro-4.80
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://pypi/P/Pyro4/Pyro4-4.80.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=95a742bcdd170f54dc72a7d4aac3f7b8
diff --git a/metadata/md5-cache/dev-python/pyroute2-0.5.14 b/metadata/md5-cache/dev-python/pyroute2-0.5.14
index 11c9ea11e14f..32ed3f669ae4 100644
--- a/metadata/md5-cache/dev-python/pyroute2-0.5.14
+++ b/metadata/md5-cache/dev-python/pyroute2-0.5.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test ) test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/svinota/pyroute2/archive/0.5.14.tar.gz -> pyroute2-0.5.14.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b137af3f1960df7912f2dfda2f6cf989
diff --git a/metadata/md5-cache/dev-python/pyrqlite-2.0 b/metadata/md5-cache/dev-python/pyrqlite-2.0
index 54d34f634264..ac9b7f63c045 100644
--- a/metadata/md5-cache/dev-python/pyrqlite-2.0
+++ b/metadata/md5-cache/dev-python/pyrqlite-2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rqlite/pyrqlite/archive/v2.0.tar.gz -> pyrqlite-2.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d17beea77f9c64a44c937eef5c3d732e
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.17.3 b/metadata/md5-cache/dev-python/pyrsistent-0.17.3
index 6c7b5eeb0d47..de358a8b08ad 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.17.3
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.17.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyrsistent/pyrsistent-0.17.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=81dbbc986028221614bd0e21169d71ba
diff --git a/metadata/md5-cache/dev-python/pysaml2-6.1.0 b/metadata/md5-cache/dev-python/pysaml2-6.1.0
index f7a928e89c3b..1b45d96532b7 100644
--- a/metadata/md5-cache/dev-python/pysaml2-6.1.0
+++ b/metadata/md5-cache/dev-python/pysaml2-6.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/cryptography-1.4[python_targets_python3_7(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysaml2/pysaml2-6.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=641df3ff6c3e6caab3697af53be7268c
diff --git a/metadata/md5-cache/dev-python/pyscard-1.9.9 b/metadata/md5-cache/dev-python/pyscard-1.9.9
index f4c9068fbd1c..031e39ff34ce 100644
--- a/metadata/md5-cache/dev-python/pyscard-1.9.9
+++ b/metadata/md5-cache/dev-python/pyscard-1.9.9
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/pcsc-lite python_targets_python3_6? ( dev-lang/python:3.6 ) pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyscard/pyscard-1.9.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6ae9e61528fb475632c425040c94920e
diff --git a/metadata/md5-cache/dev-python/pyscreenshot-2.2 b/metadata/md5-cache/dev-python/pyscreenshot-2.2
index 698e1e1de8db..be1fefee72cb 100644
--- a/metadata/md5-cache/dev-python/pyscreenshot-2.2
+++ b/metadata/md5-cache/dev-python/pyscreenshot-2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ponty/pyscreenshot/archive/2.2.tar.gz -> pyscreenshot-2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=aed918b9b80d9ae8b7aafeaf56244a0e
diff --git a/metadata/md5-cache/dev-python/pyserial-3.4 b/metadata/md5-cache/dev-python/pyserial-3.4
index 235085b8c124..cc263a924fda 100644
--- a/metadata/md5-cache/dev-python/pyserial-3.4
+++ b/metadata/md5-cache/dev-python/pyserial-3.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyserial/pyserial-3.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cb33b67b85acf8c117b5cf45ae2edf81
diff --git a/metadata/md5-cache/dev-python/pyserial-3.5 b/metadata/md5-cache/dev-python/pyserial-3.5
index cfaba1bdd3ab..c6617f73bcfe 100644
--- a/metadata/md5-cache/dev-python/pyserial-3.5
+++ b/metadata/md5-cache/dev-python/pyserial-3.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyserial/pyserial-3.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=064a701e65112a3dce957e918dc59fd5
diff --git a/metadata/md5-cache/dev-python/pysimdjson-3.1.1 b/metadata/md5-cache/dev-python/pysimdjson-3.1.1
new file mode 100644
index 000000000000..16bdc1f01c68
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pysimdjson-3.1.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/pybind11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-libs/simdjson >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python bindings for simdjson
+EAPI=7
+HOMEPAGE=https://github.com/TkTech/pysimdjson
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT Apache-2.0
+RDEPEND=dev-libs/simdjson python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/TkTech/pysimdjson/archive/v3.1.1.tar.gz -> pysimdjson-3.1.1.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a55c1aab4e6efadce2c0f1f103dc467b
diff --git a/metadata/md5-cache/dev-python/pysmi-0.3.4 b/metadata/md5-cache/dev-python/pysmi-0.3.4
index 9ecad6cbe258..c22adc9afa91 100644
--- a/metadata/md5-cache/dev-python/pysmi-0.3.4
+++ b/metadata/md5-cache/dev-python/pysmi-0.3.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/ply[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysmi/pysmi-0.3.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=690cb86652acd6433cb4009ce646468e
diff --git a/metadata/md5-cache/dev-python/pysnmp-4.4.12-r1 b/metadata/md5-cache/dev-python/pysnmp-4.4.12-r1
index 496144cd5fa8..ffaee35daca7 100644
--- a/metadata/md5-cache/dev-python/pysnmp-4.4.12-r1
+++ b/metadata/md5-cache/dev-python/pysnmp-4.4.12-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysnmp/pysnmp-4.4.12.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=965ffab68378fcb53a8495a1e5560188
diff --git a/metadata/md5-cache/dev-python/pysnmp-999999 b/metadata/md5-cache/dev-python/pysnmp-999999
index 6cd2a973c483..92855715c385 100644
--- a/metadata/md5-cache/dev-python/pysnmp-999999
+++ b/metadata/md5-cache/dev-python/pysnmp-999999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pysmi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=69567e495f5d268012082f16edb7f5f7
diff --git a/metadata/md5-cache/dev-python/pysnmp-mibs-0.1.6 b/metadata/md5-cache/dev-python/pysnmp-mibs-0.1.6
index 90cea3b5b448..4127b88b16fd 100644
--- a/metadata/md5-cache/dev-python/pysnmp-mibs-0.1.6
+++ b/metadata/md5-cache/dev-python/pysnmp-mibs-0.1.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pysnmp-4.2.3[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysnmp-mibs/pysnmp-mibs-0.1.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=54c2ed2f599ce3be97f249de59c198ed
diff --git a/metadata/md5-cache/dev-python/pysol_cards-0.10.1 b/metadata/md5-cache/dev-python/pysol_cards-0.10.1
index 6ec621a57b63..4cf90f91392b 100644
--- a/metadata/md5-cache/dev-python/pysol_cards-0.10.1
+++ b/metadata/md5-cache/dev-python/pysol_cards-0.10.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pbr[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysol_cards/pysol_cards-0.10.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=91c6c2cf4d48d43d6aae49d8300849bd
diff --git a/metadata/md5-cache/dev-python/pyspectrum2-0.2.0 b/metadata/md5-cache/dev-python/pyspectrum2-0.2.0
index de9e096fdab7..911666e12718 100644
--- a/metadata/md5-cache/dev-python/pyspectrum2-0.2.0
+++ b/metadata/md5-cache/dev-python/pyspectrum2-0.2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/stv0g/pyspectrum2/archive/v0.2.0.tar.gz -> pyspectrum2-0.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e3ef94cf09d595a0f717f0482d430604
diff --git a/metadata/md5-cache/dev-python/pyspf-2.0.14 b/metadata/md5-cache/dev-python/pyspf-2.0.14
index c2a07df7444e..f857eb611c0a 100644
--- a/metadata/md5-cache/dev-python/pyspf-2.0.14
+++ b/metadata/md5-cache/dev-python/pyspf-2.0.14
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( ipv6 ) || ( python_targets_python3_6 python_targets_python3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyspf/pyspf-2.0.14.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=504da00565693e1c528bc46816605bb1
diff --git a/metadata/md5-cache/dev-python/pysrt-1.1.2 b/metadata/md5-cache/dev-python/pysrt-1.1.2
index b6fd774007f7..f4093979e7d4 100644
--- a/metadata/md5-cache/dev-python/pysrt-1.1.2
+++ b/metadata/md5-cache/dev-python/pysrt-1.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysrt/pysrt-1.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=df099ff4241d1ba6d85b60dd996afb84
diff --git a/metadata/md5-cache/dev-python/pysrt-9999 b/metadata/md5-cache/dev-python/pysrt-9999
index 43d2aae8b0ec..dff988cedeca 100644
--- a/metadata/md5-cache/dev-python/pysrt-9999
+++ b/metadata/md5-cache/dev-python/pysrt-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/chardet[python_targets_pypy3(-)?,python_targets_python3_6(-)?
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bd51564edbfc0b19f52f9626810f9e75
diff --git a/metadata/md5-cache/dev-python/pysvg-0.2.2_p3 b/metadata/md5-cache/dev-python/pysvg-0.2.2_p3
index 7a16fbe7b097..b8e236798e38 100644
--- a/metadata/md5-cache/dev-python/pysvg-0.2.2_p3
+++ b/metadata/md5-cache/dev-python/pysvg-0.2.2_p3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysvg-py3/pysvg-py3-0.2.2.post3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=69792d3a3b7eb08e20721dc0d626c244
diff --git a/metadata/md5-cache/dev-python/pysvn-1.9.11 b/metadata/md5-cache/dev-python/pysvn-1.9.11
index 53c03f07aa0a..15e5063d5c3d 100644
--- a/metadata/md5-cache/dev-python/pysvn-1.9.11
+++ b/metadata/md5-cache/dev-python/pysvn-1.9.11
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pycxx-7.0.2[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/pysvn/pysvn/V1.9.11/pysvn-1.9.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=43131ba0be7639c077c4d788e7f36dca
diff --git a/metadata/md5-cache/dev-python/pytables-3.6.1 b/metadata/md5-cache/dev-python/pytables-3.6.1
index dda30b80e705..48ccf9dcb0cc 100644
--- a/metadata/md5-cache/dev-python/pytables-3.6.1
+++ b/metadata/md5-cache/dev-python/pytables-3.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tables/tables-3.6.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64980aa254d68a76885e553907657ad2
diff --git a/metadata/md5-cache/dev-python/pytaglib-1.4.6 b/metadata/md5-cache/dev-python/pytaglib-1.4.6
index 570ce07cf646..f4e73b821e4d 100644
--- a/metadata/md5-cache/dev-python/pytaglib-1.4.6
+++ b/metadata/md5-cache/dev-python/pytaglib-1.4.6
@@ -11,5 +11,5 @@ RDEPEND=media-libs/taglib python_targets_python3_7? ( dev-lang/python:3.7 ) pyth
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/supermihi/pytaglib/archive/v1.4.6.tar.gz -> pytaglib-1.4.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0de09eb3789d7ad44aa36711ecdabb77
diff --git a/metadata/md5-cache/dev-python/pyte-0.8.0-r1 b/metadata/md5-cache/dev-python/pyte-0.8.0-r1
index e3ada67069e7..a05e1541815e 100644
--- a/metadata/md5-cache/dev-python/pyte-0.8.0-r1
+++ b/metadata/md5-cache/dev-python/pyte-0.8.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/selectel/pyte/archive/0.8.0.tar.gz -> pyte-0.8.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=29a275d19541361aaea80f06e4d4d328
diff --git a/metadata/md5-cache/dev-python/pytest-4.6.11-r1 b/metadata/md5-cache/dev-python/pytest-4.6.11-r1
index 6faac72fd7c0..ee494b9a7b87 100644
--- a/metadata/md5-cache/dev-python/pytest-4.6.11-r1
+++ b/metadata/md5-cache/dev-python/pytest-4.6.11-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-4.6.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=252d6ef366d45cdb7f5b8343c28f6cf2
diff --git a/metadata/md5-cache/dev-python/pytest-5.4.3 b/metadata/md5-cache/dev-python/pytest-5.4.3
index b5dbd69ed2b4..6f0590821b0e 100644
--- a/metadata/md5-cache/dev-python/pytest-5.4.3
+++ b/metadata/md5-cache/dev-python/pytest-5.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-5.4.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b8313a82513f5cd3f42a40bed7901aa3
diff --git a/metadata/md5-cache/dev-python/pytest-6.1.1 b/metadata/md5-cache/dev-python/pytest-6.1.1
deleted file mode 100644
index 30317238b005..000000000000
--- a/metadata/md5-cache/dev-python/pytest-6.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/iniconfig[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pluggy-1 >=dev-python/py-1.8.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/argcomplete[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/hypothesis-3.56[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/xmlschema[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!dev-python/flaky )
-DESCRIPTION=Simple powerful testing with Python
-EAPI=7
-HOMEPAGE=https://pytest.org/
-IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/iniconfig[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pluggy-1 >=dev-python/py-1.8.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest/pytest-6.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d6a057bc9a4003578c18e378c4ebbb54
diff --git a/metadata/md5-cache/dev-python/pytest-6.1.2 b/metadata/md5-cache/dev-python/pytest-6.1.2
index ff4e045fc304..d8683ebf276d 100644
--- a/metadata/md5-cache/dev-python/pytest-6.1.2
+++ b/metadata/md5-cache/dev-python/pytest-6.1.2
@@ -5,12 +5,12 @@ DESCRIPTION=Simple powerful testing with Python
 EAPI=7
 HOMEPAGE=https://pytest.org/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/iniconfig[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pluggy-1 >=dev-python/py-1.8.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-6.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7e8bdc07f6dfdf4fbbc0b90dad7b0fb7
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=bc80e685cb38002aea68db27d96f9cb2
diff --git a/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1 b/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
index 563e3f4b33d3..2dde4753bf41 100644
--- a/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pytest-5.4[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-aiohttp/pytest-aiohttp-0.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=881f0e424a10b8b0b368b5a9663c3dbc
diff --git a/metadata/md5-cache/dev-python/pytest-asyncio-0.14.0 b/metadata/md5-cache/dev-python/pytest-asyncio-0.14.0
index 7efe1093164f..3226102df702 100644
--- a/metadata/md5-cache/dev-python/pytest-asyncio-0.14.0
+++ b/metadata/md5-cache/dev-python/pytest-asyncio-0.14.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pytest-asyncio/archive/v0.14.0.tar.gz -> pytest-asyncio-0.14.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=40a193a1d9c73e5e8eedbae38a1ce559
diff --git a/metadata/md5-cache/dev-python/pytest-cache-1.0-r2 b/metadata/md5-cache/dev-python/pytest-cache-1.0-r2
index 5197c3181b5f..6ad89d839a3e 100644
--- a/metadata/md5-cache/dev-python/pytest-cache-1.0-r2
+++ b/metadata/md5-cache/dev-python/pytest-cache-1.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-cache/pytest-cache-1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=df6422d206db51601ab83d4d353ccbdc
diff --git a/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2 b/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
index 18183e4c8f1d..3c3e84f9a67b 100644
--- a/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
+++ b/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-catchlog/pytest-catchlog-1.2.2.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=22f74f14cff8684c877d20111cbf3871
diff --git a/metadata/md5-cache/dev-python/pytest-cov-2.10.1 b/metadata/md5-cache/dev-python/pytest-cov-2.10.1
new file mode 100644
index 000000000000..93982bae869c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-cov-2.10.1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/fields[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/process-tests-2.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=py.test plugin for coverage reporting
+EAPI=7
+HOMEPAGE=https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/
+IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/py-1.4.22[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-3.6[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/coverage-4.4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-cov/pytest-cov-2.10.1.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3002b67555a652f99f08b5b869a1ce5c
diff --git a/metadata/md5-cache/dev-python/pytest-cov-2.8.1 b/metadata/md5-cache/dev-python/pytest-cov-2.8.1
index 924b9da5db77..5c9868f6f681 100644
--- a/metadata/md5-cache/dev-python/pytest-cov-2.8.1
+++ b/metadata/md5-cache/dev-python/pytest-cov-2.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-cov/pytest-cov-2.8.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5d3d5c42e8c11656ed5574f634f3ab2a
diff --git a/metadata/md5-cache/dev-python/pytest-datadir-1.3.1 b/metadata/md5-cache/dev-python/pytest-datadir-1.3.1
index 16c88f7a995c..86e0999fb410 100644
--- a/metadata/md5-cache/dev-python/pytest-datadir-1.3.1
+++ b/metadata/md5-cache/dev-python/pytest-datadir-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-datadir/pytest-datadir-1.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e984fb55ef072f052a72f7db311ee2ef
diff --git a/metadata/md5-cache/dev-python/pytest-describe-1.0.0 b/metadata/md5-cache/dev-python/pytest-describe-1.0.0
index 48a9abd75879..dfbf5c769575 100644
--- a/metadata/md5-cache/dev-python/pytest-describe-1.0.0
+++ b/metadata/md5-cache/dev-python/pytest-describe-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-describe/pytest-describe-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=33a64ea955467bdb50e02b3d0e83e2e1
diff --git a/metadata/md5-cache/dev-python/pytest-django-4.1.0 b/metadata/md5-cache/dev-python/pytest-django-4.1.0
index e832047de565..daea82d55c9c 100644
--- a/metadata/md5-cache/dev-python/pytest-django-4.1.0
+++ b/metadata/md5-cache/dev-python/pytest-django-4.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pytest-django/archive/v4.1.0.tar.gz -> pytest-django-4.1.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=63de96cf22d1abae53befd66516ed52e
diff --git a/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1 b/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
index 4607de077c68..c6c7d940e55c 100644
--- a/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-expect/pytest-expect-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9d6c593f7c745e6027f77516ace1c276
diff --git a/metadata/md5-cache/dev-python/pytest-faulthandler-1.6.0 b/metadata/md5-cache/dev-python/pytest-faulthandler-1.6.0
index 6bcb91295238..339770ad741b 100644
--- a/metadata/md5-cache/dev-python/pytest-faulthandler-1.6.0
+++ b/metadata/md5-cache/dev-python/pytest-faulthandler-1.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-faulthandler/pytest-faulthandler-1.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d1c68b44dc8d92ad5782deb93b20bf48
diff --git a/metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1 b/metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1
index 36354ed91b18..d6e942d62f6d 100644
--- a/metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1
+++ b/metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pytest-5.0[python_targets_python3_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pytest-faulthandler/archive/2.0.1.tar.gz -> pytest-faulthandler-2.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=78dff1f994a6c17ba8e096ccec5eb3e7
diff --git a/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r1 b/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r1
index 11e8fd613fc0..e94648bf6360 100644
--- a/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-fixture-config/pytest-fixture-config-1.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1e39015abfe77f1d524cc3fa05d16c0f
diff --git a/metadata/md5-cache/dev-python/pytest-flake8-0.9.1 b/metadata/md5-cache/dev-python/pytest-flake8-0.9.1
index 021f37935c51..624ee345039d 100644
--- a/metadata/md5-cache/dev-python/pytest-flake8-0.9.1
+++ b/metadata/md5-cache/dev-python/pytest-flake8-0.9.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/flake8-3.3.0[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-flake8/pytest-flake8-0.9.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=661d60d30d985d7aa8a9f4936782131e
diff --git a/metadata/md5-cache/dev-python/pytest-flakes-4.0.0 b/metadata/md5-cache/dev-python/pytest-flakes-4.0.0
index 437492cb83b0..f089faea4802 100644
--- a/metadata/md5-cache/dev-python/pytest-flakes-4.0.0
+++ b/metadata/md5-cache/dev-python/pytest-flakes-4.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-flakes/pytest-flakes-4.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6101e745b40fedf110ee6905c7a4721d
diff --git a/metadata/md5-cache/dev-python/pytest-forked-1.3.0-r1 b/metadata/md5-cache/dev-python/pytest-forked-1.3.0-r1
index eef33e34d05f..7234860f83c4 100644
--- a/metadata/md5-cache/dev-python/pytest-forked-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-forked-1.3.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-forked/pytest-forked-1.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ab77f3ba832724b1d1ddcb4e8677fdc0
diff --git a/metadata/md5-cache/dev-python/pytest-freezegun-0.4.2 b/metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
index 4f8832b8ba39..395e4d3a5f3e 100644
--- a/metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
+++ b/metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ktosiek/pytest-freezegun/archive/0.4.2.tar.gz -> pytest-freezegun-0.4.2.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fb5061a621d1ea9da51a5331d2a3ee45
diff --git a/metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8-r1 b/metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8-r1
index 05a3196046f8..bcf8ae3a8ca6 100644
--- a/metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8-r1
+++ b/metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/saltstack/pytest-helpers-namespace/archive/v2019.1.8.tar.gz -> pytest-helpers-namespace-v2019.1.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6064781bfa488c1e7b0f5c2e5cff1c49
diff --git a/metadata/md5-cache/dev-python/pytest-html-1.22.1 b/metadata/md5-cache/dev-python/pytest-html-1.22.1
index 295a987ebc93..c1b47ac31ef9 100644
--- a/metadata/md5-cache/dev-python/pytest-html-1.22.1
+++ b/metadata/md5-cache/dev-python/pytest-html-1.22.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-html/pytest-html-1.22.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0d3fd32da26a1fb3b1d8003dbb5eb3d4
diff --git a/metadata/md5-cache/dev-python/pytest-httpbin-1.0.0-r1 b/metadata/md5-cache/dev-python/pytest-httpbin-1.0.0-r1
index 32ba7d2d80c0..9ff4d61fc5f0 100644
--- a/metadata/md5-cache/dev-python/pytest-httpbin-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-httpbin-1.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kevin1024/pytest-httpbin/archive/v1.0.0.tar.gz -> pytest-httpbin-1.0.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=db757cd4ccda1d86a034f91073f43000
diff --git a/metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3 b/metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3
index b967027aace8..2b55ee09aac5 100644
--- a/metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3
+++ b/metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=42df8c78a3a1f90ca1450490bf9b3a8b
diff --git a/metadata/md5-cache/dev-python/pytest-localserver-0.5.0 b/metadata/md5-cache/dev-python/pytest-localserver-0.5.0
index 1f795e70a01d..066386c36542 100644
--- a/metadata/md5-cache/dev-python/pytest-localserver-0.5.0
+++ b/metadata/md5-cache/dev-python/pytest-localserver-0.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-localserver/pytest-localserver-0.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c497c0f45e02ee165a80f60f91fe86cd
diff --git a/metadata/md5-cache/dev-python/pytest-metadata-1.8.0 b/metadata/md5-cache/dev-python/pytest-metadata-1.8.0
index 172149507c5e..28bc393a8e3b 100644
--- a/metadata/md5-cache/dev-python/pytest-metadata-1.8.0
+++ b/metadata/md5-cache/dev-python/pytest-metadata-1.8.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pytest-3.0[python_targets_pypy3(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-metadata/pytest-metadata-1.8.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=aa27438c9444cd34cd251d8a984e1b7b
diff --git a/metadata/md5-cache/dev-python/pytest-mock-3.3.1 b/metadata/md5-cache/dev-python/pytest-mock-3.3.1
index 9690b61cff17..1bfe2b21c525 100644
--- a/metadata/md5-cache/dev-python/pytest-mock-3.3.1
+++ b/metadata/md5-cache/dev-python/pytest-mock-3.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-mock/pytest-mock-3.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ac5bf72ed239cd8479fee33dde28f0d9
diff --git a/metadata/md5-cache/dev-python/pytest-ordering-0.6 b/metadata/md5-cache/dev-python/pytest-ordering-0.6
index 6d1a09fa099b..97560a8b45a9 100644
--- a/metadata/md5-cache/dev-python/pytest-ordering-0.6
+++ b/metadata/md5-cache/dev-python/pytest-ordering-0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ftobia/pytest-ordering/archive/0.6.tar.gz -> pytest-ordering-0.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ccd154d46c3b867ece74ea7c0a824a89
diff --git a/metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r1 b/metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r1
index ae3e305912f4..02826bc4414e 100644
--- a/metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r1
+++ b/metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pep8-1.3[python_targets_pypy3(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-pep8/pytest-pep8-1.0.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c5f629fce289a168de33edbe7b3846af
diff --git a/metadata/md5-cache/dev-python/pytest-pylint-0.17.0 b/metadata/md5-cache/dev-python/pytest-pylint-0.17.0
index f945a57f0253..029ea9f43d62 100644
--- a/metadata/md5-cache/dev-python/pytest-pylint-0.17.0
+++ b/metadata/md5-cache/dev-python/pytest-pylint-0.17.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/carsongee/pytest-pylint/archive/v0.17.0.tar.gz -> pytest-pylint-0.17.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1a29555a1ae64d0d15c9da08d49db239
diff --git a/metadata/md5-cache/dev-python/pytest-qt-3.3.0 b/metadata/md5-cache/dev-python/pytest-qt-3.3.0
index a15a92387d25..d8ef47c24e05 100644
--- a/metadata/md5-cache/dev-python/pytest-qt-3.3.0
+++ b/metadata/md5-cache/dev-python/pytest-qt-3.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-qt/pytest-qt-3.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=d4f73c9bd57a8cf3ed6dfbb25146c5f5
diff --git a/metadata/md5-cache/dev-python/pytest-regressions-2.0.1 b/metadata/md5-cache/dev-python/pytest-regressions-2.0.1
index 590be5a78ba1..1472e5719c46 100644
--- a/metadata/md5-cache/dev-python/pytest-regressions-2.0.1
+++ b/metadata/md5-cache/dev-python/pytest-regressions-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-regressions/pytest-regressions-2.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=113e4a39a78e83a178fac7273082eccc
diff --git a/metadata/md5-cache/dev-python/pytest-regressions-2.0.2 b/metadata/md5-cache/dev-python/pytest-regressions-2.0.2
index ff34f84589bd..b5612af2bfeb 100644
--- a/metadata/md5-cache/dev-python/pytest-regressions-2.0.2
+++ b/metadata/md5-cache/dev-python/pytest-regressions-2.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-regressions/pytest-regressions-2.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=501262cce159a11df48ce17f799d6a3f
diff --git a/metadata/md5-cache/dev-python/pytest-rerunfailures-9.1.1 b/metadata/md5-cache/dev-python/pytest-rerunfailures-9.1.1
index 64cff4865334..2e1cea7cb4b7 100644
--- a/metadata/md5-cache/dev-python/pytest-rerunfailures-9.1.1
+++ b/metadata/md5-cache/dev-python/pytest-rerunfailures-9.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-rerunfailures/pytest-rerunfailures-9.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4fbba685db51c9d5000c1bbb99dadf88
diff --git a/metadata/md5-cache/dev-python/pytest-salt-2019.2.1_p1 b/metadata/md5-cache/dev-python/pytest-salt-2019.2.1_p1
index bc965f2eaf86..6b651521542a 100644
--- a/metadata/md5-cache/dev-python/pytest-salt-2019.2.1_p1
+++ b/metadata/md5-cache/dev-python/pytest-salt-2019.2.1_p1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-salt/pytest-salt-2019.2.1.post1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=27fb52299b91b1ed4440ceca4026fe88
diff --git a/metadata/md5-cache/dev-python/pytest-salt-2020.1.27 b/metadata/md5-cache/dev-python/pytest-salt-2020.1.27
index 0abdbff829e3..573506d34bfa 100644
--- a/metadata/md5-cache/dev-python/pytest-salt-2020.1.27
+++ b/metadata/md5-cache/dev-python/pytest-salt-2020.1.27
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/saltstack/pytest-salt/archive/v2020.1.27.tar.gz -> pytest-salt-2020.1.27.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4dcf5315792c86e8be21c68df3f35d56
diff --git a/metadata/md5-cache/dev-python/pytest-salt-factories-0.94.4 b/metadata/md5-cache/dev-python/pytest-salt-factories-0.94.4
index 6ff65c92827f..ff1bce424974 100644
--- a/metadata/md5-cache/dev-python/pytest-salt-factories-0.94.4
+++ b/metadata/md5-cache/dev-python/pytest-salt-factories-0.94.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/saltstack/pytest-salt-factories/archive/0.94.4.tar.gz -> pytest-salt-factories-0.94.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cc24f3b94ec6eafe4771474ffe5d80f3
diff --git a/metadata/md5-cache/dev-python/pytest-services-2.2.0 b/metadata/md5-cache/dev-python/pytest-services-2.2.0
index 9c5d47bdc1dd..d48fed130f02 100644
--- a/metadata/md5-cache/dev-python/pytest-services-2.2.0
+++ b/metadata/md5-cache/dev-python/pytest-services-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pytest-services/archive/2.2.0.tar.gz -> pytest-services-2.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=91780e9873b0ff5d05c668544f94f458
diff --git a/metadata/md5-cache/dev-python/pytest-services-2.2.1 b/metadata/md5-cache/dev-python/pytest-services-2.2.1
index efda9d7175ff..07b897c490a8 100644
--- a/metadata/md5-cache/dev-python/pytest-services-2.2.1
+++ b/metadata/md5-cache/dev-python/pytest-services-2.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pytest-services/archive/2.2.1.tar.gz -> pytest-services-2.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=24a7dd8fffbe0df3f0d9e100d8c8b57c
diff --git a/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r1 b/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r1
index 49104a03c7e2..083404b1d4b2 100644
--- a/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-shutil/pytest-shutil-1.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=25d5c4548d862c1e2a2ee917aaedf1d1
diff --git a/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.1 b/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.1
index 1d42ef2e5e52..fe6e28fb97c2 100644
--- a/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.1
+++ b/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/untitaker/pytest-subtesthack/archive/0.1.1.tar.gz -> pytest-subtesthack-0.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1e68e71c34d919009a96be323c146b99
diff --git a/metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12 b/metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12
index a9c626711465..8b00036ac660 100644
--- a/metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12
+++ b/metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/saltstack/pytest-tempdir/archive/v2019.10.12.tar.gz -> pytest-tempdir-2019.10.12.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=56b4c04234ac7ff47f3da2c3ad9f0091
diff --git a/metadata/md5-cache/dev-python/pytest-testmon-0.9.15 b/metadata/md5-cache/dev-python/pytest-testmon-0.9.15
index ea7bb2ba8ed2..6d98e1a6b150 100644
--- a/metadata/md5-cache/dev-python/pytest-testmon-0.9.15
+++ b/metadata/md5-cache/dev-python/pytest-testmon-0.9.15
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-testmon/pytest-testmon-0.9.15.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5d889e4ecfaa8e702719e86e3bd87abf
diff --git a/metadata/md5-cache/dev-python/pytest-timeout-1.4.2-r1 b/metadata/md5-cache/dev-python/pytest-timeout-1.4.2-r1
index b6bc918c0204..591562a89702 100644
--- a/metadata/md5-cache/dev-python/pytest-timeout-1.4.2-r1
+++ b/metadata/md5-cache/dev-python/pytest-timeout-1.4.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-timeout/pytest-timeout-1.4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b6917a122e5d254bc829a64b67f59c4a
diff --git a/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r1 b/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r1
index 4816497d0142..7c298791820f 100644
--- a/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-virtualenv/pytest-virtualenv-1.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ce0ef9b21a1763064eac8c881918d232
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-1.34.0-r1 b/metadata/md5-cache/dev-python/pytest-xdist-1.34.0-r1
index 9c161d4e9064..20c26ac186bf 100644
--- a/metadata/md5-cache/dev-python/pytest-xdist-1.34.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-xdist-1.34.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-1.34.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=25b87828bcebea10138fe8ef8bdee866
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-2.1.0 b/metadata/md5-cache/dev-python/pytest-xdist-2.1.0
index e21f9be7d627..651764ec3274 100644
--- a/metadata/md5-cache/dev-python/pytest-xdist-2.1.0
+++ b/metadata/md5-cache/dev-python/pytest-xdist-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-2.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e679f223282a4b582ead350ef075929e
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b8179992fa4f43d0c163e575e1a1f360
diff --git a/metadata/md5-cache/dev-python/pytest-xprocess-0.15.0 b/metadata/md5-cache/dev-python/pytest-xprocess-0.15.0
index 52f7a796c22f..827a265049ea 100644
--- a/metadata/md5-cache/dev-python/pytest-xprocess-0.15.0
+++ b/metadata/md5-cache/dev-python/pytest-xprocess-0.15.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xprocess/pytest-xprocess-0.15.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=20fd36bbe5c6775f289f92fbbb3e9a3c
diff --git a/metadata/md5-cache/dev-python/pytest-xprocess-0.16.0 b/metadata/md5-cache/dev-python/pytest-xprocess-0.16.0
index ca8c64837000..0da1afb47ad0 100644
--- a/metadata/md5-cache/dev-python/pytest-xprocess-0.16.0
+++ b/metadata/md5-cache/dev-python/pytest-xprocess-0.16.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xprocess/pytest-xprocess-0.16.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3ab93424b700e9c35f2af31ee6e0c26a
diff --git a/metadata/md5-cache/dev-python/pytest-xprocess-0.17.0 b/metadata/md5-cache/dev-python/pytest-xprocess-0.17.0
index 4a73f106a3f8..debaef198b76 100644
--- a/metadata/md5-cache/dev-python/pytest-xprocess-0.17.0
+++ b/metadata/md5-cache/dev-python/pytest-xprocess-0.17.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xprocess/pytest-xprocess-0.17.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3ab93424b700e9c35f2af31ee6e0c26a
diff --git a/metadata/md5-cache/dev-python/pytest-xvfb-2.0.0 b/metadata/md5-cache/dev-python/pytest-xvfb-2.0.0
index 5c16bcd5c7d8..2630b03faf15 100644
--- a/metadata/md5-cache/dev-python/pytest-xvfb-2.0.0
+++ b/metadata/md5-cache/dev-python/pytest-xvfb-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/The-Compiler/pytest-xvfb/archive/v2.0.0.tar.gz -> pytest-xvfb-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ba381fa460fd10329b98abdbb2ef82b7
diff --git a/metadata/md5-cache/dev-python/python-augeas-1.1.0 b/metadata/md5-cache/dev-python/python-augeas-1.1.0
index 93ddfbca2c47..06e14e2e9c06 100644
--- a/metadata/md5-cache/dev-python/python-augeas-1.1.0
+++ b/metadata/md5-cache/dev-python/python-augeas-1.1.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-admin/augeas >=dev-python/cffi-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=app-admin/augeas >=dev-python/cffi-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Python bindings for Augeas
 EAPI=7
 HOMEPAGE=http://augeas.net/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1
-RDEPEND=app-admin/augeas >=dev-python/cffi-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=app-admin/augeas >=dev-python/cffi-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-augeas/python-augeas-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d91eec2e49358db02c6b33a53738f040
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=70870a4958fff4228c46ec14f40329cc
diff --git a/metadata/md5-cache/dev-python/python-axolotl-0.2.3-r1 b/metadata/md5-cache/dev-python/python-axolotl-0.2.3-r1
index 1af9102679de..5c9c00a3cfc1 100644
--- a/metadata/md5-cache/dev-python/python-axolotl-0.2.3-r1
+++ b/metadata/md5-cache/dev-python/python-axolotl-0.2.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tgalal/python-axolotl/archive/0.2.3.tar.gz -> python-axolotl-0.2.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=356efb8834aed53713a7775b4b9aafbc
diff --git a/metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2-r1 b/metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2-r1
index 2da3b67702df..b284934a21d7 100644
--- a/metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2-r1
+++ b/metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/tgalal/python-axolotl-curve25519/archive/0.4.1-2.tar.gz -> python-axolotl-curve25519-0.4.1-2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2c546e8d64c56f4cc23fcf961882018f
diff --git a/metadata/md5-cache/dev-python/python-backoff-1.6.0 b/metadata/md5-cache/dev-python/python-backoff-1.6.0
index ef21d69d8218..23f54c8bfaaa 100644
--- a/metadata/md5-cache/dev-python/python-backoff-1.6.0
+++ b/metadata/md5-cache/dev-python/python-backoff-1.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/backoff/backoff-1.6.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d6c1a3920eb934d403f61c3fc659f7e2
diff --git a/metadata/md5-cache/dev-python/python-barbicanclient-4.8.1 b/metadata/md5-cache/dev-python/python-barbicanclient-4.8.1
index 8c3e100a2a8b..df613416d99f 100644
--- a/metadata/md5-cache/dev-python/python-barbicanclient-4.8.1
+++ b/metadata/md5-cache/dev-python/python-barbicanclient-4.8.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-barbicanclient/python-barbicanclient-4.8.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4fffea5341e5f9888a17ab7ae7da5b8d
diff --git a/metadata/md5-cache/dev-python/python-barbicanclient-5.0.1 b/metadata/md5-cache/dev-python/python-barbicanclient-5.0.1
index 679f29b28453..e3f407b6f2db 100644
--- a/metadata/md5-cache/dev-python/python-barbicanclient-5.0.1
+++ b/metadata/md5-cache/dev-python/python-barbicanclient-5.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-barbicanclient/python-barbicanclient-5.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a0b1decec888ae1af8b834cf23b8bf4b
diff --git a/metadata/md5-cache/dev-python/python-blazarclient-3.1.1 b/metadata/md5-cache/dev-python/python-blazarclient-3.1.1
index b0c225d3ebb6..bb731eab662c 100644
--- a/metadata/md5-cache/dev-python/python-blazarclient-3.1.1
+++ b/metadata/md5-cache/dev-python/python-blazarclient-3.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-blazarclient/python-blazarclient-3.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5a6d68602bc346161d92e539a74f2394
diff --git a/metadata/md5-cache/dev-python/python-bugzilla-3.0.1 b/metadata/md5-cache/dev-python/python-bugzilla-3.0.1
index e63c30dc1a68..179230796392 100644
--- a/metadata/md5-cache/dev-python/python-bugzilla-3.0.1
+++ b/metadata/md5-cache/dev-python/python-bugzilla-3.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-bugzilla/python-bugzilla-3.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=453b78fe7721abc6927a8ad06cc718cd
diff --git a/metadata/md5-cache/dev-python/python-bugzilla-3.0.2 b/metadata/md5-cache/dev-python/python-bugzilla-3.0.2
index c81891427d58..c20aa9ee90ee 100644
--- a/metadata/md5-cache/dev-python/python-bugzilla-3.0.2
+++ b/metadata/md5-cache/dev-python/python-bugzilla-3.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-bugzilla/python-bugzilla-3.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=12363ec899f0b64cf7e66dfe53679919
diff --git a/metadata/md5-cache/dev-python/python-ceilometerclient-2.9.0 b/metadata/md5-cache/dev-python/python-ceilometerclient-2.9.0
index 586c2078f0ed..de3838af87d8 100644
--- a/metadata/md5-cache/dev-python/python-ceilometerclient-2.9.0
+++ b/metadata/md5-cache/dev-python/python-ceilometerclient-2.9.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.6[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ceilometerclient/python-ceilometerclient-2.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6be096e615a619ed25af0f40ee00e380
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-7.2.0 b/metadata/md5-cache/dev-python/python-cinderclient-7.2.0
index ae43c018cf4e..eb662698be74 100644
--- a/metadata/md5-cache/dev-python/python-cinderclient-7.2.0
+++ b/metadata/md5-cache/dev-python/python-cinderclient-7.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-cinderclient/python-cinderclient-7.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=79cd84161b5dac6349e1a1d0eecc2e4b
diff --git a/metadata/md5-cache/dev-python/python-cstruct-1.8 b/metadata/md5-cache/dev-python/python-cstruct-1.8
index d82d3ae574a8..086fdd80f2d8 100644
--- a/metadata/md5-cache/dev-python/python-cstruct-1.8
+++ b/metadata/md5-cache/dev-python/python-cstruct-1.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/andreax79/python-cstruct/archive/v1.8.tar.gz -> python-cstruct-1.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bace7f438a0da11d2eea1c7923bdf5d7
diff --git a/metadata/md5-cache/dev-python/python-ctags-1.5.0 b/metadata/md5-cache/dev-python/python-ctags-1.5.0
index d1dac3631f74..93b41d87e2f8 100644
--- a/metadata/md5-cache/dev-python/python-ctags-1.5.0
+++ b/metadata/md5-cache/dev-python/python-ctags-1.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ctags3/python-ctags3-1.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=41fd0bcdee819cdd2c68494d3478ff2b
diff --git a/metadata/md5-cache/dev-python/python-daemon-2.2.4 b/metadata/md5-cache/dev-python/python-daemon-2.2.4
index fb414b69e601..07a156c4893e 100644
--- a/metadata/md5-cache/dev-python/python-daemon-2.2.4
+++ b/metadata/md5-cache/dev-python/python-daemon-2.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-daemon/python-daemon-2.2.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0bdb37946b8ef2e34cb13bdfb10ac086
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.8.1-r2 b/metadata/md5-cache/dev-python/python-dateutil-2.8.1-r2
index 7f90e56fdb71..3f206765be52 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.8.1-r2
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.8.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.8.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e06d630a5d2dd9bcbb374cf3eda14c64
diff --git a/metadata/md5-cache/dev-python/python-debian-0.1.37 b/metadata/md5-cache/dev-python/python-debian-0.1.37
index a38c527801ee..279ce6f2123f 100644
--- a/metadata/md5-cache/dev-python/python-debian-0.1.37
+++ b/metadata/md5-cache/dev-python/python-debian-0.1.37
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/python-debian/python-debian_0.1.37.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ccfe9159cc472ee2c8f5a8a6b919de4d
diff --git a/metadata/md5-cache/dev-python/python-designateclient-4.1.0 b/metadata/md5-cache/dev-python/python-designateclient-4.1.0
index 3e57b133d876..e3182e05e179 100644
--- a/metadata/md5-cache/dev-python/python-designateclient-4.1.0
+++ b/metadata/md5-cache/dev-python/python-designateclient-4.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-designateclient/python-designateclient-4.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=441e8c159aab5ee7e7f5cf3e6551821f
diff --git a/metadata/md5-cache/dev-python/python-discid-1.2.0 b/metadata/md5-cache/dev-python/python-discid-1.2.0
index 931772b7dd03..5e42ccbb5a8a 100644
--- a/metadata/md5-cache/dev-python/python-discid-1.2.0
+++ b/metadata/md5-cache/dev-python/python-discid-1.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/libdiscid-0.2.2 python_targets_python3_6? ( dev-lang/python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/JonnyJD/python-discid/archive/v1.2.0.tar.gz -> python-discid-1.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f6d9a1c98ba8761114e1c285b6b253fa
diff --git a/metadata/md5-cache/dev-python/python-distutils-extra-2.45 b/metadata/md5-cache/dev-python/python-distutils-extra-2.45
index fcc8940a14d2..377da2dd2f39 100644
--- a/metadata/md5-cache/dev-python/python-distutils-extra-2.45
+++ b/metadata/md5-cache/dev-python/python-distutils-extra-2.45
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://salsa.debian.org/python-team/modules/python-distutils-extra/-/archive/2.45/python-distutils-extra-2.45.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ace818e8936a71f916066fd01b445eed
diff --git a/metadata/md5-cache/dev-python/python-dotenv-0.14.0 b/metadata/md5-cache/dev-python/python-dotenv-0.14.0
index 477a09e32f22..42c6e9b126e5 100644
--- a/metadata/md5-cache/dev-python/python-dotenv-0.14.0
+++ b/metadata/md5-cache/dev-python/python-dotenv-0.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dotenv/python-dotenv-0.14.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=04cf3e2ce374112ac76d6c721e04e1b3
diff --git a/metadata/md5-cache/dev-python/python-dotenv-0.15.0 b/metadata/md5-cache/dev-python/python-dotenv-0.15.0
index 4c8109136d0a..b6afc7f4ccae 100644
--- a/metadata/md5-cache/dev-python/python-dotenv-0.15.0
+++ b/metadata/md5-cache/dev-python/python-dotenv-0.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dotenv/python-dotenv-0.15.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=642170586ade81c7af639bc6535f03d6
diff --git a/metadata/md5-cache/dev-python/python-editor-1.0.4-r1 b/metadata/md5-cache/dev-python/python-editor-1.0.4-r1
index 54b8b83f64ee..d68c4e142368 100644
--- a/metadata/md5-cache/dev-python/python-editor-1.0.4-r1
+++ b/metadata/md5-cache/dev-python/python-editor-1.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-editor/python-editor-1.0.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dc4ac614c9023e11b16bb795d14dcbc9
diff --git a/metadata/md5-cache/dev-python/python-efl-1.25.0 b/metadata/md5-cache/dev-python/python-efl-1.25.0
index d2f4775671fa..fd0c14496da5 100644
--- a/metadata/md5-cache/dev-python/python-efl-1.25.0
+++ b/metadata/md5-cache/dev-python/python-efl-1.25.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/bindings/python/python-efl-1.25.0.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=26da2afddd24550b88124b44e7e4dc6d
diff --git a/metadata/md5-cache/dev-python/python-email-validator-1.1.1 b/metadata/md5-cache/dev-python/python-email-validator-1.1.1
index b64c0bb84050..a528a29ffbad 100644
--- a/metadata/md5-cache/dev-python/python-email-validator-1.1.1
+++ b/metadata/md5-cache/dev-python/python-email-validator-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JoshData/python-email-validator/archive/v1.1.1.tar.gz -> python-email-validator-1.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f6ea5043186282a5cbfe23963702ee8e
diff --git a/metadata/md5-cache/dev-python/python-email-validator-1.1.2 b/metadata/md5-cache/dev-python/python-email-validator-1.1.2
index bd30f63b87a7..39c862f5595b 100644
--- a/metadata/md5-cache/dev-python/python-email-validator-1.1.2
+++ b/metadata/md5-cache/dev-python/python-email-validator-1.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JoshData/python-email-validator/archive/v1.1.2.tar.gz -> python-email-validator-1.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0c3f34bc32a2126d7c427fa02624b183
diff --git a/metadata/md5-cache/dev-python/python-engineio-3.12.1 b/metadata/md5-cache/dev-python/python-engineio-3.12.1
index 522cd94a27b9..f17ce6238e87 100644
--- a/metadata/md5-cache/dev-python/python-engineio-3.12.1
+++ b/metadata/md5-cache/dev-python/python-engineio-3.12.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-engineio/python-engineio-3.12.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0beb3ead8a7a04becf9c166b6082eebe
diff --git a/metadata/md5-cache/dev-python/python-etcd-0.4.5-r1 b/metadata/md5-cache/dev-python/python-etcd-0.4.5-r1
index eb196132a1cc..adca28464e10 100644
--- a/metadata/md5-cache/dev-python/python-etcd-0.4.5-r1
+++ b/metadata/md5-cache/dev-python/python-etcd-0.4.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-etcd/python-etcd-0.4.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3cf1130603a3819aa6fc7ec50533868a
diff --git a/metadata/md5-cache/dev-python/python-ethtool-0.14 b/metadata/md5-cache/dev-python/python-ethtool-0.14
index b341dff42474..6191d159e86d 100644
--- a/metadata/md5-cache/dev-python/python-ethtool-0.14
+++ b/metadata/md5-cache/dev-python/python-ethtool-0.14
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libnl:3 python_targets_python3_6? ( dev-lang/python:3.6 ) pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/fedora-python/python-ethtool/archive/v0.14.tar.gz -> python-ethtool-0.14.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bbd7c73695cc46d9e8a6433f22fa20dd
diff --git a/metadata/md5-cache/dev-python/python-evdev-1.3.0 b/metadata/md5-cache/dev-python/python-evdev-1.3.0
index 4f38dfc0c7dd..f751582e611d 100644
--- a/metadata/md5-cache/dev-python/python-evdev-1.3.0
+++ b/metadata/md5-cache/dev-python/python-evdev-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gvalkov/python-evdev/archive/v1.3.0.tar.gz -> python-evdev-1.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=376b654110b372fdf8d7cb51a9197cec
diff --git a/metadata/md5-cache/dev-python/python-fastimport-0.9.8-r1 b/metadata/md5-cache/dev-python/python-fastimport-0.9.8-r1
index c047d65847d4..37f78367395c 100644
--- a/metadata/md5-cache/dev-python/python-fastimport-0.9.8-r1
+++ b/metadata/md5-cache/dev-python/python-fastimport-0.9.8-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fastimport/fastimport-0.9.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d6da54b471b69be777d2b77ed9d9cbba
diff --git a/metadata/md5-cache/dev-python/python-gammu-2.11 b/metadata/md5-cache/dev-python/python-gammu-2.11
index dda54f1b9293..7280da5e2443 100644
--- a/metadata/md5-cache/dev-python/python-gammu-2.11
+++ b/metadata/md5-cache/dev-python/python-gammu-2.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gammu/python-gammu-2.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d50c30b6670304355b3d100c2cf90f1f
diff --git a/metadata/md5-cache/dev-python/python-gflags-3.1.2-r1 b/metadata/md5-cache/dev-python/python-gflags-3.1.2-r1
index fb0d294f6eb1..4bc3f192c4a1 100644
--- a/metadata/md5-cache/dev-python/python-gflags-3.1.2-r1
+++ b/metadata/md5-cache/dev-python/python-gflags-3.1.2-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gflags/python-gflags-3.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fc240b4a44e1ea3cdbe54f4c5d1e1c09
diff --git a/metadata/md5-cache/dev-python/python-glanceclient-3.2.2 b/metadata/md5-cache/dev-python/python-glanceclient-3.2.2
index 9ef550b39a77..bd411a8a01ef 100644
--- a/metadata/md5-cache/dev-python/python-glanceclient-3.2.2
+++ b/metadata/md5-cache/dev-python/python-glanceclient-3.2.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-glanceclient/python-glanceclient-3.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=178661d792532c8f99bca772e6362524
diff --git a/metadata/md5-cache/dev-python/python-gnupg-0.4.6 b/metadata/md5-cache/dev-python/python-gnupg-0.4.6
index 019166581217..521adde23ae2 100644
--- a/metadata/md5-cache/dev-python/python-gnupg-0.4.6
+++ b/metadata/md5-cache/dev-python/python-gnupg-0.4.6
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/gnupg python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) py
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gnupg/python-gnupg-0.4.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4199934a85a2369f4d178b1dee1bd08c
diff --git a/metadata/md5-cache/dev-python/python-heatclient-2.2.1 b/metadata/md5-cache/dev-python/python-heatclient-2.2.1
index ac15301c26a6..648d933886db 100644
--- a/metadata/md5-cache/dev-python/python-heatclient-2.2.1
+++ b/metadata/md5-cache/dev-python/python-heatclient-2.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-heatclient/python-heatclient-2.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=650e125f035e1f30b31aa835b1c6afb6
diff --git a/metadata/md5-cache/dev-python/python-iptables-1.0.0-r1 b/metadata/md5-cache/dev-python/python-iptables-1.0.0-r1
index 4cfb3750dbd7..576703118b6f 100644
--- a/metadata/md5-cache/dev-python/python-iptables-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/python-iptables-1.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-iptables/python-iptables-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c6e70a19ecf52f7b0515ba0efba7f75d
diff --git a/metadata/md5-cache/dev-python/python-ironicclient-4.1.0 b/metadata/md5-cache/dev-python/python-ironicclient-4.1.0
index 3b77e0e4da2a..15eb9594a15d 100644
--- a/metadata/md5-cache/dev-python/python-ironicclient-4.1.0
+++ b/metadata/md5-cache/dev-python/python-ironicclient-4.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ironicclient/python-ironicclient-4.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7f60e751785af067d9def0cfdbed6279
diff --git a/metadata/md5-cache/dev-python/python-ironicclient-4.4.0 b/metadata/md5-cache/dev-python/python-ironicclient-4.4.0
index c83bc2b1cd30..dbd42152e495 100644
--- a/metadata/md5-cache/dev-python/python-ironicclient-4.4.0
+++ b/metadata/md5-cache/dev-python/python-ironicclient-4.4.0
@@ -5,11 +5,11 @@ DESCRIPTION=Python bindings for the Ironic API
 EAPI=7
 HOMEPAGE=https://www.openstack.org/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/appdirs-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cliff-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/cliff-2.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/dogpile-cache-0.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/openstacksdk-0.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/osc-lib-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyyaml-3.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ironicclient/python-ironicclient-4.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6318e7e9fa1cbb20037ea1eef1eaff9e
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2e2491123721dbc54a5b2a2da29b8381
diff --git a/metadata/md5-cache/dev-python/python-jose-3.2.0-r1 b/metadata/md5-cache/dev-python/python-jose-3.2.0-r1
index cc8ddc450ee7..9c2934d0fef4 100644
--- a/metadata/md5-cache/dev-python/python-jose-3.2.0-r1
+++ b/metadata/md5-cache/dev-python/python-jose-3.2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mpdavis/python-jose/archive/3.2.0.tar.gz -> python-jose-3.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b82fb71c5136a40ba3bca0e9c25966d6
diff --git a/metadata/md5-cache/dev-python/python-jsonrpc-server-0.3.4 b/metadata/md5-cache/dev-python/python-jsonrpc-server-0.3.4
index 2710520ca9db..b8fd2aa9fb9c 100644
--- a/metadata/md5-cache/dev-python/python-jsonrpc-server-0.3.4
+++ b/metadata/md5-cache/dev-python/python-jsonrpc-server-0.3.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-jsonrpc-server/python-jsonrpc-server-0.3.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c44903d0e7c03370dfa90369d5e3203e
diff --git a/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1 b/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1
index 1305eb0b76fa..f6eb324d23f1 100644
--- a/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-jsonrpc-server/python-jsonrpc-server-0.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2db22ec49ef6ae9fc84b747e75681917
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-4.1.1 b/metadata/md5-cache/dev-python/python-keystoneclient-4.1.1
index 1da980e1e09a..ca86f9225da3 100644
--- a/metadata/md5-cache/dev-python/python-keystoneclient-4.1.1
+++ b/metadata/md5-cache/dev-python/python-keystoneclient-4.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-keystoneclient/python-keystoneclient-4.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b375fb9f575691caa9d73ba83afa9a95
diff --git a/metadata/md5-cache/dev-python/python-language-server-0.34.1 b/metadata/md5-cache/dev-python/python-language-server-0.34.1
index 6a324c8599f8..e5d294874717 100644
--- a/metadata/md5-cache/dev-python/python-language-server-0.34.1
+++ b/metadata/md5-cache/dev-python/python-language-server-0.34.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-language-server/python-language-server-0.34.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=afa6edc380910f780724075e2e5a442f
diff --git a/metadata/md5-cache/dev-python/python-language-server-0.35.1-r1 b/metadata/md5-cache/dev-python/python-language-server-0.35.1-r1
index 9540b423bfe7..f1b96e3cd594 100644
--- a/metadata/md5-cache/dev-python/python-language-server-0.35.1-r1
+++ b/metadata/md5-cache/dev-python/python-language-server-0.35.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-language-server/python-language-server-0.35.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1470c83c8383687ffe14ef3d9b69990a
diff --git a/metadata/md5-cache/dev-python/python-language-server-0.36.1 b/metadata/md5-cache/dev-python/python-language-server-0.36.1
index 5e1e85357dbb..3e0ffa2746f0 100644
--- a/metadata/md5-cache/dev-python/python-language-server-0.36.1
+++ b/metadata/md5-cache/dev-python/python-language-server-0.36.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-language-server/python-language-server-0.36.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d8f571b28beaba16e8e36c833730b08e
diff --git a/metadata/md5-cache/dev-python/python-ldap-3.3.1 b/metadata/md5-cache/dev-python/python-ldap-3.3.1
index 326839da1fb9..e11efc7d04d1 100644
--- a/metadata/md5-cache/dev-python/python-ldap-3.3.1
+++ b/metadata/md5-cache/dev-python/python-ldap-3.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ldap/python-ldap-3.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fe02090a36d41aaffd24ae79558b2af0
diff --git a/metadata/md5-cache/dev-python/python-ldap-9999 b/metadata/md5-cache/dev-python/python-ldap-9999
index e6477dc4e88d..7ca5684e0ffa 100644
--- a/metadata/md5-cache/dev-python/python-ldap-9999
+++ b/metadata/md5-cache/dev-python/python-ldap-9999
@@ -10,5 +10,5 @@ RDEPEND=!dev-python/pyldap >=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,py
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d4aff74f867c2409b3c72b936acf7c36
diff --git a/metadata/md5-cache/dev-python/python-levenshtein-0.12.0 b/metadata/md5-cache/dev-python/python-levenshtein-0.12.0
index d5f6396f9a65..6a53018bc23f 100644
--- a/metadata/md5-cache/dev-python/python-levenshtein-0.12.0
+++ b/metadata/md5-cache/dev-python/python-levenshtein-0.12.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-Levenshtein/python-Levenshtein-0.12.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=317fa851cb46058e734b85ad3a842d7e
diff --git a/metadata/md5-cache/dev-python/python-lhafile-0.2.2 b/metadata/md5-cache/dev-python/python-lhafile-0.2.2
index 024e2cd62f80..c44e2c9cbfbf 100644
--- a/metadata/md5-cache/dev-python/python-lhafile-0.2.2
+++ b/metadata/md5-cache/dev-python/python-lhafile-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/FrodeSolheim/python-lhafile/archive/v0.2.2.tar.gz -> python-lhafile-0.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=62bc97deaefa5b8e80871fbf22879c6f
diff --git a/metadata/md5-cache/dev-python/python-libevdev-0.8 b/metadata/md5-cache/dev-python/python-libevdev-0.8
index d8a37b6eaa28..ade5980cb2c1 100644
--- a/metadata/md5-cache/dev-python/python-libevdev-0.8
+++ b/metadata/md5-cache/dev-python/python-libevdev-0.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/libevdev/python-libevdev/-/archive/0.8/python-libevdev-0.8.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f327eb29495ad43811842dbc1235ad79
diff --git a/metadata/md5-cache/dev-python/python-linux-procfs-0.6.1 b/metadata/md5-cache/dev-python/python-linux-procfs-0.6.1
index 095ab90cab24..9de935551a80 100644
--- a/metadata/md5-cache/dev-python/python-linux-procfs-0.6.1
+++ b/metadata/md5-cache/dev-python/python-linux-procfs-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://cdn.kernel.org/pub/software/libs/python/python-linux-procfs/python-linux-procfs-0.6.1.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0675dbf5d990287289acb5daf05454b2
diff --git a/metadata/md5-cache/dev-python/python-ly-0.9.6 b/metadata/md5-cache/dev-python/python-ly-0.9.6
index 03d130c947ff..6a99392f1b7a 100644
--- a/metadata/md5-cache/dev-python/python-ly-0.9.6
+++ b/metadata/md5-cache/dev-python/python-ly-0.9.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ly/python-ly-0.9.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=79aaf2cfcb4eab96cb7b56a168f77f38
diff --git a/metadata/md5-cache/dev-python/python-lzo-1.12-r1 b/metadata/md5-cache/dev-python/python-lzo-1.12-r1
index 6c2655d68b77..c59b52400e50 100644
--- a/metadata/md5-cache/dev-python/python-lzo-1.12-r1
+++ b/metadata/md5-cache/dev-python/python-lzo-1.12-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-lzo/python-lzo-1.12.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a9409bb6e8db7036b241d7241380ada2
diff --git a/metadata/md5-cache/dev-python/python-magic-0.4.18 b/metadata/md5-cache/dev-python/python-magic-0.4.18
index fe726be2332e..97435e3eccbb 100644
--- a/metadata/md5-cache/dev-python/python-magic-0.4.18
+++ b/metadata/md5-cache/dev-python/python-magic-0.4.18
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ahupp/python-magic/archive/0.4.18.tar.gz -> python-magic-0.4.18.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=98963bbd869b772e6f2fb802063482cf
diff --git a/metadata/md5-cache/dev-python/python-magnumclient-3.2.1 b/metadata/md5-cache/dev-python/python-magnumclient-3.2.1
index 20da5e2968f6..92ac6fecd299 100644
--- a/metadata/md5-cache/dev-python/python-magnumclient-3.2.1
+++ b/metadata/md5-cache/dev-python/python-magnumclient-3.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-magnumclient/python-magnumclient-3.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=25de28b51ec72ad459ed3b79ce9226ce
diff --git a/metadata/md5-cache/dev-python/python-manilaclient-2.3.0 b/metadata/md5-cache/dev-python/python-manilaclient-2.3.0
index 75778607047f..23d800a124fc 100644
--- a/metadata/md5-cache/dev-python/python-manilaclient-2.3.0
+++ b/metadata/md5-cache/dev-python/python-manilaclient-2.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-manilaclient/python-manilaclient-2.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=aadc5322f26353fefb04123d49575d24
diff --git a/metadata/md5-cache/dev-python/python-markdown-math-0.7 b/metadata/md5-cache/dev-python/python-markdown-math-0.7
index 1de020fc71b8..823f96f4ce86 100644
--- a/metadata/md5-cache/dev-python/python-markdown-math-0.7
+++ b/metadata/md5-cache/dev-python/python-markdown-math-0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-markdown-math/python-markdown-math-0.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=21ef870fd54a966a61fd1296e11dc102
diff --git a/metadata/md5-cache/dev-python/python-memcached-1.59-r1 b/metadata/md5-cache/dev-python/python-memcached-1.59-r1
index 2c47cfc0f1e6..a9676f753da3 100644
--- a/metadata/md5-cache/dev-python/python-memcached-1.59-r1
+++ b/metadata/md5-cache/dev-python/python-memcached-1.59-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/linsomniac/python-memcached/archive/1.59.tar.gz -> python-memcached-1.59-gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=732080c1f68ee6c6092fbe5d011cf12f
diff --git a/metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r3 b/metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r3
index a7b4376da6ca..c4e39f7c3b50 100644
--- a/metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r3
+++ b/metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Basic functions for handling mime-types in python
 EAPI=7
 HOMEPAGE=https://github.com/dbtsai/python-mimeparse
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-mimeparse/python-mimeparse-1.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f2f403ee8f963763c2d41f44871e62e4
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cc27ef71c93c8158d955583ee430953d
diff --git a/metadata/md5-cache/dev-python/python-mistralclient-4.1.1 b/metadata/md5-cache/dev-python/python-mistralclient-4.1.1
index c1116d0d70e3..197b31b93530 100644
--- a/metadata/md5-cache/dev-python/python-mistralclient-4.1.1
+++ b/metadata/md5-cache/dev-python/python-mistralclient-4.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-mistralclient/python-mistralclient-4.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=af11fdc7ff7ab9e5a706cd81176e3615
diff --git a/metadata/md5-cache/dev-python/python-monascaclient-2.2.1 b/metadata/md5-cache/dev-python/python-monascaclient-2.2.1
index 6dc4547da01a..9656ace9b42e 100644
--- a/metadata/md5-cache/dev-python/python-monascaclient-2.2.1
+++ b/metadata/md5-cache/dev-python/python-monascaclient-2.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-monascaclient/python-monascaclient-2.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9974ce7a4be12d0d7d164799c2220aeb
diff --git a/metadata/md5-cache/dev-python/python-mpd-1.1.0-r1 b/metadata/md5-cache/dev-python/python-mpd-1.1.0-r1
index 1ad5c0536d60..546275dcdbd6 100644
--- a/metadata/md5-cache/dev-python/python-mpd-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/python-mpd-1.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( twisted ) || ( python_targets_python3_6 python_targets_pyth
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Mic92/python-mpd2/archive/v1.1.0.tar.gz -> python-mpd-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=647ed47f3063de80164f14d4a410ace6
diff --git a/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.7.1 b/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.7.1
index f401ade1a9fb..2c4559c1d9a9 100644
--- a/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.7.1
+++ b/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/alastair/python-musicbrainzngs/archive/v0.7.1.tar.gz -> python-musicbrainzngs0.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4c25a4284415d784def0f2d9834f61c4
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-1.0.2 b/metadata/md5-cache/dev-python/python-nbxmpp-1.0.2
index a4c84c707b28..5678137f2c48 100644
--- a/metadata/md5-cache/dev-python/python-nbxmpp-1.0.2
+++ b/metadata/md5-cache/dev-python/python-nbxmpp-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-1.0.2/python-nbxmpp-nbxmpp-1.0.2.tar.bz2 -> python-nbxmpp-1.0.2.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=f4c06073c012acc8c698db909758031a
diff --git a/metadata/md5-cache/dev-python/python-netlink-0.1 b/metadata/md5-cache/dev-python/python-netlink-0.1
index ea17326e643b..e26630968fd8 100644
--- a/metadata/md5-cache/dev-python/python-netlink-0.1
+++ b/metadata/md5-cache/dev-python/python-netlink-0.1
@@ -10,5 +10,5 @@ RDEPEND=!dev-libs/libnl[python] python_targets_python3_6? ( dev-lang/python:3.6
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/N/NetLink/NetLink-0.1.tar.gz -> python-netlink-0.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e2b08d29bda0373351f99ebec8a3a05a
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-6.12.1 b/metadata/md5-cache/dev-python/python-neutronclient-6.12.1
index 16fd14b22644..a14561f5ea76 100644
--- a/metadata/md5-cache/dev-python/python-neutronclient-6.12.1
+++ b/metadata/md5-cache/dev-python/python-neutronclient-6.12.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-6.12.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1c55a5227ed8f3ee09157b92a31fbe94
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-7.2.1 b/metadata/md5-cache/dev-python/python-neutronclient-7.2.1
index 12f221ecd752..577f6dd2ad44 100644
--- a/metadata/md5-cache/dev-python/python-neutronclient-7.2.1
+++ b/metadata/md5-cache/dev-python/python-neutronclient-7.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-7.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b8518ede673c4f25026b0affa292fc65
diff --git a/metadata/md5-cache/dev-python/python-novaclient-17.0.0 b/metadata/md5-cache/dev-python/python-novaclient-17.0.0
index 1de930fc3742..b86cb5863e68 100644
--- a/metadata/md5-cache/dev-python/python-novaclient-17.0.0
+++ b/metadata/md5-cache/dev-python/python-novaclient-17.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/keystoneauth-3.5.0[python_targets_python3_6(-)?,python_targ
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-17.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dd562890b1237fa09d568b2f36d2c1ff
diff --git a/metadata/md5-cache/dev-python/python-novaclient-17.2.1 b/metadata/md5-cache/dev-python/python-novaclient-17.2.1
index f5d9abbadc9e..5ccce1e0749c 100644
--- a/metadata/md5-cache/dev-python/python-novaclient-17.2.1
+++ b/metadata/md5-cache/dev-python/python-novaclient-17.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/keystoneauth-3.5.0[python_targets_python3_7(-)?,python_targ
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-17.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d0d6966af13b62a9a8477c20777c7d4f
diff --git a/metadata/md5-cache/dev-python/python-octaviaclient-2.2.0 b/metadata/md5-cache/dev-python/python-octaviaclient-2.2.0
index 13c6e560f6a5..0d726231f48c 100644
--- a/metadata/md5-cache/dev-python/python-octaviaclient-2.2.0
+++ b/metadata/md5-cache/dev-python/python-octaviaclient-2.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-octaviaclient/python-octaviaclient-2.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1674b98c1e787a97a3e6ceea1368d559
diff --git a/metadata/md5-cache/dev-python/python-openstackclient-5.2.1 b/metadata/md5-cache/dev-python/python-openstackclient-5.2.1
index 9f9f89648f78..27b6282e1fa2 100644
--- a/metadata/md5-cache/dev-python/python-openstackclient-5.2.1
+++ b/metadata/md5-cache/dev-python/python-openstackclient-5.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-openstackclient/python-openstackclient-5.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=82b57e9695ade54d45d0e42fb4de6078
diff --git a/metadata/md5-cache/dev-python/python-openstackclient-5.4.0 b/metadata/md5-cache/dev-python/python-openstackclient-5.4.0
index 538c399ec2d1..5faf9865cbb6 100644
--- a/metadata/md5-cache/dev-python/python-openstackclient-5.4.0
+++ b/metadata/md5-cache/dev-python/python-openstackclient-5.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-openstackclient/python-openstackclient-5.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e705c39f1919f837d314e3ed49b3133b
diff --git a/metadata/md5-cache/dev-python/python-podman-1.6.0 b/metadata/md5-cache/dev-python/python-podman-1.6.0
index 00d2a236f41e..5e474ddab7fd 100644
--- a/metadata/md5-cache/dev-python/python-podman-1.6.0
+++ b/metadata/md5-cache/dev-python/python-podman-1.6.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/podman/podman-1.6.0.tar.gz -> python-podman-1.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9ed66bee8d0748f16c024f6ff41c3757
diff --git a/metadata/md5-cache/dev-python/python-poppler-qt5-0.75.0 b/metadata/md5-cache/dev-python/python-poppler-qt5-0.75.0
index a0b42cecd278..e1d585a73da9 100644
--- a/metadata/md5-cache/dev-python/python-poppler-qt5-0.75.0
+++ b/metadata/md5-cache/dev-python/python-poppler-qt5-0.75.0
@@ -11,5 +11,5 @@ RDEPEND=app-text/poppler[qt5] dev-python/PyQt5[python_targets_python3_6(-)?,pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/frescobaldi/python-poppler-qt5/archive/v0.75.0.tar.gz -> python-poppler-qt5-0.75.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=270ccc7049d72b2707c1a94128aea9bb
diff --git a/metadata/md5-cache/dev-python/python-prctl-1.7 b/metadata/md5-cache/dev-python/python-prctl-1.7
index b0825ef1e8bd..dd6e41c7f7ec 100644
--- a/metadata/md5-cache/dev-python/python-prctl-1.7
+++ b/metadata/md5-cache/dev-python/python-prctl-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/libcap python_targets_python3_6? ( dev-lang/python:3.6 ) python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/seveas/python-prctl/archive/v1.7.tar.gz -> python-prctl-1.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=32c53c1860f9d477960faa316f54ab95
diff --git a/metadata/md5-cache/dev-python/python-redmine-2.3.0 b/metadata/md5-cache/dev-python/python-redmine-2.3.0
index 795ebf6207f6..ee1f6e0d9006 100644
--- a/metadata/md5-cache/dev-python/python-redmine-2.3.0
+++ b/metadata/md5-cache/dev-python/python-redmine-2.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-redmine/python-redmine-2.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=93f333e3885564aa229a79077c842f7e
diff --git a/metadata/md5-cache/dev-python/python-saharaclient-3.2.1 b/metadata/md5-cache/dev-python/python-saharaclient-3.2.1
index 6d7c9a826677..8c2a942b0d2b 100644
--- a/metadata/md5-cache/dev-python/python-saharaclient-3.2.1
+++ b/metadata/md5-cache/dev-python/python-saharaclient-3.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-saharaclient/python-saharaclient-3.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b997351d5fdfdd4bbb4ba623f401a066
diff --git a/metadata/md5-cache/dev-python/python-senlinclient-2.1.1 b/metadata/md5-cache/dev-python/python-senlinclient-2.1.1
index 7b58ca4e4f47..489fffa85d8d 100644
--- a/metadata/md5-cache/dev-python/python-senlinclient-2.1.1
+++ b/metadata/md5-cache/dev-python/python-senlinclient-2.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.1.1[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-senlinclient/python-senlinclient-2.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=773d92d6bee396235391827bcae412d5
diff --git a/metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r2 b/metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r2
index 5792b714f173..6f7b9ab5a9fb 100644
--- a/metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r2
+++ b/metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/RPi-Distro/python-sense-hat/archive/v2.2.0.tar.gz -> python-sense-hat-2.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=95e9897e3872a6633aed72b19c397771
diff --git a/metadata/md5-cache/dev-python/python-slip-0.6.5 b/metadata/md5-cache/dev-python/python-slip-0.6.5
index d5d54e013ece..018fea459148 100644
--- a/metadata/md5-cache/dev-python/python-slip-0.6.5
+++ b/metadata/md5-cache/dev-python/python-slip-0.6.5
@@ -10,5 +10,5 @@ RDEPEND=dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/nphilipp/python-slip/releases/download/python-slip-0.6.5/python-slip-0.6.5.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b6141e2898b3ce12dfdece23c04ca044
diff --git a/metadata/md5-cache/dev-python/python-slugify-1.2.6 b/metadata/md5-cache/dev-python/python-slugify-1.2.6
index 8ad4ba653a54..a9c57022c798 100644
--- a/metadata/md5-cache/dev-python/python-slugify-1.2.6
+++ b/metadata/md5-cache/dev-python/python-slugify-1.2.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/un33k/python-slugify/archive/1.2.6.tar.gz -> python-slugify-1.2.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d3ed74bfae88d6844e354101237ba735
diff --git a/metadata/md5-cache/dev-python/python-slugify-4.0.1 b/metadata/md5-cache/dev-python/python-slugify-4.0.1
index b2e1b63eae06..86b58145b8ad 100644
--- a/metadata/md5-cache/dev-python/python-slugify-4.0.1
+++ b/metadata/md5-cache/dev-python/python-slugify-4.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/un33k/python-slugify/archive/4.0.1.tar.gz -> python-slugify-4.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0bfe13aa62a399bcf0006e148056c5ab
diff --git a/metadata/md5-cache/dev-python/python-socks-1.1.0 b/metadata/md5-cache/dev-python/python-socks-1.1.0
index e0f77c8939ca..2942aab2b913 100644
--- a/metadata/md5-cache/dev-python/python-socks-1.1.0
+++ b/metadata/md5-cache/dev-python/python-socks-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/romis2012/python-socks/archive/v1.1.0.tar.gz -> python-socks-1.1.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4d0c7f3fe33523b9ebe93b76e794b7ab
diff --git a/metadata/md5-cache/dev-python/python-sshpubkeys-3.1.0 b/metadata/md5-cache/dev-python/python-sshpubkeys-3.1.0
index 9c2cd52d2d71..5679f683bded 100644
--- a/metadata/md5-cache/dev-python/python-sshpubkeys-3.1.0
+++ b/metadata/md5-cache/dev-python/python-sshpubkeys-3.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ojarva/python-sshpubkeys/archive/v3.1.0.tar.gz -> python-sshpubkeys-3.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=aa5f7bcd64909771f16a6ab5a78363b4
diff --git a/metadata/md5-cache/dev-python/python-stdnum-1.14 b/metadata/md5-cache/dev-python/python-stdnum-1.14
index 9fa0f565c545..c08227d19c60 100644
--- a/metadata/md5-cache/dev-python/python-stdnum-1.14
+++ b/metadata/md5-cache/dev-python/python-stdnum-1.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-stdnum/python-stdnum-1.14.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=eba351ad0c5b65a179e10e298d5506ea
diff --git a/metadata/md5-cache/dev-python/python-swiftclient-3.10.1 b/metadata/md5-cache/dev-python/python-swiftclient-3.10.1
index bd869b5142c4..32665dc40ca6 100644
--- a/metadata/md5-cache/dev-python/python-swiftclient-3.10.1
+++ b/metadata/md5-cache/dev-python/python-swiftclient-3.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-swiftclient/python-swiftclient-3.10.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b7b4d990f247e056145aa723ee91dccd
diff --git a/metadata/md5-cache/dev-python/python-systemd-234 b/metadata/md5-cache/dev-python/python-systemd-234
index d2490febefd0..fababe289db3 100644
--- a/metadata/md5-cache/dev-python/python-systemd-234
+++ b/metadata/md5-cache/dev-python/python-systemd-234
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/python-systemd/archive/v234.tar.gz -> python-systemd-234.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7194ae9a8b6918aeb79ea951c3abc0dd
diff --git a/metadata/md5-cache/dev-python/python-termstyle-0.1.10 b/metadata/md5-cache/dev-python/python-termstyle-0.1.10
index b890af5ed444..540d6d001f28 100644
--- a/metadata/md5-cache/dev-python/python-termstyle-0.1.10
+++ b/metadata/md5-cache/dev-python/python-termstyle-0.1.10
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/gfxmonk/termstyle/archive/0.1.10.tar.gz -> python-termstyle-0.1.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0c8dbadf0c258a8eaac8d6511a7ea5e7
diff --git a/metadata/md5-cache/dev-python/python-troveclient-5.1.1 b/metadata/md5-cache/dev-python/python-troveclient-5.1.1
index 624228534c89..29c04f339a0b 100644
--- a/metadata/md5-cache/dev-python/python-troveclient-5.1.1
+++ b/metadata/md5-cache/dev-python/python-troveclient-5.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/prettytable-0.7.2[python_targets_python3_6(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-troveclient/python-troveclient-5.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=70020a64fed34d782fd3024f8e77c29d
diff --git a/metadata/md5-cache/dev-python/python-utils-2.3.0 b/metadata/md5-cache/dev-python/python-utils-2.3.0
index d6cc31bd2df0..70d24f3434aa 100644
--- a/metadata/md5-cache/dev-python/python-utils-2.3.0
+++ b/metadata/md5-cache/dev-python/python-utils-2.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-utils/python-utils-2.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=68571bb8190f70ec8e7cb65d1bc639f6
diff --git a/metadata/md5-cache/dev-python/python-varlink-30.3.0 b/metadata/md5-cache/dev-python/python-varlink-30.3.0
index 8dd6238da25f..a59f931b5b51 100644
--- a/metadata/md5-cache/dev-python/python-varlink-30.3.0
+++ b/metadata/md5-cache/dev-python/python-varlink-30.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/varlink/python/archive/30.3.0.tar.gz -> python-varlink-30.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=204dd55ad9083bc8b3cd81ec37829681
diff --git a/metadata/md5-cache/dev-python/python-vitrageclient-4.1.1 b/metadata/md5-cache/dev-python/python-vitrageclient-4.1.1
index 9c6bcbc02cd4..4cb39db07c41 100644
--- a/metadata/md5-cache/dev-python/python-vitrageclient-4.1.1
+++ b/metadata/md5-cache/dev-python/python-vitrageclient-4.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-3.1.1[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-vitrageclient/python-vitrageclient-4.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e51c171e570d9e9429bb38b25f94bf2d
diff --git a/metadata/md5-cache/dev-python/python-xlib-0.28 b/metadata/md5-cache/dev-python/python-xlib-0.28
index 6d8797a96d1b..d98b82a10ac4 100644
--- a/metadata/md5-cache/dev-python/python-xlib-0.28
+++ b/metadata/md5-cache/dev-python/python-xlib-0.28
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-xlib/python-xlib/releases/download/0.28/python-xlib-0.28.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=70625bfdd31e0bbf53187ddcb8fd416f
diff --git a/metadata/md5-cache/dev-python/python-xlib-0.29 b/metadata/md5-cache/dev-python/python-xlib-0.29
index d11899600fc8..1317afb488be 100644
--- a/metadata/md5-cache/dev-python/python-xlib-0.29
+++ b/metadata/md5-cache/dev-python/python-xlib-0.29
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-xlib/python-xlib/releases/download/0.29/python-xlib-0.29.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=6518731a79e154a73b2f599012118d49
diff --git a/metadata/md5-cache/dev-python/python-xmlsec-1.3.9 b/metadata/md5-cache/dev-python/python-xmlsec-1.3.9
index 3c0bbb4826eb..3d6fabab8102 100644
--- a/metadata/md5-cache/dev-python/python-xmlsec-1.3.9
+++ b/metadata/md5-cache/dev-python/python-xmlsec-1.3.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mehcode/python-xmlsec/archive/1.3.9.tar.gz -> python-xmlsec-1.3.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=931c3019ba52d49a0fb1258ea3e58b2e
diff --git a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1 b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1
index 1903c0a1c211..c6ff73b88c71 100644
--- a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1
+++ b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-xmp-toolkit/python-xmp-toolkit/archive/v2.0.1.tar.gz -> python-xmp-toolkit-2.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dde7b050b146cf9999f84fae47966295
diff --git a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r1 b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r1
new file mode 100644
index 000000000000..f80ae6ed7ee9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-libs/exempi )
+DESCRIPTION=Library for working with XMP metadata
+EAPI=7
+HOMEPAGE=https://github.com/python-xmp-toolkit/python-xmp-toolkit/ https://pypi.org/project/python-xmp-toolkit/
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-xmp-toolkit/python-xmp-toolkit/archive/v2.0.1.tar.gz -> python-xmp-toolkit-2.0.1.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=14371f43e65f320252f40fea75ac61d9
diff --git a/metadata/md5-cache/dev-python/python-zaqarclient-2.0.1 b/metadata/md5-cache/dev-python/python-zaqarclient-2.0.1
index d2064cf65408..02d6e970b0f2 100644
--- a/metadata/md5-cache/dev-python/python-zaqarclient-2.0.1
+++ b/metadata/md5-cache/dev-python/python-zaqarclient-2.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-zaqarclient/python-zaqarclient-2.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d1b4c42a985dfe1c0ea1daa3b839ac6b
diff --git a/metadata/md5-cache/dev-python/python-zipstream-1.1.4 b/metadata/md5-cache/dev-python/python-zipstream-1.1.4
index c59b0afc8c4b..9c360714c51f 100644
--- a/metadata/md5-cache/dev-python/python-zipstream-1.1.4
+++ b/metadata/md5-cache/dev-python/python-zipstream-1.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/allanlei/python-zipstream/archive/v1.1.4.tar.gz -> python-zipstream-1.1.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd25470f72bee4dd1cd28eed0bf5e888
diff --git a/metadata/md5-cache/dev-python/python-zunclient-4.1.1 b/metadata/md5-cache/dev-python/python-zunclient-4.1.1
index e5d9d7c83e75..9577b2dbe8e6 100644
--- a/metadata/md5-cache/dev-python/python-zunclient-4.1.1
+++ b/metadata/md5-cache/dev-python/python-zunclient-4.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/prettytable-0.7.1[python_targets_python3_7(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-zunclient/python-zunclient-4.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=00fa58226c79093dfb9565ec893b8711
diff --git a/metadata/md5-cache/dev-python/python3-lxc-3.0.4 b/metadata/md5-cache/dev-python/python3-lxc-3.0.4
index fe66b9d94579..55e0e44790fe 100644
--- a/metadata/md5-cache/dev-python/python3-lxc-3.0.4
+++ b/metadata/md5-cache/dev-python/python3-lxc-3.0.4
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/lxc python_targets_python3_6? ( dev-lang/python:3.6 ) pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/python3-lxc-3.0.4.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxc/python3-lxc-3.0.4.tar.gz.asc )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=5fdc105d20942df072c7d74ff912e2da
diff --git a/metadata/md5-cache/dev-python/python3-openid-3.2.0 b/metadata/md5-cache/dev-python/python3-openid-3.2.0
index 47c4733c339c..1f2ceb051c38 100644
--- a/metadata/md5-cache/dev-python/python3-openid-3.2.0
+++ b/metadata/md5-cache/dev-python/python3-openid-3.2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/defusedxml[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python3-openid/python3-openid-3.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d01f6aecd1a65c3b35686cf040137acb
diff --git a/metadata/md5-cache/dev-python/python3-saml-1.9.0 b/metadata/md5-cache/dev-python/python3-saml-1.9.0
index 970aeabb8b0d..1946500790f2 100644
--- a/metadata/md5-cache/dev-python/python3-saml-1.9.0
+++ b/metadata/md5-cache/dev-python/python3-saml-1.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/onelogin/python3-saml/archive/v1.9.0.tar.gz -> python3-saml-1.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1314a7f815cbf3ecb4c84a27a7dbb672
diff --git a/metadata/md5-cache/dev-python/pythondialog-3.5.1 b/metadata/md5-cache/dev-python/pythondialog-3.5.1
index 60601e857aeb..7039930e82a2 100644
--- a/metadata/md5-cache/dev-python/pythondialog-3.5.1
+++ b/metadata/md5-cache/dev-python/pythondialog-3.5.1
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) py
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pythondialog/3.5.1/python3-pythondialog-3.5.1.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b8619dd582d7d278a7376d05cf2b743c
diff --git a/metadata/md5-cache/dev-python/pythonz-bd-1.11.4 b/metadata/md5-cache/dev-python/pythonz-bd-1.11.4
index 039ea18ce211..22a83edb993a 100644
--- a/metadata/md5-cache/dev-python/pythonz-bd-1.11.4
+++ b/metadata/md5-cache/dev-python/pythonz-bd-1.11.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pythonz-bd/pythonz-bd-1.11.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=52793291434cc42b356bcff21b4b5be7
diff --git a/metadata/md5-cache/dev-python/pytidylib-0.3.2-r1 b/metadata/md5-cache/dev-python/pytidylib-0.3.2-r1
index d076095e24f8..4280d3527a62 100644
--- a/metadata/md5-cache/dev-python/pytidylib-0.3.2-r1
+++ b/metadata/md5-cache/dev-python/pytidylib-0.3.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytidylib/pytidylib-0.3.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=92aafe5267afea38848506a68fe00ffa
diff --git a/metadata/md5-cache/dev-python/pytoml-0.1.20 b/metadata/md5-cache/dev-python/pytoml-0.1.20
index f05fa84eccdf..552045a42e3b 100644
--- a/metadata/md5-cache/dev-python/pytoml-0.1.20
+++ b/metadata/md5-cache/dev-python/pytoml-0.1.20
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/avakar/pytoml/archive/v0.1.20.tar.gz -> pytoml-0.1.20.tar.gz test? ( https://github.com/avakar/toml-test/archive/b212790a6b7367489f389411bda009e5ff765f20.tar.gz -> toml-test-b212790a6b7367489f389411bda009e5ff765f20.tar.gz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1d8cf2310b18f45c0f8e0b496bf94c2f
diff --git a/metadata/md5-cache/dev-python/pytools-2020.4 b/metadata/md5-cache/dev-python/pytools-2020.4
index ff8ef406d5a6..e56065dd7d79 100644
--- a/metadata/md5-cache/dev-python/pytools-2020.4
+++ b/metadata/md5-cache/dev-python/pytools-2020.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytools/pytools-2020.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1b719d686637165ed1213204ac464c18
diff --git a/metadata/md5-cache/dev-python/pytools-9999 b/metadata/md5-cache/dev-python/pytools-9999
index 042340c2266b..dc64aac54e1a 100644
--- a/metadata/md5-cache/dev-python/pytools-9999
+++ b/metadata/md5-cache/dev-python/pytools-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/appdirs-1.4.0[python_targets_python3_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=875b0f72bc7aa9e27ac93824253b5ddf
diff --git a/metadata/md5-cache/dev-python/pytrie-0.4.0 b/metadata/md5-cache/dev-python/pytrie-0.4.0
index 230d607eda73..b0ed90c516a0 100644
--- a/metadata/md5-cache/dev-python/pytrie-0.4.0
+++ b/metadata/md5-cache/dev-python/pytrie-0.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyTrie/PyTrie-0.4.0.tar.gz -> pytrie-0.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=34dc56f1258ad04b01c531986f820ca7
diff --git a/metadata/md5-cache/dev-python/pytz-2020.1-r1 b/metadata/md5-cache/dev-python/pytz-2020.1-r1
index cefaa1b35e50..db77b72ac90e 100644
--- a/metadata/md5-cache/dev-python/pytz-2020.1-r1
+++ b/metadata/md5-cache/dev-python/pytz-2020.1-r1
@@ -11,5 +11,5 @@ RDEPEND=|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] ) python_tar
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytz/pytz-2020.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e23f1f80cf80fb4582843aece49a78f6
diff --git a/metadata/md5-cache/dev-python/pytz-2020.4 b/metadata/md5-cache/dev-python/pytz-2020.4
index 8c9ce9000517..ce2c7bcc9e05 100644
--- a/metadata/md5-cache/dev-python/pytz-2020.4
+++ b/metadata/md5-cache/dev-python/pytz-2020.4
@@ -11,5 +11,5 @@ RDEPEND=|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] ) python_tar
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytz/pytz-2020.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d2672d59df11e034799894966d06592e
diff --git a/metadata/md5-cache/dev-python/pyu2f-0.1.4-r1 b/metadata/md5-cache/dev-python/pyu2f-0.1.4-r1
index 228759ded4f4..30acf2c2005a 100644
--- a/metadata/md5-cache/dev-python/pyu2f-0.1.4-r1
+++ b/metadata/md5-cache/dev-python/pyu2f-0.1.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/pyu2f/archive/0.1.4.tar.gz -> pyu2f-0.1.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e951c55d7e3fb0f88da0c22d24f03b38
diff --git a/metadata/md5-cache/dev-python/pyudev-0.22.0 b/metadata/md5-cache/dev-python/pyudev-0.22.0
index 936889a06b07..bc96b63db05b 100644
--- a/metadata/md5-cache/dev-python/pyudev-0.22.0
+++ b/metadata/md5-cache/dev-python/pyudev-0.22.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyudev/pyudev-0.22.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c23e37a003edbd0c7fd0b3e0d653dc00
diff --git a/metadata/md5-cache/dev-python/pyusb-1.0.2-r1 b/metadata/md5-cache/dev-python/pyusb-1.0.2-r1
index 0565182c1c78..548c3967673f 100644
--- a/metadata/md5-cache/dev-python/pyusb-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/pyusb-1.0.2-r1
@@ -11,5 +11,5 @@ RDEPEND=virtual/libusb:= dev-python/setuptools[python_targets_python3_6(-)?,pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/walac/pyusb/archive/v1.0.2.tar.gz -> pyusb-1.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f437b5125490c6e12ff642ce40ebcdc7
diff --git a/metadata/md5-cache/dev-python/pyusb-1.1.0 b/metadata/md5-cache/dev-python/pyusb-1.1.0
new file mode 100644
index 000000000000..f175f0541c6e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyusb-1.1.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/libusb:=
+DESCRIPTION=USB support for Python
+EAPI=7
+HOMEPAGE=https://pyusb.github.io/pyusb/ https://pypi.org/project/pyusb/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=BSD
+RDEPEND=virtual/libusb:= python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyusb/pyusb-1.1.0.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f2b9d459dd03aedc79bd7caba1afd892
diff --git a/metadata/md5-cache/dev-python/pyvirtualdisplay-1.3.2 b/metadata/md5-cache/dev-python/pyvirtualdisplay-1.3.2
index 25c575eac72a..041d59f411ca 100644
--- a/metadata/md5-cache/dev-python/pyvirtualdisplay-1.3.2
+++ b/metadata/md5-cache/dev-python/pyvirtualdisplay-1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ponty/PyVirtualDisplay/archive/1.3.2.tar.gz -> pyvirtualdisplay-1.3.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=06caea6a77e1c040fb63d56fae26177b
diff --git a/metadata/md5-cache/dev-python/pywavelets-1.1.1 b/metadata/md5-cache/dev-python/pywavelets-1.1.1
index f413e97526ad..a4a189be71f9 100644
--- a/metadata/md5-cache/dev-python/pywavelets-1.1.1
+++ b/metadata/md5-cache/dev-python/pywavelets-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyWavelets/PyWavelets-1.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b94bcbdc5076242d6ea6cf798ae243ca
diff --git a/metadata/md5-cache/dev-python/pywinrm-0.4.1 b/metadata/md5-cache/dev-python/pywinrm-0.4.1
index f3245a705f4b..53b0df6c0776 100644
--- a/metadata/md5-cache/dev-python/pywinrm-0.4.1
+++ b/metadata/md5-cache/dev-python/pywinrm-0.4.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/xmltodict[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pywinrm/pywinrm-0.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=841ad5566f69442d885ae7323347f0d1
diff --git a/metadata/md5-cache/dev-python/pyx-0.15 b/metadata/md5-cache/dev-python/pyx-0.15
index 53d2e43337fc..223ae423f660 100644
--- a/metadata/md5-cache/dev-python/pyx-0.15
+++ b/metadata/md5-cache/dev-python/pyx-0.15
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyx-project/pyx/archive/0.15.tar.gz -> pyx-0.15.gh.tar.gz test? ( https://www.w3.org/Graphics/SVG/Test/20110816/archives/W3C_SVG_11_TestSuite.tar.gz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8b444d920d60e5bb9296282cac06549f
diff --git a/metadata/md5-cache/dev-python/pyxattr-0.7.1 b/metadata/md5-cache/dev-python/pyxattr-0.7.1
index 855116fbd0ed..69f65abfed61 100644
--- a/metadata/md5-cache/dev-python/pyxattr-0.7.1
+++ b/metadata/md5-cache/dev-python/pyxattr-0.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyxattr/pyxattr-0.7.1.tar.gz https://pyxattr.k1024.org/downloads/pyxattr-0.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bb42bb3a3b673cafaed66ba5cf35f73a
diff --git a/metadata/md5-cache/dev-python/pyxdg-0.26-r2 b/metadata/md5-cache/dev-python/pyxdg-0.26-r2
index 2ac0f4f23441..65910de2ed7d 100644
--- a/metadata/md5-cache/dev-python/pyxdg-0.26-r2
+++ b/metadata/md5-cache/dev-python/pyxdg-0.26-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/takluyver/pyxdg/archive/rel-0.26.tar.gz -> pyxdg-rel-0.26.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a7b8637627649ea69425a5405012aa3b
diff --git a/metadata/md5-cache/dev-python/pyyaml-5.3.1-r1 b/metadata/md5-cache/dev-python/pyyaml-5.3.1-r1
index 8d3d5b2b3156..6d1d2019fa57 100644
--- a/metadata/md5-cache/dev-python/pyyaml-5.3.1-r1
+++ b/metadata/md5-cache/dev-python/pyyaml-5.3.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yaml/pyyaml/archive/5.3.1.tar.gz -> pyyaml-5.3.1.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=23c46fab131481f32ae9bb0dd5e9ca7c
diff --git a/metadata/md5-cache/dev-python/pyzbar-0.1.8 b/metadata/md5-cache/dev-python/pyzbar-0.1.8
index 355b35f5c5bb..ac4e709b21f1 100644
--- a/metadata/md5-cache/dev-python/pyzbar-0.1.8
+++ b/metadata/md5-cache/dev-python/pyzbar-0.1.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/NaturalHistoryMuseum/pyzbar/archive/v0.1.8.tar.gz -> pyzbar-0.1.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3f1e23e6440e3862289e09ec34bb7580
diff --git a/metadata/md5-cache/dev-python/pyzmq-19.0.2 b/metadata/md5-cache/dev-python/pyzmq-19.0.2
index 6633eb078e5d..f39e44ee0b4b 100644
--- a/metadata/md5-cache/dev-python/pyzmq-19.0.2
+++ b/metadata/md5-cache/dev-python/pyzmq-19.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zeromq/pyzmq/archive/dd4dac055152d47c829034224cdecf594c7b3f12.tar.gz -> pyzmq-19.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=24d9b5d79f6c7b6a4fa5662569eb2881
diff --git a/metadata/md5-cache/dev-python/pyzmq-20.0.0 b/metadata/md5-cache/dev-python/pyzmq-20.0.0
index 2489305e90ca..e49b00a9ddc7 100644
--- a/metadata/md5-cache/dev-python/pyzmq-20.0.0
+++ b/metadata/md5-cache/dev-python/pyzmq-20.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zeromq/pyzmq/archive/v20.0.0.tar.gz -> pyzmq-20.0.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=016c4c3cbfe1678e447f9026b3312837
diff --git a/metadata/md5-cache/dev-python/qdarkstyle-2.8.1 b/metadata/md5-cache/dev-python/qdarkstyle-2.8.1
index 58f6d3e7f35b..e70820c5c6ac 100644
--- a/metadata/md5-cache/dev-python/qdarkstyle-2.8.1
+++ b/metadata/md5-cache/dev-python/qdarkstyle-2.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ColinDuquesnoy/QDarkStyleSheet/archive/v2.8.1.tar.gz -> qdarkstyle-2.8.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=975f772350fb11a0652a7bc3965e770b
diff --git a/metadata/md5-cache/dev-python/qrcode-6.1 b/metadata/md5-cache/dev-python/qrcode-6.1
index 26c2eb68a171..5b9cbb93317c 100644
--- a/metadata/md5-cache/dev-python/qrcode-6.1
+++ b/metadata/md5-cache/dev-python/qrcode-6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qrcode/qrcode-6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7c3ec2feea5089128eaf002c86e60bb6
diff --git a/metadata/md5-cache/dev-python/qtawesome-0.7.2 b/metadata/md5-cache/dev-python/qtawesome-0.7.2
index 18d6d80970f6..1e58b1e7a745 100644
--- a/metadata/md5-cache/dev-python/qtawesome-0.7.2
+++ b/metadata/md5-cache/dev-python/qtawesome-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/Q/QtAwesome/QtAwesome-0.7.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=4d42e774deea823d9402e39fcc9b65f0
diff --git a/metadata/md5-cache/dev-python/qtawesome-1.0.1 b/metadata/md5-cache/dev-python/qtawesome-1.0.1
index 590f9c38abc0..d781987e6101 100644
--- a/metadata/md5-cache/dev-python/qtawesome-1.0.1
+++ b/metadata/md5-cache/dev-python/qtawesome-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/Q/QtAwesome/QtAwesome-1.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=1f2e5a9c2e273abeb87eb27fec1755ea
diff --git a/metadata/md5-cache/dev-python/qtconsole-4.7.6 b/metadata/md5-cache/dev-python/qtconsole-4.7.6
index c8739c04ec34..225d35c05a24 100644
--- a/metadata/md5-cache/dev-python/qtconsole-4.7.6
+++ b/metadata/md5-cache/dev-python/qtconsole-4.7.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qtconsole/qtconsole-4.7.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4825f537b3f6bacec6e6e8fd8d4688be
diff --git a/metadata/md5-cache/dev-python/qtconsole-4.7.7 b/metadata/md5-cache/dev-python/qtconsole-4.7.7
index 367643872ecf..8693f6a3eb6e 100644
--- a/metadata/md5-cache/dev-python/qtconsole-4.7.7
+++ b/metadata/md5-cache/dev-python/qtconsole-4.7.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qtconsole/qtconsole-4.7.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3136857ae3877d28d02ac4cd6a143661
diff --git a/metadata/md5-cache/dev-python/qtconsole-5.0.0 b/metadata/md5-cache/dev-python/qtconsole-5.0.0
index 76ea98973814..d122e21273c3 100644
--- a/metadata/md5-cache/dev-python/qtconsole-5.0.0
+++ b/metadata/md5-cache/dev-python/qtconsole-5.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qtconsole/qtconsole-5.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=df5f10d9571869bc76baedb432939e65
diff --git a/metadata/md5-cache/dev-python/qtconsole-5.0.1 b/metadata/md5-cache/dev-python/qtconsole-5.0.1
index 5e1acb2e5094..67e688194faf 100644
--- a/metadata/md5-cache/dev-python/qtconsole-5.0.1
+++ b/metadata/md5-cache/dev-python/qtconsole-5.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qtconsole/qtconsole-5.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=df5f10d9571869bc76baedb432939e65
diff --git a/metadata/md5-cache/dev-python/qtsass-0.3.0 b/metadata/md5-cache/dev-python/qtsass-0.3.0
index af2acfa42282..aa7332373efe 100644
--- a/metadata/md5-cache/dev-python/qtsass-0.3.0
+++ b/metadata/md5-cache/dev-python/qtsass-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/qtsass/archive/v0.3.0.tar.gz -> qtsass-0.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=89e9dacd824be267527797ed0d43719f
diff --git a/metadata/md5-cache/dev-python/quantities-0.12.4 b/metadata/md5-cache/dev-python/quantities-0.12.4
index 32d83d944259..e9adab5c2187 100644
--- a/metadata/md5-cache/dev-python/quantities-0.12.4
+++ b/metadata/md5-cache/dev-python/quantities-0.12.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-quantities/python-quantities/archive/v0.12.4.tar.gz -> python-quantities-0.12.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a3c1bb893aff6c64dcc51b5250537507
diff --git a/metadata/md5-cache/dev-python/radon-4.1.0 b/metadata/md5-cache/dev-python/radon-4.1.0
index ebde8ab0e712..f53575decc15 100644
--- a/metadata/md5-cache/dev-python/radon-4.1.0
+++ b/metadata/md5-cache/dev-python/radon-4.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/radon/radon-4.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=30c9c33d78a7ad916403de06b4300433
diff --git a/metadata/md5-cache/dev-python/raet-0.6.8-r1 b/metadata/md5-cache/dev-python/raet-0.6.8-r1
index 2f59006454dd..1acfd62a1153 100644
--- a/metadata/md5-cache/dev-python/raet-0.6.8-r1
+++ b/metadata/md5-cache/dev-python/raet-0.6.8-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/raet/raet-0.6.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d64f5a822e08c338c808a0d93eb3669e
diff --git a/metadata/md5-cache/dev-python/random2-1.0.1-r1 b/metadata/md5-cache/dev-python/random2-1.0.1-r1
index fa51c3e5e671..6df4a1f7fd47 100644
--- a/metadata/md5-cache/dev-python/random2-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/random2-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/r/random2/random2-1.0.1.zip
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f51be67a3c27d2647a09383426e59f35
diff --git a/metadata/md5-cache/dev-python/rarfile-3.1 b/metadata/md5-cache/dev-python/rarfile-3.1
index 82cbfab53f69..b63a21117f7e 100644
--- a/metadata/md5-cache/dev-python/rarfile-3.1
+++ b/metadata/md5-cache/dev-python/rarfile-3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rarfile/rarfile-3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1da1ea8322a5c8046c5d1a770d5a87e4
diff --git a/metadata/md5-cache/dev-python/ratelimit-1.4.1 b/metadata/md5-cache/dev-python/ratelimit-1.4.1
index 9a55d13db9a9..08cda9341804 100644
--- a/metadata/md5-cache/dev-python/ratelimit-1.4.1
+++ b/metadata/md5-cache/dev-python/ratelimit-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tomasbasham/ratelimit/archive/v1.4.1.tar.gz -> ratelimit-1.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0e0ac56f2a4417a8493e1f11477b1b18
diff --git a/metadata/md5-cache/dev-python/rcssmin-1.0.6 b/metadata/md5-cache/dev-python/rcssmin-1.0.6
index 71912e70a558..afdb6ee8a077 100644
--- a/metadata/md5-cache/dev-python/rcssmin-1.0.6
+++ b/metadata/md5-cache/dev-python/rcssmin-1.0.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rcssmin/rcssmin-1.0.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f378c02479c4c039d668bdf8a172c006
diff --git a/metadata/md5-cache/dev-python/rdflib-5.0.0 b/metadata/md5-cache/dev-python/rdflib-5.0.0
index 4eb2a7a55a92..37f42d4238a8 100644
--- a/metadata/md5-cache/dev-python/rdflib-5.0.0
+++ b/metadata/md5-cache/dev-python/rdflib-5.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rdflib/rdflib-5.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b39aa164de26cde0192490d2cd7f54a8
diff --git a/metadata/md5-cache/dev-python/re-assert-1.1.0 b/metadata/md5-cache/dev-python/re-assert-1.1.0
index 8f3ae8c08185..a44b83fbba85 100644
--- a/metadata/md5-cache/dev-python/re-assert-1.1.0
+++ b/metadata/md5-cache/dev-python/re-assert-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asottile/re-assert/archive/v1.1.0.tar.gz -> re-assert-1.1.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=65bee92525a990f9de72f21b5dc4db2b
diff --git a/metadata/md5-cache/dev-python/readme_renderer-28.0 b/metadata/md5-cache/dev-python/readme_renderer-28.0
index e319e9e172c9..52a59c1f85c3 100644
--- a/metadata/md5-cache/dev-python/readme_renderer-28.0
+++ b/metadata/md5-cache/dev-python/readme_renderer-28.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/readme_renderer/readme_renderer-28.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=51e8d6d7232c0804e987ce92266b80fb
diff --git a/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.1 b/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.1
index 2e8578e9e705..d5ed78df423e 100644
--- a/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.1
+++ b/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=49044b267cf28a8046f8fb351568405b
diff --git a/metadata/md5-cache/dev-python/rebulk-2.0.1 b/metadata/md5-cache/dev-python/rebulk-2.0.1
index d8e05a827bc0..85aca5c42e26 100644
--- a/metadata/md5-cache/dev-python/rebulk-2.0.1
+++ b/metadata/md5-cache/dev-python/rebulk-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rebulk/rebulk-2.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d8296bb3c0564bbd72f50fe4a26c3b09
diff --git a/metadata/md5-cache/dev-python/recommonmark-0.6.0 b/metadata/md5-cache/dev-python/recommonmark-0.6.0
index afb2c90f4f47..1c9cf5eb5b87 100644
--- a/metadata/md5-cache/dev-python/recommonmark-0.6.0
+++ b/metadata/md5-cache/dev-python/recommonmark-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rtfd/recommonmark/archive/0.6.0.tar.gz -> recommonmark-0.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ba7d6f34c61d58edf5bc7062dc0e3884
diff --git a/metadata/md5-cache/dev-python/redis-py-3.3.11 b/metadata/md5-cache/dev-python/redis-py-3.3.11
index fa597025b017..597b62534574 100644
--- a/metadata/md5-cache/dev-python/redis-py-3.3.11
+++ b/metadata/md5-cache/dev-python/redis-py-3.3.11
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/redis/redis-3.3.11.tar.gz -> redis-py-3.3.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c455402afe77f1021693c758b2162550
diff --git a/metadata/md5-cache/dev-python/redis-py-3.5.3 b/metadata/md5-cache/dev-python/redis-py-3.5.3
index 1507438a2ff1..0c21157b9912 100644
--- a/metadata/md5-cache/dev-python/redis-py-3.5.3
+++ b/metadata/md5-cache/dev-python/redis-py-3.5.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/redis/redis-3.5.3.tar.gz -> redis-py-3.5.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=20da9126b13b30f6215919c34a4bccf1
diff --git a/metadata/md5-cache/dev-python/rednose-0.4.3 b/metadata/md5-cache/dev-python/rednose-0.4.3
index 00308f311b49..9b936595eb54 100644
--- a/metadata/md5-cache/dev-python/rednose-0.4.3
+++ b/metadata/md5-cache/dev-python/rednose-0.4.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rednose/rednose-0.4.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4ed4bc54e225d200bb2f91fdfe1fe37e
diff --git a/metadata/md5-cache/dev-python/reedsolomon-1.5.4 b/metadata/md5-cache/dev-python/reedsolomon-1.5.4
index d55b5d44dd13..10b1f6947beb 100644
--- a/metadata/md5-cache/dev-python/reedsolomon-1.5.4
+++ b/metadata/md5-cache/dev-python/reedsolomon-1.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tomerfiliba/reedsolomon/archive/v1.5.4.tar.gz -> reedsolomon-1.5.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a596bd3d291518bda79515735edb14a0
diff --git a/metadata/md5-cache/dev-python/reflink-0.2.1-r1 b/metadata/md5-cache/dev-python/reflink-0.2.1-r1
index 49059826a4f1..fd9ce7f14561 100644
--- a/metadata/md5-cache/dev-python/reflink-0.2.1-r1
+++ b/metadata/md5-cache/dev-python/reflink-0.2.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/reflink/reflink-0.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ab2d9963a9bcd7d0f4310006da0912ac
diff --git a/metadata/md5-cache/dev-python/regex-2020.4.4-r1 b/metadata/md5-cache/dev-python/regex-2020.4.4-r1
index 05f55b8f63e4..9b7bcaafef02 100644
--- a/metadata/md5-cache/dev-python/regex-2020.4.4-r1
+++ b/metadata/md5-cache/dev-python/regex-2020.4.4-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/r/regex/regex-2020.4.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=25feaadaa10066c00ca3e24ac794a0f2
diff --git a/metadata/md5-cache/dev-python/rencode-1.0.6 b/metadata/md5-cache/dev-python/rencode-1.0.6
index 626b2092d3b5..4ec36cdc0b41 100644
--- a/metadata/md5-cache/dev-python/rencode-1.0.6
+++ b/metadata/md5-cache/dev-python/rencode-1.0.6
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/aresch/rencode/archive/v1.0.6.tar.gz -> rencode-1.0.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=868987e182aa73da9616e12774aa7f5d
diff --git a/metadata/md5-cache/dev-python/reno-3.2.0-r1 b/metadata/md5-cache/dev-python/reno-3.2.0-r1
index 7ded6a753fbf..21f7d244543e 100644
--- a/metadata/md5-cache/dev-python/reno-3.2.0-r1
+++ b/metadata/md5-cache/dev-python/reno-3.2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/reno/reno-3.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d39d0fcaf41a584b0717ce40da9ff648
diff --git a/metadata/md5-cache/dev-python/reportlab-3.5.48 b/metadata/md5-cache/dev-python/reportlab-3.5.48
index ae60c2aaf8a5..d3df9525409a 100644
--- a/metadata/md5-cache/dev-python/reportlab-3.5.48
+++ b/metadata/md5-cache/dev-python/reportlab-3.5.48
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/reportlab/reportlab-3.5.48.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3c083685053f4955bc707d913d333a09
diff --git a/metadata/md5-cache/dev-python/repoze-lru-0.7-r1 b/metadata/md5-cache/dev-python/repoze-lru-0.7-r1
index ec04d3fa1a65..54b264541726 100644
--- a/metadata/md5-cache/dev-python/repoze-lru-0.7-r1
+++ b/metadata/md5-cache/dev-python/repoze-lru-0.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/repoze/repoze.lru/archive/0.7.tar.gz -> repoze-lru-0.7-r1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0909342c21735dd6dce8ca225ab2cab4
diff --git a/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.8 b/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.8
index a4adcd70a6c1..2f585669f5d4 100644
--- a/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.8
+++ b/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.8
@@ -11,5 +11,5 @@ RDEPEND=dev-python/namespace-repoze[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/r/repoze.sphinx.autointerface/repoze.sphinx.autointerface-0.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5cb5b40f02418daf7055632d5db4ce30
diff --git a/metadata/md5-cache/dev-python/requests-2.24.0-r1 b/metadata/md5-cache/dev-python/requests-2.24.0-r1
index 593c510a3eb1..548b6a4c4c00 100644
--- a/metadata/md5-cache/dev-python/requests-2.24.0-r1
+++ b/metadata/md5-cache/dev-python/requests-2.24.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.24.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=01f620aaa8faca1d1e6cb01ad731e711
diff --git a/metadata/md5-cache/dev-python/requests-2.25.0 b/metadata/md5-cache/dev-python/requests-2.25.0
index bf319411a19c..3c04dfa77379 100644
--- a/metadata/md5-cache/dev-python/requests-2.25.0
+++ b/metadata/md5-cache/dev-python/requests-2.25.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.25.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6625e7bde713d444831f35e77bf03867
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.5.2 b/metadata/md5-cache/dev-python/requests-cache-0.5.2
index ea9b39584768..559d469ca3bf 100644
--- a/metadata/md5-cache/dev-python/requests-cache-0.5.2
+++ b/metadata/md5-cache/dev-python/requests-cache-0.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-cache/requests-cache-0.5.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a43e30473793b3cec2ffafe13f0fae48
diff --git a/metadata/md5-cache/dev-python/requests-credssp-1.1.1 b/metadata/md5-cache/dev-python/requests-credssp-1.1.1
index 85e138eed2db..e7b7f242717d 100644
--- a/metadata/md5-cache/dev-python/requests-credssp-1.1.1
+++ b/metadata/md5-cache/dev-python/requests-credssp-1.1.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/cryptography[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-credssp/requests-credssp-1.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3b40e8517417c57f1b0d3a2c3dd3eac7
diff --git a/metadata/md5-cache/dev-python/requests-file-1.4.3 b/metadata/md5-cache/dev-python/requests-file-1.4.3
index e7c02d35463f..f82af8186a25 100644
--- a/metadata/md5-cache/dev-python/requests-file-1.4.3
+++ b/metadata/md5-cache/dev-python/requests-file-1.4.3
@@ -1,15 +1,14 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=File transport adapter for Requests
 EAPI=7
 HOMEPAGE=https://pypi.org/project/requests-file/
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-file/requests-file-1.4.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9431ac9810a3c9415f06ad52fdfc2fbe
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fcd0557873f3a4d19323c7ecb66e19d2
diff --git a/metadata/md5-cache/dev-python/requests-kerberos-0.12.0-r1 b/metadata/md5-cache/dev-python/requests-kerberos-0.12.0-r1
index 8b01bf3ebcc4..0f948bc8ca1f 100644
--- a/metadata/md5-cache/dev-python/requests-kerberos-0.12.0-r1
+++ b/metadata/md5-cache/dev-python/requests-kerberos-0.12.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/requests/requests-kerberos/archive/v0.12.0.tar.gz -> requests-kerberos-0.12.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cdb00a3296e83cf8dfd8b42c0322210a
diff --git a/metadata/md5-cache/dev-python/requests-mock-1.8.0 b/metadata/md5-cache/dev-python/requests-mock-1.8.0
index d47eba9b4a25..6d4a0eb272c7 100644
--- a/metadata/md5-cache/dev-python/requests-mock-1.8.0
+++ b/metadata/md5-cache/dev-python/requests-mock-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-mock/requests-mock-1.8.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7e1f1629fce7d54113fe3be15d8b93ec
diff --git a/metadata/md5-cache/dev-python/requests-ntlm-1.1.0-r1 b/metadata/md5-cache/dev-python/requests-ntlm-1.1.0-r1
index 73c050c03306..d9a9af4ffcb9 100644
--- a/metadata/md5-cache/dev-python/requests-ntlm-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/requests-ntlm-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.0.0[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests_ntlm/requests_ntlm-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e03f7872fa5c0e186ca604dd2a34792c
diff --git a/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0 b/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0
index ed9fc5a98110..508f7abcd600 100644
--- a/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0
+++ b/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/requests/requests-oauthlib/archive/v1.3.0.tar.gz -> requests-oauthlib-1.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a8864111447d9946a6748f856ca1ed19
diff --git a/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1 b/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
index b6097ed6d32d..377740cc9044 100644
--- a/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
+++ b/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-toolbelt/requests-toolbelt-0.9.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=eab9c5e051e6ca643349c67c8b84809f
diff --git a/metadata/md5-cache/dev-python/requests-unixsocket-0.2.0 b/metadata/md5-cache/dev-python/requests-unixsocket-0.2.0
index 48f12bcac53d..f54b32cdb07d 100644
--- a/metadata/md5-cache/dev-python/requests-unixsocket-0.2.0
+++ b/metadata/md5-cache/dev-python/requests-unixsocket-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-unixsocket/requests-unixsocket-0.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7dbae03cf74a4c35178b0fdefb0e687b
diff --git a/metadata/md5-cache/dev-python/requests_download-0.1.2 b/metadata/md5-cache/dev-python/requests_download-0.1.2
index 4807825523d3..604e6a87a45b 100644
--- a/metadata/md5-cache/dev-python/requests_download-0.1.2
+++ b/metadata/md5-cache/dev-python/requests_download-0.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/takluyver/requests_download/archive/0.1.2.tar.gz -> requests_download-0.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=de80e3ea05ee9fd29277f529646b0a9c
diff --git a/metadata/md5-cache/dev-python/requests_pkcs12-1.7 b/metadata/md5-cache/dev-python/requests_pkcs12-1.7
index b008c32b2221..6dcdbbe75be2 100644
--- a/metadata/md5-cache/dev-python/requests_pkcs12-1.7
+++ b/metadata/md5-cache/dev-python/requests_pkcs12-1.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests_pkcs12/requests_pkcs12-1.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fd9651a429c6f4be5eb2cf3310c8372d
diff --git a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0 b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
index d743140c3a5f..997182e3d1c0 100644
--- a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
+++ b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requestsexceptions/requestsexceptions-1.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7dad216888eb0a2ed3b3e7aaf91c2378
diff --git a/metadata/md5-cache/dev-python/responses-0.12.0 b/metadata/md5-cache/dev-python/responses-0.12.0
index e5a6732f16c1..da20cdc0087e 100644
--- a/metadata/md5-cache/dev-python/responses-0.12.0
+++ b/metadata/md5-cache/dev-python/responses-0.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/responses/responses-0.12.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4dcf8a9d53f49261b491bd3d471a1995
diff --git a/metadata/md5-cache/dev-python/responses-0.12.1 b/metadata/md5-cache/dev-python/responses-0.12.1
index 9d860d89d12d..7f3bc9cf2c01 100644
--- a/metadata/md5-cache/dev-python/responses-0.12.1
+++ b/metadata/md5-cache/dev-python/responses-0.12.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/responses/responses-0.12.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e53a7cb944ecfb95f4e05c55982cf4fc
diff --git a/metadata/md5-cache/dev-python/restructuredtext-lint-1.3.0 b/metadata/md5-cache/dev-python/restructuredtext-lint-1.3.0
index 16a7aafd13b1..810a4c211805 100644
--- a/metadata/md5-cache/dev-python/restructuredtext-lint-1.3.0
+++ b/metadata/md5-cache/dev-python/restructuredtext-lint-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/restructuredtext_lint/restructuredtext_lint-1.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1e97bd5c28268433ec9d76c1ed5903df
diff --git a/metadata/md5-cache/dev-python/resumable-urlretrieve-0.1.5 b/metadata/md5-cache/dev-python/resumable-urlretrieve-0.1.5
index b93a50d9a3ed..6c8e4ea5917a 100644
--- a/metadata/md5-cache/dev-python/resumable-urlretrieve-0.1.5
+++ b/metadata/md5-cache/dev-python/resumable-urlretrieve-0.1.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/resumable-urlretrieve/resumable-urlretrieve-0.1.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f4ce4e1e8548eb370f0a4dbd2103954
diff --git a/metadata/md5-cache/dev-python/retry-decorator-1.1.1 b/metadata/md5-cache/dev-python/retry-decorator-1.1.1
index 6892a134ce4a..d6405dc940a8 100644
--- a/metadata/md5-cache/dev-python/retry-decorator-1.1.1
+++ b/metadata/md5-cache/dev-python/retry-decorator-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pnpnpn/retry-decorator/archive/v1.1.1.tar.gz -> retry-decorator-1.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=78a2267bac68866d68f8ccff73f61ae3
diff --git a/metadata/md5-cache/dev-python/retrying-1.3.3 b/metadata/md5-cache/dev-python/retrying-1.3.3
index 5ce374d42b3d..707629996dab 100644
--- a/metadata/md5-cache/dev-python/retrying-1.3.3
+++ b/metadata/md5-cache/dev-python/retrying-1.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rholder/retrying/archive/v1.3.3.tar.gz -> retrying-1.3.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=74d6ceb07391d24991bf94fcaedd0015
diff --git a/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2 b/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
index d99f3ea6c949..2e95af37bf5e 100644
--- a/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
+++ b/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/naimetti/rfc3339-validator/archive/v0.1.2.tar.gz -> rfc3339-validator-0.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c2b228bf38d216a735777549384a5286
diff --git a/metadata/md5-cache/dev-python/rfc3986-1.4.0 b/metadata/md5-cache/dev-python/rfc3986-1.4.0
index a0f213c55155..9ed13a94a5b8 100644
--- a/metadata/md5-cache/dev-python/rfc3986-1.4.0
+++ b/metadata/md5-cache/dev-python/rfc3986-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-1.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=64f5d38a277c53ea4a6b1d117893885f
diff --git a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1 b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
index b0b4136377f8..64a3d8c7e2a4 100644
--- a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
+++ b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986_validator/rfc3986_validator-0.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=85e6237e4f83ff0a1a2d99237901756d
diff --git a/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1 b/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
index 6fcac84e1f8e..249a3832e274 100644
--- a/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
+++ b/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/regex[python_targets_pypy3(-)?,python_targets_python3_6(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3987/rfc3987-1.3.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ceb76524714be2d283cb4dadb9861310
diff --git a/metadata/md5-cache/dev-python/rjsmin-1.1.0 b/metadata/md5-cache/dev-python/rjsmin-1.1.0
index 35b37bb05462..4f268af91761 100644
--- a/metadata/md5-cache/dev-python/rjsmin-1.1.0
+++ b/metadata/md5-cache/dev-python/rjsmin-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rjsmin/rjsmin-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=534d0c27a3cea1ba815e82ed8b262b67
diff --git a/metadata/md5-cache/dev-python/robot-detection-0.4.0 b/metadata/md5-cache/dev-python/robot-detection-0.4.0
index cc29dc19ce0f..ace00fa1db03 100644
--- a/metadata/md5-cache/dev-python/robot-detection-0.4.0
+++ b/metadata/md5-cache/dev-python/robot-detection-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/rory/robot-detection/archive/v0.4.0.tar.gz -> robot-detection-0.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=099a3b490ad96d860ddb71b2c77b6b8a
diff --git a/metadata/md5-cache/dev-python/roman-3.2 b/metadata/md5-cache/dev-python/roman-3.2
index 89a5cf1dcd6e..f1bc972df3af 100644
--- a/metadata/md5-cache/dev-python/roman-3.2
+++ b/metadata/md5-cache/dev-python/roman-3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/roman/roman-3.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0d0f724072fa52b4496c641a9984e5da
diff --git a/metadata/md5-cache/dev-python/rope-0.17.0 b/metadata/md5-cache/dev-python/rope-0.17.0
index c8b116668bed..a96bf34a6489 100644
--- a/metadata/md5-cache/dev-python/rope-0.17.0
+++ b/metadata/md5-cache/dev-python/rope-0.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rope/rope-0.17.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a8c853f7f6c94a465e9605244c7cc23c
diff --git a/metadata/md5-cache/dev-python/rope-0.18.0 b/metadata/md5-cache/dev-python/rope-0.18.0
index 15e5b77658e1..0332bfab2f70 100644
--- a/metadata/md5-cache/dev-python/rope-0.18.0
+++ b/metadata/md5-cache/dev-python/rope-0.18.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rope/rope-0.18.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d9670cb43e1c256f617b7f9daef8f2cf
diff --git a/metadata/md5-cache/dev-python/ropemode-0.5 b/metadata/md5-cache/dev-python/ropemode-0.5
index 9b55cdfe3624..f075f08c40b3 100644
--- a/metadata/md5-cache/dev-python/ropemode-0.5
+++ b/metadata/md5-cache/dev-python/ropemode-0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rope[python_targets_python3_7(-)?,python_targets_python3_8(-)
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/python-rope/ropemode/archive/0.5.tar.gz -> ropemode-0.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dc7499d30b5937f3bfdd34e7cd5db217
diff --git a/metadata/md5-cache/dev-python/rosdistro-0.8.3 b/metadata/md5-cache/dev-python/rosdistro-0.8.3
index 95b5af79b811..f63f68486542 100644
--- a/metadata/md5-cache/dev-python/rosdistro-0.8.3
+++ b/metadata/md5-cache/dev-python/rosdistro-0.8.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rosdistro/archive/0.8.3.tar.gz -> rosdistro-0.8.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7618f797b20aff0c8fbfda70d961205f
diff --git a/metadata/md5-cache/dev-python/rosdistro-9999 b/metadata/md5-cache/dev-python/rosdistro-9999
index 6f6fac28af34..62d767a440e1 100644
--- a/metadata/md5-cache/dev-python/rosdistro-9999
+++ b/metadata/md5-cache/dev-python/rosdistro-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7618f797b20aff0c8fbfda70d961205f
diff --git a/metadata/md5-cache/dev-python/rospkg-1.2.8-r1 b/metadata/md5-cache/dev-python/rospkg-1.2.8-r1
index 12584e1ea9a9..d9920d3e78c0 100644
--- a/metadata/md5-cache/dev-python/rospkg-1.2.8-r1
+++ b/metadata/md5-cache/dev-python/rospkg-1.2.8-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rospkg/archive/1.2.8.tar.gz -> rospkg-1.2.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c082ad3ecb5e83e6dd7eec19a8fa174f
diff --git a/metadata/md5-cache/dev-python/rospkg-9999 b/metadata/md5-cache/dev-python/rospkg-9999
index 48e1fcd46f4a..c5eb6fc8a465 100644
--- a/metadata/md5-cache/dev-python/rospkg-9999
+++ b/metadata/md5-cache/dev-python/rospkg-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c082ad3ecb5e83e6dd7eec19a8fa174f
diff --git a/metadata/md5-cache/dev-python/routes-2.5.1 b/metadata/md5-cache/dev-python/routes-2.5.1
index a06c7668122d..e006c020ffc9 100644
--- a/metadata/md5-cache/dev-python/routes-2.5.1
+++ b/metadata/md5-cache/dev-python/routes-2.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/R/Routes/Routes-2.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bc1699684d188c8f502a3b6caa5af008
diff --git a/metadata/md5-cache/dev-python/rply-0.7.7-r1 b/metadata/md5-cache/dev-python/rply-0.7.7-r1
index 612fb8f966bf..bd9da09542f3 100644
--- a/metadata/md5-cache/dev-python/rply-0.7.7-r1
+++ b/metadata/md5-cache/dev-python/rply-0.7.7-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alex/rply/archive/v0.7.7.tar.gz -> rply-0.7.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4de641989a05a75ff1ea4bd22ffadc65
diff --git a/metadata/md5-cache/dev-python/rpy-2.9.0 b/metadata/md5-cache/dev-python/rpy-2.9.0
index 75e419924c8a..91fa2fb86abd 100644
--- a/metadata/md5-cache/dev-python/rpy-2.9.0
+++ b/metadata/md5-cache/dev-python/rpy-2.9.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/rpy2/rpy2-2.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7cd9a03c411ed7006b00ce8a3b808906
diff --git a/metadata/md5-cache/dev-python/rpyc-4.1.4 b/metadata/md5-cache/dev-python/rpyc-4.1.4
index 395544ffda1b..2c374fbefdeb 100644
--- a/metadata/md5-cache/dev-python/rpyc-4.1.4
+++ b/metadata/md5-cache/dev-python/rpyc-4.1.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/plumbum[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/tomerfiliba/rpyc/archive/4.1.4.tar.gz -> rpyc-4.1.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f686d3617b2c8e8203ae7f4dd45859c1
diff --git a/metadata/md5-cache/dev-python/rpyc-4.1.5 b/metadata/md5-cache/dev-python/rpyc-4.1.5
new file mode 100644
index 000000000000..1b3df397542a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rpyc-4.1.5
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Remote Python Call (RPyC), a transparent and symmetric RPC library
+EAPI=7
+HOMEPAGE=https://rpyc.readthedocs.io/en/latest/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/plumbum[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/tomerfiliba/rpyc/archive/4.1.5.tar.gz -> rpyc-4.1.5.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=610ed1fb8553a484854afca4ed03c1f2
diff --git a/metadata/md5-cache/dev-python/rq-1.5.2 b/metadata/md5-cache/dev-python/rq-1.5.2
index eac020816b5e..4005d4cccd39 100644
--- a/metadata/md5-cache/dev-python/rq-1.5.2
+++ b/metadata/md5-cache/dev-python/rq-1.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rq/rq/archive/v1.5.2.tar.gz -> rq-1.5.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ee96f168b97ef5a6117d3c0fa0a4b668
diff --git a/metadata/md5-cache/dev-python/rq-1.6.1 b/metadata/md5-cache/dev-python/rq-1.6.1
index 0d3ac20398de..0dea8de2618f 100644
--- a/metadata/md5-cache/dev-python/rq-1.6.1
+++ b/metadata/md5-cache/dev-python/rq-1.6.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rq/rq/archive/v1.6.1.tar.gz -> rq-1.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=283770e9463e10b9701d1dde49eb6712
diff --git a/metadata/md5-cache/dev-python/rq-1.7.0 b/metadata/md5-cache/dev-python/rq-1.7.0
index 1dd0dbdb59cd..ba922d5fa56e 100644
--- a/metadata/md5-cache/dev-python/rq-1.7.0
+++ b/metadata/md5-cache/dev-python/rq-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rq/rq/archive/v1.7.0.tar.gz -> rq-1.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=283770e9463e10b9701d1dde49eb6712
diff --git a/metadata/md5-cache/dev-python/rsa-4.2 b/metadata/md5-cache/dev-python/rsa-4.2
index cbe31208af87..a4d75801e55b 100644
--- a/metadata/md5-cache/dev-python/rsa-4.2
+++ b/metadata/md5-cache/dev-python/rsa-4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sybrenstuvel/python-rsa/archive/version-4.2.tar.gz -> python-rsa-version-4.2.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5929f83530e5247e1e187f9343b4fd00
diff --git a/metadata/md5-cache/dev-python/rst-linker-2.0.0 b/metadata/md5-cache/dev-python/rst-linker-2.0.0
deleted file mode 100644
index 9ef8c528fd2d..000000000000
--- a/metadata/md5-cache/dev-python/rst-linker-2.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/path-py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-3.4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sphinx plugin to add links and timestamps to the changelog
-EAPI=7
-HOMEPAGE=https://github.com/jaraco/rst.linker
-IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/rst.linker/rst.linker-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a4760a040af4dc46b01955959dc77719
diff --git a/metadata/md5-cache/dev-python/rst-linker-2.1.1 b/metadata/md5-cache/dev-python/rst-linker-2.1.1
index a895bbfcbdc3..326cd2bcf1fc 100644
--- a/metadata/md5-cache/dev-python/rst-linker-2.1.1
+++ b/metadata/md5-cache/dev-python/rst-linker-2.1.1
@@ -4,12 +4,12 @@ DESCRIPTION=Sphinx plugin to add links and timestamps to the changelog
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/rst.linker
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rst.linker/rst.linker-2.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bc2d49973b3b110c89fb8b371433a458
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8360c1338acaa08ddb3751dd52b16cbc
diff --git a/metadata/md5-cache/dev-python/rtimulib-7.2.1-r1 b/metadata/md5-cache/dev-python/rtimulib-7.2.1-r1
index 3ad3fdc1728c..90c1b7f1b3c2 100644
--- a/metadata/md5-cache/dev-python/rtimulib-7.2.1-r1
+++ b/metadata/md5-cache/dev-python/rtimulib-7.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/RPi-Distro/RTIMULib/archive/V7.2.1.tar.gz -> RTIMULib-7.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d188e03ffecbf0da76c29b86cc8f8714
diff --git a/metadata/md5-cache/dev-python/rtslib-fb-2.1.74 b/metadata/md5-cache/dev-python/rtslib-fb-2.1.74
index fcfdbb93ecd3..f02e60d961d9 100644
--- a/metadata/md5-cache/dev-python/rtslib-fb-2.1.74
+++ b/metadata/md5-cache/dev-python/rtslib-fb-2.1.74
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyudev[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rtslib-fb/rtslib-fb-2.1.74.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9edf27cdb5dbaa22a1c9cdfc0b0189c7
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-0.16.12-r1 b/metadata/md5-cache/dev-python/ruamel-yaml-0.16.12-r1
index fd9fd448e17a..712da88ab860 100644
--- a/metadata/md5-cache/dev-python/ruamel-yaml-0.16.12-r1
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-0.16.12-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/ruamel-yaml-clib[python_targets_pypy3(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ruamel.yaml/ruamel.yaml-0.16.12.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4f474b115143fa86890801d9e6bdf6a2
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.2-r1 b/metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.2-r1
index a42a7e26ef4e..182914594b40 100644
--- a/metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.2-r1
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=!<dev-python/ruamel-yaml-0.16.0 python_targets_pypy3? ( >=dev-python/pyp
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ruamel.yaml.clib/ruamel.yaml.clib-0.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=962ede8aa5adf102e93683c28cc808f0
diff --git a/metadata/md5-cache/dev-python/ryu-4.34 b/metadata/md5-cache/dev-python/ryu-4.34
index c06f12bb0f98..e4cfc0e65288 100644
--- a/metadata/md5-cache/dev-python/ryu-4.34
+++ b/metadata/md5-cache/dev-python/ryu-4.34
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ryu/ryu-4.34.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=14327e08fcaadbc0c708da8a77866f5f
diff --git a/metadata/md5-cache/dev-python/s3fs-0.4.2 b/metadata/md5-cache/dev-python/s3fs-0.4.2
index bc036afa691a..adeda69dabe2 100644
--- a/metadata/md5-cache/dev-python/s3fs-0.4.2
+++ b/metadata/md5-cache/dev-python/s3fs-0.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/s3fs/s3fs-0.4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fe1e55572b59782ee0f247fb3d394305
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.3.3 b/metadata/md5-cache/dev-python/s3transfer-0.3.3
index 570891f891b2..0ac92eb85732 100644
--- a/metadata/md5-cache/dev-python/s3transfer-0.3.3
+++ b/metadata/md5-cache/dev-python/s3transfer-0.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/s3transfer/s3transfer-0.3.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9242d1fa9da42cb553f671c99ed61615
diff --git a/metadata/md5-cache/dev-python/sabyenc-4.0.2 b/metadata/md5-cache/dev-python/sabyenc-4.0.2
index 3aac7cd55dbb..ae9773f44e62 100644
--- a/metadata/md5-cache/dev-python/sabyenc-4.0.2
+++ b/metadata/md5-cache/dev-python/sabyenc-4.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sabnzbd/sabyenc/archive/v4.0.2.tar.gz -> sabyenc-4.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=02c36dcee162add988f4a6912f9a7e0e
diff --git a/metadata/md5-cache/dev-python/sarge-0.1.5 b/metadata/md5-cache/dev-python/sarge-0.1.5
index 421d22555f76..c72e9b3ed491 100644
--- a/metadata/md5-cache/dev-python/sarge-0.1.5
+++ b/metadata/md5-cache/dev-python/sarge-0.1.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sarge/sarge-0.1.5.post0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e14a60a5cc40705d1a67ed1899ac26cd
diff --git a/metadata/md5-cache/dev-python/scandir-1.10.0-r2 b/metadata/md5-cache/dev-python/scandir-1.10.0-r2
index 6ecd19625ae1..9cd0ec4773dd 100644
--- a/metadata/md5-cache/dev-python/scandir-1.10.0-r2
+++ b/metadata/md5-cache/dev-python/scandir-1.10.0-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scandir/scandir-1.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8eb0ec2d567877af028966690cd0432a
diff --git a/metadata/md5-cache/dev-python/scikit-build-0.11.1 b/metadata/md5-cache/dev-python/scikit-build-0.11.1
index 95e9edc2cc95..3c894422b95c 100644
--- a/metadata/md5-cache/dev-python/scikit-build-0.11.1
+++ b/metadata/md5-cache/dev-python/scikit-build-0.11.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-build/scikit-build-0.11.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5d7b2232390019c22a1526a1f51c4097
diff --git a/metadata/md5-cache/dev-python/scipy-1.1.0 b/metadata/md5-cache/dev-python/scipy-1.1.0
index ba07656c7f34..f5cc2c1226c3 100644
--- a/metadata/md5-cache/dev-python/scipy-1.1.0
+++ b/metadata/md5-cache/dev-python/scipy-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.1.0.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.1.0/scipy-html-1.1.0.zip -> scipy-1.1.0-html.zip https://docs.scipy.org/doc/scipy-1.1.0/scipy-ref-1.1.0.pdf -> scipy-1.1.0-ref.pdf )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=884465db4f9245dbbcf8c07709ebfa02
diff --git a/metadata/md5-cache/dev-python/scipy-1.4.1 b/metadata/md5-cache/dev-python/scipy-1.4.1
index c6b7e7db60e3..14735e248212 100644
--- a/metadata/md5-cache/dev-python/scipy-1.4.1
+++ b/metadata/md5-cache/dev-python/scipy-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.4.1.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.4.1/scipy-html-1.4.1.zip -> scipy-1.4.1-html.zip https://docs.scipy.org/doc/scipy-1.4.1/scipy-ref-1.4.1.pdf -> scipy-1.4.1-ref.pdf )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e9c6b486d69388543318da1b3eec76d8
diff --git a/metadata/md5-cache/dev-python/scipy-1.5.2 b/metadata/md5-cache/dev-python/scipy-1.5.2
index 0c767b6ba276..9dd8dbddc83d 100644
--- a/metadata/md5-cache/dev-python/scipy-1.5.2
+++ b/metadata/md5-cache/dev-python/scipy-1.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.5.2.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.5.2/scipy-html-1.5.2.zip -> scipy-1.5.2-html.zip https://docs.scipy.org/doc/scipy-1.5.2/scipy-ref-1.5.2.pdf -> scipy-1.5.2-ref.pdf )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a8987b02a426c49c3779898f2744f889
diff --git a/metadata/md5-cache/dev-python/scipy-1.5.3 b/metadata/md5-cache/dev-python/scipy-1.5.3
index 4cd7db75ac02..54b9dbaf1af6 100644
--- a/metadata/md5-cache/dev-python/scipy-1.5.3
+++ b/metadata/md5-cache/dev-python/scipy-1.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.5.3.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.5.3/scipy-html-1.5.3.zip -> scipy-1.5.3-html.zip https://docs.scipy.org/doc/scipy-1.5.3/scipy-ref-1.5.3.pdf -> scipy-1.5.3-ref.pdf )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b70b62434f7de9a2fe873922ba216eb
diff --git a/metadata/md5-cache/dev-python/scipy-1.5.4 b/metadata/md5-cache/dev-python/scipy-1.5.4
index 593c3f08486f..a65c4bf6b668 100644
--- a/metadata/md5-cache/dev-python/scipy-1.5.4
+++ b/metadata/md5-cache/dev-python/scipy-1.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.5.4.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.5.4/scipy-html-1.5.4.zip -> scipy-1.5.4-html.zip https://docs.scipy.org/doc/scipy-1.5.4/scipy-ref-1.5.4.pdf -> scipy-1.5.4-ref.pdf )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b70b62434f7de9a2fe873922ba216eb
diff --git a/metadata/md5-cache/dev-python/scripttest-1.3.0-r1 b/metadata/md5-cache/dev-python/scripttest-1.3.0-r1
index f091f17d7ee6..a590ee731bce 100644
--- a/metadata/md5-cache/dev-python/scripttest-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/scripttest-1.3.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/scripttest/archive/1.3.0.tar.gz -> scripttest-1.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=62e24a26937447306033a7e0fb5aceea
diff --git a/metadata/md5-cache/dev-python/scrypt-0.8.16 b/metadata/md5-cache/dev-python/scrypt-0.8.16
index f827d3f6126a..b52faf80afdf 100644
--- a/metadata/md5-cache/dev-python/scrypt-0.8.16
+++ b/metadata/md5-cache/dev-python/scrypt-0.8.16
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scrypt/scrypt-0.8.16.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4eca747b82d17007d35d1b970404dc6a
diff --git a/metadata/md5-cache/dev-python/seaborn-0.10.1 b/metadata/md5-cache/dev-python/seaborn-0.10.1
index 0748f397db75..6fdf3fd34672 100644
--- a/metadata/md5-cache/dev-python/seaborn-0.10.1
+++ b/metadata/md5-cache/dev-python/seaborn-0.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/seaborn/seaborn-0.10.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b4fe241f0c1773b58d1ee61e1c28ec41
diff --git a/metadata/md5-cache/dev-python/secretstorage-3.1.2 b/metadata/md5-cache/dev-python/secretstorage-3.1.2
index e91e4dea24d4..4a7034238193 100644
--- a/metadata/md5-cache/dev-python/secretstorage-3.1.2
+++ b/metadata/md5-cache/dev-python/secretstorage-3.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SecretStorage/SecretStorage-3.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0dba766e66d575aab124bd76d0201487
diff --git a/metadata/md5-cache/dev-python/secretstorage-3.2.0 b/metadata/md5-cache/dev-python/secretstorage-3.2.0
index 8e06f792cab6..aefefabea0c8 100644
--- a/metadata/md5-cache/dev-python/secretstorage-3.2.0
+++ b/metadata/md5-cache/dev-python/secretstorage-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SecretStorage/SecretStorage-3.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8e56e923bac6b9d7fee83c75a4706cf0
diff --git a/metadata/md5-cache/dev-python/secretstorage-3.3.0 b/metadata/md5-cache/dev-python/secretstorage-3.3.0
index f4453775796b..ac7679e43042 100644
--- a/metadata/md5-cache/dev-python/secretstorage-3.3.0
+++ b/metadata/md5-cache/dev-python/secretstorage-3.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SecretStorage/SecretStorage-3.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=55887ab9ad1d3547b0d7da86f28396b5
diff --git a/metadata/md5-cache/dev-python/selenium-3.141.0-r1 b/metadata/md5-cache/dev-python/selenium-3.141.0-r1
index b31f894f1efd..258e362de6d8 100644
--- a/metadata/md5-cache/dev-python/selenium-3.141.0-r1
+++ b/metadata/md5-cache/dev-python/selenium-3.141.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/selenium/selenium-3.141.0.tar.gz test? ( https://github.com/SeleniumHQ/selenium/archive/selenium-3.141.0.tar.gz -> selenium-3.141.0.gh.tar.gz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3f7e5b6ca6d25caba0ec39d4c95e2c45
diff --git a/metadata/md5-cache/dev-python/semantic_version-2.8.5 b/metadata/md5-cache/dev-python/semantic_version-2.8.5
index 466df50d1f2d..4102e0db680b 100644
--- a/metadata/md5-cache/dev-python/semantic_version-2.8.5
+++ b/metadata/md5-cache/dev-python/semantic_version-2.8.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/semantic_version/semantic_version-2.8.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=93e2acf06f4e614ed25b00de0059f6ff
diff --git a/metadata/md5-cache/dev-python/semver-2.13.0 b/metadata/md5-cache/dev-python/semver-2.13.0
index eced0d304d24..d2e8851a6fca 100644
--- a/metadata/md5-cache/dev-python/semver-2.13.0
+++ b/metadata/md5-cache/dev-python/semver-2.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-semver/python-semver/archive/2.13.0.tar.gz -> semver-2.13.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2a9692b47dfebadebdf4afcc589c226e
diff --git a/metadata/md5-cache/dev-python/send2trash-1.5.0-r1 b/metadata/md5-cache/dev-python/send2trash-1.5.0-r1
index 1599a1c7fdaf..d128c97b166e 100644
--- a/metadata/md5-cache/dev-python/send2trash-1.5.0-r1
+++ b/metadata/md5-cache/dev-python/send2trash-1.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/S/Send2Trash/Send2Trash-1.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2b95b8dd72f39e6853b77ed30dc8e1e0
diff --git a/metadata/md5-cache/dev-python/sentinels-1.0.0 b/metadata/md5-cache/dev-python/sentinels-1.0.0
index 424f038356c9..a35b3f636c5a 100644
--- a/metadata/md5-cache/dev-python/sentinels-1.0.0
+++ b/metadata/md5-cache/dev-python/sentinels-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sentinels/sentinels-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4694c94a69b7b57761f3919e36613621
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-0.19.1 b/metadata/md5-cache/dev-python/sentry-sdk-0.19.1
index 37410098b076..4e442585697b 100644
--- a/metadata/md5-cache/dev-python/sentry-sdk-0.19.1
+++ b/metadata/md5-cache/dev-python/sentry-sdk-0.19.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getsentry/sentry-python/archive/0.19.1.tar.gz -> sentry-sdk-0.19.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=063bfccf67a0923fe356d70eac993c77
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-0.19.4 b/metadata/md5-cache/dev-python/sentry-sdk-0.19.4
index d1a27139435c..b9d66aa6870f 100644
--- a/metadata/md5-cache/dev-python/sentry-sdk-0.19.4
+++ b/metadata/md5-cache/dev-python/sentry-sdk-0.19.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getsentry/sentry-python/archive/0.19.4.tar.gz -> sentry-sdk-0.19.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e8da7eb952caf84e1195cfffca16f58e
diff --git a/metadata/md5-cache/dev-python/serpent-1.30 b/metadata/md5-cache/dev-python/serpent-1.30
index b8913430e6ed..13ff3439068b 100644
--- a/metadata/md5-cache/dev-python/serpent-1.30
+++ b/metadata/md5-cache/dev-python/serpent-1.30
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/serpent/serpent-1.30.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4b2db3ff4996eecde100d5ff05f3dac5
diff --git a/metadata/md5-cache/dev-python/serpent-1.30.2 b/metadata/md5-cache/dev-python/serpent-1.30.2
index 11a7aa46322f..e4cc334981a7 100644
--- a/metadata/md5-cache/dev-python/serpent-1.30.2
+++ b/metadata/md5-cache/dev-python/serpent-1.30.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/serpent/serpent-1.30.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=93b974b8243bec49b0c355f56352d7da
diff --git a/metadata/md5-cache/dev-python/serverfiles-0.2.1 b/metadata/md5-cache/dev-python/serverfiles-0.2.1
index 79e6a0b912e3..f660ffacf7c9 100644
--- a/metadata/md5-cache/dev-python/serverfiles-0.2.1
+++ b/metadata/md5-cache/dev-python/serverfiles-0.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/biolab/serverfiles/archive/0.2.1.tar.gz -> serverfiles-0.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=30cb3c0c9e6d0781f746682ebe2855d7
diff --git a/metadata/md5-cache/dev-python/service_identity-18.1.0-r1 b/metadata/md5-cache/dev-python/service_identity-18.1.0-r1
index 4077976a04b1..e7c06f111a38 100644
--- a/metadata/md5-cache/dev-python/service_identity-18.1.0-r1
+++ b/metadata/md5-cache/dev-python/service_identity-18.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyca/service-identity/archive/18.1.0.tar.gz -> service_identity-18.1.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=19a70eba6b04fa9872e785e4fb1aed5e
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1 b/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1
index d91868154b5f..f44c3d3e39d3 100644
--- a/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1
+++ b/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setproctitle/setproctitle-1.1.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=797648a46a4d35ba117ee1109149a5c6
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.2 b/metadata/md5-cache/dev-python/setproctitle-1.2
index 10320fb6156c..7e21ff0aacf0 100644
--- a/metadata/md5-cache/dev-python/setproctitle-1.2
+++ b/metadata/md5-cache/dev-python/setproctitle-1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setproctitle/setproctitle-1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dcc036bf93c5a83074b2bf4591e00a46
diff --git a/metadata/md5-cache/dev-python/setuptools-46.4.0-r3 b/metadata/md5-cache/dev-python/setuptools-46.4.0-r3
index 9eeb3597410b..e6af26e1656d 100644
--- a/metadata/md5-cache/dev-python/setuptools-46.4.0-r3
+++ b/metadata/md5-cache/dev-python/setuptools-46.4.0-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-46.4.0.zip
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=27576e8719982258e3cba994d7ce21a6
diff --git a/metadata/md5-cache/dev-python/setuptools-50.3.0 b/metadata/md5-cache/dev-python/setuptools-50.3.0
index 43d54a0b525c..07851f27513b 100644
--- a/metadata/md5-cache/dev-python/setuptools-50.3.0
+++ b/metadata/md5-cache/dev-python/setuptools-50.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-50.3.0.zip
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=753509f5dcd3f39b20c95ae7e87fb116
diff --git a/metadata/md5-cache/dev-python/setuptools-git-1.2-r2 b/metadata/md5-cache/dev-python/setuptools-git-1.2-r2
index 441b35228c44..b7ab0a70fe7e 100644
--- a/metadata/md5-cache/dev-python/setuptools-git-1.2-r2
+++ b/metadata/md5-cache/dev-python/setuptools-git-1.2-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools-git/setuptools-git-1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6e5facf7430764b53873767352f0b334
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-4.1.2-r1 b/metadata/md5-cache/dev-python/setuptools_scm-4.1.2-r1
index 2f8e40c9ff4a..0961b3448c66 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm-4.1.2-r1
+++ b/metadata/md5-cache/dev-python/setuptools_scm-4.1.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-4.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5913efa8d771865b5200f49d35ee96c9
diff --git a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1 b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1
index b086bcda84ea..9820a196e145 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1
+++ b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Changaco/setuptools_scm_git_archive/archive/1.1.tar.gz -> setuptools_scm_git_archive-1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e7480366ccb8e69d6b0003a89dad6088
diff --git a/metadata/md5-cache/dev-python/setuptools_trial-0.6.0-r1 b/metadata/md5-cache/dev-python/setuptools_trial-0.6.0-r1
index 11299cef988a..aeaab10b6624 100644
--- a/metadata/md5-cache/dev-python/setuptools_trial-0.6.0-r1
+++ b/metadata/md5-cache/dev-python/setuptools_trial-0.6.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_trial/setuptools_trial-0.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5c8dae90b8b086ee77d6601f7792d3a2
diff --git a/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1 b/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
index 1d569152c908..a2c95c89fe2a 100644
--- a/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
+++ b/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tkf/sexpdata/archive/v0.0.3.tar.gz -> sexpdata-0.0.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e9261def2ceb4bdee45a98841cae4787
diff --git a/metadata/md5-cache/dev-python/sgmllib3k-1.0.0 b/metadata/md5-cache/dev-python/sgmllib3k-1.0.0
index 8d12e755fe09..56c41230cb7b 100644
--- a/metadata/md5-cache/dev-python/sgmllib3k-1.0.0
+++ b/metadata/md5-cache/dev-python/sgmllib3k-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sgmllib3k/sgmllib3k-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a06fd5a92ecea5f51438743ce4265ba0
diff --git a/metadata/md5-cache/dev-python/sh-1.14.0 b/metadata/md5-cache/dev-python/sh-1.14.0
index 56317275d9fc..4de9887247b4 100644
--- a/metadata/md5-cache/dev-python/sh-1.14.0
+++ b/metadata/md5-cache/dev-python/sh-1.14.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sh/sh-1.14.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5819aec428f2d8c6684ed4fdba1bff9a
diff --git a/metadata/md5-cache/dev-python/shutilwhich-1.1.0 b/metadata/md5-cache/dev-python/shutilwhich-1.1.0
index 6bd064dab144..9fa36ba652d0 100644
--- a/metadata/md5-cache/dev-python/shutilwhich-1.1.0
+++ b/metadata/md5-cache/dev-python/shutilwhich-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/shutilwhich/shutilwhich-1.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=159bd71367ae3e397976ba35e3b8f6f4
diff --git a/metadata/md5-cache/dev-python/simplebayes-1.5.7 b/metadata/md5-cache/dev-python/simplebayes-1.5.7
index aacc959840a6..1bf8e898fc31 100644
--- a/metadata/md5-cache/dev-python/simplebayes-1.5.7
+++ b/metadata/md5-cache/dev-python/simplebayes-1.5.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hickeroar/simplebayes/archive/1.5.7.tar.gz -> simplebayes-1.5.7.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e43a3df2844faa8f758108b005e7f68
diff --git a/metadata/md5-cache/dev-python/simpleeval-0.9.10 b/metadata/md5-cache/dev-python/simpleeval-0.9.10
index 32298fc870d0..e2fd520e94fd 100644
--- a/metadata/md5-cache/dev-python/simpleeval-0.9.10
+++ b/metadata/md5-cache/dev-python/simpleeval-0.9.10
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simpleeval/simpleeval-0.9.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=02c485dfcc835de71661fb85aee4f1c9
diff --git a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1 b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
index 6c271a82fc24..3561e75e9aa3 100644
--- a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplegeneric/simplegeneric-0.8.1.zip
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a691f4dec18ba72b62c266e8572f6bbe
diff --git a/metadata/md5-cache/dev-python/simplejson-3.17.2-r1 b/metadata/md5-cache/dev-python/simplejson-3.17.2-r1
index f0f66c9c4ee6..0fd8dcdb8daa 100644
--- a/metadata/md5-cache/dev-python/simplejson-3.17.2-r1
+++ b/metadata/md5-cache/dev-python/simplejson-3.17.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplejson/simplejson-3.17.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0899af82c2b30e21e7519e74e4d00663
diff --git a/metadata/md5-cache/dev-python/simplekml-1.3.1 b/metadata/md5-cache/dev-python/simplekml-1.3.1
index 07cd2d95232a..61002c0b71d9 100644
--- a/metadata/md5-cache/dev-python/simplekml-1.3.1
+++ b/metadata/md5-cache/dev-python/simplekml-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplekml/simplekml-1.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9f5eeaea559190f02d96a76a6eb3d4da
diff --git a/metadata/md5-cache/dev-python/simplesoapy-1.5.1-r1 b/metadata/md5-cache/dev-python/simplesoapy-1.5.1-r1
index 206e54e981fc..4fb2d633cbad 100644
--- a/metadata/md5-cache/dev-python/simplesoapy-1.5.1-r1
+++ b/metadata/md5-cache/dev-python/simplesoapy-1.5.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/xmikos/simplesoapy/archive/v1.5.1.tar.gz -> simplesoapy-1.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=08f8a2f78e18fd2ee42bc976803bb916
diff --git a/metadata/md5-cache/dev-python/simplesoapy-9999 b/metadata/md5-cache/dev-python/simplesoapy-9999
index 9c870d8294a1..7b40cc06a5a4 100644
--- a/metadata/md5-cache/dev-python/simplesoapy-9999
+++ b/metadata/md5-cache/dev-python/simplesoapy-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-wireless/soapysdr[python] net-wireless/soapysdr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=08f8a2f78e18fd2ee42bc976803bb916
diff --git a/metadata/md5-cache/dev-python/simplespectral-1.0.0 b/metadata/md5-cache/dev-python/simplespectral-1.0.0
index 2a9938a8d354..e4c9fd7bcd2e 100644
--- a/metadata/md5-cache/dev-python/simplespectral-1.0.0
+++ b/metadata/md5-cache/dev-python/simplespectral-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/xmikos/simplespectral/archive/v1.0.0.tar.gz -> simplespectral-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=469d498c6ec76c4f45cf44f12ad3dee3
diff --git a/metadata/md5-cache/dev-python/simplespectral-9999 b/metadata/md5-cache/dev-python/simplespectral-9999
index 0ea92f23ea48..c7150acd7edb 100644
--- a/metadata/md5-cache/dev-python/simplespectral-9999
+++ b/metadata/md5-cache/dev-python/simplespectral-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] faster? ( dev-python/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) fastest? ( dev-python/pyFFTW[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=469d498c6ec76c4f45cf44f12ad3dee3
diff --git a/metadata/md5-cache/dev-python/simpy-3.0.13 b/metadata/md5-cache/dev-python/simpy-3.0.13
index fbc80829d5f3..1251ea48f5bf 100644
--- a/metadata/md5-cache/dev-python/simpy-3.0.13
+++ b/metadata/md5-cache/dev-python/simpy-3.0.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/simpy/simpy-3.0.13.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e37a392ae2869750e235b4d09872509f
diff --git a/metadata/md5-cache/dev-python/six-1.15.0-r1 b/metadata/md5-cache/dev-python/six-1.15.0-r1
index a1b4ee60ae00..3deb53d2ca8a 100644
--- a/metadata/md5-cache/dev-python/six-1.15.0-r1
+++ b/metadata/md5-cache/dev-python/six-1.15.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/six/six-1.15.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9a002f4361438365c9c4df13c79fe8d3
diff --git a/metadata/md5-cache/dev-python/slackclient-2.5.0 b/metadata/md5-cache/dev-python/slackclient-2.5.0
index 2431938102ba..c0c60bb5d69f 100644
--- a/metadata/md5-cache/dev-python/slackclient-2.5.0
+++ b/metadata/md5-cache/dev-python/slackclient-2.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/slackclient/slackclient-2.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fc4a976a6f3b437f87e0b71648b9e2d9
diff --git a/metadata/md5-cache/dev-python/slimit-0.8.1-r1 b/metadata/md5-cache/dev-python/slimit-0.8.1-r1
index 077fed5532ba..66933da507fd 100644
--- a/metadata/md5-cache/dev-python/slimit-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/slimit-0.8.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rspivak/slimit/archive/0.8.1.tar.gz -> slimit-0.8.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=42552987a6e28e47b2f7a2203aad31c6
diff --git a/metadata/md5-cache/dev-python/slixmpp-1.4.2 b/metadata/md5-cache/dev-python/slixmpp-1.4.2
index 74e0b930117f..c6655e192a88 100644
--- a/metadata/md5-cache/dev-python/slixmpp-1.4.2
+++ b/metadata/md5-cache/dev-python/slixmpp-1.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/slixmpp/slixmpp-1.4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f9280915252756d2ccf2d561092893d5
diff --git a/metadata/md5-cache/dev-python/slixmpp-1.5.2 b/metadata/md5-cache/dev-python/slixmpp-1.5.2
index 101eff22ed63..51b073356ef8 100644
--- a/metadata/md5-cache/dev-python/slixmpp-1.5.2
+++ b/metadata/md5-cache/dev-python/slixmpp-1.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/slixmpp/slixmpp-1.5.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f7f598c833503a3ee9378890ac3d4f78
diff --git a/metadata/md5-cache/dev-python/slixmpp-9999 b/metadata/md5-cache/dev-python/slixmpp-9999
index a3d46587012e..303b816fbe71 100644
--- a/metadata/md5-cache/dev-python/slixmpp-9999
+++ b/metadata/md5-cache/dev-python/slixmpp-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/aiodns[python_targets_python3_7(-)?,python_targets_python3_8(
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f7f598c833503a3ee9378890ac3d4f78
diff --git a/metadata/md5-cache/dev-python/smmap-3.0.4 b/metadata/md5-cache/dev-python/smmap-3.0.4
index f5d1fa961750..ebe21b83107f 100644
--- a/metadata/md5-cache/dev-python/smmap-3.0.4
+++ b/metadata/md5-cache/dev-python/smmap-3.0.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/smmap/smmap-3.0.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=28a8d8b3532f08f2d26b7d74e9cbdb8c
diff --git a/metadata/md5-cache/dev-python/smmap2-2.0.3 b/metadata/md5-cache/dev-python/smmap2-2.0.3
index 73735eccbf0a..3b5cc1ddec4d 100644
--- a/metadata/md5-cache/dev-python/smmap2-2.0.3
+++ b/metadata/md5-cache/dev-python/smmap2-2.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/smmap2/smmap2-2.0.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e98c451348a29e86be83f0e29ac4a834
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.8.8 b/metadata/md5-cache/dev-python/snakeoil-0.8.8
index 0e2c83624a2e..e3a2d1fbb6e6 100644
--- a/metadata/md5-cache/dev-python/snakeoil-0.8.8
+++ b/metadata/md5-cache/dev-python/snakeoil-0.8.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.8.8.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=373096de604dc7cac0598ac22776f894
diff --git a/metadata/md5-cache/dev-python/snakeoil-9999 b/metadata/md5-cache/dev-python/snakeoil-9999
index 4e949924b069..a2bfd1f54e3c 100644
--- a/metadata/md5-cache/dev-python/snakeoil-9999
+++ b/metadata/md5-cache/dev-python/snakeoil-9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01757a1eef9bb2f4269980f8869b66ae
diff --git a/metadata/md5-cache/dev-python/snaketrace-0.1.1 b/metadata/md5-cache/dev-python/snaketrace-0.1.1
index 6f109b2f6b63..69998100eda9 100644
--- a/metadata/md5-cache/dev-python/snaketrace-0.1.1
+++ b/metadata/md5-cache/dev-python/snaketrace-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/dcoles/snaketrace/archive/v0.1.1.tar.gz -> snaketrace-0.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=529c9f2561258d3c845fbba05e4df787
diff --git a/metadata/md5-cache/dev-python/snappy-0.5.1-r1 b/metadata/md5-cache/dev-python/snappy-0.5.1-r1
index d74098bf8111..c7a7fe951ec5 100644
--- a/metadata/md5-cache/dev-python/snappy-0.5.1-r1
+++ b/metadata/md5-cache/dev-python/snappy-0.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-arch/snappy-1.0.2:= python_targets_python3_6? ( dev-lang/python:3.
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-snappy/python-snappy-0.5.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2cfd53af75e6a70ffe3a7ae68faadf9c
diff --git a/metadata/md5-cache/dev-python/snapshottest-0.5.1 b/metadata/md5-cache/dev-python/snapshottest-0.5.1
index 6a6159c4fffd..642cf100af7d 100644
--- a/metadata/md5-cache/dev-python/snapshottest-0.5.1
+++ b/metadata/md5-cache/dev-python/snapshottest-0.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/syrusakbary/snapshottest/archive/4ac2b4fb09e9e7728bebb11967c164a914775d1d.tar.gz -> snapshottest-0.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=65b5ed164b6ea60cf5902a05fc43adea
diff --git a/metadata/md5-cache/dev-python/snowballstemmer-2.0.0 b/metadata/md5-cache/dev-python/snowballstemmer-2.0.0
index cc5fe10a1979..be4d90be95b6 100644
--- a/metadata/md5-cache/dev-python/snowballstemmer-2.0.0
+++ b/metadata/md5-cache/dev-python/snowballstemmer-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/snowballstemmer/snowballstemmer-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2bd1632017d46502346b7f83f4663c4b
diff --git a/metadata/md5-cache/dev-python/socketio-client-0.7.2 b/metadata/md5-cache/dev-python/socketio-client-0.7.2
index 8254573b6b7d..e78c73220d4a 100644
--- a/metadata/md5-cache/dev-python/socketio-client-0.7.2
+++ b/metadata/md5-cache/dev-python/socketio-client-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/socketIO-client/socketIO-client-0.7.2.tar.gz -> socketio-client-0.7.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f8f8aeaf2e7afe0cbe2984568c10912d
diff --git a/metadata/md5-cache/dev-python/socketio-client-nexus-0.7.6 b/metadata/md5-cache/dev-python/socketio-client-nexus-0.7.6
index ef92453429bb..e37d448c0f83 100644
--- a/metadata/md5-cache/dev-python/socketio-client-nexus-0.7.6
+++ b/metadata/md5-cache/dev-python/socketio-client-nexus-0.7.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/socketIO-client-nexus/socketIO-client-nexus-0.7.6.tar.gz -> socketio-client-nexus-0.7.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6df46635c33ca5123a6ed973a4d2f0b0
diff --git a/metadata/md5-cache/dev-python/socketpool-0.5.3-r3 b/metadata/md5-cache/dev-python/socketpool-0.5.3-r3
index 1f7812e4cad4..7af7b38378e2 100644
--- a/metadata/md5-cache/dev-python/socketpool-0.5.3-r3
+++ b/metadata/md5-cache/dev-python/socketpool-0.5.3-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/socketpool/socketpool-0.5.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fb0287689f67e626f3193a8bf0689a72
diff --git a/metadata/md5-cache/dev-python/sortedcollections-0.5.3 b/metadata/md5-cache/dev-python/sortedcollections-0.5.3
index ad5e39468696..ce09b5078019 100644
--- a/metadata/md5-cache/dev-python/sortedcollections-0.5.3
+++ b/metadata/md5-cache/dev-python/sortedcollections-0.5.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sortedcollections/sortedcollections-0.5.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d4e4d66fb09fbac79e97c36fc98c37f7
diff --git a/metadata/md5-cache/dev-python/sortedcontainers-2.2.2-r1 b/metadata/md5-cache/dev-python/sortedcontainers-2.2.2-r1
index b68315136127..f510289be71c 100644
--- a/metadata/md5-cache/dev-python/sortedcontainers-2.2.2-r1
+++ b/metadata/md5-cache/dev-python/sortedcontainers-2.2.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grantjenks/python-sortedcontainers/archive/v2.2.2.tar.gz -> python-sortedcontainers-2.2.2.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=73e7e6181a55d745a37b35c4af8c060b
diff --git a/metadata/md5-cache/dev-python/sortedcontainers-2.3.0 b/metadata/md5-cache/dev-python/sortedcontainers-2.3.0
index 1dc08f515efa..ec997cf43d5f 100644
--- a/metadata/md5-cache/dev-python/sortedcontainers-2.3.0
+++ b/metadata/md5-cache/dev-python/sortedcontainers-2.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grantjenks/python-sortedcontainers/archive/v2.3.0.tar.gz -> python-sortedcontainers-2.3.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=020936a702f7d33a113bf62b9693ea2a
diff --git a/metadata/md5-cache/dev-python/soupsieve-2.0.1 b/metadata/md5-cache/dev-python/soupsieve-2.0.1
index 11509e693426..fc8ca26dd13e 100644
--- a/metadata/md5-cache/dev-python/soupsieve-2.0.1
+++ b/metadata/md5-cache/dev-python/soupsieve-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/soupsieve/archive/2.0.1.tar.gz -> soupsieve-2.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3046e38216c90569ca34b75c04247653
diff --git a/metadata/md5-cache/dev-python/sparql-wrapper-1.8.5 b/metadata/md5-cache/dev-python/sparql-wrapper-1.8.5
index 756f3f83371c..3f876488026d 100644
--- a/metadata/md5-cache/dev-python/sparql-wrapper-1.8.5
+++ b/metadata/md5-cache/dev-python/sparql-wrapper-1.8.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SPARQLWrapper/SPARQLWrapper-1.8.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=656c720479da1131931ae63e3e6ab8e7
diff --git a/metadata/md5-cache/dev-python/speaklater-1.3-r1 b/metadata/md5-cache/dev-python/speaklater-1.3-r1
index 6a3ff7d910fd..cbfef4fec218 100644
--- a/metadata/md5-cache/dev-python/speaklater-1.3-r1
+++ b/metadata/md5-cache/dev-python/speaklater-1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/speaklater/speaklater-1.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=05e05027257e07839a5e223efd95a5f2
diff --git a/metadata/md5-cache/dev-python/speg-0.3-r1 b/metadata/md5-cache/dev-python/speg-0.3-r1
index 7db59d3f621f..3e621d404e62 100644
--- a/metadata/md5-cache/dev-python/speg-0.3-r1
+++ b/metadata/md5-cache/dev-python/speg-0.3-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/avakar/speg/archive/v0.3.tar.gz -> speg-0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cc2aa4e56c17cf0249a97eb44d01cc40
diff --git a/metadata/md5-cache/dev-python/sphinx-2.4.4 b/metadata/md5-cache/dev-python/sphinx-2.4.4
index 1fa49bd801c7..176cdb4ba059 100644
--- a/metadata/md5-cache/dev-python/sphinx-2.4.4
+++ b/metadata/md5-cache/dev-python/sphinx-2.4.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-2.4.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=11c57be428a8363ab6fa0e8fb0c354a9
diff --git a/metadata/md5-cache/dev-python/sphinx-3.2.1 b/metadata/md5-cache/dev-python/sphinx-3.2.1
index dd2bee83c1e5..216e16110db4 100644
--- a/metadata/md5-cache/dev-python/sphinx-3.2.1
+++ b/metadata/md5-cache/dev-python/sphinx-3.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-3.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bafb90b034a2bc9547113ea19a75b861
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=11c1a28d3683a523050a3a053c6192d8
diff --git a/metadata/md5-cache/dev-python/sphinx-3.3.1 b/metadata/md5-cache/dev-python/sphinx-3.3.1
index fec151c65f4b..8e1472312474 100644
--- a/metadata/md5-cache/dev-python/sphinx-3.3.1
+++ b/metadata/md5-cache/dev-python/sphinx-3.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-3.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=47668951236b3494b029a829e538812f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fa5c070e10e9fe06697c63418c944d86
diff --git a/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6 b/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
index 49af6e4d8996..afc3f114dde4 100644
--- a/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
+++ b/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
@@ -11,5 +11,5 @@ RDEPEND=dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp-theme/aiohttp-theme-0.1.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=95dfee48414e6396e7b4bb1b69908f38
diff --git a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0 b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0
index 91c544c342d4..3ee8de4d8923 100644
--- a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0
+++ b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/ryan-roemer/sphinx-bootstrap-theme/archive/v0.8.0.tar.gz -> sphinx-bootstrap-theme-0.8.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c91fb5c70ea4a5c79ed4ef9533607387
diff --git a/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4 b/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
index db64eac530c6..f79ae96c5eec 100644
--- a/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
+++ b/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-epytext/sphinx-epytext-0.0.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=38d33fb1e3d60a5ceae7d6ea54cd7a2b
diff --git a/metadata/md5-cache/dev-python/sphinx-gallery-0.3.1-r1 b/metadata/md5-cache/dev-python/sphinx-gallery-0.3.1-r1
index ca649fc56811..1509970b5554 100644
--- a/metadata/md5-cache/dev-python/sphinx-gallery-0.3.1-r1
+++ b/metadata/md5-cache/dev-python/sphinx-gallery-0.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-gallery/sphinx-gallery-0.3.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2986aa629b985e7d6bfcd962bc75ad79
diff --git a/metadata/md5-cache/dev-python/sphinx-gallery-0.8.1 b/metadata/md5-cache/dev-python/sphinx-gallery-0.8.1
index dd4aff73090d..d47cc5eadbb3 100644
--- a/metadata/md5-cache/dev-python/sphinx-gallery-0.8.1
+++ b/metadata/md5-cache/dev-python/sphinx-gallery-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-gallery/sphinx-gallery-0.8.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7c8db1c298cae6c32722e8755bd7905f
diff --git a/metadata/md5-cache/dev-python/sphinx-issues-1.2.0 b/metadata/md5-cache/dev-python/sphinx-issues-1.2.0
index 2f30a9a30687..7cadc60c23cc 100644
--- a/metadata/md5-cache/dev-python/sphinx-issues-1.2.0
+++ b/metadata/md5-cache/dev-python/sphinx-issues-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sloria/sphinx-issues/archive/1.2.0.tar.gz -> sphinx-issues-1.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dfdb71fb225d7839133e91aabb56c2b6
diff --git a/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0 b/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
index 60e6fc614a06..de9352229c6b 100644
--- a/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
+++ b/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-jinja/sphinx-jinja-0.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ea98eefbba67714f384c5b7ab29d401e
diff --git a/metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4 b/metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4
index c6955ea4d420..85bf7c100db5 100644
--- a/metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4
+++ b/metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Holzhaus/sphinx-multiversion/archive/v0.2.4.tar.gz -> sphinx-multiversion-0.2.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=58d49685d24d2ff7960ca510cdc7f31f
diff --git a/metadata/md5-cache/dev-python/sphinx-notfound-page-0.5 b/metadata/md5-cache/dev-python/sphinx-notfound-page-0.5
index e8620428aee2..92468376a6b2 100644
--- a/metadata/md5-cache/dev-python/sphinx-notfound-page-0.5
+++ b/metadata/md5-cache/dev-python/sphinx-notfound-page-0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/readthedocs/sphinx-notfound-page/archive/0.5.tar.gz -> sphinx-notfound-page-0.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3a32d75550a1d820a1a0308139f2bc13
diff --git a/metadata/md5-cache/dev-python/sphinx-panels-0.4.1 b/metadata/md5-cache/dev-python/sphinx-panels-0.4.1
index 06ec1f77188a..6aab3a25cffe 100644
--- a/metadata/md5-cache/dev-python/sphinx-panels-0.4.1
+++ b/metadata/md5-cache/dev-python/sphinx-panels-0.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/executablebooks/sphinx-panels/archive/v0.4.1.tar.gz -> sphinx-panels-0.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=61df41a866f6e520e19e47a98b35d717
diff --git a/metadata/md5-cache/dev-python/sphinx-prompt-1.3.0 b/metadata/md5-cache/dev-python/sphinx-prompt-1.3.0
index c079c30f016d..604e1230763b 100644
--- a/metadata/md5-cache/dev-python/sphinx-prompt-1.3.0
+++ b/metadata/md5-cache/dev-python/sphinx-prompt-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_7(-)?,
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/sbrunner/sphinx-prompt/archive/1.3.0.tar.gz -> sphinx-prompt-1.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1d99439cb0f6166ab0d5650b9eb870b5
diff --git a/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1 b/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1
index caffff8f902f..68ef2882b536 100644
--- a/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1
+++ b/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f7c541ec0e42ab7fe257156d65a50e10
diff --git a/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1 b/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1
index 5431a5f68339..c4041160f8bd 100644
--- a/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-testing/sphinx-testing-1.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d986b979948d554766590c9c0e3421d4
diff --git a/metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1 b/metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1
index eac01c7f78a7..e85225b91890 100644
--- a/metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1
+++ b/metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/sphinx-2.0.0[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx_celery/sphinx_celery-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=824a6c9da11ebdc82291d71a49997d4b
diff --git a/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.2.4 b/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.2.4
index 6c25ab2f55bb..963eac325af4 100644
--- a/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.2.4
+++ b/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.2.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5dd2fe6d5f9e2856b64ddeaf76ad8b4c
diff --git a/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.4.3-r1 b/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.4.3-r1
index d45f03c1fdb7..6cea87b9fe7c 100644
--- a/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.4.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=ReadTheDocs.org theme for Sphinx
 EAPI=7
 HOMEPAGE=https://github.com/readthedocs/sphinx_rtd_theme
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 PDEPEND=dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4a41b474df0dfa99cce446dc98e331bc
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=abc82f92bcea59de7de229bf675ac258
diff --git a/metadata/md5-cache/dev-python/sphinx_selective_exclude-1.0.3 b/metadata/md5-cache/dev-python/sphinx_selective_exclude-1.0.3
index 1f10d5c393c4..d273bac2ce4f 100644
--- a/metadata/md5-cache/dev-python/sphinx_selective_exclude-1.0.3
+++ b/metadata/md5-cache/dev-python/sphinx_selective_exclude-1.0.3
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1c80f38935603e018ee7a988aa31f677
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2 b/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2
index a2d2c2a0c424..69693b5a2ea2 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6def6ec137319a8e54c329694d27cb08
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2 b/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2
index dae800f974c2..3b6ca553b690 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e71198dc50686ff914b89b89c8b1ec95
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0 b/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0
index f68252a9430e..78adea120e94 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/blockdiag/sphinxcontrib-blockdiag/archive/2.0.0.tar.gz -> sphinxcontrib-blockdiag-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2975794488f4979e309e35e5e516152b
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2 b/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2
index 958b77ab36e0..f2edaa6b4898 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=61016e6d98c3d7033896ffaaaa3e9a42
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.6.1 b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.6.1
index a19000a40a67..ab6e66a8ec2c 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.6.1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.6.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/sphinx-1.0[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f53ab5de017f74183b1e7c940673c754
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.1-r2 b/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.1-r2
index 2bc9e75e1943..1a5e49000594 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.1-r2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jupyter/sphinxcontrib_github_alt/archive/1.1.tar.gz -> sphinxcontrib-github-alt-1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d0ea43443bf25b79f7c2fed260223698
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.3 b/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.3
index 6961eab0f3db..186815415364 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.3
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4bf9a77efc818ba246d6a108242866cb
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.7.0 b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.7.0
index 1cf5dac4eae6..a270723836db 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.7.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sphinx-contrib/httpdomain/archive/1.7.0.tar.gz -> sphinxcontrib-httpdomain-1.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4d788f51d875fff001e72dee8fb65e96
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-httpexample-0.10.3 b/metadata/md5-cache/dev-python/sphinxcontrib-httpexample-0.10.3
index 0417d4dc9b6c..b69715fe5c73 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-httpexample-0.10.3
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-httpexample-0.10.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/collective/sphinxcontrib-httpexample/archive/0.10.3.tar.gz -> sphinxcontrib-httpexample-0.10.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=01c8fed5e53dde2e04fa039fd8721b05
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1
index 52ee1023f165..227666531e5e 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64beaf6de65e27d269ff35e02e20170c
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2 b/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2
index 37ad6454720a..196d01e1f07d 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ea07c5334f1712d71f4c288ff566fad6
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1
index 20da67625155..287ab232a4cb 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0b72d50349b54c66f6b4be8fb3dd05ca
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4 b/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4
index 994b8bec7679..c05971810af0 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0701fb3e201ca648d0e3ef2e59b0a334
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-pretty-searchresults-0.3.5 b/metadata/md5-cache/dev-python/sphinxcontrib-pretty-searchresults-0.3.5
index 95dc737ca7ab..d36808a367d4 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-pretty-searchresults-0.3.5
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-pretty-searchresults-0.3.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sphinx-contrib/sphinx-pretty-searchresults/archive/v0.3.5.tar.gz -> sphinxcontrib-pretty-searchresults-0.3.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b9dfcb6e8ad433b8d639528f97679348
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.16 b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.16
index 5b855c9a368d..b8f88c2f00b0 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.16
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.16
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.16.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=03198baea840b89bcd2fa53aefa0eabd
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3 b/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3
index dd25c3a2a06c..4a12f2652a5f 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4b39e6eab13c6fb768578da99522edfb
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.4 b/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.4
index f3c8aed9ae4b..28b333e5b347 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.4
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=039b6200409046bf64d517d8817e7294
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.3.0 b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.3.0
index 8defb2393bf6..f77e097203da 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.3.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c3166f573bc4f8889e8210d64164d6fa
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.4.0 b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.4.0
index a3192f80e4db..2e0ce82cae9a 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.4.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-spelling/sphinxcontrib-spelling-5.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a535505e27584146fcabf2e670b7fdef
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.0.0 b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.0.0
index 2349ca849343..31f7e67766ea 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.0.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cd7e958842043d50b5b9782b77f41e40
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.0.1 b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.0.1
index 387a3a1bc87b..c1246fda222b 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.0.1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-spelling/sphinxcontrib-spelling-7.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3b21481566009b50fde4f70d97ea54d3
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.1.0 b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.1.0
index 0804067f6a7b..46f42f35ee86 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.1.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-spelling/sphinxcontrib-spelling-7.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3b21481566009b50fde4f70d97ea54d3
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4 b/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4
index 14a6140954fa..4ea98e125b27 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sphinx-doc/sphinxcontrib-websupport/archive/1.2.4.tar.gz -> sphinxcontrib-websupport-1.2.4.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=61ef8e8754ada19db49b90e5243df49f
diff --git a/metadata/md5-cache/dev-python/spur-0.3.22 b/metadata/md5-cache/dev-python/spur-0.3.22
index a058e130b6f0..1555206519d9 100644
--- a/metadata/md5-cache/dev-python/spur-0.3.22
+++ b/metadata/md5-cache/dev-python/spur-0.3.22
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mwilliamson/spur.py/archive/0.3.22.tar.gz -> spur.py-0.3.22.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=35e62c17d94ffb04a3c60fbd8e3875b1
diff --git a/metadata/md5-cache/dev-python/spyder-4.2.0 b/metadata/md5-cache/dev-python/spyder-4.2.0
index 80131a4ee60d..b91dd09ed1ba 100644
--- a/metadata/md5-cache/dev-python/spyder-4.2.0
+++ b/metadata/md5-cache/dev-python/spyder-4.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/spyder/archive/v4.2.0.tar.gz -> spyder-4.2.0.tar.gz https://github.com/spyder-ide/spyder-docs/archive/7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c.tar.gz -> spyder-docs-7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e0e3efd8fe7103757b67a37f2f1b3b0
diff --git a/metadata/md5-cache/dev-python/spyder-kernels-1.10.0 b/metadata/md5-cache/dev-python/spyder-kernels-1.10.0
index 4a4895ecee52..a56196ffd2d7 100644
--- a/metadata/md5-cache/dev-python/spyder-kernels-1.10.0
+++ b/metadata/md5-cache/dev-python/spyder-kernels-1.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/spyder-kernels/archive/v1.10.0.tar.gz -> spyder-kernels-1.10.0-gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=902d53a210b70b931b6e532114b67884
diff --git a/metadata/md5-cache/dev-python/spyder-line-profiler-0.2.1 b/metadata/md5-cache/dev-python/spyder-line-profiler-0.2.1
index 1fd80ae8a6ce..52c66a0249fd 100644
--- a/metadata/md5-cache/dev-python/spyder-line-profiler-0.2.1
+++ b/metadata/md5-cache/dev-python/spyder-line-profiler-0.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/spyder-line-profiler/archive/v0.2.1.tar.gz -> spyder-line-profiler-0.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=96e488746090ddd68df0d1dba046ef78
diff --git a/metadata/md5-cache/dev-python/spyder-memory-profiler-0.2.1 b/metadata/md5-cache/dev-python/spyder-memory-profiler-0.2.1
index 66984eeb87bf..7cec8054c5b4 100644
--- a/metadata/md5-cache/dev-python/spyder-memory-profiler-0.2.1
+++ b/metadata/md5-cache/dev-python/spyder-memory-profiler-0.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/spyder-memory-profiler/archive/v0.2.1.tar.gz -> spyder-memory-profiler-0.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=b57c4b7731f6524e240afd634c644dda
diff --git a/metadata/md5-cache/dev-python/spyder-notebook-0.3.1 b/metadata/md5-cache/dev-python/spyder-notebook-0.3.1
index dcccbbc8ccb7..148b07336844 100644
--- a/metadata/md5-cache/dev-python/spyder-notebook-0.3.1
+++ b/metadata/md5-cache/dev-python/spyder-notebook-0.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/spyder-notebook/archive/v0.3.1.tar.gz -> spyder-notebook-0.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=ddd7911588f1ddfe81a550bb65b1e8d1
diff --git a/metadata/md5-cache/dev-python/spyder-terminal-0.5.0 b/metadata/md5-cache/dev-python/spyder-terminal-0.5.0
index 6b6b74e13b78..1bfc2f1d9915 100644
--- a/metadata/md5-cache/dev-python/spyder-terminal-0.5.0
+++ b/metadata/md5-cache/dev-python/spyder-terminal-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/coloredlogs[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spyder-terminal/spyder-terminal-0.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e8ab2275e9d18e126ce4448dd03d3216
diff --git a/metadata/md5-cache/dev-python/spyder-unittest-0.4.1 b/metadata/md5-cache/dev-python/spyder-unittest-0.4.1
index e47b3b536aed..5fab7d10e6a5 100644
--- a/metadata/md5-cache/dev-python/spyder-unittest-0.4.1
+++ b/metadata/md5-cache/dev-python/spyder-unittest-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/spyder-unittest/archive/v0.4.1.tar.gz -> spyder-unittest-0.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=9a326773f140cd238a9a4e360f17458f
diff --git a/metadata/md5-cache/dev-python/spyder-vim-0_pre20201026 b/metadata/md5-cache/dev-python/spyder-vim-0_pre20201026
index 0b7c1e7897e8..7a7e92f208d0 100644
--- a/metadata/md5-cache/dev-python/spyder-vim-0_pre20201026
+++ b/metadata/md5-cache/dev-python/spyder-vim-0_pre20201026
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/spyder-vim/archive/4d0bf821abb193bfd158e2489970e1873a9f1138.tar.gz -> spyder-vim-0_pre20201026.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=66693cbc89ab20043b74bc50262f0b4a
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.17 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.17
index 772644014128..0d5fa9455619 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.3.17
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.17
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy3 python_targets_python3_6
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.17.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8181b05225c4a18a9d3997191d3938ea
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.20 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.20
index 7938e7971ef5..b2aa0fbc2112 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.3.20
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.20
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy3 python_targets_python3_6
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.20.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b70c31ebde15b766473a6fbfc98c6195
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.13.0 b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.13.0
index a86484dd6fa4..ebd409cd0f17 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.13.0
+++ b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.13.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/sqlalchemy-0.9.6[python_targets_python3_6(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b9213e97f91a8e8cb08ef9d9cf0478e9
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0 b/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0
index efab02643036..7925fd8d839b 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0
+++ b/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rqlite/sqlalchemy-rqlite/archive/v1.0.tar.gz -> sqlalchemy-rqlite-1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c20f717a153fb836835acf1063c7f056
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-rqlite-9999 b/metadata/md5-cache/dev-python/sqlalchemy-rqlite-9999
index 219a87f78ed9..def9f89149fc 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-rqlite-9999
+++ b/metadata/md5-cache/dev-python/sqlalchemy-rqlite-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyrqlite[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5f0c8ddb5aedcc911b1a34e318aae7a8
diff --git a/metadata/md5-cache/dev-python/sqlparse-0.3.1 b/metadata/md5-cache/dev-python/sqlparse-0.3.1
index ca0423215dbb..fb326d5191b8 100644
--- a/metadata/md5-cache/dev-python/sqlparse-0.3.1
+++ b/metadata/md5-cache/dev-python/sqlparse-0.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sqlparse/sqlparse-0.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0072e005dacd6ec70869c7460439e541
diff --git a/metadata/md5-cache/dev-python/sqlparse-0.4.1 b/metadata/md5-cache/dev-python/sqlparse-0.4.1
index 596a6b9d3f84..8bcffd38b600 100644
--- a/metadata/md5-cache/dev-python/sqlparse-0.4.1
+++ b/metadata/md5-cache/dev-python/sqlparse-0.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sqlparse/sqlparse-0.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=adac221ab3979285dafaf9d655f07729
diff --git a/metadata/md5-cache/dev-python/sshtunnel-0.1.4-r2 b/metadata/md5-cache/dev-python/sshtunnel-0.1.4-r2
index cb45ea5be9e0..5b259448fa3a 100644
--- a/metadata/md5-cache/dev-python/sshtunnel-0.1.4-r2
+++ b/metadata/md5-cache/dev-python/sshtunnel-0.1.4-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/sshtunnel/sshtunnel-0.1.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3a279790ba886ec725bed6f0b72561a6
diff --git a/metadata/md5-cache/dev-python/sshtunnel-0.1.5 b/metadata/md5-cache/dev-python/sshtunnel-0.1.5
index e6350c33fe99..b85f1d704a61 100644
--- a/metadata/md5-cache/dev-python/sshtunnel-0.1.5
+++ b/metadata/md5-cache/dev-python/sshtunnel-0.1.5
@@ -9,8 +9,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
+RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sshtunnel/sshtunnel-0.1.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0cd6745d07293a9cac84e36f103a85ff
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9fb19ed3e524ff1b59e8b6b945473ee2
diff --git a/metadata/md5-cache/dev-python/sshtunnel-0.3.1 b/metadata/md5-cache/dev-python/sshtunnel-0.3.1
new file mode 100644
index 000000000000..fdfb88bc78f2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sshtunnel-0.3.1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=Pure Python SSH tunnels
+EAPI=7
+HOMEPAGE=https://pypi.org/project/sshtunnel/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/s/sshtunnel/sshtunnel-0.3.1.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2eb24df2100823b1db100572344548ce
diff --git a/metadata/md5-cache/dev-python/ssl-fetch-0.4 b/metadata/md5-cache/dev-python/ssl-fetch-0.4
index 657a2dd2a42a..2743f82b3f2a 100644
--- a/metadata/md5-cache/dev-python/ssl-fetch-0.4
+++ b/metadata/md5-cache/dev-python/ssl-fetch-0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-1.2.1[python_targets_pypy3(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/ssl-fetch/ssl-fetch-0.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1db60ed7e8e11aaae3887c382b5d0c3b
diff --git a/metadata/md5-cache/dev-python/ssl-fetch-9999 b/metadata/md5-cache/dev-python/ssl-fetch-9999
index e83866206c00..a986e3cc1214 100644
--- a/metadata/md5-cache/dev-python/ssl-fetch-9999
+++ b/metadata/md5-cache/dev-python/ssl-fetch-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/requests-1.2.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b4e1c67574015530ba848dfd8bc4457
diff --git a/metadata/md5-cache/dev-python/stapler-1.0.0_p20200531 b/metadata/md5-cache/dev-python/stapler-1.0.0_p20200531
index 4ee05494f097..3ea560f76717 100644
--- a/metadata/md5-cache/dev-python/stapler-1.0.0_p20200531
+++ b/metadata/md5-cache/dev-python/stapler-1.0.0_p20200531
@@ -11,5 +11,5 @@ RDEPEND=dev-python/PyPDF2[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/hellerbarde/stapler/archive/1cabc85521e2badfc1e0d690086e286e701c2d9e.tar.gz -> stapler-1.0.0_p20200531.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=f3e55b7b7396bc5c1aa5d11479d6bd9f
diff --git a/metadata/md5-cache/dev-python/statsd-3.3.0 b/metadata/md5-cache/dev-python/statsd-3.3.0
index 4b5f973a1aa1..50596aac5956 100644
--- a/metadata/md5-cache/dev-python/statsd-3.3.0
+++ b/metadata/md5-cache/dev-python/statsd-3.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsd/statsd-3.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c26540f748cf7a30407c1122d6acc979
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.11.1 b/metadata/md5-cache/dev-python/statsmodels-0.11.1
index 2791000cc8c4..53698fa133ed 100644
--- a/metadata/md5-cache/dev-python/statsmodels-0.11.1
+++ b/metadata/md5-cache/dev-python/statsmodels-0.11.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.11.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3965592348e99a1afe7dc2ec14a5b77f
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.12.0 b/metadata/md5-cache/dev-python/statsmodels-0.12.0
index 1ad864e13020..40917745e05b 100644
--- a/metadata/md5-cache/dev-python/statsmodels-0.12.0
+++ b/metadata/md5-cache/dev-python/statsmodels-0.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.12.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d3e259ef0d94dd583b41e2f5e3b0df3b
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.12.1 b/metadata/md5-cache/dev-python/statsmodels-0.12.1
index 31dded9948ce..e5b19979ffcd 100644
--- a/metadata/md5-cache/dev-python/statsmodels-0.12.1
+++ b/metadata/md5-cache/dev-python/statsmodels-0.12.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.12.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c84ee500fdb209c552d9943363220679
diff --git a/metadata/md5-cache/dev-python/statsmodels-9999 b/metadata/md5-cache/dev-python/statsmodels-9999
index 99bfb067d974..92b3e16c0cd5 100644
--- a/metadata/md5-cache/dev-python/statsmodels-9999
+++ b/metadata/md5-cache/dev-python/statsmodels-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=b3f2cbb1f31b3f8b605623e202ef58bd
diff --git a/metadata/md5-cache/dev-python/stestr-2.1.0-r1 b/metadata/md5-cache/dev-python/stestr-2.1.0-r1
index bf2acf890b2d..738aaa2d5702 100644
--- a/metadata/md5-cache/dev-python/stestr-2.1.0-r1
+++ b/metadata/md5-cache/dev-python/stestr-2.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/stestr/stestr-2.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b6499a9d7a41ae5ae5c06ebff690ef16
diff --git a/metadata/md5-cache/dev-python/stevedore-3.2.2 b/metadata/md5-cache/dev-python/stevedore-3.2.2
index f069937cbae9..150efc2820ed 100644
--- a/metadata/md5-cache/dev-python/stevedore-3.2.2
+++ b/metadata/md5-cache/dev-python/stevedore-3.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stevedore/stevedore-3.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=433d8d6fed5259510cf7c066d197413d
diff --git a/metadata/md5-cache/dev-python/stevedore-3.3.0 b/metadata/md5-cache/dev-python/stevedore-3.3.0
new file mode 100644
index 000000000000..8e58aebb1085
--- /dev/null
+++ b/metadata/md5-cache/dev-python/stevedore-3.3.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/testtools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( python_targets_python3_6? ( >=dev-python/importlib_metadata-1.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-1.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_9(-),python_single_target_python3_9(+)] >=dev-python/reno-2.5.0[python_targets_python3_9(-),python_single_target_python3_9(+)] >=dev-python/sphinx-2.0.0[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/reno-2.5.0[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/sphinx-2.0.0[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/reno-2.5.0[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/sphinx-2.0.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/reno-2.5.0[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/sphinx-2.0.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Manage dynamic plugins for Python applications
+EAPI=7
+HOMEPAGE=https://github.com/openstack/stevedore https://pypi.org/project/stevedore/
+IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_6? ( >=dev-python/importlib_metadata-1.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-1.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/stevedore/stevedore-3.3.0.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9ccdaa0164ee54d5dded14639be4e459
diff --git a/metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1 b/metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1
index 9da8ab646506..647bdcea0abe 100644
--- a/metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1
+++ b/metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/danielrichman/strict-rfc3339/archive/version-0.7.tar.gz -> strict-rfc3339-version-0.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c3480ca45924946a4e12593631c049af
diff --git a/metadata/md5-cache/dev-python/stripe-2.46.0 b/metadata/md5-cache/dev-python/stripe-2.46.0
index cb9757a1d56a..812ab73eefd4 100644
--- a/metadata/md5-cache/dev-python/stripe-2.46.0
+++ b/metadata/md5-cache/dev-python/stripe-2.46.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stripe/stripe-2.46.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f4025c8a224cc962d6e4dccb082ee80a
diff --git a/metadata/md5-cache/dev-python/subunit-1.4.0 b/metadata/md5-cache/dev-python/subunit-1.4.0
index 95b33d7c8ee7..096f1f6ea5bc 100644
--- a/metadata/md5-cache/dev-python/subunit-1.4.0
+++ b/metadata/md5-cache/dev-python/subunit-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/subunit/trunk/1.4.0/+download/subunit-1.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bc8b312b1faa2f5c3fd54e741dc5a608
diff --git a/metadata/md5-cache/dev-python/subvertpy-0.10.1 b/metadata/md5-cache/dev-python/subvertpy-0.10.1
index 40d6d6cad783..307042146b03 100644
--- a/metadata/md5-cache/dev-python/subvertpy-0.10.1
+++ b/metadata/md5-cache/dev-python/subvertpy-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/subversion-1.4 python_targets_python3_6? ( dev-lang/python:3.6
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/subvertpy/subvertpy-0.10.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d958a699aca998329d0cb57bad2b62a5
diff --git a/metadata/md5-cache/dev-python/suds-0.6-r1 b/metadata/md5-cache/dev-python/suds-0.6-r1
index f4e2ecb5abcf..a89151ffc089 100644
--- a/metadata/md5-cache/dev-python/suds-0.6-r1
+++ b/metadata/md5-cache/dev-python/suds-0.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/suds-jurko/suds-jurko-0.6.tar.bz2 -> suds-0.6.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1340b8010c9eb8b91dae9657f97b8586
diff --git a/metadata/md5-cache/dev-python/suds-0.8.4 b/metadata/md5-cache/dev-python/suds-0.8.4
index 2d1a6452ff57..7978383d7ab5 100644
--- a/metadata/md5-cache/dev-python/suds-0.8.4
+++ b/metadata/md5-cache/dev-python/suds-0.8.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/suds-community/suds-community-0.8.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0c1eeb86cc8b1725b35d9fd2e1f3281f
diff --git a/metadata/md5-cache/dev-python/sure-1.4.11 b/metadata/md5-cache/dev-python/sure-1.4.11
index 4d3c4a9d082f..2c35977f2116 100644
--- a/metadata/md5-cache/dev-python/sure-1.4.11
+++ b/metadata/md5-cache/dev-python/sure-1.4.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sure/sure-1.4.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=33a72d208458d8e5e451effba37b71f9
diff --git a/metadata/md5-cache/dev-python/svg-path-4.0.2 b/metadata/md5-cache/dev-python/svg-path-4.0.2
index b2ae82bca4bd..0781379de6b8 100644
--- a/metadata/md5-cache/dev-python/svg-path-4.0.2
+++ b/metadata/md5-cache/dev-python/svg-path-4.0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/regebro/svg.path/archive/4.0.2.tar.gz -> svg.path-4.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0d3fdc182d7d49716f50ac9cbfb7120f
diff --git a/metadata/md5-cache/dev-python/svgwrite-1.4 b/metadata/md5-cache/dev-python/svgwrite-1.4
index f8aa984a5ec9..435afdb145ed 100644
--- a/metadata/md5-cache/dev-python/svgwrite-1.4
+++ b/metadata/md5-cache/dev-python/svgwrite-1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mozman/svgwrite/archive/v1.4.tar.gz -> svgwrite-1.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4f96c34f851c02f410b5b80cd504e948
diff --git a/metadata/md5-cache/dev-python/swagger-spec-validator-2.5.0 b/metadata/md5-cache/dev-python/swagger-spec-validator-2.5.0
index 507731d12b30..b1cf20f2e5c1 100644
--- a/metadata/md5-cache/dev-python/swagger-spec-validator-2.5.0
+++ b/metadata/md5-cache/dev-python/swagger-spec-validator-2.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/swagger-spec-validator/swagger-spec-validator-2.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a9033155ab9ed0f5c314b563298834f3
diff --git a/metadata/md5-cache/dev-python/sybil-1.4.0 b/metadata/md5-cache/dev-python/sybil-1.4.0
index e82b8204a99d..b3f0cc3f2680 100644
--- a/metadata/md5-cache/dev-python/sybil-1.4.0
+++ b/metadata/md5-cache/dev-python/sybil-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sybil/sybil-1.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bfff6a6ce17da54a187b528c5254523f
diff --git a/metadata/md5-cache/dev-python/sybil-2.0.0 b/metadata/md5-cache/dev-python/sybil-2.0.0
index 0bd69dc6bd49..795c1d7393f5 100644
--- a/metadata/md5-cache/dev-python/sybil-2.0.0
+++ b/metadata/md5-cache/dev-python/sybil-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sybil/sybil-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c794b61f76af10b7b926c7af441d4c44
diff --git a/metadata/md5-cache/dev-python/sybil-2.0.1 b/metadata/md5-cache/dev-python/sybil-2.0.1
index d4de8fcdbc82..3b055dc05e32 100644
--- a/metadata/md5-cache/dev-python/sybil-2.0.1
+++ b/metadata/md5-cache/dev-python/sybil-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sybil/sybil-2.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c794b61f76af10b7b926c7af441d4c44
diff --git a/metadata/md5-cache/dev-python/symengine-0.6.1-r1 b/metadata/md5-cache/dev-python/symengine-0.6.1-r1
index 6acc41c78220..a43a6520133e 100644
--- a/metadata/md5-cache/dev-python/symengine-0.6.1-r1
+++ b/metadata/md5-cache/dev-python/symengine-0.6.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/symengine/symengine.py/archive/v0.6.1.tar.gz -> symengine.py-0.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2b18152d36ed8cdd1781baac96ad2e84
diff --git a/metadata/md5-cache/dev-python/sympy-1.6.2 b/metadata/md5-cache/dev-python/sympy-1.6.2
index b76eee8ef52a..0e02b068449e 100644
--- a/metadata/md5-cache/dev-python/sympy-1.6.2
+++ b/metadata/md5-cache/dev-python/sympy-1.6.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sympy/sympy/archive/sympy-1.6.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5c7f34da0b08afb141ef5780976c6454
diff --git a/metadata/md5-cache/dev-python/sympy-1.7 b/metadata/md5-cache/dev-python/sympy-1.7
index 3a242f9a4cf3..d628e8425fc2 100644
--- a/metadata/md5-cache/dev-python/sympy-1.7
+++ b/metadata/md5-cache/dev-python/sympy-1.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sympy/sympy/archive/sympy-1.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=115dd84ef7be330bef1ea3682bcb2cb3
diff --git a/metadata/md5-cache/dev-python/sympy-1.7_rc1 b/metadata/md5-cache/dev-python/sympy-1.7_rc1
index 62b56b04e27f..cadbbf02ef20 100644
--- a/metadata/md5-cache/dev-python/sympy-1.7_rc1
+++ b/metadata/md5-cache/dev-python/sympy-1.7_rc1
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sympy/sympy/archive/sympy-1.7rc1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=1351d18c512731e0af16da5763dab398
diff --git a/metadata/md5-cache/dev-python/tabulate-0.8.7 b/metadata/md5-cache/dev-python/tabulate-0.8.7
index c5400c726335..0b454d7371dd 100644
--- a/metadata/md5-cache/dev-python/tabulate-0.8.7
+++ b/metadata/md5-cache/dev-python/tabulate-0.8.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/astanin/python-tabulate/archive/v0.8.7.tar.gz -> tabulate-0.8.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fcb59697d210263342fc552380a80b8e
diff --git a/metadata/md5-cache/dev-python/tagpy-2018.1-r1 b/metadata/md5-cache/dev-python/tagpy-2018.1-r1
index 17e4ff0bf4d9..f5f90185d6ad 100644
--- a/metadata/md5-cache/dev-python/tagpy-2018.1-r1
+++ b/metadata/md5-cache/dev-python/tagpy-2018.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/boost-1.70:=[python,threads,python_targets_python3_6(-)?,pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tagpy/tagpy-2018.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=affc14400024bbe5e48de9a615fd183e
diff --git a/metadata/md5-cache/dev-python/tappy-3.0 b/metadata/md5-cache/dev-python/tappy-3.0
index e7d09247b04c..42286104c72d 100644
--- a/metadata/md5-cache/dev-python/tappy-3.0
+++ b/metadata/md5-cache/dev-python/tappy-3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tap.py/tap.py-3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6784412545f12b6155b5d66bddeedd84
diff --git a/metadata/md5-cache/dev-python/taskflow-4.1.0 b/metadata/md5-cache/dev-python/taskflow-4.1.0
index b5243cb137f2..01df45f8d54d 100644
--- a/metadata/md5-cache/dev-python/taskflow-4.1.0
+++ b/metadata/md5-cache/dev-python/taskflow-4.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/taskflow/taskflow-4.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=14ad312f0f03e1e95e57db6a068eefd5
diff --git a/metadata/md5-cache/dev-python/taskflow-4.5.0 b/metadata/md5-cache/dev-python/taskflow-4.5.0
index c33fe3303498..46de51430f56 100644
--- a/metadata/md5-cache/dev-python/taskflow-4.5.0
+++ b/metadata/md5-cache/dev-python/taskflow-4.5.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/t/taskflow/taskflow-4.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dd1022d1cdebb8568dffdde11a348b51
diff --git a/metadata/md5-cache/dev-python/tblib-1.7.0 b/metadata/md5-cache/dev-python/tblib-1.7.0
index 087df5fd65e4..f9c0088356ee 100644
--- a/metadata/md5-cache/dev-python/tblib-1.7.0
+++ b/metadata/md5-cache/dev-python/tblib-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tblib/tblib-1.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=29a576210acf47b951c6718dcafe516d
diff --git a/metadata/md5-cache/dev-python/tempita-0.5.3-r3 b/metadata/md5-cache/dev-python/tempita-0.5.3-r3
index ffd399d0e6c2..0c7bc8845313 100644
--- a/metadata/md5-cache/dev-python/tempita-0.5.3-r3
+++ b/metadata/md5-cache/dev-python/tempita-0.5.3-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/ianb/tempita/get/97392d008cc8.tar.gz -> tempita-0.5.3-bitbucket.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=52462f0d717ce9a92cf9c8eb89951ed8
diff --git a/metadata/md5-cache/dev-python/tempora-3.0.0 b/metadata/md5-cache/dev-python/tempora-3.0.0
index 88d3c8d462ea..60682cf84a92 100644
--- a/metadata/md5-cache/dev-python/tempora-3.0.0
+++ b/metadata/md5-cache/dev-python/tempora-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempora/tempora-3.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c2040b625c9a90d80a7aec3d4ef21fb0
diff --git a/metadata/md5-cache/dev-python/tempora-4.0.0 b/metadata/md5-cache/dev-python/tempora-4.0.0
index e031d86617f1..cfce46c014a5 100644
--- a/metadata/md5-cache/dev-python/tempora-4.0.0
+++ b/metadata/md5-cache/dev-python/tempora-4.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempora/tempora-4.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7e2def3fd5ede19514ebba1c04832a83
diff --git a/metadata/md5-cache/dev-python/tempora-4.0.1 b/metadata/md5-cache/dev-python/tempora-4.0.1
index 5151573a9c7c..a178bb3ffa7a 100644
--- a/metadata/md5-cache/dev-python/tempora-4.0.1
+++ b/metadata/md5-cache/dev-python/tempora-4.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempora/tempora-4.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8bf2e4194e5d687d33d21727740e9974
diff --git a/metadata/md5-cache/dev-python/tenacity-6.2.0 b/metadata/md5-cache/dev-python/tenacity-6.2.0
index 59e7bcc4c82b..8d63dff53c08 100644
--- a/metadata/md5-cache/dev-python/tenacity-6.2.0
+++ b/metadata/md5-cache/dev-python/tenacity-6.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tenacity/tenacity-6.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7b1970bfe380bd367091a612b4e6eff7
diff --git a/metadata/md5-cache/dev-python/termcolor-1.1.0-r2 b/metadata/md5-cache/dev-python/termcolor-1.1.0-r2
index 2a358b10997c..396990d3cbcd 100644
--- a/metadata/md5-cache/dev-python/termcolor-1.1.0-r2
+++ b/metadata/md5-cache/dev-python/termcolor-1.1.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/termcolor/termcolor-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0446d0b0b907f526cf81dddc0639059d
diff --git a/metadata/md5-cache/dev-python/terminado-0.8.3 b/metadata/md5-cache/dev-python/terminado-0.8.3
index 6872f4a35ca4..60d73f84f91b 100644
--- a/metadata/md5-cache/dev-python/terminado-0.8.3
+++ b/metadata/md5-cache/dev-python/terminado-0.8.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/terminado/terminado-0.8.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ffdedca564e5029c88f79faf06f141f2
diff --git a/metadata/md5-cache/dev-python/terminado-0.9.1 b/metadata/md5-cache/dev-python/terminado-0.9.1
index 4b85f8a56aa1..64e4f9857c2d 100644
--- a/metadata/md5-cache/dev-python/terminado-0.9.1
+++ b/metadata/md5-cache/dev-python/terminado-0.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/terminado/terminado-0.9.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6d12b06b000a767f369bccb1afb48e05
diff --git a/metadata/md5-cache/dev-python/terminaltables-3.1.0 b/metadata/md5-cache/dev-python/terminaltables-3.1.0
index a2599204428a..8dc97a8b6593 100644
--- a/metadata/md5-cache/dev-python/terminaltables-3.1.0
+++ b/metadata/md5-cache/dev-python/terminaltables-3.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Robpol86/terminaltables/archive/v3.1.0.tar.gz -> terminaltables-3.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a9b283502f6b305a9282025226053edf
diff --git a/metadata/md5-cache/dev-python/terminaltables-9999 b/metadata/md5-cache/dev-python/terminaltables-9999
index 1c9c991ff534..c15eaeec82a7 100644
--- a/metadata/md5-cache/dev-python/terminaltables-9999
+++ b/metadata/md5-cache/dev-python/terminaltables-9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6b0c81992071f7c747f8882ca5891418
diff --git a/metadata/md5-cache/dev-python/test_server-0.0.31 b/metadata/md5-cache/dev-python/test_server-0.0.31
index 20811a5aee59..ef40745f4e0f 100644
--- a/metadata/md5-cache/dev-python/test_server-0.0.31
+++ b/metadata/md5-cache/dev-python/test_server-0.0.31
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lorien/test_server/archive/v0.0.31.tar.gz -> test_server-0.0.31.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3d2484cb2a09f2d2e9d0f1f67a40b56f
diff --git a/metadata/md5-cache/dev-python/testfixtures-6.15.0 b/metadata/md5-cache/dev-python/testfixtures-6.15.0
index b68252c4304b..7441b58f8d9f 100644
--- a/metadata/md5-cache/dev-python/testfixtures-6.15.0
+++ b/metadata/md5-cache/dev-python/testfixtures-6.15.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testfixtures/testfixtures-6.15.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fd1fffe5ed9e43c5b55e626f4dfb0ed7
diff --git a/metadata/md5-cache/dev-python/testpath-0.4.4-r1 b/metadata/md5-cache/dev-python/testpath-0.4.4-r1
index 328d172cb53a..4ee67cba61ec 100644
--- a/metadata/md5-cache/dev-python/testpath-0.4.4-r1
+++ b/metadata/md5-cache/dev-python/testpath-0.4.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupyter/testpath/archive/0.4.4.tar.gz -> testpath-0.4.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=43931daf3ca09bf15e91d14b4715bb10
diff --git a/metadata/md5-cache/dev-python/testrepository-0.0.20 b/metadata/md5-cache/dev-python/testrepository-0.0.20
index 9f68ebcc50ff..8c193775b721 100644
--- a/metadata/md5-cache/dev-python/testrepository-0.0.20
+++ b/metadata/md5-cache/dev-python/testrepository-0.0.20
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testrepository/testrepository-0.0.20.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=34609d2c5731ddd8356d5d65b56f0776
diff --git a/metadata/md5-cache/dev-python/testresources-2.0.1 b/metadata/md5-cache/dev-python/testresources-2.0.1
index bf67f8f97b79..4e5f7d012ef9 100644
--- a/metadata/md5-cache/dev-python/testresources-2.0.1
+++ b/metadata/md5-cache/dev-python/testresources-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testresources/testresources-2.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=14aa94ca0a7278aacb518f8d96c7a8e2
diff --git a/metadata/md5-cache/dev-python/testscenarios-0.5.0-r1 b/metadata/md5-cache/dev-python/testscenarios-0.5.0-r1
index 947ea94cafdf..aaebe6cb8480 100644
--- a/metadata/md5-cache/dev-python/testscenarios-0.5.0-r1
+++ b/metadata/md5-cache/dev-python/testscenarios-0.5.0-r1
@@ -5,12 +5,12 @@ DESCRIPTION=A pyunit extension for dependency injection
 EAPI=7
 HOMEPAGE=https://launchpad.net/testscenarios
 IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-python/testtools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testscenarios/testscenarios-0.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=48b5af4af99e08cc678fde04ac6f9204
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b44271bfeb07741c1808896adf825203
diff --git a/metadata/md5-cache/dev-python/testtools-2.4.0-r1 b/metadata/md5-cache/dev-python/testtools-2.4.0-r1
index 27c3af620f9e..219a13d4a6fe 100644
--- a/metadata/md5-cache/dev-python/testtools-2.4.0-r1
+++ b/metadata/md5-cache/dev-python/testtools-2.4.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Extensions to the Python standard library unit testing framework
 EAPI=7
 HOMEPAGE=https://github.com/testing-cabal/testtools
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 PDEPEND=>=dev-python/fixtures-1.3.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 RDEPEND=>=dev-python/extras-1.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-mimeparse[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pbr-0.11[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrsistent[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traceback2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/unittest2-1.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testtools/testtools-2.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b66150cf3218e73a2dd17256000031d4
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=83f3e92c71f7737885246045588b3006
diff --git a/metadata/md5-cache/dev-python/text-unidecode-1.3 b/metadata/md5-cache/dev-python/text-unidecode-1.3
index 2fbd799e2d61..c59a03610e82 100644
--- a/metadata/md5-cache/dev-python/text-unidecode-1.3
+++ b/metadata/md5-cache/dev-python/text-unidecode-1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/text-unidecode/text-unidecode-1.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6e05e544e77f7d7f116b195c066189a4
diff --git a/metadata/md5-cache/dev-python/texttable-1.6.3 b/metadata/md5-cache/dev-python/texttable-1.6.3
index b1901f430dca..6c7f213fefcc 100644
--- a/metadata/md5-cache/dev-python/texttable-1.6.3
+++ b/metadata/md5-cache/dev-python/texttable-1.6.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/foutaise/texttable/archive/v1.6.3.tar.gz -> texttable-1.6.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=958179caa7a8a5c49584dafe7defc31a
diff --git a/metadata/md5-cache/dev-python/textx-1.4 b/metadata/md5-cache/dev-python/textx-1.4
index d7b69b715ff2..3c90d9651e2e 100644
--- a/metadata/md5-cache/dev-python/textx-1.4
+++ b/metadata/md5-cache/dev-python/textx-1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/textX/textX-1.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d80f002b4d319fd36257aa58427b9cd
diff --git a/metadata/md5-cache/dev-python/theano-1.0.5 b/metadata/md5-cache/dev-python/theano-1.0.5
index 52ba4fcb10d5..ea13774c73d3 100644
--- a/metadata/md5-cache/dev-python/theano-1.0.5
+++ b/metadata/md5-cache/dev-python/theano-1.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/T/Theano/Theano-1.0.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ba7e67384e986d376a88a622b01f3675
diff --git a/metadata/md5-cache/dev-python/threadpoolctl-2.1.0 b/metadata/md5-cache/dev-python/threadpoolctl-2.1.0
index b6bf8981e937..215c827beece 100644
--- a/metadata/md5-cache/dev-python/threadpoolctl-2.1.0
+++ b/metadata/md5-cache/dev-python/threadpoolctl-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joblib/threadpoolctl/archive/2.1.0.tar.gz -> threadpoolctl-2.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7037232eac34e4a0b74107b175ff40ca
diff --git a/metadata/md5-cache/dev-python/three-merge-0.1.1 b/metadata/md5-cache/dev-python/three-merge-0.1.1
index 967e6839b1d8..a8859c74f547 100644
--- a/metadata/md5-cache/dev-python/three-merge-0.1.1
+++ b/metadata/md5-cache/dev-python/three-merge-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/three-merge/archive/v0.1.1.tar.gz -> three-merge-0.1.1-gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ae49f9c0cc401ff5047018f9c1f10d24
diff --git a/metadata/md5-cache/dev-python/thrift-0.11.0 b/metadata/md5-cache/dev-python/thrift-0.11.0
index 77cd158edd51..12f50b0866a6 100644
--- a/metadata/md5-cache/dev-python/thrift-0.11.0
+++ b/metadata/md5-cache/dev-python/thrift-0.11.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/t/thrift/thrift-0.11.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=092efbe3b97d52b876be9db65513972d
diff --git a/metadata/md5-cache/dev-python/tikzplotlib-0.9.4 b/metadata/md5-cache/dev-python/tikzplotlib-0.9.4
index fbd53d0a0c19..b406e92dabec 100644
--- a/metadata/md5-cache/dev-python/tikzplotlib-0.9.4
+++ b/metadata/md5-cache/dev-python/tikzplotlib-0.9.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nschloe/tikzplotlib/archive/v0.9.4.tar.gz -> tikzplotlib-0.9.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=49b5c9296a7d965df35c4103ad54dffa
diff --git a/metadata/md5-cache/dev-python/tinycss-0.4 b/metadata/md5-cache/dev-python/tinycss-0.4
index 6a15513276e8..58185e84b60d 100644
--- a/metadata/md5-cache/dev-python/tinycss-0.4
+++ b/metadata/md5-cache/dev-python/tinycss-0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tinycss/tinycss-0.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da3dee02d409dd76cb153c56f87d3125
diff --git a/metadata/md5-cache/dev-python/tinycss2-1.0.2 b/metadata/md5-cache/dev-python/tinycss2-1.0.2
index 0e012bee9833..d3a944ca2fb6 100644
--- a/metadata/md5-cache/dev-python/tinycss2-1.0.2
+++ b/metadata/md5-cache/dev-python/tinycss2-1.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tinycss2/tinycss2-1.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4e8f69a472bd427f1ee9a8cd45ab790d
diff --git a/metadata/md5-cache/dev-python/tinycss2-1.1.0 b/metadata/md5-cache/dev-python/tinycss2-1.1.0
index 03af40c7b20f..0158f3e30cec 100644
--- a/metadata/md5-cache/dev-python/tinycss2-1.1.0
+++ b/metadata/md5-cache/dev-python/tinycss2-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kozea/tinycss2/archive/v1.1.0.tar.gz -> tinycss2-1.1.0.gh.tar.gz https://github.com/SimonSapin/css-parsing-tests/archive/c5749e51dda3868b3e8062e65a36584c2fec8059.tar.gz -> css-parsing-tests-c5749e51dda3868b3e8062e65a36584c2fec8059.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a8cac7f36c6df540a10dfe3394a9c55e
diff --git a/metadata/md5-cache/dev-python/tinyrpc-1.0.1 b/metadata/md5-cache/dev-python/tinyrpc-1.0.1
index 138b0687a5a4..096b63f6b518 100644
--- a/metadata/md5-cache/dev-python/tinyrpc-1.0.1
+++ b/metadata/md5-cache/dev-python/tinyrpc-1.0.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tinyrpc/tinyrpc-1.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d74d56df7831feaa6dad1d888faf09cf
diff --git a/metadata/md5-cache/dev-python/tld-0.12.2 b/metadata/md5-cache/dev-python/tld-0.12.2
index a899dbcca500..526f527ae5f8 100644
--- a/metadata/md5-cache/dev-python/tld-0.12.2
+++ b/metadata/md5-cache/dev-python/tld-0.12.2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/barseghyanartur/tld/archive/0.12.2.tar.gz -> tld-0.12.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=733760565920d77c1d9bbb714db0b559
diff --git a/metadata/md5-cache/dev-python/tldextract-2.2.1 b/metadata/md5-cache/dev-python/tldextract-2.2.1
index 476510cd69d1..709fa0b229a0 100644
--- a/metadata/md5-cache/dev-python/tldextract-2.2.1
+++ b/metadata/md5-cache/dev-python/tldextract-2.2.1
@@ -1,15 +1,14 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Accurately separate the TLD from the registered domain and subdomains of a URL.
 EAPI=7
 HOMEPAGE=https://pypi.org/project/tldextract/
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/idna[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests-file[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/idna[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests-file[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tldextract/tldextract-2.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c2db68bfb509bf4f52978eb9fc74f519
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c53e42097216d4221a97c4bfbce5a6d5
diff --git a/metadata/md5-cache/dev-python/toml-0.10.1-r1 b/metadata/md5-cache/dev-python/toml-0.10.1-r1
index c5ba2786a32e..7cc3483617fd 100644
--- a/metadata/md5-cache/dev-python/toml-0.10.1-r1
+++ b/metadata/md5-cache/dev-python/toml-0.10.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uiri/toml/archive/0.10.1.tar.gz -> toml-0.10.1-1.tar.gz test? ( https://github.com/BurntSushi/toml-test/archive/280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz -> toml-test-280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=edb20030ee2d1ff31050787129c16d35
diff --git a/metadata/md5-cache/dev-python/toml-0.10.2 b/metadata/md5-cache/dev-python/toml-0.10.2
index f0f1d3ef212f..4a70afd07ac6 100644
--- a/metadata/md5-cache/dev-python/toml-0.10.2
+++ b/metadata/md5-cache/dev-python/toml-0.10.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uiri/toml/archive/0.10.2.tar.gz -> toml-0.10.2-1.tar.gz test? ( https://github.com/BurntSushi/toml-test/archive/280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz -> toml-test-280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3577756687e0a29291769af657a4562a
diff --git a/metadata/md5-cache/dev-python/toolz-0.11.1 b/metadata/md5-cache/dev-python/toolz-0.11.1
index 30a99e216b86..32ed52d0e9e8 100644
--- a/metadata/md5-cache/dev-python/toolz-0.11.1
+++ b/metadata/md5-cache/dev-python/toolz-0.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/toolz/toolz-0.11.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5cc52aff4086e6baed81b89812c2fc20
diff --git a/metadata/md5-cache/dev-python/tooz-2.7.1 b/metadata/md5-cache/dev-python/tooz-2.7.1
index 6f69e2806b65..6088cbe9ef90 100644
--- a/metadata/md5-cache/dev-python/tooz-2.7.1
+++ b/metadata/md5-cache/dev-python/tooz-2.7.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python3_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tooz/tooz-2.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d24d8467fc814cb2db212f68a7321628
diff --git a/metadata/md5-cache/dev-python/towncrier-19.2.0 b/metadata/md5-cache/dev-python/towncrier-19.2.0
index 35babcce37df..57a366c69e69 100644
--- a/metadata/md5-cache/dev-python/towncrier-19.2.0
+++ b/metadata/md5-cache/dev-python/towncrier-19.2.0
@@ -4,12 +4,12 @@ DESCRIPTION=Building newsfiles for your project
 EAPI=7
 HOMEPAGE=https://github.com/hawkowl/towncrier
 IUSE=test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/click-default-group[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/incremental[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/toml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hawkowl/towncrier/archive/19.2.0.tar.gz -> towncrier-19.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bb8267ca4cbb181fcdca78f934861727
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=33f80ef544c302475595f594c996b2fb
diff --git a/metadata/md5-cache/dev-python/tox-3.20.1 b/metadata/md5-cache/dev-python/tox-3.20.1
index 8ae820821430..1ddb36947b70 100644
--- a/metadata/md5-cache/dev-python/tox-3.20.1
+++ b/metadata/md5-cache/dev-python/tox-3.20.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tox-dev/tox/archive/3.20.1.tar.gz -> tox-3.20.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9d875a6ed3040a93296382e763543fe6
diff --git a/metadata/md5-cache/dev-python/tox-3.20.1-r1 b/metadata/md5-cache/dev-python/tox-3.20.1-r1
index 2dcc9c0c6f75..20521e4c320e 100644
--- a/metadata/md5-cache/dev-python/tox-3.20.1-r1
+++ b/metadata/md5-cache/dev-python/tox-3.20.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tox-dev/tox/archive/3.20.1.tar.gz -> tox-3.20.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=830df0c990e6545edf41116c1894e1e1
diff --git a/metadata/md5-cache/dev-python/tqdm-4.51.0 b/metadata/md5-cache/dev-python/tqdm-4.51.0
index 863e56464fd6..bf69a43adab9 100644
--- a/metadata/md5-cache/dev-python/tqdm-4.51.0
+++ b/metadata/md5-cache/dev-python/tqdm-4.51.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tqdm/tqdm-4.51.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a187012fb91dd77f9b8428e57d17caa6
diff --git a/metadata/md5-cache/dev-python/tqdm-4.53.0 b/metadata/md5-cache/dev-python/tqdm-4.53.0
index f9b260a47ee6..cb1ef2129f25 100644
--- a/metadata/md5-cache/dev-python/tqdm-4.53.0
+++ b/metadata/md5-cache/dev-python/tqdm-4.53.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tqdm/tqdm-4.53.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9d22e94a4abbe8e27f0f23a7381b2f2b
diff --git a/metadata/md5-cache/dev-python/tqdm-4.54.0 b/metadata/md5-cache/dev-python/tqdm-4.54.0
index ebc11ac74275..e845449680e3 100644
--- a/metadata/md5-cache/dev-python/tqdm-4.54.0
+++ b/metadata/md5-cache/dev-python/tqdm-4.54.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tqdm/tqdm-4.54.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8226a7e560259c2b06c291a4e6e3013d
diff --git a/metadata/md5-cache/dev-python/tqdm-9999 b/metadata/md5-cache/dev-python/tqdm-9999
index 1ff21a977e14..3eee480b6ce8 100644
--- a/metadata/md5-cache/dev-python/tqdm-9999
+++ b/metadata/md5-cache/dev-python/tqdm-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c742acaad81301bcb1401e7b5213a6f7
diff --git a/metadata/md5-cache/dev-python/traceback2-1.4.0-r1 b/metadata/md5-cache/dev-python/traceback2-1.4.0-r1
index a3a272e0f10d..cc6d3b7b6415 100644
--- a/metadata/md5-cache/dev-python/traceback2-1.4.0-r1
+++ b/metadata/md5-cache/dev-python/traceback2-1.4.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/traceback2/traceback2-1.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8113c3e8f6dbebbe8c26eef07ea75ae1
diff --git a/metadata/md5-cache/dev-python/traitlets-4.3.3 b/metadata/md5-cache/dev-python/traitlets-4.3.3
index e9c979866f47..aad8e8775b9f 100644
--- a/metadata/md5-cache/dev-python/traitlets-4.3.3
+++ b/metadata/md5-cache/dev-python/traitlets-4.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/traitlets/traitlets-4.3.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ca12b55e894bbbe17ee7d2b97f71711b
diff --git a/metadata/md5-cache/dev-python/traitlets-5.0.5 b/metadata/md5-cache/dev-python/traitlets-5.0.5
index 1b9a1279c772..16df9eaa2930 100644
--- a/metadata/md5-cache/dev-python/traitlets-5.0.5
+++ b/metadata/md5-cache/dev-python/traitlets-5.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/traitlets/traitlets-5.0.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5e952846d42e72b8c3f335b629c77ad8
diff --git a/metadata/md5-cache/dev-python/transitions-0.8.2-r1 b/metadata/md5-cache/dev-python/transitions-0.8.2-r1
index e2e32d2fcd6e..268960162505 100644
--- a/metadata/md5-cache/dev-python/transitions-0.8.2-r1
+++ b/metadata/md5-cache/dev-python/transitions-0.8.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytransitions/transitions/archive/0.8.2.tar.gz -> transitions-0.8.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=564d904a49a1655fff955adb5a1693d4
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-2.5.1 b/metadata/md5-cache/dev-python/translate-toolkit-2.5.1
index bf2eb63af460..ca97ccae1283 100644
--- a/metadata/md5-cache/dev-python/translate-toolkit-2.5.1
+++ b/metadata/md5-cache/dev-python/translate-toolkit-2.5.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/translate/translate/releases/download/2.5.1/translate-toolkit-2.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=12a1bd4951557436ccd649e46fb68dc9
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.2.0 b/metadata/md5-cache/dev-python/translate-toolkit-3.2.0
index 38ef019ebfb7..28dc870a4de2 100644
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.2.0
+++ b/metadata/md5-cache/dev-python/translate-toolkit-3.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/translate/translate/releases/download/3.2.0/translate-toolkit-3.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b4032800bd5b289c00bebbb44886598d
diff --git a/metadata/md5-cache/dev-python/treq-20.9.0 b/metadata/md5-cache/dev-python/treq-20.9.0
index 3d242134b6e4..ecfbbd023777 100644
--- a/metadata/md5-cache/dev-python/treq-20.9.0
+++ b/metadata/md5-cache/dev-python/treq-20.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/treq/treq-20.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e817972dc3a2f6c6822fd8c2406c83c0
diff --git a/metadata/md5-cache/dev-python/trustme-0.6.0-r1 b/metadata/md5-cache/dev-python/trustme-0.6.0-r1
index fae409f3d716..17e916db5ea0 100644
--- a/metadata/md5-cache/dev-python/trustme-0.6.0-r1
+++ b/metadata/md5-cache/dev-python/trustme-0.6.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/trustme/trustme-0.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4e0346cdc3d0c895caac75cc92d1699f
diff --git a/metadata/md5-cache/dev-python/tubes-0.2.0-r1 b/metadata/md5-cache/dev-python/tubes-0.2.0-r1
index f90fded7b14b..46f1ddc4fe57 100644
--- a/metadata/md5-cache/dev-python/tubes-0.2.0-r1
+++ b/metadata/md5-cache/dev-python/tubes-0.2.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/twisted/tubes/archive/v0.2.0.tar.gz -> tubes-0.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2e96b5052a661bc06d3acd94401b61b7
diff --git a/metadata/md5-cache/dev-python/tvdb_api-2.0-r1 b/metadata/md5-cache/dev-python/tvdb_api-2.0-r1
index 28d71713b4c3..b5d9c67fc0c4 100644
--- a/metadata/md5-cache/dev-python/tvdb_api-2.0-r1
+++ b/metadata/md5-cache/dev-python/tvdb_api-2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/requests-cache[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tvdb_api/tvdb_api-2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ea22c73a21057cdb53e7e2470e98ce05
diff --git a/metadata/md5-cache/dev-python/twine-3.2.0 b/metadata/md5-cache/dev-python/twine-3.2.0
index 9937bb29a37b..9e469084eedb 100644
--- a/metadata/md5-cache/dev-python/twine-3.2.0
+++ b/metadata/md5-cache/dev-python/twine-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/twine/archive/3.2.0.tar.gz -> twine-3.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7b6c79906b9988d4bdfd3437a3a837f2
diff --git a/metadata/md5-cache/dev-python/twisted-19.10.0 b/metadata/md5-cache/dev-python/twisted-19.10.0
index 9a291cebadcd..69655d592c29 100644
--- a/metadata/md5-cache/dev-python/twisted-19.10.0
+++ b/metadata/md5-cache/dev-python/twisted-19.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Twisted/19.10/Twisted-19.10.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=f1ef3ff1527e613faea8c9711f6ec4fa
diff --git a/metadata/md5-cache/dev-python/twisted-20.3.0 b/metadata/md5-cache/dev-python/twisted-20.3.0
index fa4d1930c7a1..8d6d21cb6144 100644
--- a/metadata/md5-cache/dev-python/twisted-20.3.0
+++ b/metadata/md5-cache/dev-python/twisted-20.3.0
@@ -5,12 +5,12 @@ DESCRIPTION=An asynchronous networking framework written in Python
 EAPI=7
 HOMEPAGE=https://www.twistedmatrix.com/trac/
 IUSE=conch crypt http2 serial test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/automat-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/constantly-15.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/hyperlink-17.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/incremental-16.10.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyhamcrest-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] conch? ( dev-python/pyasn1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/appdirs-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/service_identity[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) serial? ( >=dev-python/pyserial-3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) http2? ( >=dev-python/hyper-h2-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/hyper-h2-4.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/priority-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/priority-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) !dev-python/twisted-core !dev-python/twisted-conch !dev-python/twisted-lore !dev-python/twisted-mail !dev-python/twisted-names !dev-python/twisted-news !dev-python/twisted-pair !dev-python/twisted-runner !dev-python/twisted-words !dev-python/twisted-web python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Twisted/20.3/Twisted-20.3.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=0bf1ab0d71c535e6615237a7e371c3df
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_md5_=dab1e6fd7e5685d8b6d873bb51e581ba
diff --git a/metadata/md5-cache/dev-python/twython-3.7.0 b/metadata/md5-cache/dev-python/twython-3.7.0
index 3a19205fe018..a4d0e13887e4 100644
--- a/metadata/md5-cache/dev-python/twython-3.7.0
+++ b/metadata/md5-cache/dev-python/twython-3.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ryanmcgrath/twython/archive/3.7.0.tar.gz -> twython-3.7.0.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=044665e07900e063613494f96ad424da
diff --git a/metadata/md5-cache/dev-python/txAMQP-0.8.2 b/metadata/md5-cache/dev-python/txAMQP-0.8.2
index 09a13a3b0952..fcfcd2d98399 100644
--- a/metadata/md5-cache/dev-python/txAMQP-0.8.2
+++ b/metadata/md5-cache/dev-python/txAMQP-0.8.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/txamqp/txamqp/archive/0.8.2.tar.gz -> txamqp-0.8.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f8d140507317e952e460e4423bac7bc5
diff --git a/metadata/md5-cache/dev-python/txaio-20.4.1 b/metadata/md5-cache/dev-python/txaio-20.4.1
index b5e570f3c74d..55669c172177 100644
--- a/metadata/md5-cache/dev-python/txaio-20.4.1
+++ b/metadata/md5-cache/dev-python/txaio-20.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/txaio/txaio-20.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a5c8904746a35625c04d84341d4bc14d
diff --git a/metadata/md5-cache/dev-python/txgithub-15.0.0-r1 b/metadata/md5-cache/dev-python/txgithub-15.0.0-r1
index 148d67f82943..3a9b5a972f3b 100644
--- a/metadata/md5-cache/dev-python/txgithub-15.0.0-r1
+++ b/metadata/md5-cache/dev-python/txgithub-15.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tomprince/txgithub/archive/15.0.0.tar.gz -> txgithub-15.0.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f21795fe91b08fb3098e4f95b16716fc
diff --git a/metadata/md5-cache/dev-python/txrequests-0.9.6 b/metadata/md5-cache/dev-python/txrequests-0.9.6
index 425273ca2831..7522ddc68149 100644
--- a/metadata/md5-cache/dev-python/txrequests-0.9.6
+++ b/metadata/md5-cache/dev-python/txrequests-0.9.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-1.2.0[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/t/txrequests/txrequests-0.9.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=288c26107c570fad7d983db77d49e102
diff --git a/metadata/md5-cache/dev-python/typed-ast-1.4.1 b/metadata/md5-cache/dev-python/typed-ast-1.4.1
index a9d4bd659125..57b2f9d34423 100644
--- a/metadata/md5-cache/dev-python/typed-ast-1.4.1
+++ b/metadata/md5-cache/dev-python/typed-ast-1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/typed_ast/typed_ast-1.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d558e2234c1bcd4cd8c10a11aec7dd4b
diff --git a/metadata/md5-cache/dev-python/typing-3.7.4.3 b/metadata/md5-cache/dev-python/typing-3.7.4.3
index 4da4d1da83a9..4f9742528a01 100644
--- a/metadata/md5-cache/dev-python/typing-3.7.4.3
+++ b/metadata/md5-cache/dev-python/typing-3.7.4.3
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/typing/typing-3.7.4.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3d846489272d6949e03b049ef802309b
diff --git a/metadata/md5-cache/dev-python/typing-extensions-3.7.4.3 b/metadata/md5-cache/dev-python/typing-extensions-3.7.4.3
index 4d2c32e8ef04..9b911da31461 100644
--- a/metadata/md5-cache/dev-python/typing-extensions-3.7.4.3
+++ b/metadata/md5-cache/dev-python/typing-extensions-3.7.4.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/t/typing_extensions/typing_extensions-3.7.4.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7aba822cd552f4f02aea580063501b27
diff --git a/metadata/md5-cache/dev-python/tzlocal-2.1 b/metadata/md5-cache/dev-python/tzlocal-2.1
index 2483696639f1..465255deaf67 100644
--- a/metadata/md5-cache/dev-python/tzlocal-2.1
+++ b/metadata/md5-cache/dev-python/tzlocal-2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/regebro/tzlocal/archive/2.1.tar.gz -> tzlocal-2.1.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ef8784e64763f5e2dd1a76407dddb756
diff --git a/metadata/md5-cache/dev-python/u-msgpack-2.7.1 b/metadata/md5-cache/dev-python/u-msgpack-2.7.1
index 15441306f976..3818b99b5fd4 100644
--- a/metadata/md5-cache/dev-python/u-msgpack-2.7.1
+++ b/metadata/md5-cache/dev-python/u-msgpack-2.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/u-msgpack-python/u-msgpack-python-2.7.1.tar.gz -> u-msgpack-2.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=698e4b31800304374140ed5762ca75bb
diff --git a/metadata/md5-cache/dev-python/ubelt-0.9.1 b/metadata/md5-cache/dev-python/ubelt-0.9.1
index fd35884679c8..d5fd5d7bc9f3 100644
--- a/metadata/md5-cache/dev-python/ubelt-0.9.1
+++ b/metadata/md5-cache/dev-python/ubelt-0.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Erotemic/ubelt/archive/0.9.1.tar.gz -> ubelt-0.9.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4c31f74b7fcf16a274448d44f3d0a331
diff --git a/metadata/md5-cache/dev-python/ujson-1.35-r1 b/metadata/md5-cache/dev-python/ujson-1.35-r1
index 60c5bc5fcc9d..ed53cb125a87 100644
--- a/metadata/md5-cache/dev-python/ujson-1.35-r1
+++ b/metadata/md5-cache/dev-python/ujson-1.35-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/ujson/ujson-1.35.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=22ba480147a8326559e9f7c2a7a02b7c
diff --git a/metadata/md5-cache/dev-python/ujson-4.0.1 b/metadata/md5-cache/dev-python/ujson-4.0.1
index b19747ad2c00..262e488de6cb 100644
--- a/metadata/md5-cache/dev-python/ujson-4.0.1
+++ b/metadata/md5-cache/dev-python/ujson-4.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/ujson/ujson-4.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1f640584f62dad4d5f93d58e10052b13
diff --git a/metadata/md5-cache/dev-python/uncertainties-3.1.4-r1 b/metadata/md5-cache/dev-python/uncertainties-3.1.4-r1
index 03df8e533d28..dfc9311f7621 100644
--- a/metadata/md5-cache/dev-python/uncertainties-3.1.4-r1
+++ b/metadata/md5-cache/dev-python/uncertainties-3.1.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uncertainties/uncertainties-3.1.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e634b6b589d28cd5eca5414d4f0e3215
diff --git a/metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1 b/metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1
index 7b63628093d9..1c483aa45ddd 100644
--- a/metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1
+++ b/metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/u/unicodecsv/unicodecsv-0.14.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=35c20fb9cc851944b750e01c3787f787
diff --git a/metadata/md5-cache/dev-python/unidecode-0.04.21 b/metadata/md5-cache/dev-python/unidecode-0.04.21
index a7634ba458ee..95cabe139257 100644
--- a/metadata/md5-cache/dev-python/unidecode-0.04.21
+++ b/metadata/md5-cache/dev-python/unidecode-0.04.21
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/U/Unidecode/Unidecode-0.04.21.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b988430c7736c486e686cbd75d222bb
diff --git a/metadata/md5-cache/dev-python/unidecode-1.1.1 b/metadata/md5-cache/dev-python/unidecode-1.1.1
index 8e1d2a965411..73897522a3f8 100644
--- a/metadata/md5-cache/dev-python/unidecode-1.1.1
+++ b/metadata/md5-cache/dev-python/unidecode-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[wide-unicode(+)] ) p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/U/Unidecode/Unidecode-1.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=53bae03a426ebe7a5d8949f9be4d6138
diff --git a/metadata/md5-cache/dev-python/unittest-mixins-1.6-r1 b/metadata/md5-cache/dev-python/unittest-mixins-1.6-r1
index 312923913972..a9d617a14481 100644
--- a/metadata/md5-cache/dev-python/unittest-mixins-1.6-r1
+++ b/metadata/md5-cache/dev-python/unittest-mixins-1.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nedbat/unittest-mixins/archive/v1.6.tar.gz -> unittest-mixins-1.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=22321238a23bae11c071be4fb4182b95
diff --git a/metadata/md5-cache/dev-python/unittest2-1.1.0-r1 b/metadata/md5-cache/dev-python/unittest2-1.1.0-r1
index 08a09d8f477b..9ab225651caf 100644
--- a/metadata/md5-cache/dev-python/unittest2-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/unittest2-1.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/unittest2/unittest2-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ef31e3f0908a2e05c33e628a16c8afff
diff --git a/metadata/md5-cache/dev-python/uranium-4.7.0 b/metadata/md5-cache/dev-python/uranium-4.7.0
index 057bb953c2c9..35b5dec860a8 100644
--- a/metadata/md5-cache/dev-python/uranium-4.7.0
+++ b/metadata/md5-cache/dev-python/uranium-4.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/Uranium/archive/4.7.0.tar.gz -> uranium-4.7.0.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c0f7b13f9baaa2a44e3822b319b3cb2b
diff --git a/metadata/md5-cache/dev-python/uranium-4.8.0 b/metadata/md5-cache/dev-python/uranium-4.8.0
index 21bd251e5d4a..1acde4576d63 100644
--- a/metadata/md5-cache/dev-python/uranium-4.8.0
+++ b/metadata/md5-cache/dev-python/uranium-4.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/Uranium/archive/4.8.0.tar.gz -> uranium-4.8.0.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c0f7b13f9baaa2a44e3822b319b3cb2b
diff --git a/metadata/md5-cache/dev-python/urdf_parser_py-0.4.3 b/metadata/md5-cache/dev-python/urdf_parser_py-0.4.3
index 9a093601c94a..36706e3fb17f 100644
--- a/metadata/md5-cache/dev-python/urdf_parser_py-0.4.3
+++ b/metadata/md5-cache/dev-python/urdf_parser_py-0.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/urdf_parser_py/archive/0.4.3.tar.gz -> urdf_parser_py-0.4.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4d434ae7773039021e8729a2e2fb7270
diff --git a/metadata/md5-cache/dev-python/uritemplate-3.0.1-r1 b/metadata/md5-cache/dev-python/uritemplate-3.0.1-r1
index edd89b62f76c..eb3ca7b7cf94 100644
--- a/metadata/md5-cache/dev-python/uritemplate-3.0.1-r1
+++ b/metadata/md5-cache/dev-python/uritemplate-3.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uritemplate/uritemplate-3.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b6a1564f13ead50a6f8b08a97586a928
diff --git a/metadata/md5-cache/dev-python/urlgrabber-4.0.0 b/metadata/md5-cache/dev-python/urlgrabber-4.0.0
index e9de49eea802..1c6c8ba106e2 100644
--- a/metadata/md5-cache/dev-python/urlgrabber-4.0.0
+++ b/metadata/md5-cache/dev-python/urlgrabber-4.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycurl[python_targets_python3_7(-)?,python_targets_python3_8(
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=http://urlgrabber.baseurl.org/download/urlgrabber-4.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d464861b6ca837af8deb133b6bda8bf8
diff --git a/metadata/md5-cache/dev-python/urllib3-1.24.2-r1 b/metadata/md5-cache/dev-python/urllib3-1.24.2-r1
index ae95d2bab735..63185f2c971c 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.24.2-r1
+++ b/metadata/md5-cache/dev-python/urllib3-1.24.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.24.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a56fdeb84ce7a1cb3e034084c4e33c1b
diff --git a/metadata/md5-cache/dev-python/urllib3-1.25.11 b/metadata/md5-cache/dev-python/urllib3-1.25.11
index ab7e5e6b008f..351eef462d7f 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.25.11
+++ b/metadata/md5-cache/dev-python/urllib3-1.25.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.25.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=456d4d54759a827950181af78006193b
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.0 b/metadata/md5-cache/dev-python/urllib3-1.26.0
index 712bb3f2c90a..939ba20cedbb 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.26.0
+++ b/metadata/md5-cache/dev-python/urllib3-1.26.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d6f056dcb4d100952f88de6bdd2f8cf1
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.1 b/metadata/md5-cache/dev-python/urllib3-1.26.1
index 1aad063eb2e8..0ced2fb0f4c9 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.26.1
+++ b/metadata/md5-cache/dev-python/urllib3-1.26.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d6f056dcb4d100952f88de6bdd2f8cf1
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.2 b/metadata/md5-cache/dev-python/urllib3-1.26.2
index 285ac7a3bf86..9b969683da63 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.26.2
+++ b/metadata/md5-cache/dev-python/urllib3-1.26.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e63d275624c1760767f184c677a73910
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.2-r1 b/metadata/md5-cache/dev-python/urllib3-1.26.2-r1
new file mode 100644
index 000000000000..b06bc4afaeba
--- /dev/null
+++ b/metadata/md5-cache/dev-python/urllib3-1.26.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_python3_6? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/brotlicffi[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/brotlicffi[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/brotlicffi[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/brotlicffi[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest-freezegun[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/trustme-0.5.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
+EAPI=7
+HOMEPAGE=https://github.com/urllib3/urllib3
+IUSE=brotli test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-1.3.4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.2.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4df324fb0dd48e1644fb164c5dd2da88
diff --git a/metadata/md5-cache/dev-python/urwid-2.1.1 b/metadata/md5-cache/dev-python/urwid-2.1.1
index b4176441947d..2965fa49e203 100644
--- a/metadata/md5-cache/dev-python/urwid-2.1.1
+++ b/metadata/md5-cache/dev-python/urwid-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_target
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/u/urwid/urwid-2.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a51289362915f43f7629f757ad57bccd
diff --git a/metadata/md5-cache/dev-python/urwidtrees-1.0.3 b/metadata/md5-cache/dev-python/urwidtrees-1.0.3
index ad0d94b076d7..487925860981 100644
--- a/metadata/md5-cache/dev-python/urwidtrees-1.0.3
+++ b/metadata/md5-cache/dev-python/urwidtrees-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/urwid-1.1.0[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/pazz/urwidtrees/archive/1.0.3.tar.gz -> urwidtrees-1.0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dcb61c12ca315e19bc2d57e90d30051a
diff --git a/metadata/md5-cache/dev-python/utidylib-0.6-r1 b/metadata/md5-cache/dev-python/utidylib-0.6-r1
index 1e5cc0c71c95..fa728122f637 100644
--- a/metadata/md5-cache/dev-python/utidylib-0.6-r1
+++ b/metadata/md5-cache/dev-python/utidylib-0.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/utidylib/uTidylib-0.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4a74d9fdaf681ce84254837636aae7f7
diff --git a/metadata/md5-cache/dev-python/uvloop-0.14.0 b/metadata/md5-cache/dev-python/uvloop-0.14.0
index 663493b6d570..3b93567fd514 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.14.0
+++ b/metadata/md5-cache/dev-python/uvloop-0.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uvloop/uvloop-0.14.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3ac37642545e905754d9c9926cb026e7
diff --git a/metadata/md5-cache/dev-python/vcrpy-4.1.1 b/metadata/md5-cache/dev-python/vcrpy-4.1.1
index d9fcb6145570..d0149edc6c25 100644
--- a/metadata/md5-cache/dev-python/vcrpy-4.1.1
+++ b/metadata/md5-cache/dev-python/vcrpy-4.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kevin1024/vcrpy/archive/v4.1.1.tar.gz -> vcrpy-4.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7614c2cbd226d234838282e8cb646d3d
diff --git a/metadata/md5-cache/dev-python/vcstools-0.1.42 b/metadata/md5-cache/dev-python/vcstools-0.1.42
index 4c3498038307..1c6e6d5cf860 100644
--- a/metadata/md5-cache/dev-python/vcstools-0.1.42
+++ b/metadata/md5-cache/dev-python/vcstools-0.1.42
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/vcstools/vcstools-0.1.42.tar.gz https://github.com/vcstools/vcstools/archive/0.1.42.tar.gz -> vcstools-0.1.42.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3af1c57bf04da574fdeb4868f3b42060
diff --git a/metadata/md5-cache/dev-python/vcversioner-2.16.0.0 b/metadata/md5-cache/dev-python/vcversioner-2.16.0.0
index 9a544ccf574d..0d9e937ef3b1 100644
--- a/metadata/md5-cache/dev-python/vcversioner-2.16.0.0
+++ b/metadata/md5-cache/dev-python/vcversioner-2.16.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/v/vcversioner/vcversioner-2.16.0.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c458bb97b3fe90085bb3787aae9f0331
diff --git a/metadata/md5-cache/dev-python/vdf-3.3 b/metadata/md5-cache/dev-python/vdf-3.3
index 02298f3ed90d..1b0159517bb7 100644
--- a/metadata/md5-cache/dev-python/vdf-3.3
+++ b/metadata/md5-cache/dev-python/vdf-3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://codeload.github.com/ValvePython/vdf/tar.gz/v3.3 -> vdf-3.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5e5d83da1952372518d77e39d09da239
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.16.8 b/metadata/md5-cache/dev-python/vdirsyncer-0.16.8
index b64b9b47b7d0..bcd92a3a1bce 100644
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.16.8
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.16.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.16.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dbc40343e214044a57e074c8f290301d
diff --git a/metadata/md5-cache/dev-python/vecrec-0.3.0 b/metadata/md5-cache/dev-python/vecrec-0.3.0
index edfd476498c7..c4c3ae460427 100644
--- a/metadata/md5-cache/dev-python/vecrec-0.3.0
+++ b/metadata/md5-cache/dev-python/vecrec-0.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vecrec/vecrec-0.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c14f006c94b85958cfc7619e2d023da9
diff --git a/metadata/md5-cache/dev-python/verboselogs-1.7 b/metadata/md5-cache/dev-python/verboselogs-1.7
index cbc62162fdd2..e8b28087a4e5 100644
--- a/metadata/md5-cache/dev-python/verboselogs-1.7
+++ b/metadata/md5-cache/dev-python/verboselogs-1.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/verboselogs/verboselogs-1.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e36e8e6beda62e905925f283104e68af
diff --git a/metadata/md5-cache/dev-python/versioneer-0.18-r1 b/metadata/md5-cache/dev-python/versioneer-0.18-r1
index a28c29f4642f..8673be7f4907 100644
--- a/metadata/md5-cache/dev-python/versioneer-0.18-r1
+++ b/metadata/md5-cache/dev-python/versioneer-0.18-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/versioneer/versioneer-0.18.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c0c448cd17a1cc56c8166bcabdcb8f03
diff --git a/metadata/md5-cache/dev-python/versioneer-0.19 b/metadata/md5-cache/dev-python/versioneer-0.19
index 12d988ad6a3f..ecffd085e7ef 100644
--- a/metadata/md5-cache/dev-python/versioneer-0.19
+++ b/metadata/md5-cache/dev-python/versioneer-0.19
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/versioneer/versioneer-0.19.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=35f30c81bffab13d81a328a8084c65f4
diff --git a/metadata/md5-cache/dev-python/vine-1.3.0 b/metadata/md5-cache/dev-python/vine-1.3.0
index b6ec5a43bf0d..71d2f6a747c2 100644
--- a/metadata/md5-cache/dev-python/vine-1.3.0
+++ b/metadata/md5-cache/dev-python/vine-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vine/vine-1.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=49c0e1cdd9f029fda54bbeac4aac4c3a
diff --git a/metadata/md5-cache/dev-python/virtualenv-16.7.10-r1 b/metadata/md5-cache/dev-python/virtualenv-16.7.10-r1
index 63684dfb6af1..8844209aca39 100644
--- a/metadata/md5-cache/dev-python/virtualenv-16.7.10-r1
+++ b/metadata/md5-cache/dev-python/virtualenv-16.7.10-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/virtualenv/archive/16.7.10.tar.gz -> virtualenv-16.7.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f640646e018015c91d6b6a753ba17c29
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.1.0 b/metadata/md5-cache/dev-python/virtualenv-20.1.0
index b7f1789d34f4..d67290b69425 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.1.0
+++ b/metadata/md5-cache/dev-python/virtualenv-20.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5598a8a8cbe46feb6e2684f08e9feadd
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.2.1 b/metadata/md5-cache/dev-python/virtualenv-20.2.1
index 6efbd9cd0257..5da563404e09 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.2.1
+++ b/metadata/md5-cache/dev-python/virtualenv-20.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9967867ef4fca7140bf425ac5111d7c7
diff --git a/metadata/md5-cache/dev-python/virtualenv-clone-0.5.3 b/metadata/md5-cache/dev-python/virtualenv-clone-0.5.3
index dfd811a42bcf..cb8f6cb569a0 100644
--- a/metadata/md5-cache/dev-python/virtualenv-clone-0.5.3
+++ b/metadata/md5-cache/dev-python/virtualenv-clone-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenv-clone/virtualenv-clone-0.5.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3466a98343ecec5829944bdd44dcf5d3
diff --git a/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.4-r1 b/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.4-r1
index 50533894d8bb..b7eb9f902257 100644
--- a/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.4-r1
+++ b/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenvwrapper/virtualenvwrapper-4.8.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=773e4eec2b018cc58d38172c5f5aa92a
diff --git a/metadata/md5-cache/dev-python/visitor-0.1.3-r1 b/metadata/md5-cache/dev-python/visitor-0.1.3-r1
index 2d8064d3fc0e..b4d57f4b6421 100644
--- a/metadata/md5-cache/dev-python/visitor-0.1.3-r1
+++ b/metadata/md5-cache/dev-python/visitor-0.1.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mbr/visitor/archive/0.1.3.tar.gz -> visitor-0.1.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=371be59b6558492daf8e5b7f9d6c7372
diff --git a/metadata/md5-cache/dev-python/vncdotool-0.13.0 b/metadata/md5-cache/dev-python/vncdotool-0.13.0
index bf0ccc9c0be7..8a6d3796b6f7 100644
--- a/metadata/md5-cache/dev-python/vncdotool-0.13.0
+++ b/metadata/md5-cache/dev-python/vncdotool-0.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sibson/vncdotool/archive/v0.13.0.tar.gz -> vncdotool-0.13.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2fb3f6bde7ce9dcd583c5efb70496a45
diff --git a/metadata/md5-cache/dev-python/vncdotool-1.0.0 b/metadata/md5-cache/dev-python/vncdotool-1.0.0
index dbb2b04cd6e8..25fd90c17aed 100644
--- a/metadata/md5-cache/dev-python/vncdotool-1.0.0
+++ b/metadata/md5-cache/dev-python/vncdotool-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sibson/vncdotool/archive/v1.0.0.tar.gz -> vncdotool-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2fb3f6bde7ce9dcd583c5efb70496a45
diff --git a/metadata/md5-cache/dev-python/vobject-0.9.6.1-r2 b/metadata/md5-cache/dev-python/vobject-0.9.6.1-r2
index 9c7b2ce41aec..9d8ac87e0d50 100644
--- a/metadata/md5-cache/dev-python/vobject-0.9.6.1-r2
+++ b/metadata/md5-cache/dev-python/vobject-0.9.6.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python3_6(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vobject/vobject-0.9.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=92c35cb4217d85a1565d58bfeb701dfa
diff --git a/metadata/md5-cache/dev-python/voluptuous-0.12.0 b/metadata/md5-cache/dev-python/voluptuous-0.12.0
index be00c9c45510..05a8feb751ce 100644
--- a/metadata/md5-cache/dev-python/voluptuous-0.12.0
+++ b/metadata/md5-cache/dev-python/voluptuous-0.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/voluptuous/voluptuous-0.12.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2df1188019f6580d27597d8c5f23f2b0
diff --git a/metadata/md5-cache/dev-python/vpython-7.6.1-r2 b/metadata/md5-cache/dev-python/vpython-7.6.1-r2
index 8d3dc2b6f110..cddff20524a1 100644
--- a/metadata/md5-cache/dev-python/vpython-7.6.1-r2
+++ b/metadata/md5-cache/dev-python/vpython-7.6.1-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/autobahn[python_targets_python3_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vpython/vpython-7.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5d4da177f7c0a6b832c135201790f601
diff --git a/metadata/md5-cache/dev-python/waitress-1.4.4 b/metadata/md5-cache/dev-python/waitress-1.4.4
index a0517e05ca9c..d64585f77498 100644
--- a/metadata/md5-cache/dev-python/waitress-1.4.4
+++ b/metadata/md5-cache/dev-python/waitress-1.4.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/waitress/waitress-1.4.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=67511361c3a26f1197382516a2f88b66
diff --git a/metadata/md5-cache/dev-python/wand-0.6.3 b/metadata/md5-cache/dev-python/wand-0.6.3
index 94844bcb93d6..17bad0edee17 100644
--- a/metadata/md5-cache/dev-python/wand-0.6.3
+++ b/metadata/md5-cache/dev-python/wand-0.6.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wand/Wand-0.6.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4d1abe16155243713ab1035410399b0d
diff --git a/metadata/md5-cache/dev-python/wand-0.6.5 b/metadata/md5-cache/dev-python/wand-0.6.5
index 3577775c5855..4e12a3fc38c9 100644
--- a/metadata/md5-cache/dev-python/wand-0.6.5
+++ b/metadata/md5-cache/dev-python/wand-0.6.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wand/Wand-0.6.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=64b50865aca0c555a53cf939d6728fe1
diff --git a/metadata/md5-cache/dev-python/warlock-1.3.3 b/metadata/md5-cache/dev-python/warlock-1.3.3
index ef6cd316818a..cc827127ed91 100644
--- a/metadata/md5-cache/dev-python/warlock-1.3.3
+++ b/metadata/md5-cache/dev-python/warlock-1.3.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/warlock/warlock-1.3.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=850cb829634021013ea117f645e45292
diff --git a/metadata/md5-cache/dev-python/watchdog-0.10.3 b/metadata/md5-cache/dev-python/watchdog-0.10.3
index e8f03caac1c3..bfe78a25c447 100644
--- a/metadata/md5-cache/dev-python/watchdog-0.10.3
+++ b/metadata/md5-cache/dev-python/watchdog-0.10.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v0.10.3.tar.gz -> watchdog-0.10.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=90a5babc1e5a2b790e7d9c1e16cdad92
diff --git a/metadata/md5-cache/dev-python/watchdog-0.10.4 b/metadata/md5-cache/dev-python/watchdog-0.10.4
index 9cd8011fe025..2da29e9f99f8 100644
--- a/metadata/md5-cache/dev-python/watchdog-0.10.4
+++ b/metadata/md5-cache/dev-python/watchdog-0.10.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v0.10.4.tar.gz -> watchdog-0.10.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6765e47f4143d346d6813cb7182a374a
diff --git a/metadata/md5-cache/dev-python/watchdog-0.8.3-r2 b/metadata/md5-cache/dev-python/watchdog-0.8.3-r2
index 62939ec48b55..d11db127819a 100644
--- a/metadata/md5-cache/dev-python/watchdog-0.8.3-r2
+++ b/metadata/md5-cache/dev-python/watchdog-0.8.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/watchdog/watchdog-0.8.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b82e7cf21f682ea1fa62b424efc09f9b
diff --git a/metadata/md5-cache/dev-python/wcwidth-0.2.5-r1 b/metadata/md5-cache/dev-python/wcwidth-0.2.5-r1
index 668c5e357e89..f1a5f3ed0a00 100644
--- a/metadata/md5-cache/dev-python/wcwidth-0.2.5-r1
+++ b/metadata/md5-cache/dev-python/wcwidth-0.2.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jquast/wcwidth/archive/0.2.5.tar.gz -> wcwidth-0.2.5.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=71da8b410b01fe78f10a36509ca8820b
diff --git a/metadata/md5-cache/dev-python/weasyprint-51 b/metadata/md5-cache/dev-python/weasyprint-51
index 2ef3e675f8fa..e4d0de38f43d 100644
--- a/metadata/md5-cache/dev-python/weasyprint-51
+++ b/metadata/md5-cache/dev-python/weasyprint-51
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WeasyPrint/WeasyPrint-51.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=acf0c15990b2ca81d964fd6a58ecb433
diff --git a/metadata/md5-cache/dev-python/webassets-2.0 b/metadata/md5-cache/dev-python/webassets-2.0
index 6ef5d7546854..849f621232b1 100644
--- a/metadata/md5-cache/dev-python/webassets-2.0
+++ b/metadata/md5-cache/dev-python/webassets-2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miracle2k/webassets/archive/2.0.tar.gz -> webassets-2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=eccb4bc3a1e38c02f4f2c50c1759a1b4
diff --git a/metadata/md5-cache/dev-python/webcolors-1.11.1 b/metadata/md5-cache/dev-python/webcolors-1.11.1
index dd6897243d15..01433d7ccfe2 100644
--- a/metadata/md5-cache/dev-python/webcolors-1.11.1
+++ b/metadata/md5-cache/dev-python/webcolors-1.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/webcolors/webcolors-1.11.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0b109bd7977805d22395a0a0c9eafa36
diff --git a/metadata/md5-cache/dev-python/webencodings-0.5.1-r1 b/metadata/md5-cache/dev-python/webencodings-0.5.1-r1
index 84c3fe27abad..c0b158626e44 100644
--- a/metadata/md5-cache/dev-python/webencodings-0.5.1-r1
+++ b/metadata/md5-cache/dev-python/webencodings-0.5.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/webencodings/webencodings-0.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=eb429002244e09b8f4026eb5fdd49a6c
diff --git a/metadata/md5-cache/dev-python/webob-1.8.6 b/metadata/md5-cache/dev-python/webob-1.8.6
index 95ba0cf267ba..530fec83cf14 100644
--- a/metadata/md5-cache/dev-python/webob-1.8.6
+++ b/metadata/md5-cache/dev-python/webob-1.8.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebOb/WebOb-1.8.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1323df9765c45ea36b5f92e5abfa07b2
diff --git a/metadata/md5-cache/dev-python/websocket-client-0.57.0 b/metadata/md5-cache/dev-python/websocket-client-0.57.0
index eebf31bfa1a2..e504f49f14db 100644
--- a/metadata/md5-cache/dev-python/websocket-client-0.57.0
+++ b/metadata/md5-cache/dev-python/websocket-client-0.57.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/websocket-client/websocket_client-0.57.0.tar.gz -> websocket-client-0.57.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d31fcd317a4101b230f539479b9774fc
diff --git a/metadata/md5-cache/dev-python/websockets-8.1 b/metadata/md5-cache/dev-python/websockets-8.1
index 8760020cdb79..b58006331ee3 100644
--- a/metadata/md5-cache/dev-python/websockets-8.1
+++ b/metadata/md5-cache/dev-python/websockets-8.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/aaugustin/websockets/archive/8.1.tar.gz -> websockets-8.1-src.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c5acaad9b57cc91a1aa9bf12e989cf4d
diff --git a/metadata/md5-cache/dev-python/websockify-0.9.0 b/metadata/md5-cache/dev-python/websockify-0.9.0
index f2d139f01617..9cc18d70cdb3 100644
--- a/metadata/md5-cache/dev-python/websockify-0.9.0
+++ b/metadata/md5-cache/dev-python/websockify-0.9.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/kanaka/websockify/archive/v0.9.0.tar.gz -> websockify-0.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=72f6667de98015010c7685e8849958ba
diff --git a/metadata/md5-cache/dev-python/websockify-0.9.0-r1 b/metadata/md5-cache/dev-python/websockify-0.9.0-r1
index d9dbed18c950..4e69c99149ec 100644
--- a/metadata/md5-cache/dev-python/websockify-0.9.0-r1
+++ b/metadata/md5-cache/dev-python/websockify-0.9.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kanaka/websockify/archive/v0.9.0.tar.gz -> websockify-0.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9d52899d93e69c98e2e491af7e761a30
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.35 b/metadata/md5-cache/dev-python/webtest-2.0.35
index cbecb93c5060..d56e1768fb9d 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.35
+++ b/metadata/md5-cache/dev-python/webtest-2.0.35
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.35.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d40e03e1502b586bd3dd0d3011e0f719
diff --git a/metadata/md5-cache/dev-python/werkzeug-1.0.1-r1 b/metadata/md5-cache/dev-python/werkzeug-1.0.1-r1
index fb5bf4e8cc87..cd15bdcf23ec 100644
--- a/metadata/md5-cache/dev-python/werkzeug-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/werkzeug-1.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/werkzeug/archive/1.0.1.tar.gz -> werkzeug-1.0.1.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dd12003c2eddf2bbf8680eef97a15cba
diff --git a/metadata/md5-cache/dev-python/wheel-0.35.1-r1 b/metadata/md5-cache/dev-python/wheel-0.35.1-r1
index b234bf2cd3ba..3bad71e1999e 100644
--- a/metadata/md5-cache/dev-python/wheel-0.35.1-r1
+++ b/metadata/md5-cache/dev-python/wheel-0.35.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/wheel/archive/0.35.1.tar.gz -> wheel-0.35.1.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=783689cfad9a05887612fa52d8a2423b
diff --git a/metadata/md5-cache/dev-python/wheel-0.36.0 b/metadata/md5-cache/dev-python/wheel-0.36.0
new file mode 100644
index 000000000000..d1218e2486ec
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wheel-0.36.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A built-package format for Python
+EAPI=7
+HOMEPAGE=https://pypi.org/project/wheel/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pypa/wheel/archive/0.36.0.tar.gz -> wheel-0.36.0.gh.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=48d6e5bfaf584153023cd2b4563e7271
diff --git a/metadata/md5-cache/dev-python/whichcraft-0.6.1 b/metadata/md5-cache/dev-python/whichcraft-0.6.1
index db11c095eba9..9dc59e291a8b 100644
--- a/metadata/md5-cache/dev-python/whichcraft-0.6.1
+++ b/metadata/md5-cache/dev-python/whichcraft-0.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pydanny/whichcraft/archive/0.6.1.tar.gz -> whichcraft-0.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=32c73e6751ff3bfc526ad2e9e6518add
diff --git a/metadata/md5-cache/dev-python/whisper-1.1.5 b/metadata/md5-cache/dev-python/whisper-1.1.5
index 7200bc019f51..ee359a8befdd 100644
--- a/metadata/md5-cache/dev-python/whisper-1.1.5
+++ b/metadata/md5-cache/dev-python/whisper-1.1.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/graphite-project/whisper/archive/1.1.5.tar.gz -> whisper-1.1.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0d73a13f77c8cbb29cdc361f714137a4
diff --git a/metadata/md5-cache/dev-python/whoosh-2.7.4-r1 b/metadata/md5-cache/dev-python/whoosh-2.7.4-r1
index da66321e8914..45b7f4c116aa 100644
--- a/metadata/md5-cache/dev-python/whoosh-2.7.4-r1
+++ b/metadata/md5-cache/dev-python/whoosh-2.7.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/Whoosh/Whoosh-2.7.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=81330f0b55b2acdce42592a02ec7dc89
diff --git a/metadata/md5-cache/dev-python/widgetsnbextension-3.5.1 b/metadata/md5-cache/dev-python/widgetsnbextension-3.5.1
index 7b92683b80bd..868bfff03ea7 100644
--- a/metadata/md5-cache/dev-python/widgetsnbextension-3.5.1
+++ b/metadata/md5-cache/dev-python/widgetsnbextension-3.5.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/notebook[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/w/widgetsnbextension/widgetsnbextension-3.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5d71e5bc75f1339176a79c09e5c77b86
diff --git a/metadata/md5-cache/dev-python/widgetsnbextension-3.5.1-r1 b/metadata/md5-cache/dev-python/widgetsnbextension-3.5.1-r1
index 2e611fd2719e..13db498c15bf 100644
--- a/metadata/md5-cache/dev-python/widgetsnbextension-3.5.1-r1
+++ b/metadata/md5-cache/dev-python/widgetsnbextension-3.5.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/notebook[python_targets_python3_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/w/widgetsnbextension/widgetsnbextension-3.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=63f0c3f2d303ff6273bde89f4711be4c
diff --git a/metadata/md5-cache/dev-python/wrapt-1.12.1 b/metadata/md5-cache/dev-python/wrapt-1.12.1
index 52abb4b0a48c..bff6e1c88f58 100644
--- a/metadata/md5-cache/dev-python/wrapt-1.12.1
+++ b/metadata/md5-cache/dev-python/wrapt-1.12.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/wrapt/archive/1.12.1.tar.gz -> wrapt-1.12.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4c8305262aef1d823fa94476cd966fda
diff --git a/metadata/md5-cache/dev-python/ws4py-0.5.1-r1 b/metadata/md5-cache/dev-python/ws4py-0.5.1-r1
index f4157ca0ee70..c8f71c7111a0 100644
--- a/metadata/md5-cache/dev-python/ws4py-0.5.1-r1
+++ b/metadata/md5-cache/dev-python/ws4py-0.5.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Lawouach/WebSocket-for-Python/archive/0.5.1.tar.gz -> ws4py-0.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=67bafa72d362ff6c8507bed725d5b3b0
diff --git a/metadata/md5-cache/dev-python/ws4py-9999 b/metadata/md5-cache/dev-python/ws4py-9999
index 5079259eba2b..7bf7e3651c0b 100644
--- a/metadata/md5-cache/dev-python/ws4py-9999
+++ b/metadata/md5-cache/dev-python/ws4py-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/greenlet-0.4.1[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=73080931dd460b969c2c88a419d4045f
diff --git a/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108 b/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
index df795f45884a..51221f571358 100644
--- a/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
+++ b/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/methane/wsaccel/archive/0fbd074c257c51b73de05b25ccb6488801320a32.zip -> wsaccel-0.6.2_p20170108.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a2a360b925f89921dae9264a14fe4e9
diff --git a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.6-r1 b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.6-r1
index 5ef36fda5401..fe4f4575f8ca 100644
--- a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.6-r1
+++ b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WSGIProxy2/WSGIProxy2-0.4.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5a51b65b812117fd30870a78e2d1193a
diff --git a/metadata/md5-cache/dev-python/wsproto-0.15.0 b/metadata/md5-cache/dev-python/wsproto-0.15.0
index f0d4a5d68e88..3b264707249b 100644
--- a/metadata/md5-cache/dev-python/wsproto-0.15.0
+++ b/metadata/md5-cache/dev-python/wsproto-0.15.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wsproto/wsproto-0.15.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2a1a791ebc5b61ffc8cef6aa389bbf35
diff --git a/metadata/md5-cache/dev-python/wsproto-1.0.0 b/metadata/md5-cache/dev-python/wsproto-1.0.0
index 643b016da514..1f87f1e92507 100644
--- a/metadata/md5-cache/dev-python/wsproto-1.0.0
+++ b/metadata/md5-cache/dev-python/wsproto-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wsproto/wsproto-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=84248c58a57d12c51b4b35f2e5771ba9
diff --git a/metadata/md5-cache/dev-python/wstools-0.4.8 b/metadata/md5-cache/dev-python/wstools-0.4.8
index 1f04a9d43c58..37a68f197cd5 100644
--- a/metadata/md5-cache/dev-python/wstools-0.4.8
+++ b/metadata/md5-cache/dev-python/wstools-0.4.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wstools/wstools-0.4.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0bad3b6d4f3a5fd7cd5bd87225a4408b
diff --git a/metadata/md5-cache/dev-python/wtforms-2.3.3 b/metadata/md5-cache/dev-python/wtforms-2.3.3
index e3e3d5d9cd80..761b8c8a0131 100644
--- a/metadata/md5-cache/dev-python/wtforms-2.3.3
+++ b/metadata/md5-cache/dev-python/wtforms-2.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WTForms/WTForms-2.3.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a130bd086ce13706422d35a4ed785ab4
diff --git a/metadata/md5-cache/dev-python/wurlitzer-2.0.1 b/metadata/md5-cache/dev-python/wurlitzer-2.0.1
index b397dda40cae..b2fb154863ad 100644
--- a/metadata/md5-cache/dev-python/wurlitzer-2.0.1
+++ b/metadata/md5-cache/dev-python/wurlitzer-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wurlitzer/wurlitzer-2.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=63f60abbdecaf2afe31233c3afa7b464
diff --git a/metadata/md5-cache/dev-python/www-authenticate-0.9.2 b/metadata/md5-cache/dev-python/www-authenticate-0.9.2
index d8465df80481..6fa6161c5a2d 100644
--- a/metadata/md5-cache/dev-python/www-authenticate-0.9.2
+++ b/metadata/md5-cache/dev-python/www-authenticate-0.9.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alexsdutton/www-authenticate/archive/0.9.2.tar.gz -> www-authenticate-0.9.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=357e06ac6ca578fdd32e0d3ff57ac381
diff --git a/metadata/md5-cache/dev-python/wxpython-4.0.7 b/metadata/md5-cache/dev-python/wxpython-4.0.7
index 4faa3c1de352..b61fb04884b5 100644
--- a/metadata/md5-cache/dev-python/wxpython-4.0.7
+++ b/metadata/md5-cache/dev-python/wxpython-4.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=4.0
 SRC_URI=mirror://pypi/w/wxPython/wxPython-4.0.7.post2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=e2a08606fe6c9dfb2537a9088a9dd41c
diff --git a/metadata/md5-cache/dev-python/xapp-2.0.1 b/metadata/md5-cache/dev-python/xapp-2.0.1
index 35b467a56f6b..4459de4385a9 100644
--- a/metadata/md5-cache/dev-python/xapp-2.0.1
+++ b/metadata/md5-cache/dev-python/xapp-2.0.1
@@ -11,5 +11,5 @@ RDEPEND=x11-libs/xapps[introspection] dev-python/psutil[python_targets_python3_6
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/python3-xapp/archive/2.0.1.tar.gz -> xapp-2.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fd0b196d2a7801cf730a7f119fc03486
diff --git a/metadata/md5-cache/dev-python/xarray-0.12.1 b/metadata/md5-cache/dev-python/xarray-0.12.1
index bf65b9f59731..7ed966962fc3 100644
--- a/metadata/md5-cache/dev-python/xarray-0.12.1
+++ b/metadata/md5-cache/dev-python/xarray-0.12.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xarray/xarray-0.12.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b9225be4a55b85f9156bed78038d60f5
diff --git a/metadata/md5-cache/dev-python/xarray-0.16.0 b/metadata/md5-cache/dev-python/xarray-0.16.0
index f6ce0d15dfef..e411a9d04914 100644
--- a/metadata/md5-cache/dev-python/xarray-0.16.0
+++ b/metadata/md5-cache/dev-python/xarray-0.16.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xarray/xarray-0.16.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=599e865e844cc333417bdfdc2b8fffcf
diff --git a/metadata/md5-cache/dev-python/xarray-0.16.1 b/metadata/md5-cache/dev-python/xarray-0.16.1
index ae644555fbb6..3cadd959e849 100644
--- a/metadata/md5-cache/dev-python/xarray-0.16.1
+++ b/metadata/md5-cache/dev-python/xarray-0.16.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xarray/xarray-0.16.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=02adcde94a6edc490b8fc28045ba118d
diff --git a/metadata/md5-cache/dev-python/xarray-0.16.2 b/metadata/md5-cache/dev-python/xarray-0.16.2
index 611f6de87533..53a46b4fd34c 100644
--- a/metadata/md5-cache/dev-python/xarray-0.16.2
+++ b/metadata/md5-cache/dev-python/xarray-0.16.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xarray/xarray-0.16.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b873d534478f6ea017500a908152caca
diff --git a/metadata/md5-cache/dev-python/xcffib-0.10.1 b/metadata/md5-cache/dev-python/xcffib-0.10.1
index 3ef24c4b2681..7c9564e0bdfa 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.10.1
+++ b/metadata/md5-cache/dev-python/xcffib-0.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.10.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9475fa1dd0ea69d7a904df98e1d7edfc
diff --git a/metadata/md5-cache/dev-python/xcffib-0.11.0 b/metadata/md5-cache/dev-python/xcffib-0.11.0
index e05f83858ec0..dff63fd1ecfd 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.11.0
+++ b/metadata/md5-cache/dev-python/xcffib-0.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.11.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f073c52468c4d9a1745eaf5edb30a357
diff --git a/metadata/md5-cache/dev-python/xcffib-0.11.1 b/metadata/md5-cache/dev-python/xcffib-0.11.1
index 064040513339..86df43e5fe7d 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.11.1
+++ b/metadata/md5-cache/dev-python/xcffib-0.11.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.11.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f073c52468c4d9a1745eaf5edb30a357
diff --git a/metadata/md5-cache/dev-python/xdoctest-0.15.0 b/metadata/md5-cache/dev-python/xdoctest-0.15.0
index bbac96eb56c2..c30875c4b4af 100644
--- a/metadata/md5-cache/dev-python/xdoctest-0.15.0
+++ b/metadata/md5-cache/dev-python/xdoctest-0.15.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xdoctest/xdoctest-0.15.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=aca4f3421fc610a5113ee45a9ecd7942
diff --git a/metadata/md5-cache/dev-python/xlrd-1.2.0 b/metadata/md5-cache/dev-python/xlrd-1.2.0
index d411a71d0150..1d474c585f32 100644
--- a/metadata/md5-cache/dev-python/xlrd-1.2.0
+++ b/metadata/md5-cache/dev-python/xlrd-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlrd/xlrd-1.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5f474f0c80c09f9422b55f8989c43f21
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-1.3.7 b/metadata/md5-cache/dev-python/xlsxwriter-1.3.7
index df405f8495c9..06b39b17cc95 100644
--- a/metadata/md5-cache/dev-python/xlsxwriter-1.3.7
+++ b/metadata/md5-cache/dev-python/xlsxwriter-1.3.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_1.3.7.tar.gz -> xlsxwriter-1.3.7-tests.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=65d9726c7ba0696e4c7d197d3ea6da85
diff --git a/metadata/md5-cache/dev-python/xlutils-2.0.0-r1 b/metadata/md5-cache/dev-python/xlutils-2.0.0-r1
index f65188447f99..c34d502c0b12 100644
--- a/metadata/md5-cache/dev-python/xlutils-2.0.0-r1
+++ b/metadata/md5-cache/dev-python/xlutils-2.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlutils/xlutils-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4f913224f89acc36252bbd74b995e14f
diff --git a/metadata/md5-cache/dev-python/xlwt-1.3.0-r1 b/metadata/md5-cache/dev-python/xlwt-1.3.0-r1
index 77c89ea077b6..91b41998a171 100644
--- a/metadata/md5-cache/dev-python/xlwt-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/xlwt-1.3.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlwt/xlwt-1.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=12482d15ed9e10491f678ac08ed4b39e
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.2.3-r1 b/metadata/md5-cache/dev-python/xmlschema-1.2.3-r1
index 80d843666edc..9210102a33f8 100644
--- a/metadata/md5-cache/dev-python/xmlschema-1.2.3-r1
+++ b/metadata/md5-cache/dev-python/xmlschema-1.2.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.2.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e3e3001b3780d49a43ec04a81d84be5f
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.2.4 b/metadata/md5-cache/dev-python/xmlschema-1.2.4
index 05a943c24ac6..72811dc38b1c 100644
--- a/metadata/md5-cache/dev-python/xmlschema-1.2.4
+++ b/metadata/md5-cache/dev-python/xmlschema-1.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.2.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=03fa69046524df8c875993365ab2c052
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.2.5 b/metadata/md5-cache/dev-python/xmlschema-1.2.5
index e855c6805622..bae6c953d20c 100644
--- a/metadata/md5-cache/dev-python/xmlschema-1.2.5
+++ b/metadata/md5-cache/dev-python/xmlschema-1.2.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.2.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5a9bcdfe43f4eb390642f38360e1bb37
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.3.0 b/metadata/md5-cache/dev-python/xmlschema-1.3.0
index c6d19c0a2ba9..726d50369721 100644
--- a/metadata/md5-cache/dev-python/xmlschema-1.3.0
+++ b/metadata/md5-cache/dev-python/xmlschema-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b0f28c95114926533af426162695d7e2
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.3.1 b/metadata/md5-cache/dev-python/xmlschema-1.3.1
index 11dbc44809c8..86148e0c4699 100644
--- a/metadata/md5-cache/dev-python/xmlschema-1.3.1
+++ b/metadata/md5-cache/dev-python/xmlschema-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=56c947fd52ef75d8ed58738458bf8738
diff --git a/metadata/md5-cache/dev-python/xmltodict-0.12.0-r1 b/metadata/md5-cache/dev-python/xmltodict-0.12.0-r1
index d52d0b669d41..e8ee0784de09 100644
--- a/metadata/md5-cache/dev-python/xmltodict-0.12.0-r1
+++ b/metadata/md5-cache/dev-python/xmltodict-0.12.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmltodict/xmltodict-0.12.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=736a090aedfddf51f9282182b00359a7
diff --git a/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9 b/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
index 5a3510cc507d..e34a3df3c8e2 100644
--- a/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
+++ b/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
@@ -10,5 +10,5 @@ RDEPEND=x11-base/xorg-server[xvfb] python_targets_python3_6? ( dev-lang/python:3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xvfbwrapper/xvfbwrapper-0.2.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ff3e0a3453141df1c46c49794d68206f
diff --git a/metadata/md5-cache/dev-python/xxhash-2.0.0 b/metadata/md5-cache/dev-python/xxhash-2.0.0
index 81dfa2eea609..7018b14cda37 100644
--- a/metadata/md5-cache/dev-python/xxhash-2.0.0
+++ b/metadata/md5-cache/dev-python/xxhash-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xxhash/xxhash-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6ba15d897efa420d2fa056970df34c1b
diff --git a/metadata/md5-cache/dev-python/yapf-0.30.0 b/metadata/md5-cache/dev-python/yapf-0.30.0
index 42bfc131abd5..71f74d809c68 100644
--- a/metadata/md5-cache/dev-python/yapf-0.30.0
+++ b/metadata/md5-cache/dev-python/yapf-0.30.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/google/yapf/archive/v0.30.0.tar.gz -> yapf-0.30.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9630e5242821fcad29517cad91c74948
diff --git a/metadata/md5-cache/dev-python/yappi-1.2.5-r1 b/metadata/md5-cache/dev-python/yappi-1.2.5-r1
index 44dae4241a99..2fdd15c7ddd7 100644
--- a/metadata/md5-cache/dev-python/yappi-1.2.5-r1
+++ b/metadata/md5-cache/dev-python/yappi-1.2.5-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-python/contextvars[python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/sumerc/yappi/archive/b6c7d9f0bb40b511f61bb82cc395ad9140a4f4b0.tar.gz -> yappi-1.2.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5f49a8366831c9c337e18c22728dc88a
diff --git a/metadata/md5-cache/dev-python/yappi-1.3.0 b/metadata/md5-cache/dev-python/yappi-1.3.0
index f7b7d8c258ff..3a84c76decd4 100644
--- a/metadata/md5-cache/dev-python/yappi-1.3.0
+++ b/metadata/md5-cache/dev-python/yappi-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/sumerc/yappi/archive/b6c7d9f0bb40b511f61bb82cc395ad9140a4f4b0.tar.gz -> yappi-1.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f5a55ff0e964a509c593dad408858959
diff --git a/metadata/md5-cache/dev-python/yapsy-1.12.2 b/metadata/md5-cache/dev-python/yapsy-1.12.2
index 7f79ec9ee778..edbe3c588ac9 100644
--- a/metadata/md5-cache/dev-python/yapsy-1.12.2
+++ b/metadata/md5-cache/dev-python/yapsy-1.12.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://sourceforge/yapsy/Yapsy-1.12.2/Yapsy-1.12.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b6e61c3ba54dd2c8543934312d125ca9
diff --git a/metadata/md5-cache/dev-python/yaql-1.1.3 b/metadata/md5-cache/dev-python/yaql-1.1.3
index 5546c2a9e648..4117c60acbcf 100644
--- a/metadata/md5-cache/dev-python/yaql-1.1.3
+++ b/metadata/md5-cache/dev-python/yaql-1.1.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yaql/yaql-1.1.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4e861d8b4828a8ed99383b14007c2992
diff --git a/metadata/md5-cache/dev-python/yarl-1.6.2 b/metadata/md5-cache/dev-python/yarl-1.6.2
index 9f03f478dda2..60a4f474c71c 100644
--- a/metadata/md5-cache/dev-python/yarl-1.6.2
+++ b/metadata/md5-cache/dev-python/yarl-1.6.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yarl/yarl-1.6.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7f803a0c26a9b24c1dd2ea66e444f3dc
diff --git a/metadata/md5-cache/dev-python/yarl-1.6.3 b/metadata/md5-cache/dev-python/yarl-1.6.3
index a2e3409a4c40..13bb7e910bc6 100644
--- a/metadata/md5-cache/dev-python/yarl-1.6.3
+++ b/metadata/md5-cache/dev-python/yarl-1.6.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yarl/yarl-1.6.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b3bdc945e9b53ed8b7c77ad81c98313d
diff --git a/metadata/md5-cache/dev-python/yaswfp-0.9.3-r1 b/metadata/md5-cache/dev-python/yaswfp-0.9.3-r1
index a1c7a31f9f92..e9ac38961c80 100644
--- a/metadata/md5-cache/dev-python/yaswfp-0.9.3-r1
+++ b/metadata/md5-cache/dev-python/yaswfp-0.9.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yaswfp/yaswfp-0.9.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=35a93bd97f6b077c669af4a7378927f1
diff --git a/metadata/md5-cache/dev-python/zVMCloudConnector-1.4.1 b/metadata/md5-cache/dev-python/zVMCloudConnector-1.4.1
index db2773d261ad..1733d3d1530b 100644
--- a/metadata/md5-cache/dev-python/zVMCloudConnector-1.4.1
+++ b/metadata/md5-cache/dev-python/zVMCloudConnector-1.4.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zVMCloudConnector/zVMCloudConnector-1.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2a23fbce19e3aa39d6f97f05355e82ad
diff --git a/metadata/md5-cache/dev-python/zc-lockfile-2.0 b/metadata/md5-cache/dev-python/zc-lockfile-2.0
index 3eb7865fbce6..bcf0d594c6e3 100644
--- a/metadata/md5-cache/dev-python/zc-lockfile-2.0
+++ b/metadata/md5-cache/dev-python/zc-lockfile-2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zc.lockfile/zc.lockfile-2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e4a160288bf32ef4caaca740f5ee164b
diff --git a/metadata/md5-cache/dev-python/zconfig-3.5.0 b/metadata/md5-cache/dev-python/zconfig-3.5.0
index e4b9d66da6ac..2f4381ee0088 100644
--- a/metadata/md5-cache/dev-python/zconfig-3.5.0
+++ b/metadata/md5-cache/dev-python/zconfig-3.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/Z/ZConfig/ZConfig-3.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dcd2ece0940025feebea961e418af8cd
diff --git a/metadata/md5-cache/dev-python/zeep-3.4.0 b/metadata/md5-cache/dev-python/zeep-3.4.0
index 54b77ad9acf5..8f352e9d7b34 100644
--- a/metadata/md5-cache/dev-python/zeep-3.4.0
+++ b/metadata/md5-cache/dev-python/zeep-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools >=dev-python/appdirs-1.4.0[python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zeep/zeep-3.4.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6999512f333fe50a4face71d6c5b6cfd
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.24.4 b/metadata/md5-cache/dev-python/zeroconf-0.24.4
index ae8e5e3457f7..87012707ddd3 100644
--- a/metadata/md5-cache/dev-python/zeroconf-0.24.4
+++ b/metadata/md5-cache/dev-python/zeroconf-0.24.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/z/zeroconf/zeroconf-0.24.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6d238acd17318c28272e0ce42311b478
diff --git a/metadata/md5-cache/dev-python/zict-0.1.4 b/metadata/md5-cache/dev-python/zict-0.1.4
index 805b57af9b89..8e2116d3d074 100644
--- a/metadata/md5-cache/dev-python/zict-0.1.4
+++ b/metadata/md5-cache/dev-python/zict-0.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zict/zict-0.1.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2eb3be23958578e50a1bbe7be6006a44
diff --git a/metadata/md5-cache/dev-python/zipp-3.4.0 b/metadata/md5-cache/dev-python/zipp-3.4.0
index 87961d58f1d6..d431ab0e74f1 100644
--- a/metadata/md5-cache/dev-python/zipp-3.4.0
+++ b/metadata/md5-cache/dev-python/zipp-3.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zipp/zipp-3.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=46ea606a21fe423810537fefa645b408
diff --git a/metadata/md5-cache/dev-python/zope-component-4.4.1 b/metadata/md5-cache/dev-python/zope-component-4.4.1
index 45a7a17a25c6..32df69bdd442 100644
--- a/metadata/md5-cache/dev-python/zope-component-4.4.1
+++ b/metadata/md5-cache/dev-python/zope-component-4.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.component/zope.component-4.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d29675e54e5551fc11e4915b5519e58a
diff --git a/metadata/md5-cache/dev-python/zope-configuration-4.4.0 b/metadata/md5-cache/dev-python/zope-configuration-4.4.0
index b5a7a420d20d..3fd81e2dc4ba 100644
--- a/metadata/md5-cache/dev-python/zope-configuration-4.4.0
+++ b/metadata/md5-cache/dev-python/zope-configuration-4.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/zope-i18nmessageid[python_targets_python3_6(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.configuration/zope.configuration-4.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=904729e5c33f90e137e47e1e13168741
diff --git a/metadata/md5-cache/dev-python/zope-deprecation-4.4.0 b/metadata/md5-cache/dev-python/zope-deprecation-4.4.0
index 378f2bd2aa75..e1fa940848e4 100644
--- a/metadata/md5-cache/dev-python/zope-deprecation-4.4.0
+++ b/metadata/md5-cache/dev-python/zope-deprecation-4.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.deprecation/zope.deprecation-4.4.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2511bab16948872f439260fc7f7ab5b9
diff --git a/metadata/md5-cache/dev-python/zope-event-4.5.0-r1 b/metadata/md5-cache/dev-python/zope-event-4.5.0-r1
index 9d9ad8793c43..8635156f5238 100644
--- a/metadata/md5-cache/dev-python/zope-event-4.5.0-r1
+++ b/metadata/md5-cache/dev-python/zope-event-4.5.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.event/zope.event-4.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8c05ecb99b90ed41f67314d6a442dbd2
diff --git a/metadata/md5-cache/dev-python/zope-exceptions-4.4 b/metadata/md5-cache/dev-python/zope-exceptions-4.4
index cf9a6b6dc5f7..daa38bbc33a7 100644
--- a/metadata/md5-cache/dev-python/zope-exceptions-4.4
+++ b/metadata/md5-cache/dev-python/zope-exceptions-4.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.exceptions/zope.exceptions-4.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a6a28f96a8c7593ff084b640d2ac6f5c
diff --git a/metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.1 b/metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.1
index 7e21cf33580d..c4acf65b40d8 100644
--- a/metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.1
+++ b/metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.i18nmessageid/zope.i18nmessageid-5.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=132cf2b0353d795a5c4dd041ce29d58f
diff --git a/metadata/md5-cache/dev-python/zope-interface-5.1.2 b/metadata/md5-cache/dev-python/zope-interface-5.1.2
index 8490f848b4d4..8de8f3ab36e9 100644
--- a/metadata/md5-cache/dev-python/zope-interface-5.1.2
+++ b/metadata/md5-cache/dev-python/zope-interface-5.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.interface/zope.interface-5.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=209bf990635f09fae3ca90a078d4336f
diff --git a/metadata/md5-cache/dev-python/zope-interface-5.2.0 b/metadata/md5-cache/dev-python/zope-interface-5.2.0
index e94bbfcdadcb..093217172c33 100644
--- a/metadata/md5-cache/dev-python/zope-interface-5.2.0
+++ b/metadata/md5-cache/dev-python/zope-interface-5.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.interface/zope.interface-5.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e5ead5c48cd4a8fff89852a5573a3535
diff --git a/metadata/md5-cache/dev-python/zope-schema-6.0.0 b/metadata/md5-cache/dev-python/zope-schema-6.0.0
index 640f69b4b6ce..b7cdf0bfc982 100644
--- a/metadata/md5-cache/dev-python/zope-schema-6.0.0
+++ b/metadata/md5-cache/dev-python/zope-schema-6.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.schema/zope.schema-6.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=77924404975719db1b163f82fb8605c6
diff --git a/metadata/md5-cache/dev-python/zope-testing-4.7-r2 b/metadata/md5-cache/dev-python/zope-testing-4.7-r2
index fa5469b6b303..6245ab24fc76 100644
--- a/metadata/md5-cache/dev-python/zope-testing-4.7-r2
+++ b/metadata/md5-cache/dev-python/zope-testing-4.7-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.testing/zope.testing-4.7.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a8c5bff3c1abae47328aff0c41e7b29e
diff --git a/metadata/md5-cache/dev-python/zope-testrunner-5.2 b/metadata/md5-cache/dev-python/zope-testrunner-5.2
index b9bf62806f1d..471cd4c4b148 100644
--- a/metadata/md5-cache/dev-python/zope-testrunner-5.2
+++ b/metadata/md5-cache/dev-python/zope-testrunner-5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.testrunner/zope.testrunner-5.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6141f8616e641db387e589b4527d8a92
diff --git a/metadata/md5-cache/dev-python/zstandard-0.14.0-r1 b/metadata/md5-cache/dev-python/zstandard-0.14.0-r1
index ebc77f0371ff..8c440e16959a 100644
--- a/metadata/md5-cache/dev-python/zstandard-0.14.0-r1
+++ b/metadata/md5-cache/dev-python/zstandard-0.14.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zstandard/zstandard-0.14.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=db19a2d8eff8902229ff1ff41afe2261
diff --git a/metadata/md5-cache/dev-python/zstandard-0.8.1-r1 b/metadata/md5-cache/dev-python/zstandard-0.8.1-r1
index 60339163ba75..eb00d1b66c55 100644
--- a/metadata/md5-cache/dev-python/zstandard-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/zstandard-0.8.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cffi:=[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zstandard/zstandard-0.8.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0053df888c65d99caf438ce26b1b7195
diff --git a/metadata/md5-cache/dev-python/zstd-1.4.5.1 b/metadata/md5-cache/dev-python/zstd-1.4.5.1
index 659edab91a74..8fd4cdefc2df 100644
--- a/metadata/md5-cache/dev-python/zstd-1.4.5.1
+++ b/metadata/md5-cache/dev-python/zstd-1.4.5.1
@@ -11,5 +11,5 @@ RDEPEND=app-arch/zstd !dev-python/zstandard[python_targets_python3_7(-)?,python_
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zstd/zstd-1.4.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e89e4d849b607f92d287e625f6c70cf4
diff --git a/metadata/md5-cache/dev-python/zxcvbn-4.4.28 b/metadata/md5-cache/dev-python/zxcvbn-4.4.28
index fc0f000617eb..0512c37f6b43 100644
--- a/metadata/md5-cache/dev-python/zxcvbn-4.4.28
+++ b/metadata/md5-cache/dev-python/zxcvbn-4.4.28
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dwolfhub/zxcvbn-python/archive/v4.4.28.tar.gz -> zxcvbn-4.4.28.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ec50154c8276d4f8900c019d02dbadf2
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index 6ae863949cd8..df0bf68c9918 100644
Binary files a/metadata/md5-cache/dev-ros/Manifest.gz and b/metadata/md5-cache/dev-ros/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ros/ament_copyright-0.10.0 b/metadata/md5-cache/dev-ros/ament_copyright-0.10.0
index d723bc3eed7d..21a9d536658c 100644
--- a/metadata/md5-cache/dev-ros/ament_copyright-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_copyright-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2802ff01d857b0722fe9571d96d10864
diff --git a/metadata/md5-cache/dev-ros/ament_copyright-9999 b/metadata/md5-cache/dev-ros/ament_copyright-9999
index 929ccc21a645..d8e1956f9517 100644
--- a/metadata/md5-cache/dev-ros/ament_copyright-9999
+++ b/metadata/md5-cache/dev-ros/ament_copyright-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2802ff01d857b0722fe9571d96d10864
diff --git a/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.0 b/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.0
index f666193bf1f4..2c4106a7645d 100644
--- a/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=dev-util/cppcheck python_targets_python3_7? ( dev-lang/python:3.7 ) pyth
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f906d7b42236f008e8e2001dd59d2a6f
diff --git a/metadata/md5-cache/dev-ros/ament_cppcheck-9999 b/metadata/md5-cache/dev-ros/ament_cppcheck-9999
index 8bbf2a8f1c45..c295ec38c227 100644
--- a/metadata/md5-cache/dev-ros/ament_cppcheck-9999
+++ b/metadata/md5-cache/dev-ros/ament_cppcheck-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-util/cppcheck python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f906d7b42236f008e8e2001dd59d2a6f
diff --git a/metadata/md5-cache/dev-ros/ament_cpplint-0.10.0 b/metadata/md5-cache/dev-ros/ament_cpplint-0.10.0
index cf8369eefcd1..a2a31ea58a8d 100644
--- a/metadata/md5-cache/dev-ros/ament_cpplint-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_cpplint-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3349a3f97bd98867e5da8a54580460c4
diff --git a/metadata/md5-cache/dev-ros/ament_cpplint-9999 b/metadata/md5-cache/dev-ros/ament_cpplint-9999
index c06c65c4ec54..059fd3cd2aa7 100644
--- a/metadata/md5-cache/dev-ros/ament_cpplint-9999
+++ b/metadata/md5-cache/dev-ros/ament_cpplint-9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3349a3f97bd98867e5da8a54580460c4
diff --git a/metadata/md5-cache/dev-ros/ament_flake8-0.10.0 b/metadata/md5-cache/dev-ros/ament_flake8-0.10.0
index be81783e1481..8d2dc2ae628c 100644
--- a/metadata/md5-cache/dev-ros/ament_flake8-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_flake8-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=49fd556b02a0ab9fcd61022b5e5be942
diff --git a/metadata/md5-cache/dev-ros/ament_flake8-9999 b/metadata/md5-cache/dev-ros/ament_flake8-9999
index 5eec91bef082..545c254cee62 100644
--- a/metadata/md5-cache/dev-ros/ament_flake8-9999
+++ b/metadata/md5-cache/dev-ros/ament_flake8-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_lint[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=49fd556b02a0ab9fcd61022b5e5be942
diff --git a/metadata/md5-cache/dev-ros/ament_lint-0.10.0 b/metadata/md5-cache/dev-ros/ament_lint-0.10.0
index ab95f8cc5567..a4c0f583863a 100644
--- a/metadata/md5-cache/dev-ros/ament_lint-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_lint-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9892ea456ead68452dea8529f4e2c45a
diff --git a/metadata/md5-cache/dev-ros/ament_lint-0.9.5 b/metadata/md5-cache/dev-ros/ament_lint-0.9.5
index 0f1604668c3d..ae21063fa42f 100644
--- a/metadata/md5-cache/dev-ros/ament_lint-0.9.5
+++ b/metadata/md5-cache/dev-ros/ament_lint-0.9.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9892ea456ead68452dea8529f4e2c45a
diff --git a/metadata/md5-cache/dev-ros/ament_lint-9999 b/metadata/md5-cache/dev-ros/ament_lint-9999
index 79d520ef1348..d5eda310126a 100644
--- a/metadata/md5-cache/dev-ros/ament_lint-9999
+++ b/metadata/md5-cache/dev-ros/ament_lint-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9892ea456ead68452dea8529f4e2c45a
diff --git a/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.0 b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.0
index 7c3f63c8d5bc..100dc9ab5a41 100644
--- a/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3f4e4efbbb89f7c4f61a4013cebf1a42
diff --git a/metadata/md5-cache/dev-ros/ament_lint_cmake-9999 b/metadata/md5-cache/dev-ros/ament_lint_cmake-9999
index e674df227ebd..cad5a90de308 100644
--- a/metadata/md5-cache/dev-ros/ament_lint_cmake-9999
+++ b/metadata/md5-cache/dev-ros/ament_lint_cmake-9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3f4e4efbbb89f7c4f61a4013cebf1a42
diff --git a/metadata/md5-cache/dev-ros/ament_pep257-0.10.0 b/metadata/md5-cache/dev-ros/ament_pep257-0.10.0
index 12ed4a099ebd..1caedc43c860 100644
--- a/metadata/md5-cache/dev-ros/ament_pep257-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_pep257-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f7d2af15ca6d78dc1b3d0e4c08cd9d4d
diff --git a/metadata/md5-cache/dev-ros/ament_pep257-9999 b/metadata/md5-cache/dev-ros/ament_pep257-9999
index fa73d1b7d87c..f371f55dc236 100644
--- a/metadata/md5-cache/dev-ros/ament_pep257-9999
+++ b/metadata/md5-cache/dev-ros/ament_pep257-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f7d2af15ca6d78dc1b3d0e4c08cd9d4d
diff --git a/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.0 b/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.0
index d3a5e9842657..1b733f058c7f 100644
--- a/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=dev-util/uncrustify python_targets_python3_7? ( dev-lang/python:3.7 ) py
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dd4f411e73b2dfdee5b90ebaec04064e
diff --git a/metadata/md5-cache/dev-ros/ament_uncrustify-9999 b/metadata/md5-cache/dev-ros/ament_uncrustify-9999
index e67cada2f06f..3e55bf7898c3 100644
--- a/metadata/md5-cache/dev-ros/ament_uncrustify-9999
+++ b/metadata/md5-cache/dev-ros/ament_uncrustify-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-util/uncrustify python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dd4f411e73b2dfdee5b90ebaec04064e
diff --git a/metadata/md5-cache/dev-ros/ament_xmllint-0.10.0 b/metadata/md5-cache/dev-ros/ament_xmllint-0.10.0
index 28d0d2953cf8..26903f3dea20 100644
--- a/metadata/md5-cache/dev-ros/ament_xmllint-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_xmllint-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d93beb5aa4b64474bf240096f6f93fb1
diff --git a/metadata/md5-cache/dev-ros/ament_xmllint-9999 b/metadata/md5-cache/dev-ros/ament_xmllint-9999
index eea6202f4a73..f7267e1f055f 100644
--- a/metadata/md5-cache/dev-ros/ament_xmllint-9999
+++ b/metadata/md5-cache/dev-ros/ament_xmllint-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d93beb5aa4b64474bf240096f6f93fb1
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 66fd018fbd78..49c7eee95853 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/listen-3.3.3 b/metadata/md5-cache/dev-ruby/listen-3.3.3
new file mode 100644
index 000000000000..031640a1345b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/listen-3.3.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/thor[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/thor[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/thor[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Listens to file modifications and notifies you about the changes
+EAPI=7
+HOMEPAGE=https://github.com/guard/listen
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2 ruby_targets_ruby25? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rb-inotify-0.9.10[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://github.com/guard/listen/archive/v3.3.3.tar.gz -> listen-3.3.3.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ed925bca184fb6ce4daed350cbfcf439
diff --git a/metadata/md5-cache/dev-ruby/nokogumbo-2.0.4 b/metadata/md5-cache/dev-ruby/nokogumbo-2.0.4
new file mode 100644
index 000000000000..d96794d53467
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/nokogumbo-2.0.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.8.4[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/nokogiri-1.8.4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/nokogiri-1.8.4[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A Nokogiri interface to the Gumbo HTML5 parser
+EAPI=7
+HOMEPAGE=https://github.com/rubys/nokogumbo
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
+KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.8.4[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/nokogiri-1.8.4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/nokogiri-1.8.4[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/rubys/nokogumbo/archive/v2.0.4.tar.gz -> nokogumbo-2.0.4.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=95f8ff9e013eea336f0fc937220a3490
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-1.5.1 b/metadata/md5-cache/dev-ruby/regexp_parser-1.5.1
deleted file mode 100644
index 3b56a35fd0bc..000000000000
--- a/metadata/md5-cache/dev-ruby/regexp_parser-1.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby25(-)] dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressions
-EAPI=6
-HOMEPAGE=https://github.com/ammar/regexp_parser
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=1
-SRC_URI=https://github.com/ammar/regexp_parser/archive/v1.5.1.tar.gz -> regexp_parser-1.5.1.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a58f4ef09407ea730516519f2fce3f60
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-1.8.1 b/metadata/md5-cache/dev-ruby/regexp_parser-1.8.1
deleted file mode 100644
index a10ecbf1593a..000000000000
--- a/metadata/md5-cache/dev-ruby/regexp_parser-1.8.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby25(-)] dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressions
-EAPI=7
-HOMEPAGE=https://github.com/ammar/regexp_parser
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=1
-SRC_URI=https://github.com/ammar/regexp_parser/archive/v1.8.1.tar.gz -> regexp_parser-1.8.1.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=844e3973a33dd1d4be26e1289a2e5915
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-1.8.2 b/metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
index 6695e0a7c842..e6b641a7ddb6 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
@@ -5,7 +5,7 @@ DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressio
 EAPI=7
 HOMEPAGE=https://github.com/ammar/regexp_parser
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v1.8.2.tar.gz -> regexp_parser-1.8.2.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=844e3973a33dd1d4be26e1289a2e5915
+_md5_=735ab342184ec5b1240d3d6886ecfa15
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-1.8.0 b/metadata/md5-cache/dev-ruby/regexp_parser-2.0.0
similarity index 95%
rename from metadata/md5-cache/dev-ruby/regexp_parser-1.8.0
rename to metadata/md5-cache/dev-ruby/regexp_parser-2.0.0
index 6f7388337efe..1963af9c388f 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-1.8.0
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.0.0
@@ -10,7 +10,7 @@ LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
-SLOT=1
-SRC_URI=https://github.com/ammar/regexp_parser/archive/v1.8.0.tar.gz -> regexp_parser-1.8.0.tar.gz
+SLOT=2
+SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.0.0.tar.gz -> regexp_parser-2.0.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=844e3973a33dd1d4be26e1289a2e5915
+_md5_=d474df7c9103734468d78e2d5eebeaac
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.0 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.0
new file mode 100644
index 000000000000..c38192c434bf
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/flexmock-1.3.0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/flexmock-1.3.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/flexmock-1.3.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Pure ruby LDAP client implementation
+EAPI=7
+HOMEPAGE=https://github.com/ruby-ldap/ruby-net-ldap
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby-ldap/ruby-net-ldap/archive/v0.17.0.tar.gz -> ruby-net-ldap-0.17.0.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b7fabed627e9780b79994c86369f7396
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 9a394c39ace0..f132d3a91608 100644
Binary files a/metadata/md5-cache/dev-tcltk/Manifest.gz and b/metadata/md5-cache/dev-tcltk/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r9 b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r9
index a7286879d709..cbe3ae4ed548 100644
--- a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r9
+++ b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=ba225a74693f6ff8fbcc5a2dfff2b344
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 5aaa41034ba9..c0b4c10c822b 100644
Binary files a/metadata/md5-cache/dev-tex/Manifest.gz and b/metadata/md5-cache/dev-tex/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tex/dot2tex-2.11.3 b/metadata/md5-cache/dev-tex/dot2tex-2.11.3
index 740ce8591d8c..c5150a84df70 100644
--- a/metadata/md5-cache/dev-tex/dot2tex-2.11.3
+++ b/metadata/md5-cache/dev-tex/dot2tex-2.11.3
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyparsing[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx )
+DEPEND=dev-python/pyparsing[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( dev-python/sphinx )
 DESCRIPTION=A Graphviz to LaTeX converter
 EAPI=7
 HOMEPAGE=https://dot2tex.readthedocs.org/ https://github.com/kjellmf/dot2tex
-IUSE=doc examples python_targets_python3_6 python_targets_python3_7
+IUSE=doc examples python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=MIT
-RDEPEND=dev-python/pydot[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-gfx/graphviz python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/pydot[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-gfx/graphviz python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/kjellmf/dot2tex/archive/2.11.3.tar.gz -> dot2tex-2.11.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=20e28e8b6fc55206948513f5c8543608
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fc34e8f32f4f27318687aeb49f035adc
diff --git a/metadata/md5-cache/dev-tex/rubber-1.5.1 b/metadata/md5-cache/dev-tex/rubber-1.5.1
index b70394ab5491..0dbd83108e9c 100644
--- a/metadata/md5-cache/dev-tex/rubber-1.5.1
+++ b/metadata/md5-cache/dev-tex/rubber-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/latex-base python_targets_python3_6? ( dev-lang/python:3.6 ) pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://launchpad.net/rubber/trunk/1.5.1/+download/rubber-1.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2dd958dc76a0cecfe3f151ae2f1ee60a
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index c43876de2e23..1e8832b9cba3 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/buildbot-2.8.2-r1 b/metadata/md5-cache/dev-util/buildbot-2.8.2-r1
index 772edfd0ce7d..73164f1dca79 100644
--- a/metadata/md5-cache/dev-util/buildbot-2.8.2-r1
+++ b/metadata/md5-cache/dev-util/buildbot-2.8.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-2.8.2.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a1140b0e83fae064e77f44efb8a983a2
diff --git a/metadata/md5-cache/dev-util/buildbot-2.8.4 b/metadata/md5-cache/dev-util/buildbot-2.8.4
index cb1b3ea80b04..320d36bd7bea 100644
--- a/metadata/md5-cache/dev-util/buildbot-2.8.4
+++ b/metadata/md5-cache/dev-util/buildbot-2.8.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-2.8.4.tar.gz https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=006f918f265885ce62eb511467684ecb
diff --git a/metadata/md5-cache/dev-util/buildbot-9999 b/metadata/md5-cache/dev-util/buildbot-9999
index 8073c2c06016..221f9fced562 100644
--- a/metadata/md5-cache/dev-util/buildbot-9999
+++ b/metadata/md5-cache/dev-util/buildbot-9999
@@ -11,5 +11,5 @@ RDEPEND=acct-user/buildbot >=dev-python/jinja-2.1[python_targets_python3_6(-)?,p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4f392b1c7f380552e3c8b0597f78e60b
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-2.8.2 b/metadata/md5-cache/dev-util/buildbot-badges-2.8.2
index 308380cae1dc..928a26abedba 100644
--- a/metadata/md5-cache/dev-util/buildbot-badges-2.8.2
+++ b/metadata/md5-cache/dev-util/buildbot-badges-2.8.2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-badges/buildbot-badges-2.8.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b21310954d34116dfeddc027aa0d8881
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-2.8.4 b/metadata/md5-cache/dev-util/buildbot-badges-2.8.4
index ac4ae068afc2..3694b996ba6d 100644
--- a/metadata/md5-cache/dev-util/buildbot-badges-2.8.4
+++ b/metadata/md5-cache/dev-util/buildbot-badges-2.8.4
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-badges/buildbot-badges-2.8.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b21310954d34116dfeddc027aa0d8881
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-2.8.2 b/metadata/md5-cache/dev-util/buildbot-console-view-2.8.2
index fc909a1fdc8a..909478b7aea4 100644
--- a/metadata/md5-cache/dev-util/buildbot-console-view-2.8.2
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-2.8.2
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-2.8.2[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-2.8.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=35fe3f395baa97f44309dd147aa52441
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-2.8.4 b/metadata/md5-cache/dev-util/buildbot-console-view-2.8.4
index e44799a6c60b..336a3661188e 100644
--- a/metadata/md5-cache/dev-util/buildbot-console-view-2.8.4
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-2.8.4
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-2.8.4[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-2.8.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=35fe3f395baa97f44309dd147aa52441
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.2 b/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.2
index a4df5016fe9f..faf8e7ea9cd4 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.2
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-2.8.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=842251df93ca7efd0bb76e850c6e23da
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.4 b/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.4
index 012ebb4c2d92..e460b38516fa 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.4
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-2.8.4
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-2.8.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=842251df93ca7efd0bb76e850c6e23da
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-2.8.2 b/metadata/md5-cache/dev-util/buildbot-pkg-2.8.2
index 2732234d9173..c59df05676f7 100644
--- a/metadata/md5-cache/dev-util/buildbot-pkg-2.8.2
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-2.8.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-2.8.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=836fab1f28e1ef35429d8d88ce4c5c53
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-2.8.4 b/metadata/md5-cache/dev-util/buildbot-pkg-2.8.4
index 9b153949db64..495c4d307b85 100644
--- a/metadata/md5-cache/dev-util/buildbot-pkg-2.8.4
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-2.8.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-2.8.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=836fab1f28e1ef35429d8d88ce4c5c53
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.2 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.2
index d4c5cc0f0503..ab35431e0b20 100644
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.2
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.2
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-2.8.2[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-2.8.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6432c553a3bc681fb9891ffa1a531eb2
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.4 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.4
index 1963267f0e58..f6e18a708221 100644
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.4
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.4
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-2.8.4[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-2.8.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6432c553a3bc681fb9891ffa1a531eb2
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-2.8.2 b/metadata/md5-cache/dev-util/buildbot-worker-2.8.2
index 18a9fa979951..2710d7e470d4 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-2.8.2
+++ b/metadata/md5-cache/dev-util/buildbot-worker-2.8.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-2.8.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bd8e27fb22d341376b7060ace3925e8e
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-2.8.4 b/metadata/md5-cache/dev-util/buildbot-worker-2.8.4
index 1654f73508a3..7b309b1df0d6 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-2.8.4
+++ b/metadata/md5-cache/dev-util/buildbot-worker-2.8.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-2.8.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bd8e27fb22d341376b7060ace3925e8e
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-9999 b/metadata/md5-cache/dev-util/buildbot-worker-9999
index a09bd7286c20..bffe8a3cdb20 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-9999
+++ b/metadata/md5-cache/dev-util/buildbot-worker-9999
@@ -11,5 +11,5 @@ RDEPEND=acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3f621de5b9a24e09c7e70ce09c0f1c38
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.2 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.2
index b0e80b113b0e..08262c7d1674 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.2
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e87af2212874a69cd36ab925966c7457
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.4 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.4
index 4537de83cc79..694c693b2323 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.4
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.4
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e87af2212874a69cd36ab925966c7457
diff --git a/metadata/md5-cache/dev-util/buildbot-www-2.8.2 b/metadata/md5-cache/dev-util/buildbot-www-2.8.2
index 4bc625f46ab9..bbc675ec6d33 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-2.8.2
+++ b/metadata/md5-cache/dev-util/buildbot-www-2.8.2
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-pkg-2.8.2[python_targets_python3_6(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-2.8.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b97203eb2be2f9065d8f3a6a842afcfc
diff --git a/metadata/md5-cache/dev-util/buildbot-www-2.8.4 b/metadata/md5-cache/dev-util/buildbot-www-2.8.4
index ed93b5e5017a..6acab2aacb93 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-2.8.4
+++ b/metadata/md5-cache/dev-util/buildbot-www-2.8.4
@@ -11,5 +11,5 @@ RDEPEND=~dev-util/buildbot-pkg-2.8.4[python_targets_python3_6(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-2.8.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b97203eb2be2f9065d8f3a6a842afcfc
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.14 b/metadata/md5-cache/dev-util/catalyst-3.0.14
index 1dd34fdd3080..6a667db95c56 100644
--- a/metadata/md5-cache/dev-util/catalyst-3.0.14
+++ b/metadata/md5-cache/dev-util/catalyst-3.0.14
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/snakeoil-0.6.5[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/catalyst.git/snapshot/catalyst-3.0.14.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fd7e8bd317b4c18ed656ab35a0a49cf9
diff --git a/metadata/md5-cache/dev-util/catalyst-9999 b/metadata/md5-cache/dev-util/catalyst-9999
index d76b8a9b7476..7062b2efc17f 100644
--- a/metadata/md5-cache/dev-util/catalyst-9999
+++ b/metadata/md5-cache/dev-util/catalyst-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=sys-apps/portage[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/snakeoil-0.6.5[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/toml[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] sys-apps/util-linux[python,python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pydecomp-0.3[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] app-arch/lbzip2 app-arch/pixz app-arch/tar[xattr] dev-vcs/git sys-fs/dosfstools sys-fs/squashfs-tools-ng iso? ( virtual/cdrtools amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) alpha? ( dev-libs/libisoburn ) ia64? ( dev-libs/libisoburn sys-boot/grub[grub_platforms_efi-64] sys-fs/mtools ) ppc? ( dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) ppc64? ( dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) sparc? ( dev-libs/libisoburn sys-boot/grub:2[grub_platforms_ieee1275] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cb1b169f99305c787c6f333d67440d2a
diff --git a/metadata/md5-cache/dev-util/catfish-1.4.13 b/metadata/md5-cache/dev-util/catfish-1.4.13
index 18ed4f0d021a..489b3886ea87 100644
--- a/metadata/md5-cache/dev-util/catfish-1.4.13
+++ b/metadata/md5-cache/dev-util/catfish-1.4.13
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gobject-introspection dev-python/dbus-python[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/catfish/1.4/catfish-1.4.13.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7847cef3fba95cc8f03845f1e86fe154
diff --git a/metadata/md5-cache/dev-util/catfish-4.15.0 b/metadata/md5-cache/dev-util/catfish-4.15.0
index 88006ef1c19d..af17ace58fb5 100644
--- a/metadata/md5-cache/dev-util/catfish-4.15.0
+++ b/metadata/md5-cache/dev-util/catfish-4.15.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.42 dev-libs/gobject-introspection dev-python/dbus-pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/catfish/4.15/catfish-4.15.0.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=26139086b9694cc12a89e46883fdfc0d
diff --git a/metadata/md5-cache/dev-util/cligh-0.3 b/metadata/md5-cache/dev-util/cligh-0.3
index 4caccba77190..1c21944a44ee 100644
--- a/metadata/md5-cache/dev-util/cligh-0.3
+++ b/metadata/md5-cache/dev-util/cligh-0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyGithub[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://the-brannons.com/software/cligh-0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e2e95b26056a22328f27a6df3dfde814
diff --git a/metadata/md5-cache/dev-util/cligh-9999 b/metadata/md5-cache/dev-util/cligh-9999
index d5de589ef26f..e7c8d6c68e9e 100644
--- a/metadata/md5-cache/dev-util/cligh-9999
+++ b/metadata/md5-cache/dev-util/cligh-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/PyGithub[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyxdg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7e0287ab69b844d8a6316e90c742a345
diff --git a/metadata/md5-cache/dev-util/cmake-3.19.1 b/metadata/md5-cache/dev-util/cmake-3.19.1
index 2e89ad8853ac..0bec56b1d347 100644
--- a/metadata/md5-cache/dev-util/cmake-3.19.1
+++ b/metadata/md5-cache/dev-util/cmake-3.19.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.19/cmake-3.19.1.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=78ddaddb05a28e6078350bd53796d3f6
+_md5_=e4926710248270381bd32fe08e682b9e
diff --git a/metadata/md5-cache/dev-util/comparator-2.12 b/metadata/md5-cache/dev-util/comparator-2.12
index ab578c0fd69a..6af2a5032146 100644
--- a/metadata/md5-cache/dev-util/comparator-2.12
+++ b/metadata/md5-cache/dev-util/comparator-2.12
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://www.catb.org/~esr/comparator/comparator-2.12.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=59892c4bd7c3af071ffc7792c82cc8b7
diff --git a/metadata/md5-cache/dev-util/conan-1.28.0 b/metadata/md5-cache/dev-util/conan-1.28.0
index dc9bbcd637ca..f3daa5960db3 100644
--- a/metadata/md5-cache/dev-util/conan-1.28.0
+++ b/metadata/md5-cache/dev-util/conan-1.28.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/conan-io/conan/archive/1.28.0.tar.gz -> conan-1.28.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5aea88554cac98527b2cdb1e2fbdf876
diff --git a/metadata/md5-cache/dev-util/conan-1.28.1 b/metadata/md5-cache/dev-util/conan-1.28.1
index 06afe302c73e..4755d3984b24 100644
--- a/metadata/md5-cache/dev-util/conan-1.28.1
+++ b/metadata/md5-cache/dev-util/conan-1.28.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/conan-io/conan/archive/1.28.1.tar.gz -> conan-1.28.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cb2998e1b42b64d4c2ea80422b6ea725
diff --git a/metadata/md5-cache/dev-util/cookiecutter-1.7.2 b/metadata/md5-cache/dev-util/cookiecutter-1.7.2
index 760ee12ebb3f..04302f036d3e 100644
--- a/metadata/md5-cache/dev-util/cookiecutter-1.7.2
+++ b/metadata/md5-cache/dev-util/cookiecutter-1.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/audreyr/cookiecutter/archive/1.7.2.tar.gz -> cookiecutter-1.7.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=054400bef5edc3c766fcf2d73399f419
diff --git a/metadata/md5-cache/dev-util/cookiecutter-1.7.2-r1 b/metadata/md5-cache/dev-util/cookiecutter-1.7.2-r1
index ef9b256ff7c4..700e308b2ce7 100644
--- a/metadata/md5-cache/dev-util/cookiecutter-1.7.2-r1
+++ b/metadata/md5-cache/dev-util/cookiecutter-1.7.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/audreyr/cookiecutter/archive/1.7.2.tar.gz -> cookiecutter-1.7.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5e79ac4c3105b9234a891d1bfd0fe513
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.86 b/metadata/md5-cache/dev-util/cppcheck-1.86
index b92619c00d09..673ececf013b 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.86
+++ b/metadata/md5-cache/dev-util/cppcheck-1.86
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/danmar/cppcheck/archive/1.86.tar.gz -> cppcheck-1.86.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f42f76cec790b3b02c2697b070862355
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.87 b/metadata/md5-cache/dev-util/cppcheck-1.87
index 395372f61818..fd1f7ecf7146 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.87
+++ b/metadata/md5-cache/dev-util/cppcheck-1.87
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/danmar/cppcheck/archive/1.87.tar.gz -> cppcheck-1.87.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2328cd96f555c4d992ebfa46a68fffcc
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.88 b/metadata/md5-cache/dev-util/cppcheck-1.88
index 5bc74f10d697..43bac06a69c7 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.88
+++ b/metadata/md5-cache/dev-util/cppcheck-1.88
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/danmar/cppcheck/archive/1.88.tar.gz -> cppcheck-1.88.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0e1443cb4d76b87f3efac7405d0f8b34
diff --git a/metadata/md5-cache/dev-util/cppcheck-9999 b/metadata/md5-cache/dev-util/cppcheck-9999
index f08ba2566a72..5ed732af8ee9 100644
--- a/metadata/md5-cache/dev-util/cppcheck-9999
+++ b/metadata/md5-cache/dev-util/cppcheck-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	estack	686eaab303305a908fd57b2fd7617800	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	estack	686eaab303305a908fd57b2fd7617800	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2c971f10da05bf31ad0d379ff787832c
diff --git a/metadata/md5-cache/dev-util/cram-0.7 b/metadata/md5-cache/dev-util/cram-0.7
index 0207f10738f3..5347844cec03 100644
--- a/metadata/md5-cache/dev-util/cram-0.7
+++ b/metadata/md5-cache/dev-util/cram-0.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cram/cram-0.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=52bab999a878b7071a218ff1aba74ac4
diff --git a/metadata/md5-cache/dev-util/cram-0.7-r1 b/metadata/md5-cache/dev-util/cram-0.7-r1
index c04c9e6a350e..bd685ebd5bc4 100644
--- a/metadata/md5-cache/dev-util/cram-0.7-r1
+++ b/metadata/md5-cache/dev-util/cram-0.7-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cram/cram-0.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=485ba885e161749908bb9c6399569d8b
diff --git a/metadata/md5-cache/dev-util/debhelper-13.2.1 b/metadata/md5-cache/dev-util/debhelper-13.2.1
index 1c8c5d349231..ca467ad218fa 100644
--- a/metadata/md5-cache/dev-util/debhelper-13.2.1
+++ b/metadata/md5-cache/dev-util/debhelper-13.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of programs that can be used to automate common tasks in
 EAPI=7
 HOMEPAGE=https://tracker.debian.org/pkg/debhelper
 IUSE=test l10n_de l10n_es l10n_fr
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc ~x86 ~amd64-linux
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_13.2.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fc8683d7a50204076fcca1ee16ce4ee2
+_md5_=d42e9d2b892f852ebbc6008cef1b7f81
diff --git a/metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1 b/metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
index 16ecaa558c6f..bc94c45da561 100644
--- a/metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
+++ b/metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Command line utilities to work with desktop menu entries
 EAPI=7
 HOMEPAGE=https://freedesktop.org/wiki/Software/desktop-file-utils
 IUSE=emacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.12:2
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.26.tar.xz
 _eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d327a5f9d6103f005b5f9569aa9ca79f
+_md5_=0735c42a047220b9c2a78429ae3ed5e9
diff --git a/metadata/md5-cache/dev-util/diffoscope-162 b/metadata/md5-cache/dev-util/diffoscope-162
index 1364bcc5d71f..92b5073b12eb 100644
--- a/metadata/md5-cache/dev-util/diffoscope-162
+++ b/metadata/md5-cache/dev-util/diffoscope-162
@@ -11,5 +11,5 @@ RDEPEND=dev-python/python-magic[python_targets_python3_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/diffoscope/diffoscope-162.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=922f9400172213e7d3bf968f201c7131
diff --git a/metadata/md5-cache/dev-util/distro-info-0.22 b/metadata/md5-cache/dev-util/distro-info-0.22
index 0806a0645604..67d7be0d007b 100644
--- a/metadata/md5-cache/dev-util/distro-info-0.22
+++ b/metadata/md5-cache/dev-util/distro-info-0.22
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/distro-info/distro-info_0.22.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=304a2b7bd9b0a547c1dc370c650fa4ad
diff --git a/metadata/md5-cache/dev-util/dogtail-0.9.11 b/metadata/md5-cache/dev-util/dogtail-0.9.11
index 8f6a631b4942..38b2518038cb 100644
--- a/metadata/md5-cache/dev-util/dogtail-0.9.11
+++ b/metadata/md5-cache/dev-util/dogtail-0.9.11
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gobject-introspection dev-python/pyatspi[python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitlab.com/dogtail/dogtail/raw/released/dogtail-0.9.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7604061f82c4286ff351b5fd00e0dfbd
diff --git a/metadata/md5-cache/dev-util/dput-ng-1.28-r1 b/metadata/md5-cache/dev-util/dput-ng-1.28-r1
index 4016c806c790..782e45636655 100644
--- a/metadata/md5-cache/dev-util/dput-ng-1.28-r1
+++ b/metadata/md5-cache/dev-util/dput-ng-1.28-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dput-ng/dput-ng_1.28.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d52809b45f64428606f7938829ea835e
diff --git a/metadata/md5-cache/dev-util/flawfinder-2.0.11 b/metadata/md5-cache/dev-util/flawfinder-2.0.11
index 6b23f8374675..65c7b800b76e 100644
--- a/metadata/md5-cache/dev-util/flawfinder-2.0.11
+++ b/metadata/md5-cache/dev-util/flawfinder-2.0.11
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.dwheeler.com/flawfinder/flawfinder-2.0.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bd08e1f1da98db84903d0c5384e2ef99
diff --git a/metadata/md5-cache/dev-util/gcovr-4.2 b/metadata/md5-cache/dev-util/gcovr-4.2
index c7b643ce6af6..ac7da6758ac1 100644
--- a/metadata/md5-cache/dev-util/gcovr-4.2
+++ b/metadata/md5-cache/dev-util/gcovr-4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gcovr/gcovr/archive/4.2.tar.gz -> gcovr-4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=47e702d8c91e63b153f69c9fdd4d770b
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.62.6 b/metadata/md5-cache/dev-util/gdbus-codegen-2.62.6
index 865358342f8a..58fd8cdb378f 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.62.6
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.62.6
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/py
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.62/glib-2.62.6.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ced8344d4109dffdbb8981d72d55772d
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.64.5 b/metadata/md5-cache/dev-util/gdbus-codegen-2.64.5
index 957334c7f029..727c5592a068 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.64.5
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.64.5
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/py
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.64/glib-2.64.5.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=362dc56d6a8f9faea1125037abcefdfa
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.66.0 b/metadata/md5-cache/dev-util/gdbus-codegen-2.66.0
index 763b045a2f7a..8ef66bb1b74f 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.66.0
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.66.0
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/py
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.66/glib-2.66.0.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c90df43e7485cabefb9cf8f4d46b5974
diff --git a/metadata/md5-cache/dev-util/gertty-1.6.0-r1 b/metadata/md5-cache/dev-util/gertty-1.6.0-r1
index 470ac2569461..9923996222ee 100644
--- a/metadata/md5-cache/dev-util/gertty-1.6.0-r1
+++ b/metadata/md5-cache/dev-util/gertty-1.6.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-0.11[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gertty/gertty-1.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=37cd076065924bdf93382530c92e742b
diff --git a/metadata/md5-cache/dev-util/gertty-9999 b/metadata/md5-cache/dev-util/gertty-9999
index c2dc470f8ea5..9490e5706789 100644
--- a/metadata/md5-cache/dev-util/gertty-9999
+++ b/metadata/md5-cache/dev-util/gertty-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/pbr-0.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/urwid-1.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/GitPython-0.3.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.5.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/requests-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/alembic-0.6.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyyaml-3.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/voluptuous-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ply-3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f9379ace65aa5a07c991bc8b3f22cebd
diff --git a/metadata/md5-cache/dev-util/gprof2dot-2019.11.30 b/metadata/md5-cache/dev-util/gprof2dot-2019.11.30
index f3eb81178a28..acce44c65067 100644
--- a/metadata/md5-cache/dev-util/gprof2dot-2019.11.30
+++ b/metadata/md5-cache/dev-util/gprof2dot-2019.11.30
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gprof2dot/gprof2dot-2019.11.30.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6fb4fb3ec0ed54954b7de8e45ef47363
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.32-r2 b/metadata/md5-cache/dev-util/gtk-doc-1.32-r2
index a0f36f70ef6c..a47783b03664 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.32-r2
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.32-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-libs/glib-2.6:2 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( >=app-editors/emacs-23.1:* ) python_single_target_python3_6? ( dev-python/pygments[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygments[python_targets_python3_7(-)] ) ~dev-util/gtk-doc-am-1.32 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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-libs/glib-2.6:2 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( >=app-editors/emacs-23.1:* ) python_single_target_python3_6? ( dev-python/pygments[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygments[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygments[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygments[python_targets_python3_9(-)] ) ~dev-util/gtk-doc-am-1.32 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GTK+ Documentation Generator
 EAPI=6
 HOMEPAGE=https://www.gtk.org/gtk-doc/
-IUSE=debug doc emacs python_single_target_python3_6 python_single_target_python3_7
+IUSE=debug doc emacs python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2 FDL-1.1
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-libs/glib-2.6:2 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( >=app-editors/emacs-23.1:* ) python_single_target_python3_6? ( dev-python/pygments[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygments[python_targets_python3_7(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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-libs/glib-2.6:2 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( >=app-editors/emacs-23.1:* ) python_single_target_python3_6? ( dev-python/pygments[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygments[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygments[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygments[python_targets_python3_9(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.32/gtk-doc-1.32.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eebc8628dd7d7f9dfc1557108deab836
+_md5_=c57cf60d15284588683f9d1bb8ca1d36
diff --git a/metadata/md5-cache/dev-util/gyp-20200512145953 b/metadata/md5-cache/dev-util/gyp-20200512145953
index 10a30bcd84cd..c4de59f954c2 100644
--- a/metadata/md5-cache/dev-util/gyp-20200512145953
+++ b/metadata/md5-cache/dev-util/gyp-20200512145953
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://home.apache.org/~arfrever/distfiles/gyp-20200512145953.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=27de9300891cd374184c03b42378f3cf
diff --git a/metadata/md5-cache/dev-util/gyp-99999999999999 b/metadata/md5-cache/dev-util/gyp-99999999999999
index 395b479ca19c..42d514598662 100644
--- a/metadata/md5-cache/dev-util/gyp-99999999999999
+++ b/metadata/md5-cache/dev-util/gyp-99999999999999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) 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(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d78d4aebc779de542fdde81c47588a35
diff --git a/metadata/md5-cache/dev-util/howdoi-1.2.1 b/metadata/md5-cache/dev-util/howdoi-1.2.1
index 2fb0ce893d80..0707de2b661c 100644
--- a/metadata/md5-cache/dev-util/howdoi-1.2.1
+++ b/metadata/md5-cache/dev-util/howdoi-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/appdirs[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/howdoi/howdoi-1.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cb1c9db095b98c146473db4f29756d57
diff --git a/metadata/md5-cache/dev-util/howdoi-2.0.5 b/metadata/md5-cache/dev-util/howdoi-2.0.5
index 6ef3be3712cf..93ecfd5e9e48 100644
--- a/metadata/md5-cache/dev-util/howdoi-2.0.5
+++ b/metadata/md5-cache/dev-util/howdoi-2.0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/appdirs[python_targets_python3_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/howdoi/howdoi-2.0.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c00c9bb061f58a8e5e9c5d428a09c6a6
diff --git a/metadata/md5-cache/dev-util/howdoi-2.0.6 b/metadata/md5-cache/dev-util/howdoi-2.0.6
index 7eeca00c724e..445592d46f3f 100644
--- a/metadata/md5-cache/dev-util/howdoi-2.0.6
+++ b/metadata/md5-cache/dev-util/howdoi-2.0.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/appdirs[python_targets_python3_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/howdoi/howdoi-2.0.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c00c9bb061f58a8e5e9c5d428a09c6a6
diff --git a/metadata/md5-cache/dev-util/howdoi-2.0.7 b/metadata/md5-cache/dev-util/howdoi-2.0.7
index 2b86ab1c7ef9..6fdca702da01 100644
--- a/metadata/md5-cache/dev-util/howdoi-2.0.7
+++ b/metadata/md5-cache/dev-util/howdoi-2.0.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/appdirs[python_targets_python3_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/howdoi/howdoi-2.0.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cd3c277524b7b4d408a894457e256ec4
diff --git a/metadata/md5-cache/dev-util/idea-community-2020.2.2.202.7319.50 b/metadata/md5-cache/dev-util/idea-community-2020.2.2.202.7319.50
deleted file mode 100644
index a49529409106..000000000000
--- a/metadata/md5-cache/dev-util/idea-community-2020.2.2.202.7319.50
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=install prepare unpack
-DEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15
-DESCRIPTION=A complete toolset for web, mobile and enterprise development
-EAPI=7
-HOMEPAGE=https://www.jetbrains.com/idea
-IUSE=+jbr8 -jbr11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 ) jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT MPL-1.0 MPL-1.1 OFL ZLIB
-RDEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15 >=virtual/jdk-1.7:* dev-java/jansi-native dev-libs/libdbusmenu =dev-util/lldb-9*
-REQUIRED_USE=jbr8? ( !jbr11 )
-RESTRICT=splitdebug
-SLOT=0
-SRC_URI=https://download.jetbrains.com/idea/ideaIC-2020.2.2-no-jbr.tar.gz -> ideaIC-2.2.202.7319.50.tar.gz jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-8u202-linux-i586-b1483.37.tar.gz -> jbrx-8u202-linux-i586-b1483.37.tar.gz ) amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-8u202-linux-x64-b1483.37.tar.gz -> jbrx-8u202-linux-x64-b1483.37.tar.gz ) ) jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-11_0_2-linux-x64-b164.tar.gz -> jbr-11_0_2-linux-x64-b164.tar.gz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=05442bd3ae88bffa45105c0c809d4f93
diff --git a/metadata/md5-cache/dev-util/idea-community-2020.2.3.202.7660.26 b/metadata/md5-cache/dev-util/idea-community-2020.2.3.202.7660.26
deleted file mode 100644
index 291241b611df..000000000000
--- a/metadata/md5-cache/dev-util/idea-community-2020.2.3.202.7660.26
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=install prepare unpack
-DEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15
-DESCRIPTION=A complete toolset for web, mobile and enterprise development
-EAPI=7
-HOMEPAGE=https://www.jetbrains.com/idea
-IUSE=+jbr8 -jbr11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 ) jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT MPL-1.0 MPL-1.1 OFL ZLIB
-RDEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15 >=virtual/jdk-1.7:* dev-java/jansi-native dev-libs/libdbusmenu =dev-util/lldb-9*
-REQUIRED_USE=jbr8? ( !jbr11 )
-RESTRICT=splitdebug
-SLOT=0
-SRC_URI=https://download.jetbrains.com/idea/ideaIC-2020.2.3-no-jbr.tar.gz -> ideaIC-2.3.202.7660.26.tar.gz jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-8u202-linux-i586-b1483.37.tar.gz -> jbrx-8u202-linux-i586-b1483.37.tar.gz ) amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-8u202-linux-x64-b1483.37.tar.gz -> jbrx-8u202-linux-x64-b1483.37.tar.gz ) ) jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-11_0_2-linux-x64-b164.tar.gz -> jbr-11_0_2-linux-x64-b164.tar.gz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=05442bd3ae88bffa45105c0c809d4f93
diff --git a/metadata/md5-cache/dev-util/idea-community-2020.3.0.203.5981.155 b/metadata/md5-cache/dev-util/idea-community-2020.3.0.203.5981.155
new file mode 100644
index 000000000000..80e949238f26
--- /dev/null
+++ b/metadata/md5-cache/dev-util/idea-community-2020.3.0.203.5981.155
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/patchelf
+DEFINED_PHASES=install prepare unpack
+DEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15 || ( dev-java/openjdk:11 dev-java/openjdk-bin:11 )
+DESCRIPTION=A complete toolset for web, mobile and enterprise development
+EAPI=7
+HOMEPAGE=https://www.jetbrains.com/idea
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception ISC JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT MPL-1.0 MPL-1.1 OFL ZLIB
+RDEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15 || ( dev-java/openjdk:11 dev-java/openjdk-bin:11 ) >=virtual/jdk-1.7:* dev-java/jansi-native dev-libs/libdbusmenu =dev-util/lldb-9*
+RESTRICT=splitdebug
+SLOT=0
+SRC_URI=https://download.jetbrains.com/idea/ideaIC-2020.3-no-jbr.tar.gz -> ideaIC-3.0.203.5981.155.tar.gz amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbr-11_0_8-linux-x64-b1098.1.tar.gz -> jbr-11_0_8-linux-x64-b1098.1.tar.gz )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f35ae6e455579544ea7d215b3fb28c14
diff --git a/metadata/md5-cache/dev-util/indent-2.2.12 b/metadata/md5-cache/dev-util/indent-2.2.12
index 1eb5d923502a..9691bbd538dc 100644
--- a/metadata/md5-cache/dev-util/indent-2.2.12
+++ b/metadata/md5-cache/dev-util/indent-2.2.12
@@ -4,10 +4,10 @@ DESCRIPTION=Indent program source files
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/indent/
 IUSE=nls
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/indent/indent-2.2.12.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b364a989b7f61b9bd5c613d288c05939
+_md5_=246beaab1a362e02716edcf51d3dd92d
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.263.1 b/metadata/md5-cache/dev-util/jenkins-bin-2.263.1
new file mode 100644
index 000000000000..5c36b9f8d406
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.263.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install setup
+DESCRIPTION=Extensible continuous integration server
+EAPI=7
+HOMEPAGE=https://jenkins.io/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual/jre-1.8.0
+RESTRICT=mirror
+SLOT=lts
+SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.263.1/jenkins.war -> jenkins-bin-2.263.1.war
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=0935a84615a963df9606323f353012d9
diff --git a/metadata/md5-cache/dev-util/meld-3.20.2-r1 b/metadata/md5-cache/dev-util/meld-3.20.2-r1
index 3728333daf7f..935f6c2d816d 100644
--- a/metadata/md5-cache/dev-util/meld-3.20.2-r1
+++ b/metadata/md5-cache/dev-util/meld-3.20.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A graphical diff and merge tool
 EAPI=6
 HOMEPAGE=http://meldmerge.org/
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/glib-2.50:2 python_single_target_python3_6? ( >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_8(-)] ) gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.20:3[introspection] >=x11-libs/gtksourceview-3.20.0:3.0[introspection] >=x11-libs/pango-1.34[introspection] x11-themes/hicolor-icon-theme python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/meld/3.20/meld-3.20.2.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b95ba52a795f644aa14d857c3888299
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=78d99f915958d7c4301b5890334d2dc5
diff --git a/metadata/md5-cache/dev-util/meson-0.55.3 b/metadata/md5-cache/dev-util/meson-0.55.3
index 6ecf1cc4a4a5..dfad90bc82a2 100644
--- a/metadata/md5-cache/dev-util/meson-0.55.3
+++ b/metadata/md5-cache/dev-util/meson-0.55.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.55.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=242347e5b2f250c51f1475b0215969f0
diff --git a/metadata/md5-cache/dev-util/meson-9999 b/metadata/md5-cache/dev-util/meson-9999
index fb0eb4f9452c..b01dd21ab55c 100644
--- a/metadata/md5-cache/dev-util/meson-9999
+++ b/metadata/md5-cache/dev-util/meson-9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1a4eb197f557cb0e2340e83258be7b7d
diff --git a/metadata/md5-cache/dev-util/oprofile-1.4.0 b/metadata/md5-cache/dev-util/oprofile-1.4.0
index 67c23e021fac..e10f25749151 100644
--- a/metadata/md5-cache/dev-util/oprofile-1.4.0
+++ b/metadata/md5-cache/dev-util/oprofile-1.4.0
@@ -5,10 +5,10 @@ DESCRIPTION=A transparent low-overhead system-wide profiler
 EAPI=7
 HOMEPAGE=http://oprofile.sourceforge.net
 IUSE=apidoc java pch static-libs elibc_FreeBSD java kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs:= elibc_glibc? ( >=sys-libs/glibc-2.3.2-r1 ) ppc64? ( dev-libs/libpfm ) acct-user/oprofile acct-group/oprofile java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/oprofile/oprofile-1.4.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=beb5d0f1786cbc0a11fbf7a3605c1a8f
+_md5_=c11bbc1a0aad4036b1798c54e02af50f
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.7.7 b/metadata/md5-cache/dev-util/pkgcheck-0.7.7
index 29affdde2ddc..697f11c3f802 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.7.7
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.7.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.7.7.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b51c84c8f9487b81c516c119aec88e60
diff --git a/metadata/md5-cache/dev-util/pkgcheck-9999 b/metadata/md5-cache/dev-util/pkgcheck-9999
index b235ad4555d4..bc8f1cabe3f5 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-9999
+++ b/metadata/md5-cache/dev-util/pkgcheck-9999
@@ -10,5 +10,5 @@ RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b206c410ccd6072682d42444367a95d2
diff --git a/metadata/md5-cache/dev-util/rbtools-1.0.3 b/metadata/md5-cache/dev-util/rbtools-1.0.3
index 6b39be3bb6e6..698e3ec95887 100644
--- a/metadata/md5-cache/dev-util/rbtools-1.0.3
+++ b/metadata/md5-cache/dev-util/rbtools-1.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/six-1.8.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://downloads.reviewboard.org/releases/RBTools/1.0/RBTools-1.0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4d91420a570a71d5b36e8bf508c0a44c
diff --git a/metadata/md5-cache/dev-util/rbtools-2.0 b/metadata/md5-cache/dev-util/rbtools-2.0
index 888cd4c6aa90..480f37694e57 100644
--- a/metadata/md5-cache/dev-util/rbtools-2.0
+++ b/metadata/md5-cache/dev-util/rbtools-2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/six-1.8.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://downloads.reviewboard.org/releases/RBTools/2.0/RBTools-2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2b1d60167e4efacd803e4cf566f32d67
diff --git a/metadata/md5-cache/dev-util/rosdep-0.19.0-r1 b/metadata/md5-cache/dev-util/rosdep-0.19.0-r1
index aedfbd97410b..17bdadb13064 100644
--- a/metadata/md5-cache/dev-util/rosdep-0.19.0-r1
+++ b/metadata/md5-cache/dev-util/rosdep-0.19.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/rosdep/rosdep-0.19.0.tar.gz https://github.com/ros-infrastructure/rosdep/archive/0.19.0.tar.gz -> rosdep-0.19.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d54cd93c731941b44ccf87b57b6d5b6c
diff --git a/metadata/md5-cache/dev-util/rosdep-9999 b/metadata/md5-cache/dev-util/rosdep-9999
index da6587a40748..725d2034d9bb 100644
--- a/metadata/md5-cache/dev-util/rosdep-9999
+++ b/metadata/md5-cache/dev-util/rosdep-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d54cd93c731941b44ccf87b57b6d5b6c
diff --git a/metadata/md5-cache/dev-util/rosinstall-0.7.8 b/metadata/md5-cache/dev-util/rosinstall-0.7.8
index 9b46bd175ece..fc946e088c0f 100644
--- a/metadata/md5-cache/dev-util/rosinstall-0.7.8
+++ b/metadata/md5-cache/dev-util/rosinstall-0.7.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/rosinstall/rosinstall-0.7.8.tar.gz https://github.com/vcstools/rosinstall/archive/0.7.8.tar.gz -> rosinstall-0.7.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=668824732e66b412fc6ae1ee4f8dc261
diff --git a/metadata/md5-cache/dev-util/rosinstall-9999 b/metadata/md5-cache/dev-util/rosinstall-9999
index ec81b270b0c2..70f1ffca49e0 100644
--- a/metadata/md5-cache/dev-util/rosinstall-9999
+++ b/metadata/md5-cache/dev-util/rosinstall-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=668824732e66b412fc6ae1ee4f8dc261
diff --git a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.22-r1 b/metadata/md5-cache/dev-util/rosinstall_generator-0.1.22-r1
index 6bd724cc341b..57e812e52db5 100644
--- a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.22-r1
+++ b/metadata/md5-cache/dev-util/rosinstall_generator-0.1.22-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rosinstall_generator/archive/0.1.22.tar.gz -> rosinstall_generator-0.1.22.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=667c1d27a9ca27a667867920b3e9a978
diff --git a/metadata/md5-cache/dev-util/rosinstall_generator-9999 b/metadata/md5-cache/dev-util/rosinstall_generator-9999
index 99a261986224..d3e0327f4c46 100644
--- a/metadata/md5-cache/dev-util/rosinstall_generator-9999
+++ b/metadata/md5-cache/dev-util/rosinstall_generator-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_python3_6(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=667c1d27a9ca27a667867920b3e9a978
diff --git a/metadata/md5-cache/dev-util/scons-3.1.1 b/metadata/md5-cache/dev-util/scons-3.1.1
index 302ebf6d7ffe..8283f69d0403 100644
--- a/metadata/md5-cache/dev-util/scons-3.1.1
+++ b/metadata/md5-cache/dev-util/scons-3.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/scons/scons-3.1.1.tar.gz doc? ( http://www.scons.org/doc/3.1.1/PDF/scons-user.pdf -> scons-3.1.1-user.pdf http://www.scons.org/doc/3.1.1/HTML/scons-user.html -> scons-3.1.1-user.html )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d65087370803677af2eaab1a6abb65c1
diff --git a/metadata/md5-cache/dev-util/scons-3.1.2 b/metadata/md5-cache/dev-util/scons-3.1.2
index c9cd7a77a17d..7e7c7d36b944 100644
--- a/metadata/md5-cache/dev-util/scons-3.1.2
+++ b/metadata/md5-cache/dev-util/scons-3.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/scons/scons/3.1.2/scons-3.1.2.tar.gz doc? ( https://www.scons.org/doc/3.1.2/PDF/scons-user.pdf -> scons-3.1.2-user.pdf https://www.scons.org/doc/3.1.2/HTML/scons-user.html -> scons-3.1.2-user.html )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=885a54057df2461a81221baee0ae55c4
diff --git a/metadata/md5-cache/dev-util/scons-4.0.1 b/metadata/md5-cache/dev-util/scons-4.0.1
index a7df471d9e51..e4fa925b9e1f 100644
--- a/metadata/md5-cache/dev-util/scons-4.0.1
+++ b/metadata/md5-cache/dev-util/scons-4.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/scons/scons/4.0.1/scons-4.0.1.tar.gz doc? ( https://www.scons.org/doc/4.0.1/PDF/scons-user.pdf -> scons-4.0.1-user.pdf https://www.scons.org/doc/4.0.1/HTML/scons-user.html -> scons-4.0.1-user.html ) test? ( https://github.com/scons/scons/archive/4.0.1.tar.gz -> scons-4.0.1.gh.tar.gz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4ef40a8a5a4123dff7c66862ae1dcbc0
diff --git a/metadata/md5-cache/dev-util/shflags-1.2.3 b/metadata/md5-cache/dev-util/shflags-1.2.3
index 6005ee0c7fc1..228c29ea0020 100644
--- a/metadata/md5-cache/dev-util/shflags-1.2.3
+++ b/metadata/md5-cache/dev-util/shflags-1.2.3
@@ -3,8 +3,8 @@ DESCRIPTION=Command-line flags module for Unix shell scripts
 EAPI=7
 HOMEPAGE=https://github.com/kward/shflags
 IUSE=examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/kward/shflags/archive/v1.2.3.tar.gz -> shflags-1.2.3.tgz
-_md5_=e1521c14794388030003c800aa78ebe4
+_md5_=1031106c61ac1899d8114181a9af8e55
diff --git a/metadata/md5-cache/dev-util/vint-0.3.21 b/metadata/md5-cache/dev-util/vint-0.3.21
index a592c96986f0..8993331a2cf9 100644
--- a/metadata/md5-cache/dev-util/vint-0.3.21
+++ b/metadata/md5-cache/dev-util/vint-0.3.21
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kuniwak/vint/archive/v0.3.21.tar.gz -> vint-0.3.21.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=47e218f29fa43965a08260d7bcd05c56
diff --git a/metadata/md5-cache/dev-util/watchman-4.9.0 b/metadata/md5-cache/dev-util/watchman-4.9.0
index 08a847331f19..24d40bea26ea 100644
--- a/metadata/md5-cache/dev-util/watchman-4.9.0
+++ b/metadata/md5-cache/dev-util/watchman-4.9.0
@@ -11,5 +11,5 @@ RDEPEND=pcre? ( dev-libs/libpcre ) python? ( python_targets_python3_6? ( dev-lan
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/facebook/watchman/archive/8e0ba724d85de2c89f48161807e878667b9ed089.tar.gz -> watchman-4.9.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6e05e0dbe68af3e753af072333029aee
diff --git a/metadata/md5-cache/dev-util/wiggle-1.0 b/metadata/md5-cache/dev-util/wiggle-1.0
index a5944c2bcedc..73fcea2c2fa5 100644
--- a/metadata/md5-cache/dev-util/wiggle-1.0
+++ b/metadata/md5-cache/dev-util/wiggle-1.0
@@ -4,11 +4,11 @@ DESCRIPTION=tool for applying patches that patch cannot apply because of conflic
 EAPI=6
 HOMEPAGE=https://neil.brown.name/wiggle https://neil.brown.name/git?p=wiggle
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils virtual/awk sys-apps/grep sys-apps/less sys-apps/sed sys-apps/coreutils sys-devel/patch sys-libs/ncurses:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://neil.brown.name/wiggle/wiggle-1.0.tar.gz
 _eclasses_=fixheadtails	662e80584ee2337b981d7188078e7c74	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6ff8bf73bb075c9e9c357930cda6b080
+_md5_=dd514ba077d38d45c4b0710a5be5429e
diff --git a/metadata/md5-cache/dev-util/wstool-0.1.18 b/metadata/md5-cache/dev-util/wstool-0.1.18
index 827076b7a4d8..9da97f8cda84 100644
--- a/metadata/md5-cache/dev-util/wstool-0.1.18
+++ b/metadata/md5-cache/dev-util/wstool-0.1.18
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/wstool/wstool-0.1.18.tar.gz https://github.com/vcstools/wstool/archive/0.1.18.tar.gz -> wstool-0.1.18.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=85004e9da821b4843602bc386f341b0f
diff --git a/metadata/md5-cache/dev-util/wstool-9999 b/metadata/md5-cache/dev-util/wstool-9999
index f2a64509f33c..ae01f51fe621 100644
--- a/metadata/md5-cache/dev-util/wstool-9999
+++ b/metadata/md5-cache/dev-util/wstool-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=85004e9da821b4843602bc386f341b0f
diff --git a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.14.0 b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.14.0
index a734b1570063..5382a7e820ab 100644
--- a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.14.0
+++ b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.14.0
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/glib-2.42 virtual/pkgconfig
 DESCRIPTION=A set of scripts and m4/autoconf macros that ease build system maintenance
 EAPI=7
 HOMEPAGE=https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.42
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-dev-tools/4.14/xfce4-dev-tools-4.14.0.tar.bz2
-_md5_=2cc54c23109b3e01b9b65a4341af10dc
+_md5_=c558ef4df5209dfea422df912f008c96
diff --git a/metadata/md5-cache/dev-util/ydiff-1.1 b/metadata/md5-cache/dev-util/ydiff-1.1
index f288d2c7c7d4..5f497b7259ff 100644
--- a/metadata/md5-cache/dev-util/ydiff-1.1
+++ b/metadata/md5-cache/dev-util/ydiff-1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/y/ydiff/ydiff-1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7cd41a181b422b1794685bcedf3afbd7
diff --git a/metadata/md5-cache/dev-util/ydiff-1.2 b/metadata/md5-cache/dev-util/ydiff-1.2
index 6d2bf6e81af0..a1f3aac6e2c0 100644
--- a/metadata/md5-cache/dev-util/ydiff-1.2
+++ b/metadata/md5-cache/dev-util/ydiff-1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/y/ydiff/ydiff-1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=059f60475aa7f16a5cd07d772ac50757
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 9901ef9184f9..1c3d1a670d81 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/cssc-1.4.1 b/metadata/md5-cache/dev-vcs/cssc-1.4.1
index e84039d0235d..a7bb9268331f 100644
--- a/metadata/md5-cache/dev-vcs/cssc-1.4.1
+++ b/metadata/md5-cache/dev-vcs/cssc-1.4.1
@@ -5,10 +5,10 @@ DESCRIPTION=The GNU Project's replacement for SCCS
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/cssc/
 IUSE=test valgrind
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/cssc/CSSC-1.4.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=70fd4f6e492413d675209f626154869c
+_md5_=00141090ada59e6c7fb0a19828113e0c
diff --git a/metadata/md5-cache/dev-vcs/git-cola-3.5-r1 b/metadata/md5-cache/dev-vcs/git-cola-3.5-r1
index 16b53da3e6b0..150fde65760a 100644
--- a/metadata/md5-cache/dev-vcs/git-cola-3.5-r1
+++ b/metadata/md5-cache/dev-vcs/git-cola-3.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/git-cola/git-cola/archive/v3.5.tar.gz -> git-cola-3.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aab9a0271b97016a6a42ac95f64b3097
diff --git a/metadata/md5-cache/dev-vcs/github-pages-publish-0.1.3 b/metadata/md5-cache/dev-vcs/github-pages-publish-0.1.3
index a95b0d08f8de..91bc8291651f 100644
--- a/metadata/md5-cache/dev-vcs/github-pages-publish-0.1.3
+++ b/metadata/md5-cache/dev-vcs/github-pages-publish-0.1.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pygit2-0.20.0 python_targets_python3_6? ( dev-lang/python:3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/github-pages-publish/github-pages-publish-0.1.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2cfc5d72bf46c2e4c384b761f28b2721
diff --git a/metadata/md5-cache/dev-vcs/hg-evolve-10.0.2-r1 b/metadata/md5-cache/dev-vcs/hg-evolve-10.0.2-r1
index 5309cdfe8a55..89fa74b728a3 100644
--- a/metadata/md5-cache/dev-vcs/hg-evolve-10.0.2-r1
+++ b/metadata/md5-cache/dev-vcs/hg-evolve-10.0.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-4.6[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hg-evolve/hg-evolve-10.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e7fe52646e8f41c3e77e1edc1457bc6f
diff --git a/metadata/md5-cache/dev-vcs/hg-evolve-10.1.0 b/metadata/md5-cache/dev-vcs/hg-evolve-10.1.0
index 8ee2fbd1fc99..234e05f8b868 100644
--- a/metadata/md5-cache/dev-vcs/hg-evolve-10.1.0
+++ b/metadata/md5-cache/dev-vcs/hg-evolve-10.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-4.6[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hg-evolve/hg-evolve-10.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=80c82b7d75a0d4baa4a9107f9a297822
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.9.0 b/metadata/md5-cache/dev-vcs/hg-git-0.9.0
index 398efb472dcc..afaf17891dd8 100644
--- a/metadata/md5-cache/dev-vcs/hg-git-0.9.0
+++ b/metadata/md5-cache/dev-vcs/hg-git-0.9.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-4.3[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://foss.heptapod.net/mercurial/hg-git/-/archive/0.9.0/hg-git-0.9.0.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e78fa447d4ca4678a94b5a7b0c5fb3e5
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.9.0_rc1-r1 b/metadata/md5-cache/dev-vcs/hg-git-0.9.0_rc1-r1
index b239724ed69c..8d434f3c3535 100644
--- a/metadata/md5-cache/dev-vcs/hg-git-0.9.0_rc1-r1
+++ b/metadata/md5-cache/dev-vcs/hg-git-0.9.0_rc1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-4.3[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://foss.heptapod.net/mercurial/hg-git/-/archive/0.9.0a1/hg-git-0.9.0a1.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cdbd4c3088c8b951e42015048b553494
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.2.2-r2 b/metadata/md5-cache/dev-vcs/mercurial-5.2.2-r2
index 739149f571d8..63f601888e95 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.2.2-r2
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.2.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.2.2.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=19644178e294cc3bd589e4e4e892bc50
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.3.2-r1 b/metadata/md5-cache/dev-vcs/mercurial-5.3.2-r1
index 0d568b04dbd3..eaeaaa1cf3ed 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.3.2-r1
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.3.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.3.2.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1c0097cf8725dd2407a3ad2d8ce26f88
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.4.2-r1 b/metadata/md5-cache/dev-vcs/mercurial-5.4.2-r1
index 22a35414207f..11cf990c759c 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.4.2-r1
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.4.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.4.2.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e7608d7130c51410eb4b68c262e1d57c
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.5.2 b/metadata/md5-cache/dev-vcs/mercurial-5.5.2
index 141e642ef5f2..3992c8f64ed8 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.5.2
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.5.2.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=320a024d3aaeef70dabea7a21104ba85
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.6 b/metadata/md5-cache/dev-vcs/mercurial-5.6
index 0f4c676cfbd0..4a9fb8bf1271 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.6
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.6.tar.gz rust? ( https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.13/download -> aho-corasick-0.7.13.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/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/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.60/download -> cc-1.0.60.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/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cpython/0.4.1/download -> cpython-0.4.1.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam/0.7.3/download -> crossbeam-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.4/download -> crossbeam-channel-0.4.4.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.2.3/download -> crossbeam-queue-0.2.3.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/ctor/0.1.16/download -> ctor-0.1.16.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/flate2/1.0.17/download -> flate2-1.0.17.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/gcc/0.3.55/download -> gcc-0.3.55.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.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.16/download -> hermit-abi-0.1.16.crate https://crates.io/api/v1/crates/hex/0.4.2/download -> hex-0.4.2.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.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.77/download -> libc-0.2.77.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.5.6/download -> memoffset-0.5.6.crate https://crates.io/api/v1/crates/micro-timer/0.3.1/download -> micro-timer-0.3.1.crate https://crates.io/api/v1/crates/micro-timer-macros/0.3.1/download -> micro-timer-macros-0.3.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.2/download -> miniz_oxide-0.4.2.crate https://crates.io/api/v1/crates/num-traits/0.2.12/download -> num-traits-0.2.12.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/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/pkg-config/0.3.18/download -> pkg-config-0.3.18.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.9/download -> ppv-lite86-0.2.9.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.21/download -> proc-macro2-1.0.21.crate https://crates.io/api/v1/crates/python27-sys/0.4.1/download -> python27-sys-0.4.1.crate https://crates.io/api/v1/crates/python3-sys/0.4.1/download -> python3-sys-0.4.1.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.3.23/download -> rand-0.3.23.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.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_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.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_distr/0.2.2/download -> rand_distr-0.2.2.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_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rayon/1.4.0/download -> rayon-1.4.0.crate https://crates.io/api/v1/crates/rayon-core/1.8.1/download -> rayon-core-1.8.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.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/regex/1.3.9/download -> regex-1.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.18/download -> regex-syntax-0.6.18.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/rust-crypto/0.2.36/download -> rust-crypto-0.2.36.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.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/scopeguard/1.1.0/download -> scopeguard-1.1.0.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.41/download -> syn-1.0.41.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.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.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/twox-hash/1.5.0/download -> twox-hash-1.5.0.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/vcpkg/0.2.10/download -> vcpkg-0.2.10.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/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+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-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 https://crates.io/api/v1/crates/zstd/0.5.3+zstd.1.4.5/download -> zstd-0.5.3+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-safe/2.0.5+zstd.1.4.5/download -> zstd-safe-2.0.5+zstd.1.4.5.crate https://crates.io/api/v1/crates/zstd-sys/1.4.17+zstd.1.4.5/download -> zstd-sys-1.4.17+zstd.1.4.5.crate )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	7ffdd252643addc68abff0a08cca5306	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	7ffdd252643addc68abff0a08cca5306	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=be259b14b09c572ef085a313602f7a99
diff --git a/metadata/md5-cache/dev-vcs/mercurial-9999 b/metadata/md5-cache/dev-vcs/mercurial-9999
index b75976865e28..fed2c8e77788 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-9999
+++ b/metadata/md5-cache/dev-vcs/mercurial-9999
@@ -11,5 +11,5 @@ RDEPEND=app-misc/ca-certificates dev-python/zstandard[python_targets_python3_6(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	7ffdd252643addc68abff0a08cca5306	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mercurial	d22fe98ea362174612a57c233239102f	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	7ffdd252643addc68abff0a08cca5306	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mercurial	d22fe98ea362174612a57c233239102f	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1b7620b371988fb81432b950f4edeb63
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-1.13.0 b/metadata/md5-cache/dev-vcs/python-gitlab-1.13.0
index ade0b6fbcd72..e88de7298c4b 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-1.13.0
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-1.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-1.13.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9ca5b7e40ed0f34dbd0c581e9bcffe2e
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-1.7.0 b/metadata/md5-cache/dev-vcs/python-gitlab-1.7.0
index 8de154c250f8..7afc74571b7d 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-1.7.0
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-1.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9ca5b7e40ed0f34dbd0c581e9bcffe2e
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-1.8.0 b/metadata/md5-cache/dev-vcs/python-gitlab-1.8.0
index 0126c9239758..9ea5b0d99ca5 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-1.8.0
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-1.8.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9ca5b7e40ed0f34dbd0c581e9bcffe2e
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-1.9.0 b/metadata/md5-cache/dev-vcs/python-gitlab-1.9.0
index 744b997537a6..2030487826e8 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-1.9.0
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-1.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-1.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9ca5b7e40ed0f34dbd0c581e9bcffe2e
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-2.2.0 b/metadata/md5-cache/dev-vcs/python-gitlab-2.2.0
index 863de0bd0e5a..c7b73376dc8f 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-2.2.0
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-2.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=178ed095533104f0b6a04b973a3fa4e6
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-2.3.1 b/metadata/md5-cache/dev-vcs/python-gitlab-2.3.1
index 3f0a47ef55b8..2984254e5671 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-2.3.1
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-2.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-2.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=178ed095533104f0b6a04b973a3fa4e6
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-2.5.0 b/metadata/md5-cache/dev-vcs/python-gitlab-2.5.0
index 7e06345c15da..1b40c55d4999 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-2.5.0
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-2.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-2.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=178ed095533104f0b6a04b973a3fa4e6
diff --git a/metadata/md5-cache/dev-vcs/stgit-0.21 b/metadata/md5-cache/dev-vcs/stgit-0.21
index 114419ef9261..ab0a78615d2f 100644
--- a/metadata/md5-cache/dev-vcs/stgit-0.21
+++ b/metadata/md5-cache/dev-vcs/stgit-0.21
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python3_6? ( dev-lang/python:3.6 )
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ctmarinas/stgit/archive/v0.21.tar.gz -> stgit-0.21.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=32b638b5703b687829ee6eaa0a2c2da5
diff --git a/metadata/md5-cache/dev-vcs/stgit-0.22 b/metadata/md5-cache/dev-vcs/stgit-0.22
index 01e81dd008fa..260b8d71eade 100644
--- a/metadata/md5-cache/dev-vcs/stgit-0.22
+++ b/metadata/md5-cache/dev-vcs/stgit-0.22
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python3_6? ( dev-lang/python:3.6 )
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ctmarinas/stgit/archive/v0.22.tar.gz -> stgit-0.22.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cca2c8769995e937373160c40efe28cf
diff --git a/metadata/md5-cache/dev-vcs/stgit-0.23 b/metadata/md5-cache/dev-vcs/stgit-0.23
index 5838a18d24c2..374e4097aff7 100644
--- a/metadata/md5-cache/dev-vcs/stgit-0.23
+++ b/metadata/md5-cache/dev-vcs/stgit-0.23
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python3_6? ( dev-lang/python:3.6 )
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ctmarinas/stgit/archive/v0.23.tar.gz -> stgit-0.23.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d95793cd99a981aa919031ff55229020
diff --git a/metadata/md5-cache/dev-vcs/svneverever-1.3.2 b/metadata/md5-cache/dev-vcs/svneverever-1.3.2
index 49ed8d8718b3..01efb374b5a1 100644
--- a/metadata/md5-cache/dev-vcs/svneverever-1.3.2
+++ b/metadata/md5-cache/dev-vcs/svneverever-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pysvn[python_targets_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/svneverever/svneverever-1.3.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e4419e9ce2304f7d312e3d159d901f93
diff --git a/metadata/md5-cache/dev-vcs/svneverever-1.4.2 b/metadata/md5-cache/dev-vcs/svneverever-1.4.2
index abeb5e3de723..4159ab89488f 100644
--- a/metadata/md5-cache/dev-vcs/svneverever-1.4.2
+++ b/metadata/md5-cache/dev-vcs/svneverever-1.4.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pysvn[python_targets_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/svneverever/svneverever-1.4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e4419e9ce2304f7d312e3d159d901f93
diff --git a/metadata/md5-cache/dev-vcs/svneverever-1.5.0 b/metadata/md5-cache/dev-vcs/svneverever-1.5.0
index fc0dc7ccc486..87436e7f74c0 100644
--- a/metadata/md5-cache/dev-vcs/svneverever-1.5.0
+++ b/metadata/md5-cache/dev-vcs/svneverever-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pysvn[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/svneverever/svneverever-1.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=391c1756acdd66b19d0c6ae3c09f29d6
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-5.5.1 b/metadata/md5-cache/dev-vcs/tortoisehg-5.5.1
index 99e3bad53de5..5654bd80f260 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-5.5.1
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-5.5.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-5.4 <dev-vcs/mercurial-5.6 dev-python/iniparse[pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-5.5.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=221e87752e0ae53483b3101efaaf6bc9
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-5.5.2 b/metadata/md5-cache/dev-vcs/tortoisehg-5.5.2
index fbc37319a715..3acb3640d4a9 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-5.5.2
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-5.5.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-5.4 <dev-vcs/mercurial-5.6 dev-python/iniparse[pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-5.5.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c9f62f0ccdacd1f4cbafaad29e85bda4
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-5.6 b/metadata/md5-cache/dev-vcs/tortoisehg-5.6
index 70057bc491d8..2e0428e1a0e0 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-5.6
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-5.6
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-5.5 <dev-vcs/mercurial-5.7 dev-python/iniparse[pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-5.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b28c102b1260c62f0c9f4edbcf82533
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-9999 b/metadata/md5-cache/dev-vcs/tortoisehg-9999
index 28979ff61e9d..7095c6de5972 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-9999
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-vcs/mercurial-5.5 dev-python/iniparse[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyQt5[network,svg,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/qscintilla-python-2.9.4[qt5(+),python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	mercurial	d22fe98ea362174612a57c233239102f	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	mercurial	d22fe98ea362174612a57c233239102f	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b28c102b1260c62f0c9f4edbcf82533
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 4a762af3cc7e..4992ed266174 100644
Binary files a/metadata/md5-cache/games-action/Manifest.gz and b/metadata/md5-cache/games-action/Manifest.gz differ
diff --git a/metadata/md5-cache/games-action/violetland-0.5 b/metadata/md5-cache/games-action/violetland-0.5
index 1a6cd43d0db6..e86d5f56d566 100644
--- a/metadata/md5-cache/games-action/violetland-0.5
+++ b/metadata/md5-cache/games-action/violetland-0.5
@@ -1,13 +1,13 @@
 BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/boost:=[threads(+)] media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf virtual/opengl
+DEPEND=dev-libs/boost:=[threads(+)] media-libs/libsdl[opengl,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf virtual/opengl
 DESCRIPTION=Help a girl named Violet in the struggle with hordes of monsters
 EAPI=7
 HOMEPAGE=https://violetland.github.io/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 CC-BY-SA-3.0
-RDEPEND=dev-libs/boost:=[threads(+)] media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf virtual/opengl
+RDEPEND=dev-libs/boost:=[threads(+)] media-libs/libsdl[opengl,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/ooxi/violetland/releases/download/0.5/violetland-0.5-source-with-dependencies.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef41908054c9cc7b57c1124d117d5c5b
+_md5_=1f08a4bce531c4a801ff0d110269710f
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 9adde359f369..23787727f804 100644
Binary files a/metadata/md5-cache/games-board/Manifest.gz and b/metadata/md5-cache/games-board/Manifest.gz differ
diff --git a/metadata/md5-cache/games-board/pychess-1.0.0 b/metadata/md5-cache/games-board/pychess-1.0.0
index f9fbfeda6e8e..544196650416 100644
--- a/metadata/md5-cache/games-board/pychess-1.0.0
+++ b/metadata/md5-cache/games-board/pychess-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/pexpect[python_targets_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/pychess/pychess/releases/download/1.0.0/pychess-1.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=47749c816497270a9a5d60e16e7bc808
diff --git a/metadata/md5-cache/games-board/pychess-1.0.2 b/metadata/md5-cache/games-board/pychess-1.0.2
index a8ccae8b7fda..e77a47604bee 100644
--- a/metadata/md5-cache/games-board/pychess-1.0.2
+++ b/metadata/md5-cache/games-board/pychess-1.0.2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/pexpect[python_targets_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/pychess/pychess/releases/download/1.0.2/pychess-1.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dead772b0bfda1abd7715d283655e750
diff --git a/metadata/md5-cache/games-board/pysolfc-2.6.4-r1 b/metadata/md5-cache/games-board/pysolfc-2.6.4-r1
index 8d74ebe5e209..74a20e82652e 100644
--- a/metadata/md5-cache/games-board/pysolfc-2.6.4-r1
+++ b/metadata/md5-cache/games-board/pysolfc-2.6.4-r1
@@ -1,14 +1,14 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] )
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) 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 prepare setup test
 DESCRIPTION=An exciting collection of more than 1000 solitaire card games
 EAPI=7
 HOMEPAGE=https://pysolfc.sourceforge.net/
-IUSE=extra-cardsets minimal +sound python_single_target_python3_6 python_single_target_python3_7
+IUSE=extra-cardsets minimal +sound python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_6? ( dev-python/random2[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] !minimal? ( dev-python/pillow[tk,python_targets_python3_6(-)] dev-tcltk/tktable ) sound? ( dev-python/pygame[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/random2[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] !minimal? ( dev-python/pillow[tk,python_targets_python3_7(-)] dev-tcltk/tktable ) sound? ( dev-python/pygame[python_targets_python3_7(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_6? ( dev-python/random2[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] !minimal? ( dev-python/pillow[tk,python_targets_python3_6(-)] dev-tcltk/tktable ) sound? ( dev-python/pygame[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/random2[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] !minimal? ( dev-python/pillow[tk,python_targets_python3_7(-)] dev-tcltk/tktable ) sound? ( dev-python/pygame[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/random2[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] !minimal? ( dev-python/pillow[tk,python_targets_python3_8(-)] dev-tcltk/tktable ) sound? ( dev-python/pygame[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/random2[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] !minimal? ( dev-python/pillow[tk,python_targets_python3_9(-)] dev-tcltk/tktable ) sound? ( dev-python/pygame[python_targets_python3_9(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/shlomif/PySolFC/archive/pysolfc-2.6.4.tar.gz extra-cardsets? ( mirror://sourceforge/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.0/PySolFC-Cardsets-2.0.tar.bz2 ) !extra-cardsets? ( mirror://sourceforge/pysolfc/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.0.1.tar.xz )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=53a1cc8339013806a569322ea494a3a2
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7dd328c55e372935be1dfd64f5e360d2
diff --git a/metadata/md5-cache/games-board/sjeng-11.2_p8_p1 b/metadata/md5-cache/games-board/sjeng-11.2_p8_p1
index 3effa0f6af02..f5d8ff5189ac 100644
--- a/metadata/md5-cache/games-board/sjeng-11.2_p8_p1
+++ b/metadata/md5-cache/games-board/sjeng-11.2_p8_p1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/quilt >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
 DEPEND=sys-libs/gdbm:0=
 DESCRIPTION=Console based chess interface
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/gdbm:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/sjeng/Sjeng-Free-11.2.tar.gz mirror://debian/pool/main/s/sjeng/sjeng_11.2-8.1.diff.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=68797b26388464dff7f0659ce1e91c40
+_md5_=f00b415c5172501bb304cf4cd5721b6f
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index df6c061237d9..5ef91d99707c 100644
Binary files a/metadata/md5-cache/games-emulation/Manifest.gz and b/metadata/md5-cache/games-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/dolphin-5.0_p20200705 b/metadata/md5-cache/games-emulation/dolphin-5.0_p20200705
index 05f939131cc9..86fd29458c54 100644
--- a/metadata/md5-cache/games-emulation/dolphin-5.0_p20200705
+++ b/metadata/md5-cache/games-emulation/dolphin-5.0_p20200705
@@ -5,10 +5,10 @@ DESCRIPTION=Gamecube and Wii game emulator
 EAPI=7
 HOMEPAGE=https://www.dolphin-emu.org/
 IUSE=alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile pulseaudio +qt5 systemd upnp
-KEYWORDS=amd64
+KEYWORDS=amd64 ~arm64
 LICENSE=GPL-2
 RDEPEND=dev-libs/hidapi:0= dev-libs/libfmt:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) media-libs/vulkan-loader
 SLOT=0
 SRC_URI=https://github.com/dolphin-emu/dolphin/archive/0dbe8fb2eaa608a6540df3d269648a596c29cf4b.tar.gz -> dolphin-5.0_p20200705.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=643281562fddf907497895164d61b4cc
+_md5_=fb38f5f2a35e0bbbec63b919d01d527f
diff --git a/metadata/md5-cache/games-emulation/m64py-0.2.5 b/metadata/md5-cache/games-emulation/m64py-0.2.5
index 05f6c0f90ba7..b7ae9fea0e9e 100644
--- a/metadata/md5-cache/games-emulation/m64py-0.2.5
+++ b/metadata/md5-cache/games-emulation/m64py-0.2.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyQt5[gui,opengl,widgets,python_targets_python3_6(-)?,python_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/m64py/m64py-0.2.5/m64py-0.2.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=92f4ff7e2ad9e1b6ec62a6d132046802
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 40b14ecd4b02..670497bd025e 100644
Binary files a/metadata/md5-cache/games-engines/Manifest.gz and b/metadata/md5-cache/games-engines/Manifest.gz differ
diff --git a/metadata/md5-cache/games-engines/renpy-6.99.12.4-r4 b/metadata/md5-cache/games-engines/renpy-6.99.12.4-r4
index 9f07e6877ace..8d71205f9389 100644
--- a/metadata/md5-cache/games-engines/renpy-6.99.12.4-r4
+++ b/metadata/md5-cache/games-engines/renpy-6.99.12.4-r4
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-renpy-0.7 dev-libs/fribidi ~dev-python/pygame_sdl2
 REQUIRED_USE=examples? ( development ) || ( python_targets_python2_7 )
 SLOT=6.99
 SRC_URI=https://www.renpy.org/dl/6.99.12.4/renpy-6.99.12.4-source.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d82e714a0deab5d0c2e5ec462488648f
diff --git a/metadata/md5-cache/games-engines/renpy-7.3.5 b/metadata/md5-cache/games-engines/renpy-7.3.5
index a609b6a3add6..5df18097e94d 100644
--- a/metadata/md5-cache/games-engines/renpy-7.3.5
+++ b/metadata/md5-cache/games-engines/renpy-7.3.5
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/fribidi ~dev-python/pygame_sdl2-7.3.5[python_targets_python2_7(
 REQUIRED_USE=examples? ( development ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.renpy.org/dl/7.3.5/renpy-7.3.5-source.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61a16b986de95d6aa23c900fe6d38e63
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index b9dd3966fce8..51483da6edde 100644
Binary files a/metadata/md5-cache/games-fps/Manifest.gz and b/metadata/md5-cache/games-fps/Manifest.gz differ
diff --git a/metadata/md5-cache/games-fps/eduke32-20200907.9257 b/metadata/md5-cache/games-fps/eduke32-20201128.9276
similarity index 95%
rename from metadata/md5-cache/games-fps/eduke32-20200907.9257
rename to metadata/md5-cache/games-fps/eduke32-20201128.9276
index 2a104ef572ac..8e9565c95048 100644
--- a/metadata/md5-cache/games-fps/eduke32-20200907.9257
+++ b/metadata/md5-cache/games-fps/eduke32-20201128.9276
@@ -12,6 +12,6 @@ RDEPEND=media-libs/flac media-libs/libsdl2[alsa,joystick,opengl?,sound,video] me
 REQUIRED_USE=cdinstall? ( !demo ) demo? ( !cdinstall ) hrp? ( ^^ ( demo cdinstall ) !voxels ) offensive? ( ^^ ( demo cdinstall ) ) opl? ( ^^ ( demo cdinstall ) !sc-55 ) psx? ( ^^ ( demo cdinstall ) ) sc-55? ( ^^ ( demo cdinstall ) !opl ) voxels? ( !hrp ) vpx? ( opengl )
 RESTRICT=bindist test
 SLOT=0
-SRC_URI=https://dukeworld.com/eduke32/synthesis/latest/eduke32_src_20200907-9257-93f62bbad.tar.xz https://www.eduke32.com/images/eduke32_classic.png hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-5.4.zip ) offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-1.33.zip ) opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-2.01.zip ) psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-1.11.zip ) sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-4.02.zip ) voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-1.21.zip )
+SRC_URI=https://dukeworld.com/eduke32/synthesis/latest/eduke32_src_20201128-9276-42c62c58f.tar.xz https://www.eduke32.com/images/eduke32_classic.png hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-5.4.zip ) offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-1.33.zip ) opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-2.01.zip ) psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-1.11.zip ) sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-4.02.zip ) voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-1.21.zip )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6fa20a64bdfc2900669d514f11bffed5
+_md5_=d7b53fa685480b0ebc2d0a841408e049
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index f2445d7ca42d..81430dccc4ae 100644
Binary files a/metadata/md5-cache/games-misc/Manifest.gz and b/metadata/md5-cache/games-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/games-misc/doge-3.6.0 b/metadata/md5-cache/games-misc/doge-3.6.0
index 95a8f888bed1..ab998b5075bf 100644
--- a/metadata/md5-cache/games-misc/doge-3.6.0
+++ b/metadata/md5-cache/games-misc/doge-3.6.0
@@ -10,5 +10,5 @@ RDEPEND=sys-process/procps python_targets_python3_6? ( dev-lang/python:3.6 ) pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/thiderman/doge/archive/3.6.0.tar.gz -> doge-3.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=df22a0195533a872ce201ef7e8a0c967
diff --git a/metadata/md5-cache/games-misc/usolitaire-0.2.1 b/metadata/md5-cache/games-misc/usolitaire-0.2.1
index 019e90d10af1..1d6c19d59ed3 100644
--- a/metadata/md5-cache/games-misc/usolitaire-0.2.1
+++ b/metadata/md5-cache/games-misc/usolitaire-0.2.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/urwid[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/eliasdorneles/usolitaire/archive/v0.2.1.tar.gz -> usolitaire-0.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=935a2971885ad2f56edd5cc36c87911a
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 0d8d949ddee5..6f6031a267e2 100644
Binary files a/metadata/md5-cache/games-roguelike/Manifest.gz and b/metadata/md5-cache/games-roguelike/Manifest.gz differ
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.25.0 b/metadata/md5-cache/games-roguelike/stone-soup-0.25.0
index f015e710c04a..9bdef289eaad 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.25.0
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.25.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crawl.develz.org/release/0.25/stone_soup-0.25.0.tar.xz https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25e66e08ea05c4a15eea72bb1d6aa714
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1 b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1
index 46e78eb3a4d1..6a0c0204a85a 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/crawl/crawl/releases/download/0.25.1/stone_soup-0.25.1.zip https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=29c099acf1450d969e6437006b8b4cbc
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r1 b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r1
index d5e762e7031b..d5ceff44e09f 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r1
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/crawl/crawl/releases/download/0.25.1/stone_soup-0.25.1.zip https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a69ad897687ee0ae2a212fd2577830b4
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r100 b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r100
index f34438ffb42e..2608b2d66244 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r100
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/crawl/crawl/releases/download/0.25.1/stone_soup-0.25.1.zip https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=708471ded18280efd2f75edcf150e753
diff --git a/metadata/md5-cache/games-sports/Manifest.gz b/metadata/md5-cache/games-sports/Manifest.gz
index be9142d07cae..38b66e787b37 100644
Binary files a/metadata/md5-cache/games-sports/Manifest.gz and b/metadata/md5-cache/games-sports/Manifest.gz differ
diff --git a/metadata/md5-cache/games-sports/xmoto-0.6.1-r100 b/metadata/md5-cache/games-sports/xmoto-0.6.1-r100
new file mode 100644
index 000000000000..f18bcd071ea0
--- /dev/null
+++ b/metadata/md5-cache/games-sports/xmoto-0.6.1-r100
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-games/ode[double-precision=] 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/libxdg-basedir dev-libs/libxml2 media-fonts/dejavu media-libs/libpng:0= media-libs/libsdl[joystick,opengl] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf net-misc/curl sys-libs/zlib:= virtual/jpeg:0 virtual/glu virtual/opengl nls? ( virtual/libintl )
+DESCRIPTION=A challenging 2D motocross platform game, where physics play an important role
+EAPI=7
+HOMEPAGE=https://xmoto.tuxfamily.org
+IUSE=double-precision +nls lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-games/ode[double-precision=] 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/libxdg-basedir dev-libs/libxml2 media-fonts/dejavu media-libs/libpng:0= media-libs/libsdl[joystick,opengl] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf net-misc/curl sys-libs/zlib:= virtual/jpeg:0 virtual/glu virtual/opengl nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
+SLOT=0
+SRC_URI=https://github.com/xmoto/xmoto/archive/0.6.1.tar.gz -> xmoto-0.6.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c84301632f1444507c18ec39b09bca94
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 2dfaf4e742dc..6365730c60f0 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/asc-2.6.0.0-r2 b/metadata/md5-cache/games-strategy/asc-2.6.0.0-r2
deleted file mode 100644
index 0d14c524c426..000000000000
--- a/metadata/md5-cache/games-strategy/asc-2.6.0.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=app-arch/bzip2 dev-games/physfs dev-lang/lua:0 dev-libs/boost dev-libs/expat dev-libs/libsigc++:1.2 media-libs/libpng:0 media-libs/libsdl[video] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-sound media-libs/freetype media-libs/xvid x11-libs/wxGTK:3.0[X] app-arch/zip dev-lang/perl virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=turn based strategy game designed in the tradition of the Battle Isle series
-EAPI=6
-HOMEPAGE=http://www.asc-hq.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-arch/bzip2 dev-games/physfs dev-lang/lua:0 dev-libs/boost dev-libs/expat dev-libs/libsigc++:1.2 media-libs/libpng:0 media-libs/libsdl[video] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-sound media-libs/freetype media-libs/xvid x11-libs/wxGTK:3.0[X]
-SLOT=0
-SRC_URI=mirror://sourceforge/asc-hq/asc-2.6.0.0.tar.bz2 http://www.asc-hq.org/music/frontiers.ogg http://www.asc-hq.org/music/time_to_strike.ogg http://www.asc-hq.org/music/machine_wars.ogg
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=877b4d7bfeaea4b33788b8fef621e1d8
diff --git a/metadata/md5-cache/games-strategy/hedgewars-1.0.0-r100 b/metadata/md5-cache/games-strategy/hedgewars-1.0.0-r100
new file mode 100644
index 000000000000..7538abddc409
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/hedgewars-1.0.0-r100
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 server? ( >=dev-lang/ghc-6.10 dev-haskell/entropy dev-haskell/hslogger >=dev-haskell/mtl-2 >=dev-haskell/network-2.3 dev-haskell/random dev-haskell/regex-tdfa dev-haskell/sandi dev-haskell/sha dev-haskell/vector dev-haskell/utf8-string dev-haskell/yaml >=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6 ) !x86? ( >=dev-lang/fpc-2.4 ) x86? ( >=dev-lang/ghc-6.10 dev-haskell/parsec ) sys-devel/make dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) >=dev-games/physfs-3.0.1 dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libpng:0= media-libs/libsdl2:= media-libs/sdl2-image:= media-libs/sdl2-mixer:=[vorbis] media-libs/sdl2-net:= media-libs/sdl2-ttf:= sys-libs/zlib !x86? ( media-video/ffmpeg:= )
+DESCRIPTION=A turn-based strategy, artillery, action and comedy game
+EAPI=7
+HOMEPAGE=https://www.hedgewars.org/
+IUSE=server +lua_single_target_lua5-1
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 Apache-2.0 FDL-1.3
+RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) >=dev-games/physfs-3.0.1 dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libpng:0= media-libs/libsdl2:= media-libs/sdl2-image:= media-libs/sdl2-mixer:=[vorbis] media-libs/sdl2-net:= media-libs/sdl2-ttf:= sys-libs/zlib !x86? ( media-video/ffmpeg:= ) app-arch/xz-utils >=media-fonts/dejavu-2.28 media-fonts/wqy-zenhei
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
+SLOT=0
+SRC_URI=https://www.hedgewars.org/download/releases/hedgewars-src-1.0.0.tar.bz2
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8788150f949678980d5c960867d1247c
diff --git a/metadata/md5-cache/games-strategy/naev-0.7.0 b/metadata/md5-cache/games-strategy/naev-0.7.0
new file mode 100644
index 000000000000..319a5ba8db2a
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/naev-0.7.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm unpack
+DEPEND=media-libs/libsdl2[X,sound,video] dev-libs/libzip dev-libs/libxml2 >=media-libs/freetype-2:2 >=media-libs/libvorbis-1.2.1 >=media-libs/libpng-1.2:0= virtual/glu virtual/opengl dev-lang/lua:0 mixer? ( media-libs/sdl2-mixer ) openal? ( media-libs/openal )
+DESCRIPTION=A 2D space trading and combat game, in a similar vein to Escape Velocity
+EAPI=7
+HOMEPAGE=https://naev.org/ https://github.com/naev/naev
+IUSE=debug +mixer +openal
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0
+RDEPEND=media-libs/libsdl2[X,sound,video] dev-libs/libzip dev-libs/libxml2 >=media-libs/freetype-2:2 >=media-libs/libvorbis-1.2.1 >=media-libs/libpng-1.2:0= virtual/glu virtual/opengl dev-lang/lua:0 mixer? ( media-libs/sdl2-mixer ) openal? ( media-libs/openal )
+SLOT=0
+SRC_URI=https://github.com/naev/naev/releases/download/v0.7.0/naev-0.7.0.tar.bz2 https://github.com/naev/naev/releases/download/v0.7.0/naev-0.7.0-ndata.zip
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d6d30def9ee541aa565e9021b133a559
diff --git a/metadata/md5-cache/games-strategy/naev-0.7.0-r100 b/metadata/md5-cache/games-strategy/naev-0.7.0-r100
new file mode 100644
index 000000000000..31e94002bef9
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/naev-0.7.0-r100
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm setup unpack
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) media-libs/libsdl2[X,sound,video] dev-libs/libzip dev-libs/libxml2 >=media-libs/freetype-2:2 >=media-libs/libvorbis-1.2.1 >=media-libs/libpng-1.2:0= virtual/glu virtual/opengl mixer? ( media-libs/sdl2-mixer ) openal? ( media-libs/openal )
+DESCRIPTION=A 2D space trading and combat game, in a similar vein to Escape Velocity
+EAPI=7
+HOMEPAGE=https://naev.org/ https://github.com/naev/naev
+IUSE=debug +mixer +openal lua_single_target_luajit lua_single_target_lua5-1
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) media-libs/libsdl2[X,sound,video] dev-libs/libzip dev-libs/libxml2 >=media-libs/freetype-2:2 >=media-libs/libvorbis-1.2.1 >=media-libs/libpng-1.2:0= virtual/glu virtual/opengl mixer? ( media-libs/sdl2-mixer ) openal? ( media-libs/openal )
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
+SLOT=0
+SRC_URI=https://github.com/naev/naev/releases/download/v0.7.0/naev-0.7.0.tar.bz2 https://github.com/naev/naev/releases/download/v0.7.0/naev-0.7.0-ndata.zip
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d017e5dadc8e8bbf08bd7051432a79dc
diff --git a/metadata/md5-cache/games-strategy/openra-20190314-r100 b/metadata/md5-cache/games-strategy/openra-20190314-r100
new file mode 100644
index 000000000000..213926dbb8ae
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/openra-20190314-r100
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/mono-4.2
+DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
+DEPEND=>=dev-lang/mono-4.2 dev-dotnet/libgdiplus
+DESCRIPTION=A free RTS engine supporting games like Command & Conquer, Red Alert and Dune2k
+EAPI=7
+HOMEPAGE=https://www.openra.net/
+IUSE=+debug geoip +lua_single_target_lua5-1
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 Apache-2.0 BSD GPL-2 MIT
+RDEPEND=>=dev-lang/mono-4.2 dev-dotnet/libgdiplus app-misc/ca-certificates lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) media-libs/freetype:2 media-libs/libsdl2[opengl,video] media-libs/openal geoip? ( net-misc/geoipupdate )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
+RESTRICT=mirror test
+SLOT=0
+SRC_URI=https://github.com/OpenRA/OpenRA/archive/release-20190314.tar.gz -> openra-20190314.tar.gz https://github.com/OpenRA/Eluant/releases/download/20160124/Eluant.dll -> Eluant-20160124.dll https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/OpenAL-CS.dll.config -> OpenAL-CS-20151227.dll.config https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/OpenAL-CS.dll -> OpenAL-CS-20151227.dll https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll.config -> SDL2-CS-20161223.dll.config https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll -> SDL2-CS-20161223.dll https://www.nuget.org/api/v2/package/FuzzyLogicLibrary/1.2.0 -> FuzzyLogicLibrary-1.2.0.zip https://www.nuget.org/api/v2/package/MaxMind.Db/2.0.0 -> MaxMind.Db-2.0.0.zip https://www.nuget.org/api/v2/package/Open.Nat/2.1.0 -> Open.Nat-2.1.0.zip https://www.nuget.org/api/v2/package/rix0rrr.BeaconLib/1.0.1 -> rix0rrr.BeaconLib-1.0.1.zip https://www.nuget.org/api/v2/package/SharpFont/4.0.1 -> SharpFont-4.0.1.zip https://www.nuget.org/api/v2/package/SharpZipLib/0.86.0 -> SharpZipLib-0.86.0.zip
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bf4ffe8bf0facbecd3a413fd970a6adb
diff --git a/metadata/md5-cache/games-strategy/s25rttr-0.9.0_pre20200723-r100 b/metadata/md5-cache/games-strategy/s25rttr-0.9.0_pre20200723-r100
new file mode 100644
index 000000000000..06b3f5d7dd49
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/s25rttr-0.9.0_pre20200723-r100
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+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 ) app-arch/bzip2 >=dev-libs/boost-1.73:0=[nls] >=media-libs/libsamplerate-0.1.9 >=media-libs/libsdl2-2.0.10-r2[opengl,sound,video] media-libs/libsndfile media-libs/sdl2-mixer[vorbis,wav] net-libs/miniupnpc virtual/opengl test? ( >=sys-devel/clang-5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Open source remake of The Settlers II: Gold Edition (needs original data files)
+EAPI=7
+HOMEPAGE=https://www.siedler25.org/
+IUSE=test lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ GPL-3 Boost-1.0
+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 ) app-arch/bzip2 >=dev-libs/boost-1.73:0=[nls] >=media-libs/libsamplerate-0.1.9 >=media-libs/libsdl2-2.0.10-r2[opengl,sound,video] media-libs/libsndfile media-libs/sdl2-mixer[vorbis,wav] net-libs/miniupnpc virtual/opengl
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Return-To-The-Roots/s25client/archive/f0b97b120140c96bbeacae9c22633f899931db69.tar.gz -> s25client-f0b97b120140c96bbeacae9c22633f899931db69.tar.gz https://github.com/mat007/turtle/archive/9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz -> s25rttr-turtle-9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz https://github.com/Return-To-The-Roots/languages/archive/6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz -> s25rttr-languages-6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz https://github.com/Return-To-The-Roots/libendian/archive/dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz -> s25rttr-libendian-dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz https://github.com/Return-To-The-Roots/liblobby/archive/9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz -> s25rttr-liblobby-9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz https://github.com/Return-To-The-Roots/libsiedler2/archive/5cb9993a32504337c63fd894266991445e0dcd65.tar.gz -> s25rttr-libsiedler2-5cb9993a32504337c63fd894266991445e0dcd65.tar.gz https://github.com/Return-To-The-Roots/libutil/archive/6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz -> s25rttr-libutil-6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz https://github.com/Return-To-The-Roots/mygettext/archive/b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz -> s25rttr-mygettext-b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz https://github.com/Return-To-The-Roots/s25edit/archive/677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz -> s25rttr-s25edit-677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz https://github.com/Return-To-The-Roots/s25maps/archive/5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz -> s25rttr-s25maps-5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz https://github.com/satoren/kaguya/archive/38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz -> s25rttr-kaguya-38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f139b367018df5ef863a87f2d3d6ed55
diff --git a/metadata/md5-cache/games-strategy/widelands-0.20-r1 b/metadata/md5-cache/games-strategy/widelands-0.20-r1
index caaaaa164ab7..f13c1eabaf08 100644
--- a/metadata/md5-cache/games-strategy/widelands-0.20-r1
+++ b/metadata/md5-cache/games-strategy/widelands-0.20-r1
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/boost-1.48:= dev-libs/icu:= media-libs/glew:0= media-libs/libglvnd media-libs/libpng:0= media-libs/libsdl2[video] media-libs/sdl2-image[jpeg,png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf sys-libs/zlib:=[minizip] || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-lang/lua:0
+DEPEND=>=dev-libs/boost-1.48:= dev-libs/icu:= media-libs/glew:0= media-libs/libglvnd media-libs/libpng:0= media-libs/libsdl2[video] media-libs/sdl2-image[jpeg,png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf sys-libs/zlib:=[minizip] || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 )
 DESCRIPTION=A game similar to Settlers 2
 EAPI=7
 HOMEPAGE=https://www.widelands.org/
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/boost-1.48:= dev-libs/icu:= media-libs/glew:0= media-libs/lib
 SLOT=0
 SRC_URI=https://launchpad.net/widelands/build20/build20/+download/widelands-build20.tar.bz2
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b76768001bd4287e1d96d1888d3819f7
+_md5_=43175e623e44777ac035d002b9a325b7
diff --git a/metadata/md5-cache/games-strategy/widelands-9999 b/metadata/md5-cache/games-strategy/widelands-9999
index c0cd2eb49b79..2e279a4f39ce 100644
--- a/metadata/md5-cache/games-strategy/widelands-9999
+++ b/metadata/md5-cache/games-strategy/widelands-9999
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/boost-1.48:= dev-libs/icu:= media-libs/glew:0= media-libs/libglvnd media-libs/libpng:0= media-libs/libsdl2[video] media-libs/sdl2-image[jpeg,png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf sys-libs/zlib:=[minizip] || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-lang/lua:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/boost-1.48:= dev-libs/icu:= media-libs/glew:0= media-libs/libglvnd media-libs/libpng:0= media-libs/libsdl2[video] media-libs/sdl2-image[jpeg,png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf sys-libs/zlib:=[minizip] || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A game similar to Settlers 2
 EAPI=7
 HOMEPAGE=https://www.widelands.org/
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/boost-1.48:= dev-libs/icu:= media-libs/glew:0= media-libs/libglvnd media-libs/libpng:0= media-libs/libsdl2[video] media-libs/sdl2-image[jpeg,png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf sys-libs/zlib:=[minizip]
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e7a0866e78c555cba9d0d709eb61a3a1
+_md5_=433fa94fa88af8f9ec6d98f529e46cfd
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index df8abc6225f0..2de7d572f321 100644
Binary files a/metadata/md5-cache/games-util/Manifest.gz and b/metadata/md5-cache/games-util/Manifest.gz differ
diff --git a/metadata/md5-cache/games-util/lutris-0.5.7.1 b/metadata/md5-cache/games-util/lutris-0.5.7.1
index 95a9945f9067..4160c8ba3562 100644
--- a/metadata/md5-cache/games-util/lutris-0.5.7.1
+++ b/metadata/md5-cache/games-util/lutris-0.5.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://lutris.net/releases/lutris_0.5.7.1.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7ec9b9e17ffd676d09b53975844e74cd
diff --git a/metadata/md5-cache/games-util/lutris-0.5.8 b/metadata/md5-cache/games-util/lutris-0.5.8
index b5c055c61779..d4406ee90a7c 100644
--- a/metadata/md5-cache/games-util/lutris-0.5.8
+++ b/metadata/md5-cache/games-util/lutris-0.5.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://lutris.net/releases/lutris_0.5.8.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=726a0e3445eb1840d4a280c5477c6047
diff --git a/metadata/md5-cache/games-util/lutris-0.5.8.1 b/metadata/md5-cache/games-util/lutris-0.5.8.1
index 17bb48d11758..445a54eec4ec 100644
--- a/metadata/md5-cache/games-util/lutris-0.5.8.1
+++ b/metadata/md5-cache/games-util/lutris-0.5.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://lutris.net/releases/lutris_0.5.8.1.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=726a0e3445eb1840d4a280c5477c6047
diff --git a/metadata/md5-cache/games-util/lutris-9999 b/metadata/md5-cache/games-util/lutris-9999
index 82b43e222469..1e36657cfacb 100644
--- a/metadata/md5-cache/games-util/lutris-9999
+++ b/metadata/md5-cache/games-util/lutris-9999
@@ -11,5 +11,5 @@ RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unrar app-arch/unzip python_
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=726a0e3445eb1840d4a280c5477c6047
diff --git a/metadata/md5-cache/games-util/nml-0.5.3 b/metadata/md5-cache/games-util/nml-0.5.3
index 5b82abf88876..c568c8b158d8 100644
--- a/metadata/md5-cache/games-util/nml-0.5.3
+++ b/metadata/md5-cache/games-util/nml-0.5.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pillow[zlib,python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/OpenTTD/nml/releases/download/0.5.3/nml-0.5.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=762b1a3e27d36741ef7efec4850927ad
diff --git a/metadata/md5-cache/games-util/sc-controller-0.4.8.1 b/metadata/md5-cache/games-util/sc-controller-0.4.8.1
index 94038e7a8e73..417b2e6b475c 100644
--- a/metadata/md5-cache/games-util/sc-controller-0.4.8.1
+++ b/metadata/md5-cache/games-util/sc-controller-0.4.8.1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/pygobject[python_targets_py
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/Ryochan7/sc-controller/archive/v0.4.8.1.tar.gz -> sc-controller-0.4.8.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=870c0cdcf74490c0d0fdf5b4daa118d7
diff --git a/metadata/md5-cache/games-util/slade-3.1.12a-r100 b/metadata/md5-cache/games-util/slade-3.1.12a-r100
new file mode 100644
index 000000000000..55d4a95e9abe
--- /dev/null
+++ b/metadata/md5-cache/games-util/slade-3.1.12a-r100
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/p7zip virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+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 ) app-arch/bzip2:= >=media-libs/dumb-2:= media-libs/freeimage[jpeg,png,tiff] media-libs/glew:0= media-libs/libsfml:= net-misc/curl sys-libs/zlib x11-libs/wxGTK:3.0-gtk3[gstreamer,opengl,webkit?,X] fluidsynth? ( media-sound/fluidsynth:= )
+DESCRIPTION=Modern editor for Doom-engine based games and source ports
+EAPI=7
+HOMEPAGE=https://slade.mancubus.net/
+IUSE=fluidsynth timidity webkit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+KEYWORDS=~amd64
+LICENSE=GPL-2 MIT
+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 ) app-arch/bzip2:= >=media-libs/dumb-2:= media-libs/freeimage[jpeg,png,tiff] media-libs/glew:0= media-libs/libsfml:= net-misc/curl sys-libs/zlib x11-libs/wxGTK:3.0-gtk3[gstreamer,opengl,webkit?,X] fluidsynth? ( media-sound/fluidsynth:= ) timidity? ( media-sound/timidity++ )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
+SLOT=0
+SRC_URI=https://github.com/sirjuddington/SLADE/archive/3.1.12a.tar.gz -> slade-3.1.12a.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7b0c75844f0fde186e26249456761f4a
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index e07be9a4d40c..0ad1d84d8754 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.36.1 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.36.1
index 0778ee1723b2..3e22444e08b4 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.36.1
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.36.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-kernel/linux-headers dev-util/glib-utils dev-util/gdbus-codegen x11-base/xorg-proto || ( dev-lang/python:3.7 dev-lang/python:3.6 ) test? ( || ( ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( ( dev-lang/python:3.7 dev-python/dbusmock[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/dbusmock[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) gnome-base/gnome-session ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=sys-kernel/linux-headers dev-util/glib-utils dev-util/gdbus-codegen x11-base/xorg-proto || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) test? ( || ( ( dev-lang/python:3.9 dev-python/pygobject:3[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( ( dev-lang/python:3.9 dev-python/dbusmock[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/dbusmock[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/dbusmock[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/dbusmock[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) gnome-base/gnome-session ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=>=sci-geosciences/geocode-glib-3.10 >=dev-libs/glib-2.56:2 >=gnome-base/gnome-desktop-3.34.2:3= >=gnome-base/gsettings-desktop-schemas-3.35.91 >=x11-libs/gtk+-3.15.3:3[X,wayland?] >=dev-libs/libgweather-3.9.5:2= colord? ( >=x11-misc/colord-1.3.5:= >=media-libs/lcms-2.2:2 ) media-libs/libcanberra[gtk3] >=app-misc/geoclue-2.3.1:2.0 >=x11-libs/libnotify-0.7.3 >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.114 >=sys-power/upower-0.99.8:= x11-libs/libX11 udev? ( dev-libs/libgudev:= ) wayland? ( dev-libs/wayland ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20.0 x11-libs/gdk-pixbuf:2 ) smartcard? ( >=dev-libs/nss-3.11.2 ) cups? ( >=net-print/cups-1.4[dbus] ) modemmanager? ( >=app-crypt/gcr-3.7.5:= >=net-misc/modemmanager-1.0:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) media-libs/alsa-lib x11-libs/libXi x11-libs/libXext media-libs/fontconfig systemd? ( sys-apps/systemd sys-apps/dbus[user-session] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Gnome Settings Daemon
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.36/gnome-settings-daemon-3.36.1.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-settings-daemon-3.36.1-patchset.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b15bb97184129f722c236340d5d66880
+_md5_=7eae1601932bcce4b79358a207810fd4
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.38.1 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.38.1
index 6a4a7cf06857..1aa721b6e957 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.38.1
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.38.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.38/gnome-settings-daemon-3.38.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7976c45ee04d8cbdcd41118088c39678
+_md5_=d2e47b4f2fe71f7d216a78437b39503a
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index b98fd1bcd2ee..f1dc3e391a02 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-34 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-34
new file mode 100644
index 000000000000..bdd748878361
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-34
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=Support Ubuntu AppIndicators and KStatusNotifierItems in Gnome
+EAPI=7
+HOMEPAGE=https://github.com/ubuntu/gnome-shell-extension-appindicator
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-eselect/eselect-gnome-shell-extensions dev-libs/libappindicator:3 >=gnome-base/gnome-shell-3.34
+SLOT=0
+SRC_URI=https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v34.tar.gz -> gnome-shell-extension-appindicator-34.tar.gz
+_md5_=1494c0662409e38cec8f863114528280
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-10 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-10
new file mode 100644
index 000000000000..9013cb715d4a
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-10
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=Show tooltip with full name and description
+EAPI=7
+HOMEPAGE=https://github.com/RaphaelRochet/applications-overview-tooltip
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38
+SLOT=0
+SRC_URI=https://github.com/RaphaelRochet/applications-overview-tooltip/archive/v10.tar.gz -> gnome-shell-extension-applications-overview-tooltip-10.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9fab28e3792ef4318d5c44f6fa68dfff
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-7 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-7
deleted file mode 100644
index 25f46655677f..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=dev-libs/glib:2
-DESCRIPTION=Show tooltip with full name and description
-EAPI=7
-HOMEPAGE=https://github.com/RaphaelRochet/applications-overview-tooltip
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.20
-SLOT=0
-SRC_URI=https://github.com/RaphaelRochet/applications-overview-tooltip/archive/v7.tar.gz -> gnome-shell-extension-applications-overview-tooltip-7.tar.gz
-_md5_=7c7eccdb0d1cd7ddd8eafbf8adb36a22
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-10 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-10
deleted file mode 100644
index d28e6c9364d9..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-10
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=dev-libs/glib:2
-DESCRIPTION=Allow to connect bluetooth paired devices from gnome control panel
-EAPI=7
-HOMEPAGE=https://github.com/bjarosze/gnome-bluetooth-quick-connect
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 net-wireless/bluez app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.26.2
-SLOT=0
-SRC_URI=https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v10.tar.gz -> gnome-shell-extension-bluetooth-quick-connect-10.tar.gz
-_md5_=db8c95d90547b2973bc89470baabb86b
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-16 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-16
new file mode 100644
index 000000000000..81fe1693ef40
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-16
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=Allow to connect bluetooth paired devices from gnome control panel
+EAPI=7
+HOMEPAGE=https://github.com/bjarosze/gnome-bluetooth-quick-connect
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=net-wireless/bluez app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38
+SLOT=0
+SRC_URI=https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v16.tar.gz -> gnome-shell-extension-bluetooth-quick-connect-16.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=61f17325df5d415de87db9630c6106cd
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200901 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200901
new file mode 100644
index 000000000000..88fbc85d18b8
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200901
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst
+DEPEND=dev-libs/glib:2
+DESCRIPTION=Control the blur effect on gnome-shell lock screen
+EAPI=7
+HOMEPAGE=https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.36.4
+SLOT=0
+SRC_URI=https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/archive/df16335b2b7f4bbbd22b9e95a16f074ae405b3a3.tar.gz -> gnome-shell-extension-control-blur-effect-on-lock-screen-20200901.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd148095a0635e9b00ba7eaef80c2617
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-37 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-37
deleted file mode 100644
index 949d7caa477e..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-37
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2
-DESCRIPTION=An icon taskbar for the Gnome Shell
-EAPI=7
-HOMEPAGE=https://github.com/home-sweet-gnome/dash-to-panel
-IUSE=branding
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.18.0
-SLOT=0
-SRC_URI=https://github.com/home-sweet-gnome/dash-to-panel/archive/v37.tar.gz -> gnome-shell-extension-dash-to-panel-37.tar.gz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ced58db46b989208c9fdc7e17b184f93
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-40 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-40
index ccb2837bf8c0..5f6ed8cf134f 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-40
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-40
@@ -5,10 +5,10 @@ DESCRIPTION=An icon taskbar for the Gnome Shell
 EAPI=7
 HOMEPAGE=https://github.com/home-sweet-gnome/dash-to-panel
 IUSE=branding
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.18.0
 SLOT=0
 SRC_URI=https://github.com/home-sweet-gnome/dash-to-panel/archive/v40.tar.gz -> gnome-shell-extension-dash-to-panel-40.tar.gz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7ea63315934d42744b02abaaa820f2d0
+_md5_=6a475016cfd115ca9e0f178bb3abcb28
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-42 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-42
index 636eab63e32f..20602f76405c 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-42
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-42
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Connect implementation for Gnome Shell
 EAPI=7
 HOMEPAGE=https://github.com/andyholmes/gnome-shell-extension-gsconnect
 IUSE=nautilus
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.48 =gnome-base/gnome-shell-3.36* gnome-base/gvfs gnome-extra/evolution-data-server || ( media-libs/libcanberra media-libs/gsound ) nautilus? ( dev-python/nautilus-python gnome-base/nautilus[introspection] )
 SLOT=0
 SRC_URI=https://github.com/andyholmes/gnome-shell-extension-gsconnect/archive/v42.tar.gz -> gnome-shell-extension-gsconnect-42.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=36e8ca0b7f718a73bc9511100c7b2e74
+_md5_=21944ade4ef4f68f9d759e3e2afb4a41
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-44 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-44
new file mode 100644
index 000000000000..3a2b69f6ca8e
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-44
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/glib:2 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=KDE Connect implementation for Gnome Shell
+EAPI=7
+HOMEPAGE=https://github.com/andyholmes/gnome-shell-extension-gsconnect
+IUSE=nautilus
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.48 =gnome-base/gnome-shell-3.38* gnome-base/gvfs gnome-extra/evolution-data-server || ( media-libs/libcanberra media-libs/gsound ) nautilus? ( dev-python/nautilus-python gnome-base/nautilus[introspection] )
+SLOT=0
+SRC_URI=https://github.com/andyholmes/gnome-shell-extension-gsconnect/archive/v44.tar.gz -> gnome-shell-extension-gsconnect-44.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=09fa1e90f7776b52f25e2adbce327d69
diff --git a/metadata/md5-cache/gnome-extra/pch-session-3.34.3 b/metadata/md5-cache/gnome-extra/pch-session-3.34.3
deleted file mode 100644
index c1cc4a55f021..000000000000
--- a/metadata/md5-cache/gnome-extra/pch-session-3.34.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Unofficial gnome based session with different default settings and extensions
-EAPI=7
-HOMEPAGE=https://gitlab.com/pachoramos/pch-session
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=gnome-base/gnome-shell-3.34 >=gnome-extra/gnome-shell-extensions-3.34 >=gnome-extra/gnome-shell-extension-applications-overview-tooltip-6 >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-10 >=gnome-extra/gnome-shell-extension-dash-to-panel-26 >=gnome-extra/gnome-shell-extension-desktop-icons-19.10.2 >=gnome-extra/gnome-shell-extension-gsconnect-33 >=gnome-extra/gnome-shell-extensions-topicons-plus-22_p20190929 >=gnome-extra/gnome-tweaks-3.32
-SLOT=0
-SRC_URI=https://gitlab.com/pachoramos/pch-session/-/archive/3.34.3/pch-session-3.34.3.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bac59db46f3c2efc24b2dbff5d3edfa7
diff --git a/metadata/md5-cache/gnome-extra/pch-session-3.36.1 b/metadata/md5-cache/gnome-extra/pch-session-3.36.1
deleted file mode 100644
index f778f5db6364..000000000000
--- a/metadata/md5-cache/gnome-extra/pch-session-3.36.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DESCRIPTION=Unofficial gnome based session with different default settings and extensions
-EAPI=7
-HOMEPAGE=https://gitlab.com/pachoramos/pch-session
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=gnome-base/gnome-shell-3.36 >=gnome-extra/gnome-shell-extensions-3.36 >=gnome-extra/gnome-shell-extension-applications-overview-tooltip-8 >=gnome-extra/gnome-shell-extension-bing-wallpaper-27 >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-12 >=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713 >=gnome-extra/gnome-shell-extension-dash-to-panel-38 >=gnome-extra/gnome-shell-extension-desktop-icons-20.04.0 >=gnome-extra/gnome-shell-extension-gsconnect-34 >=gnome-extra/gnome-shell-extensions-topicons-plus-27 >=gnome-extra/gnome-tweaks-3.34
-SLOT=0
-SRC_URI=https://gitlab.com/pachoramos/pch-session/-/archive/3.36.1/pch-session-3.36.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=661ec06d662dc332cd3327593cf65b0a
diff --git a/metadata/md5-cache/gnome-extra/pch-session-3.36.2 b/metadata/md5-cache/gnome-extra/pch-session-3.36.2
deleted file mode 100644
index 004261aff6a6..000000000000
--- a/metadata/md5-cache/gnome-extra/pch-session-3.36.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DESCRIPTION=Unofficial gnome based session with different default settings and extensions
-EAPI=7
-HOMEPAGE=https://gitlab.com/pachoramos/pch-session
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=gnome-base/gnome-shell-3.36 >=gnome-extra/gnome-shell-extensions-3.36 >=gnome-extra/gnome-shell-extension-applications-overview-tooltip-8 >=gnome-extra/gnome-shell-extension-bing-wallpaper-27 >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-12 >=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713 >=gnome-extra/gnome-shell-extension-dash-to-panel-38 >=gnome-extra/gnome-shell-extension-desktop-icons-20.04.0 >=gnome-extra/gnome-shell-extension-gsconnect-34 >=gnome-extra/gnome-shell-extensions-topicons-plus-27 >=gnome-extra/gnome-tweaks-3.34
-SLOT=0
-SRC_URI=https://gitlab.com/pachoramos/pch-session/-/archive/3.36.2/pch-session-3.36.2.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=661ec06d662dc332cd3327593cf65b0a
diff --git a/metadata/md5-cache/gnome-extra/pch-session-3.36.3 b/metadata/md5-cache/gnome-extra/pch-session-3.36.3
index 0f37c2298d6c..aa1e5214346d 100644
--- a/metadata/md5-cache/gnome-extra/pch-session-3.36.3
+++ b/metadata/md5-cache/gnome-extra/pch-session-3.36.3
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm preinst
 DESCRIPTION=Unofficial gnome based session with different default settings and extensions
 EAPI=7
 HOMEPAGE=https://gitlab.com/pachoramos/pch-session
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=gnome-base/gnome-shell-3.36 >=gnome-extra/gnome-shell-extensions-3.36 >=gnome-extra/gnome-shell-extension-applications-overview-tooltip-8 >=gnome-extra/gnome-shell-extension-bing-wallpaper-27 >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-12 >=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713 >=gnome-extra/gnome-shell-extension-dash-to-panel-38 >=gnome-extra/gnome-shell-extension-desktop-icons-20.04.0 >=gnome-extra/gnome-shell-extension-gsconnect-34 >=gnome-extra/gnome-shell-extensions-topicons-plus-27 >=gnome-extra/gnome-tweaks-3.34
 SLOT=0
 SRC_URI=https://gitlab.com/pachoramos/pch-session/-/archive/3.36.3/pch-session-3.36.3.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=72c537a5657633d4eb0e2d1aca6db20a
+_md5_=661ec06d662dc332cd3327593cf65b0a
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 6e3befa7252b..70afd38159be 100644
Binary files a/metadata/md5-cache/gui-libs/Manifest.gz and b/metadata/md5-cache/gui-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-libs/libwpe-1.8.0 b/metadata/md5-cache/gui-libs/libwpe-1.8.0
index d27f307fe7d8..5300c1da8008 100644
--- a/metadata/md5-cache/gui-libs/libwpe-1.8.0
+++ b/metadata/md5-cache/gui-libs/libwpe-1.8.0
@@ -4,10 +4,10 @@ DEPEND=media-libs/mesa[egl] x11-libs/libxkbcommon
 DESCRIPTION=Platform-agnostic interfaces for WPE WebKit
 EAPI=7
 HOMEPAGE=https://wpewebkit.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=media-libs/mesa[egl] x11-libs/libxkbcommon
 SLOT=1.0
 SRC_URI=https://wpewebkit.org/releases/libwpe-1.8.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=266f8d621c83d8d8e76823f943db0844
+_md5_=f3fa5cf727bfb338f2972879c68bb7f1
diff --git a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.8.0 b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.8.0
index c491b66de837..15f344cc3d49 100644
--- a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.8.0
+++ b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.8.0
@@ -4,10 +4,10 @@ DEPEND=media-libs/libepoxy[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 >=gui-li
 DESCRIPTION=WPE backend designed for Linux desktop systems
 EAPI=7
 HOMEPAGE=https://wpewebkit.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=media-libs/libepoxy[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 >=gui-libs/libwpe-1.5.90:1.0
 SLOT=1.0
 SRC_URI=https://wpewebkit.org/releases/wpebackend-fdo-1.8.0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2a7533f675b6bdc67756ab565ac3e891
+_md5_=11f7e5ff9b8b2fa8e64d02ae25de39a7
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 20a2ab735a1c..e3df59038408 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.74.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.74.0
index 0f9a84317327..8e00fc5f6ef5 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.74.0
@@ -10,5 +10,5 @@ RDEPEND=app-doc/doxygen python_single_target_python3_7? ( dev-python/jinja[pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kapidox-5.74.0.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	kde.org	16ab706e1b049cfaa65425a0c0e28cac	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	kde.org	16ab706e1b049cfaa65425a0c0e28cac	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ce3fa8d5abc5f00180fa058794f66290
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.76.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.76.0
index cad654c6e4b7..4677e33916ce 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.76.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.76.0
@@ -10,5 +10,5 @@ RDEPEND=app-doc/doxygen python_single_target_python3_7? ( dev-python/jinja[pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=5/5.76
 SRC_URI=mirror://kde/stable/frameworks/5.76/kapidox-5.76.0.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	kde.org	16ab706e1b049cfaa65425a0c0e28cac	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	kde.org	16ab706e1b049cfaa65425a0c0e28cac	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=966cb57d0951c8acb5fb35ff01e42062
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 186a362215c0..d8db7febe087 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.20.3 b/metadata/md5-cache/kde-plasma/bluedevil-5.20.4
similarity index 95%
rename from metadata/md5-cache/kde-plasma/bluedevil-5.20.3
rename to metadata/md5-cache/kde-plasma/bluedevil-5.20.4
index 1bf58898ccc2..0fdf44df783e 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.20.3
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.20.4
@@ -7,8 +7,8 @@ HOMEPAGE=https://invent.kde.org/plasma/bluedevil
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/bluez-qt-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kded-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-plasma/kde-cli-tools-5.20.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/bluez-qt-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kded-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-plasma/kde-cli-tools-5.20.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/bluedevil-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/bluedevil-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f3efe335f626215d579e0465753b711
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.20.3 b/metadata/md5-cache/kde-plasma/breeze-5.20.4
similarity index 91%
rename from metadata/md5-cache/kde-plasma/breeze-5.20.3
rename to metadata/md5-cache/kde-plasma/breeze-5.20.4
index 2e3e073f3d1a..b13c346f2081 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.20.3
+++ b/metadata/md5-cache/kde-plasma/breeze-5.20.4
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/frameworkintegration-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-plasma/kdecoration-5.20.3:5 wayland? ( >=kde-frameworks/kwayland-5.74.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/frameworkintegration-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-plasma/kdecoration-5.20.4:5 wayland? ( >=kde-frameworks/kwayland-5.74.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
 DESCRIPTION=Breeze visual style for the Plasma desktop
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/breeze
 IUSE=wayland X debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-PDEPEND=>=kde-frameworks/breeze-icons-5.74.0:5 >=kde-plasma/kde-cli-tools-5.20.3:5
-RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/frameworkintegration-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-plasma/kdecoration-5.20.3:5 wayland? ( >=kde-frameworks/kwayland-5.74.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+PDEPEND=>=kde-frameworks/breeze-icons-5.74.0:5 >=kde-plasma/kde-cli-tools-5.20.4:5
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/frameworkintegration-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-plasma/kdecoration-5.20.4:5 wayland? ( >=kde-frameworks/kwayland-5.74.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/breeze-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/breeze-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c719c56f90059961a761772707b40dc8
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.20.3 b/metadata/md5-cache/kde-plasma/breeze-grub-5.20.4
similarity index 82%
rename from metadata/md5-cache/kde-plasma/breeze-grub-5.20.3
rename to metadata/md5-cache/kde-plasma/breeze-grub-5.20.4
index 75f7b2f2986e..9bcf97606172 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.20.3
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.20.4
@@ -5,6 +5,6 @@ HOMEPAGE=https://kde.org/plasma-desktop
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3+
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/breeze-grub-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/breeze-grub-5.20.4.tar.xz
 _eclasses_=kde.org	16ab706e1b049cfaa65425a0c0e28cac
 _md5_=a73f5cb98e14ec4847aedb636df01e5f
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.20.3 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.20.4
similarity index 93%
rename from metadata/md5-cache/kde-plasma/breeze-gtk-5.20.3
rename to metadata/md5-cache/kde-plasma/breeze-gtk-5.20.4
index cd388c0723c0..cfd3ae02f1f0 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.20.3
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.20.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-lang/sassc >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.9 dev-python/pycairo[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/pycairo[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/pycairo[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) >=kde-plasma/breeze-5.20.3:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-lang/sassc >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.9 dev-python/pycairo[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/pycairo[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/pycairo[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) >=kde-plasma/breeze-5.20.4:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
 DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/breeze-gtk-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/breeze-gtk-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3a65a52597c1520ac81f2cb3004bda08
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.20.3 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.20.4
similarity index 93%
rename from metadata/md5-cache/kde-plasma/breeze-plymouth-5.20.3
rename to metadata/md5-cache/kde-plasma/breeze-plymouth-5.20.4
index 8240106f211c..3a6d0d525ff5 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.20.3
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.20.4
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/breeze-plymouth-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/breeze-plymouth-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b9d3ea0ee4999ee03e659f5091329e6
diff --git a/metadata/md5-cache/kde-plasma/discover-5.20.3-r1 b/metadata/md5-cache/kde-plasma/discover-5.20.4
similarity index 98%
rename from metadata/md5-cache/kde-plasma/discover-5.20.3-r1
rename to metadata/md5-cache/kde-plasma/discover-5.20.4
index 3e84faf87245..7a1dcb55619a 100644
--- a/metadata/md5-cache/kde-plasma/discover-5.20.3-r1
+++ b/metadata/md5-cache/kde-plasma/discover-5.20.4
@@ -10,6 +10,6 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/attica-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 firmware? ( sys-apps/fwupd ) flatpak? ( dev-libs/appstream:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/discover-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/discover-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=52a1911059e1cde24bd7cac56231ae92
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.20.3 b/metadata/md5-cache/kde-plasma/drkonqi-5.20.4
similarity index 97%
rename from metadata/md5-cache/kde-plasma/drkonqi-5.20.3
rename to metadata/md5-cache/kde-plasma/drkonqi-5.20.4
index 667de066f866..5f6015f36908 100644
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.20.3
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.20.4
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/syntax-highlighting-5.74.0:5 X? ( >=dev-qt/qtx11extras-5.15.1:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/drkonqi-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/drkonqi-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3dc219730aaf3e7e129561909862bb07
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.20.3 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.20.4
similarity index 96%
rename from metadata/md5-cache/kde-plasma/kactivitymanagerd-5.20.3
rename to metadata/md5-cache/kde-plasma/kactivitymanagerd-5.20.4
index bfa8ae0330d9..bb13e0386d83 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.20.3
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.20.4
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsql-5.15.1:5[sqlite] >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/kactivitymanagerd-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/kactivitymanagerd-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0cf3d3b10dd9c76d21b626fc141b1ebc
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.20.3 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.20.4
similarity index 93%
rename from metadata/md5-cache/kde-plasma/kde-cli-tools-5.20.3
rename to metadata/md5-cache/kde-plasma/kde-cli-tools-5.20.4
index 4d920bdd7a4c..cd1b0360ac1c 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.20.3
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.20.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-plasma/libkworkspace-5.20.3:5 kdesu? ( >=kde-frameworks/kdesu-5.74.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-plasma/libkworkspace-5.20.4:5 kdesu? ( >=kde-frameworks/kdesu-5.74.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/kde-cli-tools
 IUSE=kdesu X test debug +handbook test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-plasma/libkworkspace-5.20.3:5 kdesu? ( >=kde-frameworks/kdesu-5.74.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-plasma/libkworkspace-5.20.4:5 kdesu? ( >=kde-frameworks/kdesu-5.74.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=kdesu? ( X )
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/kde-cli-tools-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/kde-cli-tools-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7f093e0f4883707934df783f8174940
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.20.3 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.20.4
similarity index 75%
rename from metadata/md5-cache/kde-plasma/kde-gtk-config-5.20.3
rename to metadata/md5-cache/kde-plasma/kde-gtk-config-5.20.4
index 60871a08eeb9..cddbc4153c07 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.20.3
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.20.4
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/sassc dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-plasma/kdecoration-5.20.3:5 x11-libs/gtk+:2 x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-plasma/kdecoration-5.20.4:5 x11-libs/gtk+:2 x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
 DESCRIPTION=GTK2 and GTK3 configurator for KDE Plasma
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/kde-gtk-config
 IUSE=test debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-plasma/kdecoration-5.20.3:5 x11-libs/gtk+:2 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.20.3:5 x11-misc/xsettingsd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-plasma/kdecoration-5.20.4:5 x11-libs/gtk+:2 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.20.4:5 x11-misc/xsettingsd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/kde-gtk-config-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/kde-gtk-config-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c61f02c310a94e8ea0d172b2de6845a6
+_md5_=1594d0e9717650d2ea194d65d9143433
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.20.3 b/metadata/md5-cache/kde-plasma/kdecoration-5.20.4
similarity index 95%
rename from metadata/md5-cache/kde-plasma/kdecoration-5.20.3
rename to metadata/md5-cache/kde-plasma/kdecoration-5.20.4
index f078c263bb8b..758ff2dec5fd 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.20.3
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.20.4
@@ -10,6 +10,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=kde-frameworks/ki18n-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/kdecoration-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/kdecoration-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f758cb931e2ceabcbd57f5f1d80f4a9
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.20.3 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.20.4
similarity index 96%
rename from metadata/md5-cache/kde-plasma/kdeplasma-addons-5.20.3
rename to metadata/md5-cache/kde-plasma/kdeplasma-addons-5.20.4
index 1d1dfe2f6486..5586ceff6254 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.20.3
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.20.4
@@ -7,9 +7,9 @@ HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=comic share webengine test debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kholidays-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kunitconversion-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 comic? ( >=kde-frameworks/kross-5.74.0:5 ) share? ( >=kde-frameworks/purpose-5.74.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.1:5 ) >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-plasma/plasma-workspace-5.20.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kholidays-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kunitconversion-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 comic? ( >=kde-frameworks/kross-5.74.0:5 ) share? ( >=kde-frameworks/purpose-5.74.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.1:5 ) >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-plasma/plasma-workspace-5.20.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/kdeplasma-addons-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/kdeplasma-addons-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=52076d0c8240911f9e68bb52b1cd70e3
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.20.3 b/metadata/md5-cache/kde-plasma/kgamma-5.20.4
similarity index 96%
rename from metadata/md5-cache/kde-plasma/kgamma-5.20.3
rename to metadata/md5-cache/kde-plasma/kgamma-5.20.4
index acea31c87a97..0df136f8dbc0 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.20.3
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.20.4
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 x11-libs/libX11 x11-libs/libXxf86vm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/kgamma5-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/kgamma5-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e3df5ea8862ea764fecae8384ba04dab
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.20.3 b/metadata/md5-cache/kde-plasma/khotkeys-5.20.4
similarity index 76%
rename from metadata/md5-cache/kde-plasma/khotkeys-5.20.3
rename to metadata/md5-cache/kde-plasma/khotkeys-5.20.4
index 15e42faa861b..abeab7000cba 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.20.3
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.20.4
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5[X] >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5[X] >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/libkworkspace-5.20.4:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
 DESCRIPTION=KDE Plasma workspace hotkey module
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5[X] >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.74.0:5 >=kde-plasma/kde-cli-tools-5.20.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5[X] >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/libkworkspace-5.20.4:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.74.0:5 >=kde-plasma/kde-cli-tools-5.20.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/khotkeys-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/khotkeys-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2a73871c217d86dbb8769ef4b6ce0944
+_md5_=4ea5e0461967510359bde20282f123d3
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.20.3 b/metadata/md5-cache/kde-plasma/kinfocenter-5.20.4
similarity index 94%
rename from metadata/md5-cache/kde-plasma/kinfocenter-5.20.3
rename to metadata/md5-cache/kde-plasma/kinfocenter-5.20.4
index 8b1fd818ca49..de5fedae6fd2 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.20.3
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.20.4
@@ -7,9 +7,9 @@ HOMEPAGE=https://userbase.kde.org/KInfoCenter
 IUSE=gles2-only ieee1394 +opengl +pci wayland debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5[gles2-only=] >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.74.0:5 media-libs/mesa[egl] ) >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-plasma/kde-cli-tools-5.20.3:5 >=kde-plasma/systemsettings-5.20.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5[gles2-only=] >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.74.0:5 media-libs/mesa[egl] ) >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-plasma/kde-cli-tools-5.20.4:5 >=kde-plasma/systemsettings-5.20.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=wayland? ( || ( opengl gles2-only ) )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/kinfocenter-5.20.3.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
+SRC_URI=mirror://kde/stable/plasma/5.20.4/kinfocenter-5.20.4.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1f58b89355fe4c7ae7c9d7575d7aec3
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.20.3 b/metadata/md5-cache/kde-plasma/kmenuedit-5.20.4
similarity index 97%
rename from metadata/md5-cache/kde-plasma/kmenuedit-5.20.3
rename to metadata/md5-cache/kde-plasma/kmenuedit-5.20.4
index e769f956ebc0..321b218148ee 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.20.3
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.20.4
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/kmenuedit-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/kmenuedit-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f8a44c19ae2db44efbbb6cbe5cd24d7
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.20.3 b/metadata/md5-cache/kde-plasma/kscreen-5.20.4
similarity index 90%
rename from metadata/md5-cache/kde-plasma/kscreen-5.20.3
rename to metadata/md5-cache/kde-plasma/kscreen-5.20.4
index d6903726fc29..b822dfc60757 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.20.3
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.20.4
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsensors-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-plasma/libkscreen-5.20.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsensors-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-plasma/libkscreen-5.20.4:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=KDE Plasma screen management
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/kscreen
 IUSE=debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsensors-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-plasma/libkscreen-5.20.3:5 >=dev-qt/qtgraphicaleffects-5.15.1:5 >=kde-plasma/kde-cli-tools-5.20.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsensors-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-plasma/libkscreen-5.20.4:5 >=dev-qt/qtgraphicaleffects-5.15.1:5 >=kde-plasma/kde-cli-tools-5.20.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/kscreen-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/kscreen-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c3f6342e574fab14bce248bf12e450ab
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.20.3 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.20.4
similarity index 96%
rename from metadata/md5-cache/kde-plasma/kscreenlocker-5.20.3
rename to metadata/md5-cache/kde-plasma/kscreenlocker-5.20.4
index 80f0622e2848..4e2d78a6974f 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.20.3
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.20.4
@@ -7,10 +7,10 @@ HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=+pam test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.20.3:5
+PDEPEND=>=kde-plasma/kde-cli-tools-5.20.4:5
 RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/kscreenlocker-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/kscreenlocker-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	226d8d2ff588bdfd7d188512dbdb189d	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c28665f45b639d1c1707fe1fbac42bd8
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.20.3 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.20.4
similarity index 96%
rename from metadata/md5-cache/kde-plasma/ksshaskpass-5.20.3
rename to metadata/md5-cache/kde-plasma/ksshaskpass-5.20.4
index 9451718bd6a7..3576544ed49a 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.20.3
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.20.4
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/ksshaskpass-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/ksshaskpass-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3131492101c401008ad019563a3b7d80
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.20.3 b/metadata/md5-cache/kde-plasma/ksysguard-5.20.4
similarity index 93%
rename from metadata/md5-cache/kde-plasma/ksysguard-5.20.3
rename to metadata/md5-cache/kde-plasma/ksysguard-5.20.4
index 85aa9b53d436..ac879079768d 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.20.3
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.20.4
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kinit-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/libksysguard-5.20.3:5 lm-sensors? ( sys-apps/lm-sensors:= ) network? ( dev-libs/libnl:3 net-libs/libpcap sys-libs/libcap ) networkmanager? ( >=kde-frameworks/networkmanager-qt-5.74.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kinit-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/libksysguard-5.20.4:5 lm-sensors? ( sys-apps/lm-sensors:= ) network? ( dev-libs/libnl:3 net-libs/libpcap sys-libs/libcap ) networkmanager? ( >=kde-frameworks/networkmanager-qt-5.74.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
 DESCRIPTION=Network-enabled task manager and system monitor
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=lm-sensors +network networkmanager debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kinit-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/libksysguard-5.20.3:5 lm-sensors? ( sys-apps/lm-sensors:= ) network? ( dev-libs/libnl:3 net-libs/libpcap sys-libs/libcap ) networkmanager? ( >=kde-frameworks/networkmanager-qt-5.74.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kinit-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/libksysguard-5.20.4:5 lm-sensors? ( sys-apps/lm-sensors:= ) network? ( dev-libs/libnl:3 net-libs/libpcap sys-libs/libcap ) networkmanager? ( >=kde-frameworks/networkmanager-qt-5.74.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/ksysguard-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/ksysguard-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8dc913d6fa00279775163375799b4c6e
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.20.3 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.20.4
similarity index 95%
rename from metadata/md5-cache/kde-plasma/kwallet-pam-5.20.3
rename to metadata/md5-cache/kde-plasma/kwallet-pam-5.20.4
index 5eea10efa81e..3539b84afaf9 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.20.3
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.20.4
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.74.0:5 sys-libs/pam net-misc/socat || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/kwallet-pam-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/kwallet-pam-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b198a638f9f3ca4d0a8057f62f60b7de
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.20.3 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.20.4
similarity index 95%
rename from metadata/md5-cache/kde-plasma/kwayland-integration-5.20.3
rename to metadata/md5-cache/kde-plasma/kwayland-integration-5.20.4
index 6bc2dadae237..d33529599b5d 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.20.3
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.20.4
@@ -10,6 +10,6 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/kwayland-integration-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/kwayland-integration-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c06628ee8b9a1ea7e390f771eeae063
diff --git a/metadata/md5-cache/kde-plasma/kwayland-server-5.20.3 b/metadata/md5-cache/kde-plasma/kwayland-server-5.20.4
similarity index 96%
rename from metadata/md5-cache/kde-plasma/kwayland-server-5.20.3
rename to metadata/md5-cache/kde-plasma/kwayland-server-5.20.4
index 53eb28d77541..8f4ae5abc551 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-server-5.20.3
+++ b/metadata/md5-cache/kde-plasma/kwayland-server-5.20.4
@@ -10,6 +10,6 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/wayland-1.18.0 >=dev-qt/qtconcurrent-5.15.1:5 >=dev-qt/qtgui-5.15.1:5[egl] >=dev-qt/qtwayland-5.15.1:5 >=kde-frameworks/kwayland-5.74.0:5 media-libs/mesa[egl] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/kwayland-server-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/kwayland-server-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff5dcbc9489099fc2de508e234e79439
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.20.3 b/metadata/md5-cache/kde-plasma/kwin-5.20.4
similarity index 93%
rename from metadata/md5-cache/kde-plasma/kwin-5.20.3
rename to metadata/md5-cache/kde-plasma/kwin-5.20.4
index 620964bc4b31..fb1d3263d9c2 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.20.3
+++ b/metadata/md5-cache/kde-plasma/kwin-5.20.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5=[gles2-only=] >=dev-qt/qtscript-5.15.1:5 >=dev-qt/qtsensors-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5= >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5= >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5[X] >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-plasma/breeze-5.20.3:5 >=kde-plasma/kdecoration-5.20.3:5 >=kde-plasma/kscreenlocker-5.20.3:5 >=kde-plasma/kwayland-server-5.20.3:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/designer-5.15.1:5 >=dev-qt/qtconcurrent-5.15.1:5 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5=[gles2-only=] >=dev-qt/qtscript-5.15.1:5 >=dev-qt/qtsensors-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5= >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5= >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5[X] >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-plasma/breeze-5.20.4:5 >=kde-plasma/kdecoration-5.20.4:5 >=kde-plasma/kscreenlocker-5.20.4:5 >=kde-plasma/kwayland-server-5.20.4:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/designer-5.15.1:5 >=dev-qt/qtconcurrent-5.15.1:5 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=accessibility caps gles2-only multimedia screencast test debug +handbook test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+
-PDEPEND=>=kde-plasma/kde-cli-tools-5.20.3:5
-RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5=[gles2-only=] >=dev-qt/qtscript-5.15.1:5 >=dev-qt/qtsensors-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5= >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5= >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5[X] >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-plasma/breeze-5.20.3:5 >=kde-plasma/kdecoration-5.20.3:5 >=kde-plasma/kscreenlocker-5.20.3:5 >=kde-plasma/kwayland-server-5.20.3:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=dev-qt/qtvirtualkeyboard-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5[qml] multimedia? ( >=dev-qt/qtmultimedia-5.15.1:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+PDEPEND=>=kde-plasma/kde-cli-tools-5.20.4:5
+RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5=[gles2-only=] >=dev-qt/qtscript-5.15.1:5 >=dev-qt/qtsensors-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5= >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5= >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5[X] >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-plasma/breeze-5.20.4:5 >=kde-plasma/kdecoration-5.20.4:5 >=kde-plasma/kscreenlocker-5.20.4:5 >=kde-plasma/kwayland-server-5.20.4:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=dev-qt/qtvirtualkeyboard-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5[qml] multimedia? ( >=dev-qt/qtmultimedia-5.15.1:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/kwin-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/kwin-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=57a48b6560bd7d4514385e25c29c6b29
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.20.3 b/metadata/md5-cache/kde-plasma/kwrited-5.20.4
similarity index 96%
rename from metadata/md5-cache/kde-plasma/kwrited-5.20.3
rename to metadata/md5-cache/kde-plasma/kwrited-5.20.4
index a878e9744c03..c7b1236e175a 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.20.3
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.20.4
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kpty-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/kwrited-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/kwrited-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ffae60a81c46202742281f04a85798f7
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.20.3 b/metadata/md5-cache/kde-plasma/libkscreen-5.20.4
similarity index 96%
rename from metadata/md5-cache/kde-plasma/libkscreen-5.20.3
rename to metadata/md5-cache/kde-plasma/libkscreen-5.20.4
index 95842c36395c..7ca26d8dceab 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.20.3
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.20.4
@@ -10,6 +10,6 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 x11-libs/libxcb || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/7
-SRC_URI=mirror://kde/stable/plasma/5.20.3/libkscreen-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/libkscreen-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=55b57fad6a5a95176133f8b06d6067bb
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.20.3 b/metadata/md5-cache/kde-plasma/libksysguard-5.20.4
similarity index 97%
rename from metadata/md5-cache/kde-plasma/libksysguard-5.20.3
rename to metadata/md5-cache/kde-plasma/libksysguard-5.20.4
index f69a8df6c83b..afd88858630d 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.20.3
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.20.4
@@ -10,6 +10,6 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.1:5 >=dev-qt/qtwebengine-5.15.1:5 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 x11-libs/libXres ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/9
-SRC_URI=mirror://kde/stable/plasma/5.20.3/libksysguard-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/libksysguard-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=81f9898143a0dd38b315b71de4a348e5
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.20.3 b/metadata/md5-cache/kde-plasma/libkworkspace-5.20.4
similarity index 87%
rename from metadata/md5-cache/kde-plasma/libkworkspace-5.20.3
rename to metadata/md5-cache/kde-plasma/libkworkspace-5.20.4
index ac615b9d4908..d583fac9218b 100644
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.20.3
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.20.4
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kinit-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-plasma/kscreenlocker-5.20.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-plasma/kwin-5.20.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kinit-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-plasma/kscreenlocker-5.20.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-plasma/kwin-5.20.4:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=Workspace library to interact with the Plasma session manager
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kinit-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-plasma/kscreenlocker-5.20.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau !<kde-plasma/plasma-workspace-5.14.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kinit-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-plasma/kscreenlocker-5.20.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau !<kde-plasma/plasma-workspace-5.14.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/plasma-workspace-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/plasma-workspace-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=19994d38f7ba4539dda890cb5adbc92a
diff --git a/metadata/md5-cache/kde-plasma/milou-5.20.3 b/metadata/md5-cache/kde-plasma/milou-5.20.4
similarity index 97%
rename from metadata/md5-cache/kde-plasma/milou-5.20.3
rename to metadata/md5-cache/kde-plasma/milou-5.20.4
index 386e02100e91..cc344b3bf6e3 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.20.3
+++ b/metadata/md5-cache/kde-plasma/milou-5.20.4
@@ -10,6 +10,6 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/milou-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/milou-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0751caa043171457a4a042e6e07512d4
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.20.3 b/metadata/md5-cache/kde-plasma/oxygen-5.20.4
similarity index 91%
rename from metadata/md5-cache/kde-plasma/oxygen-5.20.3
rename to metadata/md5-cache/kde-plasma/oxygen-5.20.4
index 1f3e348a8c5a..366baaa5289b 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.20.3
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.20.4
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/frameworkintegration-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-plasma/kdecoration-5.20.3:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.74.0:5 ) >=kde-frameworks/kservice-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/frameworkintegration-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-plasma/kdecoration-5.20.4:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.74.0:5 ) >=kde-frameworks/kservice-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
 DESCRIPTION=Oxygen visual style for the Plasma desktop
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/oxygen
 IUSE=wayland debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.20.3:5
-RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/frameworkintegration-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-plasma/kdecoration-5.20.3:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.74.0:5 ) !<kde-plasma/plasma-desktop-5.16.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+PDEPEND=>=kde-plasma/kde-cli-tools-5.20.4:5
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/frameworkintegration-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-plasma/kdecoration-5.20.4:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.74.0:5 ) !<kde-plasma/plasma-desktop-5.16.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/oxygen-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/oxygen-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=93aa04208e47c15b83c999364e074195
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.20.3 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.20.4
similarity index 96%
rename from metadata/md5-cache/kde-plasma/plasma-browser-integration-5.20.3
rename to metadata/md5-cache/kde-plasma/plasma-browser-integration-5.20.4
index 544edfa2307e..b62c47ad7767 100644
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.20.3
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.20.4
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kfilemetadata-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/purpose-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/plasma-browser-integration-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/plasma-browser-integration-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a61dab24ba3bd363dbc255f095f5cb50
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.20.3 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.20.4
similarity index 87%
rename from metadata/md5-cache/kde-plasma/plasma-desktop-5.20.3
rename to metadata/md5-cache/kde-plasma/plasma-desktop-5.20.4
index 6765dea41d70..f333d91ee313 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.20.3
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.20.4
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/attica-5.74.0:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kactivities-stats-5.74.0:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kbookmarks-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kded-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 >=kde-plasma/kwin-5.20.3:5 >=kde-plasma/libksysguard-5.20.3:5 >=kde-plasma/libkworkspace-5.20.3:5 >=kde-plasma/plasma-workspace-5.20.3:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.74.0:5 ) dev-libs/boost x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtconcurrent-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/attica-5.74.0:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kactivities-stats-5.74.0:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kbookmarks-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kded-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 >=kde-plasma/kwin-5.20.4:5 >=kde-plasma/libksysguard-5.20.4:5 >=kde-plasma/libkworkspace-5.20.4:5 >=kde-plasma/plasma-workspace-5.20.4:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.74.0:5 ) dev-libs/boost x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=KDE Plasma desktop
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=emoji ibus +kaccounts +policykit scim +semantic-desktop test debug +handbook test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/attica-5.74.0:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kactivities-stats-5.74.0:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kbookmarks-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kded-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 >=kde-plasma/kwin-5.20.3:5 >=kde-plasma/libksysguard-5.20.3:5 >=kde-plasma/libkworkspace-5.20.3:5 >=kde-plasma/plasma-workspace-5.20.3:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.74.0:5 ) !<kde-plasma/kdeplasma-addons-5.15.80 !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-frameworks/qqc2-desktop-style-5.74.0:5 >=kde-plasma/breeze-5.20.3:5 >=kde-plasma/kde-cli-tools-5.20.3:5 >=kde-plasma/oxygen-5.20.3:5 sys-apps/util-linux x11-apps/setxkbmap kaccounts? ( net-libs/signon-oauth2 ) policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtconcurrent-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/attica-5.74.0:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kactivities-stats-5.74.0:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kbookmarks-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kded-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 >=kde-plasma/kwin-5.20.4:5 >=kde-plasma/libksysguard-5.20.4:5 >=kde-plasma/libkworkspace-5.20.4:5 >=kde-plasma/plasma-workspace-5.20.4:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.74.0:5 ) !<kde-plasma/kdeplasma-addons-5.15.80 !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-frameworks/qqc2-desktop-style-5.74.0:5 >=kde-plasma/kde-cli-tools-5.20.4:5 >=kde-plasma/oxygen-5.20.4:5 sys-apps/util-linux x11-apps/setxkbmap kaccounts? ( net-libs/signon-oauth2 ) policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/plasma-desktop-5.20.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-0.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/plasma-desktop-5.20.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-0.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eaf7e3aec190267be45f5c287c2617f6
+_md5_=29b981ec6241123e35dc0f53662ad105
diff --git a/metadata/md5-cache/kde-plasma/plasma-disks-5.20.3 b/metadata/md5-cache/kde-plasma/plasma-disks-5.20.4
similarity index 97%
rename from metadata/md5-cache/kde-plasma/plasma-disks-5.20.3
rename to metadata/md5-cache/kde-plasma/plasma-disks-5.20.4
index 4ad171af5607..d0a09425791d 100644
--- a/metadata/md5-cache/kde-plasma/plasma-disks-5.20.3
+++ b/metadata/md5-cache/kde-plasma/plasma-disks-5.20.4
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=|| ( GPL-3 GPL-2 )
 RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 sys-apps/smartmontools kde-plasma/kinfocenter:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/plasma-disks-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/plasma-disks-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0cee289510b932855d42af4e78b80803
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.20.3 b/metadata/md5-cache/kde-plasma/plasma-integration-5.20.4
similarity index 92%
rename from metadata/md5-cache/kde-plasma/plasma-integration-5.20.3
rename to metadata/md5-cache/kde-plasma/plasma-integration-5.20.4
index 3a56823cd108..ff68ef1cd8db 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.20.3
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.20.4
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/breeze-5.20.3:5 x11-libs/libXcursor x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/breeze-5.20.4:5 x11-libs/libXcursor x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
 DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=test debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/breeze-5.20.3:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/breeze-5.20.4:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/plasma-integration-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/plasma-integration-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8a0fbf3ce43c31481bd3de9333ff5a15
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.20.3 b/metadata/md5-cache/kde-plasma/plasma-meta-5.20.3
deleted file mode 100644
index 985054feaa04..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.20.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Merge this to pull in all Plasma 5 packages
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=bluetooth +browser-integration crypt +desktop-portal discover +display-manager +elogind grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk +smart systemd thunderbolt +wallpapers
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-plasma/breeze-5.20.3:5 >=kde-plasma/drkonqi-5.20.3:5 >=kde-plasma/kactivitymanagerd-5.20.3:5 >=kde-plasma/kde-cli-tools-5.20.3:5 >=kde-plasma/kdecoration-5.20.3:5 >=kde-plasma/kdeplasma-addons-5.20.3:5 >=kde-plasma/kgamma-5.20.3:5 >=kde-plasma/khotkeys-5.20.3:5 >=kde-plasma/kinfocenter-5.20.3:5 >=kde-plasma/kmenuedit-5.20.3:5 >=kde-plasma/kscreen-5.20.3:5 >=kde-plasma/kscreenlocker-5.20.3:5 >=kde-plasma/ksshaskpass-5.20.3:5 >=kde-plasma/ksysguard-5.20.3:5 >=kde-plasma/kwayland-integration-5.20.3:5 >=kde-plasma/kwayland-server-5.20.3:5 >=kde-plasma/kwin-5.20.3:5 >=kde-plasma/kwrited-5.20.3:5 >=kde-plasma/libkscreen-5.20.3:5 >=kde-plasma/libksysguard-5.20.3:5 >=kde-plasma/milou-5.20.3:5 >=kde-plasma/oxygen-5.20.3:5 >=kde-plasma/plasma-desktop-5.20.3:5 >=kde-plasma/plasma-integration-5.20.3:5 >=kde-plasma/plasma-workspace-5.20.3:5 >=kde-plasma/polkit-kde-agent-5.20.3:5 >=kde-plasma/powerdevil-5.20.3:5 >=kde-plasma/systemsettings-5.20.3:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.20.3:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.20.3:5 ) crypt? ( >=kde-plasma/plasma-vault-5.20.3:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.20.3:5 ) discover? ( >=kde-plasma/discover-5.20.3:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.20.3:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.20.3:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.20.3:5 >=kde-plasma/kde-gtk-config-5.20.3:5 x11-misc/appmenu-gtk-module ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.20.3:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.20.3:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.20.3:5 net-misc/networkmanager[elogind?,systemd?] qrcode? ( kde-frameworks/prison[qml] ) ) plymouth? ( >=kde-plasma/breeze-plymouth-5.20.3:5 >=kde-plasma/plymouth-kcm-5.20.3:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.20.3:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.20.3:5 ) smart? ( >=kde-plasma/plasma-disks-5.20.3:5 ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.20.3:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.20.3:5 )
-REQUIRED_USE=^^ ( elogind systemd )
-SLOT=5
-_md5_=ba1225c6d80e3e33799e9afad30ed5f1
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.20.4 b/metadata/md5-cache/kde-plasma/plasma-meta-5.20.4
new file mode 100644
index 000000000000..05fa11ceaab0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.20.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Merge this to pull in all Plasma 5 packages
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=bluetooth +browser-integration crypt +desktop-portal discover +display-manager +elogind grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk +smart systemd thunderbolt +wallpapers
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-plasma/breeze-5.20.4:5 >=kde-plasma/drkonqi-5.20.4:5 >=kde-plasma/kactivitymanagerd-5.20.4:5 >=kde-plasma/kde-cli-tools-5.20.4:5 >=kde-plasma/kdecoration-5.20.4:5 >=kde-plasma/kdeplasma-addons-5.20.4:5 >=kde-plasma/kgamma-5.20.4:5 >=kde-plasma/khotkeys-5.20.4:5 >=kde-plasma/kinfocenter-5.20.4:5 >=kde-plasma/kmenuedit-5.20.4:5 >=kde-plasma/kscreen-5.20.4:5 >=kde-plasma/kscreenlocker-5.20.4:5 >=kde-plasma/ksshaskpass-5.20.4:5 >=kde-plasma/ksysguard-5.20.4:5 >=kde-plasma/kwayland-integration-5.20.4:5 >=kde-plasma/kwayland-server-5.20.4:5 >=kde-plasma/kwin-5.20.4:5 >=kde-plasma/kwrited-5.20.4:5 >=kde-plasma/libkscreen-5.20.4:5 >=kde-plasma/libksysguard-5.20.4:5 >=kde-plasma/milou-5.20.4:5 >=kde-plasma/oxygen-5.20.4:5 >=kde-plasma/plasma-desktop-5.20.4:5 >=kde-plasma/plasma-integration-5.20.4:5 >=kde-plasma/plasma-workspace-5.20.4:5 >=kde-plasma/polkit-kde-agent-5.20.4:5 >=kde-plasma/powerdevil-5.20.4:5 >=kde-plasma/systemsettings-5.20.4:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.20.4:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.20.4:5 ) crypt? ( >=kde-plasma/plasma-vault-5.20.4:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.20.4:5 ) discover? ( >=kde-plasma/discover-5.20.4:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.20.4:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.20.4:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.20.4:5 >=kde-plasma/kde-gtk-config-5.20.4:5 x11-misc/appmenu-gtk-module ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.20.4:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.20.4:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.20.4:5 net-misc/networkmanager[elogind?,systemd?] qrcode? ( kde-frameworks/prison[qml] ) ) plymouth? ( >=kde-plasma/breeze-plymouth-5.20.4:5 >=kde-plasma/plymouth-kcm-5.20.4:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.20.4:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.20.4:5 ) smart? ( >=kde-plasma/plasma-disks-5.20.4:5 ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.20.4:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.20.4:5 )
+REQUIRED_USE=^^ ( elogind systemd )
+SLOT=5
+_md5_=ba1225c6d80e3e33799e9afad30ed5f1
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.20.3 b/metadata/md5-cache/kde-plasma/plasma-nm-5.20.4
similarity index 96%
rename from metadata/md5-cache/kde-plasma/plasma-nm-5.20.3
rename to metadata/md5-cache/kde-plasma/plasma-nm-5.20.4
index 7cccbc0d7c98..3d78dab81b9d 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.20.3
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.20.4
@@ -7,9 +7,9 @@ HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=modemmanager openconnect teamd debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/networkmanager-qt-5.74.0:5[teamd=] >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/modemmanager-qt-5.74.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.1:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-plasma/kde-cli-tools-5.20.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/networkmanager-qt-5.74.0:5[teamd=] >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/modemmanager-qt-5.74.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.1:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-plasma/kde-cli-tools-5.20.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/plasma-nm-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/plasma-nm-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ab82b7487a5d1489499efc1ff77d0f3b
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.20.3 b/metadata/md5-cache/kde-plasma/plasma-pa-5.20.4
similarity index 96%
rename from metadata/md5-cache/kde-plasma/plasma-pa-5.20.3
rename to metadata/md5-cache/kde-plasma/plasma-pa-5.20.4
index 42dc11e6e150..17387042b6c6 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.20.3
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.20.4
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 media-libs/libcanberra media-sound/pulseaudio >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 x11-themes/sound-theme-freedesktop || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/plasma-pa-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/plasma-pa-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f309bdcbfbe15b6feed9187ac0a87f15
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.20.3 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.20.4
similarity index 97%
rename from metadata/md5-cache/kde-plasma/plasma-sdk-5.20.3
rename to metadata/md5-cache/kde-plasma/plasma-sdk-5.20.4
index adafa943776a..e665ebfee040 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.20.3
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.20.4
@@ -10,6 +10,6 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktexteditor-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/plasma-sdk-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/plasma-sdk-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=df93b65227636392391f4174f4979aa7
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.20.3 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.20.4
similarity index 96%
rename from metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.20.3
rename to metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.20.4
index 8ee0c20f6ad1..3000ba82f557 100644
--- a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.20.3
+++ b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.20.4
@@ -10,6 +10,6 @@ LICENSE=|| ( GPL-2 GPL-3+ )
 RDEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 sys-apps/bolt || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/plasma-thunderbolt-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/plasma-thunderbolt-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e11040e239aae27e4a652ac070151225
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.20.3 b/metadata/md5-cache/kde-plasma/plasma-vault-5.20.4
similarity index 92%
rename from metadata/md5-cache/kde-plasma/plasma-vault-5.20.3
rename to metadata/md5-cache/kde-plasma/plasma-vault-5.20.4
index 0168bd3597cc..149b519774fa 100644
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.20.3
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.20.4
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-plasma/libksysguard-5.20.3:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.74.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-plasma/libksysguard-5.20.4:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.74.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
 DESCRIPTION=Plasma applet and services for creating encrypted vaults
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
 IUSE=networkmanager debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-3
-RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-plasma/libksysguard-5.20.3:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.74.0:5 ) >=dev-qt/qtquickcontrols2-5.15.1:5 || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-plasma/libksysguard-5.20.4:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.74.0:5 ) >=dev-qt/qtquickcontrols2-5.15.1:5 || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/plasma-vault-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/plasma-vault-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2c737b050b9ea69f9e382d0e701d419c
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.20.3 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.20.4
similarity index 61%
rename from metadata/md5-cache/kde-plasma/plasma-workspace-5.20.3
rename to metadata/md5-cache/kde-plasma/plasma-workspace-5.20.4
index 59e0570b5b18..db21505a39ba 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.20.3
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.20.4
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5=[jpeg] >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwayland-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kactivities-stats-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kbookmarks-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kded-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kpeople-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktexteditor-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/prison-5.74.0:5[qml] >=kde-frameworks/solid-5.74.0:5 >=kde-plasma/kscreenlocker-5.20.3:5 >=kde-plasma/kwin-5.20.3:5 >=kde-plasma/libkscreen-5.20.3:5 >=kde-plasma/libksysguard-5.20.3:5 >=kde-plasma/libkworkspace-5.20.3:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.74.0:5 ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.74.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) screencast? ( >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.74.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-qt/qtconcurrent-5.15.1:5 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5=[jpeg] >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwayland-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kactivities-stats-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kbookmarks-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kded-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kpeople-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktexteditor-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/prison-5.74.0:5[qml] >=kde-frameworks/solid-5.74.0:5 >=kde-plasma/breeze-5.20.4:5 >=kde-plasma/kscreenlocker-5.20.4:5 >=kde-plasma/kwin-5.20.4:5 >=kde-plasma/libkscreen-5.20.4:5 >=kde-plasma/libksysguard-5.20.4:5 >=kde-plasma/libkworkspace-5.20.4:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.74.0:5 ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.74.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) screencast? ( >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.74.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-qt/qtconcurrent-5.15.1:5 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=KDE Plasma workspace
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=appstream +calendar +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry test debug +handbook test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.20.3:5
-RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5=[jpeg] >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwayland-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kactivities-stats-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kbookmarks-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kded-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kpeople-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktexteditor-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/prison-5.74.0:5[qml] >=kde-frameworks/solid-5.74.0:5 >=kde-plasma/kscreenlocker-5.20.3:5 >=kde-plasma/kwin-5.20.3:5 >=kde-plasma/libkscreen-5.20.3:5 >=kde-plasma/libksysguard-5.20.3:5 >=kde-plasma/libkworkspace-5.20.3:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.74.0:5 ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.74.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) screencast? ( >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.74.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.15.1:5 >=dev-qt/qtgraphicaleffects-5.15.1:5 >=dev-qt/qtpaths-5.15.1:5 >=dev-qt/qtquickcontrols-5.15.1:5[widgets] >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-apps/kio-extras-19.04.3:5 >=kde-frameworks/kdesu-5.74.0:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-frameworks/kquickcharts-5.74.0:5 >=kde-plasma/ksysguard-5.20.3:5 >=kde-plasma/milou-5.20.3:5 >=kde-plasma/plasma-integration-5.20.3:5 x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/plasma-desktop-5.19.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+PDEPEND=>=kde-plasma/kde-cli-tools-5.20.4:5
+RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5=[jpeg] >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwayland-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kactivities-stats-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kbookmarks-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kded-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kpeople-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktexteditor-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/prison-5.74.0:5[qml] >=kde-frameworks/solid-5.74.0:5 >=kde-plasma/breeze-5.20.4:5 >=kde-plasma/kscreenlocker-5.20.4:5 >=kde-plasma/kwin-5.20.4:5 >=kde-plasma/libkscreen-5.20.4:5 >=kde-plasma/libksysguard-5.20.4:5 >=kde-plasma/libkworkspace-5.20.4:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.74.0:5 ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.74.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) screencast? ( >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.74.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.15.1:5 >=dev-qt/qtgraphicaleffects-5.15.1:5 >=dev-qt/qtpaths-5.15.1:5 >=dev-qt/qtquickcontrols-5.15.1:5[widgets] >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-apps/kio-extras-19.04.3:5 >=kde-frameworks/kdesu-5.74.0:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-frameworks/kquickcharts-5.74.0:5 >=kde-plasma/ksysguard-5.20.4:5 >=kde-plasma/milou-5.20.4:5 >=kde-plasma/plasma-integration-5.20.4:5 x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/plasma-desktop-5.19.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=gps? ( geolocation )
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/plasma-workspace-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/plasma-workspace-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c3cb960c259f274fb600e53c2ea119eb
+_md5_=cb684164f25f35748aa97cf44f493d5f
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.20.3 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.20.4
similarity index 91%
rename from metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.20.3
rename to metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.20.4
index 36993602b92d..1ac8fac1ee0e 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.20.3
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.20.4
@@ -6,6 +6,6 @@ HOMEPAGE=https://kde.org/plasma-desktop
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/plasma-workspace-wallpapers-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/plasma-workspace-wallpapers-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3998fe2f2d6ed4d18dbaeb7417bdffc2
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.20.3 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.20.4
similarity index 94%
rename from metadata/md5-cache/kde-plasma/plymouth-kcm-5.20.3
rename to metadata/md5-cache/kde-plasma/plymouth-kcm-5.20.4
index 70f9159c7a27..9ff3a88043d5 100644
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.20.3
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.20.4
@@ -7,8 +7,8 @@ HOMEPAGE=https://invent.kde.org/plasma/plymouth-kcm
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.20.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.20.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/plymouth-kcm-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/plymouth-kcm-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=de747b54dd0e344015d6249947050ef4
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.20.3 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.20.4
similarity index 96%
rename from metadata/md5-cache/kde-plasma/polkit-kde-agent-5.20.3
rename to metadata/md5-cache/kde-plasma/polkit-kde-agent-5.20.4
index 6c8334930fbf..05a46920667e 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.20.3
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.20.4
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=sys-auth/polkit-qt-0.113.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/polkit-kde-agent-1-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/polkit-kde-agent-1-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ecc6a01ac0bf11df9ba6963077726548
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.20.3 b/metadata/md5-cache/kde-plasma/powerdevil-5.20.4
similarity index 92%
rename from metadata/md5-cache/kde-plasma/powerdevil-5.20.3
rename to metadata/md5-cache/kde-plasma/powerdevil-5.20.4
index f2517a30b6f2..8bcd5ca4f11c 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.20.3
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.20.4
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5[policykit] >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 >=kde-plasma/libkscreen-5.20.3:5 >=kde-plasma/libkworkspace-5.20.3:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.74.0:5 >=kde-frameworks/networkmanager-qt-5.74.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5[policykit] >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 >=kde-plasma/libkscreen-5.20.4:5 >=kde-plasma/libkworkspace-5.20.4:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.74.0:5 >=kde-frameworks/networkmanager-qt-5.74.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
 DESCRIPTION=Power management for KDE Plasma Shell
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/powerdevil
 IUSE=brightness-control caps +wireless debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5[policykit] >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 >=kde-plasma/libkscreen-5.20.3:5 >=kde-plasma/libkworkspace-5.20.3:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.74.0:5 >=kde-frameworks/networkmanager-qt-5.74.0:5 ) >=kde-plasma/kde-cli-tools-5.20.3:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5[policykit] >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 >=kde-plasma/libkscreen-5.20.4:5 >=kde-plasma/libkworkspace-5.20.4:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.74.0:5 >=kde-frameworks/networkmanager-qt-5.74.0:5 ) >=kde-plasma/kde-cli-tools-5.20.4:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/powerdevil-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/powerdevil-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=958cc7067b7f69dea00fef5bd172b399
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.20.3 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.20.4
similarity index 94%
rename from metadata/md5-cache/kde-plasma/sddm-kcm-5.20.3
rename to metadata/md5-cache/kde-plasma/sddm-kcm-5.20.4
index 2d79aed8fd3b..bfb3520abd1b 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.20.3
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.20.4
@@ -7,8 +7,8 @@ HOMEPAGE=https://invent.kde.org/plasma/sddm-kcm
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-plasma/kde-cli-tools-5.20.3:5 x11-misc/sddm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-plasma/kde-cli-tools-5.20.4:5 x11-misc/sddm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/sddm-kcm-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/sddm-kcm-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3f05ff0ada1fbbb57f0ad46a0fc4dad3
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.20.3 b/metadata/md5-cache/kde-plasma/systemsettings-5.20.4
similarity index 94%
rename from metadata/md5-cache/kde-plasma/systemsettings-5.20.3
rename to metadata/md5-cache/kde-plasma/systemsettings-5.20.4
index d26872f4b336..197133719751 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.20.3
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.20.4
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kactivities-stats-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/libkworkspace-5.20.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kactivities-stats-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/libkworkspace-5.20.4:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
 DESCRIPTION=Control Center to configure KDE Plasma desktop
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kactivities-stats-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/libkworkspace-5.20.3:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kactivities-stats-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/libkworkspace-5.20.4:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/systemsettings-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/systemsettings-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=11577e05f8e8a22aff395510c76ef190
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.20.3 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.20.4
similarity index 96%
rename from metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.20.3
rename to metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.20.4
index 3713e893b237..48441a470bee 100644
--- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.20.3
+++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.20.4
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5[cups] >=dev-qt/qtwayland-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 sys-apps/xdg-desktop-portal || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/xdg-desktop-portal-kde-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/xdg-desktop-portal-kde-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=44f074659af71012cc9cd148fea115b3
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.20.3 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.20.4
similarity index 95%
rename from metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.20.3
rename to metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.20.4
index 912db36e6e97..a20e12abcbff 100644
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.20.3
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.20.4
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtcore-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/extra-cmake-modules-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !<kde-plasma/plasma-workspace-5.14.2:5 !kde-plasma/xembed-sni-proxy:0
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.20.3/plasma-workspace-5.20.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.20.4/plasma-workspace-5.20.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e859ceaaf0d73f3a10d0a761681dfa19
diff --git a/metadata/md5-cache/lxde-base/Manifest.gz b/metadata/md5-cache/lxde-base/Manifest.gz
index cbb238254d9a..8da198eff889 100644
Binary files a/metadata/md5-cache/lxde-base/Manifest.gz and b/metadata/md5-cache/lxde-base/Manifest.gz differ
diff --git a/metadata/md5-cache/lxde-base/lxdm-0.5.3-r2 b/metadata/md5-cache/lxde-base/lxdm-0.5.3-r2
index 76f211f10a6f..91af736f65b4 100644
--- a/metadata/md5-cache/lxde-base/lxdm-0.5.3-r2
+++ b/metadata/md5-cache/lxde-base/lxdm-0.5.3-r2
@@ -5,11 +5,11 @@ DESCRIPTION=LXDE Display Manager
 EAPI=7
 HOMEPAGE=https://wiki.lxde.org/en/LXDM
 IUSE=debug elogind +gtk3 nls pam systemd
-KEYWORDS=amd64 ~arm ~ppc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/libxcb gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) pam? ( sys-libs/pam ) elogind? ( sys-auth/elogind[pam] ) systemd? ( sys-apps/systemd[pam] )
 REQUIRED_USE=?? ( elogind systemd ) elogind? ( pam ) systemd? ( pam )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxdm-0.5.3.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8949ab0e851df6a7ab01428412be6156
+_md5_=a3b26c288d0bd5142c47512d1fc23a71
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 4bce67742eba..1653795a0600 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/alot-0.9 b/metadata/md5-cache/mail-client/alot-0.9
index fabf93155152..d894bf7520fe 100644
--- a/metadata/md5-cache/mail-client/alot-0.9
+++ b/metadata/md5-cache/mail-client/alot-0.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pazz/alot/archive/0.9.tar.gz -> alot-0.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cd6413ef8990ebf2a7d558cfa3f684f6
diff --git a/metadata/md5-cache/mail-client/alot-0.9.1 b/metadata/md5-cache/mail-client/alot-0.9.1
index 9b488ae254cb..13c6b26176c4 100644
--- a/metadata/md5-cache/mail-client/alot-0.9.1
+++ b/metadata/md5-cache/mail-client/alot-0.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pazz/alot/archive/0.9.1.tar.gz -> alot-0.9.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9d33846d5c852ee5369a7424a81ec45b
diff --git a/metadata/md5-cache/mail-client/alot-9999 b/metadata/md5-cache/mail-client/alot-9999
index 773bab367e4d..762331be73c2 100644
--- a/metadata/md5-cache/mail-client/alot-9999
+++ b/metadata/md5-cache/mail-client/alot-9999
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/gpgme[python,python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=24eb1523ac643d953af6780448fd084f
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.17.8 b/metadata/md5-cache/mail-client/claws-mail-3.17.8
index 2b09cffa2518..b635aec70297 100644
--- a/metadata/md5-cache/mail-client/claws-mail-3.17.8
+++ b/metadata/md5-cache/mail-client/claws-mail-3.17.8
@@ -5,11 +5,11 @@ DESCRIPTION=An email client (and news reader) based on GTK+
 EAPI=7
 HOMEPAGE=https://www.claws-mail.org/
 IUSE=+appindicator archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:= x11-libs/cairo x11-libs/gdk-pixbuf:2[jpeg] >=x11-libs/gtk+-2.24:2 x11-libs/libX11 x11-libs/pango archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 sys-apps/dbus ) gdata? ( >=dev-libs/libgdata-0.17.2 ) dillo? ( www-client/dillo ) gnutls? ( >=net-libs/gnutls-3.0 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) litehtml? ( >=dev-libs/glib-2.36:2 >=dev-libs/gumbo-0.10 net-misc/curl media-libs/fontconfig ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 appindicator? ( dev-libs/libindicate:3[gtk] ) libcanberra? ( media-libs/libcanberra[gtk] ) libnotify? ( x11-libs/libnotify ) ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-2.0.0:2= ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) app-misc/mime-types x11-misc/shared-mime-info clamav? ( app-antivirus/clamav ) networkmanager? ( net-misc/networkmanager ) pdf? ( app-text/ghostscript-gpl ) perl? ( dev-lang/perl:= ) rss? ( dev-libs/libxml2 net-misc/curl )
 REQUIRED_USE=appindicator? ( notification ) libcanberra? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) smime? ( pgp )
 SLOT=0
 SRC_URI=https://www.claws-mail.org/download.php?file=releases/claws-mail-3.17.8.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bd750e3a6dd08d60584f1cb2a54ceed6
+_md5_=5d1a55c1c2a5bd3a2adbf1e7017c254b
diff --git a/metadata/md5-cache/mail-client/neomutt-20201127 b/metadata/md5-cache/mail-client/neomutt-20201127
index 249d7e7de301..971d875ec267 100644
--- a/metadata/md5-cache/mail-client/neomutt-20201127
+++ b/metadata/md5-cache/mail-client/neomutt-20201127
@@ -4,11 +4,11 @@ DESCRIPTION=A small but very powerful text-based mail client
 EAPI=7
 HOMEPAGE=https://neomutt.org/
 IUSE=berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic ssl tokyocabinet test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2u:0= ) libressl? ( dev-libs/libressl:= ) ) selinux? ( sec-policy/selinux-mutt )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neomutt/neomutt/archive/20201127.tar.gz -> neomutt-20201127.tar.gz test? ( https://github.com/neomutt/neomutt-test-files/archive/8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz -> neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7ed05231fb6dffb9c6dd4ee5dcd66df9
+_md5_=dd292b434dea32a73b0e576897d0b135
diff --git a/metadata/md5-cache/mail-client/neomutt-20201127-r1 b/metadata/md5-cache/mail-client/neomutt-20201127-r1
new file mode 100644
index 000000000000..3faac0f24bd9
--- /dev/null
+++ b/metadata/md5-cache/mail-client/neomutt-20201127-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst test
+DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-1.13.1:= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2u:0= ) libressl? ( dev-libs/libressl:= ) ) dev-lang/tcl:= net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
+DESCRIPTION=A small but very powerful text-based mail client
+EAPI=7
+HOMEPAGE=https://neomutt.org/
+IUSE=berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic ssl tokyocabinet test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-1.13.1:= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2u:0= ) libressl? ( dev-libs/libressl:= ) ) selinux? ( sec-policy/selinux-mutt )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/neomutt/neomutt/archive/20201127.tar.gz -> neomutt-20201127.tar.gz test? ( https://github.com/neomutt/neomutt-test-files/archive/8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz -> neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0f6d08df95dc644d87bd652d6b877476
diff --git a/metadata/md5-cache/mail-client/neomutt-99999999 b/metadata/md5-cache/mail-client/neomutt-99999999
index 7c2f3935c469..9f5b479325ed 100644
--- a/metadata/md5-cache/mail-client/neomutt-99999999
+++ b/metadata/md5-cache/mail-client/neomutt-99999999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst test unpack
-DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2u:0= ) libressl? ( dev-libs/libressl:= ) ) dev-lang/tcl:= net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
+DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-1.13.1:= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2u:0= ) libressl? ( dev-libs/libressl:= ) ) dev-lang/tcl:= net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
 DESCRIPTION=A small but very powerful text-based mail client
 EAPI=7
 HOMEPAGE=https://neomutt.org/
 IUSE=berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic ssl tokyocabinet test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2u:0= ) libressl? ( dev-libs/libressl:= ) ) selinux? ( sec-policy/selinux-mutt )
+RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-1.13.1:= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2u:0= ) libressl? ( dev-libs/libressl:= ) ) selinux? ( sec-policy/selinux-mutt )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=test? ( https://github.com/neomutt/neomutt-test-files/archive/8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz -> neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7ed05231fb6dffb9c6dd4ee5dcd66df9
+_md5_=0f6d08df95dc644d87bd652d6b877476
diff --git a/metadata/md5-cache/mail-client/thunderbird-78.5.0 b/metadata/md5-cache/mail-client/thunderbird-78.5.1
similarity index 63%
rename from metadata/md5-cache/mail-client/thunderbird-78.5.0
rename to metadata/md5-cache/mail-client/thunderbird-78.5.1
index 53b4b9675cba..af05ea8c7413 100644
--- a/metadata/md5-cache/mail-client/thunderbird-78.5.0
+++ b/metadata/md5-cache/mail-client/thunderbird-78.5.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] dev-lang/python:3.7[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.19.0 virtual/pkgconfig >=virtual/rust-1.41.0 || ( ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 sys-devel/llvm:9 clang? ( =sys-devel/lld-9* pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] dev-lang/python:3.7[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.21.0 virtual/pkgconfig >=virtual/rust-1.41.0 || ( ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 sys-devel/llvm:9 clang? ( =sys-devel/lld-9* pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
 DEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Thunderbird Mail Client
@@ -9,6 +9,6 @@ KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla ) !<x11-plugins/enigmail-2.2
 SLOT=0/78
-SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/source/thunderbird-78.5.0.source.tar.xz -> thunderbird-78.5.0.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-07.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-07.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/af.xpi -> thunderbird-78.5.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ar.xpi -> thunderbird-78.5.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ast.xpi -> thunderbird-78.5.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/be.xpi -> thunderbird-78.5.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/bg.xpi -> thunderbird-78.5.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/br.xpi -> thunderbird-78.5.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ca.xpi -> thunderbird-78.5.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/cak.xpi -> thunderbird-78.5.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/cs.xpi -> thunderbird-78.5.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/cy.xpi -> thunderbird-78.5.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/da.xpi -> thunderbird-78.5.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/de.xpi -> thunderbird-78.5.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.5.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/el.xpi -> thunderbird-78.5.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.5.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.5.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.5.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.5.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/et.xpi -> thunderbird-78.5.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/eu.xpi -> thunderbird-78.5.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/fa.xpi -> thunderbird-78.5.0-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/fi.xpi -> thunderbird-78.5.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/fr.xpi -> thunderbird-78.5.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.5.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.5.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/gd.xpi -> thunderbird-78.5.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/gl.xpi -> thunderbird-78.5.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/he.xpi -> thunderbird-78.5.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/hr.xpi -> thunderbird-78.5.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.5.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/hu.xpi -> thunderbird-78.5.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.5.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/id.xpi -> thunderbird-78.5.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/is.xpi -> thunderbird-78.5.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/it.xpi -> thunderbird-78.5.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ja.xpi -> thunderbird-78.5.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ka.xpi -> thunderbird-78.5.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/kab.xpi -> thunderbird-78.5.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/kk.xpi -> thunderbird-78.5.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ko.xpi -> thunderbird-78.5.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/lt.xpi -> thunderbird-78.5.0-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ms.xpi -> thunderbird-78.5.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.5.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/nl.xpi -> thunderbird-78.5.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.5.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.5.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/pl.xpi -> thunderbird-78.5.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.5.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.5.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/rm.xpi -> thunderbird-78.5.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ro.xpi -> thunderbird-78.5.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ru.xpi -> thunderbird-78.5.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/si.xpi -> thunderbird-78.5.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/sk.xpi -> thunderbird-78.5.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/sl.xpi -> thunderbird-78.5.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/sq.xpi -> thunderbird-78.5.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/sr.xpi -> thunderbird-78.5.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.5.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/th.xpi -> thunderbird-78.5.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/tr.xpi -> thunderbird-78.5.0-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/uz.xpi -> thunderbird-78.5.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/vi.xpi -> thunderbird-78.5.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.5.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.5.0-zh-TW.xpi )
+SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/source/thunderbird-78.5.1.source.tar.xz -> thunderbird-78.5.1.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-07.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-07.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/af.xpi -> thunderbird-78.5.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ar.xpi -> thunderbird-78.5.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ast.xpi -> thunderbird-78.5.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/be.xpi -> thunderbird-78.5.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/bg.xpi -> thunderbird-78.5.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/br.xpi -> thunderbird-78.5.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ca.xpi -> thunderbird-78.5.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/cak.xpi -> thunderbird-78.5.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/cs.xpi -> thunderbird-78.5.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/cy.xpi -> thunderbird-78.5.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/da.xpi -> thunderbird-78.5.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/de.xpi -> thunderbird-78.5.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.5.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/el.xpi -> thunderbird-78.5.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.5.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.5.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.5.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.5.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/et.xpi -> thunderbird-78.5.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/eu.xpi -> thunderbird-78.5.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/fa.xpi -> thunderbird-78.5.1-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/fi.xpi -> thunderbird-78.5.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/fr.xpi -> thunderbird-78.5.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.5.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.5.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/gd.xpi -> thunderbird-78.5.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/gl.xpi -> thunderbird-78.5.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/he.xpi -> thunderbird-78.5.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/hr.xpi -> thunderbird-78.5.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.5.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/hu.xpi -> thunderbird-78.5.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.5.1-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/id.xpi -> thunderbird-78.5.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/is.xpi -> thunderbird-78.5.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/it.xpi -> thunderbird-78.5.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ja.xpi -> thunderbird-78.5.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ka.xpi -> thunderbird-78.5.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/kab.xpi -> thunderbird-78.5.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/kk.xpi -> thunderbird-78.5.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ko.xpi -> thunderbird-78.5.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/lt.xpi -> thunderbird-78.5.1-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ms.xpi -> thunderbird-78.5.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.5.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/nl.xpi -> thunderbird-78.5.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.5.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.5.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/pl.xpi -> thunderbird-78.5.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.5.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.5.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/rm.xpi -> thunderbird-78.5.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ro.xpi -> thunderbird-78.5.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ru.xpi -> thunderbird-78.5.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/si.xpi -> thunderbird-78.5.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/sk.xpi -> thunderbird-78.5.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/sl.xpi -> thunderbird-78.5.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/sq.xpi -> thunderbird-78.5.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/sr.xpi -> thunderbird-78.5.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.5.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/th.xpi -> thunderbird-78.5.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/tr.xpi -> thunderbird-78.5.1-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/uz.xpi -> thunderbird-78.5.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/vi.xpi -> thunderbird-78.5.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.5.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.5.1-zh-TW.xpi )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=94f48370e44ba1756c09ee66277b3be9
+_md5_=cfc99d062681bb89c7c18fa0730f8c0a
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-78.5.0 b/metadata/md5-cache/mail-client/thunderbird-bin-78.5.0
deleted file mode 100644
index cc2756756d41..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-bin-78.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Thunderbird Mail Client
-EAPI=7
-HOMEPAGE=https://www.thunderbird.net/
-IUSE=+alsa +ffmpeg +pulseaudio selinux wayland l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip
-SLOT=0/78
-SRC_URI=amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/en-US/thunderbird-78.5.0.tar.bz2 -> thunderbird-bin_x86_64-78.5.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/en-US/thunderbird-78.5.0.tar.bz2 -> thunderbird-bin_i686-78.5.0.tar.bz2 ) l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/af.xpi -> thunderbird-78.5.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ar.xpi -> thunderbird-78.5.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ast.xpi -> thunderbird-78.5.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/be.xpi -> thunderbird-78.5.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/bg.xpi -> thunderbird-78.5.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/br.xpi -> thunderbird-78.5.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ca.xpi -> thunderbird-78.5.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/cak.xpi -> thunderbird-78.5.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/cs.xpi -> thunderbird-78.5.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/cy.xpi -> thunderbird-78.5.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/da.xpi -> thunderbird-78.5.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/de.xpi -> thunderbird-78.5.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.5.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/el.xpi -> thunderbird-78.5.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.5.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.5.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.5.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.5.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/et.xpi -> thunderbird-78.5.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/eu.xpi -> thunderbird-78.5.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/fa.xpi -> thunderbird-78.5.0-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/fi.xpi -> thunderbird-78.5.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/fr.xpi -> thunderbird-78.5.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.5.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.5.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/gd.xpi -> thunderbird-78.5.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/gl.xpi -> thunderbird-78.5.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/he.xpi -> thunderbird-78.5.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/hr.xpi -> thunderbird-78.5.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.5.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/hu.xpi -> thunderbird-78.5.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.5.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/id.xpi -> thunderbird-78.5.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/is.xpi -> thunderbird-78.5.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/it.xpi -> thunderbird-78.5.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ja.xpi -> thunderbird-78.5.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ka.xpi -> thunderbird-78.5.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/kab.xpi -> thunderbird-78.5.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/kk.xpi -> thunderbird-78.5.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ko.xpi -> thunderbird-78.5.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/lt.xpi -> thunderbird-78.5.0-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ms.xpi -> thunderbird-78.5.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.5.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/nl.xpi -> thunderbird-78.5.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.5.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.5.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/pl.xpi -> thunderbird-78.5.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.5.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.5.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/rm.xpi -> thunderbird-78.5.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ro.xpi -> thunderbird-78.5.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/ru.xpi -> thunderbird-78.5.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/si.xpi -> thunderbird-78.5.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/sk.xpi -> thunderbird-78.5.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/sl.xpi -> thunderbird-78.5.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/sq.xpi -> thunderbird-78.5.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/sr.xpi -> thunderbird-78.5.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.5.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/th.xpi -> thunderbird-78.5.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/tr.xpi -> thunderbird-78.5.0-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/uz.xpi -> thunderbird-78.5.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/vi.xpi -> thunderbird-78.5.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.5.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.5.0-zh-TW.xpi )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fac32e93ec0bda9f403a9092ac5d8658
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-78.5.1 b/metadata/md5-cache/mail-client/thunderbird-bin-78.5.1
new file mode 100644
index 000000000000..f72a6268e9d7
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-78.5.1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Thunderbird Mail Client
+EAPI=7
+HOMEPAGE=https://www.thunderbird.net/
+IUSE=+alsa +ffmpeg +pulseaudio selinux wayland l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip
+SLOT=0/78
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/en-US/thunderbird-78.5.1.tar.bz2 -> thunderbird-bin_x86_64-78.5.1.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/en-US/thunderbird-78.5.1.tar.bz2 -> thunderbird-bin_i686-78.5.1.tar.bz2 ) l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/af.xpi -> thunderbird-78.5.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ar.xpi -> thunderbird-78.5.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ast.xpi -> thunderbird-78.5.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/be.xpi -> thunderbird-78.5.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/bg.xpi -> thunderbird-78.5.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/br.xpi -> thunderbird-78.5.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ca.xpi -> thunderbird-78.5.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/cak.xpi -> thunderbird-78.5.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/cs.xpi -> thunderbird-78.5.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/cy.xpi -> thunderbird-78.5.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/da.xpi -> thunderbird-78.5.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/de.xpi -> thunderbird-78.5.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.5.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/el.xpi -> thunderbird-78.5.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.5.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.5.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.5.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.5.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/et.xpi -> thunderbird-78.5.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/eu.xpi -> thunderbird-78.5.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/fa.xpi -> thunderbird-78.5.1-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/fi.xpi -> thunderbird-78.5.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/fr.xpi -> thunderbird-78.5.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.5.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.5.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/gd.xpi -> thunderbird-78.5.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/gl.xpi -> thunderbird-78.5.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/he.xpi -> thunderbird-78.5.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/hr.xpi -> thunderbird-78.5.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.5.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/hu.xpi -> thunderbird-78.5.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.5.1-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/id.xpi -> thunderbird-78.5.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/is.xpi -> thunderbird-78.5.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/it.xpi -> thunderbird-78.5.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ja.xpi -> thunderbird-78.5.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ka.xpi -> thunderbird-78.5.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/kab.xpi -> thunderbird-78.5.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/kk.xpi -> thunderbird-78.5.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ko.xpi -> thunderbird-78.5.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/lt.xpi -> thunderbird-78.5.1-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ms.xpi -> thunderbird-78.5.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.5.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/nl.xpi -> thunderbird-78.5.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.5.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.5.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/pl.xpi -> thunderbird-78.5.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.5.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.5.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/rm.xpi -> thunderbird-78.5.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ro.xpi -> thunderbird-78.5.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/ru.xpi -> thunderbird-78.5.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/si.xpi -> thunderbird-78.5.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/sk.xpi -> thunderbird-78.5.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/sl.xpi -> thunderbird-78.5.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/sq.xpi -> thunderbird-78.5.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/sr.xpi -> thunderbird-78.5.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.5.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/th.xpi -> thunderbird-78.5.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/tr.xpi -> thunderbird-78.5.1-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/uz.xpi -> thunderbird-78.5.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/vi.xpi -> thunderbird-78.5.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.5.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.5.1-zh-TW.xpi )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fac32e93ec0bda9f403a9092ac5d8658
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index b1cb2109cbdc..5f2fdcb134e0 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/afew-3.0.0 b/metadata/md5-cache/mail-filter/afew-3.0.0
index 413e53f66761..6e5aa84d8629 100644
--- a/metadata/md5-cache/mail-filter/afew-3.0.0
+++ b/metadata/md5-cache/mail-filter/afew-3.0.0
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/afew/afew-3.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f46f116dd8c3ab46e3a713a0bb1579a3
diff --git a/metadata/md5-cache/mail-filter/afew-3.0.1 b/metadata/md5-cache/mail-filter/afew-3.0.1
index a5d91b7cba0b..1ce3d5b27c2d 100644
--- a/metadata/md5-cache/mail-filter/afew-3.0.1
+++ b/metadata/md5-cache/mail-filter/afew-3.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Initial tagging script for Notmuch
 EAPI=7
 HOMEPAGE=https://github.com/afewmail/afew
 IUSE=doc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ISC
 RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/dkimpy[python_targets_python3_6(-)] net-mail/notmuch[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/dkimpy[python_targets_python3_7(-)] net-mail/notmuch[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/dkimpy[python_targets_python3_8(-)] net-mail/notmuch[python,python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/a/afew/afew-3.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a09d84a1b52b9e0f44eb4c3f6f7ab793
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=afce835df47289907c01f97be2315e2f
diff --git a/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2-r1 b/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2-r1
index e1fb90cffc2b..403416f83783 100644
--- a/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2-r1
+++ b/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/c/courier-pythonfilter/courier-pythonfilter-3.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=45258a78e1b184003162cddd7dce7cbf
diff --git a/metadata/md5-cache/mail-filter/pyzor-1.0.0-r1 b/metadata/md5-cache/mail-filter/pyzor-1.0.0-r1
index 25d229f7d420..a0df55bcb0ab 100644
--- a/metadata/md5-cache/mail-filter/pyzor-1.0.0-r1
+++ b/metadata/md5-cache/mail-filter/pyzor-1.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=pyzord? ( || ( gdbm redis ) ) test? ( gdbm redis ) || ( python_targ
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/SpamExperts/pyzor/archive/release-1-0-0.tar.gz -> pyzor-1.0.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=918f587fdd64c620dce497131b4754ec
diff --git a/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523 b/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523
index 4067493fe970..060ba62e8b2b 100644
--- a/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523
+++ b/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523
@@ -12,5 +12,5 @@ REQUIRED_USE=pyzord? ( || ( gdbm redis ) ) test? ( gdbm redis ) || ( python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SpamExperts/pyzor/archive/f46159bd6519cebcebf59e9334a7920371111d75.tar.gz -> pyzor-1.0.0_p20200523.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ab4065796acf52abf55b1697f9ef49e9
diff --git a/metadata/md5-cache/mail-filter/spf-engine-2.0.2-r1 b/metadata/md5-cache/mail-filter/spf-engine-2.0.2-r1
index bbd730229654..52bc71b17547 100644
--- a/metadata/md5-cache/mail-filter/spf-engine-2.0.2-r1
+++ b/metadata/md5-cache/mail-filter/spf-engine-2.0.2-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pyspf[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypolicyd-spf/pypolicyd-spf-2.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8721e1ce279db8897729481d0ccaad54
diff --git a/metadata/md5-cache/mail-filter/spf-engine-2.9.2 b/metadata/md5-cache/mail-filter/spf-engine-2.9.2
index b6fdbd8a1700..46fb47b568ac 100644
--- a/metadata/md5-cache/mail-filter/spf-engine-2.9.2
+++ b/metadata/md5-cache/mail-filter/spf-engine-2.9.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pyspf[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spf-engine/spf-engine-2.9.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0445b263fa674f7f4aaab8225366cbaa
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 984a17276df1..fda1cc5258a5 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/nullmailer-2.2-r1 b/metadata/md5-cache/mail-mta/nullmailer-2.2-r1
index 3f9c696bc610..08a610b3e8ff 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-2.2-r1
+++ b/metadata/md5-cache/mail-mta/nullmailer-2.2-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Simple relay-only local mail transport agent
 EAPI=7
 HOMEPAGE=http://untroubled.org/nullmailer/ https://github.com/bruceg/nullmailer
 IUSE=ssl test
-KEYWORDS=amd64 ~arm ppc x86 ~x64-cygwin
+KEYWORDS=amd64 ~arm ~arm64 ppc x86 ~x64-cygwin
 LICENSE=GPL-2
 RDEPEND=virtual/logger sys-apps/shadow ssl? ( net-libs/gnutls:0= ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta(+)] !mail-mta/netqmail !mail-mta/opensmtpd[mta(+)] !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta(+)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-2.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a4aeed757e4f379946faf2e021702016
+_md5_=c4ebdb0017cfdc2fca3d28347ee611b9
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index ca5c7226bb49..f88decda4071 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/asymptote-2.61 b/metadata/md5-cache/media-gfx/asymptote-2.61
deleted file mode 100644
index 37ce36b9da72..000000000000
--- a/metadata/md5-cache/media-gfx/asymptote-2.61
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) X? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=A vector graphics language that provides a framework for technical drawing
-EAPI=7
-HOMEPAGE=https://asymptote.sourceforge.io/
-IUSE=+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) X? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/latex-base
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) offscreen? ( opengl ) doc? ( boehm-gc )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/asymptote/asymptote-2.61.src.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	latex-package	e5f296c98696dd02059bc6a5a03282e2	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=08242d4925b21c3d7d5cf30fd7b7593b
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.62 b/metadata/md5-cache/media-gfx/asymptote-2.62
deleted file mode 100644
index 008122c33434..000000000000
--- a/metadata/md5-cache/media-gfx/asymptote-2.62
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) X? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=A vector graphics language that provides a framework for technical drawing
-EAPI=7
-HOMEPAGE=https://asymptote.sourceforge.io/
-IUSE=+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) X? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/latex-base
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) offscreen? ( opengl ) doc? ( boehm-gc )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/asymptote/asymptote-2.62.src.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	latex-package	e5f296c98696dd02059bc6a5a03282e2	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0ba7236b6e712d5b7658167fb32494df
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.68 b/metadata/md5-cache/media-gfx/asymptote-2.68
new file mode 100644
index 000000000000..1ff2f43e8504
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/asymptote-2.68
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) X? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DESCRIPTION=A vector graphics language that provides a framework for technical drawing
+EAPI=7
+HOMEPAGE=https://asymptote.sourceforge.io/
+IUSE=+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) X? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/latex-base
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) offscreen? ( opengl ) doc? ( boehm-gc )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/asymptote/asymptote-2.68.src.tgz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	latex-package	e5f296c98696dd02059bc6a5a03282e2	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d54ae0b01d6f5a58964bb3d922520053
diff --git a/metadata/md5-cache/media-gfx/blender-2.83.4-r1 b/metadata/md5-cache/media-gfx/blender-2.83.4-r1
index 3c351bbfa294..31d42fa4cc7c 100644
--- a/metadata/md5-cache/media-gfx/blender-2.83.4-r1
+++ b/metadata/md5-cache/media-gfx/blender-2.83.4-r1
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( media-libs/openimageio:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] dev-libs/c-blosc:= ) osl? ( media-libs/osl ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( media-libs/openimageio:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] dev-libs/c-blosc:= ) osl? ( media-libs/osl:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
 DESCRIPTION=3D Creation/Animation/Publishing System
 EAPI=7
 HOMEPAGE=https://www.blender.org
 IUSE=+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb abi6-compat abi7-compat alembic collada color-management cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb osl sdl sndfile standalone test tiff valgrind +python_single_target_python3_7
 KEYWORDS=amd64 ~x86
 LICENSE=|| ( GPL-2 BL )
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( media-libs/openimageio:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] dev-libs/c-blosc:= ) osl? ( media-libs/osl ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( media-libs/openimageio:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] dev-libs/c-blosc:= ) osl? ( media-libs/osl:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
 REQUIRED_USE=^^ ( python_single_target_python3_7 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) elbeem? ( tbb ) opencl? ( cycles ) openvdb? ( ^^ ( abi6-compat abi7-compat ) tbb ) osl? ( cycles llvm ) standalone? ( cycles )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.blender.org/source/blender-2.83.4.tar.xz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7fedaea3ac2bc1423e3639c2cf005610
+_md5_=e9d6a29a29474db44aec59cdf2befd51
diff --git a/metadata/md5-cache/media-gfx/blender-2.90.1-r1 b/metadata/md5-cache/media-gfx/blender-2.90.1-r1
index 8585df912ca1..bcc50fdeb975 100644
--- a/metadata/md5-cache/media-gfx/blender-2.90.1-r1
+++ b/metadata/md5-cache/media-gfx/blender-2.90.1-r1
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( media-libs/openimageio:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] dev-libs/c-blosc:= ) osl? ( media-libs/osl ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( media-libs/openimageio:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] dev-libs/c-blosc:= ) osl? ( media-libs/osl:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
 DESCRIPTION=3D Creation/Animation/Publishing System
 EAPI=7
 HOMEPAGE=https://www.blender.org
 IUSE=+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb abi6-compat abi7-compat alembic collada color-management cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb osl sdl sndfile standalone test tiff valgrind +python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( GPL-2 BL )
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( media-libs/openimageio:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] dev-libs/c-blosc:= ) osl? ( media-libs/osl ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
-REQUIRED_USE=^^ ( python_single_target_python3_7 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) elbeem? ( tbb ) opencl? ( cycles ) openvdb? ( ^^ ( abi6-compat abi7-compat ) tbb ) osl? ( cycles llvm ) standalone? ( cycles )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( media-libs/openimageio:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] dev-libs/c-blosc:= ) osl? ( media-libs/osl:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
+REQUIRED_USE=^^ ( python_single_target_python3_7 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tbb tiff openimageio ) elbeem? ( tbb ) opencl? ( cycles ) openvdb? ( ^^ ( abi6-compat abi7-compat ) tbb ) osl? ( cycles llvm ) standalone? ( cycles )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.blender.org/source/blender-2.90.1.tar.xz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9b771e976e12a8e7ac45c99bbd54786f
+_md5_=734b5c5de30d074b57f91fbbd96715d8
diff --git a/metadata/md5-cache/media-gfx/blender-2.91.0 b/metadata/md5-cache/media-gfx/blender-2.91.0
new file mode 100644
index 000000000000..040668fabd75
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/blender-2.91.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/gmp dev-libs/pugixml dev-libs/lzo:2= python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) media-gfx/potrace media-libs/fontconfig:= media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) cycles? ( media-libs/freeglut ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( media-libs/openimageio:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] dev-libs/c-blosc:= ) osl? ( media-libs/osl:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
+DESCRIPTION=3D Creation/Animation/Publishing System
+EAPI=7
+HOMEPAGE=https://www.blender.org
+IUSE=+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb abi6-compat abi7-compat alembic collada color-management cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb osl sdl sndfile standalone test tiff valgrind python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 BL )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/gmp dev-libs/pugixml dev-libs/lzo:2= python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) media-gfx/potrace media-libs/fontconfig:= media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) cycles? ( media-libs/freeglut ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( media-libs/openimageio:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] dev-libs/c-blosc:= ) osl? ( media-libs/osl:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tbb tiff openimageio ) elbeem? ( tbb ) opencl? ( cycles ) openvdb? ( ^^ ( abi6-compat abi7-compat ) tbb ) osl? ( cycles llvm ) standalone? ( cycles )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.blender.org/source/blender-2.91.0.tar.xz
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e1e141d2dfc00f8debfec87093641118
diff --git a/metadata/md5-cache/media-gfx/cairosvg-2.4.2 b/metadata/md5-cache/media-gfx/cairosvg-2.4.2
index 281a406ef118..59f4e8f2dd91 100644
--- a/metadata/md5-cache/media-gfx/cairosvg-2.4.2
+++ b/metadata/md5-cache/media-gfx/cairosvg-2.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/CairoSVG/CairoSVG-2.4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b29a20ab4eb4653faa1f54cc6f612062
diff --git a/metadata/md5-cache/media-gfx/cairosvg-2.5.0 b/metadata/md5-cache/media-gfx/cairosvg-2.5.0
index 39092512dda7..086cf813e7e1 100644
--- a/metadata/md5-cache/media-gfx/cairosvg-2.5.0
+++ b/metadata/md5-cache/media-gfx/cairosvg-2.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/CairoSVG/CairoSVG-2.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=841dbea2deed76f270ccf8b398c6ef82
diff --git a/metadata/md5-cache/media-gfx/fotoxx-15.05 b/metadata/md5-cache/media-gfx/fotoxx-15.05
index 9c52027f446c..113ee6f1e225 100644
--- a/metadata/md5-cache/media-gfx/fotoxx-15.05
+++ b/metadata/md5-cache/media-gfx/fotoxx-15.05
@@ -3,10 +3,10 @@ DEPEND=media-libs/libpng media-libs/tiff media-libs/lcms:2 x11-libs/gtk+:3
 DESCRIPTION=Program for improving image files made with a digital camera
 EAPI=6
 HOMEPAGE=https://www.kornelix.net/fotoxx/fotoxx.html
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3
 RDEPEND=media-libs/libpng media-libs/tiff media-libs/lcms:2 x11-libs/gtk+:3 media-gfx/ufraw[gtk] media-gfx/dcraw media-libs/exiftool x11-misc/xdg-utils
 SLOT=0
 SRC_URI=http://www.kornelix.com/uploads/1/3/0/3/13035936/fotoxx-15.05.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=41891d4051eef5b87395822607807196
+_md5_=4bda7d04edf61227710887b5956fca40
diff --git a/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1 b/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1
index 888144f85c6d..09b547886c8d 100644
--- a/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1
+++ b/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( doc ) ^^ ( python_single_target_python3_6 python_single_tar
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fract4d/gnofract4d/archive/bd600c20921afff7b02fc0a76ab79242ebd0896d.tar.gz -> gnofract4d-4.0.1_p1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da6d4150910ba1f608e9091955310310
diff --git a/metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029 b/metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029
index eac3db29e9fa..150f25050a10 100644
--- a/metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029
+++ b/metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fract4d/gnofract4d/archive/3e3893b0ee381098418d7b28997f6b861c53eff1.tar.gz -> gnofract4d-4.3_p20201029.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a087b545c32d8555923dae8f574b5c81
diff --git a/metadata/md5-cache/media-gfx/img2pdf-0.3.6 b/metadata/md5-cache/media-gfx/img2pdf-0.3.6
index 8758fe6e0241..1309e6b13217 100644
--- a/metadata/md5-cache/media-gfx/img2pdf-0.3.6
+++ b/metadata/md5-cache/media-gfx/img2pdf-0.3.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/img2pdf/img2pdf-0.3.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d58e30054b8290500c86bf6cf415deee
diff --git a/metadata/md5-cache/media-gfx/mypaint-2.0.1-r2 b/metadata/md5-cache/media-gfx/mypaint-2.0.1-r2
index 48172b76e012..7703fa0aa66e 100644
--- a/metadata/md5-cache/media-gfx/mypaint-2.0.1-r2
+++ b/metadata/md5-cache/media-gfx/mypaint-2.0.1-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mypaint/mypaint/releases/download/v2.0.1/mypaint-2.0.1.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=50dd3d6eee2ccd61fdcd55077ecfec2d
diff --git a/metadata/md5-cache/media-gfx/netpaint-1.1.2 b/metadata/md5-cache/media-gfx/netpaint-1.1.2
index bcb0d1323ce6..a8514e03ff56 100644
--- a/metadata/md5-cache/media-gfx/netpaint-1.1.2
+++ b/metadata/md5-cache/media-gfx/netpaint-1.1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/urwid[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/SyntheticDreams/netpaint/archive/v1.1.2.tar.gz -> netpaint-1.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=213a9093071e2a8714bf3be4c9f738f7
diff --git a/metadata/md5-cache/media-gfx/scour-0.37 b/metadata/md5-cache/media-gfx/scour-0.37
index c18d52bc4c1e..4d7477a5746a 100644
--- a/metadata/md5-cache/media-gfx/scour-0.37
+++ b/metadata/md5-cache/media-gfx/scour-0.37
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/scour-project/scour/archive/v0.37.tar.gz -> scour-0.37.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=61d6af142d920e1fab62d5bdac92f5df
diff --git a/metadata/md5-cache/media-gfx/termtosvg-1.1.0 b/metadata/md5-cache/media-gfx/termtosvg-1.1.0
index 04e92edfcdec..a22d1ea0cf9c 100644
--- a/metadata/md5-cache/media-gfx/termtosvg-1.1.0
+++ b/metadata/md5-cache/media-gfx/termtosvg-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nbedos/termtosvg/archive/1.1.0.tar.gz -> termtosvg-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9c3f7d63e699af2a396d7d7ede13f4a1
diff --git a/metadata/md5-cache/media-gfx/viewnior-1.7-r2 b/metadata/md5-cache/media-gfx/viewnior-1.7-r2
index 02fa6ea5c83f..7011182bc5ac 100644
--- a/metadata/md5-cache/media-gfx/viewnior-1.7-r2
+++ b/metadata/md5-cache/media-gfx/viewnior-1.7-r2
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 media-gfx/exiv2:0= x11-libs/gtk+:2 dev-util/desktop-file-
 DESCRIPTION=Fast and simple image viewer
 EAPI=7
 HOMEPAGE=https://siyanpanayotov.com/project/viewnior/ https://github.com/hellosiyan/Viewnior
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 media-gfx/exiv2:0= x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://github.com/hellosiyan/Viewnior/archive/viewnior-1.7.tar.gz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d0cdaa2bc0e546f87fec6b0e30478ee
+_md5_=aec6f48050badcc2d7d49146e168fc34
diff --git a/metadata/md5-cache/media-gfx/word_cloud-1.6.0 b/metadata/md5-cache/media-gfx/word_cloud-1.6.0
index 319127c42907..a327468b6d0b 100644
--- a/metadata/md5-cache/media-gfx/word_cloud-1.6.0
+++ b/metadata/md5-cache/media-gfx/word_cloud-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/amueller/word_cloud/archive/1.6.0.tar.gz -> word_cloud-1.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=675ad02f561410cf16294ad0b0fe2706
diff --git a/metadata/md5-cache/media-gfx/word_cloud-1.8.0 b/metadata/md5-cache/media-gfx/word_cloud-1.8.0
index 17de2a2c8471..d261bdb00fc1 100644
--- a/metadata/md5-cache/media-gfx/word_cloud-1.8.0
+++ b/metadata/md5-cache/media-gfx/word_cloud-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/matplotlib[python_targets_python3_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/amueller/word_cloud/archive/1.8.0.tar.gz -> word_cloud-1.8.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ac787d15e29921290a40e08120d97ddc
diff --git a/metadata/md5-cache/media-gfx/xdot-1.1 b/metadata/md5-cache/media-gfx/xdot-1.1
index fb4fb46e220e..a8b70de11b44 100644
--- a/metadata/md5-cache/media-gfx/xdot-1.1
+++ b/metadata/md5-cache/media-gfx/xdot-1.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/jrfonseca/xdot.py/archive/1.1.tar.gz -> xdot-1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=78c5c76cddfc391bfb7d821e18a9029b
diff --git a/metadata/md5-cache/media-gfx/xdot-1.2 b/metadata/md5-cache/media-gfx/xdot-1.2
index b3a906f5ec15..fe5acd2b6b1d 100644
--- a/metadata/md5-cache/media-gfx/xdot-1.2
+++ b/metadata/md5-cache/media-gfx/xdot-1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/jrfonseca/xdot.py/archive/1.2.tar.gz -> xdot-1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7c1884a7711b062816ce28103a75a6f1
diff --git a/metadata/md5-cache/media-gfx/xdot-9999 b/metadata/md5-cache/media-gfx/xdot-9999
index 883468383673..b4f3807ea36a 100644
--- a/metadata/md5-cache/media-gfx/xdot-9999
+++ b/metadata/md5-cache/media-gfx/xdot-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-gfx/graphviz python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7c1884a7711b062816ce28103a75a6f1
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 0c212d7e48c2..63c3ea9ecb85 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/a52dec-0.7.4-r6 b/metadata/md5-cache/media-libs/a52dec-0.7.4-r6
index f98b276103a2..1c4c5b694e86 100644
--- a/metadata/md5-cache/media-libs/a52dec-0.7.4-r6
+++ b/metadata/md5-cache/media-libs/a52dec-0.7.4-r6
@@ -4,10 +4,10 @@ DESCRIPTION=library for decoding ATSC A/52 streams used in DVD
 EAPI=5
 HOMEPAGE=http://liba52.sourceforge.net/
 IUSE=djbfft oss static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=djbfft? ( sci-libs/djbfft )
 SLOT=0
 SRC_URI=http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=094da1ddbdad48a68e0ba389edad0304
+_md5_=d5545f718c194706405d86c5846cc6b4
diff --git a/metadata/md5-cache/media-libs/a52dec-0.7.4-r7 b/metadata/md5-cache/media-libs/a52dec-0.7.4-r7
index 808ef8fd9151..a3d8797884ff 100644
--- a/metadata/md5-cache/media-libs/a52dec-0.7.4-r7
+++ b/metadata/md5-cache/media-libs/a52dec-0.7.4-r7
@@ -4,10 +4,10 @@ DESCRIPTION=library for decoding ATSC A/52 streams used in DVD
 EAPI=5
 HOMEPAGE=http://liba52.sourceforge.net/
 IUSE=djbfft oss 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=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=djbfft? ( >=sci-libs/djbfft-0.76-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b1972f127be3bd58590584ab00e2756a
+_md5_=e992509a7a3272f240267c15058517f5
diff --git a/metadata/md5-cache/media-libs/a52dec-0.7.4-r8 b/metadata/md5-cache/media-libs/a52dec-0.7.4-r8
index 32340f7f0191..2cbb1ba66a4b 100644
--- a/metadata/md5-cache/media-libs/a52dec-0.7.4-r8
+++ b/metadata/md5-cache/media-libs/a52dec-0.7.4-r8
@@ -5,10 +5,10 @@ DESCRIPTION=library for decoding ATSC A/52 streams used in DVD
 EAPI=7
 HOMEPAGE=http://liba52.sourceforge.net/
 IUSE=djbfft oss 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=djbfft? ( >=sci-libs/djbfft-0.76-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=45deabd176480ca1a4f36e921ff453fd
+_md5_=317cb342ee0dfbb7d3f83de9472198e8
diff --git a/metadata/md5-cache/media-libs/aubio-0.4.9 b/metadata/md5-cache/media-libs/aubio-0.4.9
index 953718766fae..902a736221b7 100644
--- a/metadata/md5-cache/media-libs/aubio-0.4.9
+++ b/metadata/md5-cache/media-libs/aubio-0.4.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://aubio.org/pub/aubio-0.4.9.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c55b15b3ec6c2525f6dd836cb9a4ce5
diff --git a/metadata/md5-cache/media-libs/elgato-streamdeck-0.8.1 b/metadata/md5-cache/media-libs/elgato-streamdeck-0.8.1
index d4120fb558ba..937ae63eda6a 100644
--- a/metadata/md5-cache/media-libs/elgato-streamdeck-0.8.1
+++ b/metadata/md5-cache/media-libs/elgato-streamdeck-0.8.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/abcminiuser/python-elgato-streamdeck/archive/0.8.1.tar.gz -> elgato-streamdeck-0.8.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0b4d107fdee2f459acea2b3bde86733e
diff --git a/metadata/md5-cache/media-libs/elgato-streamdeck-9999 b/metadata/md5-cache/media-libs/elgato-streamdeck-9999
index 7df390b45cc7..6f16d588a7b6 100644
--- a/metadata/md5-cache/media-libs/elgato-streamdeck-9999
+++ b/metadata/md5-cache/media-libs/elgato-streamdeck-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0b4d107fdee2f459acea2b3bde86733e
diff --git a/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.04 b/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.04
deleted file mode 100644
index 0f3d057a1217..000000000000
--- a/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.04
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=app-eselect/eselect-infinality app-eselect/eselect-lcdfilter media-libs/fontconfig-infinality media-libs/freetype:2[infinality]
-DESCRIPTION=A set of font rendering and replacement rules for fontconfig-infinality
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-eselect/eselect-infinality app-eselect/eselect-lcdfilter media-libs/fontconfig-infinality media-libs/freetype:2[infinality]
-SLOT=0
-SRC_URI=https://github.com/bohoomil/fontconfig-ultimate/archive/2015-04.tar.gz -> fontconfig-ultimate-2015.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2766eeacc8f33ab7e8748e7d05a429a0
diff --git a/metadata/md5-cache/media-libs/gmtk-1.0.8 b/metadata/md5-cache/media-libs/gmtk-1.0.8
deleted file mode 100644
index 53c9a984dcf5..000000000000
--- a/metadata/md5-cache/media-libs/gmtk-1.0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.30 >=x11-libs/gtk+-3.2:3 x11-libs/libX11 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=GTK+ widget and function libraries for gnome-mplayer
-EAPI=5
-HOMEPAGE=https://code.google.com/p/gmtk/
-IUSE=alsa +dconf pulseaudio
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.30 >=x11-libs/gtk+-3.2:3 x11-libs/libX11 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) dconf? ( gnome-base/dconf )
-SLOT=0
-SRC_URI=https://gmtk.googlecode.com/files/gmtk-1.0.8.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0916d7a28b7f7825b886cd67ddd824f7
diff --git a/metadata/md5-cache/media-libs/hamlib-3.3-r1 b/metadata/md5-cache/media-libs/hamlib-3.3-r1
index 137097cdee1e..d70fb65addf0 100644
--- a/metadata/md5-cache/media-libs/hamlib-3.3-r1
+++ b/metadata/md5-cache/media-libs/hamlib-3.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Ham radio backend rig control libraries
 EAPI=6
 HOMEPAGE=https://www.hamlib.org
 IUSE=doc perl python tcl python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2 GPL-2
 RDEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.github.com/hamlib/hamlib/releases/download/3.3-r1/hamlib-3.3.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c599e7a32538b68843a5c67315b9eb07
+_md5_=a0beddb3865c5b477d7a142d0da392e5
diff --git a/metadata/md5-cache/media-libs/lib3ds-1.3.0-r1 b/metadata/md5-cache/media-libs/lib3ds-1.3.0-r1
deleted file mode 100644
index cea4fcde7d79..000000000000
--- a/metadata/md5-cache/media-libs/lib3ds-1.3.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/freeglut virtual/opengl app-arch/unzip >=app-portage/elt-patches-20170815
-DESCRIPTION=library for managing 3D-Studio Release 3 and 4 .3DS files
-EAPI=5
-HOMEPAGE=https://code.google.com/p/lib3ds/
-IUSE=static-libs
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=media-libs/freeglut virtual/opengl
-SLOT=0
-SRC_URI=https://lib3ds.googlecode.com/files/lib3ds-1.3.0.zip
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c906808be319865cc4a3e501bc880e24
diff --git a/metadata/md5-cache/media-libs/lib3ds-2.0.0_rc1 b/metadata/md5-cache/media-libs/lib3ds-2.0.0_rc1
deleted file mode 100644
index dc1c33843e3e..000000000000
--- a/metadata/md5-cache/media-libs/lib3ds-2.0.0_rc1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=media-libs/freeglut virtual/opengl app-arch/unzip
-DESCRIPTION=library for managing 3D-Studio Release 3 and 4 .3DS files
-EAPI=5
-HOMEPAGE=https://code.google.com/p/lib3ds/
-KEYWORDS=amd64 ~arm64 ppc ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=media-libs/freeglut virtual/opengl
-SLOT=0
-SRC_URI=https://lib3ds.googlecode.com/files/lib3ds-20080909.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a579f607f8a7090fc104d8cc7933e923
diff --git a/metadata/md5-cache/media-libs/libaacplus-2.0.2-r2 b/metadata/md5-cache/media-libs/libaacplus-2.0.2-r2
deleted file mode 100644
index 427a07517f47..000000000000
--- a/metadata/md5-cache/media-libs/libaacplus-2.0.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!media-sound/aacplusenc fftw? ( >=sci-libs/fftw-3.3.3-r2:3.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(-)?] ) app-arch/unzip virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=HE-AAC+ v2 library, based on the reference implementation
-EAPI=5
-HOMEPAGE=http://tipok.org.ua/node/17
-IUSE=fftw 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 hppa ppc ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=!media-sound/aacplusenc fftw? ( >=sci-libs/fftw-3.3.3-r2:3.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(-)?] )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~aballier/libaacplus-2.0.2.tar.gz http://217.20.164.161/~tipok/aacplus/libaacplus-2.0.2.tar.gz http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/26410-800.zip
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=aff496e7b3c36c0a9af3395b161dd80b
diff --git a/metadata/md5-cache/media-libs/libaacs-0.10.0 b/metadata/md5-cache/media-libs/libaacs-0.10.0
deleted file mode 100644
index 48d0cd5c42a1..000000000000
--- a/metadata/md5-cache/media-libs/libaacs-0.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/flex virtual/yacc
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libgcrypt-1.5.3: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(-)?] >=dev-libs/libgpg-error-1.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Open implementation of the Advanced Access Content System (AACS) specification
-EAPI=7
-HOMEPAGE=https://www.videolan.org/developers/libaacs.html
-IUSE=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 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/libgcrypt-1.5.3: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(-)?] >=dev-libs/libgpg-error-1.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://downloads.videolan.org/pub/videolan/libaacs/0.10.0/libaacs-0.10.0.tar.bz2
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=168f140dfced11dbf9cb56b7c45d532d
diff --git a/metadata/md5-cache/media-libs/libaacs-0.9.0 b/metadata/md5-cache/media-libs/libaacs-0.9.0
deleted file mode 100644
index b2accb048746..000000000000
--- a/metadata/md5-cache/media-libs/libaacs-0.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libgcrypt-1.5.3: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(-)?] >=dev-libs/libgpg-error-1.12[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-devel/flex virtual/yacc >=app-portage/elt-patches-20170815
-DESCRIPTION=Open implementation of the Advanced Access Content System (AACS) specification
-EAPI=5
-HOMEPAGE=https://www.videolan.org/developers/libaacs.html
-IUSE=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 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/libgcrypt-1.5.3: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(-)?] >=dev-libs/libgpg-error-1.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://downloads.videolan.org/pub/videolan/libaacs/0.9.0/libaacs-0.9.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-multilib	9c600605e4462da7f90f41008447ba1c	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0fbfdcaf0076f53008a0bf040700b335
diff --git a/metadata/md5-cache/media-libs/libass-0.15.0 b/metadata/md5-cache/media-libs/libass-0.15.0
index 67fbfa4af4ba..51ce9899a961 100644
--- a/metadata/md5-cache/media-libs/libass-0.15.0
+++ b/metadata/md5-cache/media-libs/libass-0.15.0
@@ -5,10 +5,10 @@ DESCRIPTION=Library for SSA/ASS subtitles rendering
 EAPI=7
 HOMEPAGE=https://github.com/libass/libass
 IUSE=+fontconfig 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 ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=ISC
 RDEPEND=>=dev-libs/fribidi-0.19.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(-)?] >=media-libs/freetype-2.5.0.1: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(-)?] >=virtual/libiconv-0-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(-)?] >=media-libs/harfbuzz-0.9.12[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/9
 SRC_URI=https://github.com/libass/libass/releases/download/0.15.0/libass-0.15.0.tar.xz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=45f12c145110c3f8053ce974da5d7ded
+_md5_=28da26317f981b5976dcbdafa9f20c49
diff --git a/metadata/md5-cache/media-libs/libhdhomerun-20150826 b/metadata/md5-cache/media-libs/libhdhomerun-20150826
deleted file mode 100644
index 6326d9b7588a..000000000000
--- a/metadata/md5-cache/media-libs/libhdhomerun-20150826
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=SiliconDust HDHomeRun Utilties
-EAPI=5
-HOMEPAGE=http://www.silicondust.com/support/hdhomerun/downloads/linux/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-SLOT=0
-SRC_URI=http://download.silicondust.com/hdhomerun/libhdhomerun_20150826.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=920264f14e79cdb94d92a7840a1204a9
diff --git a/metadata/md5-cache/media-libs/libmpeg3-1.8-r1 b/metadata/md5-cache/media-libs/libmpeg3-1.8-r1
index e87ba292afcf..0fecd31cf33d 100644
--- a/metadata/md5-cache/media-libs/libmpeg3-1.8-r1
+++ b/metadata/md5-cache/media-libs/libmpeg3-1.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An mpeg library for linux
 EAPI=5
 HOMEPAGE=http://heroinewarrior.com/libmpeg3.php
 IUSE=cpu_flags_x86_mmx 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 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib virtual/jpeg:0 media-libs/a52dec
 SLOT=0
 SRC_URI=mirror://sourceforge/heroines/libmpeg3-1.8-src.tar.bz2 mirror://gentoo/libmpeg3-1.7-gentoo.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a88f35528c695da499908eccff6418f7
+_md5_=318e485db820da377c1b4fbee92835ca
diff --git a/metadata/md5-cache/media-libs/libopenraw-0.0.9 b/metadata/md5-cache/media-libs/libopenraw-0.0.9
deleted file mode 100644
index 1b7a8f04c243..000000000000
--- a/metadata/md5-cache/media-libs/libopenraw-0.0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=virtual/jpeg:0 dev-libs/libxml2 gtk? ( >=dev-libs/glib-2 >=x11-libs/gdk-pixbuf-2.24.0:2 ) >=dev-libs/boost-1.35 virtual/pkgconfig test? ( net-misc/curl )
-DESCRIPTION=A decoding library for RAW image formats
-EAPI=5
-HOMEPAGE=https://libopenraw.freedesktop.org/wiki/
-IUSE=gtk static-libs test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-LICENSE=GPL-3 LGPL-3
-RDEPEND=virtual/jpeg:0 dev-libs/libxml2 gtk? ( >=dev-libs/glib-2 >=x11-libs/gdk-pixbuf-2.24.0:2 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://libopenraw.freedesktop.org/download/libopenraw-0.0.9.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a54a037cb1e4e793ae2e062272474d8c
diff --git a/metadata/md5-cache/media-libs/libsfml-2.5.1 b/metadata/md5-cache/media-libs/libsfml-2.5.1
index d997784faa45..2560308f9812 100644
--- a/metadata/md5-cache/media-libs/libsfml-2.5.1
+++ b/metadata/md5-cache/media-libs/libsfml-2.5.1
@@ -4,10 +4,10 @@ DESCRIPTION=Simple and Fast Multimedia Library (SFML)
 EAPI=6
 HOMEPAGE=https://www.sfml-dev.org/ https://github.com/SFML/SFML
 IUSE=debug doc examples
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=ZLIB
 RDEPEND=media-libs/flac media-libs/freetype:2 media-libs/libpng:0= media-libs/libogg media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/jpeg:0 kernel_linux? ( virtual/libudev:0 ) virtual/opengl !kernel_Winnt? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util-image )
 SLOT=0/2.5
 SRC_URI=https://github.com/SFML/SFML/archive/2.5.1.tar.gz -> libsfml-2.5.1.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=15aadba1eb0d6484bbb670b9dcb4e4a7
+_md5_=1ae8569507724b2e85c07fe9366f7080
diff --git a/metadata/md5-cache/media-libs/libuvc-0.0.6-r1 b/metadata/md5-cache/media-libs/libuvc-0.0.6-r1
index e071f882fa7a..a26d80a01cdc 100644
--- a/metadata/md5-cache/media-libs/libuvc-0.0.6-r1
+++ b/metadata/md5-cache/media-libs/libuvc-0.0.6-r1
@@ -3,10 +3,10 @@ DEPEND=virtual/jpeg:0 virtual/libusb:1 virtual/udev sys-devel/make >=dev-util/cm
 DESCRIPTION=A cross-platform library for USB video devices, built atop libusb
 EAPI=6
 HOMEPAGE=https://int80k.com/libuvc/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=virtual/jpeg:0 virtual/libusb:1 virtual/udev
 SLOT=0
 SRC_URI=https://github.com/ktossell/libuvc/archive/v0.0.6.tar.gz -> libuvc-0.0.6.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6da2ea0e8d32b26cfb3d573807e79e0b
+_md5_=01b917db9a229cf5fe0286bd29d1dde9
diff --git a/metadata/md5-cache/media-libs/mesa-20.3.0_rc3 b/metadata/md5-cache/media-libs/mesa-20.3.0_rc3
index 52aa79883eb6..19713bff76ae 100644
--- a/metadata/md5-cache/media-libs/mesa-20.3.0_rc3
+++ b/metadata/md5-cache/media-libs/mesa-20.3.0_rc3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-20.3.0-rc3.tar.xz
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=618450602fbce6820c6d2ab4728a4dca
+_md5_=04dee61d11c7236b3ec1c563ab29ef53
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index 9bef99f108b3..5305815f3d7f 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -1,15 +1,15 @@
 BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( dev-lang/python:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install pretend setup test unpack
-DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-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(-)?] >=x11-libs/libXext-1.3.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(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:11[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-devel/clang:10[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-devel/clang: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(-)?] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:11[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-devel/llvm:10[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-devel/llvm: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(-)?] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
+DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.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(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:11[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-devel/clang:10[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-devel/clang: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(-)?] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:11[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-devel/llvm:10[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-devel/llvm: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(-)?] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=7
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-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(-)?] >=x11-libs/libXext-1.3.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(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:11[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-devel/clang:10[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-devel/clang: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(-)?] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:11[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-devel/llvm:10[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-devel/llvm: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(-)?] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) )
+RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) X? ( >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.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(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:11[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-devel/clang:10[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-devel/clang: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(-)?] ) <sys-devel/clang-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:11[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-devel/llvm:10[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-devel/llvm: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(-)?] ) <sys-devel/llvm-12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) )
 REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=618450602fbce6820c6d2ab4728a4dca
+_md5_=bd75c3d49939354cb62f4ca3ec9666af
diff --git a/metadata/md5-cache/media-libs/mutagen-1.43.0-r1 b/metadata/md5-cache/media-libs/mutagen-1.43.0-r1
index 1d33697e8be0..51c4ab134b58 100644
--- a/metadata/md5-cache/media-libs/mutagen-1.43.0-r1
+++ b/metadata/md5-cache/media-libs/mutagen-1.43.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/quodlibet/mutagen/releases/download/release-1.43.0/mutagen-1.43.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c719f693e4a5152baecde8a509285601
diff --git a/metadata/md5-cache/media-libs/mutagen-1.44.0 b/metadata/md5-cache/media-libs/mutagen-1.44.0
index 6ab7e4e3bcc3..87b23d496a96 100644
--- a/metadata/md5-cache/media-libs/mutagen-1.44.0
+++ b/metadata/md5-cache/media-libs/mutagen-1.44.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/quodlibet/mutagen/releases/download/release-1.44.0/mutagen-1.44.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e8f3588f5ec08d069f9442da9e4de42b
diff --git a/metadata/md5-cache/media-libs/mutagen-1.45.1 b/metadata/md5-cache/media-libs/mutagen-1.45.1
index 70a2303d4508..ce97bde37678 100644
--- a/metadata/md5-cache/media-libs/mutagen-1.45.1
+++ b/metadata/md5-cache/media-libs/mutagen-1.45.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/quodlibet/mutagen/releases/download/release-1.45.1/mutagen-1.45.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e6dce502657fd24fa3128b1fb4025f4f
diff --git a/metadata/md5-cache/media-libs/openimageio-2.2.8.0 b/metadata/md5-cache/media-libs/openimageio-2.2.8.0-r1
similarity index 84%
rename from metadata/md5-cache/media-libs/openimageio-2.2.8.0
rename to metadata/md5-cache/media-libs/openimageio-2.2.8.0-r1
index 12d581f6d94e..4a74e4728600 100644
--- a/metadata/md5-cache/media-libs/openimageio-2.2.8.0
+++ b/metadata/md5-cache/media-libs/openimageio-2.2.8.0-r1
@@ -1,10 +1,10 @@
 BDEPEND=doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/boost-1.62:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= >=media-libs/libheif-1.7.0:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/opencolorio:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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_6? ( dev-libs/boost:=[python,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pybind11[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pybind11[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/boost-1.62:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= >=media-libs/libheif-1.7.0:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/opencolorio:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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_6? ( dev-libs/boost:=[python,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pybind11[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pybind11[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=A library for reading and writing images
 EAPI=7
 HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-IUSE=dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+IUSE=dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 ~ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/boost-1.62:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= >=media-libs/libheif-1.7.0:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/opencolorio:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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_6? ( dev-libs/boost:=[python,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pybind11[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pybind11[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=test
 SLOT=0/2.2
 SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-2.2.8.0.tar.gz -> openimageio-2.2.8.0.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=354c47d99141ca42b32981ae8ab780e5
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1ea1fa9194f557e329a86ca473d39ea0
diff --git a/metadata/md5-cache/media-libs/openimageio-2.2.9.0-r1 b/metadata/md5-cache/media-libs/openimageio-2.2.9.0-r1
new file mode 100644
index 000000000000..f91af2387d61
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openimageio-2.2.9.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/boost-1.62:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= >=media-libs/libheif-1.7.0:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/opencolorio:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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_6? ( dev-libs/boost:=[python,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pybind11[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pybind11[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=A library for reading and writing images
+EAPI=7
+HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
+IUSE=dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/boost-1.62:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= >=media-libs/libheif-1.7.0:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= media-libs/opencolorio:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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_6? ( dev-libs/boost:=[python,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pybind11[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pybind11[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+RESTRICT=test
+SLOT=0/2.2
+SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-2.2.9.0.tar.gz -> openimageio-2.2.9.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=809bbff17f6bb14cc5f709a9a1eca404
diff --git a/metadata/md5-cache/media-libs/osl-1.10.13 b/metadata/md5-cache/media-libs/osl-1.10.13
new file mode 100644
index 000000000000..76010ebba9c5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/osl-1.10.13
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:= dev-libs/pugixml media-libs/openexr:= media-libs/openimageio:= <sys-devel/clang-11:= sys-libs/zlib partio? ( media-libs/partio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !!sys-devel/llvm:0
+DESCRIPTION=Advanced shading language for production GI renderers
+EAPI=7
+HOMEPAGE=http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage
+IUSE=doc partio qt5 test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= dev-libs/pugixml media-libs/openexr:= media-libs/openimageio:= <sys-devel/clang-11:= sys-libs/zlib partio? ( media-libs/partio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+RESTRICT=test
+SLOT=0/10
+SRC_URI=https://github.com/imageworks/OpenShadingLanguage/archive/Release-1.10.13.tar.gz -> osl-1.10.13.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fea6dff394760282737ed60f3090cc56
diff --git a/metadata/md5-cache/media-libs/osl-1.11.9.0 b/metadata/md5-cache/media-libs/osl-1.11.9.0
new file mode 100644
index 000000000000..16432327b3c9
--- /dev/null
+++ b/metadata/md5-cache/media-libs/osl-1.11.9.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:= dev-libs/pugixml media-libs/openexr:= media-libs/openimageio:= <sys-devel/clang-11:= sys-libs/zlib partio? ( media-libs/partio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) dev-python/pybind11 !!sys-devel/llvm:0
+DESCRIPTION=Advanced shading language for production GI renderers
+EAPI=7
+HOMEPAGE=http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage
+IUSE=doc partio qt5 test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= dev-libs/pugixml media-libs/openexr:= media-libs/openimageio:= <sys-devel/clang-11:= sys-libs/zlib partio? ( media-libs/partio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+RESTRICT=test
+SLOT=0/11
+SRC_URI=https://github.com/imageworks/OpenShadingLanguage/archive/Release-1.11.9.0.tar.gz -> osl-1.11.9.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=efe116199f0dc897f8afb2211b8a4ae0
diff --git a/metadata/md5-cache/media-libs/plib-1.8.5-r1 b/metadata/md5-cache/media-libs/plib-1.8.5-r1
deleted file mode 100644
index 1f4de2f0d2f0..000000000000
--- a/metadata/md5-cache/media-libs/plib-1.8.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=virtual/opengl >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=multimedia library used by many games
-EAPI=5
-HOMEPAGE=http://plib.sourceforge.net/
-KEYWORDS=~alpha amd64 hppa ppc sparc x86
-LICENSE=LGPL-2
-RDEPEND=virtual/opengl
-SLOT=0
-SRC_URI=http://plib.sourceforge.net/dist/plib-1.8.5.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=62365146cda7321580790ecef8339c7a
diff --git a/metadata/md5-cache/media-libs/portmidi-217-r3 b/metadata/md5-cache/media-libs/portmidi-217-r3
index 7841105268fd..4e3dfd780423 100644
--- a/metadata/md5-cache/media-libs/portmidi-217-r3
+++ b/metadata/md5-cache/media-libs/portmidi-217-r3
@@ -11,5 +11,5 @@ RDEPEND=media-libs/alsa-lib python? ( python_targets_python3_6? ( dev-lang/pytho
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/portmedia/portmidi-src-217.zip
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b43d6711596e82187349d4fb862f7253
diff --git a/metadata/md5-cache/media-libs/raspberrypi-userland-0_pre20201022 b/metadata/md5-cache/media-libs/raspberrypi-userland-0_pre20201022
index f84022da7f37..fc66866c558e 100644
--- a/metadata/md5-cache/media-libs/raspberrypi-userland-0_pre20201022
+++ b/metadata/md5-cache/media-libs/raspberrypi-userland-0_pre20201022
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Raspberry Pi userspace tools and libraries
 EAPI=7
 HOMEPAGE=https://github.com/raspberrypi/userland
-KEYWORDS=~arm ~arm64
+KEYWORDS=arm ~arm64
 LICENSE=BSD
 RDEPEND=acct-group/video !media-libs/raspberrypi-userland-bin
 SLOT=0
 SRC_URI=https://github.com/raspberrypi/userland/archive/e432bc3400401064e2d8affa5d1454aac2cf4a00.tar.gz -> raspberrypi-userland-0_pre20201022.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1c8c2bfd564ada004c81bc6ce46cde9
+_md5_=d6cc57a5b91929536afc3086026bbacd
diff --git a/metadata/md5-cache/media-libs/sdl-gfx-2.0.25 b/metadata/md5-cache/media-libs/sdl-gfx-2.0.25
deleted file mode 100644
index bbeaba3d42d4..000000000000
--- a/metadata/md5-cache/media-libs/sdl-gfx-2.0.25
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/libsdl-1.2.15-r4[video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Graphics drawing primitives library for SDL
-EAPI=5
-HOMEPAGE=http://www.ferzkopp.net/joomla/content/view/19/14/
-IUSE=doc cpu_flags_x86_mmx 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=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=ZLIB
-RDEPEND=>=media-libs/libsdl-1.2.15-r4[video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.25.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=552eef057f21593776eec7a24261e401
diff --git a/metadata/md5-cache/media-libs/urt-3.1b-r3 b/metadata/md5-cache/media-libs/urt-3.1b-r3
index f39d790cdd13..f71809629cc1 100644
--- a/metadata/md5-cache/media-libs/urt-3.1b-r3
+++ b/metadata/md5-cache/media-libs/urt-3.1b-r3
@@ -4,10 +4,10 @@ DESCRIPTION=the Utah Raster Toolkit is a library for dealing with raster images
 EAPI=6
 HOMEPAGE=https://www.cs.utah.edu/gdc/projects/urt/
 IUSE=gif postscript static-libs tiff tools X
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=URT gif? ( free-noncomm )
 RDEPEND=X? ( x11-libs/libXext ) gif? ( media-libs/giflib ) postscript? ( app-text/ghostscript-gpl ) tiff? ( media-libs/tiff:= )
 SLOT=0/3.1b-r2
 SRC_URI=ftp://ftp.iastate.edu/pub/utah-raster/urt-3.1b.tar.Z
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b20711385886c89ebab241f9cbf7ee7c
+_md5_=eb6bad09cd625986677b13c0fb774d8c
diff --git a/metadata/md5-cache/media-libs/wxsvg-1.5.9 b/metadata/md5-cache/media-libs/wxsvg-1.5.9
deleted file mode 100644
index b18dbbe56422..000000000000
--- a/metadata/md5-cache/media-libs/wxsvg-1.5.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/expat-2:= >=dev-libs/glib-2.28:2= dev-libs/libxml2:= media-libs/fontconfig:= media-libs/freetype:2= x11-libs/cairo:= x11-libs/pango:= x11-libs/wxGTK:3.0=[X] >=media-video/ffmpeg-2.6:0= virtual/pkgconfig
-DESCRIPTION=C++ library to create, manipulate and render SVG files
-EAPI=5
-HOMEPAGE=http://wxsvg.sourceforge.net/
-IUSE=static-libs
-KEYWORDS=amd64 x86
-LICENSE=wxWinLL-3
-RDEPEND=>=dev-libs/expat-2:= >=dev-libs/glib-2.28:2= dev-libs/libxml2:= media-libs/fontconfig:= media-libs/freetype:2= x11-libs/cairo:= x11-libs/pango:= x11-libs/wxGTK:3.0=[X] >=media-video/ffmpeg-2.6:0=
-SLOT=0/3
-SRC_URI=mirror://sourceforge/wxsvg/wxsvg-1.5.9.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=6d8bfb96a629bf8293ec38ebb69598f3
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 96210e08f959..959998a5df46 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/xbmc-addon-xvdr-9999 b/metadata/md5-cache/media-plugins/xbmc-addon-xvdr-9999
deleted file mode 100644
index b1f1d15ae100..000000000000
--- a/metadata/md5-cache/media-plugins/xbmc-addon-xvdr-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure info install prepare unpack
-DESCRIPTION=XBMC addon: add VDR (http://www.tvdr.de/) as a TV/PVR Backend
-EAPI=7
-HOMEPAGE=https://github.com/pipelka/xbmc-addon-xvdr
-LICENSE=GPL-2
-PROPERTIES=live
-SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b23ca762e676c9ca3b60ad196e6fb536
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 814798bed7f0..fd946bf95c16 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/alsa-tools-1.2.2-r1 b/metadata/md5-cache/media-sound/alsa-tools-1.2.2-r1
index 90019c3eb6b9..eb41f7c6e5e5 100644
--- a/metadata/md5-cache/media-sound/alsa-tools-1.2.2-r1
+++ b/metadata/md5-cache/media-sound/alsa-tools-1.2.2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Advanced Linux Sound Architecture tools
 EAPI=7
 HOMEPAGE=https://alsa-project.org/
 IUSE=fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712 alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.2.2 >=dev-python/pyalsa-1.0.26 fltk? ( >=x11-libs/fltk-1.3.0:1 ) gtk? ( dev-libs/gobject-introspection x11-libs/gtk+:2 x11-libs/gtk+:3 ) gtk? ( media-fonts/font-misc-misc )
 SLOT=0.9
 SRC_URI=https://www.alsa-project.org/files/pub/tools/alsa-tools-1.2.2.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=548996b1e9b5dbe9c5871e79428021ed
+_md5_=edfd9d103401b3eac63bb40b6b6710ad
diff --git a/metadata/md5-cache/media-sound/audiotools-3.1.1 b/metadata/md5-cache/media-sound/audiotools-3.1.1
index e7c70b8bcdf4..6325b5f22376 100644
--- a/metadata/md5-cache/media-sound/audiotools-3.1.1
+++ b/metadata/md5-cache/media-sound/audiotools-3.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/audiotools/audiotools-3.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e6f3df4d39d36b3f71bac04fbcaae5a8
diff --git a/metadata/md5-cache/media-sound/beets-1.4.9-r2 b/metadata/md5-cache/media-sound/beets-1.4.9-r2
index b4978b7d2aff..3f5554b410db 100644
--- a/metadata/md5-cache/media-sound/beets-1.4.9-r2
+++ b/metadata/md5-cache/media-sound/beets-1.4.9-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/beets/beets-1.4.9.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dcaf3d57b1d5d4aa57de2ec691ed4c04
diff --git a/metadata/md5-cache/media-sound/beets-9999 b/metadata/md5-cache/media-sound/beets-9999
index 4df927e3d2d8..9cea5636fc00 100644
--- a/metadata/md5-cache/media-sound/beets-9999
+++ b/metadata/md5-cache/media-sound/beets-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7e7ed088cf9c2ceead2eca8015ce663f
diff --git a/metadata/md5-cache/media-sound/dcaenc-2 b/metadata/md5-cache/media-sound/dcaenc-2
deleted file mode 100644
index 9ee5d4afe98f..000000000000
--- a/metadata/md5-cache/media-sound/dcaenc-2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=alsa? ( media-libs/alsa-lib )
-DESCRIPTION=DTS Coherent Acoustics audio encoder
-EAPI=5
-HOMEPAGE=http://aepatrakov.narod.ru/index/0-2
-IUSE=alsa
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-SLOT=0
-SRC_URI=http://aepatrakov.narod.ru/olderfiles/1/dcaenc-2.tar.gz
-_md5_=007b81ad4c97fee2a3a122b1f18ed410
diff --git a/metadata/md5-cache/media-sound/frescobaldi-3.1.1 b/metadata/md5-cache/media-sound/frescobaldi-3.1.1
index 0a7b46450f05..1fa0804d39fd 100644
--- a/metadata/md5-cache/media-sound/frescobaldi-3.1.1
+++ b/metadata/md5-cache/media-sound/frescobaldi-3.1.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/PyQt5[gui,network,printsupport,svg,widgets,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/wbsoft/frescobaldi/releases/download/v3.1.1/frescobaldi-3.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00f99d75d7a9c15c1da1c0279f48e16f
diff --git a/metadata/md5-cache/media-sound/gpodder-3.10.16-r1 b/metadata/md5-cache/media-sound/gpodder-3.10.16-r1
index e02321ee4c31..db254064cd40 100644
--- a/metadata/md5-cache/media-sound/gpodder-3.10.16-r1
+++ b/metadata/md5-cache/media-sound/gpodder-3.10.16-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gpodder/gpodder/archive/3.10.16.tar.gz -> gpodder-3.10.16.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bf448fc28925be11ce7ed7ded2e2155f
diff --git a/metadata/md5-cache/media-sound/jack-4.0.0_pre20200706 b/metadata/md5-cache/media-sound/jack-4.0.0_pre20200706
index 2e69d9154e0c..95e6c7519ead 100644
--- a/metadata/md5-cache/media-sound/jack-4.0.0_pre20200706
+++ b/metadata/md5-cache/media-sound/jack-4.0.0_pre20200706
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_6? ( dev-python/python-discid[python_target
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jack-cli-cd-ripper/jack/archive/8e2004d7453f5d71d5e73032cbe7770b75bfbd41.tar.gz -> jack-4.0.0_pre20200706.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9569395c8e32e36cee2661a3bb6fa715
diff --git a/metadata/md5-cache/media-sound/jack2-1.9.16 b/metadata/md5-cache/media-sound/jack2-1.9.16
index 9239d9e180ee..c3c217b2c156 100644
--- a/metadata/md5-cache/media-sound/jack2-1.9.16
+++ b/metadata/md5-cache/media-sound/jack2-1.9.16
@@ -4,11 +4,11 @@ DESCRIPTION=Jackdmp jack implemention for multi-processor machine
 EAPI=6
 HOMEPAGE=https://jackaudio.org/
 IUSE=alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_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
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[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/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:* ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit:0
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( classic dbus )
 SLOT=2
 SRC_URI=https://github.com/jackaudio/jack2/archive/v1.9.16/v1.9.16.tar.gz -> jack2-1.9.16.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=0e72cec55c192bb9f9aa54215c5d0c12
+_md5_=bdf59e41718924e7359ced436a5989c4
diff --git a/metadata/md5-cache/media-sound/marrie-0.4 b/metadata/md5-cache/media-sound/marrie-0.4
index f9137c38e77f..3b2437a51030 100644
--- a/metadata/md5-cache/media-sound/marrie-0.4
+++ b/metadata/md5-cache/media-sound/marrie-0.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/feedparser[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/marrie/marrie-0.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ec7525130d1c1dc9f999a36c4ab9319c
diff --git a/metadata/md5-cache/media-sound/marrie-9999 b/metadata/md5-cache/media-sound/marrie-9999
index 8d7ea5bb5fb7..34cbae0f7248 100644
--- a/metadata/md5-cache/media-sound/marrie-9999
+++ b/metadata/md5-cache/media-sound/marrie-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/feedparser[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ec7525130d1c1dc9f999a36c4ab9319c
diff --git a/metadata/md5-cache/media-sound/mps-youtube-0.2.8-r2 b/metadata/md5-cache/media-sound/mps-youtube-0.2.8-r2
index 12dc0c491501..27d5af18d8ae 100644
--- a/metadata/md5-cache/media-sound/mps-youtube-0.2.8-r2
+++ b/metadata/md5-cache/media-sound/mps-youtube-0.2.8-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pafy[python_targets_python3_6(-)?,python_targets_python3_7(-)
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mps-youtube/mps-youtube-0.2.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c40b4290dbfe4407eca66f712c88b009
diff --git a/metadata/md5-cache/media-sound/mps-youtube-9999 b/metadata/md5-cache/media-sound/mps-youtube-9999
index e21a13670b28..d88fdb947e60 100644
--- a/metadata/md5-cache/media-sound/mps-youtube-9999
+++ b/metadata/md5-cache/media-sound/mps-youtube-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/pafy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] media-video/ffmpeg || ( media-video/mpv media-video/mplayer ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c40b4290dbfe4407eca66f712c88b009
diff --git a/metadata/md5-cache/media-sound/mumble-1.3.3 b/metadata/md5-cache/media-sound/mumble-1.3.3
index 211fcf79b5c1..cbaa6144d697 100644
--- a/metadata/md5-cache/media-sound/mumble-1.3.3
+++ b/metadata/md5-cache/media-sound/mumble-1.3.3
@@ -5,10 +5,10 @@ DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat softw
 EAPI=7
 HOMEPAGE=https://wiki.mumble.info
 IUSE=+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf 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 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 x86
 LICENSE=BSD MIT
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/speex-1.2.0 media-libs/speexdsp sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) g15? ( app-misc/g15daemon ) jack? ( virtual/jack ) !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) libressl? ( dev-libs/libressl ) opus? ( >=media-libs/opus-1.0.1 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 SLOT=0
 SRC_URI=https://github.com/mumble-voip/mumble/releases/download/1.3.3/mumble-1.3.3.tar.gz https://dl.mumble.info/mumble-1.3.3.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca797290848238c6b7ad2bcaae61144c
+_md5_=1609c353bac2187f1364649c830d54c7
diff --git a/metadata/md5-cache/media-sound/murmur-1.3.3 b/metadata/md5-cache/media-sound/murmur-1.3.3
index 90e4b139875f..9ebc0715f8c9 100644
--- a/metadata/md5-cache/media-sound/murmur-1.3.3
+++ b/metadata/md5-cache/media-sound/murmur-1.3.3
@@ -5,10 +5,10 @@ DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat softw
 EAPI=7
 HOMEPAGE=https://wiki.mumble.info
 IUSE=+dbus debug +ice pch zeroconf
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm x86
 LICENSE=BSD
 RDEPEND=acct-group/murmur acct-user/murmur >=dev-libs/openssl-1.0.0b:0= >=dev-libs/protobuf-2.2.0:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 || ( dev-qt/qtsql:5[sqlite] dev-qt/qtsql:5[mysql] ) dev-qt/qtxml:5 sys-apps/lsb-release >=sys-libs/libcap-2.15 dbus? ( dev-qt/qtdbus:5 ) ice? ( dev-libs/Ice:= ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 SLOT=0
 SRC_URI=https://github.com/mumble-voip/mumble/releases/download/1.3.3/mumble-1.3.3.tar.gz https://dl.mumble.info/mumble-1.3.3.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=13344d7d693f1ff4723f450156cbfb9b
+_md5_=71a18b0bd349bbf39285124b5655b025
diff --git a/metadata/md5-cache/media-sound/picard-2.4.2 b/metadata/md5-cache/media-sound/picard-2.4.2
index c2e4b80da1e4..69aa6eb8eb91 100644
--- a/metadata/md5-cache/media-sound/picard-2.4.2
+++ b/metadata/md5-cache/media-sound/picard-2.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://musicbrainz.osuosl.org/pub/musicbrainz/picard/picard-2.4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7fa4572da646ea75041f940b932a097
diff --git a/metadata/md5-cache/media-sound/picard-9999 b/metadata/md5-cache/media-sound/picard-9999
index 91b27ec44390..55d37b17997e 100644
--- a/metadata/md5-cache/media-sound/picard-9999
+++ b/metadata/md5-cache/media-sound/picard-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/PyQt5[declarative,gui,netwo
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d61b1939ecb06992deb42c5aec6de2c3
diff --git a/metadata/md5-cache/media-sound/pulsemixer-1.5.1 b/metadata/md5-cache/media-sound/pulsemixer-1.5.1
index e06a8d06841c..cf65e2b4e8f1 100644
--- a/metadata/md5-cache/media-sound/pulsemixer-1.5.1
+++ b/metadata/md5-cache/media-sound/pulsemixer-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=media-sound/pulseaudio python_targets_python3_6? ( dev-lang/python:3.6[n
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/GeorgeFilipkin/pulsemixer/archive/1.5.1.tar.gz -> pulsemixer-1.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=074f7ab342912b4c08bb03682177413a
diff --git a/metadata/md5-cache/media-sound/pulsemixer-9999 b/metadata/md5-cache/media-sound/pulsemixer-9999
index c60aa3f152fa..b9ed593b0402 100644
--- a/metadata/md5-cache/media-sound/pulsemixer-9999
+++ b/metadata/md5-cache/media-sound/pulsemixer-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=media-sound/pulseaudio python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d3dd0934aece42a7a12b22767a6fe83d
diff --git a/metadata/md5-cache/media-sound/qtractor-0.9.18 b/metadata/md5-cache/media-sound/qtractor-0.9.18
index 724a9eeb4699..d11aa6ff108a 100644
--- a/metadata/md5-cache/media-sound/qtractor-0.9.18
+++ b/metadata/md5-cache/media-sound/qtractor-0.9.18
@@ -5,10 +5,10 @@ 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 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/ladspa-sdk media-libs/libsndfile >=media-libs/lilv-0.16.0 media-libs/lv2 media-libs/suil virtual/jack aubio? ( media-libs/aubio ) dssi? ( media-libs/dssi ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/qtractor/qtractor-0.9.18.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=820b8f23d4b4a030e338688b2e9711bb
+_md5_=0f5f0e19da94b0286c47ba0a04a8623d
diff --git a/metadata/md5-cache/media-sound/quodlibet-4.2.1 b/metadata/md5-cache/media-sound/quodlibet-4.2.1
index 9c5c4c9bdd85..10d751c80028 100644
--- a/metadata/md5-cache/media-sound/quodlibet-4.2.1
+++ b/metadata/md5-cache/media-sound/quodlibet-4.2.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/keybinder:3[introspection] dev-python/feedparser[python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/quodlibet/quodlibet/archive/release-4.2.1.tar.gz -> quodlibet-4.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d8196f4f72f7dc2d2ee03e6e587de62a
diff --git a/metadata/md5-cache/media-sound/quodlibet-4.3.0 b/metadata/md5-cache/media-sound/quodlibet-4.3.0
index b96584e33dc4..0b402ba729a1 100644
--- a/metadata/md5-cache/media-sound/quodlibet-4.3.0
+++ b/metadata/md5-cache/media-sound/quodlibet-4.3.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/keybinder:3[introspection] dev-python/feedparser[python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/quodlibet/quodlibet/archive/release-4.3.0.tar.gz -> quodlibet-4.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ff98c089b682b08335051a654f3ca58
diff --git a/metadata/md5-cache/media-sound/sonata-1.7_beta1_p20200212 b/metadata/md5-cache/media-sound/sonata-1.7_beta1_p20200212
index acbc24bfd71e..adaceaf1f529 100644
--- a/metadata/md5-cache/media-sound/sonata-1.7_beta1_p20200212
+++ b/metadata/md5-cache/media-sound/sonata-1.7_beta1_p20200212
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/multani/sonata/archive/0c807e593f7571a654ad055cb126652d7f3a698d.tar.gz -> sonata-1.7_beta1_p20200212.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9e8b28cb39b0d1f605c49a664a1b6075
diff --git a/metadata/md5-cache/media-sound/whipper-0.9.0 b/metadata/md5-cache/media-sound/whipper-0.9.0
index 9a8fc4f518cf..48fb0549aee6 100644
--- a/metadata/md5-cache/media-sound/whipper-0.9.0
+++ b/metadata/md5-cache/media-sound/whipper-0.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whipper-team/whipper/archive/v0.9.0.tar.gz -> whipper-0.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1f72cf4e0043308afc9b6a805c39dad2
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 6c1a40a63c43..dc484eefaf4f 100644
Binary files a/metadata/md5-cache/media-tv/Manifest.gz and b/metadata/md5-cache/media-tv/Manifest.gz differ
diff --git a/metadata/md5-cache/media-tv/tvnamer-2.4 b/metadata/md5-cache/media-tv/tvnamer-2.4
index d81c83b3295e..d7d69cea3656 100644
--- a/metadata/md5-cache/media-tv/tvnamer-2.4
+++ b/metadata/md5-cache/media-tv/tvnamer-2.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/tvdb_api-1.10_pre[python_targets_python3_6(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tvnamer/tvnamer-2.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d41637c4dc45cfaf266014c3cc4546da
diff --git a/metadata/md5-cache/media-tv/tvnamer-2.5 b/metadata/md5-cache/media-tv/tvnamer-2.5
index 31102af477fd..d1a136f0944e 100644
--- a/metadata/md5-cache/media-tv/tvnamer-2.5
+++ b/metadata/md5-cache/media-tv/tvnamer-2.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/tvdb_api-1.10_pre[python_targets_python3_6(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tvnamer/tvnamer-2.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f94e756fec5b7ed978eb6e35199ac2c3
diff --git a/metadata/md5-cache/media-tv/w_scan-20170107 b/metadata/md5-cache/media-tv/w_scan-20170107
index 79d1695658ae..91df2742b027 100644
--- a/metadata/md5-cache/media-tv/w_scan-20170107
+++ b/metadata/md5-cache/media-tv/w_scan-20170107
@@ -4,8 +4,8 @@ DESCRIPTION=Scan DVB-C/DVB-T/DVB-S channels
 EAPI=7
 HOMEPAGE=http://wirbel.htpc-forum.de/w_scan/index2.html
 IUSE=doc examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://wirbel.htpc-forum.de/w_scan/w_scan-20170107.tar.bz2
-_md5_=7c98c5859cb1d57109c94c2bfac6fce5
+_md5_=e23d3987746134fc72924024bb667fcb
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index a7c87bf71f56..8b43ce8acd59 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/devedeng-4.16.0-r1 b/metadata/md5-cache/media-video/devedeng-4.16.0-r1
index 7087a7d92e5b..54a5d9cc09d1 100644
--- a/metadata/md5-cache/media-video/devedeng-4.16.0-r1
+++ b/metadata/md5-cache/media-video/devedeng-4.16.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://gitlab.com/rastersoft/devedeng/-/archive/4.16.0/devedeng-4.16.0.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ebf60a7fc282862df53d9af2eba2f40b
diff --git a/metadata/md5-cache/media-video/gaupol-1.8-r1 b/metadata/md5-cache/media-video/gaupol-1.8-r1
index ed784de892d4..24bcc503f8af 100644
--- a/metadata/md5-cache/media-video/gaupol-1.8-r1
+++ b/metadata/md5-cache/media-video/gaupol-1.8-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/otsaloma/gaupol/archive/1.8.tar.gz -> gaupol-1.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8216b245f46c1b0598e1b039a408d98c
diff --git a/metadata/md5-cache/media-video/gaupol-1.8-r2 b/metadata/md5-cache/media-video/gaupol-1.8-r2
index 3599078bef3f..397eafa10993 100644
--- a/metadata/md5-cache/media-video/gaupol-1.8-r2
+++ b/metadata/md5-cache/media-video/gaupol-1.8-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/otsaloma/gaupol/archive/1.8.tar.gz -> gaupol-1.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e88538321a1ca988af53e84d6f5a7dea
diff --git a/metadata/md5-cache/media-video/gxine-0.5.907-r1 b/metadata/md5-cache/media-video/gxine-0.5.907-r1
deleted file mode 100644
index 3068919df0f0..000000000000
--- a/metadata/md5-cache/media-video/gxine-0.5.907-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=media-libs/xine-lib-1.1.20 x11-libs/gtk+:2 >=dev-libs/glib-2 >=dev-lang/spidermonkey-1.8.2.15:0 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) nsplugin? ( dev-libs/nspr x11-libs/libXaw x11-libs/libXt ) udev? ( dev-libs/libgudev:= ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/unzip
-DESCRIPTION=GTK+ Front-End for libxine
-EAPI=5
-HOMEPAGE=http://xine.sourceforge.net/
-IUSE=l10n_cs l10n_de lirc nls nsplugin udev +xcb xinerama
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/xine/gxine-0.5.907.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mozextension	798d8c84c9e7a8105e56c9eb6626e643	multilib	d410501a125f99ffb560b0c523cd3d1e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2e857ddf45400b940b99d5cf25bd37fc
diff --git a/metadata/md5-cache/media-video/harvid-0.8.0 b/metadata/md5-cache/media-video/harvid-0.8.0
deleted file mode 100644
index 781e76aef250..000000000000
--- a/metadata/md5-cache/media-video/harvid-0.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=media-video/ffmpeg-2.6:0= media-libs/libpng:0= virtual/jpeg:0 virtual/pkgconfig
-DESCRIPTION=HTTP Ardour Video Daemon
-EAPI=5
-HOMEPAGE=http://x42.github.io/harvid/
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=media-video/ffmpeg-2.6:0= media-libs/libpng:0= virtual/jpeg:0
-SLOT=0
-SRC_URI=https://github.com/x42/harvid/archive/v0.8.0.tar.gz -> harvid-0.8.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7d14825439c5cb11502e97e435109cea
diff --git a/metadata/md5-cache/media-video/harvid-0.8.1 b/metadata/md5-cache/media-video/harvid-0.8.1
deleted file mode 100644
index 453717941f5a..000000000000
--- a/metadata/md5-cache/media-video/harvid-0.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=media-video/ffmpeg-2.6:0= media-libs/libpng:0= virtual/jpeg:0 virtual/pkgconfig
-DESCRIPTION=HTTP Ardour Video Daemon
-EAPI=5
-HOMEPAGE=http://x42.github.io/harvid/
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=media-video/ffmpeg-2.6:0= media-libs/libpng:0= virtual/jpeg:0
-SLOT=0
-SRC_URI=https://github.com/x42/harvid/archive/v0.8.1.tar.gz -> harvid-0.8.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9e8ba21f439320ecb00e92cca7575835
diff --git a/metadata/md5-cache/media-video/harvid-0.8.2 b/metadata/md5-cache/media-video/harvid-0.8.2
deleted file mode 100644
index 3e897d148e79..000000000000
--- a/metadata/md5-cache/media-video/harvid-0.8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=media-video/ffmpeg-2.6:0= media-libs/libpng:0= virtual/jpeg:0 virtual/pkgconfig
-DESCRIPTION=HTTP Ardour Video Daemon
-EAPI=5
-HOMEPAGE=http://x42.github.io/harvid/
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=media-video/ffmpeg-2.6:0= media-libs/libpng:0= virtual/jpeg:0
-SLOT=0
-SRC_URI=https://github.com/x42/harvid/archive/v0.8.2.tar.gz -> harvid-0.8.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9e8ba21f439320ecb00e92cca7575835
diff --git a/metadata/md5-cache/media-video/movit-1.2.0 b/metadata/md5-cache/media-video/movit-1.2.0
deleted file mode 100644
index a9944bbea69f..000000000000
--- a/metadata/md5-cache/media-video/movit-1.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile test
-DEPEND=media-libs/mesa[X(+)] >=dev-cpp/eigen-3.2.0:3 media-libs/libepoxy sci-libs/fftw media-libs/libsdl2
-DESCRIPTION=Modern Video Toolkit
-EAPI=5
-HOMEPAGE=https://movit.sesse.net/
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=media-libs/mesa[X(+)] >=dev-cpp/eigen-3.2.0:3 media-libs/libepoxy sci-libs/fftw media-libs/libsdl2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://movit.sesse.net/movit-1.2.0.tar.gz https://googletest.googlecode.com/files/gtest-1.7.0.zip
-_md5_=5e53a28c4b18dccf5fe61069fd1736ff
diff --git a/metadata/md5-cache/media-video/movit-1.6.1 b/metadata/md5-cache/media-video/movit-1.6.1
deleted file mode 100644
index b6c1bcb94fc0..000000000000
--- a/metadata/md5-cache/media-video/movit-1.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=media-libs/mesa[X(+)] >=dev-cpp/eigen-3.2.0:3 media-libs/libepoxy >=sci-libs/fftw-3 media-libs/libsdl2
-DESCRIPTION=Modern Video Toolkit
-EAPI=5
-HOMEPAGE=https://movit.sesse.net/
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=media-libs/mesa[X(+)] >=dev-cpp/eigen-3.2.0:3 media-libs/libepoxy >=sci-libs/fftw-3 media-libs/libsdl2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://movit.sesse.net/movit-1.6.1.tar.gz https://googletest.googlecode.com/files/gtest-1.7.0.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4c5dc0202bdd1fceafac06cf602ababb
diff --git a/metadata/md5-cache/media-video/mpeg-tools-1.5b-r4 b/metadata/md5-cache/media-video/mpeg-tools-1.5b-r4
deleted file mode 100644
index 555839ced160..000000000000
--- a/metadata/md5-cache/media-video/mpeg-tools-1.5b-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=x11-libs/libX11 virtual/jpeg:0
-DESCRIPTION=Tools for MPEG video
-EAPI=5
-HOMEPAGE=http://bmrc.berkeley.edu/research/mpeg/mpeg_encode.html
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=x11-libs/libX11 virtual/jpeg:0
-SLOT=0
-SRC_URI=ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/mpeg_encode-1.5b-src.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1b89f94d1a25b284a4f2add9df351426
diff --git a/metadata/md5-cache/media-video/openshot-2.4.0-r1 b/metadata/md5-cache/media-video/openshot-2.4.0-r1
index 82fb4a2be3aa..7e016b4c7884 100644
--- a/metadata/md5-cache/media-video/openshot-2.4.0-r1
+++ b/metadata/md5-cache/media-video/openshot-2.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_6? ( dev-python/httplib2[python_targets_pyt
 REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=1
 SRC_URI=https://launchpad.net/openshot/2.4/2.4.0/+download/openshot-qt-2.4.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=160f8bf846c51eb68d2b9e9d240f25c0
diff --git a/metadata/md5-cache/media-video/openshot-2.4.4-r1 b/metadata/md5-cache/media-video/openshot-2.4.4-r1
index 9c7511502528..ee45ef736244 100644
--- a/metadata/md5-cache/media-video/openshot-2.4.4-r1
+++ b/metadata/md5-cache/media-video/openshot-2.4.4-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-python/httplib2[python_targets_pyt
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=1
 SRC_URI=https://github.com/OpenShot/openshot-qt/archive/v2.4.4.tar.gz -> openshot-2.4.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=421e1b0c91f23b9b04e8b8d37e42dc4d
diff --git a/metadata/md5-cache/media-video/openshot-2.5.0 b/metadata/md5-cache/media-video/openshot-2.5.0
index 675e466bf8e8..cf526559301d 100644
--- a/metadata/md5-cache/media-video/openshot-2.5.0
+++ b/metadata/md5-cache/media-video/openshot-2.5.0
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-python/httplib2[python_targets_pyt
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=1
 SRC_URI=https://github.com/OpenShot/openshot-qt/archive/v2.5.0.tar.gz -> openshot-2.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f96247b7f2b51fd465ed6acdeac2d703
diff --git a/metadata/md5-cache/media-video/openshot-2.5.1 b/metadata/md5-cache/media-video/openshot-2.5.1
index 4aa00cdd218c..6fcbdbd383d4 100644
--- a/metadata/md5-cache/media-video/openshot-2.5.1
+++ b/metadata/md5-cache/media-video/openshot-2.5.1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-python/httplib2[python_targets_pyt
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=1
 SRC_URI=https://github.com/OpenShot/openshot-qt/archive/v2.5.1.tar.gz -> openshot-2.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb810f06a65cb1dae712542c5d9c5881
diff --git a/metadata/md5-cache/media-video/streamdeck-ui-0.0_p20200102-r1 b/metadata/md5-cache/media-video/streamdeck-ui-0.0_p20200102-r1
index b2ed165dc33c..7497f4fec434 100644
--- a/metadata/md5-cache/media-video/streamdeck-ui-0.0_p20200102-r1
+++ b/metadata/md5-cache/media-video/streamdeck-ui-0.0_p20200102-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/timothycrosley/streamdeck-ui/archive/9b6678d2d3027963ddac147ee3aeda322ec77f29.tar.gz -> streamdeck-ui-0.0_p20200102.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8ee15f5c2d191624a7e1412a41006644
diff --git a/metadata/md5-cache/media-video/streamdeck-ui-9999 b/metadata/md5-cache/media-video/streamdeck-ui-9999
index 6b41e424c039..e70910642fa5 100644
--- a/metadata/md5-cache/media-video/streamdeck-ui-9999
+++ b/metadata/md5-cache/media-video/streamdeck-ui-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pynput[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyside2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),designer] media-libs/elgato-streamdeck[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/hidapi python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8ee15f5c2d191624a7e1412a41006644
diff --git a/metadata/md5-cache/media-video/subliminal-2.1.0-r1 b/metadata/md5-cache/media-video/subliminal-2.1.0-r1
index a0170682fe59..97c898d17d6b 100644
--- a/metadata/md5-cache/media-video/subliminal-2.1.0-r1
+++ b/metadata/md5-cache/media-video/subliminal-2.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Diaoul/subliminal/archive/2.1.0.tar.gz -> subliminal-2.1.0.tar.gz test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5da328152777c59a52986700c6e08629
diff --git a/metadata/md5-cache/media-video/subliminal-9999 b/metadata/md5-cache/media-video/subliminal-9999
index 9fed46b634d3..26552f49d55f 100644
--- a/metadata/md5-cache/media-video/subliminal-9999
+++ b/metadata/md5-cache/media-video/subliminal-9999
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=12955f012490d5f6bf50e37086b9e1fa
diff --git a/metadata/md5-cache/media-video/vcsi-7-r1 b/metadata/md5-cache/media-video/vcsi-7-r1
index 1e0537c7d364..2e65625d9468 100644
--- a/metadata/md5-cache/media-video/vcsi-7-r1
+++ b/metadata/md5-cache/media-video/vcsi-7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/amietn/vcsi/archive/v7.tar.gz -> vcsi-7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=496cd2e86afa027d1407b359c44efd5a
diff --git a/metadata/md5-cache/media-video/vidcutter-6.0.0-r1 b/metadata/md5-cache/media-video/vidcutter-6.0.0-r1
index b7dcd6a5ea26..a007b9b59a99 100644
--- a/metadata/md5-cache/media-video/vidcutter-6.0.0-r1
+++ b/metadata/md5-cache/media-video/vidcutter-6.0.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=media-video/mpv-0.25[libmpv] >=dev-python/PyQt5-5.7[dbus,multimedia,py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ozmartian/vidcutter/archive/6.0.0.tar.gz -> vidcutter-6.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=612ae6b6e3eda6a288a215ad8937e0f4
diff --git a/metadata/md5-cache/media-video/vidcutter-9999 b/metadata/md5-cache/media-video/vidcutter-9999
index e61944dfd813..2f262ab3d452 100644
--- a/metadata/md5-cache/media-video/vidcutter-9999
+++ b/metadata/md5-cache/media-video/vidcutter-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=media-video/mpv-0.25[libmpv] >=dev-python/PyQt5-5.7[dbus,multimedia,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] media-video/ffmpeg[X,encode] media-video/mediainfo python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=612ae6b6e3eda6a288a215ad8937e0f4
diff --git a/metadata/md5-cache/media-video/webcamoid-8.7.1 b/metadata/md5-cache/media-video/webcamoid-8.7.1
index d95ac7f2f134..65091d182201 100644
--- a/metadata/md5-cache/media-video/webcamoid-8.7.1
+++ b/metadata/md5-cache/media-video/webcamoid-8.7.1
@@ -5,11 +5,11 @@ DESCRIPTION=A full featured webcam capture application
 EAPI=7
 HOMEPAGE=https://webcamoid.github.io
 IUSE=alsa coreaudio ffmpeg gstreamer jack libuvc oss pulseaudio qtaudio v4lutils videoeffects debug headers v4l
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=media-libs/gstreamer-1.6.0 ) jack? ( virtual/jack ) libuvc? ( media-libs/libuvc ) pulseaudio? ( media-sound/pulseaudio ) qtaudio? ( dev-qt/qtmultimedia:5 ) v4l? ( media-libs/libv4l )
 REQUIRED_USE=v4lutils? ( v4l )
 SLOT=0
 SRC_URI=https://github.com/webcamoid/webcamoid/archive/8.7.1.tar.gz -> webcamoid-8.7.1.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b3af2e178fb9531bdc1e614664470a99
+_md5_=4b480a435a90cf3ddf07b1979ba69d7f
diff --git a/metadata/md5-cache/media-video/yle-dl-20201022 b/metadata/md5-cache/media-video/yle-dl-20201022
index 5e94b0a9bc72..b6deee427c48 100644
--- a/metadata/md5-cache/media-video/yle-dl-20201022
+++ b/metadata/md5-cache/media-video/yle-dl-20201022
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aajanki/yle-dl/archive/20201022.tar.gz -> yle-dl-20201022.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=39177542d323795854ccf86b4a38f6b3
diff --git a/metadata/md5-cache/net-analyzer/2ping-4.4.1 b/metadata/md5-cache/net-analyzer/2ping-4.4.1
index dfa6e3017754..b5eab0bccb21 100644
--- a/metadata/md5-cache/net-analyzer/2ping-4.4.1
+++ b/metadata/md5-cache/net-analyzer/2ping-4.4.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.finnie.org/software/2ping/2ping-4.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c3118f260815de86a4ad96fe2c20c348
diff --git a/metadata/md5-cache/net-analyzer/2ping-4.5 b/metadata/md5-cache/net-analyzer/2ping-4.5
index 86764403c756..f683acf81017 100644
--- a/metadata/md5-cache/net-analyzer/2ping-4.5
+++ b/metadata/md5-cache/net-analyzer/2ping-4.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.finnie.org/software/2ping/2ping-4.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c3118f260815de86a4ad96fe2c20c348
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index e8fb22a85d39..7c1ff8aca861 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/bwping-2.1 b/metadata/md5-cache/net-analyzer/bwping-2.1
index 6c83d0ca931e..499a00a5f3cb 100644
--- a/metadata/md5-cache/net-analyzer/bwping-2.1
+++ b/metadata/md5-cache/net-analyzer/bwping-2.1
@@ -2,8 +2,8 @@ DEFINED_PHASES=test
 DESCRIPTION=A tool to measure bandwidth and RTT between two hosts using ICMP
 EAPI=7
 HOMEPAGE=https://bwping.sourceforge.io/
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=~amd64 ~sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/bwping/2.1/bwping-2.1.tar.gz
-_md5_=ecf228938963da4c11da210797d8267b
+_md5_=3022c12b7356a8bb87a0a25972e450d9
diff --git a/metadata/md5-cache/net-analyzer/carl-0.9-r3 b/metadata/md5-cache/net-analyzer/carl-0.9-r3
index c5d2157a1598..8a5280e56477 100644
--- a/metadata/md5-cache/net-analyzer/carl-0.9-r3
+++ b/metadata/md5-cache/net-analyzer/carl-0.9-r3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=http://www.schwarzvogel.de/pkgs/carl-0.9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f3aa9cf744feb63ca62cbbf7de79da5
diff --git a/metadata/md5-cache/net-analyzer/carl-0.9-r4 b/metadata/md5-cache/net-analyzer/carl-0.9-r4
index 924696250a9b..86dec33a6e12 100644
--- a/metadata/md5-cache/net-analyzer/carl-0.9-r4
+++ b/metadata/md5-cache/net-analyzer/carl-0.9-r4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.schwarzvogel.de/pkgs/carl-0.9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dc4c60a4e2a6fee934407811e4dffb1c
diff --git a/metadata/md5-cache/net-analyzer/etherape-0.9.19 b/metadata/md5-cache/net-analyzer/etherape-0.9.19
index 7f421b776960..4b8c1dd188f6 100644
--- a/metadata/md5-cache/net-analyzer/etherape-0.9.19
+++ b/metadata/md5-cache/net-analyzer/etherape-0.9.19
@@ -3,9 +3,9 @@ DEPEND=dev-libs/glib:2 dev-libs/popt net-libs/libpcap x11-libs/goocanvas:2.0 >=s
 DESCRIPTION=A graphical network monitor for Unix modeled after etherman
 EAPI=7
 HOMEPAGE=https://etherape.sourceforge.io/
-KEYWORDS=amd64 ppc ppc64 sparc x86
+KEYWORDS=amd64 ~arm64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/popt net-libs/libpcap x11-libs/goocanvas:2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/etherape/etherape-0.9.19.tar.gz
-_md5_=8ce5c7a4f8399f227fee31506621f778
+_md5_=60fbf7e31a1accd577314e98c5346bad
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.11.1-r2 b/metadata/md5-cache/net-analyzer/fail2ban-0.11.1-r2
index 8ebeab2fd71d..a0c76553bb0e 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.11.1-r2
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.11.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/fail2ban/fail2ban/archive/0.11.1.tar.gz -> fail2ban-0.11.1.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=06f86bf4ba201186969ad52bcec8be4d
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-99999999 b/metadata/md5-cache/net-analyzer/fail2ban-99999999
index de50e3ca9b28..6de31e80afc7 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-99999999
+++ b/metadata/md5-cache/net-analyzer/fail2ban-99999999
@@ -1,14 +1,14 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
 DESCRIPTION=scans log files and bans IPs that show malicious signs
 EAPI=7
 HOMEPAGE=https://www.fail2ban.org/
-IUSE=selinux systemd python_single_target_python3_6 python_single_target_python3_7
+IUSE=selinux systemd python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python3_6? ( || ( dev-python/python-systemd[python_targets_python3_6(-)] sys-apps/systemd[python(-),python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( || ( dev-python/python-systemd[python_targets_python3_7(-)] sys-apps/systemd[python(-),python_targets_python3_7(-)] ) ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RDEPEND=virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python3_6? ( || ( dev-python/python-systemd[python_targets_python3_6(-)] sys-apps/systemd[python(-),python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( || ( dev-python/python-systemd[python_targets_python3_7(-)] sys-apps/systemd[python(-),python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( || ( dev-python/python-systemd[python_targets_python3_8(-)] sys-apps/systemd[python(-),python_targets_python3_8(-)] ) ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7a35f36e1af57bdc0e1c33efab5c1f98
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fd91e780b867d316bf6b293dade408b3
diff --git a/metadata/md5-cache/net-analyzer/flent-1.3.2 b/metadata/md5-cache/net-analyzer/flent-1.3.2
index 3a12e14ad847..88dc3d7ad812 100644
--- a/metadata/md5-cache/net-analyzer/flent-1.3.2
+++ b/metadata/md5-cache/net-analyzer/flent-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=qt5? ( dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/tohojo/flent/archive/v1.3.2.tar.gz -> flent-1.3.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=84c80dc8ee09b67b99954d80249b8376
diff --git a/metadata/md5-cache/net-analyzer/graphite-web-1.1.5-r1 b/metadata/md5-cache/net-analyzer/graphite-web-1.1.5-r1
index 45cfd107c720..9159856658ec 100644
--- a/metadata/md5-cache/net-analyzer/graphite-web-1.1.5-r1
+++ b/metadata/md5-cache/net-analyzer/graphite-web-1.1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=carbon? ( dev-python/carbon[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/graphite-web/graphite-web-1.1.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=83a6b8c868d85fda88a437549169fc19
diff --git a/metadata/md5-cache/net-analyzer/graphite-web-1.1.7 b/metadata/md5-cache/net-analyzer/graphite-web-1.1.7
index 73c76d4ae767..a692f250e890 100644
--- a/metadata/md5-cache/net-analyzer/graphite-web-1.1.7
+++ b/metadata/md5-cache/net-analyzer/graphite-web-1.1.7
@@ -10,5 +10,5 @@ RDEPEND=carbon? ( dev-python/carbon[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/graphite-web/graphite-web-1.1.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4dd897b0147faba3264bc936771323e8
diff --git a/metadata/md5-cache/net-analyzer/gvm-tools-2.0.0-r1 b/metadata/md5-cache/net-analyzer/gvm-tools-2.0.0-r1
index 846d821a3864..0e5b765e89ca 100644
--- a/metadata/md5-cache/net-analyzer/gvm-tools-2.0.0-r1
+++ b/metadata/md5-cache/net-analyzer/gvm-tools-2.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/gvm-tools/archive/v2.0.0.tar.gz -> gvm-tools-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5bc9186f70dc2d8d00d3270ded1b40d8
diff --git a/metadata/md5-cache/net-analyzer/gvm-tools-2.1.0 b/metadata/md5-cache/net-analyzer/gvm-tools-2.1.0
index 03e26a3d8e63..8dcdfa1bb8f1 100644
--- a/metadata/md5-cache/net-analyzer/gvm-tools-2.1.0
+++ b/metadata/md5-cache/net-analyzer/gvm-tools-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/gvm-tools/archive/v2.1.0.tar.gz -> gvm-tools-2.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b1749dc5700a52bf0981451113d3f110
diff --git a/metadata/md5-cache/net-analyzer/iptraf-ng-1.2.1 b/metadata/md5-cache/net-analyzer/iptraf-ng-1.2.1
index a76d144c22b6..12f7e4f1d067 100644
--- a/metadata/md5-cache/net-analyzer/iptraf-ng-1.2.1
+++ b/metadata/md5-cache/net-analyzer/iptraf-ng-1.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=A console-based network monitoring utility
 EAPI=7
 HOMEPAGE=https://github.com/iptraf-ng/iptraf-ng
 IUSE=doc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2 doc? ( FDL-1.1 )
 RDEPEND=>=sys-libs/ncurses-5.7-r7:0=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iptraf-ng/iptraf-ng/archive/v1.2.1.tar.gz -> iptraf-ng-1.2.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4455f547ecd8fb5675e06d572c628943
+_md5_=6879822746ce73b396cb872a0c3bbe89
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729 b/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
index 726dafec9217..d03761440a61 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
+++ b/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linkchecker/linkchecker/archive/a977e4d7129450ba9fda8389724c80c1bde66883.tar.gz -> linkchecker-10.0.0_pre20200729.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9c6d4c5f6f5f35daaddc84fda31362fb
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-9999 b/metadata/md5-cache/net-analyzer/linkchecker-9999
index 9195e47b26b3..a134473ba638 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-9999
+++ b/metadata/md5-cache/net-analyzer/linkchecker-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/beautifulsoup[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e1b16e9b3b69aa463e17724dbf0abe28
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1 b/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1
index 3ccca9ac3c08..e1980722b427 100644
--- a/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1
+++ b/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/clarkbox/check_multiple/archive/v0.0.1.tar.gz -> nagios-check_multiple-0.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=098c106b43f53f357bf0014495b7e087
diff --git a/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r1 b/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r1
index 4047ecec91a0..ed939c8b70d5 100644
--- a/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r1
+++ b/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/liquidat/nagios-icinga-openvpn/archive/0.0.1.tar.gz -> nagios-icinga-openvpn-0.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2a4b4883b401d7195e738fc0285e93e1
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-flameeyes-9999 b/metadata/md5-cache/net-analyzer/nagios-plugins-flameeyes-9999
deleted file mode 100644
index a67e1503ef14..000000000000
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-flameeyes-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Flameeyes's custom Nagios/Icinga plugins
-EAPI=5
-HOMEPAGE=https://github.com/Flameeyes/nagios-plugins-flameeyes
-IUSE=smart samba
-LICENSE=MIT
-PROPERTIES=live
-RDEPEND=dev-perl/Monitoring-Plugin sys-apps/portage dev-perl/Time-Duration dev-perl/TimeDate smart? ( sys-apps/smartmontools app-admin/sudo ) samba? ( dev-perl/Filesys-SmbClient )
-SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=07c16cc76b14b75bbe36dfcf25bb97e1
diff --git a/metadata/md5-cache/net-analyzer/nagstamon-3.4.1-r1 b/metadata/md5-cache/net-analyzer/nagstamon-3.4.1-r1
index bb19c49c3096..a41f2616d300 100644
--- a/metadata/md5-cache/net-analyzer/nagstamon-3.4.1-r1
+++ b/metadata/md5-cache/net-analyzer/nagstamon-3.4.1-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-3.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=49653cc4d7ba717a42a71826f933f149
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r2 b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r2
index 5d5334090274..f5b6ff008452 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r2
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=test
 SLOT=0/40
 SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz https://dev.gentoo.org/~jer/net-snmp-5.9.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d759c7dabae96e632eaee5689ba62246
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-99999999 b/metadata/md5-cache/net-analyzer/net-snmp-99999999
index e913903d5d75..6993611f3c76 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-99999999
+++ b/metadata/md5-cache/net-analyzer/net-snmp-99999999
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=test
 SLOT=0/40
 SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c8f8c0b9145b51a9d52c3a43f7fffe4e
diff --git a/metadata/md5-cache/net-analyzer/ospd-2.0.1 b/metadata/md5-cache/net-analyzer/ospd-2.0.1
index cfc162d53cd1..8d7857eb63ef 100644
--- a/metadata/md5-cache/net-analyzer/ospd-2.0.1
+++ b/metadata/md5-cache/net-analyzer/ospd-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/ospd/archive/v2.0.1.tar.gz -> ospd-2.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=872af8fec16435d523f7cc8375824684
diff --git a/metadata/md5-cache/net-analyzer/ospd-openvas-1.0.1 b/metadata/md5-cache/net-analyzer/ospd-openvas-1.0.1
index 2f6bfdb8bef2..8af25de9b9e7 100644
--- a/metadata/md5-cache/net-analyzer/ospd-openvas-1.0.1
+++ b/metadata/md5-cache/net-analyzer/ospd-openvas-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/ospd-openvas/archive/v1.0.1.tar.gz -> ospd-openvas-1.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=03c4949afea6111fee47e7866530f363
diff --git a/metadata/md5-cache/net-analyzer/prelude-correlator-4.0.0 b/metadata/md5-cache/net-analyzer/prelude-correlator-4.0.0
index 070b4e1b7f62..ff0ff71c370a 100644
--- a/metadata/md5-cache/net-analyzer/prelude-correlator-4.0.0
+++ b/metadata/md5-cache/net-analyzer/prelude-correlator-4.0.0
@@ -10,5 +10,5 @@ RDEPEND=~dev-libs/libprelude-4.0.0[python,python_targets_python3_6(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/4.0.0/prelude-correlator-4.0.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae223742b36b0dcb7659043c423be011
diff --git a/metadata/md5-cache/net-analyzer/prelude-correlator-4.1.1 b/metadata/md5-cache/net-analyzer/prelude-correlator-4.1.1
index 73169c1301d4..66dc7bee63db 100644
--- a/metadata/md5-cache/net-analyzer/prelude-correlator-4.1.1
+++ b/metadata/md5-cache/net-analyzer/prelude-correlator-4.1.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-libs/libprelude-4.1.0[python,python_targets_python3_6(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/4.1.0/prelude-correlator-4.1.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d11bf89d062cb4a183bb9a5dab1afdc
diff --git a/metadata/md5-cache/net-analyzer/prelude-correlator-5.1.0 b/metadata/md5-cache/net-analyzer/prelude-correlator-5.1.0
index 95106bbe4107..0afb50b4782d 100644
--- a/metadata/md5-cache/net-analyzer/prelude-correlator-5.1.0
+++ b/metadata/md5-cache/net-analyzer/prelude-correlator-5.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libprelude-5.1.0[python,python_targets_python3_6(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.1.0/prelude-correlator-5.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f59aef24c633a02830299c8c23ad71e2
diff --git a/metadata/md5-cache/net-analyzer/prelude-correlator-5.2.0 b/metadata/md5-cache/net-analyzer/prelude-correlator-5.2.0
index f21f5d076e54..fb7fa7b59b14 100644
--- a/metadata/md5-cache/net-analyzer/prelude-correlator-5.2.0
+++ b/metadata/md5-cache/net-analyzer/prelude-correlator-5.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libprelude-5.2.0[python,python_targets_python3_6(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/prelude-correlator-5.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d214e2ff843081e12d8c4511bf9a234e
diff --git a/metadata/md5-cache/net-analyzer/pypacker-4.8 b/metadata/md5-cache/net-analyzer/pypacker-4.8
index c1bc5c0f5ce8..c25c9b23f863 100644
--- a/metadata/md5-cache/net-analyzer/pypacker-4.8
+++ b/metadata/md5-cache/net-analyzer/pypacker-4.8
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitlab.com/mike01/pypacker/-/archive/v4.8/pypacker-v4.8.tar.gz -> pypacker-4.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=46d0bf6a0546228958e07855ce9648a1
diff --git a/metadata/md5-cache/net-analyzer/pypacker-4.9 b/metadata/md5-cache/net-analyzer/pypacker-4.9
index 49c6d05fb951..a52ef1d3b54c 100644
--- a/metadata/md5-cache/net-analyzer/pypacker-4.9
+++ b/metadata/md5-cache/net-analyzer/pypacker-4.9
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitlab.com/mike01/pypacker/-/archive/v4.9/pypacker-v4.9.tar.gz -> pypacker-4.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=46d0bf6a0546228958e07855ce9648a1
diff --git a/metadata/md5-cache/net-analyzer/python-gvm-1.1.0 b/metadata/md5-cache/net-analyzer/python-gvm-1.1.0
index 6be1d7f0c899..ac43ed1375fa 100644
--- a/metadata/md5-cache/net-analyzer/python-gvm-1.1.0
+++ b/metadata/md5-cache/net-analyzer/python-gvm-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/python-gvm/archive/v1.1.0.tar.gz -> python-gvm-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c7d823c7332963521d12da58b71d2d27
diff --git a/metadata/md5-cache/net-analyzer/python-gvm-1.2.0 b/metadata/md5-cache/net-analyzer/python-gvm-1.2.0
index f0bc78842eaa..5b6a77e61ebb 100644
--- a/metadata/md5-cache/net-analyzer/python-gvm-1.2.0
+++ b/metadata/md5-cache/net-analyzer/python-gvm-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/python-gvm/archive/v1.2.0.tar.gz -> python-gvm-1.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b92e06b455626ad6ee380c6d48f4984e
diff --git a/metadata/md5-cache/net-analyzer/python-gvm-1.5.0 b/metadata/md5-cache/net-analyzer/python-gvm-1.5.0
index a370e0ed34af..31993091a4b0 100644
--- a/metadata/md5-cache/net-analyzer/python-gvm-1.5.0
+++ b/metadata/md5-cache/net-analyzer/python-gvm-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/python-gvm/archive/v1.5.0.tar.gz -> python-gvm-1.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=71b88ee5e603ab8c244ded84ca6f9ae3
diff --git a/metadata/md5-cache/net-analyzer/python-gvm-1.6.0 b/metadata/md5-cache/net-analyzer/python-gvm-1.6.0
index cab50938fff6..feb37df91a12 100644
--- a/metadata/md5-cache/net-analyzer/python-gvm-1.6.0
+++ b/metadata/md5-cache/net-analyzer/python-gvm-1.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/python-gvm/archive/v1.6.0.tar.gz -> python-gvm-1.6.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3a5f3a144eb591897b0c3ccd9b93e26b
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2
index 1767e974c74c..049d2ccb5d11 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0/8.0.0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=af1261b22e09e018f9a70566cfaa4d7a
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r1 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r1
index f4c51ea865f5..1485168106dd 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r1
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0/8.0.0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb4a595da3df379cceb87446da97c0fd
diff --git a/metadata/md5-cache/net-analyzer/scanssh-2.1 b/metadata/md5-cache/net-analyzer/scanssh-2.1
deleted file mode 100644
index 7a70264bd21f..000000000000
--- a/metadata/md5-cache/net-analyzer/scanssh-2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/libdnet dev-libs/libevent net-libs/libpcap
-DESCRIPTION=network scanner that gathers info on SSH protocols and versions
-EAPI=5
-HOMEPAGE=https://monkey.org/~provos/scanssh/
-KEYWORDS=amd64 hppa ppc ~ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=dev-libs/libdnet dev-libs/libevent net-libs/libpcap
-SLOT=0
-SRC_URI=https://monkey.org/~provos/scanssh-2.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=56951e0c3e5bb4b930810c8a1c231a0a
diff --git a/metadata/md5-cache/net-analyzer/scanssh-2.1-r2 b/metadata/md5-cache/net-analyzer/scanssh-2.1-r2
deleted file mode 100644
index 981162637fb6..000000000000
--- a/metadata/md5-cache/net-analyzer/scanssh-2.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libdnet dev-libs/libevent:= net-libs/libpcap
-DESCRIPTION=network scanner that gathers info on SSH protocols and versions
-EAPI=7
-HOMEPAGE=https://monkey.org/~provos/scanssh/
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/libdnet dev-libs/libevent:= net-libs/libpcap
-SLOT=0
-SRC_URI=https://monkey.org/~provos/scanssh-2.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0473fca923cb80b60178dfc928c57c88
diff --git a/metadata/md5-cache/net-analyzer/scapy-2.4.3 b/metadata/md5-cache/net-analyzer/scapy-2.4.3
index 2fdb5be2e59b..4c0a37c919ae 100644
--- a/metadata/md5-cache/net-analyzer/scapy-2.4.3
+++ b/metadata/md5-cache/net-analyzer/scapy-2.4.3
@@ -10,5 +10,5 @@ RDEPEND=net-analyzer/tcpdump python_targets_python3_6? ( dev-lang/python:3.6 ) p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/secdev/scapy/archive/v2.4.3.tar.gz -> scapy-2.4.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f360f1ac84a4d5d8dc601448dde957ee
diff --git a/metadata/md5-cache/net-analyzer/scapy-2.4.4 b/metadata/md5-cache/net-analyzer/scapy-2.4.4
index d717349d4e1a..bf9a219f05ff 100644
--- a/metadata/md5-cache/net-analyzer/scapy-2.4.4
+++ b/metadata/md5-cache/net-analyzer/scapy-2.4.4
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python interactive packet manipulation program for mastering the network
 EAPI=7
 HOMEPAGE=https://scapy.net/ https://github.com/secdev/scapy
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/secdev/scapy/archive/v2.4.4.tar.gz -> scapy-2.4.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=dcfe71fc1fc027e1ce66afe1cbcb36d7
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=32abe95fbffe17cce25d7f10e39803c5
diff --git a/metadata/md5-cache/net-analyzer/scapy-9999 b/metadata/md5-cache/net-analyzer/scapy-9999
index fbd46b1a4dc7..577af4510513 100644
--- a/metadata/md5-cache/net-analyzer/scapy-9999
+++ b/metadata/md5-cache/net-analyzer/scapy-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6befde5879a0d47fa225214bb17831a6
diff --git a/metadata/md5-cache/net-analyzer/snallygaster-0.0.6 b/metadata/md5-cache/net-analyzer/snallygaster-0.0.6
index f92ed552ff17..8a6ac106d44c 100644
--- a/metadata/md5-cache/net-analyzer/snallygaster-0.0.6
+++ b/metadata/md5-cache/net-analyzer/snallygaster-0.0.6
@@ -11,5 +11,5 @@ RDEPEND=dev-python/dnspython dev-python/urllib3 dev-python/beautifulsoup python_
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/snallygaster/snallygaster-0.0.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e4a856335b852380cf99f9518537a233
diff --git a/metadata/md5-cache/net-analyzer/snallygaster-0.0.8 b/metadata/md5-cache/net-analyzer/snallygaster-0.0.8
index beea9e26883c..6af7b187777b 100644
--- a/metadata/md5-cache/net-analyzer/snallygaster-0.0.8
+++ b/metadata/md5-cache/net-analyzer/snallygaster-0.0.8
@@ -11,5 +11,5 @@ RDEPEND=dev-python/dnspython dev-python/urllib3 dev-python/beautifulsoup python_
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/snallygaster/snallygaster-0.0.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e4a856335b852380cf99f9518537a233
diff --git a/metadata/md5-cache/net-analyzer/snallygaster-0.0.9 b/metadata/md5-cache/net-analyzer/snallygaster-0.0.9
index 518cf33f88fa..89c0d13fa9b8 100644
--- a/metadata/md5-cache/net-analyzer/snallygaster-0.0.9
+++ b/metadata/md5-cache/net-analyzer/snallygaster-0.0.9
@@ -11,5 +11,5 @@ RDEPEND=dev-python/dnspython dev-python/urllib3 dev-python/beautifulsoup python_
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/snallygaster/snallygaster-0.0.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e4a856335b852380cf99f9518537a233
diff --git a/metadata/md5-cache/net-analyzer/snmpclitools-0.6.4 b/metadata/md5-cache/net-analyzer/snmpclitools-0.6.4
index 36451f6e7a1d..e58b0bd67e6a 100644
--- a/metadata/md5-cache/net-analyzer/snmpclitools-0.6.4
+++ b/metadata/md5-cache/net-analyzer/snmpclitools-0.6.4
@@ -11,5 +11,5 @@ RDEPEND=!dev-python/pysnmp-apps >=dev-python/pysnmp-4.2.2[python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/etingof/snmpclitools/archive/v0.6.4.tar.gz -> snmpclitools-0.6.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=396cf044063ac9ba2fab7b484e2cb23a
diff --git a/metadata/md5-cache/net-analyzer/speedtest-cli-2.1.2 b/metadata/md5-cache/net-analyzer/speedtest-cli-2.1.2
index cc88e4a3b742..1f31d0b0546d 100644
--- a/metadata/md5-cache/net-analyzer/speedtest-cli-2.1.2
+++ b/metadata/md5-cache/net-analyzer/speedtest-cli-2.1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/sivel/speedtest-cli/archive/v2.1.2.tar.gz -> speedtest-cli-2.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=05ecadc88fedd6ae6f70384dedfbacec
diff --git a/metadata/md5-cache/net-analyzer/trafshow-5.2.3 b/metadata/md5-cache/net-analyzer/trafshow-5.2.3
deleted file mode 100644
index 1f076afa3b9e..000000000000
--- a/metadata/md5-cache/net-analyzer/trafshow-5.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=net-libs/libpcap !slang? ( sys-libs/ncurses ) slang? ( >=sys-libs/slang-1.4 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Full screen visualization of the network traffic
-EAPI=5
-HOMEPAGE=http://soft.risp.ru/trafshow/index_en.shtml
-IUSE=slang
-KEYWORDS=amd64 hppa ~ppc ppc64 sparc x86
-LICENSE=BSD
-SLOT=3
-SRC_URI=ftp://ftp.nsk.su/pub/RinetSoftware/trafshow-5.2.3.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a58734581fbbfcd82cdfc2843ba02cb4
diff --git a/metadata/md5-cache/net-analyzer/wapiti-3.0.3 b/metadata/md5-cache/net-analyzer/wapiti-3.0.3
index da60b8a1fca9..d1c9402a1808 100644
--- a/metadata/md5-cache/net-analyzer/wapiti-3.0.3
+++ b/metadata/md5-cache/net-analyzer/wapiti-3.0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/beautifulsoup:4[python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://sourceforge/wapiti/wapiti3-3.0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fed5eb897ad59a9e18a05e64d66b8814
diff --git a/metadata/md5-cache/net-analyzer/wapiti-9999 b/metadata/md5-cache/net-analyzer/wapiti-9999
index 6b4f6c98e03f..5cfd2af5aed8 100644
--- a/metadata/md5-cache/net-analyzer/wapiti-9999
+++ b/metadata/md5-cache/net-analyzer/wapiti-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/beautifulsoup:4[python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c2bdc012ccc50cc63751163b5f56804f
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.27 b/metadata/md5-cache/net-analyzer/zabbix-4.0.27
new file mode 100644
index 000000000000..c421adaf7c65
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.27
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=7
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.27.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=98c207cbd32ce9f3f5dd52cba394e4d1
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.6 b/metadata/md5-cache/net-analyzer/zabbix-5.0.6
new file mode 100644
index 000000000000..3e86d10db661
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.6
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=7
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.6.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=91e57c23041003da6c0573ba37e60b0f
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.2.2 b/metadata/md5-cache/net-analyzer/zabbix-5.2.2
new file mode 100644
index 000000000000..af11154b9e3e
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.2.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=7
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.2/zabbix-5.2.2.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=91e57c23041003da6c0573ba37e60b0f
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index e5a0de516faa..d74a7bc477fc 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/dnsviz-0.8.2 b/metadata/md5-cache/net-dns/dnsviz-0.8.2
index fb99c5ca2923..db9241b48ea8 100644
--- a/metadata/md5-cache/net-dns/dnsviz-0.8.2
+++ b/metadata/md5-cache/net-dns/dnsviz-0.8.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/dnspython[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/dnsviz/dnsviz/archive/v0.8.2.tar.gz -> dnsviz-0.8.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=531009f2f743147a160fd246b32938b9
diff --git a/metadata/md5-cache/net-dns/dnsviz-0.8.2-r1 b/metadata/md5-cache/net-dns/dnsviz-0.8.2-r1
index 4fa74cee2f50..23f308b9787b 100644
--- a/metadata/md5-cache/net-dns/dnsviz-0.8.2-r1
+++ b/metadata/md5-cache/net-dns/dnsviz-0.8.2-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/dnspython[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/dnsviz/dnsviz/archive/v0.8.2.tar.gz -> dnsviz-0.8.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2acc78a785433b64936a266cc8976191
diff --git a/metadata/md5-cache/net-dns/idnkit-2.3 b/metadata/md5-cache/net-dns/idnkit-2.3
index ce94f24ec720..4322b9651541 100644
--- a/metadata/md5-cache/net-dns/idnkit-2.3
+++ b/metadata/md5-cache/net-dns/idnkit-2.3
@@ -4,11 +4,11 @@ DESCRIPTION=Toolkit for Internationalized Domain Names (IDN)
 EAPI=6
 HOMEPAGE=https://jprs.co.jp/idn/
 IUSE=liteonly static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=JPRS
 RDEPEND=virtual/libiconv
 RESTRICT=test
 SLOT=0
 SRC_URI=https://jprs.co.jp/idn/idnkit-2.3.tar.bz2
 _eclasses_=ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1a7ba77dd6f212ed1a0b6900d4ba7998
+_md5_=c168e17e7f132e7cf2787997d4d05db1
diff --git a/metadata/md5-cache/net-dns/ldns-utils-1.7.1 b/metadata/md5-cache/net-dns/ldns-utils-1.7.1
index c2a0e11a7f06..d14e7199bac9 100644
--- a/metadata/md5-cache/net-dns/ldns-utils-1.7.1
+++ b/metadata/md5-cache/net-dns/ldns-utils-1.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Set of utilities to simplify various dns(sec) tasks
 EAPI=6
 HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
 IUSE=+dane ecdsa ed25519 ed448 examples gost ssl
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=net-libs/ldns-1.7.1[dane?,ecdsa?,ed25519?,ed448?,gost?] examples? ( net-libs/libpcap )
 REQUIRED_USE=ecdsa? ( ssl ) ed25519? ( ssl ) ed448? ( ssl ) dane? ( ssl ) gost? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz
-_md5_=bd9e0bc982c877b5ec1b34fdc1820c2e
+_md5_=f0713b985d9150c11b1916e510c862d3
diff --git a/metadata/md5-cache/net-dns/nsd-4.3.2 b/metadata/md5-cache/net-dns/nsd-4.3.4
similarity index 92%
rename from metadata/md5-cache/net-dns/nsd-4.3.2
rename to metadata/md5-cache/net-dns/nsd-4.3.4
index 86e7424a9aaa..f0ef013ab0dc 100644
--- a/metadata/md5-cache/net-dns/nsd-4.3.2
+++ b/metadata/md5-cache/net-dns/nsd-4.3.4
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd )
 SLOT=0
-SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.2.tar.gz
+SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.4.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e4e3272e00ff24094340355a544b0897
+_md5_=858aa6a690e62220c294ff1eb9e1b6df
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 0ffbf7f6f607..e400f8cbe102 100644
Binary files a/metadata/md5-cache/net-firewall/Manifest.gz and b/metadata/md5-cache/net-firewall/Manifest.gz differ
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-2.4-r1 b/metadata/md5-cache/net-firewall/ipt_netflow-2.4-r1
deleted file mode 100644
index d8c254c349be..000000000000
--- a/metadata/md5-cache/net-firewall/ipt_netflow-2.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) virtual/linux-sources virtual/pkgconfig kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Netflow iptables module
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/ipt-netflow https://github.com/aabc/ipt-netflow
-IUSE=debug natevents snmp kernel_linux kernel_linux kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? ( sys-apps/kmod[tools] )
-SLOT=0
-SRC_URI=https://github.com/aabc/ipt-netflow/archive/v2.4.tar.gz -> ipt_netflow-2.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=43425b2bf77654ef289e122988bf3e6a
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-2.5.1-r1 b/metadata/md5-cache/net-firewall/ipt_netflow-2.5.1-r1
index 6cc82b44ce6f..96b57af766ba 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-2.5.1-r1
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-2.5.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Netflow iptables module
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/ipt-netflow https://github.com/aabc/ipt-netflow
 IUSE=debug natevents snmp kernel_linux kernel_linux kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? ( sys-apps/kmod[tools] )
 SLOT=0
 SRC_URI=https://github.com/aabc/ipt-netflow/archive/v2.5.1.tar.gz -> ipt_netflow-2.5.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6b4501f58ac75c5cfb7b18302970e0b5
+_md5_=4adbd39feeecd984ed6c7c07bb2afb10
diff --git a/metadata/md5-cache/net-firewall/ufw-0.36 b/metadata/md5-cache/net-firewall/ufw-0.36
index f9956f02d937..7d2ec1cf2eec 100644
--- a/metadata/md5-cache/net-firewall/ufw-0.36
+++ b/metadata/md5-cache/net-firewall/ufw-0.36
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/ufw/0.36/0.36/+download/ufw-0.36.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=db4c477b92fd3bab8fc03d47ad763176
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index c925446786e7..76f32d08c4fe 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/element-desktop-bin-1.7.9 b/metadata/md5-cache/net-im/element-desktop-bin-1.7.14
similarity index 97%
rename from metadata/md5-cache/net-im/element-desktop-bin-1.7.9
rename to metadata/md5-cache/net-im/element-desktop-bin-1.7.14
index 1f1bb39973c9..83ee54667b02 100644
--- a/metadata/md5-cache/net-im/element-desktop-bin-1.7.9
+++ b/metadata/md5-cache/net-im/element-desktop-bin-1.7.14
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=app-accessibility/at-spi2-atk:2 app-crypt/libsecret dev-db/sqlcipher dev-libs/atk dev-libs/expat dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver x11-libs/pango emoji? ( media-fonts/noto-emoji )
 SLOT=0
-SRC_URI=https://packages.riot.im/debian/pool/main/e/element-desktop/element-desktop_1.7.9_amd64.deb
+SRC_URI=https://packages.riot.im/debian/pool/main/e/element-desktop/element-desktop_1.7.14_amd64.deb
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8a29792e33c256da17c80908e634f618
diff --git a/metadata/md5-cache/net-im/err-6.1.4 b/metadata/md5-cache/net-im/err-6.1.4
index b9501fdfb14d..af6401d085a8 100644
--- a/metadata/md5-cache/net-im/err-6.1.4
+++ b/metadata/md5-cache/net-im/err-6.1.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/ansi[python_targets_python3_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/e/errbot/errbot-6.1.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d6b40bf9453be692a0156909b0ac5fa5
diff --git a/metadata/md5-cache/net-im/gajim-1.2.1 b/metadata/md5-cache/net-im/gajim-1.2.1
index e332fa843d89..c71bb3ba46e8 100644
--- a/metadata/md5-cache/net-im/gajim-1.2.1
+++ b/metadata/md5-cache/net-im/gajim-1.2.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspe
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://gajim.org/downloads/1.2/gajim-1.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=537ae828ec4bcf5965331fa584ef8cf4
diff --git a/metadata/md5-cache/net-im/gajim-1.2.2 b/metadata/md5-cache/net-im/gajim-1.2.2
index a12aecebdad7..db6f79e148cd 100644
--- a/metadata/md5-cache/net-im/gajim-1.2.2
+++ b/metadata/md5-cache/net-im/gajim-1.2.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspe
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://gajim.org/downloads/1.2/gajim-1.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e458f3d41570c1b33ce210f727305809
diff --git a/metadata/md5-cache/net-im/poezio-0.12 b/metadata/md5-cache/net-im/poezio-0.12
index ed0ea6ab507d..576a5c8afb8b 100644
--- a/metadata/md5-cache/net-im/poezio-0.12
+++ b/metadata/md5-cache/net-im/poezio-0.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/poezio/poezio-0.12.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7f8b368116c9e3fe63ca54d109475b9d
diff --git a/metadata/md5-cache/net-im/poezio-0.13.1 b/metadata/md5-cache/net-im/poezio-0.13.1
index 7d66a6ee8439..c01491510b44 100644
--- a/metadata/md5-cache/net-im/poezio-0.13.1
+++ b/metadata/md5-cache/net-im/poezio-0.13.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/poezio/poezio-0.13.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=646c4394cfc5199f0f7411802f1e3bd8
diff --git a/metadata/md5-cache/net-im/poezio-0.13.1-r1 b/metadata/md5-cache/net-im/poezio-0.13.1-r1
index 7a19822490b7..ff71b79a120d 100644
--- a/metadata/md5-cache/net-im/poezio-0.13.1-r1
+++ b/metadata/md5-cache/net-im/poezio-0.13.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/poezio/poezio-0.13.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=81751f26be0aebfee533ab54413529bd
diff --git a/metadata/md5-cache/net-im/poezio-9999 b/metadata/md5-cache/net-im/poezio-9999
index 241a294da1c6..662153db5b7d 100644
--- a/metadata/md5-cache/net-im/poezio-9999
+++ b/metadata/md5-cache/net-im/poezio-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/aiodns[python_targets_python3_7(-)?,python_targets_python3_8(
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b6457e5948271ccefc5b2714dfb690ee
diff --git a/metadata/md5-cache/net-im/transwhat-0.2.2_p20190426-r1 b/metadata/md5-cache/net-im/transwhat-0.2.2_p20190426-r1
index 4d182a007c3d..15b37a81e1e6 100644
--- a/metadata/md5-cache/net-im/transwhat-0.2.2_p20190426-r1
+++ b/metadata/md5-cache/net-im/transwhat-0.2.2_p20190426-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/stv0g/transwhat/archive/d022243f6c7b23674d3c87a09819f00b10df1165.tar.gz -> transwhat-0.2.2_p20190426.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=489b801fc0bf6b56c4187b7a4a8b612f
diff --git a/metadata/md5-cache/net-im/yowsup-3.2.3_p20190905 b/metadata/md5-cache/net-im/yowsup-3.2.3_p20190905
index b1b2b60087a8..aaf958921473 100644
--- a/metadata/md5-cache/net-im/yowsup-3.2.3_p20190905
+++ b/metadata/md5-cache/net-im/yowsup-3.2.3_p20190905
@@ -11,5 +11,5 @@ RDEPEND=dev-python/appdirs[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/tgalal/yowsup/archive/2adc067f306d9e7d8b634f66e96c52d80a42e1ff.tar.gz -> yowsup-3.2.3_p20190905.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8fcca9677d48c0380ce46e9447931b62
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 0e0be04d8efb..11c93cfb3b11 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/limnoria-20191123 b/metadata/md5-cache/net-irc/limnoria-20191123
index 2cc98b308431..a3bbb2fb86de 100644
--- a/metadata/md5-cache/net-irc/limnoria-20191123
+++ b/metadata/md5-cache/net-irc/limnoria-20191123
@@ -11,5 +11,5 @@ RDEPEND=dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/ProgVal/Limnoria/archive/master-2019-11-23.tar.gz -> limnoria-20191123.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=06fc4dbed6771699b6faf875e6ccc840
diff --git a/metadata/md5-cache/net-irc/limnoria-99999999 b/metadata/md5-cache/net-irc/limnoria-99999999
index b2537c178ca4..bd7516182629 100644
--- a/metadata/md5-cache/net-irc/limnoria-99999999
+++ b/metadata/md5-cache/net-irc/limnoria-99999999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ecdsa[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/feedparser[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PySocks[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sqlalchemy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] crypt? ( dev-python/python-gnupg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ssl? ( dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) !net-irc/supybot !net-irc/supybot-plugins python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=06fc4dbed6771699b6faf875e6ccc840
diff --git a/metadata/md5-cache/net-irc/quasselgrep-0_p20200830 b/metadata/md5-cache/net-irc/quasselgrep-0_p20200830
index c470bc826b1b..1b8c221302d8 100644
--- a/metadata/md5-cache/net-irc/quasselgrep-0_p20200830
+++ b/metadata/md5-cache/net-irc/quasselgrep-0_p20200830
@@ -10,5 +10,5 @@ RDEPEND=dev-python/future[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/fish-face/quasselgrep/archive/9b6b0bc1252daa6e574363d87d04eebd981215a5.tar.gz -> quasselgrep-0_p20200830.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=61ab453c5ea63ae71d7a9331bb620c17
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 6d884f5c8735..c7abddf97253 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/gnutls-3.6.15 b/metadata/md5-cache/net-libs/gnutls-3.6.15
index e86bd5f4b5fa..e4635adceb80 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.6.15
+++ b/metadata/md5-cache/net-libs/gnutls-3.6.15
@@ -1,9 +1,9 @@
 BDEPEND=>=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) tools? ( sys-devel/autogen ) valgrind? ( dev-util/valgrind ) test-full? ( app-crypt/dieharder >=app-misc/datefudge-1.22 dev-libs/softhsm:2[-bindist] net-dialup/ppp net-misc/socat ) >=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=dev-libs/libtasn1-4.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(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.4.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-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(-)?] tools? ( sys-devel/autogen:= ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-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(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-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(-)?] ) test? ( seccomp? ( sys-libs/libseccomp ) )
-DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
+DESCRIPTION=A secure communications library implementing the SSL, TLS and DTLS protocols
 EAPI=7
-HOMEPAGE=http://www.gnutls.org/
+HOMEPAGE=https://www.gnutls.org/
 IUSE=+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind 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 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1+
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/30
 SRC_URI=mirror://gnupg/gnutls/v3.6/gnutls-3.6.15.tar.xz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4652f77e7d17ba814d18ddb378f1f0a8
+_md5_=8e8a47defeb4e51f5612becf7dd7780f
diff --git a/metadata/md5-cache/net-libs/gnutls-3.7.0 b/metadata/md5-cache/net-libs/gnutls-3.7.0
new file mode 100644
index 000000000000..f169afdb5086
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gnutls-3.7.0
@@ -0,0 +1,16 @@
+BDEPEND=>=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) tools? ( sys-devel/autogen ) valgrind? ( dev-util/valgrind ) test-full? ( app-crypt/dieharder >=app-misc/datefudge-1.22 dev-libs/softhsm:2[-bindist] net-dialup/ppp net-misc/socat ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/libtasn1-4.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(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.6:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-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(-)?] tools? ( sys-devel/autogen:= ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-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(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-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(-)?] ) test? ( seccomp? ( sys-libs/libseccomp ) )
+DESCRIPTION=A secure communications library implementing the SSL, TLS and DTLS protocols
+EAPI=7
+HOMEPAGE=https://www.gnutls.org/
+IUSE=+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3 LGPL-2.1+
+RDEPEND=>=dev-libs/libtasn1-4.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(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.6:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-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(-)?] tools? ( sys-devel/autogen:= ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-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(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-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(-)?] )
+REQUIRED_USE=test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )
+RESTRICT=!test? ( test )
+SLOT=0/30
+SRC_URI=mirror://gnupg/gnutls/v3.7/gnutls-3.7.0.tar.xz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7867a7de969c75f71e4f57069b378691
diff --git a/metadata/md5-cache/net-libs/libetpan-1.9.4-r1 b/metadata/md5-cache/net-libs/libetpan-1.9.4-r1
index bb927145a9b3..d84724aa723e 100644
--- a/metadata/md5-cache/net-libs/libetpan-1.9.4-r1
+++ b/metadata/md5-cache/net-libs/libetpan-1.9.4-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A portable, efficient middleware for different kinds of mail access
 EAPI=7
 HOMEPAGE=http://libetpan.sourceforge.net/
 IUSE=berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs
-KEYWORDS=~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=sys-libs/zlib !lmdb? ( berkdb? ( sys-libs/db:= ) ) lmdb? ( dev-db/lmdb ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) sasl? ( dev-libs/cyrus-sasl:2 ) liblockfile? ( net-libs/liblockfile )
 SLOT=0
 SRC_URI=https://github.com/dinhviethoa/libetpan/archive/1.9.4.tar.gz -> libetpan-1.9.4.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=347c8e9ea81fb6bfdfb38e54e79c0dfe
+_md5_=242521ea076e5aef71849aa883f4e789
diff --git a/metadata/md5-cache/net-libs/libosmo-abis-9999 b/metadata/md5-cache/net-libs/libosmo-abis-9999
deleted file mode 100644
index 6c09099567f8..000000000000
--- a/metadata/md5-cache/net-libs/libosmo-abis-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=net-libs/ortp >=net-libs/libosmocore-0.11.0 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Osmocom library for A-bis interface
-EAPI=6
-HOMEPAGE=http://openbsc.osmocom.org/trac/wiki/libosmo-abis
-LICENSE=GPL-2 LGPL-3
-PROPERTIES=live
-RDEPEND=net-libs/ortp >=net-libs/libosmocore-0.11.0
-SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=78cc6c138cd23499c2910c21c3de1dbe
diff --git a/metadata/md5-cache/net-libs/libosmo-netif-9999 b/metadata/md5-cache/net-libs/libosmo-netif-9999
deleted file mode 100644
index 8d6f23ec7110..000000000000
--- a/metadata/md5-cache/net-libs/libosmo-netif-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=net-libs/libosmocore net-libs/libosmo-abis >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Utility functions for OsmocomBB, OpenBSC and related projects
-EAPI=5
-HOMEPAGE=http://bb.osmocom.org/trac/wiki/
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=net-libs/libosmocore net-libs/libosmo-abis
-SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cca543f29275f01c31c4cf1147b09722
diff --git a/metadata/md5-cache/net-libs/librsync-2.3.1 b/metadata/md5-cache/net-libs/librsync-2.3.1
index 7909a929e84f..6ea25e159632 100644
--- a/metadata/md5-cache/net-libs/librsync-2.3.1
+++ b/metadata/md5-cache/net-libs/librsync-2.3.1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/popt
 DESCRIPTION=Remote delta-compression library
 EAPI=7
 HOMEPAGE=https://librsync.github.io/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/popt
 SLOT=0/2.2
 SRC_URI=https://github.com/librsync/librsync/archive/v2.3.1.tar.gz -> librsync-2.3.1.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25ddab1286e5995cfbcd2e0dbc2b57d5
+_md5_=dc18bc928bb509bfa2f9633a23709920
diff --git a/metadata/md5-cache/net-libs/libsmi-0.5.0-r1 b/metadata/md5-cache/net-libs/libsmi-0.5.0-r1
index b9b2d43f69b2..fa444acf49de 100644
--- a/metadata/md5-cache/net-libs/libsmi-0.5.0-r1
+++ b/metadata/md5-cache/net-libs/libsmi-0.5.0-r1
@@ -3,9 +3,9 @@ DESCRIPTION=A Library to Access SMI MIB Information
 EAPI=7
 HOMEPAGE=https://www.ibr.cs.tu-bs.de/projects/libsmi/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=BSD
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.ibr.cs.tu-bs.de/projects/libsmi/download/libsmi-0.5.0.tar.gz
-_md5_=353a667dd5845300dfd1f9ab5afdf39e
+_md5_=898ad76d4f95920f56b748a91d5b8c9e
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.14 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.14
index 23785ed32121..02610ece6c11 100644
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.14
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.14
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 ) )
 RESTRICT=!test? ( test )
 SLOT=0/9
 SRC_URI=https://github.com/arvidn/libtorrent/releases/download/libtorrent-1_1_14/libtorrent-rasterbar-1.1.14.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=250bc45e05384460ebd958347d9c9668
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.10 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.10
index 5248f05f6f56..0fa725840b20 100644
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.10
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.10
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://github.com/arvidn/libtorrent/archive/libtorrent-1.2.10.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6b5bcbcd8598afb73111bbec9cbc8d96
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.6 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.6
index 5161d5da93b9..564955c1e6c4 100644
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.6
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.6
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 py
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://github.com/arvidn/libtorrent/archive/libtorrent-1_2_6.tar.gz -> libtorrent-rasterbar-1.2.6.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b234ffd508a96eaf3d870d74f9362901
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.9 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.9
index 6b8033813dfb..30f7ebaf4496 100644
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.9
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.9
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://github.com/arvidn/libtorrent/archive/libtorrent-1.2.9.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6b5bcbcd8598afb73111bbec9cbc8d96
diff --git a/metadata/md5-cache/net-libs/libwebsockets-4.1.4 b/metadata/md5-cache/net-libs/libwebsockets-4.1.4
index 67e026de7cb1..dc43e3408f12 100644
--- a/metadata/md5-cache/net-libs/libwebsockets-4.1.4
+++ b/metadata/md5-cache/net-libs/libwebsockets-4.1.4
@@ -5,11 +5,11 @@ DESCRIPTION=A flexible pure-C library for implementing network protocols
 EAPI=7
 HOMEPAGE=https://libwebsockets.org/
 IUSE=access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6 +lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5 sqlite3 ssl static-libs threads zip
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
+KEYWORDS=amd64 arm arm64 ~ppc x86
 LICENSE=MIT
 RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) http-proxy? ( net-libs/libhubbub ) libev? ( dev-libs/libev ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) sqlite3? ( dev-db/sqlite:= ) ssl? ( !libressl? ( !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( >net-libs/mbedtls-2.0.0 ) ) )
 REQUIRED_USE=access-log? ( http2 ) generic-sessions? ( smtp sqlite3 ) http-proxy? ( client ) smtp? ( libuv ) socks5? ( client http-proxy ) ssl? ( ?? ( libressl mbedtls ) ) mbedtls? ( ssl ) ?? ( libev libevent )
 SLOT=0/17
 SRC_URI=https://github.com/warmcat/libwebsockets/archive/v4.1.4.tar.gz -> libwebsockets-4.1.4.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c1a3cf92a04eae15a472a576bf4ec5d3
+_md5_=7df9a850f52d53abad298ea6d6506ca1
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.42.0 b/metadata/md5-cache/net-libs/nghttp2-1.42.0
index 38b3dc6110c0..62220cf20038 100644
--- a/metadata/md5-cache/net-libs/nghttp2-1.42.0
+++ b/metadata/md5-cache/net-libs/nghttp2-1.42.0
@@ -5,11 +5,11 @@ DESCRIPTION=HTTP/2 C Library
 EAPI=7
 HOMEPAGE=https://nghttp2.org/
 IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/boost:=[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] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libev-4.15[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.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7: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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/1.14
 SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.42.0/nghttp2-1.42.0.tar.xz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e0b32b09ccd18bf32e8d96d1779d925a
+_md5_=92ed1e37dd7be9f751be86f88323c770
diff --git a/metadata/md5-cache/net-libs/nghttp2-9999 b/metadata/md5-cache/net-libs/nghttp2-9999
index 0bdb264675a3..11d1e92b65ff 100644
--- a/metadata/md5-cache/net-libs/nghttp2-9999
+++ b/metadata/md5-cache/net-libs/nghttp2-9999
@@ -11,4 +11,4 @@ RDEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,
 RESTRICT=!test? ( test )
 SLOT=0/1.14
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=858210f22055da88c98f46c3e604d3f2
+_md5_=92ed1e37dd7be9f751be86f88323c770
diff --git a/metadata/md5-cache/net-libs/stem-1.5.4 b/metadata/md5-cache/net-libs/stem-1.5.4
index 3737e4d6776a..62b4d50af4e2 100644
--- a/metadata/md5-cache/net-libs/stem-1.5.4
+++ b/metadata/md5-cache/net-libs/stem-1.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stem/stem-1.5.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=49b0126f3776b735dbd33359c1e4fc3a
diff --git a/metadata/md5-cache/net-libs/stem-1.6.0 b/metadata/md5-cache/net-libs/stem-1.6.0
index 0a3302831874..8c8ed7cf5054 100644
--- a/metadata/md5-cache/net-libs/stem-1.6.0
+++ b/metadata/md5-cache/net-libs/stem-1.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stem/stem-1.6.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=49b0126f3776b735dbd33359c1e4fc3a
diff --git a/metadata/md5-cache/net-libs/stem-1.7.0 b/metadata/md5-cache/net-libs/stem-1.7.0
index 726c4a5fb75d..790f56097091 100644
--- a/metadata/md5-cache/net-libs/stem-1.7.0
+++ b/metadata/md5-cache/net-libs/stem-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stem/stem-1.7.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a081370a82d0ccd1f06cade2708117bc
diff --git a/metadata/md5-cache/net-libs/stem-1.7.1 b/metadata/md5-cache/net-libs/stem-1.7.1
index d2f19468a26e..5443e093b150 100644
--- a/metadata/md5-cache/net-libs/stem-1.7.1
+++ b/metadata/md5-cache/net-libs/stem-1.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stem/stem-1.7.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a081370a82d0ccd1f06cade2708117bc
diff --git a/metadata/md5-cache/net-libs/stem-1.8.0-r1 b/metadata/md5-cache/net-libs/stem-1.8.0-r1
index d5808867a36c..9ec2cffd1d60 100644
--- a/metadata/md5-cache/net-libs/stem-1.8.0-r1
+++ b/metadata/md5-cache/net-libs/stem-1.8.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stem/stem-1.8.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8334e534494b7461dfe2cb5f01ad9295
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.30.3 b/metadata/md5-cache/net-libs/webkit-gtk-2.30.3
index 1f171ffa8191..0d49ca6a4952 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.30.3
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.30.3
@@ -4,7 +4,7 @@ DESCRIPTION=Open source web browser engine
 EAPI=6
 HOMEPAGE=https://www.webkitgtk.org
 IUSE=aqua +egl gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-60.2:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
 REQUIRED_USE=gles2-only? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) wayland? ( egl ) || ( aqua wayland X )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.30.3.tar.xz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0df77a8e14c240e0614019c9849aaf68
+_md5_=5d0518e0484201d4b4589785dd8d0403
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 4ae80a58f97b..fd3a996bb4ca 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/automx2-2019.0 b/metadata/md5-cache/net-mail/automx2-2019.0
index f81c0a263efe..ec4cbb67e70e 100644
--- a/metadata/md5-cache/net-mail/automx2-2019.0
+++ b/metadata/md5-cache/net-mail/automx2-2019.0
@@ -10,5 +10,5 @@ RDEPEND=acct-user/automx2 >=dev-python/flask-migrate-2.5.2[python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitlab.com/automx/automx2/-/archive/2019.0/automx2-2019.0.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5d6d5811cd70c1d7795d930c77e31b99
diff --git a/metadata/md5-cache/net-mail/automx2-2020.1-r1 b/metadata/md5-cache/net-mail/automx2-2020.1-r1
index 37d821a11238..b074af6df7b3 100644
--- a/metadata/md5-cache/net-mail/automx2-2020.1-r1
+++ b/metadata/md5-cache/net-mail/automx2-2020.1-r1
@@ -10,5 +10,5 @@ RDEPEND=acct-user/automx2 dev-python/flask-migrate[python_targets_python3_7(-)?,
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://gitlab.com/automx/automx2/-/archive/2020.1/automx2-2020.1.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=55cdc9bf845993e414875414ef2b7d85
diff --git a/metadata/md5-cache/net-mail/b4-0.5.3 b/metadata/md5-cache/net-mail/b4-0.5.3
index 588f57170f1b..ee6f510f9df9 100644
--- a/metadata/md5-cache/net-mail/b4-0.5.3
+++ b/metadata/md5-cache/net-mail/b4-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/b4/b4-0.5.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d33c88529697c054071161bb9213d6fe
diff --git a/metadata/md5-cache/net-mail/django-mailman3-1.3.4 b/metadata/md5-cache/net-mail/django-mailman3-1.3.4
index 6b83e46066f9..866d717594cc 100644
--- a/metadata/md5-cache/net-mail/django-mailman3-1.3.4
+++ b/metadata/md5-cache/net-mail/django-mailman3-1.3.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/django[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-mailman3/django-mailman3-1.3.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bb4922ca15d19c17233f315114157b4f
diff --git a/metadata/md5-cache/net-mail/getmail-6.9 b/metadata/md5-cache/net-mail/getmail-6.9
index ce350dc2ee6b..74fb12383e01 100644
--- a/metadata/md5-cache/net-mail/getmail-6.9
+++ b/metadata/md5-cache/net-mail/getmail-6.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7[ssl] ) python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/getmail6/getmail6/archive/v6.9.tar.gz -> getmail-6.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d2c9fe7a8af1f64f5f50dec0196d2fcd
diff --git a/metadata/md5-cache/net-mail/hyperkitty-1.3.3 b/metadata/md5-cache/net-mail/hyperkitty-1.3.3
index 3a0cdbed96da..8cd19ee34830 100644
--- a/metadata/md5-cache/net-mail/hyperkitty-1.3.3
+++ b/metadata/md5-cache/net-mail/hyperkitty-1.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/H/HyperKitty/HyperKitty-1.3.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f8293671412b69cd3d182a727f03b744
diff --git a/metadata/md5-cache/net-mail/mailman-3.3.1-r1 b/metadata/md5-cache/net-mail/mailman-3.3.1-r1
index e09d83f7dade..907c66047bbf 100644
--- a/metadata/md5-cache/net-mail/mailman-3.3.1-r1
+++ b/metadata/md5-cache/net-mail/mailman-3.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/aiosmtpd-1.1[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=3
 SRC_URI=mirror://pypi/m/mailman/mailman-3.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=77b1999e3e1844df874168d2888ff809
diff --git a/metadata/md5-cache/net-mail/mailman-3.3.2 b/metadata/md5-cache/net-mail/mailman-3.3.2
index 2b56df091183..7241df8602a2 100644
--- a/metadata/md5-cache/net-mail/mailman-3.3.2
+++ b/metadata/md5-cache/net-mail/mailman-3.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/aiosmtpd-1.1[python_targets_python3_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=3
 SRC_URI=mirror://pypi/m/mailman/mailman-3.3.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bc7213689947033546ad3bb5160d3088
diff --git a/metadata/md5-cache/net-mail/mailmanclient-3.3.1 b/metadata/md5-cache/net-mail/mailmanclient-3.3.1
index 036ff5b051a9..a1ba02555394 100644
--- a/metadata/md5-cache/net-mail/mailmanclient-3.3.1
+++ b/metadata/md5-cache/net-mail/mailmanclient-3.3.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mailmanclient/mailmanclient-3.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d1b131e803049eea0c72c1b41106a192
diff --git a/metadata/md5-cache/net-mail/mu-1.4.13 b/metadata/md5-cache/net-mail/mu-1.4.13
index 6eaed3be00d0..29a7b0fe2a70 100644
--- a/metadata/md5-cache/net-mail/mu-1.4.13
+++ b/metadata/md5-cache/net-mail/mu-1.4.13
@@ -5,10 +5,10 @@ DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and ind
 EAPI=7
 HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
 IUSE=emacs guile mug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86 ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2= dev-libs/gmime:3.0= >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-24.4:* ) guile? ( >=dev-scheme/guile-2.2:* ) mug? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3= )
 SLOT=0
 SRC_URI=https://github.com/djcb/mu/archive/1.4.13.tar.gz -> mu-1.4.13.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=43991b0510e92ae648b0a5a8e2bbc264
+_md5_=e4b26c1a6efd2fdc39e23897b28e4ba2
diff --git a/metadata/md5-cache/net-mail/notmuch-0.29.3-r2 b/metadata/md5-cache/net-mail/notmuch-0.29.3-r2
index 2c7c575f6624..87437366dd96 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.29.3-r2
+++ b/metadata/md5-cache/net-mail/notmuch-0.29.3-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python3_6 python_ta
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.29.3.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a0184d76e72c656f3956fe2565d4b75c
diff --git a/metadata/md5-cache/net-mail/notmuch-0.30-r1 b/metadata/md5-cache/net-mail/notmuch-0.30-r1
index f057e61f6b94..19a93446ebdf 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.30-r1
+++ b/metadata/md5-cache/net-mail/notmuch-0.30-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python3_6 python_ta
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.30.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=844c14bc4808a83cd84a1cacc0058867
diff --git a/metadata/md5-cache/net-mail/notmuch-0.31 b/metadata/md5-cache/net-mail/notmuch-0.31
index ea06992f0f05..43748ff32dc3 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.31
+++ b/metadata/md5-cache/net-mail/notmuch-0.31
@@ -12,5 +12,5 @@ REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python3_6 python_ta
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.31.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=35dd0964dec04cb1208294f6e75be13e
diff --git a/metadata/md5-cache/net-mail/notmuch-0.31-r2 b/metadata/md5-cache/net-mail/notmuch-0.31-r2
index e044a89b96b3..9d5d88dfd5f1 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.31-r2
+++ b/metadata/md5-cache/net-mail/notmuch-0.31-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=apidoc? ( doc ) nmbug? ( python ) python? ( || ( python_targets_pyp
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.31.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d956cea07efc509c17929dd7ab9eda1
diff --git a/metadata/md5-cache/net-mail/notmuch-0.31.2 b/metadata/md5-cache/net-mail/notmuch-0.31.2
index a4c2993e435b..553fbf3fbedd 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.31.2
+++ b/metadata/md5-cache/net-mail/notmuch-0.31.2
@@ -5,12 +5,12 @@ DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
 EAPI=7
 HOMEPAGE=https://notmuchmail.org/
 IUSE=apidoc crypt doc emacs mutt nmbug python test valgrind python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-libs/talloc sys-libs/zlib:= emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) crypt? ( app-crypt/gnupg ) mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Pod-Parser ) nmbug? ( dev-vcs/git )
 REQUIRED_USE=apidoc? ( doc ) nmbug? ( python ) python? ( || ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ) test? ( crypt emacs python valgrind )
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.31.2.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c9af22c923a16989e5e013f359e4f38
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3d4e0a0fc3fd81a99f110ffc7c48a252
diff --git a/metadata/md5-cache/net-mail/onionrouter-0.6.1 b/metadata/md5-cache/net-mail/onionrouter-0.6.1
index 45894dd318cc..9ebc818dc452 100644
--- a/metadata/md5-cache/net-mail/onionrouter-0.6.1
+++ b/metadata/md5-cache/net-mail/onionrouter-0.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://pypi.io/packages/source/o/onionrouter/onionrouter-0.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fd2e1efbbced09714286f2a4cbf83a84
diff --git a/metadata/md5-cache/net-mail/onionrouter-9999 b/metadata/md5-cache/net-mail/onionrouter-9999
index 204f7161178b..7d3de7ff56e9 100644
--- a/metadata/md5-cache/net-mail/onionrouter-9999
+++ b/metadata/md5-cache/net-mail/onionrouter-9999
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/dnspython[python_targets_py
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fd2e1efbbced09714286f2a4cbf83a84
diff --git a/metadata/md5-cache/net-mail/postorius-1.3.3 b/metadata/md5-cache/net-mail/postorius-1.3.3
index 8c743935efed..37005394f800 100644
--- a/metadata/md5-cache/net-mail/postorius-1.3.3
+++ b/metadata/md5-cache/net-mail/postorius-1.3.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/postorius/postorius-1.3.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=150132379c64171df9af6ffe89fa0ee7
diff --git a/metadata/md5-cache/net-mail/rss2email-3.11 b/metadata/md5-cache/net-mail/rss2email-3.11
index 5f15082baa9c..9591e5ef7553 100644
--- a/metadata/md5-cache/net-mail/rss2email-3.11
+++ b/metadata/md5-cache/net-mail/rss2email-3.11
@@ -11,5 +11,5 @@ RDEPEND=<dev-python/feedparser-6[python_targets_python3_6(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python3_6 ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/rss2email/rss2email/archive/v3.11.tar.gz -> rss2email-3.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0fb299e39c5a40fcef9d03a5dca9d8e7
diff --git a/metadata/md5-cache/net-mail/rss2email-3.11-r1 b/metadata/md5-cache/net-mail/rss2email-3.11-r1
index 6158ada6b7e9..4eab10adb020 100644
--- a/metadata/md5-cache/net-mail/rss2email-3.11-r1
+++ b/metadata/md5-cache/net-mail/rss2email-3.11-r1
@@ -11,5 +11,5 @@ RDEPEND=<dev-python/feedparser-6[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/rss2email/rss2email/archive/v3.11.tar.gz -> rss2email-3.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f958c36d8a6c914e2e84ad79b7d5e698
diff --git a/metadata/md5-cache/net-mail/rss2email-3.12.1 b/metadata/md5-cache/net-mail/rss2email-3.12.1
index 0761f1fde23f..07b8512138a1 100644
--- a/metadata/md5-cache/net-mail/rss2email-3.12.1
+++ b/metadata/md5-cache/net-mail/rss2email-3.12.1
@@ -11,5 +11,5 @@ RDEPEND=<dev-python/feedparser-6[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/rss2email/rss2email/archive/v3.12.1.tar.gz -> rss2email-3.12.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c2a2ce8974637da7dd454f523454a236
diff --git a/metadata/md5-cache/net-mail/rss2email-3.12.2 b/metadata/md5-cache/net-mail/rss2email-3.12.2
index fe36be7a948e..d6cffdc7815b 100644
--- a/metadata/md5-cache/net-mail/rss2email-3.12.2
+++ b/metadata/md5-cache/net-mail/rss2email-3.12.2
@@ -11,5 +11,5 @@ RDEPEND=<dev-python/feedparser-6[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/rss2email/rss2email/archive/v3.12.2.tar.gz -> rss2email-3.12.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c2a2ce8974637da7dd454f523454a236
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 2e56cd7ab12b..815da371f0f1 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/electron-cash-4.0.2-r2 b/metadata/md5-cache/net-misc/electron-cash-4.0.2-r2
index 848b01a06f9e..5a8d56266da5 100644
--- a/metadata/md5-cache/net-misc/electron-cash-4.0.2-r2
+++ b/metadata/md5-cache/net-misc/electron-cash-4.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/dnspython[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/fyookball/electrum/archive/4.0.2.tar.gz -> electron-cash-4.0.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e71cd26bb7a9b5095056a9dfbf6bb0b9
diff --git a/metadata/md5-cache/net-misc/electrum-4.0.4 b/metadata/md5-cache/net-misc/electrum-4.0.4
index 5fa7fb2a0b0a..f3901b35fd8a 100644
--- a/metadata/md5-cache/net-misc/electrum-4.0.4
+++ b/metadata/md5-cache/net-misc/electrum-4.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_6 python_targets
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spesmilo/electrum/archive/4.0.4.tar.gz -> electrum-4.0.4.gh.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=164adac3b5fd500b565f540017ea7bc8
diff --git a/metadata/md5-cache/net-misc/electrum-4.0.5 b/metadata/md5-cache/net-misc/electrum-4.0.5
index 632e7e667196..2a27aa0175fc 100644
--- a/metadata/md5-cache/net-misc/electrum-4.0.5
+++ b/metadata/md5-cache/net-misc/electrum-4.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_6 python_targets
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spesmilo/electrum/archive/4.0.5.tar.gz -> electrum-4.0.5.gh.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=659cfe3e2aee82bbb2506dcd39f8dd48
diff --git a/metadata/md5-cache/net-misc/electrum-ltc-3.3.4.1-r2 b/metadata/md5-cache/net-misc/electrum-ltc-3.3.4.1-r2
index fff8fd477b17..cb17ebaf2633 100644
--- a/metadata/md5-cache/net-misc/electrum-ltc-3.3.4.1-r2
+++ b/metadata/md5-cache/net-misc/electrum-ltc-3.3.4.1-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) python_targe
 REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pooler/electrum-ltc/archive/3.3.4.1.tar.gz -> electrum-ltc-3.3.4.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=63cda7cdd71195692a6a083b8de26245
diff --git a/metadata/md5-cache/net-misc/exabgp-4.2.11-r1 b/metadata/md5-cache/net-misc/exabgp-4.2.11-r1
index 5b51a3d8849d..e1791cd481ca 100644
--- a/metadata/md5-cache/net-misc/exabgp-4.2.11-r1
+++ b/metadata/md5-cache/net-misc/exabgp-4.2.11-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Exa-Networks/exabgp/archive/4.2.11.tar.gz -> exabgp-4.2.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fdcab749a56b986d910063887e1278dd
diff --git a/metadata/md5-cache/net-misc/gallery-dl-1.15.2-r1 b/metadata/md5-cache/net-misc/gallery-dl-1.15.2-r1
index 2c8e20960a21..0c872d39e476 100644
--- a/metadata/md5-cache/net-misc/gallery-dl-1.15.2-r1
+++ b/metadata/md5-cache/net-misc/gallery-dl-1.15.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mikf/gallery-dl/archive/v1.15.2.tar.gz -> gallery-dl-1.15.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=001ab2389dab3d2c7194a6e9854072df
diff --git a/metadata/md5-cache/net-misc/gallery-dl-1.15.3 b/metadata/md5-cache/net-misc/gallery-dl-1.15.3
index cb3826e27ecd..7b7a942bf5f5 100644
--- a/metadata/md5-cache/net-misc/gallery-dl-1.15.3
+++ b/metadata/md5-cache/net-misc/gallery-dl-1.15.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mikf/gallery-dl/archive/v1.15.3.tar.gz -> gallery-dl-1.15.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=001ab2389dab3d2c7194a6e9854072df
diff --git a/metadata/md5-cache/net-misc/gallery-dl-9999 b/metadata/md5-cache/net-misc/gallery-dl-9999
index d1d45dc5b0f0..e0ca8d1270a1 100644
--- a/metadata/md5-cache/net-misc/gallery-dl-9999
+++ b/metadata/md5-cache/net-misc/gallery-dl-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.11.0[python_targets_python3_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=001ab2389dab3d2c7194a6e9854072df
diff --git a/metadata/md5-cache/net-misc/gns3-gui-2.2.11 b/metadata/md5-cache/net-misc/gns3-gui-2.2.11
index c126f1c4048a..fe600c8bdbbc 100644
--- a/metadata/md5-cache/net-misc/gns3-gui-2.2.11
+++ b/metadata/md5-cache/net-misc/gns3-gui-2.2.11
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/distro-1.3.0[python_targets_python3_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-gui/archive/v2.2.11.tar.gz -> gns3-gui-2.2.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb3a58b52edb07635515d35e30ee45d1
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.2.11 b/metadata/md5-cache/net-misc/gns3-server-2.2.11
index 4400907bd018..49d84ba7e49c 100644
--- a/metadata/md5-cache/net-misc/gns3-server-2.2.11
+++ b/metadata/md5-cache/net-misc/gns3-server-2.2.11
@@ -11,5 +11,5 @@ RDEPEND=>=app-emulation/dynamips-0.2.18 ~dev-python/aiofiles-0.5.0[python_target
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-server/archive/v2.2.11.tar.gz -> gns3-server-2.2.11.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2a7c7cc557194051b82775292abef423
diff --git a/metadata/md5-cache/net-misc/gsutil-4.41 b/metadata/md5-cache/net-misc/gsutil-4.41
index 3678c651e01c..46928c2b03de 100644
--- a/metadata/md5-cache/net-misc/gsutil-4.41
+++ b/metadata/md5-cache/net-misc/gsutil-4.41
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://commondatastorage.googleapis.com/pub/gsutil_4.41.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4981bd6d3e59c52a3ec40f5ad231bfd1
diff --git a/metadata/md5-cache/net-misc/gsutil-4.45 b/metadata/md5-cache/net-misc/gsutil-4.45
index fbfb404879bf..183a4b63481e 100644
--- a/metadata/md5-cache/net-misc/gsutil-4.45
+++ b/metadata/md5-cache/net-misc/gsutil-4.45
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://commondatastorage.googleapis.com/pub/gsutil_4.45.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4981bd6d3e59c52a3ec40f5ad231bfd1
diff --git a/metadata/md5-cache/net-misc/gsutil-4.47 b/metadata/md5-cache/net-misc/gsutil-4.47
index 62732a9d08f9..7c33952ff536 100644
--- a/metadata/md5-cache/net-misc/gsutil-4.47
+++ b/metadata/md5-cache/net-misc/gsutil-4.47
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://commondatastorage.googleapis.com/pub/gsutil_4.47.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d68bb412c1dce9f2df9045c312ca6899
diff --git a/metadata/md5-cache/net-misc/gsutil-4.50 b/metadata/md5-cache/net-misc/gsutil-4.50
index a6e681db9ddf..60be4f7b4271 100644
--- a/metadata/md5-cache/net-misc/gsutil-4.50
+++ b/metadata/md5-cache/net-misc/gsutil-4.50
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=http://commondatastorage.googleapis.com/pub/gsutil_4.50.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=93e9de7136d202ced3a581f02e07d9ce
diff --git a/metadata/md5-cache/net-misc/httpie-2.1.0 b/metadata/md5-cache/net-misc/httpie-2.1.0
index d733138b12d7..fe4195905cd6 100644
--- a/metadata/md5-cache/net-misc/httpie-2.1.0
+++ b/metadata/md5-cache/net-misc/httpie-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakubroztocil/httpie/archive/2.1.0.tar.gz -> httpie-2.1.0.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=60962ddaac5b3c2208c4bb9d91919648
diff --git a/metadata/md5-cache/net-misc/httpie-2.2.0 b/metadata/md5-cache/net-misc/httpie-2.2.0
index a09b03e9c95c..e1de6b37b1a2 100644
--- a/metadata/md5-cache/net-misc/httpie-2.2.0
+++ b/metadata/md5-cache/net-misc/httpie-2.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakubroztocil/httpie/archive/2.2.0.tar.gz -> httpie-2.2.0.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=60962ddaac5b3c2208c4bb9d91919648
diff --git a/metadata/md5-cache/net-misc/ipcalc-0.42_p2 b/metadata/md5-cache/net-misc/ipcalc-0.42_p2
index 83b9c5e8aa49..cf9024b2bec0 100644
--- a/metadata/md5-cache/net-misc/ipcalc-0.42_p2
+++ b/metadata/md5-cache/net-misc/ipcalc-0.42_p2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=IP Calculator prints broadcast/network/etc for an IP address and netmask
 EAPI=7
 HOMEPAGE=http://jodies.de/ipcalc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=>=dev-lang/perl-5.6.0
 SLOT=0
 SRC_URI=mirror://debian/pool/main/i/ipcalc/ipcalc_0.42.orig.tar.gz mirror://debian/pool/main/i/ipcalc/ipcalc_0.42-2.debian.tar.xz
-_md5_=6bc844bd4c8dff27b5d314a7c58e6160
+_md5_=55027220d721fa2fba12d75431e71be1
diff --git a/metadata/md5-cache/net-misc/lcr-9999 b/metadata/md5-cache/net-misc/lcr-9999
deleted file mode 100644
index 5f0737f44c90..000000000000
--- a/metadata/md5-cache/net-misc/lcr-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure postinst prepare unpack
-DEPEND=media-libs/opencore-amr asterisk? ( net-misc/asterisk ) ssl? ( dev-libs/openssl ) gsm-bs? ( net-wireless/openbsc ) sip? ( net-libs/sofia-sip ) gsm-ms? ( net-wireless/osmocom-bb ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Linux Call Router
-EAPI=5
-HOMEPAGE=http://isdn.eversberg.eu/
-IUSE=asterisk +ssl +gsm-bs +gsm-ms ss5 +sip gsmhr misdn
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=media-libs/opencore-amr asterisk? ( net-misc/asterisk ) ssl? ( dev-libs/openssl ) gsm-bs? ( net-wireless/openbsc ) sip? ( net-libs/sofia-sip ) gsm-ms? ( net-wireless/osmocom-bb )
-SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5bfc29897655f9fb37d3485e236dde01
diff --git a/metadata/md5-cache/net-misc/libteam-1.22 b/metadata/md5-cache/net-misc/libteam-1.22
deleted file mode 100644
index 7b1ca907dd66..000000000000
--- a/metadata/md5-cache/net-misc/libteam-1.22
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) >=app-portage/elt-patches-20170815
-DESCRIPTION=Library and tools set for controlling team network device
-EAPI=5
-HOMEPAGE=http://libteam.org
-IUSE=dbus debug examples static-libs +syslog zmq kernel_linux
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
-SLOT=0
-SRC_URI=http://libteam.org/files/libteam-1.22.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f046286176f94b259a0af1f10406ab73
diff --git a/metadata/md5-cache/net-misc/libteam-1.31 b/metadata/md5-cache/net-misc/libteam-1.31
index 90ddab182add..79d5671bd9d2 100644
--- a/metadata/md5-cache/net-misc/libteam-1.31
+++ b/metadata/md5-cache/net-misc/libteam-1.31
@@ -5,10 +5,10 @@ DESCRIPTION=Library and tools set for controlling team network device
 EAPI=7
 HOMEPAGE=http://libteam.org
 IUSE=dbus debug examples static-libs +syslog zmq kernel_linux
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/jansson-2.4 dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
 SLOT=0
 SRC_URI=https://github.com/jpirko/libteam/archive/v1.31.tar.gz -> libteam-1.31.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7aa96cdf1a40571ff59d1f7c1d8fe75a
+_md5_=a4c9beec1bd3c10bb81fd91cf38829d1
diff --git a/metadata/md5-cache/net-misc/minidlna-1.3.0 b/metadata/md5-cache/net-misc/minidlna-1.3.0
index 34b1d2a2ba08..a0a4e8b62eeb 100644
--- a/metadata/md5-cache/net-misc/minidlna-1.3.0
+++ b/metadata/md5-cache/net-misc/minidlna-1.3.0
@@ -5,10 +5,10 @@ DESCRIPTION=DLNA/UPnP-AV compliant media server
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/minidlna/
 IUSE=elibc_musl netgear readynas zeroconf
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 arm x86
 LICENSE=BSD GPL-2
 RDEPEND=acct-group/minidlna acct-user/minidlna dev-db/sqlite:3 media-libs/flac:= media-libs/libexif:= media-libs/libid3tag:= media-libs/libogg:= media-libs/libvorbis:= media-video/ffmpeg:0= virtual/jpeg:0= elibc_musl? ( sys-libs/queue-standalone ) zeroconf? ( net-dns/avahi:= ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/minidlna/minidlna/1.3.0/minidlna-1.3.0.tar.gz https://dev.gentoo.org/~xmw/minidlna-gentoo-artwork.patch.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4cbb58770e05476e90cdbadcb2d1d2cd
+_md5_=b2630a98251510d9fcc2df9825e73f7c
diff --git a/metadata/md5-cache/net-misc/netifrc-0.7.1-r1 b/metadata/md5-cache/net-misc/netifrc-0.7.1-r1
index 27c5e93c328c..946484acc676 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.7.1-r1
+++ b/metadata/md5-cache/net-misc/netifrc-0.7.1-r1
@@ -4,10 +4,10 @@ DEPEND=!<sys-fs/udev-172
 DESCRIPTION=Gentoo Network Interface Management Scripts
 EAPI=7
 HOMEPAGE=https://www.gentoo.org/proj/en/base/openrc/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/netifrc.git/snapshot/netifrc-0.7.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=5841a95f99640c76000e77d8c120757a
+_md5_=b8dcdcdb70c6be3d61ad4829f7eeaf1f
diff --git a/metadata/md5-cache/net-misc/netkit-telnetd-0.17-r12 b/metadata/md5-cache/net-misc/netkit-telnetd-0.17-r12
index 08e98f7fac7d..80b040c7c1b0 100644
--- a/metadata/md5-cache/net-misc/netkit-telnetd-0.17-r12
+++ b/metadata/md5-cache/net-misc/netkit-telnetd-0.17-r12
@@ -9,4 +9,4 @@ RDEPEND=>=sys-libs/ncurses-5.2:= !net-misc/telnet-bsd
 SLOT=0
 SRC_URI=mirror://gentoo/netkit-telnet-0.17.tar.gz mirror://debian/pool/main/n/netkit-telnet/netkit-telnet_0.17-41.debian.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b13fa52f2bee49a147650a127d32f02a
+_md5_=88d9019964779e6a5a5a935cde65c0d3
diff --git a/metadata/md5-cache/net-misc/nyx-2.0.4 b/metadata/md5-cache/net-misc/nyx-2.0.4
index af98539bfbec..f4a672628290 100644
--- a/metadata/md5-cache/net-misc/nyx-2.0.4
+++ b/metadata/md5-cache/net-misc/nyx-2.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nyx/nyx-2.0.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=14fac63712a2db82da1dc37581e31b3b
diff --git a/metadata/md5-cache/net-misc/nyx-2.1.0-r1 b/metadata/md5-cache/net-misc/nyx-2.1.0-r1
index b55df55cfae5..c71f2ca0f51b 100644
--- a/metadata/md5-cache/net-misc/nyx-2.1.0-r1
+++ b/metadata/md5-cache/net-misc/nyx-2.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nyx/nyx-2.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b51f3d17296ab9f538b3f093914fb8d2
diff --git a/metadata/md5-cache/net-misc/ofono-1.31 b/metadata/md5-cache/net-misc/ofono-1.31
index 3433800e8b8f..b2805cc7d800 100644
--- a/metadata/md5-cache/net-misc/ofono-1.31
+++ b/metadata/md5-cache/net-misc/ofono-1.31
@@ -5,11 +5,11 @@ DESCRIPTION=Open Source mobile telephony (GSM/UMTS) daemon
 EAPI=7
 HOMEPAGE=https://01.org/ofono
 IUSE=+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/dbus-1.4 >=dev-libs/glib-2.32 net-misc/mobile-broadband-provider-info bluetooth? ( >=net-wireless/bluez-4.99 ) udev? ( virtual/udev ) examples? ( dev-python/dbus-python ) tools? ( virtual/libusb:1 )
 REQUIRED_USE=dundee? ( bluetooth )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/ofono/ofono-1.31.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=645e33d65de42d6e1c652fafd441bab4
+_md5_=0a200937115f53cd22d03082c32c65fd
diff --git a/metadata/md5-cache/net-misc/pssh-2.3.4-r1 b/metadata/md5-cache/net-misc/pssh-2.3.4-r1
index 3005935334e7..eb86a6020582 100644
--- a/metadata/md5-cache/net-misc/pssh-2.3.4-r1
+++ b/metadata/md5-cache/net-misc/pssh-2.3.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/lilydjwg/pssh/archive/v2.3.4.tar.gz -> pssh-2.3.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4c8a72ece4287a4df2f2014b173b3518
diff --git a/metadata/md5-cache/net-misc/pulseaudio-dlna-0.6.0_pre20200114 b/metadata/md5-cache/net-misc/pulseaudio-dlna-0.6.0_pre20200114
index 6c6807966473..c4db10788498 100644
--- a/metadata/md5-cache/net-misc/pulseaudio-dlna-0.6.0_pre20200114
+++ b/metadata/md5-cache/net-misc/pulseaudio-dlna-0.6.0_pre20200114
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/protobuf-python-2.5.0[python_targets_python3_6(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/masmu/pulseaudio-dlna/archive/b0db8137224f5a293329a60187365168304c3768.tar.gz -> pulseaudio-dlna-0.6.0_pre20200114.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=51c413ee636dcc2b22483d856ac476e0
diff --git a/metadata/md5-cache/net-misc/pulseaudio-dlna-9999 b/metadata/md5-cache/net-misc/pulseaudio-dlna-9999
index 616391791430..9ae62c85a1db 100644
--- a/metadata/md5-cache/net-misc/pulseaudio-dlna-9999
+++ b/metadata/md5-cache/net-misc/pulseaudio-dlna-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/protobuf-python-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/docopt-0.6.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setproctitle-1.1.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/notify2-0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psutil-5.4.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/chardet-3.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyroute2-0.3.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pychromecast-2.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dbus-python-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/zeroconf-0.17.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject[cairo,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] gnome-base/librsvg[introspection] x11-libs/gtk+:3[introspection] || ( || ( media-video/ffmpeg[encode,faac,mp3,opus,vorbis] media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] ) ( media-libs/faac media-libs/flac media-sound/lame media-sound/opus-tools media-sound/sox media-sound/vorbis-tools ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=54047b1a7aff4666605b74d50fff584c
diff --git a/metadata/md5-cache/net-misc/putty-0.74 b/metadata/md5-cache/net-misc/putty-0.74
index aa4f3b3094e0..b6840468a3a7 100644
--- a/metadata/md5-cache/net-misc/putty-0.74
+++ b/metadata/md5-cache/net-misc/putty-0.74
@@ -5,11 +5,11 @@ DESCRIPTION=A Free Telnet/SSH Client
 EAPI=7
 HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
 IUSE=doc +gtk gtk2 ipv6 gssapi
-KEYWORDS=~alpha amd64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm64 hppa ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
 REQUIRED_USE=gtk2? ( gtk )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/0.74/putty-0.74.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe5d6dc2517bd860163076ec4945afaa
+_md5_=9a4744dc2cd750ee6746bafe2c4c6dd3
diff --git a/metadata/md5-cache/net-misc/pyhoca-cli-0.6.0.1 b/metadata/md5-cache/net-misc/pyhoca-cli-0.6.0.1
index 97ddbf63824e..cea99efc4a8c 100644
--- a/metadata/md5-cache/net-misc/pyhoca-cli-0.6.0.1
+++ b/metadata/md5-cache/net-misc/pyhoca-cli-0.6.0.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setproctitle[python_targets_python3_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/pyhoca-cli/pyhoca-cli-0.6.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6dd3533db7186de0c2677412ef81fcfb
diff --git a/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.1 b/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.1
index 5b9bd293999e..be2d2af4e513 100644
--- a/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.1
+++ b/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setproctitle[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/pyhoca-cli/pyhoca-cli-0.6.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a089fb190cb006f270fa73e3ccb7c11c
diff --git a/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2 b/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2
index 875328766797..d7e6102ae253 100644
--- a/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2
+++ b/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setproctitle[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/pyhoca-cli/pyhoca-cli-0.6.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a089fb190cb006f270fa73e3ccb7c11c
diff --git a/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.0 b/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.0
index f7d089af6783..3c53b8bf2071 100644
--- a/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.0
+++ b/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pycups[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/pyhoca-gui/pyhoca-gui-0.6.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=152aca8bd859cbbe54d39eec6e56feef
diff --git a/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1 b/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1
index 4fca431535ad..12339f7ca125 100644
--- a/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1
+++ b/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pycups[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/pyhoca-gui/pyhoca-gui-0.6.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=152aca8bd859cbbe54d39eec6e56feef
diff --git a/metadata/md5-cache/net-misc/python-x2go-0.6.0.2 b/metadata/md5-cache/net-misc/python-x2go-0.6.0.2
index f6aa1b7f39bb..26e3e8f5cbd5 100644
--- a/metadata/md5-cache/net-misc/python-x2go-0.6.0.2
+++ b/metadata/md5-cache/net-misc/python-x2go-0.6.0.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/gevent[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/python-x2go/python-x2go-0.6.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8e9a9017e21c1270b7d70303ba7b7284
diff --git a/metadata/md5-cache/net-misc/python-x2go-0.6.1.1 b/metadata/md5-cache/net-misc/python-x2go-0.6.1.1
index dc5fffd7eeca..8985fa054513 100644
--- a/metadata/md5-cache/net-misc/python-x2go-0.6.1.1
+++ b/metadata/md5-cache/net-misc/python-x2go-0.6.1.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/gevent[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/python-x2go/python-x2go-0.6.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1c7d6f94a27c283a4c14bf4a1a720774
diff --git a/metadata/md5-cache/net-misc/python-x2go-0.6.1.2 b/metadata/md5-cache/net-misc/python-x2go-0.6.1.2
index e0da022e388c..12bc95070acd 100644
--- a/metadata/md5-cache/net-misc/python-x2go-0.6.1.2
+++ b/metadata/md5-cache/net-misc/python-x2go-0.6.1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/gevent[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/python-x2go/python-x2go-0.6.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1c7d6f94a27c283a4c14bf4a1a720774
diff --git a/metadata/md5-cache/net-misc/python-x2go-0.6.1.3 b/metadata/md5-cache/net-misc/python-x2go-0.6.1.3
index 3c16e8f6ae42..4cb710a5c5ba 100644
--- a/metadata/md5-cache/net-misc/python-x2go-0.6.1.3
+++ b/metadata/md5-cache/net-misc/python-x2go-0.6.1.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/gevent[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/python-x2go/python-x2go-0.6.1.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1c7d6f94a27c283a4c14bf4a1a720774
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.9 b/metadata/md5-cache/net-misc/remmina-1.4.9
index 1379a7233c36..a1b67c7d87a8 100644
--- a/metadata/md5-cache/net-misc/remmina-1.4.9
+++ b/metadata/md5-cache/net-misc/remmina-1.4.9
@@ -5,10 +5,10 @@ DESCRIPTION=A GTK+ RDP, SPICE, VNC, XDMCP and SSH client
 EAPI=7
 HOMEPAGE=https://remmina.org/
 IUSE=appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libsodium:= net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) kwallet? ( kde-frameworks/kwallet ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.9/Remmina-v1.4.9.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=05bc8033a4f86bf429109dd9ed6ed3c7
+_md5_=3ceb77d2513f0e9d9cfbbf878316f943
diff --git a/metadata/md5-cache/net-misc/s3cmd-2.1.0 b/metadata/md5-cache/net-misc/s3cmd-2.1.0
index aca7b199f10f..225d8d6f0012 100644
--- a/metadata/md5-cache/net-misc/s3cmd-2.1.0
+++ b/metadata/md5-cache/net-misc/s3cmd-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/s3tools/s3cmd-2.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c26650359f87fe0523c9bc6c9cb21c40
diff --git a/metadata/md5-cache/net-misc/sipcalc-1.1.6 b/metadata/md5-cache/net-misc/sipcalc-1.1.6
index dad77bcaa2cc..78692fb6e039 100644
--- a/metadata/md5-cache/net-misc/sipcalc-1.1.6
+++ b/metadata/md5-cache/net-misc/sipcalc-1.1.6
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Sipcalc is an advanced console-based IP subnet calculator
 EAPI=5
 HOMEPAGE=http://www.routemeister.net/projects/sipcalc/
-KEYWORDS=amd64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.routemeister.net/projects/sipcalc/files/sipcalc-1.1.6.tar.gz
-_md5_=84f0d4a163260a3ea870a40560bfdf75
+_md5_=edf7a717e1a7b4a053f63678e2d55b9c
diff --git a/metadata/md5-cache/net-misc/socket-burst-dampener-1.2.1 b/metadata/md5-cache/net-misc/socket-burst-dampener-1.2.1
index 406d3a3b2b71..2e7ef7b46971 100644
--- a/metadata/md5-cache/net-misc/socket-burst-dampener-1.2.1
+++ b/metadata/md5-cache/net-misc/socket-burst-dampener-1.2.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/zmedico/socket-burst-dampener/archive/v1.2.1.tar.gz -> socket-burst-dampener-1.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c551f72f2d6635592be3be4b48ede357
diff --git a/metadata/md5-cache/net-misc/srf-ip-conn-srv-9999 b/metadata/md5-cache/net-misc/srf-ip-conn-srv-9999
deleted file mode 100644
index 0c57428cd16a..000000000000
--- a/metadata/md5-cache/net-misc/srf-ip-conn-srv-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=SharkRF IP Connector Protocol server
-EAPI=6
-HOMEPAGE=https://github.com/sharkrf/srf-ip-conn-srv
-LICENSE=MIT
-PROPERTIES=live
-SLOT=0
-SRC_URI=https://github.com/sharkrf/srf-ip-conn/archive/140c9b8a86193b8f345c9e113691113310859ff8.tar.gz -> srf-ip-conn-140c9b8a8619.tar.gz https://github.com/zserge/jsmn/archive/35086597a72d94d8393e6a90b96e553d714085bd.tar.gz -> jsmn-35086597a72d.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0440764b562e0ecfd629c4722c106017
diff --git a/metadata/md5-cache/net-misc/streamlink-1.3.0-r2 b/metadata/md5-cache/net-misc/streamlink-1.3.0-r2
index 03d354e82256..5632438334ae 100644
--- a/metadata/md5-cache/net-misc/streamlink-1.3.0-r2
+++ b/metadata/md5-cache/net-misc/streamlink-1.3.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/streamlink/streamlink/releases/download/1.3.0/streamlink-1.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=31c96e32e6e2b95461d8a464ad1ba7b4
diff --git a/metadata/md5-cache/net-misc/streamlink-1.3.1-r1 b/metadata/md5-cache/net-misc/streamlink-1.3.1-r1
index 8d1df2734312..23039ad3cbf6 100644
--- a/metadata/md5-cache/net-misc/streamlink-1.3.1-r1
+++ b/metadata/md5-cache/net-misc/streamlink-1.3.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/streamlink/streamlink/releases/download/1.3.1/streamlink-1.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=31c96e32e6e2b95461d8a464ad1ba7b4
diff --git a/metadata/md5-cache/net-misc/streamlink-9999 b/metadata/md5-cache/net-misc/streamlink-9999
index 1afb05c15466..06b2e1e80c88 100644
--- a/metadata/md5-cache/net-misc/streamlink-9999
+++ b/metadata/md5-cache/net-misc/streamlink-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( >dev-python/requests-2.21.0[python_tar
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=31c96e32e6e2b95461d8a464ad1ba7b4
diff --git a/metadata/md5-cache/net-misc/you-get-0.4.1355-r1 b/metadata/md5-cache/net-misc/you-get-0.4.1355-r1
index db46024e1d40..648d88af6ca4 100644
--- a/metadata/md5-cache/net-misc/you-get-0.4.1355-r1
+++ b/metadata/md5-cache/net-misc/you-get-0.4.1355-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/soimort/you-get/archive/v0.4.1355.tar.gz -> you-get-0.4.1355.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8528063b013f50c7638a2c3169678886
diff --git a/metadata/md5-cache/net-misc/you-get-0.4.1432 b/metadata/md5-cache/net-misc/you-get-0.4.1432
index acad6c10d7e1..091ce0c4db3a 100644
--- a/metadata/md5-cache/net-misc/you-get-0.4.1432
+++ b/metadata/md5-cache/net-misc/you-get-0.4.1432
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/soimort/you-get/archive/v0.4.1432.tar.gz -> you-get-0.4.1432.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fe09b47d073a46f41b29106abfd1a5e3
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2020.09.20 b/metadata/md5-cache/net-misc/youtube-dl-2020.09.20
index c64cad454a98..cbe9a089a593 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2020.09.20
+++ b/metadata/md5-cache/net-misc/youtube-dl-2020.09.20
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://youtube-dl.org/downloads/2020.09.20/youtube-dl-2020.09.20.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=918ead4df120b59067b3d7087ea5d91b
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2020.11.26 b/metadata/md5-cache/net-misc/youtube-dl-2020.11.26
index db3b795788fc..e0c6f53a96fa 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2020.11.26
+++ b/metadata/md5-cache/net-misc/youtube-dl-2020.11.26
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://youtube-dl.org/downloads/2020.11.26/youtube-dl-2020.11.26.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a733008947a32c28c88213c8b2479606
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2020.11.29 b/metadata/md5-cache/net-misc/youtube-dl-2020.11.29
index 7b1f01221e75..314b7fd0c313 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2020.11.29
+++ b/metadata/md5-cache/net-misc/youtube-dl-2020.11.29
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://youtube-dl.org/downloads/2020.11.29/youtube-dl-2020.11.29.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3a0aa2499aa88ddd233026cea1daf26a
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2020.12.02 b/metadata/md5-cache/net-misc/youtube-dl-2020.12.02
new file mode 100644
index 000000000000..3bb9e8f4c171
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2020.12.02
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Download videos from YouTube.com (and more sites...)
+EAPI=7
+HOMEPAGE=https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+RDEPEND=dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://youtube-dl.org/downloads/2020.12.02/youtube-dl-2020.12.02.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3a0aa2499aa88ddd233026cea1daf26a
diff --git a/metadata/md5-cache/net-misc/youtube-dl-9999 b/metadata/md5-cache/net-misc/youtube-dl-9999
index de3e8bd18872..521f9593f303 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-9999
+++ b/metadata/md5-cache/net-misc/youtube-dl-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=16e4170b155eab830796f63b8e0ae981
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index 13fd4b11fb44..6c0033c6c919 100644
Binary files a/metadata/md5-cache/net-nds/Manifest.gz and b/metadata/md5-cache/net-nds/Manifest.gz differ
diff --git a/metadata/md5-cache/net-nds/nsscache-0.39 b/metadata/md5-cache/net-nds/nsscache-0.39
index 7e8fbb37f078..537286593239 100644
--- a/metadata/md5-cache/net-nds/nsscache-0.39
+++ b/metadata/md5-cache/net-nds/nsscache-0.39
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/nsscache/archive/version/0.39.tar.gz -> nsscache-0.39.tar.gz https://dev.gentoo.org/~robbat2/nsscache-0.30-r3-gentoo-authorized-keys-command.py
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f94d67afc41f4599be605bc4c661df9d
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index 7b06222c6b29..3a954a46267b 100644
Binary files a/metadata/md5-cache/net-news/Manifest.gz and b/metadata/md5-cache/net-news/Manifest.gz differ
diff --git a/metadata/md5-cache/net-news/canto-curses-0.9.9 b/metadata/md5-cache/net-news/canto-curses-0.9.9
index 02c2ada93e39..d0c874743f75 100644
--- a/metadata/md5-cache/net-news/canto-curses-0.9.9
+++ b/metadata/md5-cache/net-news/canto-curses-0.9.9
@@ -10,5 +10,5 @@ RDEPEND=>=net-news/canto-daemon-0.9.1[python_targets_python3_6(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/themoken/canto-curses/archive/v0.9.9.tar.gz -> canto-curses-0.9.9.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ca5b82b6930cb07d810d79a7a344f8cd
diff --git a/metadata/md5-cache/net-news/canto-daemon-0.9.7 b/metadata/md5-cache/net-news/canto-daemon-0.9.7
index a39b3537edfc..3655e85533a8 100644
--- a/metadata/md5-cache/net-news/canto-daemon-0.9.7
+++ b/metadata/md5-cache/net-news/canto-daemon-0.9.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/feedparser[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/themoken/canto-next/archive/v0.9.7.tar.gz -> canto-daemon-0.9.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f4f161c9fe03d0eb9c06d2b8cd38be66
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 9add1149f07e..12a83fc3e6a5 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r2 b/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r2
index 093a9adc2013..8ba8c1a1c873 100644
--- a/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r2
+++ b/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/effigies/BitTornado/archive/ed327c4e1ebbe1fe949be81723527cfda87aeb8d.tar.gz -> BitTornado-0.4.1_p20160925.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=86e3a9db156cb3aa3c4e974a7ed1ea57
diff --git a/metadata/md5-cache/net-p2p/deluge-2.0.3-r4 b/metadata/md5-cache/net-p2p/deluge-2.0.3-r4
index 79789a51e8fb..e63ef3d5ff80 100644
--- a/metadata/md5-cache/net-p2p/deluge-2.0.3-r4
+++ b/metadata/md5-cache/net-p2p/deluge-2.0.3-r4
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=http://download.deluge-torrent.org/source/2.0/deluge-2.0.3.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=30f39a1de3eb06ceeae303930c4ac76c
diff --git a/metadata/md5-cache/net-p2p/deluge-2.0.3-r5 b/metadata/md5-cache/net-p2p/deluge-2.0.3-r5
index 90a8882bbbe9..3426f313272b 100644
--- a/metadata/md5-cache/net-p2p/deluge-2.0.3-r5
+++ b/metadata/md5-cache/net-p2p/deluge-2.0.3-r5
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=http://download.deluge-torrent.org/source/2.0/deluge-2.0.3.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=003a4fd56f4c6eb85b5b6baaab673cb7
diff --git a/metadata/md5-cache/net-p2p/deluge-2.0.3-r6 b/metadata/md5-cache/net-p2p/deluge-2.0.3-r6
index 2247d4f7bbb7..ffad79e2b426 100644
--- a/metadata/md5-cache/net-p2p/deluge-2.0.3-r6
+++ b/metadata/md5-cache/net-p2p/deluge-2.0.3-r6
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=http://download.deluge-torrent.org/source/2.0/deluge-2.0.3.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5a9d56f671f25b312250e7f62c167fdb
diff --git a/metadata/md5-cache/net-p2p/deluge-2.0.3-r7 b/metadata/md5-cache/net-p2p/deluge-2.0.3-r7
index 06aa1e4de422..8242757872ec 100644
--- a/metadata/md5-cache/net-p2p/deluge-2.0.3-r7
+++ b/metadata/md5-cache/net-p2p/deluge-2.0.3-r7
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=http://download.deluge-torrent.org/source/2.0/deluge-2.0.3.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=300b4d7b5b13fc4d6e2a4a56f1782b14
diff --git a/metadata/md5-cache/net-p2p/deluge-2.0.3-r8 b/metadata/md5-cache/net-p2p/deluge-2.0.3-r8
index 7329b9750f54..85666b21c970 100644
--- a/metadata/md5-cache/net-p2p/deluge-2.0.3-r8
+++ b/metadata/md5-cache/net-p2p/deluge-2.0.3-r8
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=http://download.deluge-torrent.org/source/2.0/deluge-2.0.3.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=78d37b9255005dbe8ddcb6f1f6240c99
diff --git a/metadata/md5-cache/net-p2p/deluge-9999 b/metadata/md5-cache/net-p2p/deluge-9999
index df45551b5edc..30d1df2d5597 100644
--- a/metadata/md5-cache/net-p2p/deluge-9999
+++ b/metadata/md5-cache/net-p2p/deluge-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/distro[python_targets_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)] dev-python/pyopenssl[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] dev-python/rencode[python_targets_python3_6(-)] dev-python/setproctitle[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_6(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_6(-)] geoip? ( dev-python/geoip-python[python_targets_python3_6(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_6(-)] ) dev-python/pygobject:3[python_targets_python3_6(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_6(-)] dev-python/mako[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/distro[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/pyopenssl[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] dev-python/rencode[python_targets_python3_7(-)] dev-python/setproctitle[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_7(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_7(-)] geoip? ( dev-python/geoip-python[python_targets_python3_7(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_7(-)] ) dev-python/pygobject:3[python_targets_python3_7(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_7(-)] dev-python/mako[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] dev-python/rencode[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_8(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_8(-)] geoip? ( dev-python/geoip-python[python_targets_python3_8(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_8(-)] ) dev-python/pygobject:3[python_targets_python3_8(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=300b4d7b5b13fc4d6e2a4a56f1782b14
diff --git a/metadata/md5-cache/net-p2p/nicotine+-2.0.1-r1 b/metadata/md5-cache/net-p2p/nicotine+-2.0.1-r1
index abf16c7c12e5..c9c47dfb1d01 100644
--- a/metadata/md5-cache/net-p2p/nicotine+-2.0.1-r1
+++ b/metadata/md5-cache/net-p2p/nicotine+-2.0.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/Nicotine-Plus/nicotine-plus/archive/2.0.1.tar.gz -> nicotine+-2.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7782398cb9b5f7834ba6960e83665bb3
diff --git a/metadata/md5-cache/net-p2p/nicotine+-2.1.2 b/metadata/md5-cache/net-p2p/nicotine+-2.1.2
index aac91a541cad..b30464ab7c22 100644
--- a/metadata/md5-cache/net-p2p/nicotine+-2.1.2
+++ b/metadata/md5-cache/net-p2p/nicotine+-2.1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/Nicotine-Plus/nicotine-plus/archive/2.1.2.tar.gz -> nicotine+-2.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25e26f7e6c2de1760ce6d2d33c0afe4a
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-4.3.1 b/metadata/md5-cache/net-p2p/qbittorrent-4.3.1
new file mode 100644
index 000000000000..abca2fa488b3
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/qbittorrent-4.3.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtxml:5 >=net-libs/libtorrent-rasterbar-1.2.0:0= sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-libs/geoip dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) dev-qt/linguist-tools:5
+DESCRIPTION=BitTorrent client in C++ and Qt
+EAPI=7
+HOMEPAGE=https://www.qbittorrent.org https://github.com/qbittorrent
+IUSE=+dbus debug webui +X
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtxml:5 >=net-libs/libtorrent-rasterbar-1.2.0:0= sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( dev-libs/geoip dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
+REQUIRED_USE=dbus? ( X )
+SLOT=0
+SRC_URI=https://github.com/qbittorrent/qBittorrent/archive/release-4.3.1.tar.gz -> qbittorrent-4.3.1.tar.gz
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bb70b5cf5abf102555a57d5020a68b60
diff --git a/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2 b/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
index 4f4065eaddad..ce2024d5b82e 100644
--- a/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
+++ b/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Fuuzetsu/torrentinfo/archive/v1.8.6.tar.gz -> torrentinfo-1.8.6.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7c3ba5a860f03a7787ab967cc9ac3376
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 29cad886b62d..613f2323ce6e 100644
Binary files a/metadata/md5-cache/net-print/Manifest.gz and b/metadata/md5-cache/net-print/Manifest.gz differ
diff --git a/metadata/md5-cache/net-print/poster-20060221 b/metadata/md5-cache/net-print/poster-20060221
deleted file mode 100644
index b4c004026875..000000000000
--- a/metadata/md5-cache/net-print/poster-20060221
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=small utility for making a poster from an EPS file or a one-page PS document
-EAPI=5
-HOMEPAGE=https://printing.kde.org/downloads
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://kde/printing/poster-20060221.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=03df3b4b36fde6a1e29e11a0eae1d305
diff --git a/metadata/md5-cache/net-print/poster-20060221-r2 b/metadata/md5-cache/net-print/poster-20060221-r2
deleted file mode 100644
index 8ddb0b031c66..000000000000
--- a/metadata/md5-cache/net-print/poster-20060221-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Small utility for making a poster from an EPS file or a one-page PS document
-EAPI=6
-HOMEPAGE=https://printing.kde.org/downloads
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://kde/printing/poster-20060221.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2f5aa090414187b72ebc7b239967d577
diff --git a/metadata/md5-cache/net-print/poster-20060221-r3 b/metadata/md5-cache/net-print/poster-20060221-r3
index 0d18b7c19ff8..36ccaf8019b0 100644
--- a/metadata/md5-cache/net-print/poster-20060221-r3
+++ b/metadata/md5-cache/net-print/poster-20060221-r3
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Small utility for making a poster from an EPS file or a one-page PS document
 EAPI=6
 HOMEPAGE=https://printing.kde.org/downloads
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://kde/printing/poster-20060221.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2fa65691dba4981a638653e2c6b55cc3
+_md5_=f7924898a3c5a79839538a9b96184411
diff --git a/metadata/md5-cache/net-print/splix-2.0.0_p20130826 b/metadata/md5-cache/net-print/splix-2.0.0_p20130826
deleted file mode 100644
index 216124de4bdf..000000000000
--- a/metadata/md5-cache/net-print/splix-2.0.0_p20130826
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=app-text/ghostscript-gpl-9.02 >=net-print/cups-1.4.0 jbig? ( media-libs/jbigkit )
-DESCRIPTION=A set of CUPS printer drivers for SPL (Samsung Printer Language) printers
-EAPI=5
-HOMEPAGE=http://splix.sourceforge.net/
-IUSE=+jbig
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/ghostscript-gpl-9.02 >=net-print/cups-1.4.0 jbig? ( media-libs/jbigkit )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/splix-2.0.0_p20130826.tar.bz2 https://dev.gentoo.org/~voyageur/distfiles/samsung-cms-20120312.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a6a8e739870cd30bbca103aaf3265fee
diff --git a/metadata/md5-cache/net-print/splix-2.0.0_p20130826-r1 b/metadata/md5-cache/net-print/splix-2.0.0_p20130826-r1
index 81be3247280d..78451b1a6797 100644
--- a/metadata/md5-cache/net-print/splix-2.0.0_p20130826-r1
+++ b/metadata/md5-cache/net-print/splix-2.0.0_p20130826-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A set of CUPS printer drivers for SPL (Samsung Printer Language) pri
 EAPI=7
 HOMEPAGE=http://splix.sourceforge.net/
 IUSE=+jbig
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/ghostscript-gpl-9.02 >=net-print/cups-1.4.0 jbig? ( media-libs/jbigkit )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/splix-2.0.0_p20130826.tar.bz2 https://dev.gentoo.org/~voyageur/distfiles/samsung-cms-20120312.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=753e40d9d32184255379eeb24a8b805c
+_md5_=7c42301e85499caca3314c66569908fe
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 630b6d056c78..2c66b2db27fe 100644
Binary files a/metadata/md5-cache/net-proxy/Manifest.gz and b/metadata/md5-cache/net-proxy/Manifest.gz differ
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.6 b/metadata/md5-cache/net-proxy/haproxy-2.2.6
new file mode 100644
index 000000000000..1443931b736d
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.6
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=7
+HOMEPAGE=http://www.haproxy.org
+IUSE=+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
+SLOT=0
+SRC_URI=http://haproxy.1wt.eu/download/2.2/src/haproxy-2.2.6.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ec7a9fdea643cb09501f024d019b06ae
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-5.1.1 b/metadata/md5-cache/net-proxy/mitmproxy-5.1.1
index c791b460ecc6..f038eb3db4d9 100644
--- a/metadata/md5-cache/net-proxy/mitmproxy-5.1.1
+++ b/metadata/md5-cache/net-proxy/mitmproxy-5.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v5.1.1.tar.gz -> mitmproxy-5.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=434440c8b752b0bf6eb20af501f0cfdb
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-5.2-r1 b/metadata/md5-cache/net-proxy/mitmproxy-5.2-r1
index 6a923c38afac..5fdbdd3e0933 100644
--- a/metadata/md5-cache/net-proxy/mitmproxy-5.2-r1
+++ b/metadata/md5-cache/net-proxy/mitmproxy-5.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v5.2.tar.gz -> mitmproxy-5.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=33b2a4017e54c81a771ca284ab7db224
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-5.3.0 b/metadata/md5-cache/net-proxy/mitmproxy-5.3.0
index 6179ee2a01f9..b21020d12a79 100644
--- a/metadata/md5-cache/net-proxy/mitmproxy-5.3.0
+++ b/metadata/md5-cache/net-proxy/mitmproxy-5.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v5.3.0.tar.gz -> mitmproxy-5.3.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ffc332e1fc54e04fd476fc51481188dd
diff --git a/metadata/md5-cache/net-proxy/sshuttle-0.78.5 b/metadata/md5-cache/net-proxy/sshuttle-0.78.5
index 6a6fc78e002a..13559127e512 100644
--- a/metadata/md5-cache/net-proxy/sshuttle-0.78.5
+++ b/metadata/md5-cache/net-proxy/sshuttle-0.78.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sshuttle/sshuttle-0.78.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fe3bfc253f1b87324eec7973b830a3c1
diff --git a/metadata/md5-cache/net-proxy/sshuttle-1.0.3 b/metadata/md5-cache/net-proxy/sshuttle-1.0.3
index 0497ef042176..697e9e8e1abe 100644
--- a/metadata/md5-cache/net-proxy/sshuttle-1.0.3
+++ b/metadata/md5-cache/net-proxy/sshuttle-1.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sshuttle/sshuttle-1.0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=13145a9f113c3373d5c3b0cf7bbd3537
diff --git a/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r8 b/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r8
deleted file mode 100644
index 563ad6df1ddf..000000000000
--- a/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Transparent SOCKS v4 proxying library
-EAPI=5
-HOMEPAGE=http://tsocks.sourceforge.net/
-IUSE=dns envconf tordns server-lookups 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 ppc ppc64 sparc x86
-LICENSE=GPL-2
-REQUIRED_USE=dns? ( !tordns !server-lookups ) tordns? ( !dns !server-lookups )
-SLOT=0
-SRC_URI=mirror://sourceforge/tsocks/tsocks-1.8beta5.tar.gz tordns? ( https://dev.gentoo.org/~bircoph/patches/tsocks-1.8b5-tordns1-gentoo-r3.patch.xz )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b3e69d6414dadfd0d301a13c77e8938a
diff --git a/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r9 b/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r9
index 58be6f4554ad..7f5b442f61f5 100644
--- a/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r9
+++ b/metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r9
@@ -4,10 +4,10 @@ DESCRIPTION=Transparent SOCKS v4 proxying library
 EAPI=7
 HOMEPAGE=http://tsocks.sourceforge.net/
 IUSE=debug dns envconf tordns server-lookups 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 ppc ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 arm ppc ppc64 sparc x86
 LICENSE=GPL-2
 REQUIRED_USE=dns? ( !tordns !server-lookups ) tordns? ( !dns !server-lookups )
 SLOT=0
 SRC_URI=mirror://sourceforge/tsocks/tsocks-1.8beta5.tar.gz tordns? ( https://dev.gentoo.org/~bircoph/patches/tsocks-1.8b5-tordns1-gentoo-r4.patch.xz )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7462acf557a3eb4e98efc6f0e067f92e
+_md5_=c1405f58320a627593b14cdffe3d8d81
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 493356762476..28ffc13eaf8a 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/networkmanager-openvpn-1.8.12 b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12
index 78307d47717a..4e49e94878d6 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12
+++ b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12
@@ -4,11 +4,11 @@ DESCRIPTION=NetworkManager OpenVPN plugin
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk test
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.7.0 >=x11-libs/gtk+-3.4:3 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.12.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=acddeacf42c9132aa8b69fd9178fd6ad
+_md5_=6a3d04ccea461f94fadc501791c78ff6
diff --git a/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.0 b/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.0
index 9de71c973785..21828ae955f1 100644
--- a/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.0
+++ b/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ProtonVPN/protonvpn-cli-ng/archive/v2.2.0.tar.gz -> protonvpn-cli-2.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=93f2af654601084589e3a9227282726e
diff --git a/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.2 b/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.2
index 8cec8b060df1..d44dca8c903a 100644
--- a/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.2
+++ b/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ProtonVPN/protonvpn-cli-ng/archive/v2.2.2.tar.gz -> protonvpn-cli-2.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=66c0f918f96db6a51946ce37d97ab9ea
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 483304499258..55052bea82d4 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/aircrack-ng-1.6-r1 b/metadata/md5-cache/net-wireless/aircrack-ng-1.6-r1
index 2b7dba56f4f2..aba7c88c87d7 100644
--- a/metadata/md5-cache/net-wireless/aircrack-ng-1.6-r1
+++ b/metadata/md5-cache/net-wireless/aircrack-ng-1.6-r1
@@ -12,5 +12,5 @@ RDEPEND=net-libs/libpcap sys-apps/hwloc:0= !libressl? ( dev-libs/openssl:0= ) li
 REQUIRED_USE=airdrop-ng? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) airgraph-ng? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://download.aircrack-ng.org/aircrack-ng-1.6.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=05c0ee739ea6fcad3852bf1f61c6e66a
diff --git a/metadata/md5-cache/net-wireless/aircrack-ng-1.6_p20200722 b/metadata/md5-cache/net-wireless/aircrack-ng-1.6_p20200722
index d0099dd0e543..bb0764a44687 100644
--- a/metadata/md5-cache/net-wireless/aircrack-ng-1.6_p20200722
+++ b/metadata/md5-cache/net-wireless/aircrack-ng-1.6_p20200722
@@ -12,5 +12,5 @@ RDEPEND=net-libs/libpcap sys-apps/hwloc:0= !libressl? ( dev-libs/openssl:0= ) li
 REQUIRED_USE=airdrop-ng? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) airgraph-ng? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/aircrack-ng/aircrack-ng/archive/5a02ac4818b30d2e87b3e18e497a5f9e5319394f.tar.gz -> aircrack-ng-1.6_p20200722.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=780d9d88f0f91be9acd3775149d7f8f6
diff --git a/metadata/md5-cache/net-wireless/aircrack-ng-9999 b/metadata/md5-cache/net-wireless/aircrack-ng-9999
index ab5453f93ce4..9136bb1d0adb 100644
--- a/metadata/md5-cache/net-wireless/aircrack-ng-9999
+++ b/metadata/md5-cache/net-wireless/aircrack-ng-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=net-libs/libpcap sys-apps/hwloc:0= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) netlink? ( dev-libs/libnl:3 ) pcre? ( dev-libs/libpcre ) airdrop-ng? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) airgraph-ng? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) experimental? ( sys-libs/zlib ) sqlite? ( >=dev-db/sqlite-3.4 )
 REQUIRED_USE=airdrop-ng? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) airgraph-ng? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=61aeb2d700ff1a218f294485d8cfc1cf
diff --git a/metadata/md5-cache/net-wireless/airtraf-1.1-r3 b/metadata/md5-cache/net-wireless/airtraf-1.1-r3
deleted file mode 100644
index 5dfed78b6dfd..000000000000
--- a/metadata/md5-cache/net-wireless/airtraf-1.1-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libpcap sys-libs/ncurses:= virtual/pkgconfig
-DESCRIPTION=AirTraf 802.11b Wireless traffic sniffer
-EAPI=5
-HOMEPAGE=http://www.elixar.com/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap sys-libs/ncurses:=
-SLOT=0
-SRC_URI=http://www.elixar.com/airtraf-1.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=80fa6ee709ab0af14ac007c087d30868
diff --git a/metadata/md5-cache/net-wireless/airtraf-1.1-r4 b/metadata/md5-cache/net-wireless/airtraf-1.1-r4
index 60de7475658e..fade54aec000 100644
--- a/metadata/md5-cache/net-wireless/airtraf-1.1-r4
+++ b/metadata/md5-cache/net-wireless/airtraf-1.1-r4
@@ -3,10 +3,10 @@ DEPEND=net-libs/libpcap sys-libs/ncurses:= virtual/pkgconfig
 DESCRIPTION=AirTraf 802.11b Wireless traffic sniffer
 EAPI=7
 HOMEPAGE=http://www.elixar.com/
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap sys-libs/ncurses:=
 SLOT=0
 SRC_URI=http://www.elixar.com/airtraf-1.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d86a09af6a171bdaa242a2349b1d95a4
+_md5_=b56dab45bf633a935e9fb318d7d29c78
diff --git a/metadata/md5-cache/net-wireless/dump978-9999 b/metadata/md5-cache/net-wireless/dump978-9999
deleted file mode 100644
index fe7552ac39c0..000000000000
--- a/metadata/md5-cache/net-wireless/dump978-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=install prepare unpack
-DEPEND=dev-libs/boost:= net-wireless/soapysdr:=
-DESCRIPTION=simple Mode S decoder for soapysdr supported devices
-EAPI=7
-HOMEPAGE=https://github.com/flightaware/dump978
-LICENSE=BSD
-PROPERTIES=live
-RDEPEND=dev-libs/boost:= net-wireless/soapysdr:=
-SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441
-_md5_=ca8f06f1349d0d722bd0aed8daaa62d0
diff --git a/metadata/md5-cache/net-wireless/iwd-1.10 b/metadata/md5-cache/net-wireless/iwd-1.10
new file mode 100644
index 000000000000..c3a4a64ad21d
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/iwd-1.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup unpack
+DEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.35 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Wireless daemon for linux
+EAPI=6
+HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
+IUSE=+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3 standalone systemd kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.35 net-wireless/wireless-regdb crda? ( net-wireless/crda ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-1.10.tar.xz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e275127c36d5aefe2e16369d04fbbdf2
diff --git a/metadata/md5-cache/net-wireless/jackit-0.0_p20170918-r1 b/metadata/md5-cache/net-wireless/jackit-0.0_p20170918-r1
index 3f22accbea52..ffc607cd58ae 100644
--- a/metadata/md5-cache/net-wireless/jackit-0.0_p20170918-r1
+++ b/metadata/md5-cache/net-wireless/jackit-0.0_p20170918-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/tabulate[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/insecurityofthings/jackit/archive/1c057fad102af7daad537421d95e2695caeff2b7.tar.gz -> jackit-0.0_p20170918.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0259a62617108e2698153c05d6c190e2
diff --git a/metadata/md5-cache/net-wireless/kismet-rest-2019.05.02 b/metadata/md5-cache/net-wireless/kismet-rest-2019.05.02
index bc4e4bfa4b2e..8d465ee96bb3 100644
--- a/metadata/md5-cache/net-wireless/kismet-rest-2019.05.02
+++ b/metadata/md5-cache/net-wireless/kismet-rest-2019.05.02
@@ -11,5 +11,5 @@ RDEPEND=dev-python/requests !<net-wireless/kismet-2019.05.1 python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/kismetwireless/python-kismet-rest/archive/2019.05.02.tar.gz -> kismet-rest-2019.05.02.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d96cbf7e3787b796b3bfdd1a9097a430
diff --git a/metadata/md5-cache/net-wireless/kismet-rest-9999 b/metadata/md5-cache/net-wireless/kismet-rest-9999
index bdf78862be55..6f2222713e9a 100644
--- a/metadata/md5-cache/net-wireless/kismet-rest-9999
+++ b/metadata/md5-cache/net-wireless/kismet-rest-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/requests !<net-wireless/kismet-2019.05.1 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d96cbf7e3787b796b3bfdd1a9097a430
diff --git a/metadata/md5-cache/net-wireless/kismetdb-2019.05.05 b/metadata/md5-cache/net-wireless/kismetdb-2019.05.05
index 093626f57278..11c87e0a2864 100644
--- a/metadata/md5-cache/net-wireless/kismetdb-2019.05.05
+++ b/metadata/md5-cache/net-wireless/kismetdb-2019.05.05
@@ -11,5 +11,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/kismetwireless/python-kismet-db/archive/2019.05.05.tar.gz -> kismetdb-2019.05.05.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9b6bd9b611e4141b6d0ca5bf55485263
diff --git a/metadata/md5-cache/net-wireless/kismetdb-9999 b/metadata/md5-cache/net-wireless/kismetdb-9999
index c83d829cd16d..63090c1fe83f 100644
--- a/metadata/md5-cache/net-wireless/kismetdb-9999
+++ b/metadata/md5-cache/net-wireless/kismetdb-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplekml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1fb86a6504250041413561b292756ee9
diff --git a/metadata/md5-cache/net-wireless/lorcon-0.0_p20200214 b/metadata/md5-cache/net-wireless/lorcon-0.0_p20200214
index de83a8dabeef..c273bf923da2 100644
--- a/metadata/md5-cache/net-wireless/lorcon-0.0_p20200214
+++ b/metadata/md5-cache/net-wireless/lorcon-0.0_p20200214
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kismetwireless/lorcon/archive/7dbf24ee6f7c277240c0fbd988b6902850577772.tar.gz -> lorcon-0.0_p20200214.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ebe5e896b40821eac72c779eb0374472
diff --git a/metadata/md5-cache/net-wireless/lorcon-9999 b/metadata/md5-cache/net-wireless/lorcon-9999
index d9c5afd5b41f..92705e9b087e 100644
--- a/metadata/md5-cache/net-wireless/lorcon-9999
+++ b/metadata/md5-cache/net-wireless/lorcon-9999
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d8ffc8d3dcef9886969a6ce86ef0ade5
diff --git a/metadata/md5-cache/net-wireless/nanovna-saver-0.3.7-r1 b/metadata/md5-cache/net-wireless/nanovna-saver-0.3.7-r1
index 08b256b74f62..030c12a1e193 100644
--- a/metadata/md5-cache/net-wireless/nanovna-saver-0.3.7-r1
+++ b/metadata/md5-cache/net-wireless/nanovna-saver-0.3.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cython[python_targets_python3_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/mihtjel/nanovna-saver/archive/v0.3.7.tar.gz -> nanovna-saver-0.3.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=92c979df0f6cdca123cb376ad71e6837
diff --git a/metadata/md5-cache/net-wireless/nanovna-saver-9999 b/metadata/md5-cache/net-wireless/nanovna-saver-9999
index 6faad148d5e9..b889842d1cb4 100644
--- a/metadata/md5-cache/net-wireless/nanovna-saver-9999
+++ b/metadata/md5-cache/net-wireless/nanovna-saver-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/cython[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pyserial[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/PyQt5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] <dev-python/scipy-1.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=92c979df0f6cdca123cb376ad71e6837
diff --git a/metadata/md5-cache/net-wireless/openbsc-9999 b/metadata/md5-cache/net-wireless/openbsc-9999
deleted file mode 100644
index 64dd9edae8b0..000000000000
--- a/metadata/md5-cache/net-wireless/openbsc-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=gprs? ( net-wireless/openggsn ) net-libs/libosmocore net-libs/libosmo-abis net-libs/libosmo-netif dev-db/libdbi >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=OpenBSC, OsmoSGSN, OsmoBSC and other programs
-EAPI=5
-HOMEPAGE=http://openbsc.osmocom.org/trac/wiki/OpenBSC
-IUSE=+gprs
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=gprs? ( net-wireless/openggsn ) net-libs/libosmocore net-libs/libosmo-abis net-libs/libosmo-netif dev-db/libdbi dev-db/libdbi-drivers[sqlite] dev-db/sqlite:3
-SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=867ff3bb05577bdcd1ca188ad5cc6812
diff --git a/metadata/md5-cache/net-wireless/openggsn-9999 b/metadata/md5-cache/net-wireless/openggsn-9999
deleted file mode 100644
index 0784c7b6c4f4..000000000000
--- a/metadata/md5-cache/net-wireless/openggsn-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Gateway GPRS Support Node
-EAPI=5
-HOMEPAGE=http://openbsc.osmocom.org/trac/wiki/OpenBSC_GPRS
-LICENSE=GPL-2
-PROPERTIES=live
-SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=61e1add03cbafb633c8a91e43650c5e2
diff --git a/metadata/md5-cache/net-wireless/osmobts-9999 b/metadata/md5-cache/net-wireless/osmobts-9999
deleted file mode 100644
index 9b89da51ceed..000000000000
--- a/metadata/md5-cache/net-wireless/osmobts-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure prepare unpack
-DEPEND=net-libs/libosmocore net-libs/libosmo-abis >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Osmocom BTS-Side code (Abis, scheduling)
-EAPI=5
-HOMEPAGE=http://openbsc.osmocom.org/trac/wiki/OsmoBTS
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=net-libs/libosmocore net-libs/libosmo-abis
-SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4a832c71dfafaa8c2c0622fcea7dea81
diff --git a/metadata/md5-cache/net-wireless/osmocom-bb-9999 b/metadata/md5-cache/net-wireless/osmocom-bb-9999
deleted file mode 100644
index f12fdba3fb3a..000000000000
--- a/metadata/md5-cache/net-wireless/osmocom-bb-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=net-libs/libosmocore >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=OsmocomBB MS-side GSM Protocol stack (L1, L2, L3) excluding firmware
-EAPI=5
-HOMEPAGE=http://bb.osmocom.org
-IUSE=+transmit
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=net-libs/libosmocore
-SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=799df63b1f7b6c197630e1919de01470
diff --git a/metadata/md5-cache/net-wireless/soapy_power-1.6.1-r1 b/metadata/md5-cache/net-wireless/soapy_power-1.6.1-r1
index 32a6e31c388f..324e51549a8c 100644
--- a/metadata/md5-cache/net-wireless/soapy_power-1.6.1-r1
+++ b/metadata/md5-cache/net-wireless/soapy_power-1.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/xmikos/soapy_power/archive/v1.6.1.tar.gz -> soapy_power-1.6.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ae945fe68c09950e38137f00f4e33576
diff --git a/metadata/md5-cache/net-wireless/soapy_power-9999 b/metadata/md5-cache/net-wireless/soapy_power-9999
index 20e92bfc6979..500afb973a5a 100644
--- a/metadata/md5-cache/net-wireless/soapy_power-9999
+++ b/metadata/md5-cache/net-wireless/soapy_power-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplespectral[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/simplesoapy-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] faster? ( dev-python/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) fastest? ( dev-python/pyFFTW[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ae945fe68c09950e38137f00f4e33576
diff --git a/metadata/md5-cache/net-wireless/unifi-6.0.37 b/metadata/md5-cache/net-wireless/unifi-6.0.41
similarity index 81%
rename from metadata/md5-cache/net-wireless/unifi-6.0.37
rename to metadata/md5-cache/net-wireless/unifi-6.0.41
index 3086b209f3e4..d02eb0e031ff 100644
--- a/metadata/md5-cache/net-wireless/unifi-6.0.37
+++ b/metadata/md5-cache/net-wireless/unifi-6.0.41
@@ -10,6 +10,6 @@ LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3
 RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
 RESTRICT=bindist mirror
 SLOT=0/6.0
-SRC_URI=https://dl.ui.com/unifi/6.0.37-db4f549ad2/UniFi.unix.zip -> unifi-6.0.37.zip
+SRC_URI=https://dl.ui.com/unifi/6.0.41-5353824aa0/UniFi.unix.zip -> unifi-6.0.41.zip
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=165f460be3eb5c725e03c943b19e92a8
+_md5_=f983aaaffdf6c5c67abddf2eee76c13f
diff --git a/metadata/md5-cache/net-wireless/urh-2.8.8 b/metadata/md5-cache/net-wireless/urh-2.8.8
index 5106d2910330..a83ed03aa9d7 100644
--- a/metadata/md5-cache/net-wireless/urh-2.8.8
+++ b/metadata/md5-cache/net-wireless/urh-2.8.8
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jopohl/urh/archive/v2.8.8.tar.gz -> urh-2.8.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=22eeb2fbe781043ab58ef44b108cae1d
diff --git a/metadata/md5-cache/net-wireless/urh-9999 b/metadata/md5-cache/net-wireless/urh-9999
index d28c2a904a26..8c80673cd8fe 100644
--- a/metadata/md5-cache/net-wireless/urh-9999
+++ b/metadata/md5-cache/net-wireless/urh-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] net-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyzmq[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] airspy? ( net-wireless/airspy:= ) audio? ( dev-python/pyaudio[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) limesdr? ( net-wireless/limesuite:= ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) sdrplay? ( net-wireless/sdrplay:= ) uhd? ( net-wireless/uhd:= ) dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),testlib] net-wireless/gr-osmosdr python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=22eeb2fbe781043ab58ef44b108cae1d
diff --git a/metadata/md5-cache/net-wireless/wavemon-0.7.6 b/metadata/md5-cache/net-wireless/wavemon-0.7.6
deleted file mode 100644
index fc59500116cf..000000000000
--- a/metadata/md5-cache/net-wireless/wavemon-0.7.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses caps? ( sys-libs/libcap ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Ncurses based monitor for IEEE 802.11 wireless LAN cards
-EAPI=5
-HOMEPAGE=http://eden-feed.erg.abdn.ac.uk/wavemon/
-IUSE=caps
-KEYWORDS=amd64 arm ~hppa ppc sparc x86
-LICENSE=GPL-3
-RDEPEND=sys-libs/ncurses caps? ( sys-libs/libcap )
-SLOT=0
-SRC_URI=http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/wavemon-0.7.6.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1f75d59c4db1d5c99c9b068a69cbf4fa
diff --git a/metadata/md5-cache/net-wireless/wavemon-0.8.0 b/metadata/md5-cache/net-wireless/wavemon-0.8.0
index f95a1dba07de..1c6c734ec51f 100644
--- a/metadata/md5-cache/net-wireless/wavemon-0.8.0
+++ b/metadata/md5-cache/net-wireless/wavemon-0.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Ncurses based monitor for IEEE 802.11 wireless LAN cards
 EAPI=6
 HOMEPAGE=https://github.com/uoaerg/wavemon/
 IUSE=caps
-KEYWORDS=~amd64 ~arm ~hppa ppc sparc ~x86
+KEYWORDS=amd64 arm ~hppa ppc sparc x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/libnl:3 sys-libs/ncurses:0= caps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/uoaerg/wavemon/archive/v0.8.0.tar.gz -> wavemon-0.8.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9c3b5344b1f83f50b22fe0effbc8df07
+_md5_=18da3305dcace92ca169d1eba255569a
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 9b95ddf2f638..64926908cf89 100644
Binary files a/metadata/md5-cache/sci-astronomy/Manifest.gz and b/metadata/md5-cache/sci-astronomy/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-astronomy/pyephem-3.7.6.0-r1 b/metadata/md5-cache/sci-astronomy/pyephem-3.7.6.0-r1
index d7bb9222c072..e6d6a5678464 100644
--- a/metadata/md5-cache/sci-astronomy/pyephem-3.7.6.0-r1
+++ b/metadata/md5-cache/sci-astronomy/pyephem-3.7.6.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyephem/pyephem-3.7.6.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cdf3ac423796db34467ab688f91cffde
diff --git a/metadata/md5-cache/sci-astronomy/pyephem-3.7.7.1 b/metadata/md5-cache/sci-astronomy/pyephem-3.7.7.1
index 980770b739e2..745f9cb7dbca 100644
--- a/metadata/md5-cache/sci-astronomy/pyephem-3.7.7.1
+++ b/metadata/md5-cache/sci-astronomy/pyephem-3.7.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/brandon-rhodes/pyephem/archive/v3.7.7.1.tar.gz -> pyephem-3.7.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=adebc5b0b60cc61e64b9d347d6af1cf2
diff --git a/metadata/md5-cache/sci-biology/HTSeq-0.12.4 b/metadata/md5-cache/sci-biology/HTSeq-0.12.4
index b2e1521c5f41..a0aadeb3d8b8 100644
--- a/metadata/md5-cache/sci-biology/HTSeq-0.12.4
+++ b/metadata/md5-cache/sci-biology/HTSeq-0.12.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/htseq/htseq/archive/release_0.12.4.tar.gz -> HTSeq-0.12.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ed6a76d098be1d996f372cc4a1949747
diff --git a/metadata/md5-cache/sci-biology/HTSeq-9999 b/metadata/md5-cache/sci-biology/HTSeq-9999
index 6d37bf0453e8..a9b54f10e9b3 100644
--- a/metadata/md5-cache/sci-biology/HTSeq-9999
+++ b/metadata/md5-cache/sci-biology/HTSeq-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sci-biology/pysam[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ed6a76d098be1d996f372cc4a1949747
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index c48d905eb22b..16fedee14daa 100644
Binary files a/metadata/md5-cache/sci-biology/Manifest.gz and b/metadata/md5-cache/sci-biology/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-biology/biopandas-0.2.7 b/metadata/md5-cache/sci-biology/biopandas-0.2.7
index b96d08a6d3c6..faa5609dda3b 100644
--- a/metadata/md5-cache/sci-biology/biopandas-0.2.7
+++ b/metadata/md5-cache/sci-biology/biopandas-0.2.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/B/BioPandas/biopandas-0.2.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3ae96f946a3da711a855be01492b7bde
diff --git a/metadata/md5-cache/sci-biology/biopython-1.77 b/metadata/md5-cache/sci-biology/biopython-1.77
index 0d6017e7c901..a0528a6104a0 100644
--- a/metadata/md5-cache/sci-biology/biopython-1.77
+++ b/metadata/md5-cache/sci-biology/biopython-1.77
@@ -11,5 +11,5 @@ RDEPEND=dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/biopython/biopython-1.77.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6cc3c97eed10a69e2025091cace865ed
diff --git a/metadata/md5-cache/sci-biology/pysam-0.16.0.1 b/metadata/md5-cache/sci-biology/pysam-0.16.0.1
index a1391b35a7eb..fb26937f54d1 100644
--- a/metadata/md5-cache/sci-biology/pysam-0.16.0.1
+++ b/metadata/md5-cache/sci-biology/pysam-0.16.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pysam-developers/pysam/archive/v0.16.0.1.tar.gz -> pysam-0.16.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c0f872ce3ed106718898376443d0cfe6
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 7f1e5e7e67a5..01f2aba3dc71 100644
Binary files a/metadata/md5-cache/sci-calculators/Manifest.gz and b/metadata/md5-cache/sci-calculators/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-calculators/galculator-2.1.4-r1 b/metadata/md5-cache/sci-calculators/galculator-2.1.4-r1
index c31c09d0f395..1777c3ac4740 100644
--- a/metadata/md5-cache/sci-calculators/galculator-2.1.4-r1
+++ b/metadata/md5-cache/sci-calculators/galculator-2.1.4-r1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango dev-util/desktop-file-util
 DESCRIPTION=GTK+ based algebraic and RPN calculator
 EAPI=7
 HOMEPAGE=http://galculator.mnim.org/
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango
 SLOT=0
 SRC_URI=http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2
 _eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=60b22c5bbf85abeff269c0d91bd71c7e
+_md5_=497ecdba2d3afd673bd9b1638ac725fd
diff --git a/metadata/md5-cache/sci-calculators/qalculate-gtk-3.2.0-r1 b/metadata/md5-cache/sci-calculators/qalculate-gtk-3.2.0-r1
index d3491d3b2f06..22df7a38d1a6 100644
--- a/metadata/md5-cache/sci-calculators/qalculate-gtk-3.2.0-r1
+++ b/metadata/md5-cache/sci-calculators/qalculate-gtk-3.2.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-3.2.0:= x11-libs/cairo x11-libs/g
 DESCRIPTION=Modern multi-purpose calculator
 EAPI=6
 HOMEPAGE=https://qalculate.github.io/
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-3.2.0:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
 SLOT=0
 SRC_URI=https://github.com/Qalculate/qalculate-gtk/releases/download/v3.2.0/qalculate-gtk-3.2.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d94b7666b1400fc0759c9f5946435ae6
+_md5_=33c403558ba7689108b41c4ac8092af8
diff --git a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0 b/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0
index fe6a58c6ed3f..8d1a24ce8a99 100644
--- a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0
+++ b/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Becksteinlab/GromacsWrapper/archive/release-0.8.0.tar.gz -> GromacsWrapper-0.8.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3932733dc9fd177f59a16d6e36038120
diff --git a/metadata/md5-cache/sci-chemistry/MDAnalysis-0.18.0-r1 b/metadata/md5-cache/sci-chemistry/MDAnalysis-0.18.0-r1
index 812ef0731a9d..2b9ec89791dc 100644
--- a/metadata/md5-cache/sci-chemistry/MDAnalysis-0.18.0-r1
+++ b/metadata/md5-cache/sci-chemistry/MDAnalysis-0.18.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/MDAnalysis/MDAnalysis-0.18.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=38c5ed86ae5ece108464e88d0c780ff0
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index efdf28f42353..4d88c3bfb5f6 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/chemex-2018.10.2 b/metadata/md5-cache/sci-chemistry/chemex-2018.10.2
index bb72019b9d7d..386c8258b603 100644
--- a/metadata/md5-cache/sci-chemistry/chemex-2018.10.2
+++ b/metadata/md5-cache/sci-chemistry/chemex-2018.10.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gbouvignies/chemex/archive/2018.10.2.tar.gz -> chemex-2018.10.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a3b9076d5132b8f916d984b1ea8ea345
diff --git a/metadata/md5-cache/sci-chemistry/chemex-2018.10.3 b/metadata/md5-cache/sci-chemistry/chemex-2018.10.3
index b811b1903068..191b46a1c3e3 100644
--- a/metadata/md5-cache/sci-chemistry/chemex-2018.10.3
+++ b/metadata/md5-cache/sci-chemistry/chemex-2018.10.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gbouvignies/chemex/archive/2018.10.3.tar.gz -> chemex-2018.10.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=682094d1deaf4d500e13aaa2f7f642f3
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.4 b/metadata/md5-cache/sci-chemistry/gromacs-2020.4
index 15a7f180897e..34d13e9f2560 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.4
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision )
 RESTRICT=!test? ( test )
 SLOT=0/2020.4
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2020.4.tar.gz test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2020.4.tar.gz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ad278ae7cdbbc81c13e4302e0889796
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2020.9999
index e1455f653502..f2413e38a7d2 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.9999
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/2020.9999
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c7ed99f37bdad2029e7699e7ed38dd7c
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
index ec042c103290..71f6c5f043b4 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/2021.9999
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4497a41d52b81443df41b8ed2d791e7c
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021_beta2 b/metadata/md5-cache/sci-chemistry/gromacs-2021_beta2
index a53557760bbc..61900696b853 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021_beta2
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021_beta2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision )
 RESTRICT=!test? ( test )
 SLOT=0/2021_beta2
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2021-beta2.tar.gz test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2021-beta2.tar.gz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4497a41d52b81443df41b8ed2d791e7c
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-9999 b/metadata/md5-cache/sci-chemistry/gromacs-9999
index 3d8c4952972f..764dc02f1922 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-9999
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4497a41d52b81443df41b8ed2d791e7c
diff --git a/metadata/md5-cache/sci-chemistry/mdtraj-1.9.1 b/metadata/md5-cache/sci-chemistry/mdtraj-1.9.1
index 5efa39e9abf8..e8760abdc2bb 100644
--- a/metadata/md5-cache/sci-chemistry/mdtraj-1.9.1
+++ b/metadata/md5-cache/sci-chemistry/mdtraj-1.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mdtraj/mdtraj-1.9.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3679ad7edb4bbd083ab88fc471d38274
diff --git a/metadata/md5-cache/sci-chemistry/mdtraj-1.9.4 b/metadata/md5-cache/sci-chemistry/mdtraj-1.9.4
index 3d82fa329e8c..b2a324af36f5 100644
--- a/metadata/md5-cache/sci-chemistry/mdtraj-1.9.4
+++ b/metadata/md5-cache/sci-chemistry/mdtraj-1.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/m/mdtraj/mdtraj-1.9.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=407e11f2f53ac560a1ee704890ef1fd6
diff --git a/metadata/md5-cache/sci-chemistry/modeller-9.25 b/metadata/md5-cache/sci-chemistry/modeller-9.25
new file mode 100644
index 000000000000..714b1f6909e5
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/modeller-9.25
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile config configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/swig-1.3
+DESCRIPTION=Homology or comparative modeling of protein three-dimensional structures
+EAPI=7
+HOMEPAGE=https://salilab.org/modeller/
+IUSE=doc examples python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=modeller
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://salilab.org/modeller/9.25/modeller-9.25.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=45122340aacf95ad7628b2d4863af77a
diff --git a/metadata/md5-cache/sci-chemistry/nmrglue-0.5-r1 b/metadata/md5-cache/sci-chemistry/nmrglue-0.5-r1
index ec375f15a1b5..b4891dedbc9d 100644
--- a/metadata/md5-cache/sci-chemistry/nmrglue-0.5-r1
+++ b/metadata/md5-cache/sci-chemistry/nmrglue-0.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jjhelmus/nmrglue/releases/download/v0.5/nmrglue-0.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=98e1c85234da0f89ab5a0caf323fe699
diff --git a/metadata/md5-cache/sci-chemistry/nmrglue-0.7 b/metadata/md5-cache/sci-chemistry/nmrglue-0.7
index 964d76eb2202..6f1baeddf088 100644
--- a/metadata/md5-cache/sci-chemistry/nmrglue-0.7
+++ b/metadata/md5-cache/sci-chemistry/nmrglue-0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jjhelmus/nmrglue/releases/download/v0.7/nmrglue-0.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=104f5a98bd5a8b0c23ea72e2e8497e5b
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1 b/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
index bbb25bed1918..39c55b05ba84 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
+++ b/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Interconverts file formats used in molecular modeling
 EAPI=7
 HOMEPAGE=http://openbabel.org/wiki/Main_Page
 IUSE=doc openmp test wxwidgets
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~arm x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=dev-cpp/eigen:3 dev-libs/libxml2:2 sci-libs/inchi sys-libs/zlib wxwidgets? ( x11-libs/wxGTK:3.0[X] )
 RESTRICT=!test? ( test )
 SLOT=0/5.0.0
 SRC_URI=mirror://sourceforge/openbabel/openbabel-2.4.1.tar.gz https://openbabel.org/docs/dev/_static/babel130.png -> openbabel.png
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3c87a60ce425f5a7d62f7e9e92f095a1
+_md5_=a754f45bd0c575119ad466190e62eb3b
diff --git a/metadata/md5-cache/sci-chemistry/propka-3.2.0 b/metadata/md5-cache/sci-chemistry/propka-3.2.0
index 1984c7792589..017e77905620 100644
--- a/metadata/md5-cache/sci-chemistry/propka-3.2.0
+++ b/metadata/md5-cache/sci-chemistry/propka-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/propka/propka-3.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bd048f5978b21207dd0a67d80964171d
diff --git a/metadata/md5-cache/sci-chemistry/pymol-2.4.0 b/metadata/md5-cache/sci-chemistry/pymol-2.4.0
index d8f58dd04417..6009118473a3 100644
--- a/metadata/md5-cache/sci-chemistry/pymol-2.4.0
+++ b/metadata/md5-cache/sci-chemistry/pymol-2.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/pymol-1.8.4.0.png.xz https://github.com/schrodinger/pymol-open-source/archive/v2.4.0.tar.gz -> pymol-2.4.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfc3fd4ee81b72f28e6e1a3403d71391
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 8b35f58fae2c..0a65fd0ac08d 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.21 b/metadata/md5-cache/sci-geosciences/gpsd-3.21
index e309a2c4d29b..9ebf057440fa 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.21
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.21
@@ -12,5 +12,5 @@ REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gps
 RESTRICT=!test? ( test )
 SLOT=0/27
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.21.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=25ff2212b8d98b4d85e9c2c9c31b473c
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-9999 b/metadata/md5-cache/sci-geosciences/gpsd-9999
index a9e87fbcb2cd..a316fdae2f3d 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-9999
+++ b/metadata/md5-cache/sci-geosciences/gpsd-9999
@@ -11,5 +11,5 @@ RDEPEND=acct-user/gpsd >=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wirele
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) qt5? ( cxx )
 RESTRICT=!test? ( test )
 SLOT=0/27
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=99e891766e37505bec3d151f79070958
diff --git a/metadata/md5-cache/sci-geosciences/routino-3.3.2 b/metadata/md5-cache/sci-geosciences/routino-3.3.2
index a0daf707ee81..77e9b0440dcf 100644
--- a/metadata/md5-cache/sci-geosciences/routino-3.3.2
+++ b/metadata/md5-cache/sci-geosciences/routino-3.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.routino.org/download/routino-3.3.2.tgz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e769c15001430ee3d002fe6bcfc4aeb1
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 96c0f684c444..a94f39d875e5 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/bmrblib-1.0.3 b/metadata/md5-cache/sci-libs/bmrblib-1.0.3
index d9f6b7b4f4ab..4f8a2fdf6c99 100644
--- a/metadata/md5-cache/sci-libs/bmrblib-1.0.3
+++ b/metadata/md5-cache/sci-libs/bmrblib-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://download.gna.org/bmrblib/bmrblib-1.0.3.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=84e14a0165fcc90d096bea4696c2bd69
diff --git a/metadata/md5-cache/sci-libs/bmrblib-1.0.4 b/metadata/md5-cache/sci-libs/bmrblib-1.0.4
index b70068b9612b..481e33453251 100644
--- a/metadata/md5-cache/sci-libs/bmrblib-1.0.4
+++ b/metadata/md5-cache/sci-libs/bmrblib-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/bmrblib/bmrblib-1.0.4.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=361f38b1aea6d8177c65df46bd989000
diff --git a/metadata/md5-cache/sci-libs/cartopy-0.18.0 b/metadata/md5-cache/sci-libs/cartopy-0.18.0
index 63ff1d53d903..56d630ffdef5 100644
--- a/metadata/md5-cache/sci-libs/cartopy-0.18.0
+++ b/metadata/md5-cache/sci-libs/cartopy-0.18.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SciTools/cartopy/archive/v0.18.0.tar.gz -> cartopy-0.18.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=0ffab59e74ad2b5ebe7b9ff5d0e3e3e0
diff --git a/metadata/md5-cache/sci-libs/dlib-19.16-r1 b/metadata/md5-cache/sci-libs/dlib-19.16-r1
index 63a7e20a6f11..5c4068cc5a16 100644
--- a/metadata/md5-cache/sci-libs/dlib-19.16-r1
+++ b/metadata/md5-cache/sci-libs/dlib-19.16-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( png || ( python_targets_python3_6 python_targets_python3_
 RESTRICT=!test? ( test )
 SLOT=0/19.16
 SRC_URI=https://github.com/davisking/dlib/archive/v19.16.tar.gz -> dlib-19.16.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e1af274e821413b468acbd474b456fba
diff --git a/metadata/md5-cache/sci-libs/gdal-3.0.4-r1 b/metadata/md5-cache/sci-libs/gdal-3.0.4-r1
index 7c664d70fc32..f7bf0645a21c 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.0.4-r1
+++ b/metadata/md5-cache/sci-libs/gdal-3.0.4-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 med
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ) spatialite? ( sqlite )
 SLOT=0/3.0
 SRC_URI=https://download.osgeo.org/gdal/3.0.4/gdal-3.0.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a6433392cdfcbd96029d843feace1275
diff --git a/metadata/md5-cache/sci-libs/keras-applications-1.0.7 b/metadata/md5-cache/sci-libs/keras-applications-1.0.7
index ffe3d85752e1..aa17893917d7 100644
--- a/metadata/md5-cache/sci-libs/keras-applications-1.0.7
+++ b/metadata/md5-cache/sci-libs/keras-applications-1.0.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/keras-team/keras-applications/archive/1.0.7.tar.gz -> keras-applications-1.0.7.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=51c47cf910d54be7306b5b1d2035ec44
diff --git a/metadata/md5-cache/sci-libs/keras-applications-1.0.8 b/metadata/md5-cache/sci-libs/keras-applications-1.0.8
deleted file mode 100644
index 197ba2b20195..000000000000
--- a/metadata/md5-cache/sci-libs/keras-applications-1.0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Keras deep learning library reference implementations of deep learning models
-EAPI=6
-HOMEPAGE=https://keras.io/applications/
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/keras-team/keras-applications/archive/1.0.8.tar.gz -> keras-applications-1.0.8.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=51c47cf910d54be7306b5b1d2035ec44
diff --git a/metadata/md5-cache/sci-libs/keras-applications-1.0.8-r1 b/metadata/md5-cache/sci-libs/keras-applications-1.0.8-r1
index b02b49fd4080..93dc2930a392 100644
--- a/metadata/md5-cache/sci-libs/keras-applications-1.0.8-r1
+++ b/metadata/md5-cache/sci-libs/keras-applications-1.0.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Keras deep learning library reference implementations of deep learni
 EAPI=6
 HOMEPAGE=https://keras.io/applications/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/keras-team/keras-applications/archive/1.0.8.tar.gz -> keras-applications-1.0.8.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=328abed611e90724c02b6b8f264c61ad
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f682ca24878cdfdfd3c853231fff639b
diff --git a/metadata/md5-cache/sci-libs/keras-preprocessing-1.0.9 b/metadata/md5-cache/sci-libs/keras-preprocessing-1.0.9
index f517cdb2b7e6..fb954d40fa87 100644
--- a/metadata/md5-cache/sci-libs/keras-preprocessing-1.0.9
+++ b/metadata/md5-cache/sci-libs/keras-preprocessing-1.0.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/keras-team/keras-preprocessing/archive/1.0.9.tar.gz -> keras-preprocessing-1.0.9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=184468dbd7baa2377dd623f3ef1f9e78
diff --git a/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0 b/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0
deleted file mode 100644
index a6c0e5262d88..000000000000
--- a/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Easy data preprocessing and data augmentation for deep learning models
-EAPI=6
-HOMEPAGE=https://keras.io/
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/keras-team/keras-preprocessing/archive/1.1.0.tar.gz -> keras-preprocessing-1.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=184468dbd7baa2377dd623f3ef1f9e78
diff --git a/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0-r1 b/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0-r1
index b776ef225dc1..84afe771cee4 100644
--- a/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0-r1
+++ b/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Easy data preprocessing and data augmentation for deep learning mode
 EAPI=6
 HOMEPAGE=https://keras.io/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/keras-team/keras-preprocessing/archive/1.1.0.tar.gz -> keras-preprocessing-1.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=852496460b7f01d4125ee8a8a64421e3
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9ce189f2825d4656c4e9d87b9b073eac
diff --git a/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2 b/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2
index ef34b2bcb3a4..15ed46b42668 100644
--- a/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2
+++ b/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/K/Keras_Preprocessing/Keras_Preprocessing-1.1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=09d7de1f0e09fcf2a09089cdcc9bb498
diff --git a/metadata/md5-cache/sci-libs/med-4.0.0-r1 b/metadata/md5-cache/sci-libs/med-4.0.0-r1
deleted file mode 100644
index 58934343f0e6..000000000000
--- a/metadata/md5-cache/sci-libs/med-4.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python? ( >=dev-lang/swig-3.0.8 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup
-DEPEND=!sci-libs/libmed dev-lang/tk:0= >=sci-libs/hdf5-1.10.2:=[fortran=,mpi(+)] virtual/mpi[fortran=] python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) virtual/fortran
-DESCRIPTION=Modeling and Exchange of Data library
-EAPI=7
-HOMEPAGE=https://www.salome-platform.org/user-section/about/med
-IUSE=doc fortran hdf5-16-api python test python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=!sci-libs/libmed dev-lang/tk:0= >=sci-libs/hdf5-1.10.2:=[fortran=,mpi(+)] virtual/mpi[fortran=] python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) virtual/fortran
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://files.salome-platform.org/Salome/other/med-4.0.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9457442f5dee995ed23af36588bc33d2
diff --git a/metadata/md5-cache/sci-libs/med-4.1.0 b/metadata/md5-cache/sci-libs/med-4.1.0
new file mode 100644
index 000000000000..2ce42fe992ca
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/med-4.1.0
@@ -0,0 +1,16 @@
+BDEPEND=python? ( >=dev-lang/swig-3.0.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!sci-libs/libmed dev-lang/tk:0= >=sci-libs/hdf5-1.10.2:=[fortran?,mpi?] mpi? ( virtual/mpi[fortran?] ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] ) ) fortran? ( virtual/fortran )
+DESCRIPTION=A library to store and exchange meshed data or computation results
+EAPI=7
+HOMEPAGE=https://www.salome-platform.org/user-section/about/med
+IUSE=doc fortran mpi python test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=!sci-libs/libmed dev-lang/tk:0= >=sci-libs/hdf5-1.10.2:=[fortran?,mpi?] mpi? ( virtual/mpi[fortran?] ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] ) ) fortran? ( virtual/fortran )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+RESTRICT=!test? ( test ) python? ( test )
+SLOT=0
+SRC_URI=https://files.salome-platform.org/Salome/other/med-4.1.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=407587f4df2eff9329ade7913d778f1f
diff --git a/metadata/md5-cache/sci-libs/numkit-1.1.2 b/metadata/md5-cache/sci-libs/numkit-1.1.2
index 1598203e2c5b..7dae26422f3e 100644
--- a/metadata/md5-cache/sci-libs/numkit-1.1.2
+++ b/metadata/md5-cache/sci-libs/numkit-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/Becksteinlab/numkit/archive/release-1.1.2.tar.gz -> numkit-1.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0c5d291428a6d3db296cdb003e708684
diff --git a/metadata/md5-cache/sci-libs/pyshp-2.1.0 b/metadata/md5-cache/sci-libs/pyshp-2.1.0
index 3d22bb17d4eb..a54d35c84e10 100644
--- a/metadata/md5-cache/sci-libs/pyshp-2.1.0
+++ b/metadata/md5-cache/sci-libs/pyshp-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyshp/pyshp-2.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d16fe4442447835bf8f97069d01272bc
diff --git a/metadata/md5-cache/sci-libs/pyshp-2.1.2 b/metadata/md5-cache/sci-libs/pyshp-2.1.2
index f0e02c5edcce..0fb68e47647e 100644
--- a/metadata/md5-cache/sci-libs/pyshp-2.1.2
+++ b/metadata/md5-cache/sci-libs/pyshp-2.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyshp/pyshp-2.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d16fe4442447835bf8f97069d01272bc
diff --git a/metadata/md5-cache/sci-libs/rtree-0.9.4-r1 b/metadata/md5-cache/sci-libs/rtree-0.9.4-r1
index abd3af947327..68a233f23459 100644
--- a/metadata/md5-cache/sci-libs/rtree-0.9.4-r1
+++ b/metadata/md5-cache/sci-libs/rtree-0.9.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/R/Rtree/Rtree-0.9.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3f67c4b0d395e98dd166f436ea161d03
diff --git a/metadata/md5-cache/sci-libs/scikit-image-0.13.0-r1 b/metadata/md5-cache/sci-libs/scikit-image-0.13.0-r1
index 86953136a26c..11250d881ee4 100644
--- a/metadata/md5-cache/sci-libs/scikit-image-0.13.0-r1
+++ b/metadata/md5-cache/sci-libs/scikit-image-0.13.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-image/scikit-image-0.13.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=f039362b41a1b82ffb75f7b923b05540
diff --git a/metadata/md5-cache/sci-libs/scikit-image-0.17.2 b/metadata/md5-cache/sci-libs/scikit-image-0.17.2
index d6974450a6bf..9a0883c812d3 100644
--- a/metadata/md5-cache/sci-libs/scikit-image-0.17.2
+++ b/metadata/md5-cache/sci-libs/scikit-image-0.17.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/imageio[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-image/scikit-image-0.17.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=948fa657a91924e2cef6ea170bc47796
diff --git a/metadata/md5-cache/sci-libs/scikit-learn-0.22.2_p1-r1 b/metadata/md5-cache/sci-libs/scikit-learn-0.22.2_p1-r1
index 0f3be193175d..3bcc921ea93a 100644
--- a/metadata/md5-cache/sci-libs/scikit-learn-0.22.2_p1-r1
+++ b/metadata/md5-cache/sci-libs/scikit-learn-0.22.2_p1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/scikit-learn/scikit-learn/archive/0.22.2.post1.tar.gz -> scikit-learn-0.22.2_p1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=298d0bd7b6c53b126845f1ee05e9f655
diff --git a/metadata/md5-cache/sci-libs/scikit-learn-0.23.2 b/metadata/md5-cache/sci-libs/scikit-learn-0.23.2
index 925370f4ae94..cbe0a4bf279d 100644
--- a/metadata/md5-cache/sci-libs/scikit-learn-0.23.2
+++ b/metadata/md5-cache/sci-libs/scikit-learn-0.23.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/scikit-learn/scikit-learn/archive/0.23.2.tar.gz -> scikit-learn-0.23.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6b4512a3fa9fab6c925b21c1612d02bb
diff --git a/metadata/md5-cache/sci-libs/scikit-optimize-0.8.1 b/metadata/md5-cache/sci-libs/scikit-optimize-0.8.1
index 44c6da896119..fcc7889d9ebd 100644
--- a/metadata/md5-cache/sci-libs/scikit-optimize-0.8.1
+++ b/metadata/md5-cache/sci-libs/scikit-optimize-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-optimize/scikit-optimize-0.8.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=77a2dfb141ac48205b4b68f3516646f0
diff --git a/metadata/md5-cache/sci-libs/scikits_optimization-0.3-r1 b/metadata/md5-cache/sci-libs/scikits_optimization-0.3-r1
index 9040901672b6..00c82015ac06 100644
--- a/metadata/md5-cache/sci-libs/scikits_optimization-0.3-r1
+++ b/metadata/md5-cache/sci-libs/scikits_optimization-0.3-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikits.optimization/scikits.optimization-0.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e0814daa4bb28925dc1b5a9178de2e1a
diff --git a/metadata/md5-cache/sci-libs/scikits_timeseries-0.91.3-r2 b/metadata/md5-cache/sci-libs/scikits_timeseries-0.91.3-r2
index 7eccd6d56e8b..6c4d7ae5ccff 100644
--- a/metadata/md5-cache/sci-libs/scikits_timeseries-0.91.3-r2
+++ b/metadata/md5-cache/sci-libs/scikits_timeseries-0.91.3-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pytseries/scikits.timeseries-0.91.3.tar.gz doc? ( mirror://sourceforge/pytseries/scikits.timeseries-0.91.3-html_docs.zip )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=01e25d9d077eeeb9e77935003410aae3
diff --git a/metadata/md5-cache/sci-libs/shapely-1.6.4_p2-r1 b/metadata/md5-cache/sci-libs/shapely-1.6.4_p2-r1
index b3762151ac5e..ae579654d7e4 100644
--- a/metadata/md5-cache/sci-libs/shapely-1.6.4_p2-r1
+++ b/metadata/md5-cache/sci-libs/shapely-1.6.4_p2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/Shapely-1.6.4.post2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=798f4dce5d2a4e0dce05112efdeee9e7
diff --git a/metadata/md5-cache/sci-libs/shapely-1.7.0 b/metadata/md5-cache/sci-libs/shapely-1.7.0
index 14e14e400a27..dc047a7a4688 100644
--- a/metadata/md5-cache/sci-libs/shapely-1.7.0
+++ b/metadata/md5-cache/sci-libs/shapely-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Toblerity/Shapely/archive/1.7.0.tar.gz -> shapely-1.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a1b814fa70cb1dd10819b90d4d24e923
diff --git a/metadata/md5-cache/sci-libs/shapely-1.7.1 b/metadata/md5-cache/sci-libs/shapely-1.7.1
index ef427ec50a1e..0953dbd1b900 100644
--- a/metadata/md5-cache/sci-libs/shapely-1.7.1
+++ b/metadata/md5-cache/sci-libs/shapely-1.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Toblerity/Shapely/archive/1.7.1.tar.gz -> shapely-1.7.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=06c62baf15ef9af7b972d4c28e84ff5d
diff --git a/metadata/md5-cache/sci-libs/sktime-0.4.2 b/metadata/md5-cache/sci-libs/sktime-0.4.2
index b9d70bb58949..819289a0fbd6 100644
--- a/metadata/md5-cache/sci-libs/sktime-0.4.2
+++ b/metadata/md5-cache/sci-libs/sktime-0.4.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sktime/sktime-0.4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8ef5ef116d561cd44eab19a0905b9950
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.1.0 b/metadata/md5-cache/sci-libs/tensorflow-2.1.0
index e583b4b12e9c..71bc8a7a8e76 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-2.1.0
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.1.0
@@ -12,5 +12,5 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.1.0.tar.gz -> tensorflow-2.1.0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.1.0.tar.bz2 https://storage.googleapis.com/mirror.tensorflow.org/www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz https://gitlab.com/libeigen/eigen/-/archive/4e696901f873a2347f76d931cf2f701e31e15d05/eigen-4e696901f873a2347f76d931cf2f701e31e15d05.tar.gz -> eigen-4e696901f873a2347f76d931cf2f701e31e15d05.tar.gz https://github.com/abseil/abseil-cpp/archive/43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz -> abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/bazel-skylib.0.8.0.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_swift/releases/download/0.12.1/rules_swift.0.12.1.tar.gz -> bazelbuild-rules_swift.0.12.1.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/pybind/pybind11/archive/v2.3.0.tar.gz -> pybind11-v2.3.0.tar.gz https://github.com/llvm/llvm-project/archive/ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz -> llvm-ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz cuda? ( https://github.com/nvidia/nccl/archive/0ceaec9cee96ae7658aa45686853286651f36384.tar.gz -> nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
-_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4085b23d6d0f4bf6cc3b0531a6a04cea
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.2.0-r1 b/metadata/md5-cache/sci-libs/tensorflow-2.2.0-r1
index 854b53f535f5..f854fe1873d6 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-2.2.0-r1
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.2.0-r1
@@ -12,5 +12,5 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.2.0.tar.gz -> tensorflow-2.2.0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.2.0-r1.tar.bz2 https://storage.googleapis.com/mirror.tensorflow.org/www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz https://gitlab.com/libeigen/eigen/-/archive/52a2fbbb008a47c5e3fb8ac1c65c2feecb0c511c/eigen-52a2fbbb008a47c5e3fb8ac1c65c2feecb0c511c.tar.gz https://github.com/abseil/abseil-cpp/archive/43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz -> abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz https://github.com/bazelbuild/rules_apple/releases/download/0.18.0/rules_apple.0.18.0.tar.gz -> bazelbuild-rules_apple.0.18.0.tar.gz https://github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz -> bazelbuild-apple_support.0.7.1.tar.gz https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz https://github.com/bazelbuild/rules_swift/releases/download/0.12.1/rules_swift.0.12.1.tar.gz -> bazelbuild-rules_swift.0.12.1.tar.gz https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz https://github.com/llvm/llvm-project/archive/387c3f74fd8efdc0be464b0e1a8033cc1eeb739c.tar.gz -> llvm-387c3f74fd8efdc0be464b0e1a8033cc1eeb739c.tar.gz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz cuda? ( https://github.com/nvidia/nccl/archive/3701130b3c1bcdb01c14b3cb70fe52498c1e82b7.tar.gz -> nvidia-nccl-3701130b3c1bcdb01c14b3cb70fe52498c1e82b7.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
-_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e37fefbe21389599906dff688091798b
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.2.0-r2 b/metadata/md5-cache/sci-libs/tensorflow-2.2.0-r2
index c48a43396408..aef09d67f961 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-2.2.0-r2
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.2.0-r2
@@ -12,5 +12,5 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.2.0.tar.gz -> tensorflow-2.2.0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.2.0-r1.tar.bz2 https://storage.googleapis.com/mirror.tensorflow.org/www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz https://gitlab.com/libeigen/eigen/-/archive/52a2fbbb008a47c5e3fb8ac1c65c2feecb0c511c/eigen-52a2fbbb008a47c5e3fb8ac1c65c2feecb0c511c.tar.gz https://github.com/abseil/abseil-cpp/archive/43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz -> abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz https://github.com/bazelbuild/rules_apple/releases/download/0.18.0/rules_apple.0.18.0.tar.gz -> bazelbuild-rules_apple.0.18.0.tar.gz https://github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz -> bazelbuild-apple_support.0.7.1.tar.gz https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz https://github.com/bazelbuild/rules_swift/releases/download/0.12.1/rules_swift.0.12.1.tar.gz -> bazelbuild-rules_swift.0.12.1.tar.gz https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz https://github.com/llvm/llvm-project/archive/387c3f74fd8efdc0be464b0e1a8033cc1eeb739c.tar.gz -> llvm-387c3f74fd8efdc0be464b0e1a8033cc1eeb739c.tar.gz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz cuda? ( https://github.com/nvidia/nccl/archive/3701130b3c1bcdb01c14b3cb70fe52498c1e82b7.tar.gz -> nvidia-nccl-3701130b3c1bcdb01c14b3cb70fe52498c1e82b7.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
-_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1642540b8b2dfa59f5a88376eb2e2733
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.3.1 b/metadata/md5-cache/sci-libs/tensorflow-2.3.1
index a1cf4485ebb1..aa1bdcb46822 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-2.3.1
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.3.1
@@ -12,5 +12,5 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.3.1.tar.gz -> tensorflow-2.3.1.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.3.1.tar.bz2 https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz https://gitlab.com/libeigen/eigen/-/archive/386d809bde475c65b7940f290efe80e6a05878c4/eigen-386d809bde475c65b7940f290efe80e6a05878c4.tar.gz https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz -> abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz https://github.com/bazelbuild/rules_apple/archive/5131f3d46794bf227d296c82f30c2499c9de3c5b.tar.gz -> bazelbuild-rules_apple-5131f3d46794bf227d296c82f30c2499c9de3c5b.tar.gz https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip https://github.com/bazelbuild/apple_support/archive/501b4afb27745c4813a88ffa28acd901408014e4.tar.gz -> bazelbuild-apple_support-501b4afb27745c4813a88ffa28acd901408014e4.tar.gz https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz https://github.com/llvm/llvm-project/archive/7e825abd5704ce28b166f9463d4bd304348fd2a9.tar.gz -> llvm-7e825abd5704ce28b166f9463d4bd304348fd2a9.tar.gz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/google/ruy/archive/34ea9f4993955fa1ff4eb58e504421806b7f2e8f.zip -> ruy-34ea9f4993955fa1ff4eb58e504421806b7f2e8f.zip https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz https://github.com/pytorch/cpuinfo/archive/6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip -> pytorch-cpuinfo-6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip cuda? ( https://github.com/nvidia/nccl/archive/5949d96f36d050e59d05872f8bbffd2549318e95.tar.gz -> nvidia-nccl-5949d96f36d050e59d05872f8bbffd2549318e95.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
-_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5636e3750840bb389c7e0e2b75f70b36
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.3.1-r1 b/metadata/md5-cache/sci-libs/tensorflow-2.3.1-r1
index d65c8687a06c..2565b49f5b00 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-2.3.1-r1
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.3.1-r1
@@ -12,5 +12,5 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.3.1.tar.gz -> tensorflow-2.3.1.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.3.1-r1.tar.bz2 https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz https://gitlab.com/libeigen/eigen/-/archive/386d809bde475c65b7940f290efe80e6a05878c4/eigen-386d809bde475c65b7940f290efe80e6a05878c4.tar.gz https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz -> abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz https://github.com/bazelbuild/rules_apple/archive/5131f3d46794bf227d296c82f30c2499c9de3c5b.tar.gz -> bazelbuild-rules_apple-5131f3d46794bf227d296c82f30c2499c9de3c5b.tar.gz https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip https://github.com/bazelbuild/apple_support/archive/501b4afb27745c4813a88ffa28acd901408014e4.tar.gz -> bazelbuild-apple_support-501b4afb27745c4813a88ffa28acd901408014e4.tar.gz https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz https://github.com/llvm/llvm-project/archive/7e825abd5704ce28b166f9463d4bd304348fd2a9.tar.gz -> llvm-7e825abd5704ce28b166f9463d4bd304348fd2a9.tar.gz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/google/ruy/archive/34ea9f4993955fa1ff4eb58e504421806b7f2e8f.zip -> ruy-34ea9f4993955fa1ff4eb58e504421806b7f2e8f.zip https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz https://github.com/pytorch/cpuinfo/archive/6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip -> pytorch-cpuinfo-6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip cuda? ( https://github.com/nvidia/nccl/archive/5949d96f36d050e59d05872f8bbffd2549318e95.tar.gz -> nvidia-nccl-5949d96f36d050e59d05872f8bbffd2549318e95.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
-_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=845eeaedf7adca340d1efe6f96eb77ab
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.4.0_rc3 b/metadata/md5-cache/sci-libs/tensorflow-2.4.0_rc3
index 61cdb1129830..17793d86ca24 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-2.4.0_rc3
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.4.0_rc3
@@ -12,5 +12,5 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.4.0-rc3.tar.gz -> tensorflow-2.4.0_rc3.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.4.0_rc3.tar.bz2 https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz https://gitlab.com/libeigen/eigen/-/archive/011e0db31d1bed8b7f73662be6d57d9f30fa457a/eigen-011e0db31d1bed8b7f73662be6d57d9f30fa457a.tar.gz https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz -> abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz https://github.com/llvm/llvm-project/archive/f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz -> llvm-f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/google/ruy/archive/5bb02fbf90824c2eb6cd7418f766c593106a332b.zip -> ruy-5bb02fbf90824c2eb6cd7418f766c593106a332b.zip https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz https://github.com/pytorch/cpuinfo/archive/6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip -> pytorch-cpuinfo-6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip cuda? ( https://github.com/nvidia/nccl/archive/195232556936b39b01cc908296e1650b80d4a3e9.tar.gz -> nvidia-nccl-195232556936b39b01cc908296e1650b80d4a3e9.tar.gz https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
-_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=49c409d6e12869f27a3e7a0637a71965
diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.1 b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.1
index 6fd8e585d6ee..b512fe045c25 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.1
+++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.1
@@ -11,5 +11,5 @@ RDEPEND=sci-libs/tensorflow[python,python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/estimator/archive/v2.1.tar.gz -> tensorflow-estimator-2.1.tar.gz https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
-_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=213a250efdbe982a16b0fc48277855ed
diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.2.0-r1 b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.2.0-r1
index bed0a7f8954f..8d1ccc403345 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.2.0-r1
+++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=sci-libs/tensorflow[python,python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/estimator/archive/v2.2.0.tar.gz -> tensorflow-estimator-2.2.0.tar.gz https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
-_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aac40e8ee251bbefc463f4aec53e94a0
diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.2.0-r2 b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.2.0-r2
index 530137be3eb8..190e89adebbf 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.2.0-r2
+++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.2.0-r2
@@ -11,5 +11,5 @@ RDEPEND=sci-libs/tensorflow[python,python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/estimator/archive/v2.2.0.tar.gz -> tensorflow-estimator-2.2.0.tar.gz https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
-_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e351cb7e3e853a420f2f2d03a3cec3bf
diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.3.0 b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.3.0
index ac80717a4c90..c932340d190d 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.3.0
+++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.3.0
@@ -11,5 +11,5 @@ RDEPEND=sci-libs/tensorflow[python,python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/estimator/archive/v2.3.0.tar.gz -> tensorflow-estimator-2.3.0.tar.gz https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
-_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=012eba3f952e83336f13e0da8c556bb4
diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.4.0_rc0 b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.4.0_rc0
index f32d4f0875d3..35b74b27123e 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.4.0_rc0
+++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.4.0_rc0
@@ -11,5 +11,5 @@ RDEPEND=sci-libs/tensorflow[python,python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/estimator/archive/v2.4.0-rc0.tar.gz -> tensorflow-estimator-2.4.0_rc0.tar.gz https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
-_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4eeca1fb78ec2f5b198ca4d171346770
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 52880fc31a80..12b614f7a2bd 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/dunshire-0.1.1-r1 b/metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1
index 80186576bd21..b68de878eb95 100644
--- a/metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1
+++ b/metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dunshire/dunshire-0.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ce35c1de6877487f5f2c914cf12e5f5b
diff --git a/metadata/md5-cache/sci-mathematics/octave-6.1.0 b/metadata/md5-cache/sci-mathematics/octave-6.1.0
deleted file mode 100644
index 3209d69e35e0..000000000000
--- a/metadata/md5-cache/sci-mathematics/octave-6.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:0= ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sundials? ( >=sci-libs/sundials-4:0= ) X? ( x11-libs/libX11:0= ) dev-util/gperf sys-apps/texinfo virtual/pkgconfig doc? ( dev-texlive/texlive-fontsrecommended dev-texlive/texlive-plaingeneric dev-texlive/texlive-metapost virtual/latex-base ) gui? ( dev-qt/linguist-tools:5 ) java? ( >=virtual/jdk-1.6.0 ) qrupdate? ( app-misc/pax-utils ) sparse? ( app-misc/pax-utils ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=High-level interactive language for numerical computations
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/octave/
-IUSE=curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs sundials X zlib elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:0= ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sundials? ( >=sci-libs/sundials-4:0= ) X? ( x11-libs/libX11:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/6.1.0
-SRC_URI=mirror://gnu/octave/octave-6.1.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c701e4cc96835fadc31f4cc6b97b697f
diff --git a/metadata/md5-cache/sci-mathematics/octave-6.1.0-r1 b/metadata/md5-cache/sci-mathematics/octave-6.1.0-r1
new file mode 100644
index 000000000000..124bc7b06ab6
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/octave-6.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=app-arch/bzip2 app-text/ghostscript-gpl sys-apps/texinfo dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:0= ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sundials? ( >=sci-libs/sundials-4:0= ) X? ( x11-libs/libX11:0= ) dev-util/gperf virtual/pkgconfig doc? ( dev-texlive/texlive-fontsrecommended dev-texlive/texlive-plaingeneric dev-texlive/texlive-metapost virtual/latex-base ) gui? ( dev-qt/linguist-tools:5 ) java? ( >=virtual/jdk-1.6.0 ) qrupdate? ( app-misc/pax-utils ) sparse? ( app-misc/pax-utils ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=High-level interactive language for numerical computations
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/octave/
+IUSE=curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs sundials X zlib elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl sys-apps/texinfo dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:0= ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sundials? ( >=sci-libs/sundials-4:0= ) X? ( x11-libs/libX11:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0/6.1.0
+SRC_URI=mirror://gnu/octave/octave-6.1.0.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b11489392dd2d49cf78543402e7f59d5
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index 6d047ae5a079..b3e28e7ff464 100644
Binary files a/metadata/md5-cache/sci-misc/Manifest.gz and b/metadata/md5-cache/sci-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-misc/boinc-7.14.2 b/metadata/md5-cache/sci-misc/boinc-7.14.2
index 77876a3c0836..973439aa3b53 100644
--- a/metadata/md5-cache/sci-misc/boinc-7.14.2
+++ b/metadata/md5-cache/sci-misc/boinc-7.14.2
@@ -4,11 +4,11 @@ DESCRIPTION=The Berkeley Open Infrastructure for Network Computing
 EAPI=6
 HOMEPAGE=https://boinc.ssl.berkeley.edu/
 IUSE=X cuda curl_ssl_gnutls curl_ssl_libressl +curl_ssl_openssl kernel_linux
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=app-misc/ca-certificates-20080809 cuda? ( >=dev-util/nvidia-cuda-toolkit-2.1 >=x11-drivers/nvidia-drivers-180.22 ) net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,-curl_ssl_nss(-),curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] sys-apps/util-linux sys-libs/zlib X? ( dev-db/sqlite:3 media-libs/freeglut virtual/jpeg:0= x11-libs/gtk+:3 >=x11-libs/libnotify-0.7 x11-libs/wxGTK:3.0-gtk3[X,opengl,webkit] ) !app-admin/quickswitch
 REQUIRED_USE=^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_openssl )
 SLOT=0
 SRC_URI=X? ( https://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> boinc.tif ) https://github.com/BOINC/boinc/archive/client_release/7.14/7.14.2.tar.gz -> boinc-7.14.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5fdd6936e444ca060892f5369358017e
+_md5_=daedf4667c24006854a8306a41c4cb6f
diff --git a/metadata/md5-cache/sci-misc/vitables-3.0.0-r1 b/metadata/md5-cache/sci-misc/vitables-3.0.0-r1
index e947a017b789..28d8ffc46473 100644
--- a/metadata/md5-cache/sci-misc/vitables-3.0.0-r1
+++ b/metadata/md5-cache/sci-misc/vitables-3.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_6? ( dev-python/setuptools[python_targets_p
 REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vitables/ViTables-3.0.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1e027d546f7b726d96113cc3e6dc28e7
diff --git a/metadata/md5-cache/sci-misc/vitables-3.0.0-r2 b/metadata/md5-cache/sci-misc/vitables-3.0.0-r2
index 799556fcab93..ec6ad066fc0e 100644
--- a/metadata/md5-cache/sci-misc/vitables-3.0.0-r2
+++ b/metadata/md5-cache/sci-misc/vitables-3.0.0-r2
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_6? ( dev-python/setuptools[python_targets_p
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vitables/ViTables-3.0.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8e653dad40c4c6a2fe72465356344c2b
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 477de2e6c0bd..35b701f40f5a 100644
Binary files a/metadata/md5-cache/sci-physics/Manifest.gz and b/metadata/md5-cache/sci-physics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-physics/geant-4.10.6.3 b/metadata/md5-cache/sci-physics/geant-4.10.6.3
index d95690ad7b69..0d0edee8ecc9 100644
--- a/metadata/md5-cache/sci-physics/geant-4.10.6.3
+++ b/metadata/md5-cache/sci-physics/geant-4.10.6.3
@@ -7,8 +7,8 @@ IUSE=+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5 invent
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=geant4
 RDEPEND=dev-libs/expat >=sci-physics/clhep-2.4.1.3:2=[threads?] data? ( ~sci-physics/geant-data-4.10.6.3 ) dawn? ( media-gfx/dawn ) doc? ( =app-doc/geant-docs-4.10.6* ) gdml? ( dev-libs/xerces-c ) hdf5? ( sci-libs/hdf5[threads?] ) inventor? ( media-libs/SoXt ) motif? ( x11-libs/motif:0 ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
-REQUIRED_USE=^^ ( c++11 c++14 c++17 )
+REQUIRED_USE=^^ ( c++11 c++14 c++17 ) inventor? ( opengl ) motif? ( opengl ) qt5? ( opengl )
 SLOT=4
 SRC_URI=https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p03.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25abac0455ce7d1bd438a648a9588ec6
+_md5_=faef9f1da2b49e81228998f13e63946d
diff --git a/metadata/md5-cache/sci-physics/lhapdf-6.2.3 b/metadata/md5-cache/sci-physics/lhapdf-6.2.3
index 9d8569bec767..92f40bbdee1c 100644
--- a/metadata/md5-cache/sci-physics/lhapdf-6.2.3
+++ b/metadata/md5-cache/sci-physics/lhapdf-6.2.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:0= python? ( python_targets_python3_6? ( dev-lang/python:
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://www.hepforge.org/archive/lhapdf/LHAPDF-6.2.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4caaf371f4805dcd5f2d75c12b30be76
diff --git a/metadata/md5-cache/sci-physics/qmeq-1.0-r1 b/metadata/md5-cache/sci-physics/qmeq-1.0-r1
index 8ead184eac84..9d7e31a633b5 100644
--- a/metadata/md5-cache/sci-physics/qmeq-1.0-r1
+++ b/metadata/md5-cache/sci-physics/qmeq-1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/q/qmeq/qmeq-1.0.tar.gz examples? ( https://github.com/gedaskir/qmeq-examples/archive/1.0.tar.gz -> qmeq-examples-1.0.tgz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=34b39ffe6fe1c24507b8ff8b54bd8c7b
diff --git a/metadata/md5-cache/sci-physics/qmeq-1.0_p202004 b/metadata/md5-cache/sci-physics/qmeq-1.0_p202004
index a79393df23ba..4d57eb5bfc92 100644
--- a/metadata/md5-cache/sci-physics/qmeq-1.0_p202004
+++ b/metadata/md5-cache/sci-physics/qmeq-1.0_p202004
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_7(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/gedaskir/qmeq/archive/d3949bf812e1648892959a169a7ff849cd7b69d5.tar.gz -> qmeq-1.0_p202004.tgz examples? ( https://github.com/gedaskir/qmeq-examples/archive/1.0.tar.gz -> qmeq-examples-1.0.tgz )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d5d70518df2d5f8d824a60272e4058f3
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 78e1d0a967dc..a0a77d8d905e 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/veusz-3.1 b/metadata/md5-cache/sci-visualization/veusz-3.1
index 9d72bd67e8af..329707273fc6 100644
--- a/metadata/md5-cache/sci-visualization/veusz-3.1
+++ b/metadata/md5-cache/sci-visualization/veusz-3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/veusz/veusz/releases/download/veusz-3.1/veusz-3.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ca92c85e552304bf188b0971b70df28c
diff --git a/metadata/md5-cache/sci-visualization/veusz-3.2 b/metadata/md5-cache/sci-visualization/veusz-3.2
index 8fca711b04f2..5988bd60829c 100644
--- a/metadata/md5-cache/sci-visualization/veusz-3.2
+++ b/metadata/md5-cache/sci-visualization/veusz-3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/veusz/veusz/releases/download/veusz-3.2/veusz-3.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3cfa1377bbdd51c24c9862b69105ff48
diff --git a/metadata/md5-cache/sec-policy/Manifest.gz b/metadata/md5-cache/sec-policy/Manifest.gz
index 178fd87241fa..a149a16db8f6 100644
Binary files a/metadata/md5-cache/sec-policy/Manifest.gz and b/metadata/md5-cache/sec-policy/Manifest.gz differ
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20200818-r2
index e9c57dc771d0..73cc5100ed81 100644
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-abrt-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for abrt
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c903dc2bfd640b0ef6283cd6bf561d66
+_md5_=da23791a26f08ba43192351089070ac2
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20200818-r2
index 822da13f68ba..866a4b8bbf67 100644
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/se
 DESCRIPTION=SELinux policy for accountsd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=49e5d662fe380c4b7563c28e13c10512
+_md5_=50f697eca2691aaaf47017ac456abd76
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-acct-2.20200818-r2
index 69a5314e8cd9..b8d33813e328 100644
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-acct-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for acct
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b1c6ff4767d166337dccc83fd8fb7ecc
+_md5_=59bc2581ca00212519f6b7c56db6464d
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-afs-2.20200818-r2
index 5a1a5e48da2c..f1746f95fc23 100644
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-afs-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for afs
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=2c0b03319209c4c53e5088def0cf1ca1
+_md5_=34bca63a3453d652eca09f833d46332f
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-aide-2.20200818-r2
index 6c4c433771b3..38cd094717ca 100644
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-aide-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for aide
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=24d5aaf77ba06cb1703759ca63e0ed7a
+_md5_=88d4851a81a696db796722cc2c179f6f
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20200818-r2
index b0894a8e7251..f085acfe7a01 100644
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-alsa-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for alsa
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5110b5774999d831a7c044627b148ad2
+_md5_=be701843bbeef2fd573bc14c4a0fbb0c
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20200818-r2
index 935854ad2fab..c47ede10d87a 100644
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-amanda-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/s
 DESCRIPTION=SELinux policy for amanda
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=10123f217af607c58b49311b22656d16
+_md5_=88246f1c711771e367f22f9b23c31d5e
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20200818-r2
index 83e1cff9dc60..eec734a4ab11 100644
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-amavis-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for amavis
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=bb8f9420c25aaf0dc8132281850c6d43
+_md5_=d3687608a583008d2291e78f2cd96397
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-android-2.20200818-r2
index f8caab9924cb..dd57a7adfefb 100644
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-android-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreu
 DESCRIPTION=SELinux policy for android
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=673b13583f9803222d6e154aa48e40b7
+_md5_=3e2e35e0b2790a7b987719be98d2742d
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-apache-2.20200818-r2
index ca9ef5842a45..196aeaff309b 100644
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-apache-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-polic
 DESCRIPTION=SELinux policy for apache
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6373f0d37f0595b06268e79a83aef6c8
+_md5_=6a291c4594c0f8cd50a239cfb48cfdac
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20200818-r2
index e578f4336b60..82a143ae1159 100644
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for apcupsd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6f4d2289c0b5b3a755246177458ea1d8
+_md5_=d9dcd02e49b735b1ce6bd3bebf0c7ecd
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-apm-2.20200818-r2
index dd438863fec6..fff1053204c7 100644
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-apm-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for acpi
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=2aa19ee71404e3d63022c6db2517e2d5
+_md5_=2be85310be9e6f9e189f97cc079f301e
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20200818-r2
index 61412760af80..cb8960678f2e 100644
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for arpwatch
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=f61106d2390c987076013ea09fe7d014
+_md5_=9a89ae618cdd3b77549e3edf25056a15
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20200818-r2
index 39a812355043..0fed371527b1 100644
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for asterisk
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6db510ee684f4302554787b9f1c893be
+_md5_=7ab4cfad7cf16af8793dcbf52eaecfd4
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-at-2.20200818-r2
index 4f088675a78a..2a805d299f94 100644
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-at-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for at
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=0e761ab56c02b56eefe1a2a531b42747
+_md5_=35ae681dea5bf79a4b49a15a53236a1e
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-automount-2.20200818-r2
index 844f153038c4..342c9e77936e 100644
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-automount-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for automount
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=40231a08f8497f38b1e064a6868137aa
+_md5_=060c353bd4cccdce60df61234a1ec3f3
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20200818-r2
index 4b4a65bc3194..083dd39c1335 100644
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-avahi-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for avahi
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=420fa48b3ac598a15f31bda9a82c8657
+_md5_=377cc734700938aaa4b6c5290478253d
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20200818-r2
index 37b38a71550c..6be1592f4748 100644
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-awstats-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for awstats
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=f5a1459968b67d61933c8f4415694bc0
+_md5_=dea8a6fe43909482ea738322a0d549d6
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-backup-2.20200818-r2
index 25aac2573e78..24a6b709d880 100644
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-backup-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for generic backup apps
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=73fd736f0a6505d027ebbd69543afd0f
+_md5_=58b6ce565e53cee1ce4bacb594d57381
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20200818-r2
index 44eeef9d06fe..c874ff64c2e8 100644
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bacula-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for bacula
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=98a87ce0b68dec74260e060ac54b314f
+_md5_=be653d9c92a911dc5c317309d9507493
diff --git a/metadata/md5-cache/sec-policy/selinux-base-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-base-2.20200818-r2
index 51739b931e9a..0803ac4001ba 100644
--- a/metadata/md5-cache/sec-policy/selinux-base-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-base-2.20200818-r2
@@ -5,9 +5,9 @@ DESCRIPTION=Gentoo base policy for SELinux
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 IUSE=doc +unknown-perms systemd +ubac +unconfined
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.8
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_md5_=7834c3da78da54ffc4cee354da7a01d0
+_md5_=594478e021f2e5d3ce31baae97783fc2
diff --git a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20200818-r2
index ff53045b254f..3bd1f68f5a2d 100644
--- a/metadata/md5-cache/sec-policy/selinux-base-policy-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-base-policy-2.20200818-r2
@@ -5,10 +5,10 @@ DESCRIPTION=SELinux policy for core modules
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 IUSE=systemd +unconfined
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 PDEPEND=unconfined? ( sec-policy/selinux-unconfined )
 RDEPEND==sec-policy/selinux-base-2.20200818-r2[systemd?]
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
-_md5_=b42ca2b47c58a0a1d24dda75f3886b82
+_md5_=a0c2ec250396cebc45fc71ac105d9449
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-bind-2.20200818-r2
index d2bd189b8e40..bae688e48e9c 100644
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bind-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for bind
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=49202cf52fa6df2db651169073b35e29
+_md5_=b205cc6b0ba35a601f00e900cf69e544
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20200818-r2
index 02e7194bb0ab..bfbb77a6e415 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for bitcoin
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=0ffcd29fa8d226d510747e61daa8e13b
+_md5_=e0432e5c4e87fbe0592b6126ba7fdcd3
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20200818-r2
index 0c780595de69..bd7c7137fffb 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/s
 DESCRIPTION=SELinux policy for bitlbee
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=cf49b736d62df9ba0a73a5905da86ab5
+_md5_=c5775346c00eaacb02405cf40cb0e986
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20200818-r2
index b5b1537851ee..2ca7d7cb71a0 100644
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for bluetooth
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1e9fb89fd7cb88fc8abc978a004003e3
+_md5_=53e1174489ff8b630a71d3561e978e79
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20200818-r2
index 242c4a6e322e..7b5305a7bf47 100644
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-brctl-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for brctl
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5e9deb830ed5d3ef550f01723b023adf
+_md5_=8b95fe0f5a7661cf2194d19d7a6f8c8f
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20200818-r2
index 5d42ab661f04..4150fdbe3455 100644
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for cachefilesd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5ae5e276cfca97a2fb90eea2109e3812
+_md5_=f6998742eb3b9112cd8a617b96ffe4bf
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20200818-r2
index 1de5465e87e6..08551772e2c1 100644
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for calamaris
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b6faeacc00d6523535f300a46efb0132
+_md5_=99af73e93342d7488794f4bfbdca7df1
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-canna-2.20200818-r2
index d4cb6370596c..31164b928caf 100644
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-canna-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for canna
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=155c159d889f98ddbe9294638a967f45
+_md5_=60e967d42ff39fdabc1dd9a4d1bcf9e8
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20200818-r2
index 1e553fa1ac55..55b0f63afb8d 100644
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ccs-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for ccs
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=4d64a9a7635a94c88a95765ba28476c7
+_md5_=5251e6b1affa36ea64694a0fe2f4d0e6
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20200818-r2
index 8de9b36dcb6e..ea366f5ac2cf 100644
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for cdrecord
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=715433d3829ec811aec2ba65e5743866
+_md5_=37bfdeba5446b91bb7ef5ea0c409040f
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20200818-r2
index d80a0a5eb441..8f31823b54be 100644
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ceph-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for ceph
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=8e2ec7d821d12880c55e388d5d2d40ea
+_md5_=5b5fdd2faa80e6b1416e06556f8077e6
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20200818-r2
index a3a1b15c0986..81e598c6f904 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for cgmanager
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b0007b0509609bb3f02a3a26b5493bd4
+_md5_=3fe21a123458192d60f42ae8c3ac07d6
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20200818-r2
index b2b6f3a6c390..1dcf8446d8bc 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for cgroup
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=58a635657e35b819075f22f5598ba32b
+_md5_=53032a994ff3024c9d3ac178ab859ef7
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20200818-r2
index 5f7c844e9d59..f25efe971dea 100644
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-chromium-2.20200818-r2
@@ -5,10 +5,10 @@ DESCRIPTION=SELinux policy for chromium
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=8efea01556d3d213635cb7c8faae053f
+_md5_=a5935bea2d24c8116e9e9286790cce04
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20200818-r2
index 06de931c309d..391d6cc3ab7b 100644
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for chronyd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e328e392b988cb744cdc3199c8b7032c
+_md5_=2a880aafe0a001d265c4e7b407b8c32f
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20200818-r2
index 5869e652fe8c..7b8a7d3ee0f4 100644
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-clamav-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for clamav
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c4675c498dd31653314bd6024675c649
+_md5_=4db1f8b7ef2761580220a047c25cf5da
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20200818-r2
index a6edce20df22..edd63542a7a7 100644
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for clockspeed
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=cf68257bd4f70fb8d70e690c460ec502
+_md5_=7452d8df9395dfcc89b66a3e620ced76
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20200818-r2
index e2c99b94a27b..36c05a48a3e3 100644
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-collectd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for collectd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=beb8753da86b427f72b57dade6c228a6
+_md5_=817e5ecff774d9afef6f636f9b8b348a
diff --git a/metadata/md5-cache/sec-policy/selinux-colord-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-colord-2.20200818-r2
index 90fbe9e2b2a8..b503f9733f93 100644
--- a/metadata/md5-cache/sec-policy/selinux-colord-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-colord-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for colord
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b2fd74e5878b220b84577bf530269c7b
+_md5_=f8c4acf59256f6632a7f226c04d3f69c
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20200818-r2
index 712e4ddacd2e..893f8f2529f6 100644
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-corosync-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for corosync
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1ec575f76056b95e75f9a0cc05d26fdc
+_md5_=69506f34a6aa948b4142e0ec4d0f98ec
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20200818-r2
index b292040a8827..65bc2a61a8ae 100644
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for couchdb
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b78438d078089c63e16d8351c93b4b15
+_md5_=fd8384b565f3a877a494990016663592
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-courier-2.20200818-r2
index c3ba928bd025..47f365a1869b 100644
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-courier-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for courier
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=fa4488991a64d660e079823c7b1ae035
+_md5_=2066484af0e87598bef7ca4aa66e8603
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20200818-r2
index 1720aa6aad78..bad2e8dc1fd3 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for cpucontrol
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=0fb4f0533f3c765d21afd383a1aa1783
+_md5_=d1ed4fda269384ca8dc268a0bbc245f1
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20200818-r2
index 3a6d009b34f4..2801a6d4ee10 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for cpufreqselector
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=07dfba6fad5861cfcb83e5fa88e4ed4f
+_md5_=3243329b35fa21f8609e0a8f3a526420
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cups-2.20200818-r2
index 8f7dad5ebb6f..c59ba6c50232 100644
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cups-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/sel
 DESCRIPTION=SELinux policy for cups
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=acb5f0261b99940bfa52f7b3a2f7d8ca
+_md5_=c00971533b7be1aea88fad91b8e5d5e7
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20200818-r2
index 738475cce88b..34b444e018fe 100644
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cvs-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreu
 DESCRIPTION=SELinux policy for cvs
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3e8df5d010b7e51c1d6a7f8d021db078
+_md5_=1777daeedc43e44d520ffbd3cdf96c88
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20200818-r2
index 73b438c809d6..3f1e88994343 100644
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for cyphesis
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=41d3c9879133cd30c2b2d0ad18f144e6
+_md5_=7a8cd56ec3c151c86f3da852e9b8b9b6
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20200818-r2
index da59eb978492..e575069780b8 100644
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for daemontools
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=83c9b1d70b455ccb57586f0174d8d0d0
+_md5_=03991612ec0033cccadb75bda6da7145
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dante-2.20200818-r2
index 87ff792857e9..116956a5e47c 100644
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dante-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for dante
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3113c35a24eca2ed64df346332f0127b
+_md5_=c772a08324e416d7b2a7bcd4b0d5f4c2
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20200818-r2
index 5359e0ff3b6d..a5c43ca74d3c 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for dbadm
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1740bd225c15dc4d0a2ff26fdba4f65a
+_md5_=dad9e6f9f54498152bd50f55fce44493
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20200818-r2
index 22c5c611cfc5..75b507e364c0 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/s
 DESCRIPTION=SELinux policy for dbskk
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e851f332395e9794ad806177757dd229
+_md5_=fdd5911bddfc147e74b9355a1bf5c1dc
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20200818-r2
index bdf7c6e490ea..a6466d77d1c6 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dbus-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for dbus
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3a9cf9fcb4ba084e45341be3f466a818
+_md5_=c11d1e07981d6f043f85ad2d307e0e6c
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20200818-r2
index 013c05ac34ab..a8c8f4e50bc5 100644
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dcc-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for dcc
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5ef73b1b4877acecd08c0dbf3f6cfd2c
+_md5_=c6cafd2f5357482c2afd72dbc5b3aee0
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20200818-r2
index 2cb011422b38..40e2e27f6b80 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for ddclient
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=f74a1ca7908f99ec46dab3454f1a026e
+_md5_=cc7b695c4c6f80511b899255c296299a
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20200818-r2
index 79ac1eeb657f..69ddd1cf6ee1 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for ddcprobe
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=ff5fd50351fff389eee5b77a53db5162
+_md5_=82f31255bb3c6285e288d364d0e4c888
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20200818-r2
index 09659d11a2cb..9a6848720522 100644
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for denyhosts
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c325a5f5bd9d6e0b0aa07cfbb0036dfa
+_md5_=87e5a02c5de13407ae112b87c61944a9
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20200818-r2
index b1b3d6ac112b..b9e95778bda9 100644
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/se
 DESCRIPTION=SELinux policy for devicekit
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=653b6e4b32b623e9af191e57c90ab003
+_md5_=da9debf5748aa1d7ba8c0a2385af2e14
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20200818-r2
index 8b4eec15e2ce..059b38b99182 100644
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for dhcp
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=7ee4f7ab99a2f5316d345094392ebfde
+_md5_=9b7eb008a4ceaf6cf86557f863710616
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20200818-r2
index 1f463a0847b3..fcf2af4a9257 100644
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dictd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for dictd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3b97072b0d0b3d926d0474df7031d304
+_md5_=fae285c7b0d295029a8ace185ad6822f
diff --git a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20200818-r2
index 79b0e98cdabc..2acc72d95a5c 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for dirmngr
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b347c9b1d92b0dc3643426264de1d3ac
+_md5_=95e029455abcaac706f3b5795f7cac4d
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20200818-r2
index 2323cf44ceba..f1da9ab3a3b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for dirsrv
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=0fb58a23a1dfe4dc6d8240415fced772
+_md5_=930ef526e9f0dbe1c766938a64e16847
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20200818-r2
index cf1d6e89b924..376ad9100320 100644
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-distcc-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for distcc
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b052bd9454ddbcf9ccedfd701e9b62bb
+_md5_=e2b62f4b3a217a3312cff972697b73eb
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20200818-r2
index f3153c14aaee..e9432b5ad42c 100644
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/pol
 DESCRIPTION=SELinux policy for djbdns
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=f7e215c5d51d99f9603ad39a86112237
+_md5_=0ca33ebf6ae00c90bd9e4341ef7b48e2
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20200818-r2
index ae43b02846d7..a16bc7b3ac3a 100644
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dkim-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for dkim
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=22e9b90560278d2dfb0066b6aa6d10d2
+_md5_=ee059bb325c4397f7055b851e5f7ccd1
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20200818-r2
index 50b44083d392..edfad75f4cf3 100644
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for dmidecode
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=0938cfa23abd598541a9c5902ed1d9ea
+_md5_=8c9409f2f5f4071f1a2cbe6b2a26a527
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20200818-r2
index bb66248660fc..5be0aff9f79b 100644
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for dnsmasq
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3a03e7aa2c1b9582ed4bc76d1e932190
+_md5_=7a171d899102143416257733ed16d8c2
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20200818-r2
index 5def5df98973..b21d932d161e 100644
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for dovecot
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=4b5929e4ae48c74de2c82abfeb32ee64
+_md5_=d1a112ac93c647edf5af0cf12028e2a2
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20200818-r2
index e13201759eca..78db7f44dbad 100644
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for dpkg
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=16a5eb63564da04905f0a8bca97d1c49
+_md5_=2b6be0be0c164a461646839200e315c3
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20200818-r2
index 8e14924e7422..5d10cec4d90d 100644
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dracut-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for dracut
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=8f3005820d302c392af263b9fb648bc9
+_md5_=de3b2cd301bf829c9da7eaf18be6ce5c
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20200818-r2
index 6dceb43a4b4c..e2738600fc20 100644
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreu
 DESCRIPTION=SELinux policy for dropbox
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=60658fe68b6cc7e55db0c60c530e934b
+_md5_=4d0565120a9dbdbce214491dcdb0c7af
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20200818-r2
index a3e053a47d32..16200757f423 100644
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for entropyd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=60dface977e8c541d6c37c64260fc9e9
+_md5_=f02bc885fad9005da6df99c18767c356
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20200818-r2
index 7ea90f1533c0..8c3912312935 100644
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-evolution-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy
 DESCRIPTION=SELinux policy for evolution
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a51bc9dfccabac25e88b8ee6083f675c
+_md5_=f8e8301ef15c79ab7caa85e55e4d5313
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-exim-2.20200818-r2
index 62879b9efc3a..d821a22b5463 100644
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-exim-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for exim
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c3c05b7e9aa3071f5da50b5162a31dc5
+_md5_=cd61d072cc92e1189019260bf86ba164
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20200818-r2
index ea9ff6fc0a52..d4e018e7bd0d 100644
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for fail2ban
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6b3218d430450c1ee0058ebbed65bb91
+_md5_=ac90a7f1c3a8a400abb7192115fe6644
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20200818-r2
index c3eda35a4aa3..c793a666adaf 100644
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for fetchmail
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=63bb23ea4c4a0d08fae91d22ae6e3082
+_md5_=f37578c48b2415356b0addffe3ff9676
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-finger-2.20200818-r2
index 1b9e466bdbb6..acf24e7b7deb 100644
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-finger-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/s
 DESCRIPTION=SELinux policy for finger
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6c5441245361672d3dd1396b1405f2f0
+_md5_=b91e746ef428cb3110e8ec00b3875491
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-flash-2.20200818-r2
index 1d93a8d1e17e..2fb1d7054195 100644
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-flash-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for flash
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3c7aa9f375300ba90fb841894335bf35
+_md5_=334d1f1d933324bec1ea703fd543c64c
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20200818-r2
index e8a22b2d72ac..ef9f1d7e8300 100644
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/se
 DESCRIPTION=SELinux policy for fprintd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=f56397b6bda3b9567b1c63fb17f80bcc
+_md5_=aec0e6700e8a87766eb18d7043a01dab
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20200818-r2
index a4273eaab00c..cc42bef1f533 100644
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ftp-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for ftp
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=9fe939c9dd6d24181f546b560537f333
+_md5_=dbea60f56e8da649711a3b95d6cfbfba
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-games-2.20200818-r2
index 5e154bf980fb..81a2c4c766f1 100644
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-games-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for games
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1fb41b565d57f2f6d45c1212347f2481
+_md5_=0bd762b63e67c6b1e146c4437e8acf5c
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20200818-r2
index 723265863a92..8ee9ea274cac 100644
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for gatekeeper
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=2f8d54e04b14da963dd7ead3d73e65c7
+_md5_=72a2bca5e3b136190819f8d95c383107
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-git-2.20200818-r2
index bca7d8332550..d5c0b4721899 100644
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-git-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for git
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=859cc2d34aba908f78251669c3deb018
+_md5_=a8607539cb80f90757e0aeaf3874af82
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20200818-r2
index 7c80bc8d3118..5b74cbae7001 100644
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for gitosis
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b3671bfbf64607a34c48e64f8c947ef7
+_md5_=724b49408da0151c45135244375223de
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20200818-r2
index 749f607658e2..0fec7483da91 100644
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gnome-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for gnome
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=76221318eeb5a44585d7d0861efe50f9
+_md5_=5dfee339ad294b8c691f5783761569af
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20200818-r2
index debc2307263d..85015f0f5413 100644
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20200818-r2
@@ -5,10 +5,10 @@ DESCRIPTION=SELinux policy for googletalk
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=aca0f76259907384c08f432c15c1f017
+_md5_=e9d4491dab5c3dbda38530d7144ee72d
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20200818-r2
index 8306a9334738..47eb0edbe0e1 100644
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gorg-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for gorg
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e42a4d887a8ade45cbb575726830f180
+_md5_=6e63584617022f6a5b19cd2c09bd3f1e
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20200818-r2
index b82469dd222a..ceab34d22634 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gpg-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy
 DESCRIPTION=SELinux policy for gpg
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=cb117332bf067e184b97ec65e65fb219
+_md5_=9652ff1b0f9fd32ce667424a626cb760
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20200818-r2
index 5f4c4a29f565..87885b38b8b0 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gpm-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for gpm
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1fd1fb321cb77f4f44caa7bc4a4d2b3e
+_md5_=ce57176a51fe5e75028390bcd531b47d
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20200818-r2
index 25acc86dd081..6f5798bc3bf6 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for gpsd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=50c5888fe5008a28eb81aeb981e03eef
+_md5_=dcf1d6ce183c4f4ea64eff1cfac94f20
diff --git a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20200818-r2
index fd4a55765d4e..aeab039cba10 100644
--- a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for gssproxy
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c2dd28d596de97edc4d95759527b4d58
+_md5_=30eef89cb496cf26b90afd9478e2ba83
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20200818-r2
index c08fda1a15f1..4fff957c6940 100644
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for hddtemp
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6b7b3a93bb95f639d7ccbd26759a8ab0
+_md5_=df61aea77e1bb1d5ab99a99ab639d199
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-howl-2.20200818-r2
index 62b9fe3102bd..fe6f59fd0965 100644
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-howl-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for howl
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c0a8f9607ed4128279edb1e05aabee5d
+_md5_=d021cd3faba9e6de073be7cee53190c6
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20200818-r2
index 2fda361d3d54..8c5e588cc725 100644
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-icecast-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for icecast
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=48001470e5aef2a992c749f2cf87732c
+_md5_=0a1e571f636eb86b6ade19dea455b536
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20200818-r2
index be82411a6c09..19d044311fb8 100644
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for ifplugd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=879ac59040a51a84b55795bc1eb5dd92
+_md5_=7501d59b6c2de95baa996ecf8958136d
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20200818-r2
index b20774518ae2..05028d8dd92c 100644
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-imaze-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for imaze
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b6192ef9b7baf67aab612862ab691f2b
+_md5_=1ac1f02693fb67a3feb8095b32ebc284
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20200818-r2
index d8029b428693..4bd91595910e 100644
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-inetd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for inetd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=ac99045ccaba0d72733bcdbe1bec4c6d
+_md5_=4e0de0751cd49d69343eadabf0607521
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-inn-2.20200818-r2
index defb20c2e5d1..45686ffd9668 100644
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-inn-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for inn
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=76e3b1ef8424b25c5890ad391cc204d1
+_md5_=f1c8f522c619e898622f82bef46364e6
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20200818-r2
index ec3b80c28e4c..4aac44ed6ae2 100644
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for ipsec
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=de4e7c46439ecbd912d47089cfbb948e
+_md5_=7ecaaa6b3496266968200ba1c6850eeb
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-irc-2.20200818-r2
index 27dc8b5e1129..2a3eb1fd7f5f 100644
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-irc-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for irc
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c70da4036e60151d8f89e53d9c7c2d7d
+_md5_=a255e62fc991c8d374f486e00f24750d
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20200818-r2
index dbc422172910..ce0e24cc7cca 100644
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ircd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for ircd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a2a0f0516db2e77b27f7141d0f9620de
+_md5_=0ed78d73b688bf6fc7720b2a6d0c5ad8
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20200818-r2
index b4df1f252028..d402d85aa10f 100644
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for irqbalance
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=4ee5368288521cd03e961f0a5da627d4
+_md5_=911b549021c5e4276bfd4923be92aa16
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20200818-r2
index 39aa047c4c63..a769e396fb19 100644
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-jabber-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for jabber
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=4a56211459e4e0c520dce97b73508621
+_md5_=58e8b254edeb38e849ff08f3445f3e79
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-java-2.20200818-r2
index 78c91d02247d..1eb601b18a4d 100644
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-java-2.20200818-r2
@@ -5,10 +5,10 @@ DESCRIPTION=SELinux policy for java
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=8592d1c1e32951ab60a583fede63a759
+_md5_=68b0566773aacaee9bdd7184e9ed4184
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20200818-r2
index cc04b85198c8..e2e63af89bf2 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for kdeconnect
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1f02e7d4ae3fa348308322917a1d1d0a
+_md5_=e52570b16c397ae2fb5bfcb50527bc0a
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20200818-r2
index 68416bc7c8ce..4bc465d42594 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kdump-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for kdump
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=258d92236be62db9e0cc49cfd79758fc
+_md5_=431e0d50d77812520326973264e31562
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20200818-r2
index 1fef984dd54a..cdca881b2743 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for kerberos
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=755452d888a7bd625d5f85978984251d
+_md5_=42bd8e2bde1825f4af46a037a3eaf977
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20200818-r2
index b59130c51d08..d38822bd97f3 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for kerneloops
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e465da69a90d1b9643ef790a2a72be7d
+_md5_=ac8b0166a73ba95a67f3397f4ee2631c
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20200818-r2
index 92aa90f5e26e..46d4072ba422 100644
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kismet-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for kismet
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=81d6e2bff3c448770d7f9610a241f90a
+_md5_=ad10575cf6a0d61bd52bade075fb62c1
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20200818-r2
index 48b55153fe1f..7d81aee3bf13 100644
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for ksmtuned
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=286fcad3d81cc3ba61ef23ddde3c8af6
+_md5_=9fb3a6e82c1a8015c47533bbc5db57a0
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20200818-r2
index 29db2610df2a..606b8d7bdfe7 100644
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for kudzu
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6a6006c673cb7b28568c3c2d1f6f4a2a
+_md5_=d792b137ec940a15e864e6c35b457d9d
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20200818-r2
index 7b8f3450c21b..9e1f09e3956e 100644
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ldap-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for ldap
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=190fdbb1104eb15a03af33df55af0efc
+_md5_=02758513f2439119ca68fe441add70da
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-links-2.20200818-r2
index 22bba0407088..b272131aa74a 100644
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-links-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for links
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=862ee810166f6e0c0335ebc906287340
+_md5_=cebc723fa6a67e0d0933f33712a45841
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20200818-r2
index 45af5cece520..28ca2ed619c9 100644
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-lircd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for lircd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=514f4d81623b817fc02ce9a7c59ff39b
+_md5_=0ffbac6bc507e388c94728b4a724dfdd
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20200818-r2
index 924400329740..3d3dade132ce 100644
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for loadkeys
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=95dec07ac65d2ab077a0afe645f43d20
+_md5_=30a56235cd35da9bd1f6cd96dd0946eb
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20200818-r2
index 01222ab0fac9..0df73309eb73 100644
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for lockdev
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=ac52bdd927e1f1117db938be6751dd04
+_md5_=6eb0670b78ad8cda782851d0c34a1bf3
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20200818-r2
index 1fc79b49c3fd..9fcf6c0b07b8 100644
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for logrotate
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=62a65b2e73a800acfeaccd369480df8b
+_md5_=d2081c248e27870627c07b66cea0d92b
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20200818-r2
index a9f3ea9d11d3..0c5ec72cdf16 100644
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for logsentry
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=8a72b0f2cc153a0448c6c850bd349a14
+_md5_=dab6d62519c811a63987b280b17da683
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20200818-r2
index 8bf676c620a6..ca8f9fd5e48f 100644
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for logwatch
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a29bf712834c7fde9063a306a4aa084f
+_md5_=45df7a59e7ec078b729d78f5b534b43a
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20200818-r2
index fe4ebac861c0..75b1201be4da 100644
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-lpd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for lpd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=ae7c7bd4e1dc31e18b65ef089b83cf3d
+_md5_=e7d3230787bb535103befc17bff65df6
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20200818-r2
index ce8653409dad..d2bc385fa6dd 100644
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mailman-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for mailman
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5e51b7e098fe381ca9e06a88fe82590c
+_md5_=d3526cef0a6e93d39f190ac06cba3051
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20200818-r2
index 64b54193a747..2054302e9dc1 100644
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for makewhatis
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6fe22b607e45dcca287c45cbf8592f44
+_md5_=b3e736cb0d43283b2e965f08124e9397
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20200818-r2
index e680ecaa2816..b847a19bf729 100644
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mandb-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for mandb
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=01c4825ee54fc85df214bc2b788b23f5
+_md5_=2bd9bdd062d22d5fda69fe5e1fdc6443
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20200818-r2
index 5ee6d105c1e7..199e81677e88 100644
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for mcelog
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e5001f7fec141dc7f0f59a40f4445d51
+_md5_=273abacb4374a8a57544f7a1c5786a6d
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20200818-r2
index c80d06ecfd5a..bcfea68a8869 100644
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-memcached-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for memcached
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c7073bc0ad3806a2d97b6d213415bed6
+_md5_=3bbbc23b7eb42b0ccffa8ffe42c57c66
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-milter-2.20200818-r2
index 41f1faa65f4e..44007e7f9b7a 100644
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-milter-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for milter
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3bda3ae3095e6a2ccbf5fc5cd1335eb1
+_md5_=364257a40259616eac23ff12fc51368e
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20200818-r2
index 885c40c2634e..34c1bb826c63 100644
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/se
 DESCRIPTION=SELinux policy for modemmanager
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c809227e4cd237de7b646e6c3bd2cf1c
+_md5_=2e9ffbd280d620adb5ac04db34a2e3dc
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mono-2.20200818-r2
index 0a813e5b0ae8..3a9f2cdf5129 100644
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mono-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for mono
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=44babae4e4bc44ab1bb768306be5d3ad
+_md5_=c48444568e91f776ad644d22a644f7e8
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20200818-r2
index 4aab33faec78..feb389322515 100644
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20200818-r2
@@ -5,10 +5,10 @@ DESCRIPTION=SELinux policy for mozilla
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1e69aa37cd8e86e1871f160a797da923
+_md5_=d66ce9d0ccede5311acc3188b36d12e2
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20200818-r2
index 6581e4670be6..ec9f5b36b65c 100644
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mpd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for mpd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=fa37f8d73b8b7f0c46b2be51bebf4810
+_md5_=20c9f0d03f4df7ac3c6768f7f9749b86
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20200818-r2
index 4371ba97c7db..46e3a01e34c2 100644
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20200818-r2
@@ -5,10 +5,10 @@ DESCRIPTION=SELinux policy for mplayer
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=4e299383f34396f6c470b48f960407ca
+_md5_=b6c2c653b37f9f1105b5b511825078cc
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20200818-r2
index 9ee694ad771e..a1734333ce71 100644
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for mrtg
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=294a1181093e2f1bbe090d99b494b3d3
+_md5_=0b454aec65239b9c9d8de1daeec8c491
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-munin-2.20200818-r2
index 2c61387c56e7..f8c3bcdc0f31 100644
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-munin-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for munin
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=2169670af370249f94cf1e93187aea3b
+_md5_=c166de4bb0543e1788b3108a0196693d
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20200818-r2
index 828a13942600..0acb6aa41585 100644
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mutt-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for mutt
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a617792df8423faa1c7904b80f67a510
+_md5_=87f9efc28cd74bad14b3998355988850
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20200818-r2
index 80af81983a49..ae3654bd6149 100644
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mysql-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for mysql
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=d6d000e7c7d092a94e55a592ef48d46e
+_md5_=9c5d5c57713f59cab50197606679b221
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20200818-r2
index 53bfb3abebc8..21cc7de264c3 100644
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nagios-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for nagios
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=930dab8c621770e4b57288e576df6da1
+_md5_=aa43e78b389c9b1320f84dee457f0391
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20200818-r2
index 552114dcb930..bf9457a33c11 100644
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for ncftool
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b6bb498a8db083be3ee69045401a1e51
+_md5_=e914995e6523341236a9ffb68d8b61c1
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20200818-r2
index 1f9eaf812931..0c8086644fa7 100644
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for networkmanager
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=0c80e04dce56c7549c9de6d974952516
+_md5_=59fbe36356177e17901374540abf97fd
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20200818-r2
index 13b03a3d59ba..8373df5ec64e 100644
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nginx-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for nginx
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=7418a0a04cb1f373d05eefcb174dcf80
+_md5_=06462ff6ac28a90e54b17d393866a6d8
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20200818-r2
index 28b2027d1f46..8b687075ed2d 100644
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for nslcd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=4563d091be86959950e808efe311c070
+_md5_=f232f44f52fb6c0d5a60b0abe91b6a9c
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20200818-r2
index a3aac9c64fcd..fce965e1622a 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ntop-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for ntop
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=819a779f52ebd462b8c3a87828207ac6
+_md5_=65b1280d2bc18ecc9e279b4194870900
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20200818-r2
index 8eb0c423c525..41dc4122b71b 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ntp-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for ntp
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=62401acc7b768bc905990022c6717c2d
+_md5_=6c705b43df6f2c69d6c771957f99905c
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-nut-2.20200818-r2
index ab62befdbb94..3eb737249f85 100644
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nut-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for nut
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3e9653e582df7a50997bcf53a3454579
+_md5_=fb530d3ac9bcd1043d5e589637b5890d
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-nx-2.20200818-r2
index 7c6aa679f3ff..10e2251b1f93 100644
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nx-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for nx
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e0522c456e559d89ff12b4f8d8fbb904
+_md5_=ca3cb07a7e3685c4d16c0f764c812f59
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20200818-r2
index 5547f27ad0d2..e8f1e339ccf9 100644
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for oddjob
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=ef7ca81139f5b235e8f186522c496786
+_md5_=406700042ea05dabd691b404b6620b15
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-oident-2.20200818-r2
index 131a46e964f3..4dc93c774ba5 100644
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-oident-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for oident
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e9433128429c42a0116f0006e4e1c2a1
+_md5_=23a04c6b8b90249c3eddb0472865176f
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-openct-2.20200818-r2
index 9906995c186b..7ea44c4c467a 100644
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-openct-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for openct
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=283557b5b648a3052b0a9c01358df086
+_md5_=066dd5fdf50d63ac1ac97fffad50d355
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20200818-r2
index 084fb20bfcde..bed57ea2e36c 100644
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-openrc-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for openrc
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e06df45ef787fe39f4cf502011e985c8
+_md5_=7f991cb5dd78845cade6cbdb2d5fc218
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20200818-r2
index 327fcc8f9585..f94e07626074 100644
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for openvpn
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=41f3b89b2f7b8e10484a62cde248fb3a
+_md5_=9166b58e4da213eeb1d20e9cf2c8e0ee
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-pan-2.20200818-r2
index ba4b3b2d828b..8448471bb24c 100644
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pan-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy
 DESCRIPTION=SELinux policy for pan
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6b312852c795dc17ac2e87c525b6fc25
+_md5_=ae808ecc284799edc4d7bf1eb3f63b6b
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20200818-r2
index ef9a17801e6b..ed29785e8e7d 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for pcmcia
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=72fd9e9fe7a0b6ca20bff48a4e7532b9
+_md5_=fd156a73ee658e7393e83e0bfe9237b6
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20200818-r2
index 4f76f605582a..5f432fe46752 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for pcscd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=4fa1041bee79391dea2ea3501fb4ab02
+_md5_=32555b418f95accd44d1d218ea542481
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20200818-r2
index 8b660c6e2ca1..6e6f32c849ed 100644
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for phpfpm
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=68e059e91a3e337ba97cb883b6919f3a
+_md5_=dcbcf89460063a5636c1200edf17aefa
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20200818-r2
index 44e6dde7657a..42a975852535 100644
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for plymouthd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5c012f9eacda2f3269900479a1d48c73
+_md5_=f9436852d7e88b0a5b3fb00482eafb5b
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20200818-r2
index 72136b0726b9..1170943a838f 100644
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for podsleuth
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=eeda8c8f983d80e9a570e3feb4b275f0
+_md5_=7b963991122a10861619700638ebf728
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20200818-r2
index ed1ec306bba0..808d4e637e2e 100644
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-policykit-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for policykit
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=9c9bdb46eef29c826a6c4622699957f4
+_md5_=7791dca839fc45563e5559c34534110e
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20200818-r2
index 4fe67acd9f84..2eaea6323b19 100644
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-portmap-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for portmap
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=876927c627222643ba7d32b99f659432
+_md5_=309fbdfa1a3331e93d72c945f1df257c
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20200818-r2
index 3eab3b0018f4..69a2bc8a5409 100644
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-postfix-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for postfix
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=7928a3fca15d5f5425886828532d1704
+_md5_=096417241ec63d86f07961a2058aeb09
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20200818-r2
index 15472117c307..2d9d38827030 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for postgresql
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=fa482e06bd605a409e1a7a21560d89c2
+_md5_=486440a92983aacf6941ad2ad3282fd1
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20200818-r2
index 0015f167072c..1ff403b5e898 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for postgrey
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=9899ee993602d41f32905b6768e98d4b
+_md5_=36cf420ce7e1fe4d11e4d1d5b30d6871
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20200818-r2
index 0be3ee8cb5ce..1d2391843410 100644
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ppp-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for ppp
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5c43f4f2e1f4c5485aade83ceee1011d
+_md5_=5882d3825363c05f6e3be8184fb072e3
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20200818-r2
index a4b2534b7b27..10eaac35c27b 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-prelink-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for prelink
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e22a9379e5ac0d77fb0fe1a133d9c15a
+_md5_=6677a6f644e13f30d6cf2d5828a021e5
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20200818-r2
index fd3d0a429092..3759cd68fc40 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-prelude-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for prelude
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=098d308e1f583232460e3b85dc284b47
+_md5_=c1ad7dfe7e66697a299247e5532fb024
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20200818-r2
index 12190b8105e8..27f0fb433d13 100644
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for privoxy
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=d91afd7e2a116b64eacd4547fc93dab0
+_md5_=1ebdb10ac861f8c16c0b35e65406770d
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20200818-r2
index aca32c2d590e..03eab28131ac 100644
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-procmail-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for procmail
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a15828893169dac858d92624dbc3a4d8
+_md5_=123f61f51482bd919e9bf85eb37d86d9
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-psad-2.20200818-r2
index fc7a04b72264..10446664430b 100644
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-psad-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for psad
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=02dbf3838104c346b3540e00a5fb3a01
+_md5_=1ff182ca7278fd746af72c46c610267d
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20200818-r2
index 986843f257f9..5029179b6729 100644
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for publicfile
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=846a6f27379d39e0f0aee9b6d1e2119e
+_md5_=06bf58b07890d1d0127304a197661b9e
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20200818-r2
index 736c5306700d..26948ea1dc33 100644
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for pulseaudio
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=4bd023f2893f7c76b6e69d3a0da15593
+_md5_=c7882dae8ab72a04b010c9883aa2b416
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20200818-r2
index 84c82bc61041..f84b646eee78 100644
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-puppet-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for puppet
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b25a84c234107d03c99fac5fccb2a104
+_md5_=dd947d8fb46711344216635925897d03
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20200818-r2
index 0c200b25251d..8f7231e9c2b2 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for pyicqt
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=dd5524f68f4c0c13c84f2420ff1e87a9
+_md5_=1977f99b63539a9e6fd13f3b6b7c18b7
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20200818-r2
index ee2469899126..babeff9aa1af 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for pyzor
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5e2d83ca1b2889780cdaa099b48d84a6
+_md5_=eae22b436a010807ca454763aa32bce7
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20200818-r2
index 5d6c577da526..905e4dce8c61 100644
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-qemu-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/se
 DESCRIPTION=SELinux policy for qemu
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6f897c3a01371592104419517f4c7a59
+_md5_=dd58fa0311b74c518f75d59f9f58b5bf
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20200818-r2
index 12f2f4276796..8837401aa0c8 100644
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-qmail-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for qmail
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=2db6be53a0c474f8e3cca28e26c4863f
+_md5_=aecc8a209e7f5d4aeff8899b331b87fc
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-quota-2.20200818-r2
index e53fa4a13073..c4012a452751 100644
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-quota-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for quota
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=0dd8976520facce1bca598fa746114f5
+_md5_=b27b8a1d112dc3bb824cc39b0400f83a
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-radius-2.20200818-r2
index 393c4fc39b07..02dbc6e1927a 100644
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-radius-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for radius
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=726a2da4415cb3378734ba3c4cf5818b
+_md5_=917831abc1b79da1121ceecf3b055b3b
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20200818-r2
index 7003c20b9487..a0a84e1ba1fd 100644
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-radvd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for radvd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5cee7c10e003713e914b28e6b28a6dad
+_md5_=689534c9bf61c474fcbc76e300056bfd
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-razor-2.20200818-r2
index cee80f9ac6c4..0f896cbfdb43 100644
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-razor-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for razor
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=d6bc6cd2f2d31c5cbb009a9427ac59d3
+_md5_=985e6057d3ce59c480f414c1b13ab7d9
diff --git a/metadata/md5-cache/sec-policy/selinux-redis-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-redis-2.20200818-r2
index feee9baf12a4..50712737abfc 100644
--- a/metadata/md5-cache/sec-policy/selinux-redis-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-redis-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for redis
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=caac21fd37b9391228cbd7236a31d96c
+_md5_=e7c75c27e14c73fd027ff0e7b5ebc213
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20200818-r2
index fb0a06a0ce71..b77251c08244 100644
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for remotelogin
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=184bfd0d8bdbb87c71846a04575a60c2
+_md5_=c9cf8561bd297ed71161ff490a72010c
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20200818-r2
index bd411f00e005..757e295c8243 100644
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for resolvconf
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3567883470dade6ab3ef2fb4e90f1ad1
+_md5_=730988cbe04aa68863fb456bc027db0f
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20200818-r2
index 43119d98370f..5b9ab5e5d7be 100644
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for rgmanager
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=da6fb1023020c98af1a89c8d47cc96f6
+_md5_=999c95ac68e9a7d32ae9a72eaeff0b75
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20200818-r2
index 63784f73eecf..5cf201ed6d7d 100644
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rngd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for rngd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=ea2ad696847d64c96922045d6a5b1986
+_md5_=f232ca3e74548bd754f7db5d2537af67
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20200818-r2
index bfa8f4d67f51..2a0f9548548a 100644
--- a/metadata/md5-cache/sec-policy/selinux-roundup-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-roundup-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for roundup
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1fda28944f125ecb31ffa439427cd4c9
+_md5_=aa7239126a670fafa58c0b1b07a355f4
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20200818-r2
index 41682f49002b..af77940b662e 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rpc-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for rpc
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=11e4cd0f369d771727922a86b2f15b60
+_md5_=c44258799a0a4b7bbd1b456af37ad6ef
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20200818-r2
index b5c08777a94d..3fd7903e4d5e 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for rpcbind
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1a3d8de0fb19612179ae6e3549951520
+_md5_=def68ece2f1f80a02c398c9fb07d292e
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20200818-r2
index ad99724f91fe..112dace8df6d 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rpm-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for rpm
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=8679d66a9cb3386635ab479c8d3db953
+_md5_=dea638fcfad0ed04c89517203c6e842b
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20200818-r2
index d7db0e2df923..a6b5daf66c6d 100644
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rssh-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for rssh
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c06cddf7fb0a51d2dd71471136f12aec
+_md5_=d0bb369bd00c136776bccca0678d2fc0
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20200818-r2
index b264d3f211a8..3549e8686e0c 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/se
 DESCRIPTION=SELinux policy for rtkit
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6cecdc201048a5e99934f22d43ff083a
+_md5_=73474d2c9d539782ef1ce400cf92016f
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20200818-r2
index bf3fcf9c9530..cd1a2dae032e 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for rtorrent
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=9217832d48531397ed0531ccf5321a4a
+_md5_=0d80c4afdd9ebac2d24b449736392849
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-salt-2.20200818-r2
index b6d19685dfcd..c3c67186cddb 100644
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-salt-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for salt
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=03fe7970763e95fad03daec2d1235d3c
+_md5_=c008bc843126139d0ea20b5e6687f024
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-samba-2.20200818-r2
index 14b4d063e16c..6ccde411c212 100644
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-samba-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for samba
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=d648824550ff2167ad239dd06c3233b6
+_md5_=4e01414f14700b8c0ef9b4bfdbae5b82
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20200818-r2
index 049fa83d6498..a2fa7aed6b96 100644
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sasl-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for sasl
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5d789ee7841508b060e6cf5f8d6cbe2d
+_md5_=39888556c0a8518c347ce38723e887dd
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-screen-2.20200818-r2
index 48176c72a8e3..0dcfd17e97e1 100644
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-screen-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for screen
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=21ad06fab83c0abb268ed0def1e0013a
+_md5_=3cc79d6bc950d823a905685e05d4e952
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20200818-r2
index fb2b7d7f779b..6bbc88718979 100644
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for sendmail
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=734a75e0461bc438926f3af7c55cc3d2
+_md5_=eaf7b418c4afd03ae7c96549b63105d6
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20200818-r2
index 8ad324547738..d3f7b6db1976 100644
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sensord-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for sensord
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=39870bcb514f6d744d838414f9de82c1
+_md5_=e22e5d868f313697e85d73621ff937cb
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20200818-r2
index d1d6ab25ec35..d8fd9dccde26 100644
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for shorewall
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=d66ed3b2ec0fbb66f8c39650515e44bc
+_md5_=d2c2436afd17f37b2692faade3d5938d
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20200818-r2
index 0405d412891b..adb4276b41fe 100644
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for shutdown
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=8a61c08bf896a83ffa15880b1f2c9356
+_md5_=9ff611ac1545bbfdeeb2d0bfc017d733
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-skype-2.20200818-r2
index 961e0ccd56ef..a8b97978b557 100644
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-skype-2.20200818-r2
@@ -5,10 +5,10 @@ DESCRIPTION=SELinux policy for skype
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
 IUSE=alsa
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=21b222bdb5480fdbf514ae1e7225074a
+_md5_=3fb4f4df50538cdf8ed307c03e8af3dd
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20200818-r2
index 1e6c618b2a2b..b03d9391ec5d 100644
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-slocate-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for slocate
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=43527b80c64bb2ccfffcd51808d13a88
+_md5_=6323618ddcc5c2ae460d46ac9256c3f1
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20200818-r2
index ea6c3476f3f0..3a913222f256 100644
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for slrnpull
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=eeec3f54b55d01feafcf61ed98dd2026
+_md5_=0372466d891eb27d7581362b4453f15e
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20200818-r2
index 2c8f6cd79108..b8918d732549 100644
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for smartmon
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c804c254bcc5fbaca0ba43e1d1a76520
+_md5_=e402a9e4291076fdbb25c6f892294fb6
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20200818-r2
index cb68fc5dada7..b27f3bda1409 100644
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for smokeping
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=135f1d1eea0f929d8d120b45ebc52499
+_md5_=9b5d2fad42020937a99fcfc88be8b394
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20200818-r2
index 8e7085f92e69..4c8778978864 100644
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-snmp-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for snmp
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=7075b06d3ce35889cec5cbb4191b61f1
+_md5_=3f700d70837bb24b044ea7aebf68c29f
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-snort-2.20200818-r2
index 219c72d02214..43e2b26e9554 100644
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-snort-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for snort
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=9c5bf3711393edf26a130b8a4723be3f
+_md5_=ef1328dbf23049855b2239618906bf96
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20200818-r2
index 1151d8fdbe12..b12cc1241920 100644
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for soundserver
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=ccf66a99e6562a00a7a82ff4b9c99792
+_md5_=88275f664afe45a4217b57fbdda71a51
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20200818-r2
index c14265604022..67fc160e8880 100644
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for spamassassin
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a545a7ed2fa5bc39202400a4f6e41dcb
+_md5_=c24af6ba796aedfa524ccff611874ba1
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20200818-r2
index 9aab59108567..1e67043af25d 100644
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for speedtouch
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=454bce532523a0922fc5c0c3f74f5fb6
+_md5_=42a90f193f228c189e594b7f303ed35c
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-squid-2.20200818-r2
index d2e8105157d2..be88670a9cc7 100644
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-squid-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for squid
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=106eb10e3dee5e4a3ad59c610cea795d
+_md5_=9cef9c845d28d446bd5596b68ba86c2f
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20200818-r2
index 4d4ed75d0f44..0ff0d7132044 100644
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sssd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for sssd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5253b74c14826f674bdf22dab129909d
+_md5_=9e3ac36b3e795a8fbcb7c82789745340
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20200818-r2
index 0f70bfa1a30d..bcd11ddb4799 100644
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for stunnel
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=8107439ed28024c24425a462ed43b9c6
+_md5_=b6d5de83e839b3e7fbb4903684919bcc
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20200818-r2
index 2c1cd2154540..d0d41b2219bd 100644
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for subsonic
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=8950d40697b5f6ce2bc6db7383388ac1
+_md5_=733bbd70277c5a913092947b413544ff
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20200818-r2
index 65d34daaa637..c43635b18f9f 100644
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sudo-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for sudo
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=cbc40560087cabc3e94b105abc5d7739
+_md5_=01cffa9c362ad2e4f973372db1a3f475
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20200818-r2
index 8fdac685b65d..55e76d809207 100644
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sxid-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for sxid
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5cc7f078f28c5b564e7c515a54336fad
+_md5_=80a76b8a2e85b217d1433e7ba907fd5a
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20200818-r2
index 6121354f928c..bee4c197db64 100644
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for syncthing
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=56a8e86dd12878ae51c770f43bb21a04
+_md5_=833c8e801ea0f4d77737f794c32d73d2
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20200818-r2
index 3fadb94b029b..c6b02fe44e39 100644
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for sysstat
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=58365e11a3d15ae408782f973b503d0f
+_md5_=bae79a0ad86e18f46f3fcb42f38fff3b
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20200818-r2
index 555e1d5312fa..9e0f9c0e086b 100644
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tboot-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for tboot
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=d2943b1022e604a2a7b5e8e1861ee82d
+_md5_=ac7b3a346c9f7abfc5b339929a350d49
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20200818-r2
index 47e4976cd3eb..0952d034cc89 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/s
 DESCRIPTION=SELinux policy for tcpd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=914db2ffdf80d3468adc536abcd5748a
+_md5_=04e4c2ba6caf5261b5f51911d1a3469f
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20200818-r2
index f3082c720c43..cf4a37912b67 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for tcsd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=d90fb2c189bd4c1d9933657f7b3661fe
+_md5_=c488fa0b6731f9efca44f7995efc4da7
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20200818-r2
index 45f2786c1c71..349bcfec2a1c 100644
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-telnet-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-po
 DESCRIPTION=SELinux policy for telnet
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=86909cd835046b00b454aecd6fac10f1
+_md5_=2b34a58ae37bc9b9583dc2fbc4e498cb
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20200818-r2
index bdf6013b3df1..8a83683ea57b 100644
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tftp-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for tftp
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=f9bceb6ec6334aa1af3e587c7c3f88d2
+_md5_=2cff111124cbbbe6bf38803591f5758f
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20200818-r2
index 88d6934217fe..9d55aafeb7f8 100644
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for tgtd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=991792350f5cef15f189ebbca1b89521
+_md5_=5df2ef576591824ec81912221771097d
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20200818-r2
index 7b5e6aab1e79..79ecdc66e62e 100644
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy
 DESCRIPTION=SELinux policy for thunderbird
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=d4cadbb276a7084c340d8028aef36c03
+_md5_=c171aaad960820a625b6c0655d7e362b
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20200818-r2
index ba78d49774fa..5ececbc5d1df 100644
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-timidity-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for timidity
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=8144a35b096868085487778dfd80dc58
+_md5_=cff7e109edbb7c02e1c8edfffd9513d1
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20200818-r2
index 447f70f02558..4e232a5e6368 100644
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for tmpreaper
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=097b44674a792ddee88a09728b11edf2
+_md5_=cfe54217b01c184dd114cd76083ccab3
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tor-2.20200818-r2
index 759f4559b89d..a6923642ece7 100644
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tor-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for tor
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5229ad3c824fb21abc03128a2b1ea551
+_md5_=a3a4385db6df54a44ffc88286347f28a
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20200818-r2
index 0835909dde30..31a63a8d90b9 100644
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for tripwire
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=b1d9bef0ac51ac7612c566aaac7669ca
+_md5_=7171f353235fe6c58f8a2a4bd9188f8e
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20200818-r2
index a5d4942da3c4..ea9c576b8823 100644
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for ucspitcp
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1cab4436f89d111e4765c892c3edd84a
+_md5_=11b28666d8c0c1a8c6e719065ee1f2de
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20200818-r2
index 085615fc81e2..b19000e0b110 100644
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for ulogd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a27fb52d2bb397489cb7a2ff8b8c375f
+_md5_=ddcec0ec0c906113010db0c80fafdeaa
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-uml-2.20200818-r2
index 70c90b0dfafb..68a5a8cf31ef 100644
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uml-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for uml
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=5f74e3647803a59e70f474586ea1ac1e
+_md5_=857e70d4ea35c3e199d3cb9611e2c4de
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20200818-r2
index 3300561f5192..0eedb967e1d1 100644
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for unconfined
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3696b9e28dd90cd5d97e76a790279cad
+_md5_=ef26f82f6eb3f44d84b70f1ecac16140
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20200818-r2
index ffd890f5c7dc..ee32ac4dcc96 100644
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uptime-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for uptime
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=9deedebf9646a2faa5a28d3a87db7616
+_md5_=efb0239ffe7a064e834445857995d41d
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20200818-r2
index c9dce317531c..badf736763cb 100644
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for usbmuxd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3d753dc79294ff12e27f3f3c197f81f0
+_md5_=90cc4239265dddecb4a405324fcee6a0
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20200818-r2
index d064beab5bca..6be68b79ee4f 100644
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uucp-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/s
 DESCRIPTION=SELinux policy for uucp
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=74d8f5d2af9750fbc129749ac6af0413
+_md5_=c4dac4b030968c893e2a59e53a0911d3
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20200818-r2
index d81632b41793..ad097dae4ca2 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for uwimap
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=654ed62d412c515b7a50df96a75f90ad
+_md5_=647f6659d86f79e92c7e246530ff9a4d
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20200818-r2
index a0b546f76e64..50a87ddf5bd0 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for uWSGI
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=f04cceac11ddd02e7c5842fa86036585
+_md5_=ba4d4e1e128b35fd6be958e7dc827099
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20200818-r2
index 68122aa59607..8af4b4c00110 100644
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for varnishd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=1fb0897c19211e4cb328180acd409c5b
+_md5_=80a69ccf1704e7e663f9c73e4bc278d6
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20200818-r2
index f7ad844f7539..7975d51e8985 100644
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for vbetool
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=447413c3667f8822e372ceca19dbf8ac
+_md5_=e8d9d959010a93eb91927585500b6a05
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20200818-r2
index 3b20efcf90ed..d92c35a5ec99 100644
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for vdagent
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=cbc348f7609100645ba2b6a2ef0a01af
+_md5_=2332c91d8e8445735ffb606d47c7a18a
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vde-2.20200818-r2
index 194ef3dd6c66..f3094332b8eb 100644
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vde-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for vde
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=37950da2f2cb978b1bdbefe9dc151a0d
+_md5_=9e3cdf4a5e0adabf441f2bf470a06635
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-virt-2.20200818-r2
index 4f31a2296229..94d81f5a0ac1 100644
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-virt-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for virt
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=ce6085435290d35861538b3c09cbff19
+_md5_=000f8cf88c03231c65891bc217a5b0b8
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20200818-r2
index dc1abcde1369..6de300c45e08 100644
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vlock-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for vlock
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=bc089aac6ba994b7f6c727aeb22ecd88
+_md5_=a275ba408dbde9d3d9447eb8168cb951
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20200818-r2
index 0cad727c91ae..3a904c27102d 100644
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vmware-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy
 DESCRIPTION=SELinux policy for vmware
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=231404866491694bacc1a8a4018737f6
+_md5_=e1c3fa7f125486167d166842f5b2b970
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20200818-r2
index a7867700cade..a7294c943fdb 100644
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for vnstatd
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=9dea53baa35d7d2e95afeab9ed2b1cea
+_md5_=cf181b4f1f4a8cc3599dd6b898ff39e1
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20200818-r2
index 7927421962d6..6512f1c25427 100644
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vpn-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for vpn
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=3f8897bc5e9f31c494ddf433a1aabaa2
+_md5_=d6954457cc3b6e5769a6fcd8758fc71c
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20200818-r2
index ba204705ee31..48d1d562e63d 100644
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for watchdog
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=e878f4aefe871289b83e636d347afb3a
+_md5_=a951d0b22fcbaf9fe53d909f48bc0e35
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20200818-r2
index 711ce161c385..ade7b2dd855b 100644
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
 DESCRIPTION=SELinux policy for webalizer
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=df014ebb95a05ef63f0a2dba92a8897c
+_md5_=b109e0bf5ea4dab2a7a439492cd4f74c
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-wine-2.20200818-r2
index 8a8fdd51a67f..4fac4a2d3ede 100644
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-wine-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for wine
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=6ae877249d05003280f2bcb137cbeda3
+_md5_=b8e8212cd0c603d014ffda1d62ed876e
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20200818-r2
index 08836160ef12..e6aa16399bc3 100644
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for wireshark
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=bac7a6dbba9aed6b6c16cff546bcbb18
+_md5_=7739f2df63ffbb27a2bb5f6d6369dff0
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-wm-2.20200818-r2
index f25bb5f5f729..524ca3b931d2 100644
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-wm-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for wm
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=39f580436741c1d09bf758973cca65ce
+_md5_=d3d05bd1904e7e91991a5d8aaf75370b
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-xen-2.20200818-r2
index fb5d28dfe79f..ad998aff9843 100644
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xen-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for xen
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=a44a4438afe9dc58295045f8b3fff042
+_md5_=5116b448f88b6e4b9e27d6d9c84c9d0c
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20200818-r2
index ca0eae3b3090..856d165eb0a3 100644
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xfs-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for xfs
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=f0ebf6b96f466a05d49fd089c61cb3be
+_md5_=f4007760abce84f7e0e57a2c28eac7d0
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20200818-r2
index 424e26db4850..8abf059d4fd6 100644
--- a/metadata/md5-cache/sec-policy/selinux-xprint-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xprint-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for xprint
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=213f12c1270c543b5eb703d7f59594a5
+_md5_=20ee8a13b4948e74939e88013d156fe3
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20200818-r2
index fee5601db849..6f4a9172e378 100644
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy
 DESCRIPTION=SELinux policy for xscreensaver
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=c5a8cb4ae120793c08a24d3d559a265f
+_md5_=70b8e249a9e9cc83a6cc3157f390045d
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20200818-r2
index f93d6f9f7d13..9428d6c2763a 100644
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xserver-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for xserver
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=0927f83fe860f86988014039ded4c91f
+_md5_=369dbadb1dda8456a3669ee02faa886d
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20200818-r2
index 9219dffd4db1..9c9fd668c7fc 100644
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20200818-r2
@@ -4,10 +4,10 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
 DESCRIPTION=SELinux policy for zabbix
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 -arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818/refpolicy-2.20200818.tar.bz2 https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20200818-r2.tar.bz2
 _eclasses_=selinux-policy-2	271dc44108583884b3658988f5c8c3bb
-_md5_=ed4b41ace50d14b2fc8e1ee3016b2c8e
+_md5_=d0aba49dafc6660d9580e7328f232303
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index bdd727897d8e..3519d16c3352 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/ack-3.4.0 b/metadata/md5-cache/sys-apps/ack-3.4.0
index 49a07fdbb199..635f30d74244 100644
--- a/metadata/md5-cache/sys-apps/ack-3.4.0
+++ b/metadata/md5-cache/sys-apps/ack-3.4.0
@@ -5,11 +5,11 @@ DESCRIPTION=ack is a tool like grep, optimized for programmers
 EAPI=7
 HOMEPAGE=https://beyondgrep.com
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/File-Next-1.180.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/ack-v3.4.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c88c8e18dfdc2ae446108c139d4b1e76
+_md5_=5d8f089c9ad9852baafe84c178c0d27c
diff --git a/metadata/md5-cache/sys-apps/bleachbit-4.0.0 b/metadata/md5-cache/sys-apps/bleachbit-4.0.0
index ce1a30d37a17..57f00f484999 100644
--- a/metadata/md5-cache/sys-apps/bleachbit-4.0.0
+++ b/metadata/md5-cache/sys-apps/bleachbit-4.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.bleachbit.org/bleachbit-4.0.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=65f719127dda9e5bf97ad33afb12a5da
diff --git a/metadata/md5-cache/sys-apps/checkpolicy-3.1 b/metadata/md5-cache/sys-apps/checkpolicy-3.1
index a8a8ba0c2063..c0f637d918b9 100644
--- a/metadata/md5-cache/sys-apps/checkpolicy-3.1
+++ b/metadata/md5-cache/sys-apps/checkpolicy-3.1
@@ -4,10 +4,10 @@ DESCRIPTION=SELinux policy compiler
 EAPI=7
 HOMEPAGE=http://userspace.selinuxproject.org
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libsemanage-3.1
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20200710/checkpolicy-3.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ba4698445c8c419bf6ed8cc6d8170bc2
+_md5_=6e66bf69238f0c2e1a4c308e2d8ad8d5
diff --git a/metadata/md5-cache/sys-apps/dbus-1.12.20 b/metadata/md5-cache/sys-apps/dbus-1.12.20
index 5c8ecbe80ba3..cf380fde20e2 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.12.20
+++ b/metadata/md5-cache/sys-apps/dbus-1.12.20
@@ -1,6 +1,6 @@
 BDEPEND=acct-user/messagebus app-text/xmlto app-text/docbook-xml-dtd:4.4 sys-devel/autoconf-archive virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/expat-2.1.0 elogind? ( sys-auth/elogind ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) dev-libs/expat test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 ) >=dev-libs/glib-2.40:2 )
+DEPEND=>=dev-libs/expat-2.1.0 elogind? ( sys-auth/elogind ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) dev-libs/expat test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) >=dev-libs/glib-2.40:2 )
 DESCRIPTION=A message bus system, a simple way for applications to talk to each other
 EAPI=7
 HOMEPAGE=https://dbus.freedesktop.org/
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.12.20.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9802a613d74112e133efff9fff2ccd4d
+_md5_=983f8eda42d8841be4e46b26d3a841e7
diff --git a/metadata/md5-cache/sys-apps/file-5.37-r1 b/metadata/md5-cache/sys-apps/file-5.37-r1
index 704c5c22fade..767234c165f5 100644
--- a/metadata/md5-cache/sys-apps/file-5.37-r1
+++ b/metadata/md5-cache/sys-apps/file-5.37-r1
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.37.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=83cd3ffdf4d111b38447fc1e684b1029
diff --git a/metadata/md5-cache/sys-apps/file-5.38-r1 b/metadata/md5-cache/sys-apps/file-5.38-r1
index f3e744c66ca8..fd11a6e905f3 100644
--- a/metadata/md5-cache/sys-apps/file-5.38-r1
+++ b/metadata/md5-cache/sys-apps/file-5.38-r1
@@ -11,5 +11,5 @@ RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.38.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ddc20545714c1be2f68a651704b4a261
diff --git a/metadata/md5-cache/sys-apps/file-5.39-r3 b/metadata/md5-cache/sys-apps/file-5.39-r3
index a7d04892d34e..5f554a5fa3df 100644
--- a/metadata/md5-cache/sys-apps/file-5.39-r3
+++ b/metadata/md5-cache/sys-apps/file-5.39-r3
@@ -11,5 +11,5 @@ RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.39.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=43c19a0b9db0b5329b4f572c837c6c8e
diff --git a/metadata/md5-cache/sys-apps/file-9999 b/metadata/md5-cache/sys-apps/file-9999
index ef808fef65ff..3453ee118ec8 100644
--- a/metadata/md5-cache/sys-apps/file-9999
+++ b/metadata/md5-cache/sys-apps/file-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=bzip2? ( app-arch/bzip2[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[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_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) zlib? ( >=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(-)?] ) python? ( !dev-python/python-magic ) seccomp? ( sys-libs/libseccomp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=60c32be8468ad40f9d336e570665985c
diff --git a/metadata/md5-cache/sys-apps/firejail-0.9.64-r1 b/metadata/md5-cache/sys-apps/firejail-0.9.64-r1
index 241914380ac7..7cc1a0c30b65 100644
--- a/metadata/md5-cache/sys-apps/firejail-0.9.64-r1
+++ b/metadata/md5-cache/sys-apps/firejail-0.9.64-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Security sandbox for any type of processes
 EAPI=7
 HOMEPAGE=https://firejail.wordpress.com/
 IUSE=X apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +overlayfs +private-home +suid test +userns +whitelist python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) contrib? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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] ) ) dbusproxy? ( sys-apps/xdg-dbus-proxy )
 REQUIRED_USE=contrib? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netblue30/firejail/releases/download/0.9.64/firejail-0.9.64.tar.xz
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=08cd5c052ffe944503c30f3bfb3f81f0
+_md5_=43abafea5039bc2f3b69874b37fc8940
diff --git a/metadata/md5-cache/sys-apps/fwts-20.11.00 b/metadata/md5-cache/sys-apps/fwts-20.11.00
new file mode 100644
index 000000000000..f3bc4277dd79
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/fwts-20.11.00
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DEPEND=dev-libs/glib:2 >=dev-libs/json-c-0.10-r1 dev-libs/libbsd dev-libs/libpcre sys-apps/dmidecode sys-apps/dtc sys-apps/pciutils sys-power/iasl sys-power/pmtools sys-devel/libtool
+DESCRIPTION=Firmware Test Suite
+EAPI=7
+HOMEPAGE=https://wiki.ubuntu.com/Kernel/Reference/fwts
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=dev-libs/json-c-0.10-r1 dev-libs/libbsd dev-libs/libpcre sys-apps/dmidecode sys-apps/dtc sys-apps/pciutils sys-power/iasl sys-power/pmtools
+SLOT=0
+SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/fwts_20.11.00.orig.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5e668622aedbc2542431f9475c93de0b
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.5.2 b/metadata/md5-cache/sys-apps/fwupd-1.5.2-r1
similarity index 81%
rename from metadata/md5-cache/sys-apps/fwupd-1.5.2
rename to metadata/md5-cache/sys-apps/fwupd-1.5.2-r1
index 98034f3c2527..290ff9190134 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.5.2
+++ b/metadata/md5-cache/sys-apps/fwupd-1.5.2-r1
@@ -1,16 +1,16 @@
 BDEPEND=|| ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( thunderbolt? ( dev-util/umockdev ) net-libs/gnutls[tools] ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.3.5[introspection?] >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:= python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] virtual/libelf:0= virtual/udev dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr x11-libs/cairo ) x11-libs/pango[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.3.5[introspection?] >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:= python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl virtual/libelf:0= virtual/udev dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr sys-libs/efivar x11-libs/cairo ) x11-libs/pango[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
 EAPI=7
 HOMEPAGE=https://fwupd.org
 IUSE=agent amt dell gtk-doc elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.3.5[introspection?] >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:= python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] virtual/libelf:0= virtual/udev dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr x11-libs/cairo ) sys-apps/dbus
+RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.3.5[introspection?] >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:= python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl virtual/libelf:0= virtual/udev dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr sys-libs/efivar x11-libs/cairo ) sys-apps/dbus
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) minimal? ( !introspection )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fwupd/fwupd/archive/1.5.2.tar.gz -> fwupd-1.5.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62406a78382aee51fa505722c3f0d657
+_md5_=8042a20ca9929ba59a4367bd25a223b6
diff --git a/metadata/md5-cache/sys-apps/gcp-0.2.1 b/metadata/md5-cache/sys-apps/gcp-0.2.1
index 04ebeb012493..39028321851d 100644
--- a/metadata/md5-cache/sys-apps/gcp-0.2.1
+++ b/metadata/md5-cache/sys-apps/gcp-0.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gcp/gcp-0.2.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=8d083db5c19d51ad4f529b531f3e1287
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-4.1-r1 b/metadata/md5-cache/sys-apps/i2c-tools-4.1-r1
index e82ca56cc0e2..47ee41c504ab 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-4.1-r1
+++ b/metadata/md5-cache/sys-apps/i2c-tools-4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-4.1.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=330c5b5f54023f7df488899ffe90800d
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-4.2 b/metadata/md5-cache/sys-apps/i2c-tools-4.2
index c9866f6c7ada..8729c3f8b7d3 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-4.2
+++ b/metadata/md5-cache/sys-apps/i2c-tools-4.2
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-4.2.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e75f4f4071ed1e94f29cd62456a803f9
diff --git a/metadata/md5-cache/sys-apps/kcheck-0.0.2-r1 b/metadata/md5-cache/sys-apps/kcheck-0.0.2-r1
index f1fc4b49cb27..de635b9984e2 100644
--- a/metadata/md5-cache/sys-apps/kcheck-0.0.2-r1
+++ b/metadata/md5-cache/sys-apps/kcheck-0.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configargparse[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/wraeth/kcheck/archive/0.0.2.tar.gz -> kcheck-0.0.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cc2b928ed6df71dcc6a81bfd66dd5414
diff --git a/metadata/md5-cache/sys-apps/kcheck-9999 b/metadata/md5-cache/sys-apps/kcheck-9999
index 5bd95f50d0f7..09515b1e1c8d 100644
--- a/metadata/md5-cache/sys-apps/kcheck-9999
+++ b/metadata/md5-cache/sys-apps/kcheck-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/configargparse[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cc2b928ed6df71dcc6a81bfd66dd5414
diff --git a/metadata/md5-cache/sys-apps/mcstrans-3.1 b/metadata/md5-cache/sys-apps/mcstrans-3.1
index 849f93edba43..036e4561001e 100644
--- a/metadata/md5-cache/sys-apps/mcstrans-3.1
+++ b/metadata/md5-cache/sys-apps/mcstrans-3.1
@@ -3,10 +3,10 @@ DEPEND=>=sys-libs/libsepol-3.1:= >=sys-libs/libselinux-3.1:= dev-libs/libpcre:=
 DESCRIPTION=SELinux context translation to human readable names
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libsepol-3.1:= >=sys-libs/libselinux-3.1:= dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:=
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20200710/mcstrans-3.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e343491d0d80c74c201d47f2f61805c7
+_md5_=fa5c7573292a2bac923e80b56f89197a
diff --git a/metadata/md5-cache/sys-apps/openrc-0.41.2 b/metadata/md5-cache/sys-apps/openrc-0.41.2
index e251c4630abe..7696c828b5aa 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.41.2
+++ b/metadata/md5-cache/sys-apps/openrc-0.41.2
@@ -11,4 +11,4 @@ RDEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase sys-libs/pam )
 SLOT=0
 SRC_URI=https://github.com/openrc/openrc/archive/0.41.2.tar.gz -> openrc-0.41.2.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	226d8d2ff588bdfd7d188512dbdb189d	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=398c66cf132101b1adba0d18b3e5e714
+_md5_=e8e9a5e0e1264754a7723ccb9d68c851
diff --git a/metadata/md5-cache/sys-apps/openrc-0.42.1 b/metadata/md5-cache/sys-apps/openrc-0.42.1
index 8d0c36f1e59d..56b98e816c9e 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.42.1
+++ b/metadata/md5-cache/sys-apps/openrc-0.42.1
@@ -11,4 +11,4 @@ RDEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase sys-libs/pam )
 SLOT=0
 SRC_URI=https://github.com/openrc/openrc/archive/0.42.1.tar.gz -> openrc-0.42.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	226d8d2ff588bdfd7d188512dbdb189d	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=df4f84dc50444e532b4757d157592530
+_md5_=7fb55b6486c06b20e928f30e2db89e39
diff --git a/metadata/md5-cache/sys-apps/openrc-9999 b/metadata/md5-cache/sys-apps/openrc-9999
index be94f036279e..5de2ec298af6 100644
--- a/metadata/md5-cache/sys-apps/openrc-9999
+++ b/metadata/md5-cache/sys-apps/openrc-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc !<sys-process/procps-3.3.9-r2 selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 bash? ( app-shells/bash ) !prefix? ( sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) virtual/tmpfiles ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	226d8d2ff588bdfd7d188512dbdb189d	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1c0c54ecab9c317014375f7e40eed10a
+_md5_=d7332224c4094df0fd38068d2d516ca1
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.10.13-r1 b/metadata/md5-cache/sys-apps/pkgcore-0.10.13-r1
index adb95e976fc5..ba336a23cc7f 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-0.10.13-r1
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.10.13-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.10.13.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a3c0aadab26628f2106d54aa6c9fa83e
diff --git a/metadata/md5-cache/sys-apps/pkgcore-9999 b/metadata/md5-cache/sys-apps/pkgcore-9999
index 5b1f47e2b297..ae29811797fc 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-9999
+++ b/metadata/md5-cache/sys-apps/pkgcore-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5050901c461626963e1091c10eea3960
diff --git a/metadata/md5-cache/sys-apps/policycoreutils-3.1 b/metadata/md5-cache/sys-apps/policycoreutils-3.1
deleted file mode 100644
index 90d9cdf446a7..000000000000
--- a/metadata/md5-cache/sys-apps/policycoreutils-3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gettext
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=>=sys-libs/libselinux-3.1:=[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sys-libs/libcap-1.10-r10:= >=sys-libs/libsemanage-3.1:=[python(+),python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-libs/libcap-ng:= >=sys-libs/libsepol-3.1:= >=app-admin/setools-4.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dbus? ( sys-apps/dbus dev-libs/dbus-glib:= ) audit? ( >=sys-process/audit-1.5.1[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) pam? ( sys-libs/pam:= ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=SELinux core utilities
-EAPI=7
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-IUSE=audit dbus pam split-usr python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~mips ~x86
-LICENSE=GPL-2
-PDEPEND=sys-apps/semodule-utils sys-apps/selinux-python
-RDEPEND=>=sys-libs/libselinux-3.1:=[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sys-libs/libcap-1.10-r10:= >=sys-libs/libsemanage-3.1:=[python(+),python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-libs/libcap-ng:= >=sys-libs/libsepol-3.1:= >=app-admin/setools-4.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dbus? ( sys-apps/dbus dev-libs/dbus-glib:= ) audit? ( >=sys-process/audit-1.5.1[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) pam? ( sys-libs/pam:= ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-misc/pax-utils
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20200710/policycoreutils-3.1.tar.gz https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-1.37.tar.bz2
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2e306213ad50da8829002f53300e780f
diff --git a/metadata/md5-cache/sys-apps/policycoreutils-3.1-r1 b/metadata/md5-cache/sys-apps/policycoreutils-3.1-r1
new file mode 100644
index 000000000000..11f4d880ea0c
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/policycoreutils-3.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gettext
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-libs/libselinux-3.1:=[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sys-libs/libcap-1.10-r10:= >=sys-libs/libsemanage-3.1:=[python(+),python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-libs/libcap-ng:= >=sys-libs/libsepol-3.1:= >=app-admin/setools-4.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/ipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dbus? ( sys-apps/dbus dev-libs/dbus-glib:= ) audit? ( >=sys-process/audit-1.5.1[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) pam? ( sys-libs/pam:= ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=SELinux core utilities
+EAPI=7
+HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
+IUSE=audit dbus pam split-usr python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=amd64 ~arm64 ~mips x86
+LICENSE=GPL-2
+PDEPEND=sys-apps/semodule-utils sys-apps/selinux-python
+RDEPEND=>=sys-libs/libselinux-3.1:=[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sys-libs/libcap-1.10-r10:= >=sys-libs/libsemanage-3.1:=[python(+),python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-libs/libcap-ng:= >=sys-libs/libsepol-3.1:= >=app-admin/setools-4.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/ipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dbus? ( sys-apps/dbus dev-libs/dbus-glib:= ) audit? ( >=sys-process/audit-1.5.1[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) pam? ( sys-libs/pam:= ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-misc/pax-utils
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20200710/policycoreutils-3.1.tar.gz https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-1.37.tar.bz2
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=baaed3bb0ce9ac9aa617e13b04d100f0
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.99-r2 b/metadata/md5-cache/sys-apps/portage-2.3.99-r2
index d3dd63474e97..23a4fd754448 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.99-r2
+++ b/metadata/md5-cache/sys-apps/portage-2.3.99-r2
@@ -11,5 +11,5 @@ RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !bui
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.99.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.99.tar.bz2 https://github.com/gentoo/portage/commit/9738a404e876270cbdef2514f66915bce35d7435.patch -> portage-2.3.89-bug-718578.patch
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ea2677b247c21695fc664a64581eab5
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.10-r1 b/metadata/md5-cache/sys-apps/portage-3.0.10-r1
index f43473e20d77..19d5d37f38fd 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.10-r1
+++ b/metadata/md5-cache/sys-apps/portage-3.0.10-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-3.0.10.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-3.0.10.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e55276878788bd4c95ae2f2901055b31
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.11 b/metadata/md5-cache/sys-apps/portage-3.0.11-r1
similarity index 94%
rename from metadata/md5-cache/sys-apps/portage-3.0.11
rename to metadata/md5-cache/sys-apps/portage-3.0.11-r1
index 5b7c4b7da91a..d3474f62e5de 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.11
+++ b/metadata/md5-cache/sys-apps/portage-3.0.11-r1
@@ -12,6 +12,6 @@ RDEPEND=app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/find
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://gentoo/portage-3.0.11.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-3.0.11.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=721d2ce89272d3732cabe65a5a7e4c89
+SRC_URI=mirror://gentoo/portage-3.0.11.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-3.0.11.tar.bz2 https://github.com/gentoo/portage/commit/07a604537e746814613dc171a5c09072ef0266af.patch -> portage-3.0.11-bug-754903-pdepend.patch
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cb865e22e8b46de8204a0689455598cd
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.4-r1 b/metadata/md5-cache/sys-apps/portage-3.0.4-r1
index 497093a2b695..0acc37100d6b 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.4-r1
+++ b/metadata/md5-cache/sys-apps/portage-3.0.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-3.0.4.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-3.0.4.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d4bc09f95893ed8c98d87734c74a6a32
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.8 b/metadata/md5-cache/sys-apps/portage-3.0.8
index 6283d256e670..32ef691f9e07 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.8
+++ b/metadata/md5-cache/sys-apps/portage-3.0.8
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-3.0.8.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-3.0.8.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9b0b42ad6c1d1965b70f20c865fd00fe
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.9 b/metadata/md5-cache/sys-apps/portage-3.0.9
index b898a12196cc..c9c0b6ae823a 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.9
+++ b/metadata/md5-cache/sys-apps/portage-3.0.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-3.0.9.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-3.0.9.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=edf3d6eb9a02926006915b3135815dcc
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index e9ad8e552e15..07ba3b854df0 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -12,5 +12,5 @@ RDEPEND=app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/find
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7853d8bc97df3050fa2d671c4aaf580e
diff --git a/metadata/md5-cache/sys-apps/restorecond-3.1 b/metadata/md5-cache/sys-apps/restorecond-3.1
index f13586a5cb6c..3f05fe5702f3 100644
--- a/metadata/md5-cache/sys-apps/restorecond-3.1
+++ b/metadata/md5-cache/sys-apps/restorecond-3.1
@@ -4,10 +4,10 @@ DEPEND=>=sys-libs/libsepol-3.1:= >=sys-libs/libselinux-3.1:= dev-libs/dbus-glib
 DESCRIPTION=Daemon to watch for creation and set default SELinux fcontexts
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libsepol-3.1:= >=sys-libs/libselinux-3.1:= dev-libs/dbus-glib dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:=
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20200710/restorecond-3.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9aaa57d7d90ac2052a52e841109019e6
+_md5_=d8b787ac6c6022b42b64102b7e7b4b25
diff --git a/metadata/md5-cache/sys-apps/secilc-3.1 b/metadata/md5-cache/sys-apps/secilc-3.1
index 748b1dfa4b6d..100fd50f2eea 100644
--- a/metadata/md5-cache/sys-apps/secilc-3.1
+++ b/metadata/md5-cache/sys-apps/secilc-3.1
@@ -3,11 +3,11 @@ DEPEND=app-text/xmlto >=sys-libs/libsepol-3.1
 DESCRIPTION=SELinux Common Intermediate Language (CIL) Compiler
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libsepol-3.1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20200710/secilc-3.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e859866b1f0b2ddd2291cd5f8080c329
+_md5_=e6f30f3c2da0269f95d449420c64bb7c
diff --git a/metadata/md5-cache/sys-apps/selinux-python-3.1-r1 b/metadata/md5-cache/sys-apps/selinux-python-3.1-r1
index 146ca884b2b8..a90a240e19b4 100644
--- a/metadata/md5-cache/sys-apps/selinux-python-3.1-r1
+++ b/metadata/md5-cache/sys-apps/selinux-python-3.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=SELinux core utilities
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~mips ~x86
+KEYWORDS=amd64 ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libselinux-3.1:=[python] >=sys-libs/libsemanage-3.1:=[python(+)] >=sys-libs/libsepol-3.1:= >=app-admin/setools-4.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/ipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sys-process/audit-1.5.1[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20200710/selinux-python-3.1.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1fad9fcf1095bbe1656b513ebb2763e9
+_md5_=43c690f442594ed4ed7fe73b7fe77f60
diff --git a/metadata/md5-cache/sys-apps/semodule-utils-3.1 b/metadata/md5-cache/sys-apps/semodule-utils-3.1
index 3a03f30bca4e..6830030d407d 100644
--- a/metadata/md5-cache/sys-apps/semodule-utils-3.1
+++ b/metadata/md5-cache/sys-apps/semodule-utils-3.1
@@ -3,10 +3,10 @@ DEPEND=>=sys-libs/libsepol-3.1:=
 DESCRIPTION=SELinux policy module utilities
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libsepol-3.1:=
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20200710/semodule-utils-3.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f7beb596b2a5bae0257adfaef25523ab
+_md5_=8508886b77c55bc69a8638a44c062c60
diff --git a/metadata/md5-cache/sys-apps/smcipmitool-2.24.0.201007 b/metadata/md5-cache/sys-apps/smcipmitool-2.24.0.201007-r1
similarity index 94%
rename from metadata/md5-cache/sys-apps/smcipmitool-2.24.0.201007
rename to metadata/md5-cache/sys-apps/smcipmitool-2.24.0.201007-r1
index 8ee9163a2117..66c1e0e57f74 100644
--- a/metadata/md5-cache/sys-apps/smcipmitool-2.24.0.201007
+++ b/metadata/md5-cache/sys-apps/smcipmitool-2.24.0.201007-r1
@@ -11,4 +11,4 @@ RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://www.supermicro.com/wftp/utility/SMCIPMItool/Linux/SMCIPMITool_2.24.0_build.201007_bundleJRE_Linux_x64.tar.gz
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	prefix	c2993e4c430c1ee24f278983d6189501
-_md5_=c6a7e6e4052e31e0170b76d40358ff76
+_md5_=3396a4a376bd7b3af6c73bf5334c9e77
diff --git a/metadata/md5-cache/sys-apps/systemd-tmpfiles-246 b/metadata/md5-cache/sys-apps/systemd-tmpfiles-246
index 5f5010a63d8d..6511c32bb513 100644
--- a/metadata/md5-cache/sys-apps/systemd-tmpfiles-246
+++ b/metadata/md5-cache/sys-apps/systemd-tmpfiles-246
@@ -1,15 +1,15 @@
 BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 sys-devel/m4 virtual/pkgconfig test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= >=sys-kernel/linux-headers-3.11 sys-libs/libcap:0=
+DEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= >=sys-kernel/linux-headers-3.11 sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= )
 DESCRIPTION=Creates, deletes and cleans up volatile and temporary files and directories
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=test
+IUSE=selinux test
 KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT public-domain
-RDEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= >=sys-kernel/linux-headers-3.11 sys-libs/libcap:0= !sys-apps/opentmpfiles !sys-apps/systemd
+RDEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= >=sys-kernel/linux-headers-3.11 sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= ) !sys-apps/opentmpfiles !sys-apps/systemd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v246.tar.gz -> systemd-246.tar.gz elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/systemd-tmpfiles-246-musl.tar.xz )
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1da1f47166337d42d72b9f027e06d30a
+_md5_=03d05a268e6e7288b9d0e1ce31107b4e
diff --git a/metadata/md5-cache/sys-apps/usbutils-013 b/metadata/md5-cache/sys-apps/usbutils-013
index b52fdf3e74f3..29aad3e86b6c 100644
--- a/metadata/md5-cache/sys-apps/usbutils-013
+++ b/metadata/md5-cache/sys-apps/usbutils-013
@@ -5,11 +5,11 @@ DESCRIPTION=USB enumeration utilities
 EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/usb/usbutils/ https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/
 IUSE=python python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1= virtual/libudev:= sys-apps/hwids python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/usb/usbutils/usbutils-013.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f150a2e276d4ff8ca2993f04118e3382
+_md5_=47e6c79b2776584444ee5c3655636e19
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.35.2 b/metadata/md5-cache/sys-apps/util-linux-2.35.2
index 15720649dcaf..cba4e4bb1769 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.35.2
+++ b/metadata/md5-cache/sys-apps/util-linux-2.35.2
@@ -5,7 +5,7 @@ DESCRIPTION=Various useful Linux utilities
 EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
 IUSE=audit build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU split-usr python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill !<app-shells/bash-completion-2.7-r1
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35.2.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	226d8d2ff588bdfd7d188512dbdb189d	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=921fa73d6ad1c969d2d8a2fabf456e7b
+_md5_=b9b3bfd2158165fcdd0133106f50d1f8
diff --git a/metadata/md5-cache/sys-auth/AusweisApp2-1.22.0 b/metadata/md5-cache/sys-auth/AusweisApp2-1.22.0
new file mode 100644
index 000000000000..f65a2456af06
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/AusweisApp2-1.22.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
+DESCRIPTION=Official authentication app for German ID cards and residence permits
+EAPI=7
+HOMEPAGE=https://www.ausweisapp.bund.de/
+KEYWORDS=~amd64 ~x86
+LICENSE=EUPL-1.2
+RDEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
+SLOT=0
+SRC_URI=https://github.com/Governikus/AusweisApp2/archive/1.22.0.tar.gz -> AusweisApp2-1.22.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6da17e264ef092df6480b786cf626019
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index ec433cdfe061..310ecf9f1214 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/keystone-17.0.0 b/metadata/md5-cache/sys-auth/keystone-17.0.0
index d46d4c102899..a43d0cfb98b1 100644
--- a/metadata/md5-cache/sys-auth/keystone-17.0.0
+++ b/metadata/md5-cache/sys-auth/keystone-17.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/ussuri/keystone.conf.sample -> keystone.conf.sample-17.0.0 https://tarballs.openstack.org/keystone/keystone-17.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2e515d9b344f95ecf4a0d998ac645ddd
diff --git a/metadata/md5-cache/sys-auth/keystone-18.0.0 b/metadata/md5-cache/sys-auth/keystone-18.0.0
index 4ad2d18ced1c..c95de15fe414 100644
--- a/metadata/md5-cache/sys-auth/keystone-18.0.0
+++ b/metadata/md5-cache/sys-auth/keystone-18.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 python_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/victoria/keystone.conf.sample -> keystone.conf.sample-18.0.0 https://tarballs.openstack.org/keystone/keystone-18.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d16b70b732d994b16071cc4d3b17154e
diff --git a/metadata/md5-cache/sys-auth/keystone-2020.1.9999 b/metadata/md5-cache/sys-auth/keystone-2020.1.9999
index a95a487562f9..122c496455a5 100644
--- a/metadata/md5-cache/sys-auth/keystone-2020.1.9999
+++ b/metadata/md5-cache/sys-auth/keystone-2020.1.9999
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/ussuri/keystone.conf.sample -> keystone.conf.sample-2020.1.9999
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d935f3913994ad7dde279562955ef705
diff --git a/metadata/md5-cache/sys-auth/keystone-2020.2.9999 b/metadata/md5-cache/sys-auth/keystone-2020.2.9999
index 4d3696f1de03..2c7d43e7b779 100644
--- a/metadata/md5-cache/sys-auth/keystone-2020.2.9999
+++ b/metadata/md5-cache/sys-auth/keystone-2020.2.9999
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 python_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/victoria/keystone.conf.sample -> keystone.conf.sample-2020.2.9999
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d16b70b732d994b16071cc4d3b17154e
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r3 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r3
index bc4adf670f4b..fbbb508187d6 100644
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r3
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r3
@@ -5,7 +5,7 @@ DESCRIPTION=NSS module for name lookups using LDAP
 EAPI=7
 HOMEPAGE=https://arthurdejong.org/nss-pam-ldapd/
 IUSE=debug kerberos +pam pynslcd sasl test +utils python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 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 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=acct-group/nslcd acct-user/nslcd net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sasl? ( dev-libs/cyrus-sasl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[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/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] utils? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) pynslcd? ( dev-python/python-ldap[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-daemon[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) !sys-auth/nss_ldap !sys-auth/pam_ldap
 REQUIRED_USE=utils? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) test? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) pynslcd )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.11.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	s6	abafe40bbcfffaf76f37ce116ec4d004	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a64e3f98b4c8e34491f7a78988dacebf
+_md5_=04eeabcbea6c20d6c7364e01e091bc80
diff --git a/metadata/md5-cache/sys-auth/solo-python-0.0.26 b/metadata/md5-cache/sys-auth/solo-python-0.0.26
index bbfff4d81c16..659d0cad472e 100644
--- a/metadata/md5-cache/sys-auth/solo-python-0.0.26
+++ b/metadata/md5-cache/sys-auth/solo-python-0.0.26
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/click-7.0.0[python_targets_python3_7(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/solokeys/solo-python/archive/0.0.26.tar.gz -> solo-python-0.0.26.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e7768804dab739efc15760f449a557e8
diff --git a/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.2 b/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.2
index 6f606ddc0a0a..e03d429fcb8b 100644
--- a/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.2
+++ b/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jirutka/ssh-ldap-pubkey/archive/v1.3.2.tar.gz -> ssh-ldap-pubkey-1.3.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bfa933a59b6ed029365ed354e6c33fbe
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 23308a13a312..8ebc9941684d 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/gparted-1.1.0 b/metadata/md5-cache/sys-block/gparted-1.1.0
index 8b2d0d591ff4..992a6404dbfb 100644
--- a/metadata/md5-cache/sys-block/gparted-1.1.0
+++ b/metadata/md5-cache/sys-block/gparted-1.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Gnome Partition Editor
 EAPI=6
 HOMEPAGE=https://gparted.org/
 IUSE=btrfs cryptsetup dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 udf wayland xfs test
-KEYWORDS=amd64 ~arm ppc ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=GPL-2+ FDL-1.2+
 RDEPEND=!policykit? ( kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) ) policykit? ( >=sys-auth/polkit-0.102 ) >=dev-cpp/glibmm-2.56.1:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.58.3-r1:2 >=sys-block/parted-3.2:= >=dev-libs/libsigc++-2.10.1:2 >=sys-apps/util-linux-2.33.2 >=sys-fs/e2fsprogs-1.44.5 btrfs? ( sys-fs/btrfs-progs ) cryptsetup? ( sys-fs/cryptsetup ) dmraid? ( >=sys-fs/lvm2-2.02.116 sys-fs/dmraid sys-fs/multipath-tools ) f2fs? ( sys-fs/f2fs-tools ) fat? ( sys-fs/dosfstools sys-fs/mtools ) hfs? ( sys-fs/diskdev_cmds virtual/udev sys-fs/hfsutils ) jfs? ( sys-fs/jfsutils ) mdadm? ( sys-fs/mdadm ) ntfs? ( >=sys-fs/ntfs3g-2016.2.22-r2[ntfsprogs] ) reiserfs? ( sys-fs/reiserfsprogs ) reiser4? ( sys-fs/reiser4progs ) udf? ( sys-fs/udftools ) wayland? ( x11-apps/xhost ) xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/gparted/gparted-1.1.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1e00d2834cc3623c81ddece4db3d9346
+_md5_=bb0c35c05f8543ee2eb06e235b53acb8
diff --git a/metadata/md5-cache/sys-block/seekwatcher-0.13 b/metadata/md5-cache/sys-block/seekwatcher-0.13
index c9dc4ed638d7..2f61f96f28f6 100644
--- a/metadata/md5-cache/sys-block/seekwatcher-0.13
+++ b/metadata/md5-cache/sys-block/seekwatcher-0.13
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_6? ( dev-python/matplotlib[python_targets_p
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/trofi/seekwatcher/archive/v0.13.tar.gz -> seekwatcher-0.13.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=840414b689d53b3c4403e539f260ab24
diff --git a/metadata/md5-cache/sys-block/targetcli-fb-2.1.53 b/metadata/md5-cache/sys-block/targetcli-fb-2.1.53
index 7fe111261a98..2e2451acea33 100644
--- a/metadata/md5-cache/sys-block/targetcli-fb-2.1.53
+++ b/metadata/md5-cache/sys-block/targetcli-fb-2.1.53
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configshell-fb[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/targetcli-fb/archive/v2.1.53.tar.gz -> targetcli-fb-2.1.53.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f1597eed702683a4901675768206f36f
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 720e00187cb5..2ecb329172aa 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/syslinux-6.04_pre1-r2 b/metadata/md5-cache/sys-boot/syslinux-6.04_pre1-r2
index 10d95f0b53b6..218dc372013d 100644
--- a/metadata/md5-cache/sys-boot/syslinux-6.04_pre1-r2
+++ b/metadata/md5-cache/sys-boot/syslinux-6.04_pre1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders
 EAPI=7
 HOMEPAGE=https://www.syslinux.org/
 IUSE=custom-cflags
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* ~amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/boot/syslinux/Testing/6.04/syslinux-6.04-pre1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=537f1940eac044803598fa78f13fbd3e
+_md5_=354ddd6856f705c7c6fd213557701cec
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 424f3d222cb5..d28d3bca26c7 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/ceph-14.2.11-r1 b/metadata/md5-cache/sys-cluster/ceph-14.2.11-r1
index 725bb2fb08d6..774a6984c450 100644
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.11-r1
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.11-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.11.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=704b1eec69338717966a65434770e86b
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.13 b/metadata/md5-cache/sys-cluster/ceph-14.2.13
index 963cea3419c4..2408879ae243 100644
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.13
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.13
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.13.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=955c3e1d0355e527c29247d58b2c8ee0
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.15 b/metadata/md5-cache/sys-cluster/ceph-14.2.15
index e0cb16203f75..3ec7fb0dd8d9 100644
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.15
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.15
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.15.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cbbe3250189a9978cf17efe57452c082
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.7 b/metadata/md5-cache/sys-cluster/ceph-15.2.7
index 7b67c2115674..1d9e562a6b9f 100644
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.7
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.7.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4bd03df8337640fe753b04973c0e279
diff --git a/metadata/md5-cache/sys-cluster/cinder-16.2.0 b/metadata/md5-cache/sys-cluster/cinder-16.2.0
index 1cf182579ec7..18f83bcd7599 100644
--- a/metadata/md5-cache/sys-cluster/cinder-16.2.0
+++ b/metadata/md5-cache/sys-cluster/cinder-16.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) ||
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ussuri/cinder.conf.sample -> cinder.conf.sample-16.2.0 https://tarballs.openstack.org/cinder/cinder-16.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bd32297bb5f33c8689a1e28ff18000cb
diff --git a/metadata/md5-cache/sys-cluster/cinder-17.0.0 b/metadata/md5-cache/sys-cluster/cinder-17.0.0
index 47b394b1c023..555b0f507c73 100644
--- a/metadata/md5-cache/sys-cluster/cinder-17.0.0
+++ b/metadata/md5-cache/sys-cluster/cinder-17.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) ||
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/victoria/cinder.conf.sample -> cinder.conf.sample-17.0.0 https://tarballs.openstack.org/cinder/cinder-17.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d6538078aca568125e9db40730e099f4
diff --git a/metadata/md5-cache/sys-cluster/cinder-2020.1.9999 b/metadata/md5-cache/sys-cluster/cinder-2020.1.9999
index 109ad55844a8..80136cc6dd3c 100644
--- a/metadata/md5-cache/sys-cluster/cinder-2020.1.9999
+++ b/metadata/md5-cache/sys-cluster/cinder-2020.1.9999
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) ||
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ussuri/cinder.conf.sample -> cinder.conf.sample-2020.1.9999
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ce485c312d1457c4eba59df25efaaa7e
diff --git a/metadata/md5-cache/sys-cluster/cinder-2020.2.9999 b/metadata/md5-cache/sys-cluster/cinder-2020.2.9999
index 938d00892ed6..391a1b2d6718 100644
--- a/metadata/md5-cache/sys-cluster/cinder-2020.2.9999
+++ b/metadata/md5-cache/sys-cluster/cinder-2020.2.9999
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) ||
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/victoria/cinder.conf.sample -> cinder.conf.sample-2020.2.9999
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d6538078aca568125e9db40730e099f4
diff --git a/metadata/md5-cache/sys-cluster/corosync-2.3.5 b/metadata/md5-cache/sys-cluster/corosync-2.3.5
index 18dd6e68abe6..c16432474642 100644
--- a/metadata/md5-cache/sys-cluster/corosync-2.3.5
+++ b/metadata/md5-cache/sys-cluster/corosync-2.3.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=!sys-cluster/heartbeat infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) dev-libs/nss >=sys-cluster/libqb-0.14.4 virtual/pkgconfig doc? ( sys-apps/groff ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!sys-cluster/heartbeat infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) dev-libs/nss <=sys-cluster/libqb-0.17.2 virtual/pkgconfig doc? ( sys-apps/groff ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=OSI Certified implementation of a complete cluster engine
 EAPI=6
 HOMEPAGE=http://www.corosync.org/
 IUSE=doc infiniband static-libs systemd xml
 KEYWORDS=amd64 ~hppa ppc ppc64 x86
 LICENSE=BSD-2 public-domain
-RDEPEND=!sys-cluster/heartbeat infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) dev-libs/nss >=sys-cluster/libqb-0.14.4
+RDEPEND=!sys-cluster/heartbeat infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) dev-libs/nss <=sys-cluster/libqb-0.17.2
 SLOT=0
 SRC_URI=http://build.clusterlabs.org/corosync/releases/corosync-2.3.5.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2ccd0f8a96eb7750ba9875cc1ce5c62b
+_md5_=41069a97b4ddb9603b2c63c7918a1115
diff --git a/metadata/md5-cache/sys-cluster/ganglia-3.7.1-r1 b/metadata/md5-cache/sys-cluster/ganglia-3.7.1-r1
index c40af88a122b..67d671c979f4 100644
--- a/metadata/md5-cache/sys-cluster/ganglia-3.7.1-r1
+++ b/metadata/md5-cache/sys-cluster/ganglia-3.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/confuse dev-libs/expat >=dev-libs/apr-1.0 net-libs/libnsl:0= !d
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/ganglia/ganglia-3.7.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cde1b8ed850db3a95c17820396536211
diff --git a/metadata/md5-cache/sys-cluster/heat-14.1.0 b/metadata/md5-cache/sys-cluster/heat-14.1.0
index e0076410ade0..750d22d4a2b5 100644
--- a/metadata/md5-cache/sys-cluster/heat-14.1.0
+++ b/metadata/md5-cache/sys-cluster/heat-14.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ussuri -> heat.conf.sample-14.1.0 https://tarballs.openstack.org/heat/openstack-heat-14.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=039698b749e8ae8eb9b10b65c83fb73a
diff --git a/metadata/md5-cache/sys-cluster/heat-15.0.0 b/metadata/md5-cache/sys-cluster/heat-15.0.0
index b2fbda5da19e..1c190695629f 100644
--- a/metadata/md5-cache/sys-cluster/heat-15.0.0
+++ b/metadata/md5-cache/sys-cluster/heat-15.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-5.4.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.victoria -> heat.conf.sample-15.0.0 https://tarballs.openstack.org/heat/openstack-heat-15.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d986d1896dcd1a2601d0cd4b839a5ac8
diff --git a/metadata/md5-cache/sys-cluster/heat-2020.1.9999 b/metadata/md5-cache/sys-cluster/heat-2020.1.9999
index e6945128e71a..a005762ccea6 100644
--- a/metadata/md5-cache/sys-cluster/heat-2020.1.9999
+++ b/metadata/md5-cache/sys-cluster/heat-2020.1.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ussuri -> heat.conf.sample-2020.1.9999
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e86b55d7c22ec858bb0794fff2a75378
diff --git a/metadata/md5-cache/sys-cluster/heat-2020.2.9999 b/metadata/md5-cache/sys-cluster/heat-2020.2.9999
index 38f9307034cb..7ea6ebbad7b2 100644
--- a/metadata/md5-cache/sys-cluster/heat-2020.2.9999
+++ b/metadata/md5-cache/sys-cluster/heat-2020.2.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-5.4.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.victoria -> heat.conf.sample-2020.2.9999
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d986d1896dcd1a2601d0cd4b839a5ac8
diff --git a/metadata/md5-cache/sys-cluster/neutron-16.2.0 b/metadata/md5-cache/sys-cluster/neutron-16.2.0
index 83624d9be074..b6f4845a9af9 100644
--- a/metadata/md5-cache/sys-cluster/neutron-16.2.0
+++ b/metadata/md5-cache/sys-cluster/neutron-16.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-16.2.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-16.2.0.tar.gz https://tarballs.openstack.org/neutron/neutron-16.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0e458f24a5aebd20ea1032e06b457241
diff --git a/metadata/md5-cache/sys-cluster/neutron-17.0.0 b/metadata/md5-cache/sys-cluster/neutron-17.0.0
index 233ea2872b94..5b7987084590 100644
--- a/metadata/md5-cache/sys-cluster/neutron-17.0.0
+++ b/metadata/md5-cache/sys-cluster/neutron-17.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/configs.tar.gz -> neutron-configs-17.0.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/ml2_plugins.tar.gz -> neutron-ml2-plugins-17.0.0.tar.gz https://tarballs.openstack.org/neutron/neutron-17.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7cb6f23467793b6f029406b16a5834c6
diff --git a/metadata/md5-cache/sys-cluster/neutron-2020.1.9999 b/metadata/md5-cache/sys-cluster/neutron-2020.1.9999
index 71fe3e1ad41d..abc4728d6f94 100644
--- a/metadata/md5-cache/sys-cluster/neutron-2020.1.9999
+++ b/metadata/md5-cache/sys-cluster/neutron-2020.1.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-2020.1.9999.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-2020.1.9999.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6e1e3a0066e1550303ae49186398417a
diff --git a/metadata/md5-cache/sys-cluster/neutron-2020.2.9999 b/metadata/md5-cache/sys-cluster/neutron-2020.2.9999
index e94ecb3f8d70..504615cef02c 100644
--- a/metadata/md5-cache/sys-cluster/neutron-2020.2.9999
+++ b/metadata/md5-cache/sys-cluster/neutron-2020.2.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/configs.tar.gz -> neutron-configs-2020.2.9999.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/victoria/ml2_plugins.tar.gz -> neutron-ml2-plugins-2020.2.9999.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7cb6f23467793b6f029406b16a5834c6
diff --git a/metadata/md5-cache/sys-cluster/nova-2020.1.9999 b/metadata/md5-cache/sys-cluster/nova-2020.1.9999
index 503cd290739c..5ac06cce79ed 100644
--- a/metadata/md5-cache/sys-cluster/nova-2020.1.9999
+++ b/metadata/md5-cache/sys-cluster/nova-2020.1.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-2020.1.9999
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=433f68e6860a9344128d77d365e0fe64
diff --git a/metadata/md5-cache/sys-cluster/nova-2020.2.9999 b/metadata/md5-cache/sys-cluster/nova-2020.2.9999
index 28bea683e125..ad7214b55671 100644
--- a/metadata/md5-cache/sys-cluster/nova-2020.2.9999
+++ b/metadata/md5-cache/sys-cluster/nova-2020.2.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-2020.2.9999
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1242a5542560c8ccad366d9df084c64f
diff --git a/metadata/md5-cache/sys-cluster/nova-21.1.0 b/metadata/md5-cache/sys-cluster/nova-21.1.0
index 6c91cf03c070..1a0e34dc713d 100644
--- a/metadata/md5-cache/sys-cluster/nova-21.1.0
+++ b/metadata/md5-cache/sys-cluster/nova-21.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-21.1.0 https://tarballs.openstack.org/nova/nova-21.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=67f1cba29e4c99413928f13993e85043
diff --git a/metadata/md5-cache/sys-cluster/nova-21.1.1 b/metadata/md5-cache/sys-cluster/nova-21.1.1
index 716d0c6eff40..4ffdb31f057e 100644
--- a/metadata/md5-cache/sys-cluster/nova-21.1.1
+++ b/metadata/md5-cache/sys-cluster/nova-21.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_targe
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-21.1.1 https://tarballs.openstack.org/nova/nova-21.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f4637996f3f44e87feb4d2cd54314858
diff --git a/metadata/md5-cache/sys-cluster/nova-22.0.0 b/metadata/md5-cache/sys-cluster/nova-22.0.0
index 9edb46c65134..ac74faa70f8f 100644
--- a/metadata/md5-cache/sys-cluster/nova-22.0.0
+++ b/metadata/md5-cache/sys-cluster/nova-22.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-22.0.0 https://tarballs.openstack.org/nova/nova-22.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1242a5542560c8ccad366d9df084c64f
diff --git a/metadata/md5-cache/sys-cluster/nova-22.0.1 b/metadata/md5-cache/sys-cluster/nova-22.0.1
index 6350109e6985..c07fff069551 100644
--- a/metadata/md5-cache/sys-cluster/nova-22.0.1
+++ b/metadata/md5-cache/sys-cluster/nova-22.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-22.0.1 https://tarballs.openstack.org/nova/nova-22.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1242a5542560c8ccad366d9df084c64f
diff --git a/metadata/md5-cache/sys-cluster/placement-2020.1.9999 b/metadata/md5-cache/sys-cluster/placement-2020.1.9999
index 8a13fbf4c1f1..61dd48c4d54e 100644
--- a/metadata/md5-cache/sys-cluster/placement-2020.1.9999
+++ b/metadata/md5-cache/sys-cluster/placement-2020.1.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/setuptools-21.0.0[python_targets_python3_7(-)?,-python_sing
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/placement/ussuri/placement.conf.sample -> placement.conf.sample-2020.1.9999
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1359dc9582fe6fcb66797768472c7852
diff --git a/metadata/md5-cache/sys-cluster/placement-2020.2.9999 b/metadata/md5-cache/sys-cluster/placement-2020.2.9999
index 0c2572b79ea0..d34730f56d6a 100644
--- a/metadata/md5-cache/sys-cluster/placement-2020.2.9999
+++ b/metadata/md5-cache/sys-cluster/placement-2020.2.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-5.0.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/placement/victoria/placement.conf.sample -> placement.conf.sample-2020.2.9999
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b19df2ae03582ba4f805bd3dc9db8696
diff --git a/metadata/md5-cache/sys-cluster/placement-3.0.0 b/metadata/md5-cache/sys-cluster/placement-3.0.0
index d65d69c35da7..05283b1ebded 100644
--- a/metadata/md5-cache/sys-cluster/placement-3.0.0
+++ b/metadata/md5-cache/sys-cluster/placement-3.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/setuptools-21.0.0[python_targets_python3_7(-)?,-python_sing
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/placement/ussuri/placement.conf.sample -> placement.conf.sample-3.0.0 https://tarballs.openstack.org/placement/openstack-placement-3.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b5a06fed0e559eca1afec938fc23bc1c
diff --git a/metadata/md5-cache/sys-cluster/placement-4.0.0 b/metadata/md5-cache/sys-cluster/placement-4.0.0
index e7b22bc3c69b..a6967215e93f 100644
--- a/metadata/md5-cache/sys-cluster/placement-4.0.0
+++ b/metadata/md5-cache/sys-cluster/placement-4.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=A HTTP service for managing, selecting, and claiming cloud resources
 EAPI=7
 HOMEPAGE=https://github.com/openstack/placement
 IUSE=mysql postgres sqlite python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-5.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sqlite? ( >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-python/keystonemiddleware-4.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/webob-1.8.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-config-6.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-3.37.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-db-4.40.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-policy-1.35.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-upgradecheck-0.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-resource-classes-0.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-traits-2.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/microversion-parse-0.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] acct-user/placement acct-group/placement python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/placement/victoria/placement.conf.sample -> placement.conf.sample-4.0.0 https://tarballs.openstack.org/placement/openstack-placement-4.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b19df2ae03582ba4f805bd3dc9db8696
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=77d90eda8da554bf8d8068a57b96349c
diff --git a/metadata/md5-cache/sys-cluster/sanlock-3.8.2 b/metadata/md5-cache/sys-cluster/sanlock-3.8.2
index eb36d3964b6c..142d0617fdf5 100644
--- a/metadata/md5-cache/sys-cluster/sanlock-3.8.2
+++ b/metadata/md5-cache/sys-cluster/sanlock-3.8.2
@@ -4,11 +4,11 @@ DESCRIPTION=shared storage lock manager
 EAPI=6
 HOMEPAGE=https://pagure.io/sanlock
 IUSE=python kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=LGPL-2+ GPL-2 GPL-2+
 RDEPEND=acct-user/sanlock acct-group/sanlock dev-libs/libaio sys-apps/util-linux python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://releases.pagure.org/sanlock/sanlock-3.8.2.tar.gz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8292d24a66ca7e2afb759918b4a9fb33
+_md5_=049dc996feb01a23d4aba17ea7f29227
diff --git a/metadata/md5-cache/sys-cluster/slurm-20.02.4.1 b/metadata/md5-cache/sys-cluster/slurm-20.02.4.1
deleted file mode 100644
index 7071a104b2db..000000000000
--- a/metadata/md5-cache/sys-cluster/slurm-20.02.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) ) ) munge? ( sys-auth/munge ) pam? ( sys-libs/pam ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) ucx? ( sys-cluster/ucx ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= sys-libs/readline:0= html? ( sys-apps/man2html ) dev-lang/perl
-DESCRIPTION=A Highly Scalable Resource Manager
-EAPI=7
-HOMEPAGE=https://www.schedmd.com https://github.com/SchedMD/slurm
-IUSE=debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) ) ) munge? ( sys-auth/munge ) pam? ( sys-libs/pam ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) ucx? ( sys-cluster/ucx ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= sys-libs/readline:0= acct-user/slurm acct-group/slurm dev-libs/libcgroup dev-lang/perl:=
-REQUIRED_USE=torque? ( perl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/SchedMD/slurm/archive/slurm-20-02-4-1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	226d8d2ff588bdfd7d188512dbdb189d	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ad4d52f59b74f8eec0504357b29f61b6
diff --git a/metadata/md5-cache/sys-cluster/slurm-20.02.5.1 b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1
similarity index 96%
rename from metadata/md5-cache/sys-cluster/slurm-20.02.5.1
rename to metadata/md5-cache/sys-cluster/slurm-20.11.0.1
index 787236dd0123..c7572f2b1732 100644
--- a/metadata/md5-cache/sys-cluster/slurm-20.02.5.1
+++ b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1
@@ -11,6 +11,6 @@ RDEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-clu
 REQUIRED_USE=torque? ( perl )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/SchedMD/slurm/archive/slurm-20-02-5-1.tar.gz
+SRC_URI=https://github.com/SchedMD/slurm/archive/slurm-20-11-0-1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	226d8d2ff588bdfd7d188512dbdb189d	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ad4d52f59b74f8eec0504357b29f61b6
+_md5_=63978079cb198adfafcddd0747b738c3
diff --git a/metadata/md5-cache/sys-cluster/swift-2.25.1 b/metadata/md5-cache/sys-cluster/swift-2.25.1
index f884cda7c7f5..a3f584748c4d 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.25.1
+++ b/metadata/md5-cache/sys-cluster/swift-2.25.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/swift/swift-2.25.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dc7f75ae4c7632f1108629793bc29c5a
diff --git a/metadata/md5-cache/sys-cluster/swift-2.26.0 b/metadata/md5-cache/sys-cluster/swift-2.26.0
index 6d7ce2fbc018..95a1eeaec03c 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.26.0
+++ b/metadata/md5-cache/sys-cluster/swift-2.26.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/swift/swift-2.26.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=03425bb59a852f708cb41db1417695f7
diff --git a/metadata/md5-cache/sys-cluster/swift-2020.1.9999 b/metadata/md5-cache/sys-cluster/swift-2020.1.9999
index bbfbe88588fa..2b1dfaac6c38 100644
--- a/metadata/md5-cache/sys-cluster/swift-2020.1.9999
+++ b/metadata/md5-cache/sys-cluster/swift-2020.1.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/eventlet-0.25.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netifaces-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/netifaces-0.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/netifaces-0.10.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyxattr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/PyECLib-1.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] acct-user/swift acct-group/swift python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=333263978c7ff73e2850297ebc3556a6
diff --git a/metadata/md5-cache/sys-cluster/swift-2020.2.9999 b/metadata/md5-cache/sys-cluster/swift-2020.2.9999
index 77dfc3479c35..ce0d86aba173 100644
--- a/metadata/md5-cache/sys-cluster/swift-2020.2.9999
+++ b/metadata/md5-cache/sys-cluster/swift-2020.2.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/eventlet-0.25.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/greenlet-0.3.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netifaces-0.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/netifaces-0.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/netifaces-0.10.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyxattr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyECLib-1.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] acct-user/swift acct-group/swift python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5aefc18ccfd9c1dbbb99811925f781a0
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 7817646db20f..3f2cec584f13 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.70_beta3-r1 b/metadata/md5-cache/sys-devel/autoconf-2.70_beta4
similarity index 60%
rename from metadata/md5-cache/sys-devel/autoconf-2.70_beta3-r1
rename to metadata/md5-cache/sys-devel/autoconf-2.70_beta4
index 0fac355b543c..bb7f3f22cffd 100644
--- a/metadata/md5-cache/sys-devel/autoconf-2.70_beta3-r1
+++ b/metadata/md5-cache/sys-devel/autoconf-2.70_beta4
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
 IUSE=emacs
 LICENSE=GPL-3
 PDEPEND=emacs? ( app-emacs/autoconf-mode )
-RDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6 !~sys-devel/autoconf-2.70_beta3:2.5 ~sys-devel/autoconf-wrapper-14_pre2
+RDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6 !~sys-devel/autoconf-2.70_beta4:2.5 ~sys-devel/autoconf-wrapper-14_pre3
 SLOT=2.70
-SRC_URI=mirror://gnu/autoconf/autoconf-2.69d.tar.xz -> autoconf-2.70_beta3.tar.xz https://alpha.gnu.org/pub/gnu/autoconf/autoconf-2.69d.tar.xz -> autoconf-2.70_beta3.tar.xz
+SRC_URI=mirror://gnu/autoconf/autoconf-2.69e.tar.xz -> autoconf-2.70_beta4.tar.xz https://alpha.gnu.org/pub/gnu/autoconf/autoconf-2.69e.tar.xz -> autoconf-2.70_beta4.tar.xz
 _eclasses_=toolchain-autoconf	739c1e0219b6c6464c5ce3c13a2186d8
-_md5_=16eacf7f8b1b9c2dad8e2003d94e1129
+_md5_=b85d1440ab25bcc19c61e930adc41069
diff --git a/metadata/md5-cache/sys-devel/autoconf-wrapper-14_pre2 b/metadata/md5-cache/sys-devel/autoconf-wrapper-14_pre3
similarity index 100%
rename from metadata/md5-cache/sys-devel/autoconf-wrapper-14_pre2
rename to metadata/md5-cache/sys-devel/autoconf-wrapper-14_pre3
diff --git a/metadata/md5-cache/sys-devel/bison-3.7.3 b/metadata/md5-cache/sys-devel/bison-3.7.3
index 40e609eada79..250aa94e3d0c 100644
--- a/metadata/md5-cache/sys-devel/bison-3.7.3
+++ b/metadata/md5-cache/sys-devel/bison-3.7.3
@@ -5,11 +5,11 @@ DESCRIPTION=A general-purpose (yacc-compatible) parser generator
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/bison/
 IUSE=examples nls static test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-devel/m4-1.4.16 >=sys-devel/gettext-0.21
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-3.7.3.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.7.3-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/bison/bison-3.7.3-patches-01.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e620463757ccbd8d418512e4636c77b1
+_md5_=a71d92522e9e8b32829ea607df1e7630
diff --git a/metadata/md5-cache/sys-devel/prelink-20151030-r1 b/metadata/md5-cache/sys-devel/prelink-20151030-r1
index 14eabef0dbb4..920670de1fe3 100644
--- a/metadata/md5-cache/sys-devel/prelink-20151030-r1
+++ b/metadata/md5-cache/sys-devel/prelink-20151030-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Modifies ELFs to avoid runtime symbol resolutions resulting in faste
 EAPI=7
 HOMEPAGE=https://git.yoctoproject.org/cgit/cgit.cgi/prelink-cross/ https://people.redhat.com/jakub/prelink
 IUSE=doc selinux
-KEYWORDS=amd64 ~arm ppc ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.100 selinux? ( sys-libs/libselinux ) !dev-libs/libelf
 RESTRICT=test
 SLOT=0
 SRC_URI=https://git.yoctoproject.org/cgit/cgit.cgi/prelink-cross/snapshot/prelink-cross-20151030.tar.bz2 doc? ( https://people.redhat.com/jakub/prelink/prelink.pdf )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=69a1a51349d6e4ad7a949826c3817046
+_md5_=7ec107f9f39b720ee660a7e2b7dce016
diff --git a/metadata/md5-cache/sys-devel/slibtool-0.5.31 b/metadata/md5-cache/sys-devel/slibtool-0.5.31
new file mode 100644
index 000000000000..8067fce3c0f7
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/slibtool-0.5.31
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure
+DESCRIPTION=A skinny libtool implementation, written in C
+EAPI=7
+HOMEPAGE=https://git.midipix.org/cgit.cgi/slibtool
+KEYWORDS=~amd64 ~arm
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://git.midipix.org/cgit.cgi/slibtool/snapshot/slibtool-0.5.31.tar.xz
+_md5_=53894ae7da4ec4316b043651eafc42ae
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 964e6c332516..e9cad76f0dd5 100644
Binary files a/metadata/md5-cache/sys-firmware/Manifest.gz and b/metadata/md5-cache/sys-firmware/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-firmware/bluez-firmware-1.2 b/metadata/md5-cache/sys-firmware/bluez-firmware-1.2
index adb04b1691e0..d9d33b7b22da 100644
--- a/metadata/md5-cache/sys-firmware/bluez-firmware-1.2
+++ b/metadata/md5-cache/sys-firmware/bluez-firmware-1.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure
 DESCRIPTION=Firmware for Broadcom BCM203x and STLC2300 Bluetooth chips
 EAPI=5
 HOMEPAGE=http://bluez.sourceforge.net/
-KEYWORDS=amd64 hppa ppc x86
+KEYWORDS=amd64 ~arm64 hppa ppc x86
 LICENSE=bluez-firmware
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://bluez.sourceforge.net/download/bluez-firmware-1.2.tar.gz
-_md5_=a03393a845b296c0487b67e211a2c2b8
+_md5_=1291360940b6a9a9ad8388af7322790e
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 35883ea2a1ab..2cbff8c28a0d 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5 b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
index f6236915d279..e0fbd43ba32d 100644
--- a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
+++ b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
@@ -5,10 +5,10 @@ DESCRIPTION=Device-mapper RAID tool and library
 EAPI=7
 HOMEPAGE=https://people.redhat.com/~heinzm/sw/dmraid/
 IUSE=intel_led led mini static kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-fs/lvm2-2.02.45
 SLOT=0
 SRC_URI=https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c92793e190b26fd295b6fd8507835289
+_md5_=cb33720d1791fe5be2344a527c6cee61
diff --git a/metadata/md5-cache/sys-fs/jfsutils-1.1.15-r1 b/metadata/md5-cache/sys-fs/jfsutils-1.1.15-r1
index c7c330a46343..e11eb4c5402e 100644
--- a/metadata/md5-cache/sys-fs/jfsutils-1.1.15-r1
+++ b/metadata/md5-cache/sys-fs/jfsutils-1.1.15-r1
@@ -5,10 +5,10 @@ DESCRIPTION=IBM's Journaling Filesystem (JFS) Utilities
 EAPI=7
 HOMEPAGE=http://jfs.sourceforge.net/
 IUSE=static
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=!static? ( sys-apps/util-linux:= )
 SLOT=0
 SRC_URI=http://jfs.sourceforge.net/project/pub/jfsutils-1.1.15.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c8fcef428d6fc30931bb8e51193b8d96
+_md5_=e62e2932f923747a7b276ca5a3c33e08
diff --git a/metadata/md5-cache/sys-fs/mtd-utils-2.1.2 b/metadata/md5-cache/sys-fs/mtd-utils-2.1.2
index 8e089daed2ee..d150a83ca4bd 100644
--- a/metadata/md5-cache/sys-fs/mtd-utils-2.1.2
+++ b/metadata/md5-cache/sys-fs/mtd-utils-2.1.2
@@ -5,9 +5,9 @@ DESCRIPTION=MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)
 EAPI=7
 HOMEPAGE=http://git.infradead.org/?p=mtd-utils.git;a=summary
 IUSE=+lzo xattr +zstd
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!sys-fs/mtd >=sys-apps/util-linux-2.16 sys-libs/zlib lzo? ( dev-libs/lzo ) xattr? ( sys-apps/acl ) zstd? ( app-arch/zstd )
 SLOT=0
 SRC_URI=https://github.com/sigma-star/mtd-utils/archive/v2.1.2.tar.gz -> mtd-utils-2.1.2.tar.gz
-_md5_=2ff45513c0d227d11672c08da9a8cb2e
+_md5_=db8802cd5156765cffe93556a5692a8b
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.26 b/metadata/md5-cache/sys-fs/mtools-4.0.26
index 1560eee7fcce..683d9858a235 100644
--- a/metadata/md5-cache/sys-fs/mtools-4.0.26
+++ b/metadata/md5-cache/sys-fs/mtools-4.0.26
@@ -4,10 +4,10 @@ DESCRIPTION=utilities to access MS-DOS disks from Unix without mounting them
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools
 IUSE=X elibc_glibc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris
 LICENSE=GPL-3
 RDEPEND=!elibc_glibc? ( virtual/libiconv ) X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
 SLOT=0
 SRC_URI=mirror://gnu/mtools/mtools-4.0.26.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3f0001720afe721b74c7156c8376957a
+_md5_=e2d78c3984edc970ea06b298c871957d
diff --git a/metadata/md5-cache/sys-fs/reiser4progs-2.0.3 b/metadata/md5-cache/sys-fs/reiser4progs-2.0.3
index 80735a87292e..6e63337376ae 100644
--- a/metadata/md5-cache/sys-fs/reiser4progs-2.0.3
+++ b/metadata/md5-cache/sys-fs/reiser4progs-2.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=reiser4progs: mkfs, fsck, etc...
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/reiser4/
 IUSE=debug readline static static-libs split-usr
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 -sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!static? ( >=sys-libs/libaal-1.0.7:= readline? ( sys-libs/readline:0= ) ) static-libs? ( >=sys-libs/libaal-1.0.7:=[static-libs(+)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/reiser4/reiser4progs-2.0.3.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=f93d6075c3cbe44134963c4b7dbf68b8
+_md5_=9cf66b69df4edcee4fb5a2afb2032737
diff --git a/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27 b/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27
index 2e48ed109cfc..b98ae4a02062 100644
--- a/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27
+++ b/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27
@@ -4,9 +4,9 @@ DESCRIPTION=Reiserfs Utilities
 EAPI=6
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/fs/reiserfs/
 IUSE=static-libs split-usr
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/fs/reiserfs/reiserfsprogs-3.6.27.tar.xz https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v3.6.27/reiserfsprogs-3.6.27.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6bfec9050aa20b086bc60033730440e1
+_md5_=b879e8a0a810646eaf8978f71b70d397
diff --git a/metadata/md5-cache/sys-fs/udftools-2.2 b/metadata/md5-cache/sys-fs/udftools-2.2
index c668c3e5b3bd..e5886fc6998a 100644
--- a/metadata/md5-cache/sys-fs/udftools-2.2
+++ b/metadata/md5-cache/sys-fs/udftools-2.2
@@ -4,10 +4,10 @@ DEPEND=sys-libs/readline:0=
 DESCRIPTION=Ben Fennema's tools for packet writing and the UDF filesystem
 EAPI=7
 HOMEPAGE=https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/pali/udftools/releases/download/2.2/udftools-2.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=54d6387a80d055d403b55710534a7f69
+_md5_=e58df58c1e19ae976e9c5d8ef2ac1c1d
diff --git a/metadata/md5-cache/sys-fs/udiskie-2.1.0 b/metadata/md5-cache/sys-fs/udiskie-2.1.0
index 574a89f9fe8f..0831d64fae2d 100644
--- a/metadata/md5-cache/sys-fs/udiskie-2.1.0
+++ b/metadata/md5-cache/sys-fs/udiskie-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/u/udiskie/udiskie-2.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a21c3241b457115e189bffdbdb82e840
diff --git a/metadata/md5-cache/sys-fs/udiskie-2.1.1 b/metadata/md5-cache/sys-fs/udiskie-2.1.1
index fab7286c8044..4810dee4c943 100644
--- a/metadata/md5-cache/sys-fs/udiskie-2.1.1
+++ b/metadata/md5-cache/sys-fs/udiskie-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/u/udiskie/udiskie-2.1.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5bd390b209358c2b3e4a26318e02e2c1
diff --git a/metadata/md5-cache/sys-fs/udiskie-2.2.0 b/metadata/md5-cache/sys-fs/udiskie-2.2.0
index 792a6601d169..f55cd4e9ee41 100644
--- a/metadata/md5-cache/sys-fs/udiskie-2.2.0
+++ b/metadata/md5-cache/sys-fs/udiskie-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docopt[python_targets_python3_7(-)?,python_targets_python3_8(
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/u/udiskie/udiskie-2.2.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6b42f18831894bd230d1e63076711dd0
diff --git a/metadata/md5-cache/sys-fs/zerofree-1.1.1 b/metadata/md5-cache/sys-fs/zerofree-1.1.1
index cb7730509bae..29805483161f 100644
--- a/metadata/md5-cache/sys-fs/zerofree-1.1.1
+++ b/metadata/md5-cache/sys-fs/zerofree-1.1.1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/e2fsprogs-libs
 DESCRIPTION=Zeroes out all free space on a filesystem
 EAPI=7
 HOMEPAGE=http://frippery.org/uml/index.html
-KEYWORDS=~amd64 ~arm ~mips ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/e2fsprogs-libs
 SLOT=0
 SRC_URI=http://frippery.org/uml/zerofree-1.1.1.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=360df49a08210f2ed5d9f480d6b50266
+_md5_=4c76c2bb902f555f6dddafe2f0dc01c4
diff --git a/metadata/md5-cache/sys-fs/zfs-0.8.5 b/metadata/md5-cache/sys-fs/zfs-0.8.5
index c355d48d4ef0..cab147cdfa1a 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.8.5
+++ b/metadata/md5-cache/sys-fs/zfs-0.8.5
@@ -12,5 +12,5 @@ REQUIRED_USE=!minimal? ( || ( python_targets_python3_6 python_targets_python3_7
 RESTRICT=test
 SLOT=0/2
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-0.8.5/zfs-0.8.5.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1bbe87cbc7a6a242851fca8f2e998ccd
diff --git a/metadata/md5-cache/sys-fs/zfs-2.0.0_rc7 b/metadata/md5-cache/sys-fs/zfs-2.0.0
similarity index 89%
rename from metadata/md5-cache/sys-fs/zfs-2.0.0_rc7
rename to metadata/md5-cache/sys-fs/zfs-2.0.0
index ddf5b5244854..79cfb34269aa 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.0.0_rc7
+++ b/metadata/md5-cache/sys-fs/zfs-2.0.0
@@ -7,10 +7,10 @@ HOMEPAGE=https://github.com/openzfs/zfs
 IUSE=custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr
 KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=BSD-2 CDDL MIT
-RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.0.0_rc7 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
+RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.0.0 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
 REQUIRED_USE=!minimal? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ) python? ( !minimal ) test-suite? ( !minimal )
 RESTRICT=test
 SLOT=0/4
-SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.0-rc7/zfs-2.0.0-rc7.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	226d8d2ff588bdfd7d188512dbdb189d	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
+SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.0/zfs-2.0.0.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	226d8d2ff588bdfd7d188512dbdb189d	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a39abc42d5801ff9a86d3032061943a8
diff --git a/metadata/md5-cache/sys-fs/zfs-2.0.0_rc6 b/metadata/md5-cache/sys-fs/zfs-2.0.0_rc6
deleted file mode 100644
index 3af023251a0f..000000000000
--- a/metadata/md5-cache/sys-fs/zfs-2.0.0_rc6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=Userland utilities for ZFS Linux kernel module
-EAPI=7
-HOMEPAGE=https://github.com/openzfs/zfs
-IUSE=custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=BSD-2 CDDL MIT
-RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.0.0_rc6 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
-REQUIRED_USE=!minimal? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ) python? ( !minimal ) test-suite? ( !minimal )
-RESTRICT=test
-SLOT=0/4
-SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.0-rc6/zfs-2.0.0-rc6.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	226d8d2ff588bdfd7d188512dbdb189d	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9523a2898905a729b62973baae8d02dc
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index 71cb07dc85cb..c05eeafd3ab6 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -11,5 +11,5 @@ RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-li
 REQUIRED_USE=!minimal? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ) python? ( !minimal ) test-suite? ( !minimal )
 RESTRICT=test
 SLOT=0/4
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	226d8d2ff588bdfd7d188512dbdb189d	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	226d8d2ff588bdfd7d188512dbdb189d	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a39abc42d5801ff9a86d3032061943a8
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.0_rc7 b/metadata/md5-cache/sys-fs/zfs-kmod-2.0.0
similarity index 97%
rename from metadata/md5-cache/sys-fs/zfs-kmod-2.0.0_rc7
rename to metadata/md5-cache/sys-fs/zfs-kmod-2.0.0
index fb01605e5fdf..83b523c5dc91 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.0_rc7
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.0.0
@@ -10,6 +10,6 @@ LICENSE=CDDL MIT debug? ( GPL-2+ )
 RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] )
 RESTRICT=debug? ( strip ) test
 SLOT=0
-SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.0-rc7/zfs-2.0.0-rc7.tar.gz
+SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.0/zfs-2.0.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8e4b610dbf04fabfd99710b1490766a9
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.0_rc6 b/metadata/md5-cache/sys-fs/zfs-kmod-2.0.0_rc6
deleted file mode 100644
index 7d63c8acb59f..000000000000
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.0_rc6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/awk >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
-EAPI=7
-HOMEPAGE=https://github.com/openzfs/zfs
-IUSE=custom-cflags debug +rootfs kernel_linux kernel_linux
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=CDDL MIT debug? ( GPL-2+ )
-RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] )
-RESTRICT=debug? ( strip ) test
-SLOT=0
-SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.0-rc6/zfs-2.0.0-rc6.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8e4b610dbf04fabfd99710b1490766a9
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index d7983d33f606..6ea4047d3521 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.81 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.81
new file mode 100644
index 000000000000..040b072de1b9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.81
@@ -0,0 +1,14 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.4.81 !sys-kernel/vanilla-kernel-bin:5.4.81 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.81
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-83.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-83.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.77-r1.tar.gz -> gentoo-kernel-config-5.4.77-r1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=96d050f286a796b5e6ef65d7632e4e02
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.12 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.12
new file mode 100644
index 000000000000..8ec693beb203
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.12
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.9.12 !sys-kernel/vanilla-kernel-bin:5.9.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.9.12
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-12.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-12.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.9.8-r1.tar.gz -> gentoo-kernel-config-5.9.8-r1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.2 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.2 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.2 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.2 )
+_eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3bb6b661289c30af426aafc1ca21e58c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.81 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.81
new file mode 100644
index 000000000000..798151af6f91
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.81
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.81 !sys-kernel/vanilla-kernel:5.4.81 !sys-kernel/vanilla-kernel-bin:5.4.81 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.81
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.81-1.xpak -> gentoo-kernel-5.4.81-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.81-1.xpak -> gentoo-kernel-5.4.81-1.x86.xpak )
+_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a20bdd6958940f81fa50e2ccd2ec6d97
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.12 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.12
new file mode 100644
index 000000000000..be7303bfbd9a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.12
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/gentoo-kernel:5.9.12 !sys-kernel/vanilla-kernel:5.9.12 !sys-kernel/vanilla-kernel-bin:5.9.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.9.12
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.12-1.xpak -> gentoo-kernel-5.9.12-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.12-1.xpak -> gentoo-kernel-5.9.12-1.x86.xpak )
+_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.210 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.210
new file mode 100644
index 000000000000..4a7042ba8791
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.210
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.14.210
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-220.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-220.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-220.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-220.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-220.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-220.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-220.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-220.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-220.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4070e21870455d830ab40044dde94ad6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.161 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.161
new file mode 100644
index 000000000000..3a2454d3505e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.161
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.161
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-160.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-160.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-160.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-160.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-160.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-160.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-160.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-160.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-160.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5a1f5a36fb14391349b66e9608cd1310
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.247 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.247
new file mode 100644
index 000000000000..9b8d185e6013
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.247
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.4.247
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-249.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-249.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-249.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-249.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-249.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-249.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-249.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-249.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-249.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0a0cfc7227e1db8235bb4154513907c5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.247 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.247
new file mode 100644
index 000000000000..cb67508a9dc8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.247
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.9.247
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-251.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-251.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-251.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-251.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-251.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-251.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-251.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-251.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-251.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c91a899040da80c9fa75551f915d2190
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.81 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.81
new file mode 100644
index 000000000000..6f436da52481
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.81
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.81
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-83.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-83.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-83.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-83.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-83.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-83.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-83.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-83.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-83.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=743de7995214bfda8f3230637cadcdd1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.12 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.12
new file mode 100644
index 000000000000..91051f8c0b9b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.9.12
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-12.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-12.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-12.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-12.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-12.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-12.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-12.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-12.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-12.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e9adac4453c821e169f4d91019b86d25
diff --git a/metadata/md5-cache/sys-kernel/kergen-0.1.5 b/metadata/md5-cache/sys-kernel/kergen-0.1.5
index ed373cdd3d65..4abc66cdc66d 100644
--- a/metadata/md5-cache/sys-kernel/kergen-0.1.5
+++ b/metadata/md5-cache/sys-kernel/kergen-0.1.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/nichoski/kergen/archive/0.1.5.tar.gz -> kergen-0.1.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4ea7856288d8a0d3368a6978bc173a98
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.9_p6 b/metadata/md5-cache/sys-kernel/pf-sources-5.9_p6
new file mode 100644
index 000000000000..7904d44a24b3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.9_p6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=6
+HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.9_p6
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.9...v5.9-pf6.diff -> pf-sources-5.9_p6.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.9-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.9-1.extras.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=81b8cc000b97905db21c170c3891e759
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.81 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.81
new file mode 100644
index 000000000000..f9498f561328
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.81
@@ -0,0 +1,14 @@
+BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.81 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.81
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.81.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.77-r1.tar.gz -> gentoo-kernel-config-5.4.77-r1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.81.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_md5_=270127bc525d061891eea08f7b769945
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.12 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.12
new file mode 100644
index 000000000000..a6fd002affb4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.12
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.9.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.9.12
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.12.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.9.8-r1.tar.gz -> gentoo-kernel-config-5.9.8-r1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.12.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.2 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.2 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.2 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/94a4277f8827d1b2c911deabe56e7d929dc93146/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.2 )
+_eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_md5_=ab05edaa61e2c7b33ec81d910edd2658
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.209 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.210
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.14.209
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.14.210
index f3807b448472..85c773695d38 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.209
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.210
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.14.209
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.209.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
+SLOT=4.14.210
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.210.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=71a3056d94dc6959a5c71a4dea2cc615
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.160 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.161
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.19.160
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.19.161
index ba89074576b0..b28caa754f22 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.160
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.161
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.19.160
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.160.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+SLOT=4.19.161
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.161.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=71a3056d94dc6959a5c71a4dea2cc615
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.246 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.247
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.4.246
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.4.247
index 40a07170816a..f027487e6344 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.246
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.247
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.4.246
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.246.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
+SLOT=4.4.247
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.247.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=71a3056d94dc6959a5c71a4dea2cc615
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.246 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.247
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.9.246
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.9.247
index 82fea433fb09..7b0aa15282f6 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.246
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.247
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.9.246
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.246.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
+SLOT=4.9.247
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.247.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=71a3056d94dc6959a5c71a4dea2cc615
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.80 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.81
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.4.80
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.4.81
index 1d3b69d29ab9..cfcf4472102a 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.80
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.81
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.4.80
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.80.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+SLOT=5.4.81
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.81.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=71a3056d94dc6959a5c71a4dea2cc615
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.9.11 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.9.12
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.9.11
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.9.12
index 4d9e259c2f1d..2c21cc64d465 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.9.11
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.9.12
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.9.11
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.9.11.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz
+SLOT=5.9.12
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.9.12.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=71a3056d94dc6959a5c71a4dea2cc615
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-5.9.10 b/metadata/md5-cache/sys-kernel/zen-sources-5.9.11
similarity index 92%
rename from metadata/md5-cache/sys-kernel/zen-sources-5.9.10
rename to metadata/md5-cache/sys-kernel/zen-sources-5.9.11
index 8a51c204080e..a3366023ea2a 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-5.9.10
+++ b/metadata/md5-cache/sys-kernel/zen-sources-5.9.11
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.9.10
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.9.10-zen1/v5.9.10-zen1.patch.xz
+SLOT=5.9.11
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.9.11-zen2/v5.9.11-zen2.patch.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2148a6c5380c17b8ef37514d78fd60a1
+_md5_=adb315dfea1273d62b84e6ed7fa6ce31
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 33d7fe4c6e8a..b0ed11e210fc 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/cracklib-2.9.6-r2 b/metadata/md5-cache/sys-libs/cracklib-2.9.6-r2
index 8f9ca837a599..05c843fcd970 100644
--- a/metadata/md5-cache/sys-libs/cracklib-2.9.6-r2
+++ b/metadata/md5-cache/sys-libs/cracklib-2.9.6-r2
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/p
 REQUIRED_USE=python? ( || ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~polynomial-c/dist/cracklib-2.9.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc8aad91fc0452d0a79f609d2d79beff
diff --git a/metadata/md5-cache/sys-libs/cracklib-2.9.7 b/metadata/md5-cache/sys-libs/cracklib-2.9.7
index a4e356adf4d8..b5f34a31866a 100644
--- a/metadata/md5-cache/sys-libs/cracklib-2.9.7
+++ b/metadata/md5-cache/sys-libs/cracklib-2.9.7
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targe
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/cracklib/cracklib/releases/download/v2.9.7/cracklib-2.9.7.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a866b2509fd450a05c6cd485645bfe8b
diff --git a/metadata/md5-cache/sys-libs/libaal-1.0.7-r2 b/metadata/md5-cache/sys-libs/libaal-1.0.7-r2
index 8823fc1a7471..f77b5aaf1c65 100644
--- a/metadata/md5-cache/sys-libs/libaal-1.0.7-r2
+++ b/metadata/md5-cache/sys-libs/libaal-1.0.7-r2
@@ -4,9 +4,9 @@ DESCRIPTION=library required by reiser4progs
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/reiser4/
 IUSE=static-libs split-usr
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 -sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86
 LICENSE=GPL-2
 SLOT=0/7
 SRC_URI=mirror://sourceforge/reiser4/libaal-1.0.7.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=2f9fbeb9894397de5d37be81572ba163
+_md5_=48a6fee8cdb951588bd22780f0498208
diff --git a/metadata/md5-cache/sys-libs/libapparmor-2.13.4 b/metadata/md5-cache/sys-libs/libapparmor-2.13.4
index 4b13840f6d1e..39f757ad5453 100644
--- a/metadata/md5-cache/sys-libs/libapparmor-2.13.4
+++ b/metadata/md5-cache/sys-libs/libapparmor-2.13.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/apparmor/2.13/2.13.4/+download/apparmor-2.13.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f423ce9f83c65794e96bf34710964404
diff --git a/metadata/md5-cache/sys-libs/libapparmor-3.0.0 b/metadata/md5-cache/sys-libs/libapparmor-3.0.0
index 236202007304..c7a8d982602e 100644
--- a/metadata/md5-cache/sys-libs/libapparmor-3.0.0
+++ b/metadata/md5-cache/sys-libs/libapparmor-3.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/apparmor/3.0/3.0/+download/apparmor-3.0.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3401c3a3b1f1feb5d03e9e4e48d80da8
diff --git a/metadata/md5-cache/sys-libs/libseccomp-2.5.0 b/metadata/md5-cache/sys-libs/libseccomp-2.5.0
index 8382fef68179..e058a77abae5 100644
--- a/metadata/md5-cache/sys-libs/libseccomp-2.5.0
+++ b/metadata/md5-cache/sys-libs/libseccomp-2.5.0
@@ -11,5 +11,5 @@ RDEPEND=dev-util/gperf python? ( python_targets_python3_6? ( dev-lang/python:3.6
 REQUIRED_USE=python? ( static-libs || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/seccomp/libseccomp/releases/download/v2.5.0/libseccomp-2.5.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=db6f75d3c8ae007721115fbd05507565
diff --git a/metadata/md5-cache/sys-libs/libseccomp-2.5.1 b/metadata/md5-cache/sys-libs/libseccomp-2.5.1
index f3ec041cc068..43eef63683d6 100644
--- a/metadata/md5-cache/sys-libs/libseccomp-2.5.1
+++ b/metadata/md5-cache/sys-libs/libseccomp-2.5.1
@@ -11,5 +11,5 @@ RDEPEND=dev-util/gperf python? ( python_targets_python3_6? ( dev-lang/python:3.6
 REQUIRED_USE=python? ( static-libs || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/seccomp/libseccomp/releases/download/v2.5.1/libseccomp-2.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5c2b51f20734dba4f26c76cf96b90403
diff --git a/metadata/md5-cache/sys-libs/libseccomp-9999 b/metadata/md5-cache/sys-libs/libseccomp-9999
index e3d08687e41b..0ddfc21bb81d 100644
--- a/metadata/md5-cache/sys-libs/libseccomp-9999
+++ b/metadata/md5-cache/sys-libs/libseccomp-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-util/gperf python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 REQUIRED_USE=python? ( static-libs || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0907ee695598224f14ec19fe1ad6cf09
diff --git a/metadata/md5-cache/sys-libs/libselinux-3.1-r1 b/metadata/md5-cache/sys-libs/libselinux-3.1-r1
index 8d6fdd64f97f..bf3a0866eadd 100644
--- a/metadata/md5-cache/sys-libs/libselinux-3.1-r1
+++ b/metadata/md5-cache/sys-libs/libselinux-3.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=SELinux userland library
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=pcre2 python ruby static-libs ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 python_targets_python3_6 python_targets_python3_7 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
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=public-domain
 RDEPEND=>=sys-libs/libsepol-3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[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(-)?] ) pcre2? ( dev-libs/libpcre2:=[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(-)?] ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ruby? ( ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ) elibc_musl? ( sys-libs/fts-standalone )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20200710/libselinux-3.1.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=209613c6e95118df063d083413f27165
+_md5_=8ede0f8b91513dd12741f8ae6e8360fb
diff --git a/metadata/md5-cache/sys-libs/libsemanage-3.1-r1 b/metadata/md5-cache/sys-libs/libsemanage-3.1-r1
index 52841609a10e..7a8fa59d8724 100644
--- a/metadata/md5-cache/sys-libs/libsemanage-3.1-r1
+++ b/metadata/md5-cache/sys-libs/libsemanage-3.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=SELinux kernel and policy management library
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 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 ~mips ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libsepol-3.1[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/libselinux-3.1[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-process/audit-2.2.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(-)?] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20200710/libsemanage-3.1.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e4e847fe2e1542c1159e63e918bd9596
+_md5_=ab6394f1239ee85742383e8f7d3c5040
diff --git a/metadata/md5-cache/sys-libs/libsepol-3.1 b/metadata/md5-cache/sys-libs/libsepol-3.1
index 01b2f5fa8e3a..78d1eb16f489 100644
--- a/metadata/md5-cache/sys-libs/libsepol-3.1
+++ b/metadata/md5-cache/sys-libs/libsepol-3.1
@@ -3,10 +3,10 @@ DESCRIPTION=SELinux binary policy representation library
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=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 ~mips ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20200710/libsepol-3.1.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=216c17eeface5a5186cf3ad8598e12ac
+_md5_=1edf78c2ba17fe8dc5641430ece07cd6
diff --git a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.10 b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.10
index 77d3e7211a86..b39b964d4c94 100644
--- a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.10
+++ b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.10
@@ -4,9 +4,9 @@ DESCRIPTION=Wrapper for the user, group and hosts NSS API
 EAPI=7
 HOMEPAGE=https://cwrap.org/nss_wrapper.html
 IUSE=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 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/nss_wrapper-1.1.10.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=495b126de6e938dc72f520745651870d
+_md5_=762972ded591fd59ca66b0c4be8e35d0
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2020d b/metadata/md5-cache/sys-libs/timezone-data-2020d
index f14944825d4b..d3712381dd2d 100644
--- a/metadata/md5-cache/sys-libs/timezone-data-2020d
+++ b/metadata/md5-cache/sys-libs/timezone-data-2020d
@@ -4,10 +4,10 @@ DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdum
 EAPI=7
 HOMEPAGE=https://www.iana.org/time-zones
 IUSE=nls leaps-timezone elibc_FreeBSD zic-slim
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD public-domain
 RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
 SLOT=0
 SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2020d.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2020d.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=530a6f5f3de5181c6245534c353fbbeb
+_md5_=dc120fee30c5dbde59dc5ec2457bad88
diff --git a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.8 b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.8
index 13353cfafbc5..298b7d186d5b 100644
--- a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.8
+++ b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.8
@@ -4,9 +4,9 @@ DESCRIPTION=Wrapper to fake privilege separation
 EAPI=7
 HOMEPAGE=https://cwrap.org/uid_wrapper.html
 IUSE=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 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/pub/cwrap/uid_wrapper-1.2.8.tar.gz https://ftp.samba.org/pub/cwrap/uid_wrapper-1.2.8.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=79d612f898abba90716195b4ddc9b303
+_md5_=8f8ed505e987570726b1c862c775e570
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 68b6b181e1c2..61416e909595 100644
Binary files a/metadata/md5-cache/sys-power/Manifest.gz and b/metadata/md5-cache/sys-power/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-power/acpilight-1.2-r1 b/metadata/md5-cache/sys-power/acpilight-1.2-r1
index 351bd90e17f7..e477b30b722d 100644
--- a/metadata/md5-cache/sys-power/acpilight-1.2-r1
+++ b/metadata/md5-cache/sys-power/acpilight-1.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Replacement for xbacklight that uses the ACPI interface to set brigh
 EAPI=7
 HOMEPAGE=https://gitlab.com/wavexx/acpilight/
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=virtual/udev acct-group/video python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !x11-apps/xbacklight
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://gitlab.com/wavexx/acpilight/-/archive/v1.2/acpilight-v1.2.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=4a60d2523c6c0d5c83a7ac4d9bf7d78c
+_md5_=50c8f059df8cc462da5e185844ced207
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index a7d4794d95a3..c7400324efc5 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/audit-2.8.5-r2 b/metadata/md5-cache/sys-process/audit-2.8.5-r2
index 6bb795934104..f57e38a2f65f 100644
--- a/metadata/md5-cache/sys-process/audit-2.8.5-r2
+++ b/metadata/md5-cache/sys-process/audit-2.8.5-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Userspace utilities for storing and processing auditing records
 EAPI=6
 HOMEPAGE=https://people.redhat.com/sgrubb/audit/
 IUSE=gssapi ldap python 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 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 kernel_linux split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=gssapi? ( virtual/krb5 ) ldap? ( net-nds/openldap ) sys-libs/libcap-ng python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linux-audit/audit-userspace/archive/80866dc78b5db17010516e24344eaed8dcc6fb99.tar.gz -> audit-2.8.5_p80866dc78b5d.tar.gz https://github.com/linux-audit/audit-userspace/commit/017e6c6ab95df55f34e339d2139def83e5dada1f.patch -> audit-017e6c6ab95df55f34e339d2139def83e5dada1f.patch
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=ef773b9eebe4039201b2927938a326bd
+_md5_=9a509a4dcb873363aaed5e8f030e1dfa
diff --git a/metadata/md5-cache/sys-process/glances-3.1.4.1-r1 b/metadata/md5-cache/sys-process/glances-3.1.4.1-r1
index b95073030ce7..12603eb81853 100644
--- a/metadata/md5-cache/sys-process/glances-3.1.4.1-r1
+++ b/metadata/md5-cache/sys-process/glances-3.1.4.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nicolargo/glances/archive/v3.1.4.1.tar.gz -> glances-3.1.4.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=505a704c4aa9c336b606ed8a18fc1908
diff --git a/metadata/md5-cache/sys-process/glances-3.1.5 b/metadata/md5-cache/sys-process/glances-3.1.5
index de5099ea32d7..4ea2749ca69f 100644
--- a/metadata/md5-cache/sys-process/glances-3.1.5
+++ b/metadata/md5-cache/sys-process/glances-3.1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nicolargo/glances/archive/v3.1.5.tar.gz -> glances-3.1.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e3de599cde711d8335a4551ccb365549
diff --git a/metadata/md5-cache/sys-process/htop-3.0.2 b/metadata/md5-cache/sys-process/htop-3.0.2
index aef89062f239..370466b1ab07 100644
--- a/metadata/md5-cache/sys-process/htop-3.0.2
+++ b/metadata/md5-cache/sys-process/htop-3.0.2
@@ -5,10 +5,10 @@ DESCRIPTION=interactive process viewer
 EAPI=7
 HOMEPAGE=https://htop.dev/ https://github.com/htop-dev/htop
 IUSE=kernel_FreeBSD kernel_linux openvz unicode vserver kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?]
 SLOT=0
 SRC_URI=https://github.com/htop-dev/htop/archive/3.0.2.tar.gz -> htop-3.0.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fc35cef786911c626abe0e953f3b43ee
+_md5_=1740e2a0ec294bf9023b126f905a52a0
diff --git a/metadata/md5-cache/sys-process/iotop-0.6 b/metadata/md5-cache/sys-process/iotop-0.6
index 8f02a77a8ab6..dc1c11b7af43 100644
--- a/metadata/md5-cache/sys-process/iotop-0.6
+++ b/metadata/md5-cache/sys-process/iotop-0.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses(+)] ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=http://guichaz.free.fr/iotop/files/iotop-0.6.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3b5c06c0c788f8a1ca16df11a0a0aa96
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index e6eb0cc73631..d7695c5cb2c9 100644
Binary files a/metadata/md5-cache/www-apache/Manifest.gz and b/metadata/md5-cache/www-apache/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apache/mod_wsgi-4.7.1 b/metadata/md5-cache/www-apache/mod_wsgi-4.7.1
index d87f233b3750..9da9acdd51a0 100644
--- a/metadata/md5-cache/www-apache/mod_wsgi-4.7.1
+++ b/metadata/md5-cache/www-apache/mod_wsgi-4.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=An Apache2 module for running Python WSGI applications
 EAPI=6
 HOMEPAGE=https://github.com/GrahamDumpleton/mod_wsgi
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) =www-servers/apache-2*
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/mod_wsgi/archive/4.7.1.tar.gz -> mod_wsgi-4.7.1.tar.gz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	94458fe4e9466f4803360408e60e11fd	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=293eb6c3d30fec9d0e7609143cfb3651
+_md5_=c94f6a8f1abe325939027123f5485200
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 07fae89c0f25..f6f4556a9def 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/blohg-0.13-r4 b/metadata/md5-cache/www-apps/blohg-0.13-r4
index b9109bd7e366..fad608480c94 100644
--- a/metadata/md5-cache/www-apps/blohg-0.13-r4
+++ b/metadata/md5-cache/www-apps/blohg-0.13-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( git mercurial ) test? ( git mercurial ) || ( python_targets_py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blohg/blohg-0.13.tar.gz https://dev.gentoo.org/~rafaelmartins/distfiles/blohg-patches-0.13-r4.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f2b3e452f035c464981bb9f3d6002968
diff --git a/metadata/md5-cache/www-apps/blohg-9999 b/metadata/md5-cache/www-apps/blohg-9999
index 9525decdb7b5..19770ae718f4 100644
--- a/metadata/md5-cache/www-apps/blohg-9999
+++ b/metadata/md5-cache/www-apps/blohg-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( git mercurial ) test? ( git mercurial ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f2b3e452f035c464981bb9f3d6002968
diff --git a/metadata/md5-cache/www-apps/klaus-1.5.1 b/metadata/md5-cache/www-apps/klaus-1.5.1
index 74c16bbc7872..2b82f9c72cba 100644
--- a/metadata/md5-cache/www-apps/klaus-1.5.1
+++ b/metadata/md5-cache/www-apps/klaus-1.5.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/dulwich-0.19.3[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/k/klaus/klaus-1.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=876944711fc7e59edeb1cbf170814b98
diff --git a/metadata/md5-cache/www-apps/klaus-1.5.2 b/metadata/md5-cache/www-apps/klaus-1.5.2
index f84db681f1c2..47233630f694 100644
--- a/metadata/md5-cache/www-apps/klaus-1.5.2
+++ b/metadata/md5-cache/www-apps/klaus-1.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/dulwich-0.19.3[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/k/klaus/klaus-1.5.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8dfcbdab0d8215596da24eab328f7bb9
diff --git a/metadata/md5-cache/www-apps/nikola-7.8.15 b/metadata/md5-cache/www-apps/nikola-7.8.15
index d79495a03e49..96d51cbb1f9d 100644
--- a/metadata/md5-cache/www-apps/nikola-7.8.15
+++ b/metadata/md5-cache/www-apps/nikola-7.8.15
@@ -11,5 +11,5 @@ REQUIRED_USE=ipython? ( || ( python_targets_python3_6 ) ) || ( python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/Nikola-7.8.15.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=14c46027af277630907eb2bdba697438
diff --git a/metadata/md5-cache/www-apps/nikola-7.8.15-r1 b/metadata/md5-cache/www-apps/nikola-7.8.15-r1
index a0332d6bf872..cc3de25442bd 100644
--- a/metadata/md5-cache/www-apps/nikola-7.8.15-r1
+++ b/metadata/md5-cache/www-apps/nikola-7.8.15-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/Nikola-7.8.15.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=08578c187f46a666999cb92458a87c8a
diff --git a/metadata/md5-cache/www-apps/nikola-8.0.4 b/metadata/md5-cache/www-apps/nikola-8.0.4
index 23bbcab4e810..f9043ea245bb 100644
--- a/metadata/md5-cache/www-apps/nikola-8.0.4
+++ b/metadata/md5-cache/www-apps/nikola-8.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/Nikola-8.0.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2a9d2adccdcc5dda15ebfa219937f932
diff --git a/metadata/md5-cache/www-apps/nikola-8.1.0 b/metadata/md5-cache/www-apps/nikola-8.1.0
index 43955c95ee35..509d621b0550 100644
--- a/metadata/md5-cache/www-apps/nikola-8.1.0
+++ b/metadata/md5-cache/www-apps/nikola-8.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/Nikola-8.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3dc21f03216d3302ec4919da596c8301
diff --git a/metadata/md5-cache/www-apps/nikola-8.1.1 b/metadata/md5-cache/www-apps/nikola-8.1.1
index 12401dd6f431..226e7f9f86bc 100644
--- a/metadata/md5-cache/www-apps/nikola-8.1.1
+++ b/metadata/md5-cache/www-apps/nikola-8.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/Nikola-8.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3dc21f03216d3302ec4919da596c8301
diff --git a/metadata/md5-cache/www-apps/nikola-8.1.1-r1 b/metadata/md5-cache/www-apps/nikola-8.1.1-r1
index 15e21a2f3617..210c098e86c7 100644
--- a/metadata/md5-cache/www-apps/nikola-8.1.1-r1
+++ b/metadata/md5-cache/www-apps/nikola-8.1.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=server? ( watchdog ) || ( python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/Nikola-8.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=aa835ddc0cf4baa41be2df947f444518
diff --git a/metadata/md5-cache/www-apps/nikola-8.1.2 b/metadata/md5-cache/www-apps/nikola-8.1.2
index fdded5845f7a..e86e2347b5e5 100644
--- a/metadata/md5-cache/www-apps/nikola-8.1.2
+++ b/metadata/md5-cache/www-apps/nikola-8.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=server? ( watchdog ) || ( python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/Nikola-8.1.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9fb2f3e6e2437fd4e6b45713d3082829
diff --git a/metadata/md5-cache/www-apps/novnc-1.0.0 b/metadata/md5-cache/www-apps/novnc-1.0.0
index 2e9d7d64be3e..6a7e01cd1390 100644
--- a/metadata/md5-cache/www-apps/novnc-1.0.0
+++ b/metadata/md5-cache/www-apps/novnc-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/websockify[python_targets_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/kanaka/noVNC/archive/v1.0.0.tar.gz -> novnc-1.0.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fcf0d4eae253dd60a119aec481dbe2e9
diff --git a/metadata/md5-cache/www-apps/novnc-1.1.0 b/metadata/md5-cache/www-apps/novnc-1.1.0
index a38dc2bfce12..8a9114c5e621 100644
--- a/metadata/md5-cache/www-apps/novnc-1.1.0
+++ b/metadata/md5-cache/www-apps/novnc-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/websockify[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/kanaka/noVNC/archive/v1.1.0.tar.gz -> novnc-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=75ed199ad341d28e61a244f6da6aa95d
diff --git a/metadata/md5-cache/www-apps/novnc-9999 b/metadata/md5-cache/www-apps/novnc-9999
index 1e593595992b..f2f3278b88fc 100644
--- a/metadata/md5-cache/www-apps/novnc-9999
+++ b/metadata/md5-cache/www-apps/novnc-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/websockify[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=245628b08a3cc9e7e91046446ddf3cac
diff --git a/metadata/md5-cache/www-apps/prewikka-5.1.1 b/metadata/md5-cache/www-apps/prewikka-5.1.1
index 39e78abe0947..860e2c57a1d1 100644
--- a/metadata/md5-cache/www-apps/prewikka-5.1.1
+++ b/metadata/md5-cache/www-apps/prewikka-5.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libprelude-5.1.0[python,python_targets_python3_6(-)?,-python_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.1.0/prewikka-5.1.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=46db790c27f3c62969fe5495c093ff50
diff --git a/metadata/md5-cache/www-apps/prewikka-5.2.0 b/metadata/md5-cache/www-apps/prewikka-5.2.0
index e8850f92c35b..955e543b2130 100644
--- a/metadata/md5-cache/www-apps/prewikka-5.2.0
+++ b/metadata/md5-cache/www-apps/prewikka-5.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libprelude-5.2.0[python,python_targets_python3_6(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/prewikka-5.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2a578198d0a502fca242ef51e8a867bf
diff --git a/metadata/md5-cache/www-apps/radicale-1.1.6 b/metadata/md5-cache/www-apps/radicale-1.1.6
index d11ad6f4fdcc..da6ff56941ae 100644
--- a/metadata/md5-cache/www-apps/radicale-1.1.6
+++ b/metadata/md5-cache/www-apps/radicale-1.1.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/vobject-0.9.5[python_targets_python3_6(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/R/Radicale/Radicale-1.1.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e14287e1a24f0f194b79c4448cb58564
diff --git a/metadata/md5-cache/www-apps/radicale-2.1.11-r1 b/metadata/md5-cache/www-apps/radicale-2.1.11-r1
index b3e52a2b19b8..f234176c2ade 100644
--- a/metadata/md5-cache/www-apps/radicale-2.1.11-r1
+++ b/metadata/md5-cache/www-apps/radicale-2.1.11-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/util-linux >=dev-python/vobject-0.9.6[python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/R/Radicale/Radicale-2.1.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb9ed8e0871c5ca463a2e4d9a7e9dc1c
diff --git a/metadata/md5-cache/www-apps/roundup-2.0.0 b/metadata/md5-cache/www-apps/roundup-2.0.0
index a040d014cdc3..3db83fc6827c 100644
--- a/metadata/md5-cache/www-apps/roundup-2.0.0
+++ b/metadata/md5-cache/www-apps/roundup-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=tz? ( dev-python/pytz[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/r/roundup/roundup-2.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dcba8cf6e005c876283844ba8c8180b9
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index b154df00f030..6c00d9accfa3 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/dillo-3.1_pre20181005 b/metadata/md5-cache/www-client/dillo-3.1_pre20181005
index e789eee50b3b..7208ddfee355 100644
--- a/metadata/md5-cache/www-client/dillo-3.1_pre20181005
+++ b/metadata/md5-cache/www-client/dillo-3.1_pre20181005
@@ -5,10 +5,10 @@ DESCRIPTION=Lean FLTK based web browser
 EAPI=7
 HOMEPAGE=https://www.dillo.org/
 IUSE=doc +gif ipv6 +jpeg +png ssl +xembed
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=>=x11-libs/fltk-1.3 sys-libs/zlib jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( net-libs/mbedtls:= )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/dillo-3.1_pre20181005.tar.xz mirror://gentoo/dillo.png
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2ea2260138741c5f5a32b216331f572f
+_md5_=78b9e83e6fc20e2f565cc9a71de3522d
diff --git a/metadata/md5-cache/www-client/firefox-78.5.0 b/metadata/md5-cache/www-client/firefox-78.5.0
index 838971897651..5098d79e681c 100644
--- a/metadata/md5-cache/www-client/firefox-78.5.0
+++ b/metadata/md5-cache/www-client/firefox-78.5.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] dev-lang/python:3.7[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.19.0 virtual/pkgconfig >=virtual/rust-1.41.0 || ( ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 sys-devel/llvm:9 clang? ( =sys-devel/lld-9* pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] dev-lang/python:3.7[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.21.0 virtual/pkgconfig >=virtual/rust-1.41.0 || ( ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 sys-devel/llvm:9 clang? ( =sys-devel/lld-9* pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
 DEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Firefox Web Browser
@@ -12,4 +12,4 @@ REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
 SLOT=0/esr78
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/source/firefox-78.5.0esr.source.tar.xz -> firefox-78.5.0esr.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-07.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-07.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/ach.xpi -> firefox-78.5.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/af.xpi -> firefox-78.5.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/an.xpi -> firefox-78.5.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/ar.xpi -> firefox-78.5.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/ast.xpi -> firefox-78.5.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/az.xpi -> firefox-78.5.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/be.xpi -> firefox-78.5.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/bg.xpi -> firefox-78.5.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/bn.xpi -> firefox-78.5.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/br.xpi -> firefox-78.5.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/bs.xpi -> firefox-78.5.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-78.5.0esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/ca.xpi -> firefox-78.5.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/cak.xpi -> firefox-78.5.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/cs.xpi -> firefox-78.5.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/cy.xpi -> firefox-78.5.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/da.xpi -> firefox-78.5.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/de.xpi -> firefox-78.5.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-78.5.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/el.xpi -> firefox-78.5.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-78.5.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-78.5.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/eo.xpi -> firefox-78.5.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-78.5.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-78.5.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-78.5.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-78.5.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/et.xpi -> firefox-78.5.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/eu.xpi -> firefox-78.5.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/fa.xpi -> firefox-78.5.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/ff.xpi -> firefox-78.5.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/fi.xpi -> firefox-78.5.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/fr.xpi -> firefox-78.5.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-78.5.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-78.5.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/gd.xpi -> firefox-78.5.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/gl.xpi -> firefox-78.5.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/gn.xpi -> firefox-78.5.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-78.5.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/he.xpi -> firefox-78.5.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-78.5.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/hr.xpi -> firefox-78.5.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-78.5.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/hu.xpi -> firefox-78.5.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-78.5.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/ia.xpi -> firefox-78.5.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/id.xpi -> firefox-78.5.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/is.xpi -> firefox-78.5.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/it.xpi -> firefox-78.5.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/ja.xpi -> firefox-78.5.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/ka.xpi -> firefox-78.5.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/kab.xpi -> firefox-78.5.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/kk.xpi -> firefox-78.5.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/km.xpi -> firefox-78.5.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/kn.xpi -> firefox-78.5.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/ko.xpi -> firefox-78.5.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/lij.xpi -> firefox-78.5.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/lt.xpi -> firefox-78.5.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/lv.xpi -> firefox-78.5.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/mk.xpi -> firefox-78.5.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/mr.xpi -> firefox-78.5.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/ms.xpi -> firefox-78.5.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/my.xpi -> firefox-78.5.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-78.5.0esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-78.5.0esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/nl.xpi -> firefox-78.5.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-78.5.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/oc.xpi -> firefox-78.5.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-78.5.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/pl.xpi -> firefox-78.5.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-78.5.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-78.5.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/rm.xpi -> firefox-78.5.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/ro.xpi -> firefox-78.5.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/ru.xpi -> firefox-78.5.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/si.xpi -> firefox-78.5.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/sk.xpi -> firefox-78.5.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/sl.xpi -> firefox-78.5.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/son.xpi -> firefox-78.5.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/sq.xpi -> firefox-78.5.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/sr.xpi -> firefox-78.5.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-78.5.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/ta.xpi -> firefox-78.5.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/te.xpi -> firefox-78.5.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/th.xpi -> firefox-78.5.0esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/tl.xpi -> firefox-78.5.0esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/tr.xpi -> firefox-78.5.0esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/trs.xpi -> firefox-78.5.0esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/uk.xpi -> firefox-78.5.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/ur.xpi -> firefox-78.5.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/uz.xpi -> firefox-78.5.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/vi.xpi -> firefox-78.5.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/xh.xpi -> firefox-78.5.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-78.5.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/78.5.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-78.5.0esr-zh-TW.xpi )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48b58bfd5bce956faeb0a1e8e5afbbf1
+_md5_=a412ca6e142cd4c5b1046f20bd4bedd9
diff --git a/metadata/md5-cache/www-client/firefox-83.0 b/metadata/md5-cache/www-client/firefox-83.0
index a13eb7417522..c446def09967 100644
--- a/metadata/md5-cache/www-client/firefox-83.0
+++ b/metadata/md5-cache/www-client/firefox-83.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] dev-lang/python:3.7[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.15.0 >=net-libs/nodejs-10.19.0 virtual/pkgconfig >=virtual/rust-1.43.0 || ( ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 sys-devel/llvm:9 clang? ( =sys-devel/lld-9* pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] dev-lang/python:3.7[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.15.0 >=net-libs/nodejs-10.21.1 virtual/pkgconfig >=virtual/rust-1.43.0 || ( ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 sys-devel/llvm:9 clang? ( =sys-devel/lld-9* pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
 DEPEND=>=dev-libs/nss-3.58 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Firefox Web Browser
@@ -10,6 +10,6 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.58 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
 REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
 SLOT=0/83
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/83.0/source/firefox-83.0.source.tar.xz -> firefox-83.0.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-83-patches-05.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-83-patches-05.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-83-patches-05.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ach.xpi -> firefox-83.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/af.xpi -> firefox-83.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/an.xpi -> firefox-83.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ar.xpi -> firefox-83.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ast.xpi -> firefox-83.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/az.xpi -> firefox-83.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/be.xpi -> firefox-83.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/bg.xpi -> firefox-83.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/bn.xpi -> firefox-83.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/br.xpi -> firefox-83.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/bs.xpi -> firefox-83.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-83.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ca.xpi -> firefox-83.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/cak.xpi -> firefox-83.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/cs.xpi -> firefox-83.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/cy.xpi -> firefox-83.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/da.xpi -> firefox-83.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/de.xpi -> firefox-83.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/dsb.xpi -> firefox-83.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/el.xpi -> firefox-83.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/en-CA.xpi -> firefox-83.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/en-GB.xpi -> firefox-83.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/eo.xpi -> firefox-83.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/es-AR.xpi -> firefox-83.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/es-CL.xpi -> firefox-83.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/es-ES.xpi -> firefox-83.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/es-MX.xpi -> firefox-83.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/et.xpi -> firefox-83.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/eu.xpi -> firefox-83.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/fa.xpi -> firefox-83.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ff.xpi -> firefox-83.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/fi.xpi -> firefox-83.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/fr.xpi -> firefox-83.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-83.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-83.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/gd.xpi -> firefox-83.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/gl.xpi -> firefox-83.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/gn.xpi -> firefox-83.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-83.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/he.xpi -> firefox-83.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-83.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hr.xpi -> firefox-83.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hsb.xpi -> firefox-83.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hu.xpi -> firefox-83.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-83.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ia.xpi -> firefox-83.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/id.xpi -> firefox-83.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/is.xpi -> firefox-83.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/it.xpi -> firefox-83.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ja.xpi -> firefox-83.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ka.xpi -> firefox-83.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/kab.xpi -> firefox-83.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/kk.xpi -> firefox-83.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/km.xpi -> firefox-83.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/kn.xpi -> firefox-83.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ko.xpi -> firefox-83.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/lij.xpi -> firefox-83.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/lt.xpi -> firefox-83.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/lv.xpi -> firefox-83.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/mk.xpi -> firefox-83.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/mr.xpi -> firefox-83.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ms.xpi -> firefox-83.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/my.xpi -> firefox-83.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-83.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-83.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/nl.xpi -> firefox-83.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-83.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/oc.xpi -> firefox-83.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-83.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/pl.xpi -> firefox-83.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-83.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-83.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/rm.xpi -> firefox-83.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ro.xpi -> firefox-83.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ru.xpi -> firefox-83.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/si.xpi -> firefox-83.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sk.xpi -> firefox-83.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sl.xpi -> firefox-83.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/son.xpi -> firefox-83.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sq.xpi -> firefox-83.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sr.xpi -> firefox-83.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-83.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ta.xpi -> firefox-83.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/te.xpi -> firefox-83.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/th.xpi -> firefox-83.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/tl.xpi -> firefox-83.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/tr.xpi -> firefox-83.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/trs.xpi -> firefox-83.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/uk.xpi -> firefox-83.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ur.xpi -> firefox-83.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/uz.xpi -> firefox-83.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/vi.xpi -> firefox-83.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/xh.xpi -> firefox-83.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-83.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-83.0-zh-TW.xpi )
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/83.0/source/firefox-83.0.source.tar.xz -> firefox-83.0.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-83-patches-06.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-83-patches-06.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-83-patches-06.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ach.xpi -> firefox-83.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/af.xpi -> firefox-83.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/an.xpi -> firefox-83.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ar.xpi -> firefox-83.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ast.xpi -> firefox-83.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/az.xpi -> firefox-83.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/be.xpi -> firefox-83.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/bg.xpi -> firefox-83.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/bn.xpi -> firefox-83.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/br.xpi -> firefox-83.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/bs.xpi -> firefox-83.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-83.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ca.xpi -> firefox-83.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/cak.xpi -> firefox-83.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/cs.xpi -> firefox-83.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/cy.xpi -> firefox-83.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/da.xpi -> firefox-83.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/de.xpi -> firefox-83.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/dsb.xpi -> firefox-83.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/el.xpi -> firefox-83.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/en-CA.xpi -> firefox-83.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/en-GB.xpi -> firefox-83.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/eo.xpi -> firefox-83.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/es-AR.xpi -> firefox-83.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/es-CL.xpi -> firefox-83.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/es-ES.xpi -> firefox-83.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/es-MX.xpi -> firefox-83.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/et.xpi -> firefox-83.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/eu.xpi -> firefox-83.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/fa.xpi -> firefox-83.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ff.xpi -> firefox-83.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/fi.xpi -> firefox-83.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/fr.xpi -> firefox-83.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-83.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-83.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/gd.xpi -> firefox-83.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/gl.xpi -> firefox-83.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/gn.xpi -> firefox-83.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-83.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/he.xpi -> firefox-83.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-83.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hr.xpi -> firefox-83.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hsb.xpi -> firefox-83.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hu.xpi -> firefox-83.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-83.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ia.xpi -> firefox-83.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/id.xpi -> firefox-83.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/is.xpi -> firefox-83.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/it.xpi -> firefox-83.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ja.xpi -> firefox-83.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ka.xpi -> firefox-83.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/kab.xpi -> firefox-83.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/kk.xpi -> firefox-83.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/km.xpi -> firefox-83.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/kn.xpi -> firefox-83.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ko.xpi -> firefox-83.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/lij.xpi -> firefox-83.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/lt.xpi -> firefox-83.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/lv.xpi -> firefox-83.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/mk.xpi -> firefox-83.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/mr.xpi -> firefox-83.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ms.xpi -> firefox-83.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/my.xpi -> firefox-83.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-83.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-83.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/nl.xpi -> firefox-83.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-83.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/oc.xpi -> firefox-83.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-83.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/pl.xpi -> firefox-83.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-83.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-83.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/rm.xpi -> firefox-83.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ro.xpi -> firefox-83.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ru.xpi -> firefox-83.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/si.xpi -> firefox-83.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sk.xpi -> firefox-83.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sl.xpi -> firefox-83.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/son.xpi -> firefox-83.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sq.xpi -> firefox-83.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sr.xpi -> firefox-83.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-83.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ta.xpi -> firefox-83.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/te.xpi -> firefox-83.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/th.xpi -> firefox-83.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/tl.xpi -> firefox-83.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/tr.xpi -> firefox-83.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/trs.xpi -> firefox-83.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/uk.xpi -> firefox-83.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/ur.xpi -> firefox-83.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/uz.xpi -> firefox-83.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/vi.xpi -> firefox-83.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/xh.xpi -> firefox-83.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-83.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-83.0-zh-TW.xpi )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de99b3626bcd8c74cb7d27ab24643ec0
+_md5_=177b35ce4af6744d600aafa7ae446eca
diff --git a/metadata/md5-cache/www-client/google-chrome-87.0.4280.66 b/metadata/md5-cache/www-client/google-chrome-87.0.4280.88
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-87.0.4280.66
rename to metadata/md5-cache/www-client/google-chrome-87.0.4280.88
index ee2cbf5c5866..df602d215fc1 100644
--- a/metadata/md5-cache/www-client/google-chrome-87.0.4280.66
+++ b/metadata/md5-cache/www-client/google-chrome-87.0.4280.88
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 dev-libs/wayland media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 media-libs/mesa[gbm] 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/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbcommon 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_87.0.4280.66-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_87.0.4280.88-1_amd64.deb
 _eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=903fcd0fc686d87f9cfee7f611b80e74
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-88.0.4324.11 b/metadata/md5-cache/www-client/google-chrome-unstable-88.0.4324.27
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-unstable-88.0.4324.11
rename to metadata/md5-cache/www-client/google-chrome-unstable-88.0.4324.27
index a67feca79cd9..24a09699f206 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-88.0.4324.11
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-88.0.4324.27
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 dev-libs/wayland media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 media-libs/mesa[gbm] 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/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbcommon 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-unstable/google-chrome-unstable_88.0.4324.11-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_88.0.4324.27-1_amd64.deb
 _eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=903fcd0fc686d87f9cfee7f611b80e74
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-88.0.702.0 b/metadata/md5-cache/www-client/microsoft-edge-dev-88.0.705.9
similarity index 96%
rename from metadata/md5-cache/www-client/microsoft-edge-dev-88.0.702.0
rename to metadata/md5-cache/www-client/microsoft-edge-dev-88.0.705.9
index 9d6a0ad3e4f8..104141bf2f5c 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-88.0.702.0
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-88.0.705.9
@@ -8,6 +8,6 @@ LICENSE=microsoft-edge
 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 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/wget net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_88.0.702.0-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_88.0.705.9-1_amd64.deb
 _eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1d3e0209ecec241d2cc857c4d0cddc8f
diff --git a/metadata/md5-cache/www-client/pybugz-0.13 b/metadata/md5-cache/www-client/pybugz-0.13
index f8515b6295bf..44dda2fd2a65 100644
--- a/metadata/md5-cache/www-client/pybugz-0.13
+++ b/metadata/md5-cache/www-client/pybugz-0.13
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/williamh/pybugz/archive/0.13.tar.gz -> pybugz-0.13.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=753b03e57f3163fd7bff1df5c7eba464
diff --git a/metadata/md5-cache/www-client/pybugz-9999 b/metadata/md5-cache/www-client/pybugz-9999
index 37cba532d96e..22320bcba46d 100644
--- a/metadata/md5-cache/www-client/pybugz-9999
+++ b/metadata/md5-cache/www-client/pybugz-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6[readline(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[readline(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c8d40e493e464f61addd40df2685114f
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.13.1 b/metadata/md5-cache/www-client/qutebrowser-1.13.1
index 1d70bd27cf2e..0ff5023fdea5 100644
--- a/metadata/md5-cache/www-client/qutebrowser-1.13.1
+++ b/metadata/md5-cache/www-client/qutebrowser-1.13.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.13.1/qutebrowser-1.13.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=13b2cd96cf7b1c2e80a6a277199d5db9
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.14.0 b/metadata/md5-cache/www-client/qutebrowser-1.14.0
index 7755a45a13cb..81f6b450fc87 100644
--- a/metadata/md5-cache/www-client/qutebrowser-1.14.0
+++ b/metadata/md5-cache/www-client/qutebrowser-1.14.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.14.0/qutebrowser-1.14.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=203ab189e6c61e163c0febb6ac98eb9f
diff --git a/metadata/md5-cache/www-client/qutebrowser-9999 b/metadata/md5-cache/www-client/qutebrowser-9999
index ca45c9269a58..57d943dc2432 100644
--- a/metadata/md5-cache/www-client/qutebrowser-9999
+++ b/metadata/md5-cache/www-client/qutebrowser-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/attrs[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d591b1bc144ae13b53f636bbb1e993fb
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 915142078315..d6f67f7d010f 100644
Binary files a/metadata/md5-cache/www-misc/Manifest.gz and b/metadata/md5-cache/www-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/www-misc/buku-4.3-r1 b/metadata/md5-cache/www-misc/buku-4.3-r1
index 6f8d6e44f21d..ab0dc910aaa1 100644
--- a/metadata/md5-cache/www-misc/buku-4.3-r1
+++ b/metadata/md5-cache/www-misc/buku-4.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/buku/buku-4.3.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=70129f4b409f51dd85f3ec26adfec7a3
diff --git a/metadata/md5-cache/www-misc/buku-4.4-r1 b/metadata/md5-cache/www-misc/buku-4.4-r1
index dec75a4a3c00..1eea24a20bc9 100644
--- a/metadata/md5-cache/www-misc/buku-4.4-r1
+++ b/metadata/md5-cache/www-misc/buku-4.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buku/buku-4.4.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cacc67da5772d14d51feb41f4405f0a9
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.17 b/metadata/md5-cache/www-misc/urlwatch-2.17
index 2e9736df4b34..71d0cc060794 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.17
+++ b/metadata/md5-cache/www-misc/urlwatch-2.17
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.17.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0ecb7241b6359b433d99be7fb41322d9
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.18-r1 b/metadata/md5-cache/www-misc/urlwatch-2.18-r1
index a1e632108efd..11aa488d689e 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.18-r1
+++ b/metadata/md5-cache/www-misc/urlwatch-2.18-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.18.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f3275107c760cbd9225286ede8450cfe
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.21 b/metadata/md5-cache/www-misc/urlwatch-2.21
index 831cd602de68..be222cafe977 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.21
+++ b/metadata/md5-cache/www-misc/urlwatch-2.21
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.21.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2c89c56dc36cd5a72646fb566ea34a23
diff --git a/metadata/md5-cache/www-misc/vdradmin-am-3.6.10-r1 b/metadata/md5-cache/www-misc/vdradmin-am-3.6.10-r1
index 25103196dcce..7b9ea5a07f70 100644
--- a/metadata/md5-cache/www-misc/vdradmin-am-3.6.10-r1
+++ b/metadata/md5-cache/www-misc/vdradmin-am-3.6.10-r1
@@ -5,10 +5,10 @@ DESCRIPTION=WWW Admin for the Video Disk Recorder
 EAPI=7
 HOMEPAGE=http://andreas.vdr-developer.org/vdradmin-am/index.html
 IUSE=ipv6 ssl ssl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=acct-group/vdradmin acct-user/vdradmin dev-lang/perl dev-perl/Template-Toolkit dev-perl/libwww-perl dev-perl/URI dev-perl/CGI dev-perl/Locale-gettext virtual/perl-IO-Compress ipv6? ( dev-perl/IO-Socket-INET6 ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-libnet dev-perl/Authen-SASL dev-perl/Digest-HMAC
 SLOT=0
 SRC_URI=http://andreas.vdr-developer.org/vdradmin-am/download/vdradmin-am-3.6.10.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b300c923b8a1063f0afc4f97b547e650
+_md5_=5a95c444d106da1d0fb1544c3abb5609
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index a36aa8b8cb8f..3c9bfb003547 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-87.0.4280.66 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-87.0.4280.88
similarity index 91%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-87.0.4280.66
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-87.0.4280.88
index 77617b7cb2a4..629f5dfca776 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-87.0.4280.66
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-87.0.4280.88
@@ -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_87.0.4280.66-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_87.0.4280.88-1_amd64.deb
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=3259de859b5903477401255248b093eb
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-88.0.4324.11_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-88.0.4324.27_alpha
similarity index 91%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-88.0.4324.11_alpha
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-88.0.4324.27_alpha
index 41cb58062892..00142560fd7b 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-88.0.4324.11_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-88.0.4324.27_alpha
@@ -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:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_88.0.4324.11-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_88.0.4324.27-1_amd64.deb
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=3259de859b5903477401255248b093eb
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 55f50d31b653..af4cc9bc07e8 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/apache-2.4.46-r3 b/metadata/md5-cache/www-servers/apache-2.4.46-r3
new file mode 100644
index 000000000000..0734856007b5
--- /dev/null
+++ b/metadata/md5-cache/www-servers/apache-2.4.46-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_session_crypto? ( libressl? ( dev-libs/apr-util[libressl] ) !libressl? ( dev-libs/apr-util[openssl] ) ) suexec? ( suexec-caps? ( sys-libs/libcap ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) >=dev-libs/apr-1.5.1:= !www-apache/mod_macro dev-lang/perl =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:0= ) ) !=www-servers/apache-1* virtual/pkgconfig
+DESCRIPTION=The Apache Web Server
+EAPI=6
+HOMEPAGE=https://httpd.apache.org/
+IUSE=+suexec-caps suexec-syslog split-usr ssl debug doc gdbm ldap libressl selinux ssl static suexec threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_auth_form apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authn_socache apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_brotli apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_macro apache2_modules_md apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_http2 apache2_modules_proxy_fcgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_session apache2_modules_session_cookie apache2_modules_session_crypto apache2_modules_session_dbd apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_memcache apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+LICENSE=Apache-2.0 Apache-1.1
+PDEPEND=~app-admin/apache-tools-2.4.46
+RDEPEND=apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_session_crypto? ( libressl? ( dev-libs/apr-util[libressl] ) !libressl? ( dev-libs/apr-util[openssl] ) ) >=dev-libs/apr-1.5.1:= !www-apache/mod_macro dev-lang/perl =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:0= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache ) virtual/tmpfiles
+REQUIRED_USE=apache2_modules_http2? ( ssl ) apache2_modules_md? ( ssl ) apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_auth_form? ( apache2_modules_session ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_http2? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_session_cookie? ( apache2_modules_session ) apache2_modules_session_dbd? ( apache2_modules_dbd ) apache2_modules_session_dbd? ( apache2_modules_session ) apache2_modules_socache_memcache? ( apache2_modules_cache ) apache2_modules_substitute? ( apache2_modules_filter )
+SLOT=2
+SRC_URI=mirror://apache/httpd/httpd-2.4.46.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.46-r3-20201202.tar.bz2
+_eclasses_=apache-2	6e28122182ed8dcf20426af61c42319e	autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=80f401edd93e8452615a1694009d8350
diff --git a/metadata/md5-cache/www-servers/gunicorn-19.8.1 b/metadata/md5-cache/www-servers/gunicorn-19.8.1
index 0b73a4e22252..57fdc79413de 100644
--- a/metadata/md5-cache/www-servers/gunicorn-19.8.1
+++ b/metadata/md5-cache/www-servers/gunicorn-19.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gunicorn/gunicorn-19.8.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c61506bb62ecb8e3bff007e23ae86b1f
diff --git a/metadata/md5-cache/www-servers/gunicorn-19.9.0 b/metadata/md5-cache/www-servers/gunicorn-19.9.0
index 4c61023af212..2aa52c26c025 100644
--- a/metadata/md5-cache/www-servers/gunicorn-19.9.0
+++ b/metadata/md5-cache/www-servers/gunicorn-19.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gunicorn/gunicorn-19.9.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=45d584049c1d13667650a6c094f03397
diff --git a/metadata/md5-cache/www-servers/gunicorn-20.0.4 b/metadata/md5-cache/www-servers/gunicorn-20.0.4
index dd58faadd882..1c61db40d3a4 100644
--- a/metadata/md5-cache/www-servers/gunicorn-20.0.4
+++ b/metadata/md5-cache/www-servers/gunicorn-20.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gunicorn/gunicorn-20.0.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b31e9b24a0d45647d42c4c71ba707521
diff --git a/metadata/md5-cache/www-servers/nginx-1.19.5-r1 b/metadata/md5-cache/www-servers/nginx-1.19.5-r1
new file mode 100644
index 000000000000..925b90779ab7
--- /dev/null
+++ b/metadata/md5-cache/www-servers/nginx-1.19.5-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( dev-lang/luajit:2= ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DESCRIPTION=Robust, small and high performance http and reverse proxy server
+EAPI=6
+HOMEPAGE=https://nginx.org
+IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
+PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
+RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( dev-lang/luajit:2= ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
+REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_http_addition ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( luajit nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
+RESTRICT=test
+SLOT=mainline
+SRC_URI=https://nginx.org/download/nginx-1.19.5.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.5.0.tar.gz -> njs-0.5.0.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.5.0.tar.gz -> njs-0.5.0.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f3974f199038505cbb1411ebccf4869c
diff --git a/metadata/md5-cache/www-servers/servefile-0.4.4_p20200211 b/metadata/md5-cache/www-servers/servefile-0.4.4_p20200211
index a9f4e2a4fd9c..e0dfc95d10a6 100644
--- a/metadata/md5-cache/www-servers/servefile-0.4.4_p20200211
+++ b/metadata/md5-cache/www-servers/servefile-0.4.4_p20200211
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sebageek/servefile/archive/864b2161b16e432c8ba19db1914809e080d793af.tar.gz -> servefile-0.4.4_p20200211.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0028793293d4aa5c88e088beecd9c28f
diff --git a/metadata/md5-cache/www-servers/servefile-0.5.1 b/metadata/md5-cache/www-servers/servefile-0.5.1
index c7d35db86eb8..3f25b65aab31 100644
--- a/metadata/md5-cache/www-servers/servefile-0.5.1
+++ b/metadata/md5-cache/www-servers/servefile-0.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sebageek/servefile/archive/v0.5.1.tar.gz -> servefile-0.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=887c2d30465556c7ea6de7506d2ca15c
diff --git a/metadata/md5-cache/www-servers/tornado-4.5.3 b/metadata/md5-cache/www-servers/tornado-4.5.3
index 3eacd01d7f43..d7d252b1ec95 100644
--- a/metadata/md5-cache/www-servers/tornado-4.5.3
+++ b/metadata/md5-cache/www-servers/tornado-4.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-4.5.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=161cf3082260eca905601ac25c3fe68f
diff --git a/metadata/md5-cache/www-servers/tornado-6.0.4 b/metadata/md5-cache/www-servers/tornado-6.0.4
index de34c7b4af63..a69ec83ffb30 100644
--- a/metadata/md5-cache/www-servers/tornado-6.0.4
+++ b/metadata/md5-cache/www-servers/tornado-6.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-6.0.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1960da587da60339aeeebbe5e96f7208
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index cf4a668bec5d..4f18ead6d243 100644
Binary files a/metadata/md5-cache/x11-apps/Manifest.gz and b/metadata/md5-cache/x11-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-apps/xload-1.1.3 b/metadata/md5-cache/x11-apps/xload-1.1.3
index 89142b1ba97c..5d6f916ea8ba 100644
--- a/metadata/md5-cache/x11-apps/xload-1.1.3
+++ b/metadata/md5-cache/x11-apps/xload-1.1.3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 sys-devel/
 DESCRIPTION=system load average display for X
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xload
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xload-1.1.3.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=72610587ee0692ba274b20552bc9d1d3
+_md5_=14904bd100eb2d5505c4a17de40b5cc6
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 5ab5846bc6bb..bc6c28001911 100644
Binary files a/metadata/md5-cache/x11-base/Manifest.gz and b/metadata/md5-cache/x11-base/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.20.10 b/metadata/md5-cache/x11-base/xorg-server-1.20.10
new file mode 100644
index 000000000000..a4d788b9689f
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xorg-server-1.20.10
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=media-libs/libglvnd[X] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(-)] sys-devel/flex >=x11-base/xorg-proto-2018.4 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) )
+DESCRIPTION=X.Org X servers
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
+IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +elogind ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity static-libs doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.20 )
+RDEPEND=media-libs/libglvnd[X] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(-)] selinux? ( sec-policy/selinux-xserver )
+REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !wayland ) xephyr? ( kdrive )
+SLOT=0/1.20.10
+SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.10.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
+_md5_=9600166e08620f07f8903c59f055aab9
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.20.9 b/metadata/md5-cache/x11-base/xorg-server-1.20.9
deleted file mode 100644
index 330268dc3f02..000000000000
--- a/metadata/md5-cache/x11-base/xorg-server-1.20.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=libglvnd? ( media-libs/libglvnd[X] !app-eselect/eselect-opengl !!x11-drivers/nvidia-drivers[-libglvnd(-)] ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) sys-devel/flex >=x11-base/xorg-proto-2018.4 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) )
-DESCRIPTION=X.Org X servers
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
-IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity static-libs doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.20 )
-RDEPEND=libglvnd? ( media-libs/libglvnd[X] !app-eselect/eselect-opengl !!x11-drivers/nvidia-drivers[-libglvnd(-)] ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) selinux? ( sec-policy/selinux-xserver )
-REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !wayland ) xephyr? ( kdrive )
-SLOT=0/1.20.9
-SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.9.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=56f94b204f65bde4954a57c8947d5488
diff --git a/metadata/md5-cache/x11-base/xorg-server-9999 b/metadata/md5-cache/x11-base/xorg-server-9999
index 4701805487b9..df7db9f805e1 100644
--- a/metadata/md5-cache/x11-base/xorg-server-9999
+++ b/metadata/md5-cache/x11-base/xorg-server-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl] ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=libglvnd? ( media-libs/libglvnd[X] !app-eselect/eselect-opengl !!x11-drivers/nvidia-drivers[-libglvnd(-)] ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) sys-devel/flex >=x11-base/xorg-proto-2018.4 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) )
+DEPEND=media-libs/libglvnd[X] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(-)] sys-devel/flex >=x11-base/xorg-proto-2018.4 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) )
 DESCRIPTION=X.Org X servers
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
-IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity static-libs doc
+IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +elogind ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity static-libs doc
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-9999 )
 PROPERTIES=live
-RDEPEND=libglvnd? ( media-libs/libglvnd[X] !app-eselect/eselect-opengl !!x11-drivers/nvidia-drivers[-libglvnd(-)] ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) selinux? ( sec-policy/selinux-xserver )
+RDEPEND=media-libs/libglvnd[X] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(-)] selinux? ( sec-policy/selinux-xserver )
 REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !wayland ) xephyr? ( kdrive )
 SLOT=0/9999
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=4a3b4ce019c1ee0695dce568af6f10d5
+_md5_=1801d96c9cb2f57241fab429e54e7f98
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 3337db764198..dff05c6a06da 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/goocanvas-2.0.4-r1 b/metadata/md5-cache/x11-libs/goocanvas-2.0.4-r1
index 8664ceae1cd5..8e0006a08cd8 100644
--- a/metadata/md5-cache/x11-libs/goocanvas-2.0.4-r1
+++ b/metadata/md5-cache/x11-libs/goocanvas-2.0.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Canvas widget for GTK+ using the cairo 2D library for drawing
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/GooCanvas
 IUSE=examples +introspection
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2
 RDEPEND=>=x11-libs/gtk+-3.0.0:3 >=dev-libs/glib-2.28.0:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/goocanvas/2.0/goocanvas-2.0.4.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=96c19022b32ce7e3a75ce0adc62b0641
+_md5_=b2d7308b052b17e25199b674910dd411
diff --git a/metadata/md5-cache/x11-libs/libX11-1.7.0 b/metadata/md5-cache/x11-libs/libX11-1.7.0
index 05f55dafd431..44781125b88e 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.7.0
+++ b/metadata/md5-cache/x11-libs/libX11-1.7.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.0.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=7731ee37eec67ea01b314c8084c27b64
+_md5_=0ff3f1243981dd38777a015e84e4d10e
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index c2ad97a1aecb..e1a01ad1b3c0 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/arandr-0.1.10 b/metadata/md5-cache/x11-misc/arandr-0.1.10
index 8fa988ae7add..3b9ac6bdfda2 100644
--- a/metadata/md5-cache/x11-misc/arandr-0.1.10
+++ b/metadata/md5-cache/x11-misc/arandr-0.1.10
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pygobject:3=[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://christian.amsuess.com/tools/arandr/files/arandr-0.1.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c20722189b5ff0c9af7e4140ff9fcc1b
diff --git a/metadata/md5-cache/x11-misc/cbatticon-1.6.10 b/metadata/md5-cache/x11-misc/cbatticon-1.6.10
index ca3b7d6541f0..556e5506d054 100644
--- a/metadata/md5-cache/x11-misc/cbatticon-1.6.10
+++ b/metadata/md5-cache/x11-misc/cbatticon-1.6.10
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight and fast battery icon that sits in your system tray
 EAPI=6
 HOMEPAGE=https://github.com/valr/cbatticon
 IUSE=libnotify
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 libnotify? ( x11-libs/libnotify )
 SLOT=0
 SRC_URI=https://github.com/valr/cbatticon/archive/1.6.10.tar.gz -> cbatticon-1.6.10.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3202a1a788bb26f785b6a8b732c2e370
+_md5_=65581716fc612a523f8e60ad87eb8838
diff --git a/metadata/md5-cache/x11-misc/grub2-theme-preview-1.4.2 b/metadata/md5-cache/x11-misc/grub2-theme-preview-1.4.2
index c18a1a1b096e..e2686dba4dc4 100644
--- a/metadata/md5-cache/x11-misc/grub2-theme-preview-1.4.2
+++ b/metadata/md5-cache/x11-misc/grub2-theme-preview-1.4.2
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/qemu dev-libs/libisoburn sys-fs/mtools sys-boot/grub:2[gru
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/hartwork/grub2-theme-preview/archive/1.4.2.tar.gz -> grub2-theme-preview-1.4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=25b5491785109294cddbf1dcf3470671
diff --git a/metadata/md5-cache/x11-misc/grub2-theme-preview-1.5.1 b/metadata/md5-cache/x11-misc/grub2-theme-preview-1.5.1
index 81ef5549f546..3afab96aefed 100644
--- a/metadata/md5-cache/x11-misc/grub2-theme-preview-1.5.1
+++ b/metadata/md5-cache/x11-misc/grub2-theme-preview-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/qemu dev-python/distro[python_targets_python3_6(-)?,python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/hartwork/grub2-theme-preview/archive/1.5.1.tar.gz -> grub2-theme-preview-1.5.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f744235e38cf5be1f118fb6107c4db88
diff --git a/metadata/md5-cache/x11-misc/grub2-theme-preview-2.1.0 b/metadata/md5-cache/x11-misc/grub2-theme-preview-2.1.0
new file mode 100644
index 000000000000..75499497d04a
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/grub2-theme-preview-2.1.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Preview a GRUB 2.x theme using KVM/QEMU
+EAPI=7
+HOMEPAGE=https://github.com/hartwork/grub2-theme-preview
+IUSE=grub_platforms_efi-64 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-emulation/qemu dev-python/distro[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-libs/libisoburn sys-fs/mtools grub_platforms_efi-64? ( sys-boot/grub:2[grub_platforms_efi-64] sys-firmware/edk2-ovmf ) !grub_platforms_efi-64? ( sys-boot/grub:2[grub_platforms_pc] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/hartwork/grub2-theme-preview/archive/2.1.0.tar.gz -> grub2-theme-preview-2.1.0.tar.gz
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1dc3e4418e25ef475fcb94a18a3e497c
diff --git a/metadata/md5-cache/x11-misc/hsetroot-1.0.5 b/metadata/md5-cache/x11-misc/hsetroot-1.0.5
index b47315a5ede5..5c205b94ba9d 100644
--- a/metadata/md5-cache/x11-misc/hsetroot-1.0.5
+++ b/metadata/md5-cache/x11-misc/hsetroot-1.0.5
@@ -4,10 +4,10 @@ DEPEND=>=media-libs/imlib2-1.0.6.2003[X] x11-libs/libX11 x11-libs/libXinerama x1
 DESCRIPTION=Tool which allows you to compose wallpapers ('root pixmaps') for X
 EAPI=7
 HOMEPAGE=https://github.com/himdel/hsetroot/
-KEYWORDS=~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/imlib2-1.0.6.2003[X] x11-libs/libX11 x11-libs/libXinerama
 SLOT=0
 SRC_URI=https://github.com/himdel/hsetroot/archive/1.0.5.tar.gz -> hsetroot-1.0.5.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2fc09dc3db657eda3f2c5e90821b693b
+_md5_=d6631c11130be221cf356ac740d584cc
diff --git a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
index 9c3542f713ce..c6bf77088e5f 100644
--- a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
+++ b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
@@ -5,10 +5,10 @@ DESCRIPTION=LightDM GTK+ Greeter
 EAPI=7
 HOMEPAGE=https://github.com/Xubuntu/lightdm-gtk-greeter
 IUSE=appindicator branding
-KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=~alpha amd64 arm arm64 ppc ppc64 x86
 LICENSE=GPL-3 LGPL-3 branding? ( CC-BY-3.0 )
 RDEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1
 SLOT=0
 SRC_URI=https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-2.0.8/lightdm-gtk-greeter-2.0.8.tar.gz branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=086be545c04bdd49113ac38ce3297882
+_md5_=f7ad2fe1e26ac04a0dd03ba2c0ef38f1
diff --git a/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2 b/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
index df68c1bf3268..89d3503a98ae 100644
--- a/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
+++ b/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gobject-introspection dev-python/psutil[python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://launchpad.net/menulibre/2.2/2.2.1/+download/menulibre-2.2.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d6d46be79d8a9c81d79819141520c1ed
diff --git a/metadata/md5-cache/x11-misc/mozo-1.24.0-r1 b/metadata/md5-cache/x11-misc/mozo-1.24.0-r1
index 6145ea211c3d..9f11df80ad60 100644
--- a/metadata/md5-cache/x11-misc/mozo-1.24.0-r1
+++ b/metadata/md5-cache/x11-misc/mozo-1.24.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Mozo menu editor for MATE
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pygobject-3:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=mate-base/mate-menus-1.21.0[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.22:3[introspection] !!x11-misc/mate-menu-editor virtual/libintl
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/mozo-1.24.0.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=905bf322481072fa68b35ef491aa2db0
+_md5_=f89e879abee9ec1b8329035cabb59688
diff --git a/metadata/md5-cache/x11-misc/mugshot-0.4.2-r1 b/metadata/md5-cache/x11-misc/mugshot-0.4.2-r1
index 36b989867f68..d64a21882f73 100644
--- a/metadata/md5-cache/x11-misc/mugshot-0.4.2-r1
+++ b/metadata/md5-cache/x11-misc/mugshot-0.4.2-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gobject-introspection dev-python/dbus-python[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/bluesabre/mugshot/archive/mugshot-0.4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8c27cb12b44e920519e40ac68333b5ea
diff --git a/metadata/md5-cache/x11-misc/py3status-3.31 b/metadata/md5-cache/x11-misc/py3status-3.31
index c3cf67bb67e3..4aa60d7ed505 100644
--- a/metadata/md5-cache/x11-misc/py3status-3.31
+++ b/metadata/md5-cache/x11-misc/py3status-3.31
@@ -10,5 +10,5 @@ RDEPEND=x11-misc/i3status gevent? ( >=dev-python/gevent-1.2.0[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ultrabug/py3status/archive/3.31.tar.gz -> py3status-3.31.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0cd85807da5159581d1e235bd674b0b
diff --git a/metadata/md5-cache/x11-misc/safeeyes-2.0.8 b/metadata/md5-cache/x11-misc/safeeyes-2.0.8
index 6645e39a71fb..373dd26ef4a3 100644
--- a/metadata/md5-cache/x11-misc/safeeyes-2.0.8
+++ b/metadata/md5-cache/x11-misc/safeeyes-2.0.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/safeeyes/safeeyes-2.0.8.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b14e806d1d853521c33f6cd67f1af559
diff --git a/metadata/md5-cache/x11-misc/safeeyes-2.0.8.1 b/metadata/md5-cache/x11-misc/safeeyes-2.0.8.1
index 6821774e8922..78f7bee31e6f 100644
--- a/metadata/md5-cache/x11-misc/safeeyes-2.0.8.1
+++ b/metadata/md5-cache/x11-misc/safeeyes-2.0.8.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/safeeyes/safeeyes-2.0.8.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b14e806d1d853521c33f6cd67f1af559
diff --git a/metadata/md5-cache/x11-misc/safeeyes-2.0.9 b/metadata/md5-cache/x11-misc/safeeyes-2.0.9
index a8f2af1a9bef..467ecbfc47a6 100644
--- a/metadata/md5-cache/x11-misc/safeeyes-2.0.9
+++ b/metadata/md5-cache/x11-misc/safeeyes-2.0.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/safeeyes/safeeyes-2.0.9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b14e806d1d853521c33f6cd67f1af559
diff --git a/metadata/md5-cache/x11-misc/spnavcfg-0.3.1 b/metadata/md5-cache/x11-misc/spnavcfg-0.3.1
new file mode 100644
index 000000000000..d84c9649fc9f
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/spnavcfg-0.3.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure
+DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
+DESCRIPTION=GTK-based GUI to configure a space navigator device
+EAPI=7
+HOMEPAGE=http://spacenav.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=x11-libs/gtk+:2 app-misc/spacenavd[X]
+SLOT=0
+SRC_URI=mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/spnavcfg%200.3.1/spnavcfg-0.3.1.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a268f74c2b44473c4726d169d58a8d6d
diff --git a/metadata/md5-cache/x11-misc/sunflower-0.4_p20200716-r1 b/metadata/md5-cache/x11-misc/sunflower-0.4_p20200716-r1
index 12812a202774..6b18a7005c9a 100644
--- a/metadata/md5-cache/x11-misc/sunflower-0.4_p20200716-r1
+++ b/metadata/md5-cache/x11-misc/sunflower-0.4_p20200716-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 ) || ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slashbeast/distfiles/sunflower/sunflower-0.4_p20200716.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9aeff0a8aa92c17ef1e9baaa1a01fbf2
diff --git a/metadata/md5-cache/x11-misc/synergy-1.9.1-r1 b/metadata/md5-cache/x11-misc/synergy-1.9.1-r1
index 8e20e70ddf04..db0a83f3681a 100644
--- a/metadata/md5-cache/x11-misc/synergy-1.9.1-r1
+++ b/metadata/md5-cache/x11-misc/synergy-1.9.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Lets you easily share a single mouse and keyboard between multiple c
 EAPI=6
 HOMEPAGE=https://symless.com/synergy https://github.com/symless/synergy-core
 IUSE=libressl qt5 test test
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) net-misc/curl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXtst qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-dns/avahi[mdnsresponder-compat] ) qt5? ( !x11-misc/qsynergy )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/symless/synergy-core/archive/v1.9.1-stable.tar.gz -> synergy-1.9.1.tar.gz https://dev.gentoo.org/~jer/synergy.png
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a313fad3874719c2d9e2edac8448eb2
+_md5_=aa35b73d372cb112ab5b73a4f1c04a3e
diff --git a/metadata/md5-cache/x11-misc/xautomation-1.09-r1 b/metadata/md5-cache/x11-misc/xautomation-1.09-r1
index fb7f870c674a..d3d19b21f297 100644
--- a/metadata/md5-cache/x11-misc/xautomation-1.09-r1
+++ b/metadata/md5-cache/x11-misc/xautomation-1.09-r1
@@ -3,9 +3,9 @@ DEPEND=>=media-libs/libpng-1.2:0 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst
 DESCRIPTION=Control X from command line and find things on screen
 EAPI=6
 HOMEPAGE=https://hoopajoo.net/projects/xautomation.html
-KEYWORDS=amd64 ~arm ppc x86
+KEYWORDS=amd64 ~arm ~arm64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2:0 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst
 SLOT=0
 SRC_URI=https://hoopajoo.net/static/projects/xautomation-1.09.tar.gz
-_md5_=3f2525cc008269765b77f39322f5c1fc
+_md5_=14885931071d8b923cb73c0bd970d6fc
diff --git a/metadata/md5-cache/x11-misc/xdiskusage-1.52 b/metadata/md5-cache/x11-misc/xdiskusage-1.52
index 575762fd8a51..a709ef524395 100644
--- a/metadata/md5-cache/x11-misc/xdiskusage-1.52
+++ b/metadata/md5-cache/x11-misc/xdiskusage-1.52
@@ -4,9 +4,9 @@ DEPEND=>=x11-libs/fltk-1.3:1
 DESCRIPTION=user-friendly program to show you what is using up all your disk space
 EAPI=7
 HOMEPAGE=http://xdiskusage.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/fltk-1.3:1
 SLOT=0
 SRC_URI=http://xdiskusage.sourceforge.net/xdiskusage-1.52.tgz
-_md5_=8fc5f306d3001c570dbdddbeaeef184e
+_md5_=6d30c8881985cf461342c89033b4cb65
diff --git a/metadata/md5-cache/x11-misc/xflux-gui-1.2.0-r1 b/metadata/md5-cache/x11-misc/xflux-gui-1.2.0-r1
index ea1931f60e11..34275204f5ab 100644
--- a/metadata/md5-cache/x11-misc/xflux-gui-1.2.0-r1
+++ b/metadata/md5-cache/x11-misc/xflux-gui-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libappindicator:3 dev-python/pexpect[python_targets_python3_6(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/xflux-gui/fluxgui/archive/v1.2.0.tar.gz -> xflux-gui-1.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7efe0418a0d4880374f2ca2f53f12e65
diff --git a/metadata/md5-cache/x11-misc/xsnow-3.0.7 b/metadata/md5-cache/x11-misc/xsnow-3.0.7
index 964a10b3530b..0ff2328116c0 100644
--- a/metadata/md5-cache/x11-misc/xsnow-3.0.7
+++ b/metadata/md5-cache/x11-misc/xsnow-3.0.7
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-libs/libxml2 sys-apps/dbus x11-libs/gtk+:3 x11-libs/l
 DESCRIPTION=let it snow on your desktop and windows
 EAPI=7
 HOMEPAGE=https://janswaal.home.xs4all.nl/Xsnow/ https://sourceforge.net/projects/xsnow/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 sparc x86
 LICENSE=freedist
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2 sys-apps/dbus x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXpm
 SLOT=0
 SRC_URI=mirror://sourceforge/xsnow/3.0.7/xsnow-3.0.7.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=326bcdc8a2cea7e6a075abd422c5121f
+_md5_=73b0253e1cfb23626795a9389292d0e3
diff --git a/metadata/md5-cache/x11-misc/zim-0.73.1 b/metadata/md5-cache/x11-misc/zim-0.73.1
index cce6c594c2ff..fe044f1ec3f8 100644
--- a/metadata/md5-cache/x11-misc/zim-0.73.1
+++ b/metadata/md5-cache/x11-misc/zim-0.73.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.73.1.tar.gz -> zim-0.73.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9ef94a646185658801580d4119486ada
diff --git a/metadata/md5-cache/x11-misc/zim-0.73.2 b/metadata/md5-cache/x11-misc/zim-0.73.2
index f342e26424d0..39fcb2f0154b 100644
--- a/metadata/md5-cache/x11-misc/zim-0.73.2
+++ b/metadata/md5-cache/x11-misc/zim-0.73.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.73.2.tar.gz -> zim-0.73.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=387d320c691599bef154ac59f16a7f4a
diff --git a/metadata/md5-cache/x11-misc/zim-0.73.3 b/metadata/md5-cache/x11-misc/zim-0.73.3
index bc336b4963a4..bd788ef18402 100644
--- a/metadata/md5-cache/x11-misc/zim-0.73.3
+++ b/metadata/md5-cache/x11-misc/zim-0.73.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.73.3.tar.gz -> zim-0.73.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=387d320c691599bef154ac59f16a7f4a
diff --git a/metadata/md5-cache/x11-misc/zim-0.73.4 b/metadata/md5-cache/x11-misc/zim-0.73.4
index 0d9cb13181e6..7f3d29f7e0f0 100644
--- a/metadata/md5-cache/x11-misc/zim-0.73.4
+++ b/metadata/md5-cache/x11-misc/zim-0.73.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.73.4.tar.gz -> zim-0.73.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4e6a0dd3f079b5dbb1fca3ec3fd639a
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index af592b784e8d..33aaee1e64c4 100644
Binary files a/metadata/md5-cache/x11-plugins/Manifest.gz and b/metadata/md5-cache/x11-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-plugins/wmbattery-2.54 b/metadata/md5-cache/x11-plugins/wmbattery-2.54
index d3991ff228c9..c1a9840d9d08 100644
--- a/metadata/md5-cache/x11-plugins/wmbattery-2.54
+++ b/metadata/md5-cache/x11-plugins/wmbattery-2.54
@@ -5,9 +5,9 @@ DESCRIPTION=A dockable app to report APM, ACPI, or SPIC battery status
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmbattery
 IUSE=apm +upower
-KEYWORDS=~amd64 ~ppc -sparc ~x86
+KEYWORDS=~amd64 ~ppc -sparc x86
 LICENSE=GPL-2
 RDEPEND=apm? ( sys-apps/apmd ) x11-libs/libX11 x11-libs/libXext x11-libs/libXpm upower? ( >=sys-power/upower-0.9.23 )
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmbattery-2.54.tar.gz
-_md5_=96520aa25619f27dbff6085bdc8f15d7
+_md5_=c6daee0be92623b5ec28803bc1d81a98
diff --git a/metadata/md5-cache/x11-plugins/wmbiff-0.4.36 b/metadata/md5-cache/x11-plugins/wmbiff-0.4.36
index 6c5411660fa8..370b310739aa 100644
--- a/metadata/md5-cache/x11-plugins/wmbiff-0.4.36
+++ b/metadata/md5-cache/x11-plugins/wmbiff-0.4.36
@@ -5,9 +5,9 @@ DESCRIPTION=WMBiff is a dock applet for WindowMaker which can monitor up to 5 ma
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmbiff
 IUSE=crypt
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1:0 >=net-libs/gnutls-2.2.0 )
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmbiff-0.4.36.tar.gz
-_md5_=d62feee52e99625180f09f9aa1e2dcff
+_md5_=63a30c09c810f67fcdad22ccdf722eed
diff --git a/metadata/md5-cache/x11-plugins/wmblob-1.0.4 b/metadata/md5-cache/x11-plugins/wmblob-1.0.4
index 57b82716b7c3..83596e560f01 100644
--- a/metadata/md5-cache/x11-plugins/wmblob-1.0.4
+++ b/metadata/md5-cache/x11-plugins/wmblob-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXpm x11-libs/libXext virtual/
 DESCRIPTION=a fancy but useless dockapp with moving blobs
 EAPI=6
 HOMEPAGE=https://github.com/bbidulock/wmblob
-KEYWORDS=~amd64 ppc ~sparc ~x86
+KEYWORDS=~amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
 SLOT=0
 SRC_URI=https://github.com/bbidulock/wmblob/releases/download/1.0.4/wmblob-1.0.4.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=55265115a31c749bd98064c26cf9c3bd
+_md5_=f021b7fd9ba4cdf9001e1e78dc04acc8
diff --git a/metadata/md5-cache/x11-plugins/wmbutton-0.7.1 b/metadata/md5-cache/x11-plugins/wmbutton-0.7.1
index c18abd94d1ec..d0af7833a5c3 100644
--- a/metadata/md5-cache/x11-plugins/wmbutton-0.7.1
+++ b/metadata/md5-cache/x11-plugins/wmbutton-0.7.1
@@ -4,9 +4,9 @@ DESCRIPTION=a dockapp application that displays nine configurable buttons
 EAPI=6
 HOMEPAGE=https://www.dockapps.net/wmbutton
 IUSE=branding
-KEYWORDS=~amd64 ~ppc sparc ~x86
+KEYWORDS=~amd64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmbutton-0.7.1.tar.gz
-_md5_=b4c53cb0df07fd53cb9515999cbba191
+_md5_=386f57c067d748e5362f524f41cfaba5
diff --git a/metadata/md5-cache/x11-plugins/wmix-3.5 b/metadata/md5-cache/x11-plugins/wmix-3.5
index d678813861a8..0af9e7ef7587 100644
--- a/metadata/md5-cache/x11-plugins/wmix-3.5
+++ b/metadata/md5-cache/x11-plugins/wmix-3.5
@@ -3,9 +3,9 @@ DEPEND=media-libs/alsa-lib x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-
 DESCRIPTION=Dockapp mixer for OSS or ALSA
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmix
-KEYWORDS=~amd64 ~ppc sparc ~x86
+KEYWORDS=~amd64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrandr
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmix-3.5.tar.gz
-_md5_=d31e8111cb1b63ccac05dceea2dbea07
+_md5_=7da0863094b91997514b3e9de2d7e964
diff --git a/metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r1 b/metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r1
index 170190953275..b77748d7dddb 100644
--- a/metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r1
+++ b/metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 x11-libs/libXpm virtual/pkgconfig
 DESCRIPTION=dockapp that monitors one or more mailboxes
 EAPI=6
 HOMEPAGE=http://tnemeth.free.fr/projets/dockapps.html
-KEYWORDS=~amd64 ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/libXpm
 SLOT=0
 SRC_URI=http://tnemeth.free.fr/projets/programmes/wmmaiload-2.3.0.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b5c48c0062183dd39bee81421df3f402
+_md5_=cfd10129c8dfcd19d8e6c5271be1d885
diff --git a/metadata/md5-cache/x11-plugins/wmpasman-2.2 b/metadata/md5-cache/x11-plugins/wmpasman-2.2
index d82cac3960d6..478708f473de 100644
--- a/metadata/md5-cache/x11-plugins/wmpasman-2.2
+++ b/metadata/md5-cache/x11-plugins/wmpasman-2.2
@@ -3,9 +3,9 @@ DEPEND=app-crypt/libsecret >=x11-libs/gtk+-3.8.0:3 virtual/pkgconfig
 DESCRIPTION=Password storage/retrieval in a dockapp
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/wmpasman/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=app-crypt/libsecret >=x11-libs/gtk+-3.8.0:3
 SLOT=0
 SRC_URI=mirror://sourceforge/wmpasman/wmpasman-2.2.tar.gz
-_md5_=24c77babb065ed1ff4ee9a93d4cb2046
+_md5_=a3192da2f5fbdfe56e3faaf64b615ba1
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 2be5dfc9b890..5bb50f585996 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/guake-3.7.0 b/metadata/md5-cache/x11-terms/guake-3.7.0
index 78222345278a..19968a26457c 100644
--- a/metadata/md5-cache/x11-terms/guake-3.7.0
+++ b/metadata/md5-cache/x11-terms/guake-3.7.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] python_single_target_p
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/guake/guake-3.7.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07645a8c76d789615e26c7d7c92a6b9b
diff --git a/metadata/md5-cache/x11-terms/guake-9999 b/metadata/md5-cache/x11-terms/guake-9999
index 89acd812289a..ea5e185bab2d 100644
--- a/metadata/md5-cache/x11-terms/guake-9999
+++ b/metadata/md5-cache/x11-terms/guake-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pbr[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pbr[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] ) x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f5f6556fed4240ce058d984e503765c1
diff --git a/metadata/md5-cache/x11-terms/terminator-2.0.1 b/metadata/md5-cache/x11-terms/terminator-2.0.1
index 3ef10f2acd89..8ed827388fc7 100644
--- a/metadata/md5-cache/x11-terms/terminator-2.0.1
+++ b/metadata/md5-cache/x11-terms/terminator-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gnome-terminator/terminator/archive/v2.0.1.tar.gz -> terminator-2.0.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c1eb5e04d58cc5b54978b82b3ca14cab
diff --git a/metadata/md5-cache/x11-terms/tilda-1.5.2 b/metadata/md5-cache/x11-terms/tilda-1.5.2
index ca72f1559af8..afd6755eaaea 100644
--- a/metadata/md5-cache/x11-terms/tilda-1.5.2
+++ b/metadata/md5-cache/x11-terms/tilda-1.5.2
@@ -4,10 +4,10 @@ DEPEND=x11-libs/vte:2.91 >=dev-libs/glib-2.8.4:2 dev-libs/confuse:= gnome-base/l
 DESCRIPTION=A drop down terminal, similar to the consoles found in first person shooters
 EAPI=7
 HOMEPAGE=https://github.com/lanoxx/tilda
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/vte:2.91 >=dev-libs/glib-2.8.4:2 dev-libs/confuse:= gnome-base/libglade x11-libs/gtk+:3 x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/lanoxx/tilda/archive/tilda-1.5.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=56276dccf4cfc2e7744bce387b555737
+_md5_=65241ea6c6520778d8faeffcf8b434b4
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 48ddcf0215f6..d74dd1699811 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1 b/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1
index 027aeb7deeb1..713b624ebf17 100644
--- a/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1
+++ b/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1
@@ -3,11 +3,11 @@ DESCRIPTION=A scalable icon theme called Faenza
 EAPI=5
 HOMEPAGE=http://tiheum.deviantart.com/art/Faenza-Icons-173323228
 IUSE=minimal
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-3
 RDEPEND=!minimal? ( x11-themes/adwaita-icon-theme ) x11-themes/hicolor-icon-theme
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/faenza-icon-theme/faenza-icon-theme_1.3.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3509f6ab1d3040b8dcfbec54dd149b7a
+_md5_=ff090980882aa8aa0c74ac6f87f852db
diff --git a/metadata/md5-cache/x11-themes/gtk-chtheme-0.3.1-r3 b/metadata/md5-cache/x11-themes/gtk-chtheme-0.3.1-r3
index c89b5a95fd2c..60ba2a2f0d7a 100644
--- a/metadata/md5-cache/x11-themes/gtk-chtheme-0.3.1-r3
+++ b/metadata/md5-cache/x11-themes/gtk-chtheme-0.3.1-r3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
 DESCRIPTION=GTK-2.0 Theme Switcher
 EAPI=6
 HOMEPAGE=http://plasmasturm.org/programs/gtk-chtheme/
-KEYWORDS=amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://plasmasturm.org/programs/gtk-chtheme/gtk-chtheme-0.3.1.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=674c1844bf67d5f4d583992a7e00022e
+_md5_=6c2a017e0c00add0dff20fa4294aca1b
diff --git a/metadata/md5-cache/x11-themes/wm-icons-0.4.0 b/metadata/md5-cache/x11-themes/wm-icons-0.4.0
index 97f87842c8d8..67c822c42c9e 100644
--- a/metadata/md5-cache/x11-themes/wm-icons-0.4.0
+++ b/metadata/md5-cache/x11-themes/wm-icons-0.4.0
@@ -3,10 +3,10 @@ DEPEND=virtual/awk dev-lang/perl
 DESCRIPTION=A Large Assortment of Beautiful Themed Icons, Created with FVWM in mind
 EAPI=6
 HOMEPAGE=http://wm-icons.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/awk dev-lang/perl
 SLOT=0
 SRC_URI=mirror://sourceforge/wm-icons/wm-icons-0.4.0.tar.bz2
 _eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=1fbdf2267be41bbdeac94e29c9e53f4b
+_md5_=6907fb04ff4b386ee66c628f1956dec8
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index e49ccfa60ec5..5c1cb6b5da7d 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-0.9.0 b/metadata/md5-cache/x11-wm/herbstluftwm-0.9.0
new file mode 100644
index 000000000000..a797e5f97ee9
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-0.9.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( app-text/asciidoc ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr
+DESCRIPTION=A manual tiling window manager for X
+EAPI=7
+HOMEPAGE=https://herbstluftwm.org/
+IUSE=doc examples
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr app-shells/bash
+SLOT=0
+SRC_URI=https://herbstluftwm.org/tarballs/herbstluftwm-0.9.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c52ede9f9b05ad470c1d6f672da8c184
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-9999 b/metadata/md5-cache/x11-wm/herbstluftwm-9999
index 054b93ad2eff..9257ec1ed447 100644
--- a/metadata/md5-cache/x11-wm/herbstluftwm-9999
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( app-text/asciidoc ) >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=virtual/pkgconfig doc? ( app-text/asciidoc ) >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr
 DESCRIPTION=A manual tiling window manager for X
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr app-shells/bash
 SLOT=0
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=336c1c30ebd7621fa9ef7be9c1990428
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=23484f971c566ae1013bd9b1c1400259
diff --git a/metadata/md5-cache/x11-wm/qtile-0.15.1 b/metadata/md5-cache/x11-wm/qtile-0.15.1
index ee0f4342296d..865193e10960 100644
--- a/metadata/md5-cache/x11-wm/qtile-0.15.1
+++ b/metadata/md5-cache/x11-wm/qtile-0.15.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/qtile/qtile/archive/v0.15.1.tar.gz -> qtile-0.15.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
 _md5_=cbc3ebad0d5cf9e9daa6dac10fe41c4e
diff --git a/metadata/md5-cache/x11-wm/qtile-0.16.1 b/metadata/md5-cache/x11-wm/qtile-0.16.1
index 4c80a6af18ca..ba906202e27e 100644
--- a/metadata/md5-cache/x11-wm/qtile-0.16.1
+++ b/metadata/md5-cache/x11-wm/qtile-0.16.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/q/qtile/qtile-0.16.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	f847d402a7ecea58af1958f5b4ec23da	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8b97bc034f983b656ad8a93bf44fb34b
diff --git a/metadata/md5-cache/x11-wm/xpra-3.0.2-r1 b/metadata/md5-cache/x11-wm/xpra-3.0.2-r1
index a82bd61007a2..c6fcd21f127d 100644
--- a/metadata/md5-cache/x11-wm/xpra-3.0.2-r1
+++ b/metadata/md5-cache/x11-wm/xpra-3.0.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) clipboard?
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-3.0.2.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e056d1962b00ff7fc620c7a7d2d246ee
diff --git a/metadata/md5-cache/x11-wm/xpra-3.0.5-r2 b/metadata/md5-cache/x11-wm/xpra-3.0.5-r2
index e5a4be2fcc48..a25625641e93 100644
--- a/metadata/md5-cache/x11-wm/xpra-3.0.5-r2
+++ b/metadata/md5-cache/x11-wm/xpra-3.0.5-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-3.0.5.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=37f3339acf760ad5bcf15f8e8cbd48ba
diff --git a/metadata/md5-cache/x11-wm/xpra-4.0.4 b/metadata/md5-cache/x11-wm/xpra-4.0.4
index d581f8a125f3..6d660a72c77c 100644
--- a/metadata/md5-cache/x11-wm/xpra-4.0.4
+++ b/metadata/md5-cache/x11-wm/xpra-4.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-4.0.4.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	f847d402a7ecea58af1958f5b4ec23da	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa183eebb1700d5bed8a62ca17564f89
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 69a61bdc4873..623f35e2b31c 100644
Binary files a/metadata/md5-cache/xfce-extra/Manifest.gz and b/metadata/md5-cache/xfce-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.1 b/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.1
index dc5f7df84c8d..812655faea7a 100644
--- a/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.1
+++ b/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.1
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/glib-2.18 >=x11-libs/gtk+-3.22:3 >=xfce-base/thunar-1.7:= dev-
 DESCRIPTION=Thunar plugin to share files using Samba
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-shares-plugin
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18 >=x11-libs/gtk+-3.22:3 >=xfce-base/thunar-1.7:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/thunar-plugins/thunar-shares-plugin/0.3/thunar-shares-plugin-0.3.1.tar.bz2
-_md5_=779aaeed03777ffc2e76435590c428b8
+_md5_=1c9673c9cb94ef689f704b6c928f213f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.2 b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.2
index 90f255532364..0950823d46a7 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.1
 DESCRIPTION=A panel plugin for showing information about cpufreq settings
 EAPI=7
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin
-KEYWORDS=amd64 ~arm ppc ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpufreq-plugin/1.2/xfce4-cpufreq-plugin-1.2.2.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25d788aa0034185e7cdbafe2486b1a0b
+_md5_=1467981cc860f543ce4aff10df0aa09c
diff --git a/metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-2.3.4 b/metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-2.3.4
index 02acda43508f..1908283003f6 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-2.3.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-2.3.4
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libindicator-12.10.1:3= >=x11-libs/gtk+-3.18:3= x11-libs/libX1
 DESCRIPTION=A panel plugin that uses indicator-applet to show new messages
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-indicator-plugin
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-libs/libindicator-12.10.1:3= >=x11-libs/gtk+-3.18:3= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfce4-panel-4.11:= >=xfce-base/xfconf-4.13:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-indicator-plugin/2.3/xfce4-indicator-plugin-2.3.4.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ec30a9b45201203432bcd7780a9523a4
+_md5_=f6a21a7c9750449f648906d134d3c1be
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.7 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.7
index e07a152e235d..957409675ef8 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.7
+++ b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.7
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2.
 DESCRIPTION=Xfce4 screenshooter application and panel plugin
 EAPI=7
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-screenshooter
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2.16:= >=x11-libs/gtk+-3.20:3= dev-libs/libxml2:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXfixes:= >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.7.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=706f8417fda82c1f43b06611c8808aaa
+_md5_=b06a02e807135a32e4ddc511a36530f6
diff --git a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.3 b/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.3
index 3f6eda9b509c..4e5f2e1572c6 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.3
@@ -4,9 +4,9 @@ DESCRIPTION=System load plug-in for Xfce panel
 EAPI=7
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin
 IUSE=upower
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= upower? ( >=sys-power/upower-0.9.23 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.2/xfce4-systemload-plugin-1.2.3.tar.bz2
-_md5_=f44ac99638efa2e3b9c828cb92129b18
+_md5_=669fe9b4b14726c950eb17e042005d91
diff --git a/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.1 b/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.1
index 558548c09a8e..777ac36bacec 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.1
@@ -3,9 +3,9 @@ DEPEND=gnome-base/librsvg:= x11-libs/gtk+:3= x11-libs/libwnck:3= x11-libs/libX11
 DESCRIPTION=XKB layout switching panel plug-in for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2 GPL-2+
 RDEPEND=gnome-base/librsvg:= x11-libs/gtk+:3= x11-libs/libwnck:3= x11-libs/libX11:= >=x11-libs/libxklavier-5.4:= xfce-base/garcon:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.12.1:= x11-apps/setxkbmap >=xfce-base/xfce4-settings-4.11
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/0.8/xfce4-xkb-plugin-0.8.1.tar.bz2
-_md5_=c5d895ffb0f8d5a62e8a94dad000be24
+_md5_=42d18906cd15dab0faa68181d7c8ec71
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 85da253f13b4..7ccc0d1777b0 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 12077 BLAKE2B 2f3ed2165704c3f21cd4304fe3c7b1c7220549685a7eaa2b3e7c032afad54f4636d2f0b3a9ec4d5d71d15b7b035403e2ef7a90326cff0da0eaf8ffd7e4fac1aa SHA512 f30fcba11723fbc57f0bea029403880a3ba6f50c0d547ae57a3947cb791df5cb0e16dcf31a4810562ece91b1fc646aa82b76a7ef6f7a60e3a0bdd95f0bc0a165
-TIMESTAMP 2020-12-01T06:38:45Z
+TIMESTAMP 2020-12-03T08:08:31Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/F5PVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/InP9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAFJQ/5AXUuxHLR681w+A6syWIDHLAwNQsaxobWCFYS0bcpBIIN9EapxZ6/CjtW
-gi7Y6W8nmEQ11giVJA8ITibJTYZb8YhnizbUY9iTa2HieoGvp5gWAEoXJ4F9HKdH
-h5lPN/uqfRJBZzwpetMRmPtStDHvVGcqbD7N0nFLe0ihDIo5yfGaSEbpdTPQD+Mt
-KwtCoBIZtCFgea7Siwd5LTZQS9fSN27m0lOprDr6Y0Heoy3CAdA8dVxBPeX2EetL
-IrM3NI93POLhsRYEpviuEqCoryl4Ubu+JeLwufO9SAcr7/IhZYpz+8fu2Oz5mzoZ
-5jHNeb4Oc3hFkiEcis5G7KD4AjW7Db7brrPkS7t18nyJvSbiRXYQqP0ja1I/pfkr
-fb464nXbE+P125aZKa9WN8iDe1OxX3qMwjxre/sJg+dINW2+c3XqONexNdVtTH7o
-YVyext7X6jPD5a625VZ+Jgt0U1f2ojV0MBPbNXsXYYiWEMh1ZAss2L2RrOXe8iFb
-WgNdc4VxHCSPCiE5gBSLLHc9/VJcHahiypZXofmAj7AQDEMPUL5Gx+Y6ap5wqF1U
-JSbykeuTH/k5E5Jj20TJCO1tEZm3ryhsTEelJ34PhOicdLfZq+Cg15DEj436c9bk
-4sQzJW7fk3eG6BjG10vrM3CdYlalLh/bXEyZa4dpgW0WHXjeK8Q=
-=GH0L
+klCbgA//TwQfbp71piHfyCx+YvWkcCOTdTslRgktefNNY0ip/UeMWx46bGe8cvmd
+fuzYFL6IS1HDo8DRARdwGOV3dM+hdjNV4e3ToKkyo1hfZcvu9+vPyeRRAd3qyO0F
+TEwCxlLli6KuLq6/TnT2AoNuOWyLTyD8fP8I00kCp1juM6B7QqjWhTbZCih23g7c
+UfZrvC3C4Hl9P3Px7TWnFGycjn5+S9kwZSf51So2WARjgBIcb0Nb1xMoyqjvv178
+5yCw5TdIk1BD9dU2aBpHTFreLzraE/RZb1Ky98Yqn4Ge4HlZ8h+zAqmdgaBc8t16
+KDvctc7s4040j6vmAPMV3ks5UT2GcYnh4HtP/VK4NYQFOeR0iIPtFTakMGALjkwr
+VhjENd1Lxd4POkgUSDwHfdtfPIBK6yZvLGtYY/1AG7hKWkgvVyVsaHMn7RgA2DKp
+StKzM3D1ejpAqXZzjY3xWupm62o6g5rU2qNV8UtvsNQ9lV5sKoZ0YsrXgvAW67eN
+xD9Kx7vAFdTD3uEDsjloyNW3tCVr7Bfb/d29CYx1Ebgq0jxYhadceHMqYDYHPiNV
+U3uP7swr7VG3FSVPsnx9KQ1E085NPBxFgp7pUXYhRmtVLb1E3A66hjtpylSmjRiw
+4Jp42U31U0wDdDAIF7RgK0PS+i69UAkj1kNvNN3+8w8J7zLFJvs=
+=lJ0U
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index aef36d43bd8a..d9a9c1c834ea 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 01 Dec 2020 06:38:41 +0000
+Thu, 03 Dec 2020 08:08:28 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index d2e24c3c745b..30f15d463cb4 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue 01 Dec 2020 06:38:40 AM UTC
+Thu 03 Dec 2020 08:08:27 AM UTC
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 96ca6cb913cf..08d92c04c7bc 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -262,7 +262,7 @@
 2011290239 ./acct-group/sniproxy/sniproxy-0.ebuild
 2011290239 ./acct-group/ziproxy/ziproxy-0.ebuild
 2012010109 ./acct-group/dbmail/dbmail-0.ebuild
-2011302239 ./acct-group/gatling/gatling-0.ebuild
+2012011340 ./acct-group/gatling/gatling-0-r1.ebuild
 1909291839 ./acct-user/alias/alias-0.ebuild
 1910161039 ./acct-user/bacula/bacula-0.ebuild
 1909271939 ./acct-user/bitcoin/bitcoin-0.ebuild
@@ -506,7 +506,7 @@
 2011290239 ./acct-user/sniproxy/sniproxy-0.ebuild
 2011290239 ./acct-user/ziproxy/ziproxy-0.ebuild
 2012010109 ./acct-user/dbmail/dbmail-0.ebuild
-2011302239 ./acct-user/gatling/gatling-0.ebuild
+2012011340 ./acct-user/gatling/gatling-0-r1.ebuild
 2007201009 ./app-accessibility/accerciser/accerciser-3.36.2.ebuild
 2007290809 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild
 2011090239 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild
@@ -552,7 +552,7 @@
 2002101639 ./app-admin/ansible-lint/ansible-lint-4.1.0.ebuild
 2010280109 ./app-admin/ansible/ansible-2.10.0-r2.ebuild
 2010280109 ./app-admin/ansible/ansible-9999.ebuild
-2011032139 ./app-admin/ansible/ansible-2.10.1.ebuild
+2012031039 ./app-admin/ansible/ansible-2.10.1.ebuild
 2004032241 ./app-admin/apache-tools/apache-tools-2.4.41.ebuild
 2006221008 ./app-admin/apache-tools/apache-tools-2.4.43.ebuild
 2009010209 ./app-admin/apache-tools/apache-tools-2.4.46.ebuild
@@ -587,8 +587,8 @@
 1912111539 ./app-admin/chrpath/chrpath-0.13-r2.ebuild
 1910111840 ./app-admin/clog/clog-1.3.0.ebuild
 2006040938 ./app-admin/clsync/clsync-0.4.4.ebuild
-2011090239 ./app-admin/clsync/clsync-0.4.5.ebuild
 2011090239 ./app-admin/clsync/clsync-9999.ebuild
+2012020639 ./app-admin/clsync/clsync-0.4.5.ebuild
 2006201209 ./app-admin/clustershell/clustershell-1.8.3.ebuild
 2009211409 ./app-admin/conky/conky-1.10.8-r9.ebuild
 2011021309 ./app-admin/conky/conky-1.10.8-r10.ebuild
@@ -655,7 +655,7 @@
 2004032241 ./app-admin/gamin/gamin-0.1.10-r1.ebuild
 1904151609 ./app-admin/genromfs/genromfs-0.5.2.ebuild
 1905181309 ./app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.1-r1.ebuild
-2003211239 ./app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild
+2012020639 ./app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild
 2002112050 ./app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild
 2009240709 ./app-admin/github-backup-utils/github-backup-utils-2.22.0.ebuild
 2010081309 ./app-admin/gixy/gixy-0.1.20.ebuild
@@ -665,7 +665,7 @@
 2009302109 ./app-admin/glance/glance-2020.1.9999.ebuild
 2010200039 ./app-admin/glance/glance-20.0.1.ebuild
 2010200039 ./app-admin/glance/glance-2020.2.9999.ebuild
-2010200039 ./app-admin/glance/glance-21.0.0.ebuild
+2012021739 ./app-admin/glance/glance-21.0.0.ebuild
 2008250139 ./app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild
 2003261841 ./app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild
 1804260408 ./app-admin/go-updater/go-updater-0.2.0.ebuild
@@ -737,9 +737,9 @@
 2005201939 ./app-admin/mongo-tools/mongo-tools-4.2.6.ebuild
 2009271739 ./app-admin/mongo-tools/mongo-tools-4.2.8.ebuild
 2009290139 ./app-admin/mongo-tools/mongo-tools-4.0.19.ebuild
-2011091739 ./app-admin/mongo-tools/mongo-tools-100.2.0.ebuild
 2011091739 ./app-admin/mongo-tools/mongo-tools-4.0.20.ebuild
 2011091739 ./app-admin/mongo-tools/mongo-tools-4.2.10.ebuild
+2012030739 ./app-admin/mongo-tools/mongo-tools-100.2.0.ebuild
 1910130039 ./app-admin/monit/monit-5.25.3.ebuild
 1910130039 ./app-admin/monit/monit-5.26.0.ebuild
 2011031439 ./app-admin/monit/monit-5.27.0.ebuild
@@ -829,8 +829,8 @@
 2011190639 ./app-admin/salt/salt-3002.2.ebuild
 1909180239 ./app-admin/serf/serf-0.8.1-r1.ebuild
 2002151639 ./app-admin/setools/setools-4.2.2.ebuild
-2009150709 ./app-admin/setools/setools-4.3.0.ebuild
 2009150709 ./app-admin/setools/setools-9999.ebuild
+2012030639 ./app-admin/setools/setools-4.3.0.ebuild
 1710222014 ./app-admin/socklog/socklog-2.1.0.ebuild
 1808150339 ./app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.39.ebuild
 1811071809 ./app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.40.ebuild
@@ -841,14 +841,14 @@
 2011092139 ./app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.44.ebuild
 1910111840 ./app-admin/sshguard/sshguard-2.4.0.ebuild
 1908081109 ./app-admin/sshguard/sshguard-99999.ebuild
-2008011009 ./app-admin/sshguard/sshguard-2.4.1.ebuild
+2012030239 ./app-admin/sshguard/sshguard-2.4.1.ebuild
 1912110241 ./app-admin/stow/stow-2.2.2-r1.ebuild
 2008270139 ./app-admin/stow/stow-2.3.1.ebuild
 1801291909 ./app-admin/su-exec/su-exec-0.2.ebuild
 1712300140 ./app-admin/sud/sud-1.3-r1.ebuild
 2011041709 ./app-admin/sudo/sudo-9999.ebuild
 2011141239 ./app-admin/sudo/sudo-1.9.3_p1.ebuild
-2011302039 ./app-admin/sudo/sudo-1.9.4.ebuild
+2012011409 ./app-admin/sudo/sudo-1.9.4.ebuild
 2003261841 ./app-admin/superadduser/superadduser-1.15.ebuild
 2004211009 ./app-admin/superadduser/superadduser-1.0.9.ebuild
 2008112209 ./app-admin/supervisor/supervisor-4.2.0.ebuild
@@ -900,7 +900,7 @@
 2011101839 ./app-admin/graylog/graylog-3.3.8.ebuild
 2011272009 ./app-admin/graylog/graylog-4.0.1.ebuild
 2010280109 ./app-admin/ansible-base/ansible-base-2.10.2.ebuild
-2011031039 ./app-admin/ansible-base/ansible-base-2.10.3.ebuild
+2012031039 ./app-admin/ansible-base/ansible-base-2.10.3.ebuild
 2010011509 ./app-admin/xkcdpass/xkcdpass-1.17.3-r1.ebuild
 2010020009 ./app-admin/op-cli-bin/op-cli-bin-1.7.0.ebuild
 2011030939 ./app-admin/selint/selint-1.1.0.ebuild
@@ -959,6 +959,7 @@
 2003212239 ./app-arch/lcab/lcab-1.0_beta12.ebuild
 2006222138 ./app-arch/lha/lha-114i_p20201004.ebuild
 2008051739 ./app-arch/libarchive/libarchive-3.4.3.ebuild
+2012011439 ./app-arch/libarchive/libarchive-3.5.0.ebuild
 2011141839 ./app-arch/libpar2/libpar2-0.4.ebuild
 2007132139 ./app-arch/lrzip/lrzip-0.631_p20190619.ebuild
 2008311709 ./app-arch/lz4/lz4-1.9.2.ebuild
@@ -1040,7 +1041,7 @@
 2011142339 ./app-arch/wimlib/wimlib-1.13.0.ebuild
 1911031309 ./app-arch/xar/xar-1.8-r3.ebuild
 2004032241 ./app-arch/xar/xar-1.8-r2.ebuild
-2009140009 ./app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
+2012030239 ./app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
 2006150539 ./app-arch/xdms/xdms-1.3.2-r1.ebuild
 2005072209 ./app-arch/xz-utils/xz-utils-9999.ebuild
 2009181139 ./app-arch/xz-utils/xz-utils-5.2.5.ebuild
@@ -1256,7 +1257,8 @@
 2011302339 ./app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild
 2011302339 ./app-crypt/acme-tiny/acme-tiny-9999.ebuild
 2010020039 ./app-crypt/acme/acme-9999.ebuild
-2011080139 ./app-crypt/acme/acme-1.9.0.ebuild
+2012030709 ./app-crypt/acme/acme-1.10.0.ebuild
+2012030709 ./app-crypt/acme/acme-1.9.0.ebuild
 1809280333 ./app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
 1809280333 ./app-crypt/aescrypt/aescrypt-3.0.6b.ebuild
 1809280333 ./app-crypt/aespipe/aespipe-2.4e.ebuild
@@ -1277,11 +1279,14 @@
 2007201609 ./app-crypt/ccrypt/ccrypt-1.11-r1.ebuild
 2010071839 ./app-crypt/certbot-apache/certbot-apache-9999.ebuild
 2011080139 ./app-crypt/certbot-apache/certbot-apache-1.9.0.ebuild
+2012030639 ./app-crypt/certbot-apache/certbot-apache-1.10.0.ebuild
 2002180109 ./app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0-r1.ebuild
 2010020039 ./app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
 2011080139 ./app-crypt/certbot-nginx/certbot-nginx-1.9.0.ebuild
+2012030639 ./app-crypt/certbot-nginx/certbot-nginx-1.10.0.ebuild
 2010071839 ./app-crypt/certbot/certbot-9999.ebuild
 2011080139 ./app-crypt/certbot/certbot-1.9.0.ebuild
+2012030639 ./app-crypt/certbot/certbot-1.10.0.ebuild
 2005060209 ./app-crypt/cfssl/cfssl-1.4.1.ebuild
 2003182039 ./app-crypt/chntpw/chntpw-140201.ebuild
 1702282250 ./app-crypt/ckpass/ckpass-0.2-r1.ebuild
@@ -1447,7 +1452,7 @@
 2011142339 ./app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild
 1905062039 ./app-crypt/ssdeep/ssdeep-2.14.1.ebuild
 2005101938 ./app-crypt/ssss/ssss-0.5-r1.ebuild
-2010310209 ./app-crypt/ssss/ssss-0.5.6.ebuild
+2012030239 ./app-crypt/ssss/ssss-0.5.6.ebuild
 1809280333 ./app-crypt/stan/stan-0.4.1-r1.ebuild
 2005312338 ./app-crypt/stoken/stoken-0.92-r1.ebuild
 2011241639 ./app-crypt/swtpm/swtpm-0.5.1-r1.ebuild
@@ -1487,6 +1492,7 @@
 2010200909 ./app-crypt/openpgp-keys-linuxcontainers/openpgp-keys-linuxcontainers-20201014.ebuild
 2011032309 ./app-crypt/openpgp-keys-kernel/openpgp-keys-kernel-20201103.ebuild
 2011090239 ./app-crypt/openpgp-keys-django/openpgp-keys-django-20201105.ebuild
+2012011340 ./app-crypt/openpgp-keys-django/openpgp-keys-django-20201201.ebuild
 2009041409 ./app-dicts/aspell-af/aspell-af-0.50.0.ebuild
 2009041409 ./app-dicts/aspell-be/aspell-be-0.01-r1.ebuild
 2009041409 ./app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild
@@ -2155,7 +2161,7 @@
 2004211009 ./app-doc/zsh-lovers/zsh-lovers-0.9.0.ebuild
 2004211009 ./app-doc/pms-bin/pms-bin-5_p20120920.ebuild
 2004211009 ./app-doc/pms-bin/pms-bin-7_p20180430.ebuild
-2005172009 ./app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild
+2012011340 ./app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild
 2005161809 ./app-editors/aee/aee-2.2.21.ebuild
 1702282250 ./app-editors/amyedit/amyedit-1.0-r2.ebuild
 2002011539 ./app-editors/beaver/beaver-0.4.1-r1.ebuild
@@ -2234,9 +2240,9 @@
 2011202309 ./app-editors/mousepad/mousepad-0.4.90.ebuild
 2011302109 ./app-editors/mousepad/mousepad-0.5.0.ebuild
 2008051739 ./app-editors/nano/nano-4.9.3.ebuild
-2008241609 ./app-editors/nano/nano-5.2.ebuild
-2010121509 ./app-editors/nano/nano-5.3-r1.ebuild
 2010121509 ./app-editors/nano/nano-9999.ebuild
+2012031009 ./app-editors/nano/nano-5.3-r1.ebuild
+2012022009 ./app-editors/nano/nano-5.4.ebuild
 1908281339 ./app-editors/ne/ne-3.1.1.ebuild
 2007231839 ./app-editors/ne/ne-3.3.0.ebuild
 1910111840 ./app-editors/nedit/nedit-5.6-r2.ebuild
@@ -2251,7 +2257,7 @@
 2010261709 ./app-editors/okteta/okteta-0.26.4.ebuild
 1709280402 ./app-editors/padre/padre-1.0.0-r1.ebuild
 2008070639 ./app-editors/pluma/pluma-1.24.0.ebuild
-2009252339 ./app-editors/pluma/pluma-1.24.1.ebuild
+2012030239 ./app-editors/pluma/pluma-1.24.1.ebuild
 2008291509 ./app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
 2003170509 ./app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild
 1908120039 ./app-editors/qxmledit/qxmledit-0.9.12.ebuild
@@ -2261,7 +2267,7 @@
 2008211039 ./app-editors/scite/scite-4.2.1.ebuild
 2008211039 ./app-editors/scite/scite-4.3.3.ebuild
 2008211039 ./app-editors/scite/scite-4.4.4.ebuild
-2005141809 ./app-editors/shed/shed-1.15.ebuild
+2012030239 ./app-editors/shed/shed-1.15.ebuild
 2003271051 ./app-editors/sublime-text/sublime-text-3_p3211-r1.ebuild
 1904012309 ./app-editors/tea/tea-47.0.0.ebuild
 2007040239 ./app-editors/teco/teco-36_p19940820.ebuild
@@ -2281,8 +2287,8 @@
 2004251839 ./app-editors/vim/vim-8.2.0638.ebuild
 2009162109 ./app-editors/vim/vim-8.2.0814.ebuild
 2006070938 ./app-editors/vis/vis-0.5.ebuild
-2007051009 ./app-editors/vis/vis-0.6.ebuild
-2007051009 ./app-editors/vis/vis-9999.ebuild
+2012031109 ./app-editors/vis/vis-0.6.ebuild
+2012031109 ./app-editors/vis/vis-9999.ebuild
 1908281339 ./app-editors/wily/wily-1.0-r2.ebuild
 1801061739 ./app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
 1912111539 ./app-editors/xemacs/xemacs-21.5.34-r4.ebuild
@@ -2573,6 +2579,7 @@
 2011072239 ./app-emulation/coldfire/coldfire-0.3.1.ebuild
 2008300209 ./app-emulation/conmon/conmon-2.0.20.ebuild
 2011110039 ./app-emulation/containerd/containerd-1.3.7.ebuild
+2012030009 ./app-emulation/containerd/containerd-1.3.9.ebuild
 2004020609 ./app-emulation/containers-storage/containers-storage-1.18.1.ebuild
 2006052238 ./app-emulation/containers-storage/containers-storage-1.20.2.ebuild
 2008300239 ./app-emulation/containers-storage/containers-storage-1.23.3.ebuild
@@ -2599,9 +2606,11 @@
 1912111539 ./app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
 1912111539 ./app-emulation/docker-machine/docker-machine-0.13.0.ebuild
 2010180409 ./app-emulation/docker-proxy/docker-proxy-0.8.0_p20200617.ebuild
+2012030009 ./app-emulation/docker-proxy/docker-proxy-0.8.0_p20201105.ebuild
 2010061709 ./app-emulation/docker-registry/docker-registry-2.7.1.ebuild
 2005110338 ./app-emulation/docker-swarm/docker-swarm-1.2.9.ebuild
 2011110039 ./app-emulation/docker/docker-19.03.13-r2.ebuild
+2012030009 ./app-emulation/docker/docker-19.03.14.ebuild
 2006241009 ./app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
 1810031339 ./app-emulation/dynamips/dynamips-0.2.18.ebuild
 1912111439 ./app-emulation/dynamips/dynamips-0.2.21.ebuild
@@ -2674,7 +2683,6 @@
 2011241209 ./app-emulation/qemu/qemu-5.1.0-r3.ebuild
 1803221738 ./app-emulation/qt-virt-manager/qt-virt-manager-9999.ebuild
 1912100639 ./app-emulation/reg/reg-0.16.1.ebuild
-1702282250 ./app-emulation/rex-client/rex-client-9999.ebuild
 2010180409 ./app-emulation/runc/runc-1.0.0_rc10-r1.ebuild
 1702282250 ./app-emulation/runv/runv-0.7.0.ebuild
 1707301145 ./app-emulation/s6-overlay/s6-overlay-1.18.1.3.ebuild
@@ -2764,9 +2772,8 @@
 2009280609 ./app-emulation/wine-staging/wine-staging-5.18.ebuild
 2010240639 ./app-emulation/wine-staging/wine-staging-5.20.ebuild
 2011070909 ./app-emulation/wine-staging/wine-staging-5.21.ebuild
-2011212209 ./app-emulation/wine-staging/wine-staging-5.22.ebuild
-2011240639 ./app-emulation/wine-staging/wine-staging-5.22-r1.ebuild
-2011240639 ./app-emulation/wine-staging/wine-staging-9999.ebuild
+2012011809 ./app-emulation/wine-staging/wine-staging-5.22-r2.ebuild
+2012011809 ./app-emulation/wine-staging/wine-staging-9999.ebuild
 2002231739 ./app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild
 2006291709 ./app-emulation/wine-vanilla/wine-vanilla-5.0.1.ebuild
 2010112339 ./app-emulation/wine-vanilla/wine-vanilla-5.19.ebuild
@@ -2774,9 +2781,8 @@
 2011070909 ./app-emulation/wine-vanilla/wine-vanilla-5.21.ebuild
 2011110439 ./app-emulation/wine-vanilla/wine-vanilla-5.0.3.ebuild
 2011150609 ./app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild
-2011212209 ./app-emulation/wine-vanilla/wine-vanilla-5.22.ebuild
-2011240639 ./app-emulation/wine-vanilla/wine-vanilla-5.22-r1.ebuild
-2011240639 ./app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+2012011809 ./app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild
+2012011809 ./app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
 2011150439 ./app-emulation/winetricks/winetricks-20200412.ebuild
 2011140539 ./app-emulation/winetricks/winetricks-99999999.ebuild
 2006232309 ./app-emulation/x48/x48-0.6.4-r2.ebuild
@@ -2787,12 +2793,13 @@
 2011121939 ./app-emulation/xen-tools/xen-tools-4.13.2-r1.ebuild
 2011182039 ./app-emulation/xen-tools/xen-tools-4.14.0-r4.ebuild
 2011121709 ./app-emulation/xen/xen-4.13.2-r1.ebuild
-2011272009 ./app-emulation/xen/xen-4.13.2-r2.ebuild
 2011272009 ./app-emulation/xen/xen-4.14.0-r6.ebuild
+2012031109 ./app-emulation/xen/xen-4.13.2-r2.ebuild
 2006280009 ./app-emulation/xtrs/xtrs-4.9d-r5.ebuild
 2009230439 ./app-emulation/crun/crun-0.14.1.ebuild
 2010071239 ./app-emulation/crun/crun-0.15.ebuild
 2010311439 ./app-emulation/pcem/pcem-16-r1.ebuild
+2012030039 ./app-emulation/pcem/pcem-17.ebuild
 1912120239 ./app-emulation/aranym/aranym-1.1.0.ebuild
 2004221309 ./app-emulation/protontricks/protontricks-1.4.1.ebuild
 2009212339 ./app-emulation/protontricks/protontricks-1.4.2.ebuild
@@ -2860,7 +2867,7 @@
 2005172009 ./app-forensics/afl/afl-2.56b.ebuild
 2009041339 ./app-forensics/afl/afl-2.57b.ebuild
 2009201909 ./app-forensics/aide/aide-0.16-r1.ebuild
-2009201909 ./app-forensics/aide/aide-0.16.2_p20200614.ebuild
+2012030239 ./app-forensics/aide/aide-0.16.2_p20200614.ebuild
 1905191439 ./app-forensics/air/air-2.0.0-r2.ebuild
 2009050439 ./app-forensics/chkrootkit/chkrootkit-0.53.ebuild
 1809211339 ./app-forensics/cmospwd/cmospwd-5.1-r1.ebuild
@@ -2987,7 +2994,6 @@
 2011032339 ./app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
 2011162309 ./app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild
 2011162309 ./app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
-1712251809 ./app-i18n/kde-l10n-scripts/kde-l10n-scripts-9999.ebuild
 1711100142 ./app-i18n/kinput2/kinput2-3.1-r2.ebuild
 2008011539 ./app-i18n/libcangjie/libcangjie-1.3.ebuild
 2011151839 ./app-i18n/libchewing/libchewing-0.5.1.ebuild
@@ -3254,7 +3260,7 @@
 1910100839 ./app-misc/dfshow/dfshow-0.8.2_beta.ebuild
 2011010909 ./app-misc/dfshow/dfshow-0.9.1_beta.ebuild
 1912111539 ./app-misc/digitemp/digitemp-3.7.1.ebuild
-2010112109 ./app-misc/dtach/dtach-0.9.ebuild
+2012011309 ./app-misc/dtach/dtach-0.9.ebuild
 2009131114 ./app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild
 1702282250 ./app-misc/dvorakng/dvorakng-0.6.0.ebuild
 2006041239 ./app-misc/dvtm/dvtm-0.15-r2.ebuild
@@ -3374,7 +3380,7 @@
 2005112039 ./app-misc/linux-logo/linux-logo-6.0.ebuild
 1802252138 ./app-misc/linuxspa/linuxspa-0.7.1-r2.ebuild
 2006041239 ./app-misc/lirc/lirc-0.10.1-r3.ebuild
-2011182109 ./app-misc/lirc/lirc-0.10.1-r4.ebuild
+2012030539 ./app-misc/lirc/lirc-0.10.1-r4.ebuild
 2011060439 ./app-misc/livecd-tools/livecd-tools-2.8.ebuild
 2011060439 ./app-misc/livecd-tools/livecd-tools-9999.ebuild
 2003261841 ./app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild
@@ -3485,7 +3491,7 @@
 1705030952 ./app-misc/rlwrap/rlwrap-0.42-r1.ebuild
 1707262252 ./app-misc/rlwrap/rlwrap-0.43.ebuild
 1912111539 ./app-misc/rlwrap/rlwrap-0.42.ebuild
-2011282109 ./app-misc/rox-filer/rox-filer-2.11.ebuild
+2012030239 ./app-misc/rox-filer/rox-filer-2.11.ebuild
 2004060039 ./app-misc/rtlamr/rtlamr-0.9.1.ebuild
 1702282250 ./app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild
 1702282250 ./app-misc/rundeck-cli-bin/rundeck-cli-bin-0.1.11.ebuild
@@ -3506,11 +3512,12 @@
 1702282250 ./app-misc/smtm/smtm-1.6.10-r1.ebuild
 2005212139 ./app-misc/socnetv/socnetv-2.2.ebuild
 2002112309 ./app-misc/solaar/solaar-1.0.1-r1.ebuild
-2003232239 ./app-misc/solaar/solaar-9999.ebuild
-2005220809 ./app-misc/solaar/solaar-1.0.2.ebuild
 2007280109 ./app-misc/solaar/solaar-1.0.3_rc1.ebuild
+2012030239 ./app-misc/solaar/solaar-1.0.2.ebuild
+2012030209 ./app-misc/solaar/solaar-9999.ebuild
 1805010009 ./app-misc/sonypid/sonypid-1.9.ebuild
 2008251339 ./app-misc/spacenavd/spacenavd-0.7.1.ebuild
+2012011809 ./app-misc/spacenavd/spacenavd-0.8.ebuild
 1912111539 ./app-misc/sphinx/sphinx-2.2.11-r1.ebuild
 1912111539 ./app-misc/sphinx/sphinx-2.2.11-r2.ebuild
 1912111539 ./app-misc/sphinx/sphinx-2.2.11.ebuild
@@ -3697,7 +3704,7 @@
 2007020109 ./app-officeext/languagetool/languagetool-5.0.ebuild
 1702282250 ./app-officeext/ooo2gd/ooo2gd-3.0.0-r1.ebuild
 2002241609 ./app-officeext/ooofbtools/ooofbtools-2.56.ebuild
-2008151639 ./app-officeext/ooofbtools/ooofbtools-2.57.ebuild
+2012020639 ./app-officeext/ooofbtools/ooofbtools-2.57.ebuild
 1702282250 ./app-officeext/sun-templates/sun-templates-1.0.0-r1.ebuild
 1907181709 ./app-officeext/texmaths/texmaths-0.48.ebuild
 2011090239 ./app-officeext/texmaths/texmaths-0.48.2.ebuild
@@ -3737,7 +3744,7 @@
 2009021909 ./app-portage/elicense/elicense-9999.ebuild
 2011231339 ./app-portage/elogv/elogv-0.7.8-r3.ebuild
 2011231339 ./app-portage/elogv/elogv-0.7.9.ebuild
-2008020239 ./app-portage/elogviewer/elogviewer-3.0-r2.ebuild
+2012030239 ./app-portage/elogviewer/elogviewer-3.0-r2.ebuild
 2003261841 ./app-portage/elt-patches/elt-patches-20170826.1.ebuild
 2004211009 ./app-portage/elt-patches/elt-patches-20170317.ebuild
 2004211009 ./app-portage/elt-patches/elt-patches-20170422.ebuild
@@ -3826,8 +3833,9 @@
 2005301039 ./app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
 2009271939 ./app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
 2002112051 ./app-portage/splat/splat-0.08-r1.ebuild
-2009040339 ./app-portage/tatt/tatt-0.7-r1.ebuild
 2009111939 ./app-portage/tatt/tatt-9999.ebuild
+2012030209 ./app-portage/tatt/tatt-0.7-r1.ebuild
+2012030209 ./app-portage/tatt/tatt-0.8.ebuild
 2003261841 ./app-portage/ufed/ufed-9999.ebuild
 2005060009 ./app-portage/ufed/ufed-0.96.ebuild
 2009200609 ./app-portage/unsymlink-lib/unsymlink-lib-18.ebuild
@@ -3897,9 +3905,9 @@
 1912110241 ./app-shells/pdsh/pdsh-2.26-r1.ebuild
 2005120109 ./app-shells/peco/peco-0.5.7.ebuild
 2008051739 ./app-shells/posh/posh-0.14.1.ebuild
-2002142009 ./app-shells/powerline/powerline-9999.ebuild
 2006012308 ./app-shells/powerline/powerline-2.7-r1.ebuild
 2009251439 ./app-shells/powerline/powerline-2.7-r2.ebuild
+2012031039 ./app-shells/powerline/powerline-9999.ebuild
 1702282250 ./app-shells/psh/psh-1.8.1-r3.ebuild
 2004032241 ./app-shells/push/push-2.0-r1.ebuild
 2010260109 ./app-shells/push/push-3.4.ebuild
@@ -3917,8 +3925,8 @@
 2005172009 ./app-shells/tcsh/tcsh-6.20.00.ebuild
 2005172009 ./app-shells/tcsh/tcsh-6.21.00-r1.ebuild
 2011270209 ./app-shells/tcsh/tcsh-6.22.02.ebuild
-2001051415 ./app-shells/thefuck/thefuck-3.27.ebuild
-2001051415 ./app-shells/thefuck/thefuck-3.28.ebuild
+2012031039 ./app-shells/thefuck/thefuck-3.28.ebuild
+2012031039 ./app-shells/thefuck/thefuck-3.30.ebuild
 1708212327 ./app-shells/tmux-bash-completion/tmux-bash-completion-9999.ebuild
 2006161809 ./app-shells/yash/yash-2.49.ebuild
 2011181839 ./app-shells/yash/yash-2.50.ebuild
@@ -4036,7 +4044,7 @@
 1911170839 ./app-text/docx2txt/docx2txt-1.4.ebuild
 2003261841 ./app-text/dos2unix/dos2unix-7.4.1.ebuild
 2004032241 ./app-text/dos2unix/dos2unix-7.3.5.ebuild
-2010131739 ./app-text/dos2unix/dos2unix-7.4.2.ebuild
+2012030239 ./app-text/dos2unix/dos2unix-7.4.2.ebuild
 2004032241 ./app-text/dvipng/dvipng-1.15-r1.ebuild
 2010231439 ./app-text/dvipng/dvipng-1.17.ebuild
 2006042108 ./app-text/dvipsk/dvipsk-2020.1_p20200406.ebuild
@@ -4065,7 +4073,7 @@
 2002291009 ./app-text/fictionup/fictionup-0.2.1.ebuild
 2011150109 ./app-text/flpsed/flpsed-0.7.3.ebuild
 2010201139 ./app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild
-2010201139 ./app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild
+2012011139 ./app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild
 2011151839 ./app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
 2010112239 ./app-text/gocr/gocr-0.50.ebuild
 2004252109 ./app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
@@ -4139,7 +4147,7 @@
 2004032241 ./app-text/libexttextcat/libexttextcat-3.4.5.ebuild
 2011241439 ./app-text/libgepub/libgepub-0.6.0.ebuild
 2004032241 ./app-text/libgxps/libgxps-0.3.1.ebuild
-2002081639 ./app-text/liblangtag/liblangtag-0.6.3.ebuild
+2012020509 ./app-text/liblangtag/liblangtag-0.6.3.ebuild
 1910020309 ./app-text/libmspub/libmspub-9999.ebuild
 2005091439 ./app-text/libmspub/libmspub-0.1.4.ebuild
 2005311909 ./app-text/libmwaw/libmwaw-0.3.16.ebuild
@@ -4223,8 +4231,9 @@
 2008011109 ./app-text/podofo/podofo-0.9.6_p20190928.ebuild
 2004032241 ./app-text/poppler-data/poppler-data-0.4.9.ebuild
 2011242239 ./app-text/poppler-data/poppler-data-0.4.10.ebuild
-2011021739 ./app-text/poppler/poppler-9999.ebuild
 2011242239 ./app-text/poppler/poppler-20.11.0.ebuild
+2012021309 ./app-text/poppler/poppler-20.12.0.ebuild
+2012021309 ./app-text/poppler/poppler-9999.ebuild
 2004032241 ./app-text/ps2eps/ps2eps-1.68.ebuild
 2005311939 ./app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild
 2002280339 ./app-text/psiconv/psiconv-0.8.3-r1.ebuild
@@ -4236,9 +4245,9 @@
 2009071209 ./app-text/pytextile/pytextile-4.0.1.ebuild
 2008021509 ./app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
 2011241409 ./app-text/qpdf/qpdf-10.0.1-r2.ebuild
-2011241409 ./app-text/qpdf/qpdf-10.0.4.ebuild
 2011241409 ./app-text/qpdf/qpdf-9.0.2-r1.ebuild
 2011241409 ./app-text/qpdf/qpdf-9.1.1-r2.ebuild
+2012031039 ./app-text/qpdf/qpdf-10.0.4.ebuild
 2005301239 ./app-text/qpdfview/qpdfview-0.4.18.ebuild
 2010301909 ./app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
 2004032241 ./app-text/rarian/rarian-0.8.1-r3.ebuild
@@ -4272,7 +4281,7 @@
 2002112051 ./app-text/spellutils/spellutils-0.7.ebuild
 2009191109 ./app-text/stardict/stardict-3.0.6-r4.ebuild
 2009191109 ./app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild
-2009110409 ./app-text/sword-modules/sword-modules-2.1.ebuild
+2012020439 ./app-text/sword-modules/sword-modules-2.2.ebuild
 2007251709 ./app-text/sword/sword-1.8.1-r1.ebuild
 2004032241 ./app-text/t1utils/t1utils-1.41-r2.ebuild
 2005171539 ./app-text/tabler/tabler-2-r1.ebuild
@@ -4331,8 +4340,8 @@
 2006102239 ./app-text/xapian-omega/xapian-omega-1.4.16.ebuild
 2011072339 ./app-text/xapian-omega/xapian-omega-1.4.17.ebuild
 1804210008 ./app-text/xchm/xchm-1.23-r1.ebuild
-2011300309 ./app-text/xchm/xchm-1.31.ebuild
 2011300309 ./app-text/xchm/xchm-9999.ebuild
+2012020639 ./app-text/xchm/xchm-1.31.ebuild
 2008300439 ./app-text/xdvik/xdvik-22.87.03-r2.ebuild
 2008201639 ./app-text/xhtml1/xhtml1-20020801-r6.ebuild
 2009181139 ./app-text/xiphos/xiphos-4.2.1.ebuild
@@ -4382,7 +4391,7 @@
 2010110309 ./app-text/xournalpp/xournalpp-1.0.18-r1.ebuild
 2004061139 ./app-text/rnc2rng/rnc2rng-2.6.1.ebuild
 2004061139 ./app-text/rnc2rng/rnc2rng-2.6.2.ebuild
-2011051809 ./app-text/rnc2rng/rnc2rng-2.6.4.ebuild
+2012030439 ./app-text/rnc2rng/rnc2rng-2.6.4.ebuild
 2007201839 ./app-text/foliate/foliate-2.4.2-r1.ebuild
 2010301839 ./app-text/foliate/foliate-2.5.0.ebuild
 2006290239 ./app-text/vgrep/vgrep-2.3.1.ebuild
@@ -4528,7 +4537,7 @@
 2009071209 ./app-vim/pyclewn/pyclewn-2.1-r2.ebuild
 2005071639 ./app-vim/pydiction/pydiction-1.2.3-r2.ebuild
 2005071639 ./app-vim/pydoc/pydoc-2.0-r1.ebuild
-2009022009 ./app-vim/pydoc/pydoc-2.0-r2.ebuild
+2012030239 ./app-vim/pydoc/pydoc-2.0-r2.ebuild
 1803080138 ./app-vim/pytest/pytest-1.1.4.ebuild
 1803111739 ./app-vim/rails/rails-5.2.ebuild
 2004032241 ./app-vim/rainbow_parentheses/rainbow_parentheses-1.0.ebuild
@@ -5099,6 +5108,7 @@
 2010090039 ./dev-cpp/robin-map/robin-map-9999.ebuild
 2011121939 ./dev-cpp/robin-map/robin-map-0.6.3.ebuild
 2012010009 ./dev-cpp/amqp-cpp/amqp-cpp-4.3.10.ebuild
+2012012209 ./dev-cpp/argparse/argparse-2.1.ebuild
 1912111539 ./dev-db/4store/4store-1.1.5-r1.ebuild
 1805250908 ./dev-db/aerospike-server-community/aerospike-server-community-4.1.0.1.ebuild
 1811172139 ./dev-db/aerospike-server-community/aerospike-server-community-9999.ebuild
@@ -5168,7 +5178,7 @@
 2009290139 ./dev-db/mongodb/mongodb-4.0.19.ebuild
 2011091739 ./dev-db/mongodb/mongodb-4.0.20.ebuild
 2011091739 ./dev-db/mongodb/mongodb-4.2.10.ebuild
-2011091739 ./dev-db/mongodb/mongodb-4.4.1.ebuild
+2012030739 ./dev-db/mongodb/mongodb-4.4.1.ebuild
 1702282250 ./dev-db/mtop/mtop-0.6.6-r3.ebuild
 2003081139 ./dev-db/mycli/mycli-1.20.1.ebuild
 2007081539 ./dev-db/mycli/mycli-1.21.1-r1.ebuild
@@ -5185,7 +5195,7 @@
 2002171509 ./dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild
 2005010009 ./dev-db/mysql-connector-c++/mysql-connector-c++-8.0.20.ebuild
 2008071509 ./dev-db/mysql-connector-c++/mysql-connector-c++-8.0.21.ebuild
-2010202209 ./dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
+2012031039 ./dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
 2011271909 ./dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild
 2004032241 ./dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
 1902082039 ./dev-db/mysql-super-smack/mysql-super-smack-1.3-r4.ebuild
@@ -5203,7 +5213,7 @@
 1907312209 ./dev-db/mysqltuner/mysqltuner-1.7.15.ebuild
 1910180839 ./dev-db/mysqltuner/mysqltuner-1.7.17.ebuild
 2002112051 ./dev-db/mytop/mytop-1.6-r4.ebuild
-2011292039 ./dev-db/mytop/mytop-1.9.1.ebuild
+2012020639 ./dev-db/mytop/mytop-1.9.1.ebuild
 1707301325 ./dev-db/ocp/ocp-0.2.ebuild
 1902091309 ./dev-db/ocp/ocp-0.3.ebuild
 1902091309 ./dev-db/ocp/ocp-9999.ebuild
@@ -5236,8 +5246,8 @@
 2006301639 ./dev-db/percona-xtrabackup/percona-xtrabackup-8.0.13.ebuild
 2011231209 ./dev-db/pg_activity/pg_activity-1.6.2.ebuild
 1801020340 ./dev-db/pg_top/pg_top-3.7.0.ebuild
-2011220539 ./dev-db/pg_top/pg_top-4.0.0.ebuild
 2011300639 ./dev-db/pg_top/pg_top-4.0.0-r1.ebuild
+2012020639 ./dev-db/pg_top/pg_top-4.0.0.ebuild
 2003091609 ./dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild
 2009121509 ./dev-db/pgadmin4/pgadmin4-4.25.ebuild
 2009241309 ./dev-db/pgadmin4/pgadmin4-4.26.ebuild
@@ -5284,12 +5294,12 @@
 2011141709 ./dev-db/postgresql/postgresql-13.1.ebuild
 2011141709 ./dev-db/postgresql/postgresql-9.5.24.ebuild
 2011141709 ./dev-db/postgresql/postgresql-9.6.20.ebuild
-2011141709 ./dev-db/postgresql/postgresql-9999.ebuild
+2012022239 ./dev-db/postgresql/postgresql-9999.ebuild
 2008051739 ./dev-db/pspg/pspg-3.1.2.ebuild
 2011220109 ./dev-db/pspg/pspg-3.1.5.ebuild
 1909252109 ./dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild
 1909252109 ./dev-db/psqlodbc/psqlodbc-11.01.0000.ebuild
-2005271609 ./dev-db/qdbm/qdbm-1.8.78-r2.ebuild
+2012011509 ./dev-db/qdbm/qdbm-1.8.78-r2.ebuild
 2005311309 ./dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11.ebuild
 2011101839 ./dev-db/redis/redis-5.0.10.ebuild
 2011121839 ./dev-db/redis/redis-6.0.9.ebuild
@@ -6491,12 +6501,8 @@
 2007250538 ./dev-java/bcpkix/bcpkix-1.50-r2.ebuild
 2007250538 ./dev-java/bcpkix/bcpkix-1.52-r1.ebuild
 1803011208 ./dev-java/bcprov/bcprov-1.38-r4.ebuild
-1803011208 ./dev-java/bcprov/bcprov-1.40-r2.ebuild
 1803011208 ./dev-java/bcprov/bcprov-1.45-r2.ebuild
-1803011208 ./dev-java/bcprov/bcprov-1.48-r2.ebuild
-1803011208 ./dev-java/bcprov/bcprov-1.49-r4.ebuild
 1803011208 ./dev-java/bcprov/bcprov-1.50-r2.ebuild
-1803011208 ./dev-java/bcprov/bcprov-1.50-r3.ebuild
 1803011208 ./dev-java/bcprov/bcprov-1.52-r1.ebuild
 1804090208 ./dev-java/bcprov/bcprov-1.52-r2.ebuild
 2007200439 ./dev-java/bcprov/bcprov-1.54.ebuild
@@ -6593,9 +6599,9 @@
 1808051709 ./dev-java/cssparser/cssparser-0.9.26.ebuild
 1702282250 ./dev-java/dict4j/dict4j-1.1.ebuild
 1702282250 ./dev-java/disruptor/disruptor-3.2.0.ebuild
-1807070109 ./dev-java/dnsjava/dnsjava-2.1.8.ebuild
 1912111539 ./dev-java/dnsjava/dnsjava-2.1.6.ebuild
 1912111539 ./dev-java/dnsjava/dnsjava-2.1.7.ebuild
+2012030239 ./dev-java/dnsjava/dnsjava-2.1.8.ebuild
 1905180439 ./dev-java/dom4j/dom4j-1.6.1-r7.ebuild
 1702282250 ./dev-java/dtdparser/dtdparser-1.21-r2.ebuild
 1912110241 ./dev-java/dynalang/dynalang-0.4-r1.ebuild
@@ -6607,7 +6613,6 @@
 1803011208 ./dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
 2002280139 ./dev-java/eclipse-ecj/eclipse-ecj-4.13-r2.ebuild
 2011241339 ./dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
-1702282250 ./dev-java/eclipsito/eclipsito-0_pre20130713.ebuild
 1903230339 ./dev-java/eclipsito/eclipsito-20180510.ebuild
 1804082208 ./dev-java/ecs/ecs-1.4.2-r2.ebuild
 1804082208 ./dev-java/edtftpj/edtftpj-2.4.0.ebuild
@@ -7174,10 +7179,6 @@
 2010112109 ./dev-lang/execline/execline-2.6.1.1.ebuild
 2006111539 ./dev-lang/f2c/f2c-20100827-r1.ebuild
 2006150539 ./dev-lang/ferite/ferite-1.1.17-r1.ebuild
-1803171008 ./dev-lang/fpc/fpc-2.6.4.ebuild
-1708111545 ./dev-lang/fpc/fpc-3.0.0.ebuild
-1708251445 ./dev-lang/fpc/fpc-3.0.2-r1.ebuild
-1708151436 ./dev-lang/fpc/fpc-3.0.2.ebuild
 1912151609 ./dev-lang/fpc/fpc-3.0.4.ebuild
 2009272239 ./dev-lang/gdl/gdl-1.0.0_rc3.ebuild
 2003200239 ./dev-lang/gforth/gforth-0.7.3-r1.ebuild
@@ -7236,9 +7237,6 @@
 1803171008 ./dev-lang/lazarus/lazarus-1.0.12.ebuild
 2001171339 ./dev-lang/lazarus/lazarus-1.8.4-r2.ebuild
 2004252209 ./dev-lang/lazarus/lazarus-2.0.6.ebuild
-1705301832 ./dev-lang/lfe/lfe-0.10.1.ebuild
-1706031528 ./dev-lang/lfe/lfe-0.7.ebuild
-1706031528 ./dev-lang/lfe/lfe-1.0.ebuild
 1706031528 ./dev-lang/lfe/lfe-1.1.1.ebuild
 2010200809 ./dev-lang/lisaac/lisaac-0.13.1-r2.ebuild
 2006290009 ./dev-lang/logtalk/logtalk-3.36.0.ebuild
@@ -7295,7 +7293,6 @@
 2010041639 ./dev-lang/nqp/nqp-2020.09.ebuild
 2010261939 ./dev-lang/nqp/nqp-2020.10.ebuild
 2011300939 ./dev-lang/nqp/nqp-2020.11.ebuild
-1702282250 ./dev-lang/nwcc/nwcc-0.8.2.ebuild
 1702282250 ./dev-lang/nwcc/nwcc-0.8.3.ebuild
 2010031709 ./dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
 2010031709 ./dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
@@ -7307,10 +7304,6 @@
 2002151310 ./dev-lang/orc/orc-0.4.29.ebuild
 2011041909 ./dev-lang/orc/orc-0.4.31.ebuild
 1908072109 ./dev-lang/parrot/parrot-8.1.0-r2.ebuild
-1912111539 ./dev-lang/parrot/parrot-7.1.0-r1.ebuild
-1912111539 ./dev-lang/parrot/parrot-7.11.0-r1.ebuild
-1912111539 ./dev-lang/parrot/parrot-7.5.0-r1.ebuild
-1912111539 ./dev-lang/parrot/parrot-8.1.0-r1.ebuild
 1912111539 ./dev-lang/pcc/pcc-1.1.0-r1.ebuild
 1912111539 ./dev-lang/pcc/pcc-9999.ebuild
 2006080939 ./dev-lang/perl/perl-5.30.3.ebuild
@@ -7476,14 +7469,12 @@
 2009252339 ./dev-libs/boost/boost-1.72.0-r2.ebuild
 2011242239 ./dev-libs/boost/boost-1.74.0-r1.ebuild
 2009181139 ./dev-libs/botan/botan-2.15.0.ebuild
-2011131939 ./dev-libs/botan/botan-2.17.2.ebuild
 2011172209 ./dev-libs/botan/botan-2.16.0.ebuild
+2012030239 ./dev-libs/botan/botan-2.17.2.ebuild
 2011160239 ./dev-libs/busybee/busybee-0.7.0.ebuild
 2011031109 ./dev-libs/c-blosc/c-blosc-1.20.1.ebuild
 2006091709 ./dev-libs/c-capnproto/c-capnproto-0.3.ebuild
 1806240109 ./dev-libs/caliper/caliper-1.5.0.ebuild
-1912110241 ./dev-libs/capnproto/capnproto-0.6.0.ebuild
-1912110241 ./dev-libs/capnproto/capnproto-0.6.1.ebuild
 2003261339 ./dev-libs/capnproto/capnproto-0.7.0.ebuild
 2009221409 ./dev-libs/capnproto/capnproto-0.8.0.ebuild
 2011110309 ./dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -7500,7 +7491,7 @@
 2010100809 ./dev-libs/cloog/cloog-9999.ebuild
 1802192308 ./dev-libs/collada-dom/collada-dom-2.5.0.ebuild
 1802192308 ./dev-libs/collada-dom/collada-dom-9999.ebuild
-2011241609 ./dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild
+2012020009 ./dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild
 2004032241 ./dev-libs/confuse/confuse-3.0.ebuild
 2010161109 ./dev-libs/confuse/confuse-3.3.ebuild
 2011021309 ./dev-libs/confuse/confuse-3.2.2.ebuild
@@ -7553,7 +7544,7 @@
 2002261639 ./dev-libs/editline/editline-1.17.1.ebuild
 2008111609 ./dev-libs/eekboard/eekboard-1.0.8_p20121001-r1.ebuild
 2011261109 ./dev-libs/efl/efl-1.25.1-r2.ebuild
-2012010939 ./dev-libs/efl/efl-1.25.1-r10.ebuild
+2012011439 ./dev-libs/efl/efl-1.25.1-r10.ebuild
 2010242109 ./dev-libs/elfutils/elfutils-0.181.ebuild
 2011021339 ./dev-libs/elfutils/elfutils-0.182.ebuild
 2003291409 ./dev-libs/ell/ell-0.28.ebuild
@@ -7561,6 +7552,7 @@
 2006071209 ./dev-libs/ell/ell-0.31.ebuild
 2009071139 ./dev-libs/ell/ell-0.32.ebuild
 2011120339 ./dev-libs/ell/ell-0.33.ebuild
+2012011839 ./dev-libs/ell/ell-0.35.ebuild
 2004211009 ./dev-libs/eventlog/eventlog-0.2.12.ebuild
 2003261841 ./dev-libs/expat/expat-2.2.9.ebuild
 2004032241 ./dev-libs/expat/expat-2.2.8.ebuild
@@ -7584,7 +7576,7 @@
 2007231439 ./dev-libs/geoip/geoip-1.6.9-r1.ebuild
 2002151310 ./dev-libs/gf-complete/gf-complete-0.0.0.ebuild
 2002151310 ./dev-libs/gf-complete/gf-complete-2.0.0.ebuild
-2005170409 ./dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild
+2012030239 ./dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild
 2008251339 ./dev-libs/gf2x/gf2x-1.3.0.ebuild
 2005022309 ./dev-libs/girara/girara-0.3.3.ebuild
 2005022309 ./dev-libs/girara/girara-9999.ebuild
@@ -7596,7 +7588,7 @@
 2011090239 ./dev-libs/glib/glib-2.66.2.ebuild
 2011141239 ./dev-libs/glib/glib-2.64.5.ebuild
 2004032241 ./dev-libs/gmime/gmime-2.6.23-r1.ebuild
-2010112109 ./dev-libs/gmime/gmime-3.2.7.ebuild
+2012011309 ./dev-libs/gmime/gmime-3.2.7.ebuild
 2006102139 ./dev-libs/gmp/gmp-6.2.0-r1.ebuild
 2011151339 ./dev-libs/gmp/gmp-6.2.1.ebuild
 1910111840 ./dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild
@@ -7844,12 +7836,12 @@
 2006132027 ./dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
 2009231639 ./dev-libs/libinput/libinput-1.16.1.ebuild
 2011281409 ./dev-libs/libinput/libinput-1.16.4.ebuild
-2011292039 ./dev-libs/libinput/libinput-1.16.3.ebuild
+2012030139 ./dev-libs/libinput/libinput-1.16.3.ebuild
 2004211009 ./dev-libs/libintl/libintl-0.19.7.ebuild
 2007271109 ./dev-libs/libintl/libintl-0.20.2.ebuild
 2008300439 ./dev-libs/libintl/libintl-0.20.1.ebuild
 2008312309 ./dev-libs/libintl/libintl-0.19.8.1.ebuild
-2008312339 ./dev-libs/libintl/libintl-0.21.ebuild
+2012030209 ./dev-libs/libintl/libintl-0.21.ebuild
 2006081939 ./dev-libs/libisoburn/libisoburn-1.5.2.ebuild
 2006081939 ./dev-libs/libisofs/libisofs-1.5.2.ebuild
 2002230040 ./dev-libs/libite/libite-2.1.0.ebuild
@@ -7875,8 +7867,8 @@
 2004211009 ./dev-libs/libltdl/libltdl-2.4.6.ebuild
 2004211009 ./dev-libs/liblzw/liblzw-0.2-r1.ebuild
 2004032241 ./dev-libs/libmaa/libmaa-1.3.2.ebuild
-2011270139 ./dev-libs/libmanette/libmanette-0.2.4.ebuild
 2011280039 ./dev-libs/libmanette/libmanette-0.2.5.ebuild
+2012012039 ./dev-libs/libmanette/libmanette-0.2.4.ebuild
 2009021909 ./dev-libs/libmateweather/libmateweather-1.24.0-r1.ebuild
 2009252339 ./dev-libs/libmateweather/libmateweather-1.24.1.ebuild
 2008261809 ./dev-libs/libmaxminddb/libmaxminddb-99999.ebuild
@@ -7896,7 +7888,7 @@
 2009140539 ./dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
 2002112051 ./dev-libs/libmspack/libmspack-9999.ebuild
 2004032241 ./dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
-2009061109 ./dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
+2012011209 ./dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
 2008221139 ./dev-libs/libnatspec/libnatspec-0.3.0.ebuild
 2007122339 ./dev-libs/libnfc/libnfc-1.7.2.ebuild
 2007122339 ./dev-libs/libnfc/libnfc-1.8.0.ebuild
@@ -8063,7 +8055,7 @@
 2002222009 ./dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
 1902160939 ./dev-libs/libxdiff/libxdiff-0.23-r2.ebuild
 2010131309 ./dev-libs/libxls/libxls-1.6.1.ebuild
-2010310139 ./dev-libs/libxml2/libxml2-2.9.10-r3.ebuild
+2012030339 ./dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
 2006251009 ./dev-libs/libxmlb/libxmlb-0.1.15.ebuild
 2008191209 ./dev-libs/libxmlb/libxmlb-0.2.0.ebuild
 2011060509 ./dev-libs/libxmlb/libxmlb-0.2.1.ebuild
@@ -8112,7 +8104,7 @@
 2007190209 ./dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild
 2008061739 ./dev-libs/mongo-c-driver/mongo-c-driver-1.17.0.ebuild
 2009231339 ./dev-libs/mpc/mpc-1.2.0.ebuild
-2011271939 ./dev-libs/mpc/mpc-1.2.1.ebuild
+2012030209 ./dev-libs/mpc/mpc-1.2.1.ebuild
 2009071209 ./dev-libs/mpfr/mpfr-4.1.0.ebuild
 1912291239 ./dev-libs/msgpack/msgpack-3.2.0.ebuild
 2011160509 ./dev-libs/msgpack/msgpack-3.3.0.ebuild
@@ -8133,8 +8125,8 @@
 2010071039 ./dev-libs/nspr/nspr-4.28.ebuild
 2011172209 ./dev-libs/nspr/nspr-4.29.ebuild
 2010071039 ./dev-libs/nss/nss-3.56.ebuild
-2011141409 ./dev-libs/nss/nss-3.59.ebuild
 2011172209 ./dev-libs/nss/nss-3.58-r2.ebuild
+2012012009 ./dev-libs/nss/nss-3.59-r1.ebuild
 1912110241 ./dev-libs/nsync/nsync-1.20.1.ebuild
 2008251339 ./dev-libs/ntl/ntl-11.4.3.ebuild
 2005150039 ./dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
@@ -8175,7 +8167,7 @@
 2002112051 ./dev-libs/poco/poco-1.9.0-r2.ebuild
 2011240709 ./dev-libs/poco/poco-1.10.1.ebuild
 2004211009 ./dev-libs/popt/popt-1.16-r2.ebuild
-2011190109 ./dev-libs/popt/popt-1.18.ebuild
+2012011539 ./dev-libs/popt/popt-1.18.ebuild
 2011151839 ./dev-libs/ppl/ppl-1.2-r3.ebuild
 1912110241 ./dev-libs/processor-trace/processor-trace-1.6.1.ebuild
 1912110241 ./dev-libs/processor-trace/processor-trace-1.6.2.ebuild
@@ -8320,15 +8312,15 @@
 2006021208 ./dev-libs/vc/vc-1.4.1.ebuild
 2010141239 ./dev-libs/voikko-fi/voikko-fi-2.3.ebuild
 2004032241 ./dev-libs/volume_key/volume_key-0.3.11.ebuild
-2009041339 ./dev-libs/volume_key/volume_key-0.3.12-r1.ebuild
 2011261139 ./dev-libs/volume_key/volume_key-0.3.12-r2.ebuild
+2012031009 ./dev-libs/volume_key/volume_key-0.3.12-r1.ebuild
 2003261841 ./dev-libs/wayland-protocols/wayland-protocols-9999.ebuild
 2004202009 ./dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild
 2004202009 ./dev-libs/wayland/wayland-1.18.0.ebuild
 2010160539 ./dev-libs/wayland/wayland-9999.ebuild
 2007260009 ./dev-libs/weston/weston-8.0.0.ebuild
-2009051339 ./dev-libs/weston/weston-9.0.0.ebuild
 2009051339 ./dev-libs/weston/weston-9999.ebuild
+2012030239 ./dev-libs/weston/weston-9.0.0.ebuild
 2002182239 ./dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild
 2008150239 ./dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
 2008150239 ./dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild
@@ -8338,7 +8330,7 @@
 2004032241 ./dev-libs/xapian/xapian-1.2.25.ebuild
 2004240039 ./dev-libs/xapian/xapian-1.4.14.ebuild
 2006102239 ./dev-libs/xapian/xapian-1.4.16.ebuild
-2011072339 ./dev-libs/xapian/xapian-1.4.17.ebuild
+2012011309 ./dev-libs/xapian/xapian-1.4.17.ebuild
 1810142309 ./dev-libs/xbyak/xbyak-5.73.ebuild
 2007131139 ./dev-libs/xerces-c/xerces-c-9999.ebuild
 2009051839 ./dev-libs/xerces-c/xerces-c-3.2.3.ebuild
@@ -8415,6 +8407,7 @@
 2010282009 ./dev-libs/simdjson/simdjson-0.4.7.ebuild
 2011050309 ./dev-libs/simdjson/simdjson-0.6.1.ebuild
 2011262039 ./dev-libs/rocksdb/rocksdb-6.14.5.ebuild
+2012020339 ./dev-libs/rocksdb/rocksdb-6.14.6.ebuild
 2011220139 ./dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild
 2011220139 ./dev-libs/tree-sitter/tree-sitter-9999.ebuild
 2011292209 ./dev-libs/libmpack/libmpack-1.0.5.ebuild
@@ -8485,6 +8478,8 @@
 2011290239 ./dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
 1912110241 ./dev-lua/lua-cjson/lua-cjson-2.1.0.6.ebuild
 1912110241 ./dev-lua/lua-cjson/lua-cjson-2.1.0.7.ebuild
+2012011340 ./dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild
+2012011340 ./dev-lua/lua-cjson/lua-cjson-2.1.0.8.ebuild
 2011242139 ./dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r1.ebuild
 1905250209 ./dev-lua/lua-term/lua-term-0.3.ebuild
 2011291909 ./dev-lua/lua-term/lua-term-0.7-r101.ebuild
@@ -8496,9 +8491,11 @@
 2011281939 ./dev-lua/lua_cliargs/lua_cliargs-3.0_p2-r100.ebuild
 2011292039 ./dev-lua/lua_cliargs/lua_cliargs-3.0_p2.ebuild
 2011290439 ./dev-lua/luacheck/luacheck-0.20.0-r1.ebuild
-2011292039 ./dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
 2011301639 ./dev-lua/luacheck/luacheck-0.23.0-r100.ebuild
+2012030809 ./dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
 1702282250 ./dev-lua/luacov/luacov-0.8.ebuild
+2012011509 ./dev-lua/luacov/luacov-0.14.0-r100.ebuild
+2012011509 ./dev-lua/luacov/luacov-0.14.0.ebuild
 2002151310 ./dev-lua/luacrypto/luacrypto-0.3.2-r1.ebuild
 2011151239 ./dev-lua/luadbi/luadbi-0.7.2.ebuild
 2011301639 ./dev-lua/luadbi/luadbi-0.7.2-r101.ebuild
@@ -8513,15 +8510,15 @@
 2011291909 ./dev-lua/luafilesystem/luafilesystem-1.8.0-r101.ebuild
 1902152109 ./dev-lua/luajson/luajson-1.3.3.ebuild
 2011290239 ./dev-lua/luajson/luajson-1.3.4.ebuild
-1805181538 ./dev-lua/lualdap/lualdap-1.2.0.ebuild
-1702282250 ./dev-lua/luaossl/luaossl-20150727.ebuild
-1809281339 ./dev-lua/luaossl/luaossl-20180708.ebuild
-1901030409 ./dev-lua/luaossl/luaossl-20181207.ebuild
-1910221909 ./dev-lua/luaossl/luaossl-20190731.ebuild
-2009291009 ./dev-lua/luaposix/luaposix-35.0.ebuild
+2012020309 ./dev-lua/lualdap/lualdap-1.2.5-r100.ebuild
+2012020309 ./dev-lua/lualdap/lualdap-1.2.5.ebuild
+2012030239 ./dev-lua/luaossl/luaossl-20200709-r100.ebuild
+2012030239 ./dev-lua/luaossl/luaossl-20200709.ebuild
+2012030309 ./dev-lua/luaposix/luaposix-35.0-r100.ebuild
+2012030309 ./dev-lua/luaposix/luaposix-35.0.ebuild
 2011300439 ./dev-lua/luarocks/luarocks-3.3.1.ebuild
-2011300439 ./dev-lua/luarocks/luarocks-3.4.0.ebuild
 2011301339 ./dev-lua/luarocks/luarocks-3.4.0-r100.ebuild
+2012011539 ./dev-lua/luarocks/luarocks-3.4.0.ebuild
 2010120239 ./dev-lua/luasec/luasec-9999.ebuild
 2010180309 ./dev-lua/luasec/luasec-0.9.ebuild
 2011301639 ./dev-lua/luasec/luasec-0.9-r102.ebuild
@@ -8546,7 +8543,7 @@
 2010132009 ./dev-lua/messagepack/messagepack-0.3.2-r100.ebuild
 2008080909 ./dev-lua/mpack/mpack-1.0.4.ebuild
 2011300109 ./dev-lua/mpack/mpack-1.0.8-r100.ebuild
-2011300109 ./dev-lua/mpack/mpack-1.0.8.ebuild
+2012011340 ./dev-lua/mpack/mpack-1.0.8-r1.ebuild
 1905250209 ./dev-lua/penlight/penlight-1.3.2.ebuild
 2003160339 ./dev-lua/penlight/penlight-1.5.4.ebuild
 2011282109 ./dev-lua/penlight/penlight-1.9.2.ebuild
@@ -8557,10 +8554,10 @@
 2011301639 ./dev-lua/say/say-1.3_p1-r101.ebuild
 2012010209 ./dev-lua/toluapp/toluapp-1.0.93_p20190513-r1.ebuild
 2012010209 ./dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild
-2011292039 ./dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
 2011301639 ./dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild
+2012030809 ./dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
 2011290309 ./dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild
-2011292039 ./dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild
+2012030809 ./dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild
 2011162039 ./dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild
 2011241109 ./dev-lua/lua-bit32/lua-bit32-5.3.5-r2.ebuild
 2011300339 ./dev-lua/busted-htest/busted-htest-1.0.0.ebuild
@@ -8586,13 +8583,10 @@
 1706251742 ./dev-ml/bin-prot/bin-prot-0.9.0.ebuild
 1707291305 ./dev-ml/bin-prot/bin-prot-0.9.1.ebuild
 1711102042 ./dev-ml/bin-prot/bin-prot-0.9.2.ebuild
-1702282250 ./dev-ml/biniou/biniou-1.0.12.ebuild
-1705081318 ./dev-ml/biniou/biniou-1.0.13.ebuild
-1707151745 ./dev-ml/biniou/biniou-1.1.0.ebuild
 1707200030 ./dev-ml/biniou/biniou-1.2.0.ebuild
 2006041239 ./dev-ml/bos/bos-0.1.6.ebuild
 1808261309 ./dev-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild
-2010141439 ./dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
+2012030509 ./dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
 1702282250 ./dev-ml/calendar/calendar-2.04.ebuild
 2010280709 ./dev-ml/camlbz2/camlbz2-0.6.0-r1.ebuild
 2011180439 ./dev-ml/camldbm/camldbm-1.0.ebuild
@@ -8619,38 +8613,32 @@
 1711102042 ./dev-ml/core_kernel/core_kernel-0.9.1.ebuild
 1704051322 ./dev-ml/cppo/cppo-1.4.1.ebuild
 1707091128 ./dev-ml/cppo/cppo-1.5.0.ebuild
-2010280709 ./dev-ml/cppo/cppo-1.6.6.ebuild
+2012030509 ./dev-ml/cppo/cppo-1.6.6.ebuild
 1910111840 ./dev-ml/cryptokit/cryptokit-1.10.ebuild
 2010240409 ./dev-ml/cryptokit/cryptokit-1.16.1-r1.ebuild
 2010270039 ./dev-ml/cryptokit/cryptokit-1.11.ebuild
-1702282250 ./dev-ml/csv/csv-1.5.ebuild
-1702282250 ./dev-ml/csv/csv-1.6.ebuild
 1706201511 ./dev-ml/csv/csv-1.7.ebuild
 2010280709 ./dev-ml/cudf/cudf-0.9.ebuild
 1702282250 ./dev-ml/deriving/deriving-0.7.1.ebuild
 1710061621 ./dev-ml/dns/dns-1.0.0.ebuild
 2010280709 ./dev-ml/dose3/dose3-5.0.1-r1.ebuild
 2003312109 ./dev-ml/dune/dune-2.1.0.ebuild
-2010280709 ./dev-ml/dune/dune-2.7.1.ebuild
-1702282250 ./dev-ml/easy-format/easy-format-1.0.2.ebuild
+2012030509 ./dev-ml/dune/dune-2.7.1.ebuild
 1704011524 ./dev-ml/easy-format/easy-format-1.2.0.ebuild
 1706091914 ./dev-ml/eliom/eliom-6.2.0.ebuild
 1706091914 ./dev-ml/eliom/eliom-9999.ebuild
 2002230040 ./dev-ml/extlib/extlib-1.7.1.ebuild
-2002230040 ./dev-ml/extlib/extlib-1.7.2.ebuild
 2002230040 ./dev-ml/extlib/extlib-1.7.6.ebuild
-2010280709 ./dev-ml/extlib/extlib-1.7.7.ebuild
+2012030509 ./dev-ml/extlib/extlib-1.7.7.ebuild
 2010031709 ./dev-ml/facile/facile-1.1.3.ebuild
 1704021137 ./dev-ml/fieldslib/fieldslib-0.9.0.ebuild
 2010280709 ./dev-ml/fieldslib/fieldslib-0.14.0.ebuild
 2010031709 ./dev-ml/findlib/findlib-1.8.1.ebuild
-2011292039 ./dev-ml/findlib/findlib-1.8.1-r1.ebuild
+2012030239 ./dev-ml/findlib/findlib-1.8.1-r1.ebuild
 2006041239 ./dev-ml/fmt/fmt-0.8.4.ebuild
 2006041239 ./dev-ml/fpath/fpath-0.7.2.ebuild
 1702282250 ./dev-ml/gen/gen-0.4.0.1.ebuild
 1912110241 ./dev-ml/gsl-ocaml/gsl-ocaml-1.19.1.ebuild
-1802120109 ./dev-ml/iTeML/iTeML-2.5.ebuild
-1802120109 ./dev-ml/iTeML/iTeML-2.6.ebuild
 1802120109 ./dev-ml/iTeML/iTeML-2.7.ebuild
 1802120109 ./dev-ml/integers/integers-0.2.2.ebuild
 2010240709 ./dev-ml/integers/integers-0.4.0.ebuild
@@ -8677,11 +8665,8 @@
 2011291339 ./dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
 2011291339 ./dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.ebuild
 2006041239 ./dev-ml/logs/logs-0.6.2.ebuild
-1910111840 ./dev-ml/lwt/lwt-3.0.0.ebuild
-1910111840 ./dev-ml/lwt/lwt-3.1.0.ebuild
 2010280709 ./dev-ml/lwt/lwt-5.3.0-r1.ebuild
 1910111840 ./dev-ml/lwt_react/lwt_react-1.0.1.ebuild
-1910111840 ./dev-ml/lwt_ssl/lwt_ssl-1.0.1.ebuild
 1910111840 ./dev-ml/lwt_ssl/lwt_ssl-1.1.1.ebuild
 1702282250 ./dev-ml/macaque/macaque-0.7.4.ebuild
 1912110241 ./dev-ml/markup/markup-0.7.5.ebuild
@@ -8690,7 +8675,6 @@
 1702282250 ./dev-ml/merlin-extend/merlin-extend-0.3.ebuild
 2006041239 ./dev-ml/mtime/mtime-1.1.0.ebuild
 1912122009 ./dev-ml/oasis/oasis-0.4.10.ebuild
-1912122009 ./dev-ml/oasis/oasis-0.4.8.ebuild
 1912170839 ./dev-ml/ocaml-augeas/ocaml-augeas-0.5.ebuild
 2010280709 ./dev-ml/ocaml-autoconf/ocaml-autoconf-1.1-r1.ebuild
 1912110241 ./dev-ml/ocaml-base64/ocaml-base64-2.2.0.ebuild
@@ -8701,24 +8685,15 @@
 1912110241 ./dev-ml/ocaml-cstruct/ocaml-cstruct-3.1.1.ebuild
 2010151539 ./dev-ml/ocaml-ctypes/ocaml-ctypes-0.17.1.ebuild
 2011170309 ./dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.2.ebuild
-2011170309 ./dev-ml/ocaml-ctypes/ocaml-ctypes-0.11.3.ebuild
-2011170309 ./dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild
-2011170309 ./dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild
 1802120109 ./dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11-r1.ebuild
-1703141321 ./dev-ml/ocaml-dispatch/ocaml-dispatch-0.3.0.ebuild
 1912110241 ./dev-ml/ocaml-dispatch/ocaml-dispatch-0.4.0.ebuild
 1702282250 ./dev-ml/ocaml-doc/ocaml-doc-4.04.ebuild
 1707021857 ./dev-ml/ocaml-doc/ocaml-doc-4.05.ebuild
-1912110241 ./dev-ml/ocaml-expat/ocaml-expat-1.0.0.ebuild
-1912110241 ./dev-ml/ocaml-expat/ocaml-expat-1.1.0.ebuild
 2010280709 ./dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild
 1912110241 ./dev-ml/ocaml-expect/ocaml-expect-0.0.5.ebuild
-2006241339 ./dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.1.ebuild
-2006241339 ./dev-ml/ocaml-fileutils/ocaml-fileutils-0.5.2.ebuild
 2006241339 ./dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.2.ebuild
 2010171439 ./dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r2.ebuild
 2010311309 ./dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
-1702282250 ./dev-ml/ocaml-hashcons/ocaml-hashcons-1.2.ebuild
 1709011418 ./dev-ml/ocaml-hashcons/ocaml-hashcons-1.3.ebuild
 1912110241 ./dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.0.ebuild
 1702282250 ./dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.0.0.ebuild
@@ -8728,9 +8703,6 @@
 1711041405 ./dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.7.ebuild
 2010280709 ./dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.0.0.ebuild
 1912110241 ./dev-ml/ocaml-re/ocaml-re-1.7.1.ebuild
-1910111840 ./dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.2.ebuild
-1910111840 ./dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.3.ebuild
-1910111840 ./dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.0.ebuild
 1910111840 ./dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild
 2010201309 ./dev-ml/ocaml-ssl/ocaml-ssl-0.5.3-r1.ebuild
 2010240409 ./dev-ml/ocaml-ssl/ocaml-ssl-0.5.9.ebuild
@@ -8742,7 +8714,6 @@
 2010171539 ./dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild
 2010280709 ./dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild
 1802120109 ./dev-ml/ocamlify/ocamlify-0.0.2.ebuild
-2005050339 ./dev-ml/ocamlmod/ocamlmod-0.0.8.ebuild
 2005050339 ./dev-ml/ocamlmod/ocamlmod-0.0.9.ebuild
 1910111911 ./dev-ml/ocamlnet/ocamlnet-4.1.2.ebuild
 2011011609 ./dev-ml/ocamlnet/ocamlnet-4.1.8.ebuild
@@ -8821,9 +8792,6 @@
 2010280709 ./dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild
 1708151026 ./dev-ml/ppx_sexp_value/ppx_sexp_value-0.9.0.ebuild
 2010280709 ./dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild
-2002100109 ./dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild
-2002100109 ./dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild
-2002100139 ./dev-ml/ppx_tools/ppx_tools-5.3.4.08.0.ebuild
 2010280709 ./dev-ml/ppx_tools/ppx_tools-6.2.ebuild
 1708021422 ./dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.0.1.ebuild
 1708151026 ./dev-ml/ppx_traverse/ppx_traverse-0.9.0.ebuild
@@ -8833,7 +8801,6 @@
 2010280709 ./dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1.ebuild
 1708150925 ./dev-ml/ppx_variants_conv/ppx_variants_conv-0.9.0.ebuild
 2010280709 ./dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild
-1705302108 ./dev-ml/qcheck/qcheck-0.6.ebuild
 1708221001 ./dev-ml/qcheck/qcheck-0.7.ebuild
 1708061530 ./dev-ml/re2/re2-0.9.0.ebuild
 1711102042 ./dev-ml/re2/re2-0.9.1.ebuild
@@ -9631,7 +9598,7 @@
 2008310909 ./dev-perl/File-NFSLock/File-NFSLock-1.290.0.ebuild
 1912110241 ./dev-perl/File-Next/File-Next-1.160.0.ebuild
 2004141709 ./dev-perl/File-Next/File-Next-1.180.0.ebuild
-2008310909 ./dev-perl/File-Next/File-Next-1.180.0-r1.ebuild
+2012030239 ./dev-perl/File-Next/File-Next-1.180.0-r1.ebuild
 1702282250 ./dev-perl/File-Path-Expand/File-Path-Expand-1.20.0-r1.ebuild
 2008310939 ./dev-perl/File-Path-Expand/File-Path-Expand-1.20.0-r2.ebuild
 2004032241 ./dev-perl/File-ReadBackwards/File-ReadBackwards-1.50.0-r1.ebuild
@@ -11140,8 +11107,6 @@
 2003261841 ./dev-php/doctrine-instantiator/doctrine-instantiator-1.3.0.ebuild
 2004032241 ./dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild
 2006150239 ./dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild
-1806072239 ./dev-php/doctrine/doctrine-1.2.5.ebuild
-1806072239 ./dev-php/doctrine/doctrine-2.4.6.ebuild
 1806072239 ./dev-php/doctrine/doctrine-2.6.1.ebuild
 1912021739 ./dev-php/doctrine/doctrine-2.6.4.ebuild
 2003261841 ./dev-php/fedora-autoloader/fedora-autoloader-1.0.0.ebuild
@@ -11238,7 +11203,7 @@
 2010090209 ./dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
 1911291639 ./dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild
 1911291639 ./dev-php/pecl-yaml/pecl-yaml-2.0.4.ebuild
-2007081609 ./dev-php/pecl-yaml/pecl-yaml-2.1.0.ebuild
+2012030239 ./dev-php/pecl-yaml/pecl-yaml-2.1.0.ebuild
 2003261841 ./dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
 2011261639 ./dev-php/pecl-zmq/pecl-zmq-1.1.3-r3.ebuild
 2011261639 ./dev-php/pecl-zmq/pecl-zmq-9999.ebuild
@@ -11385,9 +11350,9 @@
 2011281239 ./dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1.ebuild
 2008222139 ./dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild
 2007121009 ./dev-python/PySDL2/PySDL2-0.9.7.ebuild
-1912281939 ./dev-python/PySensors/PySensors-0.0.4.ebuild
+2012030109 ./dev-python/PySensors/PySensors-0.0.4.ebuild
 2009201409 ./dev-python/PySocks/PySocks-1.7.1-r1.ebuild
-2010162139 ./dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
+2012011340 ./dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
 2002261509 ./dev-python/PythonQt/PythonQt-3.2-r1.ebuild
 2002261509 ./dev-python/PythonQt/PythonQt-9999.ebuild
 2008030639 ./dev-python/QtPy/QtPy-1.9.0-r2.ebuild
@@ -11431,6 +11396,7 @@
 2011012109 ./dev-python/arpeggio/arpeggio-1.10.0.ebuild
 2011151409 ./dev-python/arrow/arrow-0.17.0.ebuild
 2005071739 ./dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
+2012011340 ./dev-python/asn1crypto/asn1crypto-1.4.0.ebuild
 2010132339 ./dev-python/astor/astor-0.8.1.ebuild
 2010180309 ./dev-python/astroid/astroid-2.4.2-r1.ebuild
 2012010039 ./dev-python/async_generator/async_generator-1.10.ebuild
@@ -11456,6 +11422,7 @@
 2011190409 ./dev-python/aws-sam-translator/aws-sam-translator-1.30.0.ebuild
 2011191109 ./dev-python/aws-sam-translator/aws-sam-translator-1.30.1.ebuild
 2011241139 ./dev-python/aws-sam-translator/aws-sam-translator-1.31.0.ebuild
+2012021839 ./dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild
 2008180909 ./dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.6.0.ebuild
 2011261139 ./dev-python/awscli/awscli-1.18.160.ebuild
 2008022209 ./dev-python/babelfish/babelfish-9999.ebuild
@@ -11467,7 +11434,7 @@
 2008180909 ./dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild
 2009201909 ./dev-python/backports/backports-1.0-r1.ebuild
 2011181009 ./dev-python/bandit/bandit-1.6.2-r1.ebuild
-2010160510 ./dev-python/bashate/bashate-0.6.0.ebuild
+2012030109 ./dev-python/bashate/bashate-0.6.0.ebuild
 2004222209 ./dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild
 2008221239 ./dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
 2009190209 ./dev-python/bcrypt/bcrypt-3.2.0.ebuild
@@ -11478,8 +11445,7 @@
 2011170339 ./dev-python/bibtexparser/bibtexparser-1.1.0.ebuild
 2008150239 ./dev-python/billiard/billiard-3.6.0.0.ebuild
 2011021309 ./dev-python/binaryornot/binaryornot-0.4.4-r1.ebuild
-2011141239 ./dev-python/bitarray/bitarray-0.8.3.ebuild
-2011141239 ./dev-python/bitarray/bitarray-1.6.1.ebuild
+2012021209 ./dev-python/bitarray/bitarray-1.6.1.ebuild
 2009181139 ./dev-python/bitstring/bitstring-3.1.7.ebuild
 2011281739 ./dev-python/bleach/bleach-3.2.1.ebuild
 2006021508 ./dev-python/blessings/blessings-1.7-r1.ebuild
@@ -11487,7 +11453,7 @@
 2011262239 ./dev-python/blockdiag/blockdiag-2.0.1.ebuild
 2011031239 ./dev-python/blosc/blosc-1.9.2.ebuild
 2011021609 ./dev-python/bluelet/bluelet-0.2.0.ebuild
-2010162139 ./dev-python/blurb/blurb-1.0.7.ebuild
+2012030109 ./dev-python/blurb/blurb-1.0.7.ebuild
 2010060839 ./dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
 2009010739 ./dev-python/boto/boto-2.49.0-r3.ebuild
 2007300909 ./dev-python/boto3/boto3-9999.ebuild
@@ -11500,6 +11466,8 @@
 2011241109 ./dev-python/boto3/boto3-1.16.24.ebuild
 2011251209 ./dev-python/boto3/boto3-1.16.25.ebuild
 2011261139 ./dev-python/boto3/boto3-1.16.9.ebuild
+2012011340 ./dev-python/boto3/boto3-1.16.26.ebuild
+2012021239 ./dev-python/boto3/boto3-1.16.28.ebuild
 2007300909 ./dev-python/botocore/botocore-9999.ebuild
 2011121239 ./dev-python/botocore/botocore-1.19.16.ebuild
 2011181939 ./dev-python/botocore/botocore-1.18.18.ebuild
@@ -11510,10 +11478,13 @@
 2011241109 ./dev-python/botocore/botocore-1.19.24.ebuild
 2011251209 ./dev-python/botocore/botocore-1.19.25.ebuild
 2011261139 ./dev-python/botocore/botocore-1.19.9.ebuild
+2012011340 ./dev-python/botocore/botocore-1.19.26.ebuild
+2012021239 ./dev-python/botocore/botocore-1.19.28.ebuild
 2009201139 ./dev-python/bottle/bottle-0.12.18-r1.ebuild
 2011120009 ./dev-python/bottle/bottle-0.12.19.ebuild
 2009181339 ./dev-python/bottleneck/bottleneck-1.3.2.ebuild
 2011151409 ./dev-python/bpython/bpython-0.20.ebuild
+2012011209 ./dev-python/bpython/bpython-0.20.1.ebuild
 2009300039 ./dev-python/breathe/breathe-4.14.1.ebuild
 2010311309 ./dev-python/breathe/breathe-4.22.1.ebuild
 2011281139 ./dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
@@ -11521,7 +11492,7 @@
 2007010939 ./dev-python/brython/brython-3.7.4.ebuild
 2008150239 ./dev-python/bsddb3/bsddb3-6.2.7.ebuild
 2011040839 ./dev-python/cached-property/cached-property-1.5.2.ebuild
-2004201209 ./dev-python/cachelib/cachelib-0.1.ebuild
+2012030139 ./dev-python/cachelib/cachelib-0.1.ebuild
 2008220909 ./dev-python/cachetools/cachetools-4.1.1.ebuild
 2006051939 ./dev-python/cairocffi/cairocffi-1.1.0.ebuild
 2010300309 ./dev-python/cairocffi/cairocffi-1.2.0.ebuild
@@ -11533,14 +11504,14 @@
 2011291139 ./dev-python/castellan/castellan-3.6.0.ebuild
 2010131439 ./dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild
 2010131439 ./dev-python/catkin_pkg/catkin_pkg-9999.ebuild
-2007201509 ./dev-python/cbor/cbor-1.0.0-r1.ebuild
+2012011340 ./dev-python/cbor/cbor-1.0.0-r1.ebuild
 2010162139 ./dev-python/celery/celery-4.3.0.ebuild
 2008031009 ./dev-python/certifi/certifi-10001.ebuild
 2009281909 ./dev-python/certifi/certifi-10001-r1.ebuild
 2011281039 ./dev-python/cffi/cffi-1.14.0-r3.ebuild
-2011172109 ./dev-python/cfn-python-lint/cfn-python-lint-0.41.0.ebuild
-2011251209 ./dev-python/cfn-python-lint/cfn-python-lint-0.42.0.ebuild
-2011261139 ./dev-python/cfn-python-lint/cfn-python-lint-0.39.0.ebuild
+2012011340 ./dev-python/cfn-python-lint/cfn-python-lint-0.39.0.ebuild
+2012011340 ./dev-python/cfn-python-lint/cfn-python-lint-0.41.0.ebuild
+2012011340 ./dev-python/cfn-python-lint/cfn-python-lint-0.42.0.ebuild
 2003271809 ./dev-python/cgroup-utils/cgroup-utils-0.8.ebuild
 2006040939 ./dev-python/chai/chai-1.1.2.ebuild
 2008220909 ./dev-python/chameleon/chameleon-3.8.1.ebuild
@@ -11555,7 +11526,7 @@
 2011251209 ./dev-python/cheroot/cheroot-8.4.8.ebuild
 2007310009 ./dev-python/cherrypy/cherrypy-18.6.0.ebuild
 2009091309 ./dev-python/chump/chump-1.6.0-r1.ebuild
-2004061139 ./dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
+2012030439 ./dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
 2009050339 ./dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild
 2001051415 ./dev-python/clang-python/clang-python-9.0.1.ebuild
 2009201839 ./dev-python/clang-python/clang-python-10.0.1.ebuild
@@ -11576,8 +11547,8 @@
 2011040839 ./dev-python/clint/clint-0.5.1-r3.ebuild
 2010071039 ./dev-python/cloudpickle/cloudpickle-1.6.0.ebuild
 2009190539 ./dev-python/cmd2/cmd2-1.3.8.ebuild
-2011121239 ./dev-python/cmd2/cmd2-1.4.0.ebuild
 2012010039 ./dev-python/cmd2/cmd2-1.3.11.ebuild
+2012011340 ./dev-python/cmd2/cmd2-1.4.0.ebuild
 2011150839 ./dev-python/collective-checkdocs/collective-checkdocs-0.2-r1.ebuild
 2009201139 ./dev-python/colorama/colorama-0.4.3-r1.ebuild
 2011150209 ./dev-python/colorama/colorama-0.4.4.ebuild
@@ -11588,8 +11559,7 @@
 2011011109 ./dev-python/commonmark/commonmark-0.9.1.ebuild
 2008250139 ./dev-python/configargparse/configargparse-1.2.3.ebuild
 2009201839 ./dev-python/configclass/configclass-0.2.0.ebuild
-2008061909 ./dev-python/configobj/configobj-5.0.6.ebuild
-2011292039 ./dev-python/configobj/configobj-5.0.6-r1.ebuild
+2012030239 ./dev-python/configobj/configobj-5.0.6-r1.ebuild
 2008051739 ./dev-python/configshell-fb/configshell-fb-1.1.28.ebuild
 2001051415 ./dev-python/confuse/confuse-1.0.0.ebuild
 2011251209 ./dev-python/confuse/confuse-1.4.0.ebuild
@@ -11598,8 +11568,8 @@
 2011142339 ./dev-python/construct/construct-2.10.56.ebuild
 2011281709 ./dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild
 2009260809 ./dev-python/cookies/cookies-2.2.1-r1.ebuild
-2002042309 ./dev-python/coreapi/coreapi-2.3.3-r1.ebuild
-2002042309 ./dev-python/coreschema/coreschema-0.0.4.ebuild
+2012030139 ./dev-python/coreapi/coreapi-2.3.3-r1.ebuild
+2012030139 ./dev-python/coreschema/coreschema-0.0.4.ebuild
 2002042309 ./dev-python/couchdb-python/couchdb-python-1.1.ebuild
 2011181209 ./dev-python/cov-core/cov-core-1.15.0-r2.ebuild
 2011181209 ./dev-python/coverage/coverage-4.5.4.ebuild
@@ -11607,16 +11577,17 @@
 2010162139 ./dev-python/crcmod/crcmod-1.7-r4.ebuild
 2010070339 ./dev-python/croniter/croniter-0.3.30.ebuild
 2010300139 ./dev-python/cryptography/cryptography-3.2.ebuild
-2011301109 ./dev-python/cryptography/cryptography-3.2.1.ebuild
+2012031039 ./dev-python/cryptography/cryptography-3.2.1.ebuild
 2007172339 ./dev-python/css-parser/css-parser-1.0.4-r1.ebuild
 2011281709 ./dev-python/cssselect/cssselect-1.1.0-r1.ebuild
 2009261409 ./dev-python/cssselect2/cssselect2-0.3.0.ebuild
 2010300309 ./dev-python/cssselect2/cssselect2-0.4.1.ebuild
 2008231509 ./dev-python/cssutils/cssutils-1.0.2-r2.ebuild
 2009181139 ./dev-python/ctypesgen/ctypesgen-1.0.2.ebuild
-2010180709 ./dev-python/cursive/cursive-0.2.2-r1.ebuild
 2010180709 ./dev-python/cursive/cursive-0.2.2.ebuild
+2012021739 ./dev-python/cursive/cursive-0.2.2-r1.ebuild
 2006021508 ./dev-python/curtsies/curtsies-0.3.0-r2.ebuild
+2012011209 ./dev-python/curtsies/curtsies-0.3.4.ebuild
 2008010139 ./dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
 2010161039 ./dev-python/cx_Freeze/cx_Freeze-6.1.ebuild
 2006051909 ./dev-python/cycler/cycler-0.10.0-r1.ebuild
@@ -11673,10 +11644,11 @@
 2011090239 ./dev-python/django/django-3.0.11.ebuild
 2011121539 ./dev-python/django/django-3.1.1-r1.ebuild
 2011300009 ./dev-python/django/django-3.1.3.ebuild
+2012011340 ./dev-python/django/django-3.1.4.ebuild
 2008211639 ./dev-python/django_polymorphic/django_polymorphic-3.0.0.ebuild
 2009302139 ./dev-python/djangorestframework/djangorestframework-3.11.1.ebuild
 2009171909 ./dev-python/dkimpy/dkimpy-1.0.5.ebuild
-2003162209 ./dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
+2012030239 ./dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
 2008190739 ./dev-python/dnspython/dnspython-2.0.0.ebuild
 2008221239 ./dev-python/dnspython/dnspython-1.16.0-r1.ebuild
 2010160510 ./dev-python/doc8/doc8-0.6.0.ebuild
@@ -11697,7 +11669,7 @@
 2011040839 ./dev-python/doublex-expects/doublex-expects-0.7.1.ebuild
 2011040839 ./dev-python/doublex/doublex-1.9.2.ebuild
 2003120209 ./dev-python/drf-yasg/drf-yasg-1.17.1.ebuild
-2002041909 ./dev-python/duecredit/duecredit-0.7.0.ebuild
+2012030439 ./dev-python/duecredit/duecredit-0.7.0.ebuild
 2003251909 ./dev-python/dugong/dugong-3.7.3.ebuild
 2011090239 ./dev-python/dulwich/dulwich-0.20.6.ebuild
 2005181440 ./dev-python/easy-thumbnails/easy-thumbnails-2.7.ebuild
@@ -11721,11 +11693,11 @@
 2009231339 ./dev-python/eventlet/eventlet-0.26.1.ebuild
 2011281209 ./dev-python/execnet/execnet-1.7.1-r1.ebuild
 2011040839 ./dev-python/expects/expects-0.9.0.ebuild
-2009201909 ./dev-python/extras/extras-1.0.0-r1.ebuild
+2012012039 ./dev-python/extras/extras-1.0.0-r1.ebuild
 2008091639 ./dev-python/eyeD3/eyeD3-0.8.11-r1.ebuild
 2011242239 ./dev-python/eyeD3/eyeD3-0.9.5.ebuild
 2005311639 ./dev-python/falcon/falcon-2.0.0.ebuild
-2007082339 ./dev-python/fasteners/fasteners-0.15.ebuild
+2012012039 ./dev-python/fasteners/fasteners-0.15.ebuild
 2011040409 ./dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild
 2008061909 ./dev-python/feedparser/feedparser-5.2.1.ebuild
 2011261009 ./dev-python/feedparser/feedparser-6.0.2.ebuild
@@ -11738,12 +11710,13 @@
 2011171809 ./dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
 2004040839 ./dev-python/flake8-polyfill/flake8-polyfill-1.0.2.ebuild
 2007132009 ./dev-python/flake8/flake8-3.8.1.ebuild
-2011281909 ./dev-python/flake8/flake8-3.8.3-r1.ebuild
+2012011340 ./dev-python/flake8/flake8-3.8.3-r1.ebuild
 2011281839 ./dev-python/flaky/flaky-3.7.0-r1.ebuild
 2009231439 ./dev-python/flask-api/flask-api-2.0.ebuild
 2010010439 ./dev-python/flask-babel/flask-babel-2.0.0.ebuild
 2007090839 ./dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
 2002051639 ./dev-python/flask-cors/flask-cors-2.1.0.ebuild
+2012030739 ./dev-python/flask-cors/flask-cors-3.0.9.ebuild
 2009042209 ./dev-python/flask-debug/flask-debug-0.4.3-r1.ebuild
 2006241039 ./dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
 2007302309 ./dev-python/flask-htmlmin/flask-htmlmin-2.0.2.ebuild
@@ -11768,7 +11741,7 @@
 2011101239 ./dev-python/flufl-bounce/flufl-bounce-3.0.1.ebuild
 2011101309 ./dev-python/flufl-i18n/flufl-i18n-2.0.2.ebuild
 2009271909 ./dev-python/flufl-lock/flufl-lock-5.0.1.ebuild
-2004190539 ./dev-python/fonttools/fonttools-4.1.0.ebuild
+2012011340 ./dev-python/fonttools/fonttools-4.1.0.ebuild
 2010050339 ./dev-python/fqdn/fqdn-1.5.0.ebuild
 2009201339 ./dev-python/freezegun/freezegun-0.3.15-r1.ebuild
 2009201339 ./dev-python/freezegun/freezegun-1.0.0-r1.ebuild
@@ -11785,9 +11758,7 @@
 2003162209 ./dev-python/futurist/futurist-1.8.1.ebuild
 2011261139 ./dev-python/futurist/futurist-2.3.0.ebuild
 2003240109 ./dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
-2002051709 ./dev-python/gast/gast-0.2.2.ebuild
-2007091209 ./dev-python/gast/gast-0.3.3.ebuild
-2009251439 ./dev-python/gast/gast-0.3.3-r1.ebuild
+2012022009 ./dev-python/gast/gast-0.3.3-r1.ebuild
 2005181339 ./dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5-r1.ebuild
 2008221239 ./dev-python/genshi/genshi-0.7.3-r1.ebuild
 2011281709 ./dev-python/genty/genty-1.3.2-r1.ebuild
@@ -11800,7 +11771,7 @@
 2003120039 ./dev-python/gitdb2/gitdb2-2.0.3.ebuild
 2011172109 ./dev-python/github3/github3-1.3.0.ebuild
 2009302109 ./dev-python/glance_store/glance_store-1.0.1.ebuild
-2010180709 ./dev-python/glance_store/glance_store-2.3.0.ebuild
+2012021739 ./dev-python/glance_store/glance_store-2.3.0.ebuild
 2011281509 ./dev-python/gmpy/gmpy-2.0.8-r2.ebuild
 2009202339 ./dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
 2005151009 ./dev-python/google-apitools/google-apitools-0.5.31.ebuild
@@ -11842,6 +11813,7 @@
 2007132139 ./dev-python/http-parser/http-parser-0.9.0.ebuild
 2009050239 ./dev-python/httpauth/httpauth-0.3.ebuild
 2011281139 ./dev-python/httpbin/httpbin-0.7.0-r1.ebuild
+2012021309 ./dev-python/httpbin/httpbin-0.7.0-r2.ebuild
 2009201309 ./dev-python/httplib2/httplib2-0.18.1-r1.ebuild
 2003271509 ./dev-python/httpretty/httpretty-0.9.6.ebuild
 2009010739 ./dev-python/httpretty/httpretty-1.0.2-r1.ebuild
@@ -11862,7 +11834,7 @@
 2011242239 ./dev-python/hypothesis/hypothesis-5.36.2.ebuild
 2011271239 ./dev-python/hypothesis/hypothesis-5.37.5.ebuild
 2011281439 ./dev-python/hypothesis/hypothesis-5.41.3.ebuild
-2011282309 ./dev-python/hypothesis/hypothesis-5.41.4.ebuild
+2012011340 ./dev-python/hypothesis/hypothesis-5.41.4.ebuild
 2010182239 ./dev-python/icalendar/icalendar-4.0.7.ebuild
 2011270309 ./dev-python/idna-ssl/idna-ssl-1.1.0-r1.ebuild
 2009201639 ./dev-python/idna/idna-2.10-r1.ebuild
@@ -11874,8 +11846,8 @@
 2003171839 ./dev-python/iminuit/iminuit-1.3.8.ebuild
 2009201909 ./dev-python/importlib_metadata/importlib_metadata-1.7.0-r2.ebuild
 2010260109 ./dev-python/importlib_metadata/importlib_metadata-2.0.0.ebuild
-2011240309 ./dev-python/importlib_metadata/importlib_metadata-3.0.0.ebuild
 2011281139 ./dev-python/importlib_metadata/importlib_metadata-3.1.0.ebuild
+2012021509 ./dev-python/importlib_metadata/importlib_metadata-3.1.1.ebuild
 2009201909 ./dev-python/importlib_resources/importlib_resources-1.5.0-r2.ebuild
 2011281139 ./dev-python/importlib_resources/importlib_resources-3.3.0.ebuild
 2011281509 ./dev-python/incremental/incremental-17.5.0.ebuild
@@ -11910,7 +11882,7 @@
 2009220939 ./dev-python/isort/isort-4.3.21_p2-r1.ebuild
 2011281909 ./dev-python/isort/isort-5.6.3.ebuild
 2011281139 ./dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild
-2002051809 ./dev-python/itypes/itypes-1.1.0.ebuild
+2012030139 ./dev-python/itypes/itypes-1.1.0.ebuild
 2011281739 ./dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
 2009211840 ./dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
 2011281839 ./dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
@@ -11934,6 +11906,7 @@
 2007292039 ./dev-python/jmespath/jmespath-0.10.0.ebuild
 2011190309 ./dev-python/joblib/joblib-0.17.0.ebuild
 2010260109 ./dev-python/josepy/josepy-1.4.0.ebuild
+2012020439 ./dev-python/josepy/josepy-1.5.0.ebuild
 2003201209 ./dev-python/jsmin/jsmin-2.2.2.ebuild
 2005190038 ./dev-python/json-rpc/json-rpc-1.13.0.ebuild
 2008180909 ./dev-python/jsondiff/jsondiff-1.2.0.ebuild
@@ -11941,6 +11914,7 @@
 2011172109 ./dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
 2007302309 ./dev-python/jsonpatch/jsonpatch-1.26.ebuild
 2011241109 ./dev-python/jsonpatch/jsonpatch-1.27.ebuild
+2012021239 ./dev-python/jsonpatch/jsonpatch-1.28.ebuild
 2010162139 ./dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild
 2011301139 ./dev-python/jsonpickle/jsonpickle-1.4.2.ebuild
 2008021139 ./dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
@@ -11969,8 +11943,7 @@
 2011291139 ./dev-python/keystonemiddleware/keystonemiddleware-9.1.0.ebuild
 2011271909 ./dev-python/kiwisolver/kiwisolver-1.3.0.ebuild
 2011300009 ./dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
-2005302109 ./dev-python/kombu/kombu-4.6.8.ebuild
-2010180109 ./dev-python/kombu/kombu-5.0.1.ebuild
+2012021139 ./dev-python/kombu/kombu-5.0.1.ebuild
 2010160510 ./dev-python/lazr-config/lazr-config-2.2.2.ebuild
 2010160510 ./dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild
 2007292039 ./dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
@@ -12001,6 +11974,7 @@
 2005091109 ./dev-python/livereload/livereload-2.6.1.ebuild
 2008292109 ./dev-python/llfuse/llfuse-1.3.6.ebuild
 2009190539 ./dev-python/llvmlite/llvmlite-0.34.0.ebuild
+2012011340 ./dev-python/llvmlite/llvmlite-0.35.0.ebuild
 2011172239 ./dev-python/lmdb/lmdb-1.0.0.ebuild
 2008180909 ./dev-python/locket/locket-0.2.0-r1.ebuild
 2008070439 ./dev-python/lockfile/lockfile-0.12.2-r2.ebuild
@@ -12009,7 +11983,7 @@
 2009220209 ./dev-python/loguru/loguru-0.5.3.ebuild
 2010160510 ./dev-python/logutils/logutils-0.3.5.ebuild
 2011271139 ./dev-python/lxml/lxml-4.6.1.ebuild
-2011291139 ./dev-python/lxml/lxml-4.6.2.ebuild
+2012030209 ./dev-python/lxml/lxml-4.6.2.ebuild
 2010141409 ./dev-python/lz4/lz4-3.0.2.ebuild
 2011241809 ./dev-python/lz4/lz4-3.1.1.ebuild
 2009201909 ./dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild
@@ -12035,7 +12009,7 @@
 2011090239 ./dev-python/mccabe/mccabe-0.6.1-r2.ebuild
 2008111609 ./dev-python/mecab-python/mecab-python-0.996.ebuild
 2003272009 ./dev-python/mechanize/mechanize-0.4.5.ebuild
-2001051415 ./dev-python/mediafile/mediafile-0.2.0.ebuild
+2012031109 ./dev-python/mediafile/mediafile-0.6.0.ebuild
 2008030109 ./dev-python/memory_profiler/memory_profiler-0.57.ebuild
 2009201839 ./dev-python/mergedict/mergedict-1.0.0.ebuild
 2009050939 ./dev-python/metakernel/metakernel-0.25.0-r1.ebuild
@@ -12100,8 +12074,7 @@
 2001160839 ./dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild
 2009050139 ./dev-python/netifaces/netifaces-0.10.9.ebuild
 2009241009 ./dev-python/networkx/networkx-2.5.ebuild
-2005302109 ./dev-python/neutron-lib/neutron-lib-2.3.0.ebuild
-2010190109 ./dev-python/neutron-lib/neutron-lib-2.6.1.ebuild
+2012021209 ./dev-python/neutron-lib/neutron-lib-2.6.1.ebuild
 2011140039 ./dev-python/nltk/nltk-3.5.ebuild
 2009071239 ./dev-python/nnpy/nnpy-1.4.2.ebuild
 2009211840 ./dev-python/node-semver/node-semver-0.8.0.ebuild
@@ -12113,6 +12086,7 @@
 2011181209 ./dev-python/nose/nose-1.3.7-r6.ebuild
 2011181209 ./dev-python/nose/nose-1.3.7-r7.ebuild
 2001051415 ./dev-python/nose2/nose2-0.9.1-r1.ebuild
+2012030239 ./dev-python/nose2/nose2-0.9.2.ebuild
 2004242339 ./dev-python/nose_fixes/nose_fixes-1.3.ebuild
 2010162139 ./dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
 2002112309 ./dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild
@@ -12130,7 +12104,7 @@
 2011022139 ./dev-python/numpy/numpy-1.19.4.ebuild
 2011072339 ./dev-python/numpy/numpy-1.19.1.ebuild
 2011181009 ./dev-python/numpy/numpy-1.19.2.ebuild
-2011292039 ./dev-python/numpy/numpy-1.19.3.ebuild
+2012031009 ./dev-python/numpy/numpy-1.19.3.ebuild
 2003251639 ./dev-python/numpydoc/numpydoc-0.9.1.ebuild
 2011300009 ./dev-python/numpydoc/numpydoc-1.1.0.ebuild
 2004211139 ./dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
@@ -12158,8 +12132,7 @@
 2007170509 ./dev-python/os-service-types/os-service-types-1.7.0.ebuild
 2011172239 ./dev-python/os-testr/os-testr-2.0.0.ebuild
 2011271909 ./dev-python/os-traits/os-traits-2.4.0.ebuild
-2001131309 ./dev-python/os-vif/os-vif-1.15.2.ebuild
-2010190109 ./dev-python/os-vif/os-vif-2.2.0.ebuild
+2012021209 ./dev-python/os-vif/os-vif-2.2.0.ebuild
 2001131309 ./dev-python/os-win/os-win-4.2.0.ebuild
 2011271909 ./dev-python/os-win/os-win-5.1.0.ebuild
 2011271909 ./dev-python/os-xenapi/os-xenapi-0.3.4-r1.ebuild
@@ -12172,8 +12145,7 @@
 2011271909 ./dev-python/oslo-db/oslo-db-8.4.0.ebuild
 2011160309 ./dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild
 2011181309 ./dev-python/oslo-log/oslo-log-4.4.0.ebuild
-2007190139 ./dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild
-2010200539 ./dev-python/oslo-messaging/oslo-messaging-12.5.1.ebuild
+2012021209 ./dev-python/oslo-messaging/oslo-messaging-12.5.1.ebuild
 2007030309 ./dev-python/oslo-middleware/oslo-middleware-4.0.2.ebuild
 2011271909 ./dev-python/oslo-middleware/oslo-middleware-4.1.1.ebuild
 2011271909 ./dev-python/oslo-policy/oslo-policy-3.5.0.ebuild
@@ -12188,8 +12160,7 @@
 2003261841 ./dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
 2011271909 ./dev-python/oslo-upgradecheck/oslo-upgradecheck-1.1.1.ebuild
 2011172239 ./dev-python/oslo-utils/oslo-utils-4.6.0.ebuild
-2007030309 ./dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild
-2010190109 ./dev-python/oslo-versionedobjects/oslo-versionedobjects-2.3.0.ebuild
+2012021209 ./dev-python/oslo-versionedobjects/oslo-versionedobjects-2.3.0.ebuild
 2001131309 ./dev-python/oslo-vmware/oslo-vmware-2.32.2.ebuild
 2011271909 ./dev-python/oslo-vmware/oslo-vmware-3.7.0.ebuild
 2011160309 ./dev-python/oslotest/oslotest-4.4.1.ebuild
@@ -12248,7 +12219,7 @@
 2005191538 ./dev-python/pilkit/pilkit-2.0.ebuild
 2006062209 ./dev-python/pillow/pillow-7.0.0.ebuild
 2011242239 ./dev-python/pillow/pillow-7.2.0.ebuild
-2011272309 ./dev-python/pillow/pillow-8.0.1.ebuild
+2012030209 ./dev-python/pillow/pillow-8.0.1.ebuild
 2011281909 ./dev-python/pip/pip-20.2.4.ebuild
 2010121609 ./dev-python/pipenv/pipenv-2020.8.13.ebuild
 2011120039 ./dev-python/pipenv/pipenv-2020.11.4.ebuild
@@ -12259,6 +12230,7 @@
 2011281109 ./dev-python/pluggy/pluggy-0.13.1-r1.ebuild
 2006020009 ./dev-python/pluginbase/pluginbase-1.0.0.ebuild
 2003251909 ./dev-python/plumbum/plumbum-1.6.8.ebuild
+2012011239 ./dev-python/plumbum/plumbum-1.6.9.ebuild
 2009252309 ./dev-python/ply/ply-3.11-r1.ebuild
 2004251239 ./dev-python/plyr/plyr-1.0.6.ebuild
 2010102239 ./dev-python/plyvel/plyvel-1.3.0.ebuild
@@ -12304,8 +12276,7 @@
 2007180239 ./dev-python/pudb/pudb-2019.2.ebuild
 2003171139 ./dev-python/pure-sasl/pure-sasl-0.6.1.ebuild
 2010212209 ./dev-python/pushbullet-py/pushbullet-py-0.12.0.ebuild
-2005302109 ./dev-python/py-amqp/py-amqp-2.5.2.ebuild
-2010180109 ./dev-python/py-amqp/py-amqp-2.6.1.ebuild
+2012021139 ./dev-python/py-amqp/py-amqp-2.6.1.ebuild
 2007260139 ./dev-python/py-cpuinfo/py-cpuinfo-6.0.0.ebuild
 2009140039 ./dev-python/py-cpuinfo/py-cpuinfo-7.0.0.ebuild
 2002112139 ./dev-python/py-gfm/py-gfm-0.1.4.ebuild
@@ -12319,7 +12290,7 @@
 2006110539 ./dev-python/pyTenable/pyTenable-1.1.3.ebuild
 2010101039 ./dev-python/pyacoustid/pyacoustid-1.2.0.ebuild
 2011281539 ./dev-python/pyaes/pyaes-1.6.1-r2.ebuild
-2005042009 ./dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
+2012030239 ./dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
 2009181339 ./dev-python/pyamg/pyamg-3.2.1-r1.ebuild
 2011281439 ./dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
 2009201639 ./dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
@@ -12370,8 +12341,8 @@
 2005032209 ./dev-python/pygal/pygal-2.4.0-r1.ebuild
 2010061709 ./dev-python/pygame/pygame-9999.ebuild
 2010121109 ./dev-python/pygame/pygame-2.0.0_pre10.ebuild
-2010282309 ./dev-python/pygame/pygame-2.0.0.ebuild
 2012010039 ./dev-python/pygame/pygame-1.9.6-r1.ebuild
+2012031039 ./dev-python/pygame/pygame-2.0.0.ebuild
 2009161339 ./dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r4.ebuild
 2009161339 ./dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild
 2009161339 ./dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild
@@ -12427,7 +12398,7 @@
 2012010039 ./dev-python/pyopengl/pyopengl-3.1.5.ebuild
 2008051739 ./dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.5.ebuild
 2009201639 ./dev-python/pyopenssl/pyopenssl-19.1.0-r1.ebuild
-2011281209 ./dev-python/pyopenssl/pyopenssl-20.0.0.ebuild
+2012021539 ./dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
 2003190539 ./dev-python/pyotherside/pyotherside-1.5.9.ebuild
 2010170709 ./dev-python/pyotp/pyotp-2.4.1.ebuild
 2009201309 ./dev-python/pypam/pypam-0.5.0-r6.ebuild
@@ -12487,6 +12458,7 @@
 2008231509 ./dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
 2008021239 ./dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
 2011181209 ./dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
+2012011409 ./dev-python/pytest-cov/pytest-cov-2.10.1.ebuild
 2009211939 ./dev-python/pytest-describe/pytest-describe-1.0.0.ebuild
 2011271909 ./dev-python/pytest-django/pytest-django-4.1.0.ebuild
 2009041409 ./dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
@@ -12511,15 +12483,14 @@
 2011181209 ./dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild
 2009211939 ./dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
 2009211939 ./dev-python/pytest-xdist/pytest-xdist-1.34.0-r1.ebuild
-2011281209 ./dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
+2012012109 ./dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
 2010302039 ./dev-python/pytest-xprocess/pytest-xprocess-0.16.0.ebuild
 2011150839 ./dev-python/pytest-xprocess/pytest-xprocess-0.15.0.ebuild
 2011271239 ./dev-python/pytest-xprocess/pytest-xprocess-0.17.0.ebuild
 2007120109 ./dev-python/pytest/pytest-5.4.3.ebuild
 2009201909 ./dev-python/pytest/pytest-4.6.11-r1.ebuild
-2011261409 ./dev-python/pytest/pytest-6.1.1.ebuild
-2011281139 ./dev-python/pytest/pytest-6.1.2.ebuild
-2007111109 ./dev-python/python-augeas/python-augeas-1.1.0.ebuild
+2012021339 ./dev-python/pytest/pytest-6.1.2.ebuild
+2012030639 ./dev-python/python-augeas/python-augeas-1.1.0.ebuild
 2008250139 ./dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
 2008250139 ./dev-python/python-axolotl/python-axolotl-0.2.3-r1.ebuild
 2010150509 ./dev-python/python-backoff/python-backoff-1.6.0.ebuild
@@ -12557,7 +12528,7 @@
 2011251109 ./dev-python/python-heatclient/python-heatclient-2.2.1.ebuild
 2011100339 ./dev-python/python-iptables/python-iptables-1.0.0-r1.ebuild
 2005302109 ./dev-python/python-ironicclient/python-ironicclient-4.1.0.ebuild
-2010170639 ./dev-python/python-ironicclient/python-ironicclient-4.4.0.ebuild
+2012030239 ./dev-python/python-ironicclient/python-ironicclient-4.4.0.ebuild
 2009181139 ./dev-python/python-jose/python-jose-3.2.0-r1.ebuild
 2011191439 ./dev-python/python-keystoneclient/python-keystoneclient-4.1.1.ebuild
 2010310511 ./dev-python/python-ldap/python-ldap-9999.ebuild
@@ -12620,6 +12591,7 @@
 2011090239 ./dev-python/pyu2f/pyu2f-0.1.4-r1.ebuild
 2011251209 ./dev-python/pyudev/pyudev-0.22.0.ebuild
 2009201309 ./dev-python/pyusb/pyusb-1.0.2-r1.ebuild
+2012020239 ./dev-python/pyusb/pyusb-1.1.0.ebuild
 2011182209 ./dev-python/pywavelets/pywavelets-1.1.1.ebuild
 2004040539 ./dev-python/pywinrm/pywinrm-0.4.1.ebuild
 2003081739 ./dev-python/pyx/pyx-0.15.ebuild
@@ -12659,7 +12631,7 @@
 2005090239 ./dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.8.ebuild
 2009181839 ./dev-python/requests-cache/requests-cache-0.5.2.ebuild
 2004040539 ./dev-python/requests-credssp/requests-credssp-1.1.1.ebuild
-2003171339 ./dev-python/requests-file/requests-file-1.4.3.ebuild
+2012030239 ./dev-python/requests-file/requests-file-1.4.3.ebuild
 2009211109 ./dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild
 2010162139 ./dev-python/requests-mock/requests-mock-1.8.0.ebuild
 2004200209 ./dev-python/requests-ntlm/requests-ntlm-1.1.0-r1.ebuild
@@ -12689,12 +12661,12 @@
 2009271739 ./dev-python/rply/rply-0.7.7-r1.ebuild
 2008150239 ./dev-python/rpy/rpy-2.9.0.ebuild
 2003251909 ./dev-python/rpyc/rpyc-4.1.4.ebuild
+2012011239 ./dev-python/rpyc/rpyc-4.1.5.ebuild
 2011090239 ./dev-python/rq/rq-1.6.1.ebuild
 2011261209 ./dev-python/rq/rq-1.5.2.ebuild
 2011291409 ./dev-python/rq/rq-1.7.0.ebuild
 2009010739 ./dev-python/rsa/rsa-4.2.ebuild
-2009211840 ./dev-python/rst-linker/rst-linker-2.0.0.ebuild
-2011292039 ./dev-python/rst-linker/rst-linker-2.1.1.ebuild
+2012021309 ./dev-python/rst-linker/rst-linker-2.1.1.ebuild
 2008250139 ./dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
 2011160309 ./dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild
 2011232009 ./dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild
@@ -12768,11 +12740,11 @@
 2011192309 ./dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
 2012010039 ./dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
 2008221039 ./dev-python/sphinx/sphinx-2.4.4.ebuild
-2009182109 ./dev-python/sphinx/sphinx-3.2.1.ebuild
-2011130039 ./dev-python/sphinx/sphinx-3.3.1.ebuild
+2012020039 ./dev-python/sphinx/sphinx-3.2.1.ebuild
+2012011340 ./dev-python/sphinx/sphinx-3.3.1.ebuild
 2011090239 ./dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild
 2004221139 ./dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
-2011090239 ./dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
+2012011340 ./dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
 2009041409 ./dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
 2009041409 ./dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
 2011262239 ./dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
@@ -12803,7 +12775,8 @@
 2010141009 ./dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
 2011231109 ./dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild
 2002060939 ./dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild
-2003251609 ./dev-python/sshtunnel/sshtunnel-0.1.5.ebuild
+2012022139 ./dev-python/sshtunnel/sshtunnel-0.1.5.ebuild
+2012030509 ./dev-python/sshtunnel/sshtunnel-0.3.1.ebuild
 2011180209 ./dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
 2011180209 ./dev-python/ssl-fetch/ssl-fetch-9999.ebuild
 2011021539 ./dev-python/stapler/stapler-1.0.0_p20200531.ebuild
@@ -12814,6 +12787,7 @@
 2010300309 ./dev-python/statsmodels/statsmodels-0.12.1.ebuild
 2010160239 ./dev-python/stestr/stestr-2.1.0-r1.ebuild
 2010182239 ./dev-python/stevedore/stevedore-3.2.2.ebuild
+2012011340 ./dev-python/stevedore/stevedore-3.3.0.ebuild
 2008021239 ./dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
 2006040939 ./dev-python/stripe/stripe-2.46.0.ebuild
 2007170509 ./dev-python/subunit/subunit-1.4.0.ebuild
@@ -12851,8 +12825,8 @@
 2011281839 ./dev-python/testpath/testpath-0.4.4-r1.ebuild
 2004032241 ./dev-python/testrepository/testrepository-0.0.20.ebuild
 2005311909 ./dev-python/testresources/testresources-2.0.1.ebuild
-2009201909 ./dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
-2009201909 ./dev-python/testtools/testtools-2.4.0-r1.ebuild
+2012012039 ./dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
+2012012039 ./dev-python/testtools/testtools-2.4.0-r1.ebuild
 2011040839 ./dev-python/texttable/texttable-1.6.3.ebuild
 2010150509 ./dev-python/textx/textx-1.4.ebuild
 2010272309 ./dev-python/theano/theano-1.0.5.ebuild
@@ -12863,7 +12837,7 @@
 2010300309 ./dev-python/tinycss2/tinycss2-1.1.0.ebuild
 2010160510 ./dev-python/tinyrpc/tinyrpc-1.0.1.ebuild
 2006161339 ./dev-python/tld/tld-0.12.2.ebuild
-2002061009 ./dev-python/tldextract/tldextract-2.2.1.ebuild
+2012030239 ./dev-python/tldextract/tldextract-2.2.1.ebuild
 2009201909 ./dev-python/toml/toml-0.10.1-r1.ebuild
 2011281139 ./dev-python/toml/toml-0.10.2.ebuild
 2011040409 ./dev-python/toolz/toolz-0.11.1.ebuild
@@ -12885,7 +12859,7 @@
 2005291109 ./dev-python/tvdb_api/tvdb_api-2.0-r1.ebuild
 2011281909 ./dev-python/twine/twine-3.2.0.ebuild
 2008041509 ./dev-python/twisted/twisted-19.10.0.ebuild
-2009041409 ./dev-python/twisted/twisted-20.3.0.ebuild
+2012011409 ./dev-python/twisted/twisted-20.3.0.ebuild
 2005041009 ./dev-python/twython/twython-3.7.0.ebuild
 2005091339 ./dev-python/txAMQP/txAMQP-0.8.2.ebuild
 2007201509 ./dev-python/txaio/txaio-20.4.1.ebuild
@@ -12914,6 +12888,7 @@
 2011120009 ./dev-python/urllib3/urllib3-1.26.1.ebuild
 2011261009 ./dev-python/urllib3/urllib3-1.25.11.ebuild
 2011281439 ./dev-python/urllib3/urllib3-1.26.2.ebuild
+2012021409 ./dev-python/urllib3/urllib3-1.26.2-r1.ebuild
 2009181139 ./dev-python/urwid/urwid-2.1.1.ebuild
 2008091039 ./dev-python/urwidtrees/urwidtrees-1.0.3.ebuild
 2010120139 ./dev-python/utidylib/utidylib-0.6-r1.ebuild
@@ -12952,6 +12927,7 @@
 2011281909 ./dev-python/webtest/webtest-2.0.35.ebuild
 2009201339 ./dev-python/werkzeug/werkzeug-1.0.1-r1.ebuild
 2011281739 ./dev-python/wheel/wheel-0.35.1-r1.ebuild
+2012021239 ./dev-python/wheel/wheel-0.36.0.ebuild
 2005111439 ./dev-python/whichcraft/whichcraft-0.6.1.ebuild
 2005091339 ./dev-python/whisper/whisper-1.1.5.ebuild
 2009201639 ./dev-python/whoosh/whoosh-2.7.4-r1.ebuild
@@ -13012,7 +12988,7 @@
 2011281109 ./dev-python/pathspec/pathspec-0.8.0.ebuild
 2011172339 ./dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
 2001271039 ./dev-python/test_server/test_server-0.0.31.ebuild
-2009041409 ./dev-python/click-default-group/click-default-group-1.2.2.ebuild
+2012011409 ./dev-python/click-default-group/click-default-group-1.2.2.ebuild
 2010180309 ./dev-python/elementpath/elementpath-2.0.3.ebuild
 2011281139 ./dev-python/elementpath/elementpath-2.0.4.ebuild
 2011281839 ./dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
@@ -13021,7 +12997,7 @@
 2011041409 ./dev-python/pytest-services/pytest-services-2.2.0.ebuild
 2008021239 ./dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
 2008021239 ./dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
-2010162139 ./dev-python/towncrier/towncrier-19.2.0.ebuild
+2012011409 ./dev-python/towncrier/towncrier-19.2.0.ebuild
 2009172239 ./dev-python/xmlschema/xmlschema-1.2.3-r1.ebuild
 2010201009 ./dev-python/xmlschema/xmlschema-1.2.4.ebuild
 2011021309 ./dev-python/xmlschema/xmlschema-1.2.5.ebuild
@@ -13035,10 +13011,10 @@
 2001310039 ./dev-python/intreehooks/intreehooks-1.0.ebuild
 2001051415 ./dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild
 2002060039 ./dev-python/requests_download/requests_download-0.1.2.ebuild
-2010162139 ./dev-python/ctypescrypto/ctypescrypto-0.5.ebuild
-2010162139 ./dev-python/ctypescrypto/ctypescrypto-9999.ebuild
-2001051415 ./dev-python/fleep/fleep-1.0.1.ebuild
-2001051415 ./dev-python/fleep/fleep-9999.ebuild
+2012030239 ./dev-python/ctypescrypto/ctypescrypto-0.5.ebuild
+2012030239 ./dev-python/ctypescrypto/ctypescrypto-9999.ebuild
+2012030439 ./dev-python/fleep/fleep-1.0.1.ebuild
+2012030439 ./dev-python/fleep/fleep-9999.ebuild
 2007231839 ./dev-python/ament_package/ament_package-0.9.2.ebuild
 2005160409 ./dev-python/astunparse/astunparse-1.6.3.ebuild
 2008250139 ./dev-python/pyspectrum2/pyspectrum2-0.2.0.ebuild
@@ -13080,9 +13056,11 @@
 2010162009 ./dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
 2009241009 ./dev-python/qtsass/qtsass-0.3.0.ebuild
 2008141839 ./dev-python/pikepdf/pikepdf-1.18.0.ebuild
+2012011409 ./dev-python/pikepdf/pikepdf-2.2.0.ebuild
 2008220909 ./dev-python/vdf/vdf-3.3.ebuild
 2001211509 ./dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1.ebuild
-2001142109 ./dev-python/casttube/casttube-0.2.0.ebuild
+2012011409 ./dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild
+2012030139 ./dev-python/casttube/casttube-0.2.0.ebuild
 2009191939 ./dev-python/ifaddr/ifaddr-0.1.6.ebuild
 2011222009 ./dev-python/ifaddr/ifaddr-0.1.7.ebuild
 2001142109 ./dev-python/pychromecast/pychromecast-4.1.0.ebuild
@@ -13098,7 +13076,8 @@
 2001242209 ./dev-python/snaketrace/snaketrace-0.1.1.ebuild
 2009212109 ./dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
 2006150309 ./dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
-2007022239 ./dev-python/pynvim/pynvim-0.4.1.ebuild
+2012031009 ./dev-python/pynvim/pynvim-0.4.1.ebuild
+2012031009 ./dev-python/pynvim/pynvim-0.4.2.ebuild
 2009202339 ./dev-python/ordered-set/ordered-set-4.0.1.ebuild
 2011101139 ./dev-python/ordered-set/ordered-set-4.0.2.ebuild
 2011031239 ./dev-python/scikit-build/scikit-build-0.11.1.ebuild
@@ -13151,7 +13130,7 @@
 2011232009 ./dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
 2010010039 ./dev-python/websockets/websockets-8.1.ebuild
 2008072239 ./dev-python/cppy/cppy-1.1.0.ebuild
-2011262239 ./dev-python/dataclasses/dataclasses-0.7.ebuild
+2012030209 ./dev-python/dataclasses/dataclasses-0.7.ebuild
 2010151039 ./dev-python/blessed/blessed-1.17.11.ebuild
 2011281539 ./dev-python/blessed/blessed-1.17.12.ebuild
 2007310409 ./dev-python/pebble/pebble-4.5.3.ebuild
@@ -13184,7 +13163,7 @@
 2010141909 ./dev-python/shiboken2/shiboken2-5.15.1.ebuild
 2011090239 ./dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
 2011171739 ./dev-python/spyder-vim/spyder-vim-0_pre20201026.ebuild
-2009201909 ./dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
+2012012039 ./dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
 2011281709 ./dev-python/black/black-20.8_beta1.ebuild
 2007260239 ./dev-python/klein/klein-20.6.0.ebuild
 2011090409 ./dev-python/python-dotenv/python-dotenv-0.15.0.ebuild
@@ -13292,6 +13271,8 @@
 2011260139 ./dev-python/pytaglib/pytaglib-1.4.6.ebuild
 2011281239 ./dev-python/reedsolomon/reedsolomon-1.5.4.ebuild
 2011302209 ./dev-python/pynest2d/pynest2d-4.8.0.ebuild
+2012011340 ./dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
+2012022339 ./dev-python/pysimdjson/pysimdjson-3.1.1.ebuild
 2010181809 ./dev-qt/assistant/assistant-5.15.1.ebuild
 2011260209 ./dev-qt/assistant/assistant-5.15.2.ebuild
 2010181809 ./dev-qt/designer/designer-5.15.1.ebuild
@@ -14791,6 +14772,7 @@
 2011110939 ./dev-ruby/listen/listen-3.3.0.ebuild
 2011151139 ./dev-ruby/listen/listen-3.3.1.ebuild
 2011281009 ./dev-ruby/listen/listen-3.3.2.ebuild
+2012011009 ./dev-ruby/listen/listen-3.3.3.ebuild
 2005240739 ./dev-ruby/litc/litc-1.0.3-r1.ebuild
 2008092040 ./dev-ruby/little-plugger/little-plugger-1.1.4.ebuild
 2011060639 ./dev-ruby/locale/locale-2.1.3.ebuild
@@ -14906,6 +14888,7 @@
 2011060639 ./dev-ruby/nokogiri/nokogiri-1.10.10.ebuild
 2004120939 ./dev-ruby/nokogumbo/nokogumbo-2.0.2.ebuild
 2011221009 ./dev-ruby/nokogumbo/nokogumbo-2.0.3.ebuild
+2012011009 ./dev-ruby/nokogumbo/nokogumbo-2.0.4.ebuild
 1901311039 ./dev-ruby/notify/notify-0.5.2-r1.ebuild
 2008011209 ./dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild
 2005311139 ./dev-ruby/oauth/oauth-0.5.4.ebuild
@@ -15052,11 +15035,9 @@
 2008221109 ./dev-ruby/redis/redis-4.1.4.ebuild
 2002260939 ./dev-ruby/ref/ref-2.0.0.ebuild
 2003061039 ./dev-ruby/regexp_parser/regexp_parser-0.5.0.ebuild
-2004220039 ./dev-ruby/regexp_parser/regexp_parser-1.5.1.ebuild
 2009091239 ./dev-ruby/regexp_parser/regexp_parser-1.7.1.ebuild
-2009250939 ./dev-ruby/regexp_parser/regexp_parser-1.8.0.ebuild
-2010020839 ./dev-ruby/regexp_parser/regexp_parser-1.8.1.ebuild
-2010120839 ./dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
+2012021039 ./dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
+2012021039 ./dev-ruby/regexp_parser/regexp_parser-2.0.0.ebuild
 2007261839 ./dev-ruby/regexp_property_values/regexp_property_values-1.0.0.ebuild
 2002061809 ./dev-ruby/request_store/request_store-1.5.0.ebuild
 2001121139 ./dev-ruby/rest-client/rest-client-2.1.0.ebuild
@@ -15205,6 +15186,7 @@
 2007261239 ./dev-ruby/ruby-mp3info/ruby-mp3info-0.8.10.ebuild
 2005051309 ./dev-ruby/ruby-net-ldap/ruby-net-ldap-0.16.2.ebuild
 2008190709 ./dev-ruby/ruby-net-ldap/ruby-net-ldap-0.16.3.ebuild
+2012011009 ./dev-ruby/ruby-net-ldap/ruby-net-ldap-0.17.0.ebuild
 1912111539 ./dev-ruby/ruby-oci8/ruby-oci8-2.2.7.ebuild
 2002021209 ./dev-ruby/ruby-oci8/ruby-oci8-2.2.8.ebuild
 2002021209 ./dev-ruby/ruby-odbc/ruby-odbc-0.99999.ebuild
@@ -15636,7 +15618,7 @@
 1909082039 ./dev-tex/catdvi/catdvi-0.14-r2.ebuild
 1702282250 ./dev-tex/cpp2latex/cpp2latex-2.3-r2.ebuild
 2004032241 ./dev-tex/culmus-latex/culmus-latex-0.7-r1.ebuild
-2004032241 ./dev-tex/dot2tex/dot2tex-2.11.3.ebuild
+2012031109 ./dev-tex/dot2tex/dot2tex-2.11.3.ebuild
 2006111539 ./dev-tex/dvi2gr/dvi2gr-0.4-r1.ebuild
 2002230040 ./dev-tex/foiltex/foiltex-2.1.4b.ebuild
 2011241409 ./dev-tex/frakturx/frakturx-20070103-r1.ebuild
@@ -15860,7 +15842,7 @@
 2010091209 ./dev-util/cmake/cmake-3.17.4-r1.ebuild
 2011191309 ./dev-util/cmake/cmake-3.18.5.ebuild
 2011191839 ./dev-util/cmake/cmake-3.19.0.ebuild
-2011301239 ./dev-util/cmake/cmake-3.19.1.ebuild
+2012022209 ./dev-util/cmake/cmake-3.19.1.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
@@ -15927,13 +15909,13 @@
 2004032241 ./dev-util/debhelper/debhelper-9.20160814.ebuild
 2005201409 ./dev-util/debhelper/debhelper-13.1.ebuild
 2007091139 ./dev-util/debhelper/debhelper-13.2.ebuild
-2011292039 ./dev-util/debhelper/debhelper-13.2.1.ebuild
+2012030209 ./dev-util/debhelper/debhelper-13.2.1.ebuild
 2009181209 ./dev-util/debootstrap/debootstrap-1.0.123.ebuild
 2011221539 ./dev-util/debugedit/debugedit-4.16.0.ebuild
 2004211009 ./dev-util/dejagnu/dejagnu-1.6.ebuild
 2006290009 ./dev-util/dejagnu/dejagnu-1.6.2.ebuild
 2004032241 ./dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
-2011282039 ./dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
+2012030809 ./dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
 2008302139 ./dev-util/devhelp/devhelp-3.36.2.ebuild
 2003261841 ./dev-util/dialog/dialog-1.3.20200228.ebuild
 2004011639 ./dev-util/dialog/dialog-1.3.20200327.ebuild
@@ -16027,7 +16009,7 @@
 2009271909 ./dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild
 2007051239 ./dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
 2007051239 ./dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
-2011141239 ./dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
+2012022239 ./dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
 2009181139 ./dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
 2011141239 ./dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
 2010202339 ./dev-util/gyp/gyp-20200512145953.ebuild
@@ -16046,16 +16028,15 @@
 1710011915 ./dev-util/icemon/icemon-3.1.0.ebuild
 1912272339 ./dev-util/icmake/icmake-9.02.09.ebuild
 2001180709 ./dev-util/icmake/icmake-9.03.01.ebuild
-2009171539 ./dev-util/idea-community/idea-community-2020.2.2.202.7319.50.ebuild
-2010071939 ./dev-util/idea-community/idea-community-2020.2.3.202.7660.26.ebuild
 2011260209 ./dev-util/idea-community/idea-community-2020.2.4.202.8194.7.ebuild
+2012022209 ./dev-util/idea-community/idea-community-2020.3.0.203.5981.155.ebuild
 2005151939 ./dev-util/ignition-cmake/ignition-cmake-2.2.0.ebuild
 2010231439 ./dev-util/ignition-cmake/ignition-cmake-2.5.0.ebuild
 2011302139 ./dev-util/imediff2/imediff2-1.1.2-r6.ebuild
 2011222009 ./dev-util/include-what-you-use/include-what-you-use-11.0.ebuild
 2003261841 ./dev-util/indent/indent-2.2.11_p5.ebuild
 2004032241 ./dev-util/indent/indent-2.2.11-r1.ebuild
-2011292039 ./dev-util/indent/indent-2.2.12.ebuild
+2012030839 ./dev-util/indent/indent-2.2.12.ebuild
 2009201739 ./dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4944.ebuild
 2011031509 ./dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
 2009212109 ./dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r3.ebuild
@@ -16071,6 +16052,7 @@
 2011051009 ./dev-util/jenkins-bin/jenkins-bin-2.249.3.ebuild
 2011190209 ./dev-util/jenkins-bin/jenkins-bin-2.267.ebuild
 2011300509 ./dev-util/jenkins-bin/jenkins-bin-2.268.ebuild
+2012030909 ./dev-util/jenkins-bin/jenkins-bin-2.263.1.ebuild
 1904201709 ./dev-util/kbuild/kbuild-9999.ebuild
 2010091139 ./dev-util/kbuild/kbuild-0.1.9998.3407.ebuild
 1711280410 ./dev-util/kcov/kcov-34.ebuild
@@ -16123,7 +16105,7 @@
 2005311909 ./dev-util/mdds/mdds-1.6.0.ebuild
 2011010209 ./dev-util/mdds/mdds-9999.ebuild
 2011231309 ./dev-util/mdds/mdds-1.7.0.ebuild
-2004222009 ./dev-util/meld/meld-3.20.2-r1.ebuild
+2012030239 ./dev-util/meld/meld-3.20.2-r1.ebuild
 2002151310 ./dev-util/memprof/memprof-0.6.2-r1.ebuild
 2008142209 ./dev-util/meson/meson-9999.ebuild
 2010082039 ./dev-util/meson/meson-0.55.3.ebuild
@@ -16170,7 +16152,7 @@
 1912131839 ./dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
 1705252354 ./dev-util/open-vcdiff/open-vcdiff-0.8.4-r1.ebuild
 2006272139 ./dev-util/oprofile/oprofile-1.3.0.ebuild
-2009051409 ./dev-util/oprofile/oprofile-1.4.0.ebuild
+2012030239 ./dev-util/oprofile/oprofile-1.4.0.ebuild
 2006260909 ./dev-util/ostree/ostree-2019.5.ebuild
 2010052009 ./dev-util/ostree/ostree-2020.6.ebuild
 2010302109 ./dev-util/ostree/ostree-2020.7.ebuild
@@ -16299,7 +16281,7 @@
 2004051339 ./dev-util/shellcheck/shellcheck-0.7.1.ebuild
 1912170009 ./dev-util/shelltestrunner/shelltestrunner-1.9.ebuild
 2004211009 ./dev-util/shflags/shflags-1.0.3.ebuild
-2011292039 ./dev-util/shflags/shflags-1.2.3.ebuild
+2012030039 ./dev-util/shflags/shflags-1.2.3.ebuild
 2004032241 ./dev-util/shtool/shtool-2.0.8-r1.ebuild
 1702282250 ./dev-util/shunit2/shunit2-2.1.6-r1.ebuild
 2009071209 ./dev-util/smem/smem-1.5-r1.ebuild
@@ -16374,15 +16356,15 @@
 1702282250 ./dev-util/weka/weka-3.8.0.ebuild
 1912111539 ./dev-util/weka/weka-3.7.13.ebuild
 1912110241 ./dev-util/wiggle/wiggle-0.9-r1.ebuild
-1912110241 ./dev-util/wiggle/wiggle-1.0.ebuild
+2012030509 ./dev-util/wiggle/wiggle-1.0.ebuild
 2008171609 ./dev-util/wstool/wstool-0.1.18.ebuild
 2008171609 ./dev-util/wstool/wstool-9999.ebuild
 2006212309 ./dev-util/xdelta/xdelta-1.1.4-r3.ebuild
 2007041709 ./dev-util/xdelta/xdelta-3.0.11.ebuild
 2008031309 ./dev-util/xdelta/xdelta-3.1.0.ebuild
-2004032241 ./dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
 2006251739 ./dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.0.ebuild
 2011030009 ./dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.1.ebuild
+2012021339 ./dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
 1710161045 ./dev-util/xmlindent/xmlindent-0.2.17-r2.ebuild
 1907292210 ./dev-util/xxdi/xxdi-1.0.0.ebuild
 2006040939 ./dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
@@ -16439,7 +16421,7 @@
 1910111911 ./dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild
 2002112051 ./dev-vcs/colorsvn/colorsvn-0.3.3.ebuild
 1912110241 ./dev-vcs/cssc/cssc-1.4.0.ebuild
-1912110241 ./dev-vcs/cssc/cssc-1.4.1.ebuild
+2012030509 ./dev-vcs/cssc/cssc-1.4.1.ebuild
 2005242039 ./dev-vcs/cvs-fast-export/cvs-fast-export-1.55.ebuild
 2004032241 ./dev-vcs/cvs/cvs-1.12.12-r12.ebuild
 1902111809 ./dev-vcs/cvs2cl/cvs2cl-2.71-r1.ebuild
@@ -16627,7 +16609,7 @@
 2005172009 ./games-action/trosh/trosh-20-r1.ebuild
 2005172009 ./games-action/trosh/trosh-20-r2.ebuild
 1702282250 ./games-action/tuxkart/tuxkart-0.4.0-r1.ebuild
-2002112051 ./games-action/violetland/violetland-0.5.ebuild
+2012021509 ./games-action/violetland/violetland-0.5.ebuild
 1808151339 ./games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
 2001302309 ./games-action/xblast/xblast-2.10.4-r1.ebuild
 1707090132 ./games-action/xbomber/xbomber-101-r1.ebuild
@@ -16817,10 +16799,10 @@
 2003311339 ./games-board/polyglot/polyglot-1.4.70b-r3.ebuild
 2005042339 ./games-board/pychess/pychess-1.0.0.ebuild
 2005161709 ./games-board/pychess/pychess-1.0.2.ebuild
-2002092009 ./games-board/pysolfc/pysolfc-2.6.4-r1.ebuild
+2012030239 ./games-board/pysolfc/pysolfc-2.6.4-r1.ebuild
 2006211609 ./games-board/scid/scid-4.6.2-r1.ebuild
 2005212239 ./games-board/simsu/simsu-1.3.9.ebuild
-2010230039 ./games-board/sjeng/sjeng-11.2_p8_p1.ebuild
+2012021539 ./games-board/sjeng/sjeng-11.2_p8_p1.ebuild
 2002280439 ./games-board/stockfish/stockfish-10.ebuild
 2002280509 ./games-board/stockfish/stockfish-11.ebuild
 1802210308 ./games-board/tablebase-syzygy/tablebase-syzygy-0_pre20131213-r100.ebuild
@@ -16841,8 +16823,8 @@
 1712012239 ./games-emulation/caps/caps-20071115.ebuild
 1911021809 ./games-emulation/desmume/desmume-0.9.11-r2.ebuild
 2007051509 ./games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild
-2008101739 ./games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
 2010242139 ./games-emulation/dolphin/dolphin-9999.ebuild
+2012030239 ./games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
 2001041739 ./games-emulation/dosbox/dosbox-9999.ebuild
 2001052309 ./games-emulation/dosbox/dosbox-0.74.3.ebuild
 2006061209 ./games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
@@ -16966,7 +16948,7 @@
 2011220339 ./games-fps/doomsday/doomsday-2.1.1-r1.ebuild
 2009050239 ./games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild
 2009050239 ./games-fps/duke3d-demodata/duke3d-demodata-1.3.ebuild
-2011170309 ./games-fps/eduke32/eduke32-20200907.9257.ebuild
+2012030039 ./games-fps/eduke32/eduke32-20201128.9276.ebuild
 1910040009 ./games-fps/etqw-bin/etqw-bin-1.5-r2.ebuild
 1909290039 ./games-fps/etqw-data/etqw-data-1.0-r1.ebuild
 1909231739 ./games-fps/etqw-demo/etqw-demo-2.0_p1-r2.ebuild
@@ -17335,11 +17317,11 @@
 1702282250 ./games-sports/trophy/trophy-2.0.3-r1.ebuild
 2002122139 ./games-sports/ultimatestunts/ultimatestunts-0.7.7-r1.ebuild
 2008180109 ./games-sports/xmoto/xmoto-0.6.1-r1.ebuild
+2012011639 ./games-sports/xmoto/xmoto-0.6.1-r100.ebuild
 1805241809 ./games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild
 2009050339 ./games-strategy/0ad-data/0ad-data-0.0.23b_alpha.ebuild
 1805250039 ./games-strategy/0ad/0ad-0.0.23_alpha.ebuild
 2009050339 ./games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
-1806251639 ./games-strategy/asc/asc-2.6.0.0-r2.ebuild
 2006081209 ./games-strategy/colobot-data/colobot-data-0.1.12.ebuild
 2006081209 ./games-strategy/colobot/colobot-0.1.12.ebuild
 2006081209 ./games-strategy/colobot/colobot-9999.ebuild
@@ -17358,6 +17340,7 @@
 1807010309 ./games-strategy/freesynd/freesynd-0.7.1-r1.ebuild
 1805022239 ./games-strategy/galaxyhack/galaxyhack-1.74-r1.ebuild
 2004261109 ./games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild
+2012020139 ./games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
 2009050409 ./games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1.ebuild
 2009050409 ./games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild
 1805022239 ./games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
@@ -17368,9 +17351,13 @@
 1711182327 ./games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild
 2011230739 ./games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
 2002231739 ./games-strategy/naev/naev-0.6.1-r1.ebuild
+2012020209 ./games-strategy/naev/naev-0.7.0-r100.ebuild
+2012020209 ./games-strategy/naev/naev-0.7.0.ebuild
 1805022239 ./games-strategy/netherearth/netherearth-0.52-r1.ebuild
 2002112051 ./games-strategy/openra/openra-20190314.ebuild
+2012020439 ./games-strategy/openra/openra-20190314-r100.ebuild
 2009010509 ./games-strategy/s25rttr/s25rttr-0.9.0_pre20200723.ebuild
+2012020439 ./games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild
 1910010039 ./games-strategy/satellite-reign/satellite-reign-1.13.06.ebuild
 1908011539 ./games-strategy/scorched3d/scorched3d-44-r2.ebuild
 2011151939 ./games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
@@ -17388,8 +17375,8 @@
 2006280009 ./games-strategy/warzone2100/warzone2100-3.3.0.ebuild
 2011152309 ./games-strategy/wesnoth/wesnoth-1.15.4.ebuild
 2011261439 ./games-strategy/wesnoth/wesnoth-1.14.14.ebuild
-2005172009 ./games-strategy/widelands/widelands-9999.ebuild
-2006150139 ./games-strategy/widelands/widelands-0.20-r1.ebuild
+2012030239 ./games-strategy/widelands/widelands-0.20-r1.ebuild
+2012030239 ./games-strategy/widelands/widelands-9999.ebuild
 1806110509 ./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
@@ -17448,6 +17435,7 @@
 2011220009 ./games-util/xqf/xqf-1.0.6.2.ebuild
 2005081846 ./games-util/eureka/eureka-1.27b.ebuild
 2007030209 ./games-util/slade/slade-3.1.12a.ebuild
+2012011639 ./games-util/slade/slade-3.1.12a-r100.ebuild
 2006222338 ./games-util/acc/acc-1.57.ebuild
 2011211909 ./games-util/game-device-udev-rules/game-device-udev-rules-20201121.ebuild
 2011070109 ./games-util/sc-controller/sc-controller-0.4.8.1.ebuild
@@ -17476,8 +17464,8 @@
 2007130039 ./gnome-base/gnome-panel/gnome-panel-3.36.2.ebuild
 2010072109 ./gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild
 2011161709 ./gnome-base/gnome-session/gnome-session-3.38.0.ebuild
-2008302139 ./gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.36.1.ebuild
-2011110739 ./gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.38.1.ebuild
+2012022309 ./gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.36.1.ebuild
+2012022309 ./gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.38.1.ebuild
 2011101839 ./gnome-base/gnome-shell/gnome-shell-3.38.1.ebuild
 2011220639 ./gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild
 2006132027 ./gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -17537,14 +17525,14 @@
 2008302139 ./gnome-extra/gnome-logs/gnome-logs-3.36.0.ebuild
 2004292309 ./gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0.ebuild
 2005062039 ./gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
-2004230009 ./gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-7.ebuild
 2008302339 ./gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-9.ebuild
-2005311609 ./gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-37.ebuild
+2012020139 ./gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-10.ebuild
 2008302339 ./gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-39.ebuild
-2010182109 ./gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-40.ebuild
+2012020139 ./gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-40.ebuild
 2007151139 ./gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-20.04.0-r1.ebuild
 2008302339 ./gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-41.ebuild
-2009201239 ./gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-42.ebuild
+2012020139 ./gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-42.ebuild
+2012020139 ./gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-44.ebuild
 2006291909 ./gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-27.ebuild
 2011110739 ./gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.38.1.ebuild
 2011220639 ./gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.36.7.ebuild
@@ -17575,10 +17563,7 @@
 2006072339 ./gnome-extra/nm-applet/nm-applet-1.16.0.ebuild
 2009241009 ./gnome-extra/nm-applet/nm-applet-1.18.0.ebuild
 1702282250 ./gnome-extra/office-runner/office-runner-1.0.2.ebuild
-2004230009 ./gnome-extra/pch-session/pch-session-3.34.3.ebuild
-2008302339 ./gnome-extra/pch-session/pch-session-3.36.1.ebuild
-2009111139 ./gnome-extra/pch-session/pch-session-3.36.2.ebuild
-2010182109 ./gnome-extra/pch-session/pch-session-3.36.3.ebuild
+2012020139 ./gnome-extra/pch-session/pch-session-3.36.3.ebuild
 2004032241 ./gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
 1912291809 ./gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild
 2007190239 ./gnome-extra/sushi/sushi-3.34.0.ebuild
@@ -17587,13 +17572,15 @@
 2011141239 ./gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild
 2008302139 ./gnome-extra/yelp/yelp-3.36.0.ebuild
 2003261841 ./gnome-extra/zenity/zenity-3.32.0.ebuild
-2004230009 ./gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-10.ebuild
 2008302339 ./gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-13.ebuild
+2012020139 ./gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-16.ebuild
 2005231338 ./gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-33.ebuild
+2012020139 ./gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-34.ebuild
 2006271409 ./gnome-extra/filemanager-actions/filemanager-actions-3.2.4.ebuild
 2006271409 ./gnome-extra/filemanager-actions/filemanager-actions-3.4.ebuild
 2008302339 ./gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-27.ebuild
 2008302339 ./gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713.ebuild
+2012020139 ./gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20200901.ebuild
 2009181809 ./gnustep-apps/aclock/aclock-0.4.0-r1.ebuild
 2009181809 ./gnustep-apps/addresses/addresses-0.4.8-r1.ebuild
 1708310022 ./gnustep-apps/affiche/affiche-0.6.0-r4.ebuild
@@ -17733,9 +17720,9 @@
 2011112039 ./gui-libs/wlroots/wlroots-0.12.0.ebuild
 2011112009 ./gui-libs/wlroots/wlroots-9999.ebuild
 2006012338 ./gui-libs/libwpe/libwpe-1.4.0.1.ebuild
-2011270209 ./gui-libs/libwpe/libwpe-1.8.0.ebuild
+2012012039 ./gui-libs/libwpe/libwpe-1.8.0.ebuild
 2006012338 ./gui-libs/wpebackend-fdo/wpebackend-fdo-1.4.0.ebuild
-2011270209 ./gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild
+2012012039 ./gui-libs/wpebackend-fdo/wpebackend-fdo-1.8.0.ebuild
 2008070639 ./gui-libs/gtk-layer-shell/gtk-layer-shell-0.1.0-r1.ebuild
 2011140009 ./gui-libs/wf-config/wf-config-0.6.0.ebuild
 2011140009 ./gui-libs/wf-config/wf-config-9999.ebuild
@@ -18195,103 +18182,103 @@
 2005132239 ./kde-misc/ultimate-gmail-feed/ultimate-gmail-feed-2.1.ebuild
 2011252009 ./kde-misc/markdownpart/markdownpart-0.1.1.ebuild
 2010080539 ./kde-plasma/bluedevil/bluedevil-5.19.5.ebuild
-2011111739 ./kde-plasma/bluedevil/bluedevil-5.20.3.ebuild
+2012011939 ./kde-plasma/bluedevil/bluedevil-5.20.4.ebuild
 2010080539 ./kde-plasma/breeze-grub/breeze-grub-5.19.5.ebuild
-2011111739 ./kde-plasma/breeze-grub/breeze-grub-5.20.3.ebuild
+2012011939 ./kde-plasma/breeze-grub/breeze-grub-5.20.4.ebuild
 2010080539 ./kde-plasma/breeze-gtk/breeze-gtk-5.19.5.ebuild
-2011111739 ./kde-plasma/breeze-gtk/breeze-gtk-5.20.3.ebuild
+2012011939 ./kde-plasma/breeze-gtk/breeze-gtk-5.20.4.ebuild
 2010080539 ./kde-plasma/breeze-plymouth/breeze-plymouth-5.19.5.ebuild
-2011111739 ./kde-plasma/breeze-plymouth/breeze-plymouth-5.20.3.ebuild
+2012011939 ./kde-plasma/breeze-plymouth/breeze-plymouth-5.20.4.ebuild
 2010080539 ./kde-plasma/breeze/breeze-5.19.5-r1.ebuild
-2011111739 ./kde-plasma/breeze/breeze-5.20.3.ebuild
+2012011939 ./kde-plasma/breeze/breeze-5.20.4.ebuild
 2010080539 ./kde-plasma/discover/discover-5.19.5.ebuild
-2011130339 ./kde-plasma/discover/discover-5.20.3-r1.ebuild
+2012011939 ./kde-plasma/discover/discover-5.20.4.ebuild
 2010080539 ./kde-plasma/drkonqi/drkonqi-5.19.5.ebuild
-2011111739 ./kde-plasma/drkonqi/drkonqi-5.20.3.ebuild
+2012011939 ./kde-plasma/drkonqi/drkonqi-5.20.4.ebuild
 2010080539 ./kde-plasma/kactivitymanagerd/kactivitymanagerd-5.19.5.ebuild
-2011111739 ./kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.3.ebuild
+2012011939 ./kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.4.ebuild
 2010080539 ./kde-plasma/kde-cli-tools/kde-cli-tools-5.19.5.ebuild
-2011111739 ./kde-plasma/kde-cli-tools/kde-cli-tools-5.20.3.ebuild
+2012011939 ./kde-plasma/kde-cli-tools/kde-cli-tools-5.20.4.ebuild
 2010080539 ./kde-plasma/kde-gtk-config/kde-gtk-config-5.19.5.ebuild
-2011111739 ./kde-plasma/kde-gtk-config/kde-gtk-config-5.20.3.ebuild
+2012011939 ./kde-plasma/kde-gtk-config/kde-gtk-config-5.20.4.ebuild
 2010080539 ./kde-plasma/kdecoration/kdecoration-5.19.5.ebuild
-2011111739 ./kde-plasma/kdecoration/kdecoration-5.20.3.ebuild
+2012011939 ./kde-plasma/kdecoration/kdecoration-5.20.4.ebuild
 2010080539 ./kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
-2011111739 ./kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.3.ebuild
+2012011939 ./kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.4.ebuild
 2010080539 ./kde-plasma/kgamma/kgamma-5.19.5.ebuild
-2011111739 ./kde-plasma/kgamma/kgamma-5.20.3.ebuild
+2012011939 ./kde-plasma/kgamma/kgamma-5.20.4.ebuild
 2010080539 ./kde-plasma/khotkeys/khotkeys-5.19.5.ebuild
-2011111739 ./kde-plasma/khotkeys/khotkeys-5.20.3.ebuild
+2012011939 ./kde-plasma/khotkeys/khotkeys-5.20.4.ebuild
 2010080539 ./kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild
-2011111739 ./kde-plasma/kinfocenter/kinfocenter-5.20.3.ebuild
+2012011939 ./kde-plasma/kinfocenter/kinfocenter-5.20.4.ebuild
 2010080539 ./kde-plasma/kmenuedit/kmenuedit-5.19.5.ebuild
-2011111739 ./kde-plasma/kmenuedit/kmenuedit-5.20.3.ebuild
+2012011939 ./kde-plasma/kmenuedit/kmenuedit-5.20.4.ebuild
 2010080539 ./kde-plasma/kscreen/kscreen-5.19.5.ebuild
-2011111739 ./kde-plasma/kscreen/kscreen-5.20.3.ebuild
+2012011939 ./kde-plasma/kscreen/kscreen-5.20.4.ebuild
 2010080539 ./kde-plasma/kscreenlocker/kscreenlocker-5.19.5.ebuild
-2011111739 ./kde-plasma/kscreenlocker/kscreenlocker-5.20.3.ebuild
+2012011939 ./kde-plasma/kscreenlocker/kscreenlocker-5.20.4.ebuild
 2010080539 ./kde-plasma/ksshaskpass/ksshaskpass-5.19.5-r1.ebuild
-2011111739 ./kde-plasma/ksshaskpass/ksshaskpass-5.20.3.ebuild
+2012011939 ./kde-plasma/ksshaskpass/ksshaskpass-5.20.4.ebuild
 2010080539 ./kde-plasma/ksysguard/ksysguard-5.19.5.ebuild
-2011111739 ./kde-plasma/ksysguard/ksysguard-5.20.3.ebuild
+2012011939 ./kde-plasma/ksysguard/ksysguard-5.20.4.ebuild
 2010080539 ./kde-plasma/kwallet-pam/kwallet-pam-5.19.5.ebuild
-2011111739 ./kde-plasma/kwallet-pam/kwallet-pam-5.20.3.ebuild
+2012011939 ./kde-plasma/kwallet-pam/kwallet-pam-5.20.4.ebuild
 2010080539 ./kde-plasma/kwayland-integration/kwayland-integration-5.19.5.ebuild
-2011111739 ./kde-plasma/kwayland-integration/kwayland-integration-5.20.3.ebuild
+2012011939 ./kde-plasma/kwayland-integration/kwayland-integration-5.20.4.ebuild
 2010080539 ./kde-plasma/kwin/kwin-5.19.5-r1.ebuild
-2011111739 ./kde-plasma/kwin/kwin-5.20.3.ebuild
+2012011939 ./kde-plasma/kwin/kwin-5.20.4.ebuild
 2010080539 ./kde-plasma/kwrited/kwrited-5.19.5.ebuild
-2011111739 ./kde-plasma/kwrited/kwrited-5.20.3.ebuild
+2012011939 ./kde-plasma/kwrited/kwrited-5.20.4.ebuild
 2010080539 ./kde-plasma/libkscreen/libkscreen-5.19.5.ebuild
-2011111739 ./kde-plasma/libkscreen/libkscreen-5.20.3.ebuild
+2012011939 ./kde-plasma/libkscreen/libkscreen-5.20.4.ebuild
 2010080539 ./kde-plasma/libksysguard/libksysguard-5.19.5.ebuild
-2011111739 ./kde-plasma/libksysguard/libksysguard-5.20.3.ebuild
+2012011939 ./kde-plasma/libksysguard/libksysguard-5.20.4.ebuild
 2010080539 ./kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild
-2011111739 ./kde-plasma/libkworkspace/libkworkspace-5.20.3.ebuild
+2012011939 ./kde-plasma/libkworkspace/libkworkspace-5.20.4.ebuild
 2010080539 ./kde-plasma/milou/milou-5.19.5.ebuild
-2011111739 ./kde-plasma/milou/milou-5.20.3.ebuild
+2012011939 ./kde-plasma/milou/milou-5.20.4.ebuild
 2010080539 ./kde-plasma/oxygen/oxygen-5.19.5.ebuild
-2011111739 ./kde-plasma/oxygen/oxygen-5.20.3.ebuild
+2012011939 ./kde-plasma/oxygen/oxygen-5.20.4.ebuild
 2010080539 ./kde-plasma/plasma-browser-integration/plasma-browser-integration-5.19.5.ebuild
-2011111739 ./kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.3.ebuild
+2012011939 ./kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.4.ebuild
 2010080539 ./kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
-2011111739 ./kde-plasma/plasma-desktop/plasma-desktop-5.20.3.ebuild
+2012011939 ./kde-plasma/plasma-desktop/plasma-desktop-5.20.4.ebuild
 2010080539 ./kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild
-2011111739 ./kde-plasma/plasma-integration/plasma-integration-5.20.3.ebuild
+2012011939 ./kde-plasma/plasma-integration/plasma-integration-5.20.4.ebuild
 2010080539 ./kde-plasma/plasma-meta/plasma-meta-5.19.5.ebuild
-2011111739 ./kde-plasma/plasma-meta/plasma-meta-5.20.3.ebuild
+2012011939 ./kde-plasma/plasma-meta/plasma-meta-5.20.4.ebuild
 2010080539 ./kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild
-2011111739 ./kde-plasma/plasma-nm/plasma-nm-5.20.3.ebuild
+2012011939 ./kde-plasma/plasma-nm/plasma-nm-5.20.4.ebuild
 2010080539 ./kde-plasma/plasma-pa/plasma-pa-5.19.5.ebuild
-2011111739 ./kde-plasma/plasma-pa/plasma-pa-5.20.3.ebuild
+2012011939 ./kde-plasma/plasma-pa/plasma-pa-5.20.4.ebuild
 2010080539 ./kde-plasma/plasma-sdk/plasma-sdk-5.19.5.ebuild
-2011111739 ./kde-plasma/plasma-sdk/plasma-sdk-5.20.3.ebuild
+2012011939 ./kde-plasma/plasma-sdk/plasma-sdk-5.20.4.ebuild
 2010071409 ./kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.19.5.ebuild
-2011111739 ./kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.20.3.ebuild
+2012011939 ./kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.20.4.ebuild
 2010080539 ./kde-plasma/plasma-vault/plasma-vault-5.19.5.ebuild
-2011111739 ./kde-plasma/plasma-vault/plasma-vault-5.20.3.ebuild
+2012011939 ./kde-plasma/plasma-vault/plasma-vault-5.20.4.ebuild
 2010080539 ./kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.19.5.ebuild
-2011111739 ./kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.3.ebuild
+2012011939 ./kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.4.ebuild
 2010080539 ./kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild
-2011111739 ./kde-plasma/plasma-workspace/plasma-workspace-5.20.3.ebuild
+2012011939 ./kde-plasma/plasma-workspace/plasma-workspace-5.20.4.ebuild
 2010080539 ./kde-plasma/plymouth-kcm/plymouth-kcm-5.19.5.ebuild
-2011111739 ./kde-plasma/plymouth-kcm/plymouth-kcm-5.20.3.ebuild
+2012011939 ./kde-plasma/plymouth-kcm/plymouth-kcm-5.20.4.ebuild
 2010080539 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.5.ebuild
-2011111739 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.20.3.ebuild
+2012011939 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.20.4.ebuild
 2010080539 ./kde-plasma/powerdevil/powerdevil-5.19.5.ebuild
-2011111739 ./kde-plasma/powerdevil/powerdevil-5.20.3.ebuild
+2012011939 ./kde-plasma/powerdevil/powerdevil-5.20.4.ebuild
 2010080539 ./kde-plasma/sddm-kcm/sddm-kcm-5.19.5.ebuild
-2011111739 ./kde-plasma/sddm-kcm/sddm-kcm-5.20.3.ebuild
+2012011939 ./kde-plasma/sddm-kcm/sddm-kcm-5.20.4.ebuild
 2010080539 ./kde-plasma/systemsettings/systemsettings-5.19.5.ebuild
-2011111739 ./kde-plasma/systemsettings/systemsettings-5.20.3.ebuild
+2012011939 ./kde-plasma/systemsettings/systemsettings-5.20.4.ebuild
 2010080539 ./kde-plasma/user-manager/user-manager-5.19.5.ebuild
 2010080539 ./kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild
-2011111739 ./kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.3.ebuild
+2012011939 ./kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.4.ebuild
 2010080539 ./kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.19.5-r1.ebuild
-2011111739 ./kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.3.ebuild
+2012011939 ./kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.4.ebuild
 2010080539 ./kde-plasma/kwayland-server/kwayland-server-5.19.5.ebuild
-2011201039 ./kde-plasma/kwayland-server/kwayland-server-5.20.3.ebuild
-2011111739 ./kde-plasma/plasma-disks/plasma-disks-5.20.3.ebuild
+2012011939 ./kde-plasma/kwayland-server/kwayland-server-5.20.4.ebuild
+2012011939 ./kde-plasma/plasma-disks/plasma-disks-5.20.4.ebuild
 2011090239 ./kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.20.0.ebuild
 1804072008 ./lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.1.ebuild
 2002151310 ./lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3.ebuild
@@ -18303,7 +18290,7 @@
 2002031539 ./lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.1.ebuild
 1804051913 ./lxde-base/lxde-meta/lxde-meta-0.5.5-r6.ebuild
 2010062139 ./lxde-base/lxdm/lxdm-0.5.3-r1.ebuild
-2010062139 ./lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
+2012030239 ./lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
 1808310239 ./lxde-base/lxinput/lxinput-0.3.5-r1.ebuild
 1808310239 ./lxde-base/lxinput/lxinput-0.3.5.ebuild
 1909201539 ./lxde-base/lxlauncher/lxlauncher-0.2.5.ebuild
@@ -18364,8 +18351,8 @@
 1910211739 ./mail-client/bower/bower-0.11.ebuild
 2008141139 ./mail-client/bower/bower-0.12.ebuild
 2008221109 ./mail-client/claws-mail/claws-mail-9999.ebuild
-2010192009 ./mail-client/claws-mail/claws-mail-3.17.8.ebuild
 2011181309 ./mail-client/claws-mail/claws-mail-3.17.7.ebuild
+2012030239 ./mail-client/claws-mail/claws-mail-3.17.8.ebuild
 1912031639 ./mail-client/clawsker/clawsker-1.3.1.ebuild
 2006062109 ./mail-client/clawsker/clawsker-1.1.0.ebuild
 1904121039 ./mail-client/cone/cone-1.0.ebuild
@@ -18382,24 +18369,25 @@
 2008261509 ./mail-client/neomutt/neomutt-20200626-r1.ebuild
 2008261509 ./mail-client/neomutt/neomutt-20200821.ebuild
 2011011439 ./mail-client/neomutt/neomutt-20200925.ebuild
-2011232109 ./mail-client/neomutt/neomutt-99999999.ebuild
 2011271839 ./mail-client/neomutt/neomutt-20201120.ebuild
-2011271839 ./mail-client/neomutt/neomutt-20201127.ebuild
+2012011709 ./mail-client/neomutt/neomutt-20201127-r1.ebuild
+2012020639 ./mail-client/neomutt/neomutt-20201127.ebuild
+2012011709 ./mail-client/neomutt/neomutt-99999999.ebuild
 1902052239 ./mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933-r1.ebuild
 2008290709 ./mail-client/roundcube/roundcube-1.4.8.ebuild
 2011282309 ./mail-client/roundcube/roundcube-1.4.9.ebuild
 2011242139 ./mail-client/s-nail/s-nail-14.9.16.ebuild
 2011242139 ./mail-client/s-nail/s-nail-14.9.19.ebuild
 2008111639 ./mail-client/sylpheed/sylpheed-3.7.0-r1.ebuild
-2011252309 ./mail-client/thunderbird-bin/thunderbird-bin-78.5.0.ebuild
-2011252309 ./mail-client/thunderbird/thunderbird-78.5.0.ebuild
+2012021639 ./mail-client/thunderbird-bin/thunderbird-bin-78.5.1.ebuild
+2012030539 ./mail-client/thunderbird/thunderbird-78.5.1.ebuild
 2009031539 ./mail-client/trojita/trojita-0.7-r5.ebuild
 2009031539 ./mail-client/trojita/trojita-9999.ebuild
 2009071209 ./mail-client/mutt-wizard/mutt-wizard-0_pre20200808.ebuild
 2009071209 ./mail-client/mutt-wizard/mutt-wizard-9999.ebuild
 2006041239 ./mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild
 2009050409 ./mail-filter/afew/afew-3.0.0.ebuild
-2009140510 ./mail-filter/afew/afew-3.0.1.ebuild
+2012021939 ./mail-filter/afew/afew-3.0.1.ebuild
 1702282250 ./mail-filter/amavisd-milter/amavisd-milter-1.5.0-r1.ebuild
 1804031738 ./mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild
 2003052239 ./mail-filter/amavisd-milter/amavisd-milter-1.7.0-r1.ebuild
@@ -18487,7 +18475,7 @@
 2011132339 ./mail-mta/msmtp/msmtp-1.8.13.ebuild
 2011291139 ./mail-mta/msmtp/msmtp-1.8.12.ebuild
 2008272209 ./mail-mta/netqmail/netqmail-1.06-r14.ebuild
-2003071909 ./mail-mta/nullmailer/nullmailer-2.2-r1.ebuild
+2012030239 ./mail-mta/nullmailer/nullmailer-2.2-r1.ebuild
 2008252239 ./mail-mta/opensmtpd/opensmtpd-6.7.1_p1.ebuild
 2009131209 ./mail-mta/postfix/postfix-3.5.6.ebuild
 2010061839 ./mail-mta/postfix/postfix-3.5.7.ebuild
@@ -18824,14 +18812,14 @@
 2005060209 ./media-gfx/argyllcms/argyllcms-2.1.2-r1.ebuild
 2005060009 ./media-gfx/argyllcms/argyllcms-2.1.2.ebuild
 2011261339 ./media-gfx/arss/arss-0.2.3-r1.ebuild
-2010091709 ./media-gfx/asymptote/asymptote-2.61.ebuild
-2010091709 ./media-gfx/asymptote/asymptote-2.62.ebuild
 2010091709 ./media-gfx/asymptote/asymptote-2.65.ebuild
 2010091709 ./media-gfx/asymptote/asymptote-2.67.ebuild
+2012011239 ./media-gfx/asymptote/asymptote-2.68.ebuild
 1905202039 ./media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
 1912131839 ./media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
-2010101109 ./media-gfx/blender/blender-2.90.1-r1.ebuild
-2011090239 ./media-gfx/blender/blender-2.83.4-r1.ebuild
+2012031039 ./media-gfx/blender/blender-2.83.4-r1.ebuild
+2012031039 ./media-gfx/blender/blender-2.90.1-r1.ebuild
+2012031039 ./media-gfx/blender/blender-2.91.0.ebuild
 2005032209 ./media-gfx/cairosvg/cairosvg-2.4.2.ebuild
 2010300309 ./media-gfx/cairosvg/cairosvg-2.5.0.ebuild
 1805010009 ./media-gfx/cellwriter/cellwriter-1.3.5.ebuild
@@ -18899,7 +18887,7 @@
 2011160609 ./media-gfx/fontforge/fontforge-20200314.ebuild
 2011160609 ./media-gfx/fontforge/fontforge-20201107.ebuild
 2005210409 ./media-gfx/fotowall/fotowall-1.0.ebuild
-1903202039 ./media-gfx/fotoxx/fotoxx-15.05.ebuild
+2012030239 ./media-gfx/fotoxx/fotoxx-15.05.ebuild
 2009031339 ./media-gfx/freepv/freepv-0.3.0-r5.ebuild
 1702282250 ./media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
 1710032152 ./media-gfx/freewrl/freewrl-9999.ebuild
@@ -19121,7 +19109,7 @@
 1708061128 ./media-gfx/viewer/viewer-0.8.0-r1.ebuild
 1810202209 ./media-gfx/viewnior/viewnior-1.6.ebuild
 2005211139 ./media-gfx/viewnior/viewnior-1.7-r1.ebuild
-2006160909 ./media-gfx/viewnior/viewnior-1.7-r2.ebuild
+2012030239 ./media-gfx/viewnior/viewnior-1.7-r2.ebuild
 1810201939 ./media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild
 2010100209 ./media-gfx/wings/wings-2.1.5.ebuild
 2010100209 ./media-gfx/wings/wings-2.1.6.ebuild
@@ -19153,9 +19141,9 @@
 2006250939 ./media-gfx/netpaint/netpaint-1.1.2.ebuild
 1912312209 ./media-libs/Field3D/Field3D-1.7.2.ebuild
 2009220039 ./media-libs/SoXt/SoXt-1.4.0.ebuild
-2004032241 ./media-libs/a52dec/a52dec-0.7.4-r6.ebuild
-2004032241 ./media-libs/a52dec/a52dec-0.7.4-r7.ebuild
-2011072239 ./media-libs/a52dec/a52dec-0.7.4-r8.ebuild
+2012030209 ./media-libs/a52dec/a52dec-0.7.4-r6.ebuild
+2012030209 ./media-libs/a52dec/a52dec-0.7.4-r7.ebuild
+2012030239 ./media-libs/a52dec/a52dec-0.7.4-r8.ebuild
 2004032241 ./media-libs/aalib/aalib-1.4_rc5-r9.ebuild
 2002162209 ./media-libs/aften/aften-0.0.8-r2.ebuild
 1912110241 ./media-libs/allegro/allegro-4.4.2-r2.ebuild
@@ -19226,7 +19214,6 @@
 2006270039 ./media-libs/flickcurl/flickcurl-1.26.ebuild
 1908061309 ./media-libs/fluidsynth-dssi/fluidsynth-dssi-1.0.0-r1.ebuild
 1802131408 ./media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild
-2002112051 ./media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
 2002112051 ./media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild
 2004032241 ./media-libs/fontconfig/fontconfig-2.12.6.ebuild
 2004032241 ./media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -19269,7 +19256,6 @@
 2007241009 ./media-libs/gmmlib/gmmlib-20.2.2.ebuild
 2008251409 ./media-libs/gmmlib/gmmlib-20.2.5.ebuild
 2009212339 ./media-libs/gmmlib/gmmlib-20.3.2.ebuild
-2002151310 ./media-libs/gmtk/gmtk-1.0.8.ebuild
 2002151310 ./media-libs/gmtk/gmtk-1.0.9.ebuild
 2002151310 ./media-libs/gnonlin/gnonlin-1.4.0-r1.ebuild
 2011061839 ./media-libs/graphene/graphene-1.10.2.ebuild
@@ -19292,7 +19278,7 @@
 1707291534 ./media-libs/gupnp-dlna/gupnp-dlna-0.10.5.ebuild
 2005071839 ./media-libs/hamlib/hamlib-3.3.ebuild
 2010051939 ./media-libs/hamlib/hamlib-4.0_rc2.ebuild
-2011182239 ./media-libs/hamlib/hamlib-3.3-r1.ebuild
+2012021739 ./media-libs/hamlib/hamlib-3.3-r1.ebuild
 2008151239 ./media-libs/harfbuzz/harfbuzz-9999.ebuild
 2009181139 ./media-libs/harfbuzz/harfbuzz-2.6.7.ebuild
 2010071009 ./media-libs/harfbuzz/harfbuzz-2.7.2.ebuild
@@ -19325,16 +19311,11 @@
 2009201309 ./media-libs/lensfun/lensfun-0.3.2-r1.ebuild
 2002151310 ./media-libs/leptonica/leptonica-1.74.4.ebuild
 2008190209 ./media-libs/leptonica/leptonica-1.80.0.ebuild
-1910030009 ./media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild
-1708271834 ./media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild
 2010091139 ./media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
 2010091139 ./media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
 1902221409 ./media-libs/libXcm/libXcm-0.5.4.ebuild
 1904040039 ./media-libs/libXcm/libXcm-9999.ebuild
-2002151310 ./media-libs/libaacplus/libaacplus-2.0.2-r2.ebuild
 2002151310 ./media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
-1910111911 ./media-libs/libaacs/libaacs-0.9.0.ebuild
-2005071609 ./media-libs/libaacs/libaacs-0.10.0.ebuild
 2010071039 ./media-libs/libaacs/libaacs-0.11.0.ebuild
 2004032241 ./media-libs/libafterimage/libafterimage-1.20-r2.ebuild
 2004032241 ./media-libs/libafterimage/libafterimage-1.20-r3.ebuild
@@ -19343,8 +19324,8 @@
 2006091139 ./media-libs/libaom/libaom-9999.ebuild
 2010131309 ./media-libs/libaom/libaom-2.0.0.ebuild
 2006132027 ./media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
-2011200809 ./media-libs/libass/libass-0.15.0.ebuild
 2012010039 ./media-libs/libass/libass-0.14.0.ebuild
+2012030109 ./media-libs/libass/libass-0.15.0.ebuild
 1905052209 ./media-libs/libbdplus/libbdplus-0.1.2.ebuild
 1905052209 ./media-libs/libbdplus/libbdplus-9999.ebuild
 1910111911 ./media-libs/libbluray/libbluray-1.1.2.ebuild
@@ -19416,7 +19397,6 @@
 2006210209 ./media-libs/libgpod/libgpod-0.8.3-r3.ebuild
 2004261239 ./media-libs/libgroove/libgroove-4.3.0-r1.ebuild
 2007160439 ./media-libs/libharu/libharu-2.3.0-r2.ebuild
-1702282250 ./media-libs/libhdhomerun/libhdhomerun-20150826.ebuild
 2006222209 ./media-libs/libhdhomerun/libhdhomerun-20190621.ebuild
 2006280009 ./media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
 2010121239 ./media-libs/libheif/libheif-9999.ebuild
@@ -19463,7 +19443,7 @@
 2002231739 ./media-libs/libmpd/libmpd-11.8.17-r1.ebuild
 2010131239 ./media-libs/libmpdclient/libmpdclient-2.19.ebuild
 2004032241 ./media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
-2004032241 ./media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
+2012030209 ./media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
 2011142339 ./media-libs/libmpris2client/libmpris2client-0.1.0-r1.ebuild
 1910111911 ./media-libs/libmtp/libmtp-9999.ebuild
 2002031639 ./media-libs/libmtp/libmtp-1.1.17.ebuild
@@ -19483,7 +19463,6 @@
 2004032241 ./media-libs/liboggz/liboggz-1.1.1.ebuild
 2002112051 ./media-libs/libopenglrecorder/libopenglrecorder-0.1.0.ebuild
 1912110241 ./media-libs/libopenraw/libopenraw-0.1.3.ebuild
-2004032241 ./media-libs/libopenraw/libopenraw-0.0.9.ebuild
 2004032241 ./media-libs/libopenraw/libopenraw-0.1.2.ebuild
 1805212239 ./media-libs/libopenshot-audio/libopenshot-audio-0.1.4.ebuild
 1912312039 ./media-libs/libopenshot-audio/libopenshot-audio-0.1.9_pre20190502.ebuild
@@ -19523,7 +19502,7 @@
 2008081209 ./media-libs/libsdl/libsdl-1.2.15-r9.ebuild
 2009071209 ./media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild
 2010151939 ./media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild
-1902211339 ./media-libs/libsfml/libsfml-2.5.1.ebuild
+2012030239 ./media-libs/libsfml/libsfml-2.5.1.ebuild
 2006280009 ./media-libs/libshout/libshout-2.4.1-r2.ebuild
 2006280009 ./media-libs/libshout/libshout-2.4.2.ebuild
 2006280009 ./media-libs/libshout/libshout-2.4.3.ebuild
@@ -19542,7 +19521,7 @@
 2006132027 ./media-libs/libtiger/libtiger-0.3.4-r1.ebuild
 2010160139 ./media-libs/libtimidity/libtimidity-0.2.6.ebuild
 2004032241 ./media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
-1905261839 ./media-libs/libuvc/libuvc-0.0.6-r1.ebuild
+2012030239 ./media-libs/libuvc/libuvc-0.0.6-r1.ebuild
 2003261841 ./media-libs/libv4l/libv4l-1.16.6.ebuild
 2004211009 ./media-libs/libv4l/libv4l-1.10.1.ebuild
 2008232009 ./media-libs/libv4l/libv4l-1.20.0.ebuild
@@ -19578,9 +19557,9 @@
 2004032241 ./media-libs/memphis/memphis-0.2.3.ebuild
 2010162009 ./media-libs/mesa/mesa-20.1.10.ebuild
 2011192309 ./media-libs/mesa/mesa-20.3.0_rc2.ebuild
-2011192309 ./media-libs/mesa/mesa-9999.ebuild
 2011232239 ./media-libs/mesa/mesa-20.2.3.ebuild
-2012010009 ./media-libs/mesa/mesa-20.3.0_rc3.ebuild
+2012020239 ./media-libs/mesa/mesa-20.3.0_rc3.ebuild
+2012020239 ./media-libs/mesa/mesa-9999.ebuild
 2011021609 ./media-libs/mlt/mlt-6.22.1-r1.ebuild
 1801230038 ./media-libs/munt-mt32emu/munt-mt32emu-2.3.0.ebuild
 2006042339 ./media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
@@ -19613,7 +19592,8 @@
 1911230139 ./media-libs/openglide/openglide-0.09_rc9_p20191120.ebuild
 2007222309 ./media-libs/openh264/openh264-2.1.1.ebuild
 1912302209 ./media-libs/openicc/openicc-0.1.0.ebuild
-2011132139 ./media-libs/openimageio/openimageio-2.2.8.0.ebuild
+2012030839 ./media-libs/openimageio/openimageio-2.2.8.0-r1.ebuild
+2012030839 ./media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
 2004032241 ./media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
 2004032241 ./media-libs/openjpeg/openjpeg-2.3.1-r1.ebuild
 2006081109 ./media-libs/opensubdiv/opensubdiv-3.3.3-r1.ebuild
@@ -19623,6 +19603,8 @@
 2004032241 ./media-libs/opusfile/opusfile-0.11.ebuild
 2007061209 ./media-libs/opusfile/opusfile-0.12.ebuild
 2007310139 ./media-libs/osl/osl-1.10.10.ebuild
+2012011439 ./media-libs/osl/osl-1.10.13.ebuild
+2012011439 ./media-libs/osl/osl-1.11.9.0.ebuild
 2002021939 ./media-libs/oyranos/oyranos-9999.ebuild
 2002092239 ./media-libs/oyranos/oyranos-0.9.6-r1.ebuild
 2009011339 ./media-libs/partio/partio-1.1.0_p20170829.ebuild
@@ -19633,7 +19615,6 @@
 2010270339 ./media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild
 2010270339 ./media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild
 2010270339 ./media-libs/phonon/phonon-4.11.1-r1.ebuild
-2002112051 ./media-libs/plib/plib-1.8.5-r1.ebuild
 2010091139 ./media-libs/plib/plib-1.8.5-r2.ebuild
 2011072109 ./media-libs/plotutils/plotutils-2.6-r2.ebuild
 1702282250 ./media-libs/pnglite/pnglite-0.1.17.ebuild
@@ -19651,8 +19632,8 @@
 1907300009 ./media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
 2011240309 ./media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201022.ebuild
 1707301238 ./media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
-2011230809 ./media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
 2011230809 ./media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
+2012030839 ./media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
 2008241009 ./media-libs/raul/raul-1.0.0_pre20200718.ebuild
 2008241009 ./media-libs/raul/raul-9999.ebuild
 2002222009 ./media-libs/resid/resid-0.16_p2-r1.ebuild
@@ -19660,7 +19641,6 @@
 2003191509 ./media-libs/rtaudio/rtaudio-5.1.0.ebuild
 2011021709 ./media-libs/rubberband/rubberband-1.9.0.ebuild
 2004032241 ./media-libs/sbc/sbc-1.4.ebuild
-2004111339 ./media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
 2010101139 ./media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
 2010091139 ./media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
 2008081209 ./media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
@@ -19706,7 +19686,7 @@
 2012010139 ./media-libs/tremor/tremor-0_pre20130223-r2.ebuild
 1805292338 ./media-libs/tse3/tse3-0.3.1-r1.ebuild
 2005172009 ./media-libs/urt/urt-3.1b-r1.ebuild
-2005172009 ./media-libs/urt/urt-3.1b-r3.ebuild
+2012030209 ./media-libs/urt/urt-3.1b-r3.ebuild
 2010091139 ./media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild
 2002112051 ./media-libs/vidstab/vidstab-9999.ebuild
 2005011709 ./media-libs/vidstab/vidstab-1.1.0-r2.ebuild
@@ -19733,7 +19713,6 @@
 2004272039 ./media-libs/woff2/woff2-1.0.2-r1.ebuild
 2009181139 ./media-libs/woff2/woff2-1.0.2-r2.ebuild
 2004261109 ./media-libs/wxsvg/wxsvg-1.5.11.ebuild
-2004261109 ./media-libs/wxsvg/wxsvg-1.5.9.ebuild
 2009052209 ./media-libs/x264/x264-0.0.20190214.ebuild
 2009052209 ./media-libs/x264/x264-0.0.20190903-r1.ebuild
 2009052209 ./media-libs/x264/x264-0.0.20190903.ebuild
@@ -20271,7 +20250,6 @@
 2006280009 ./media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
 1803300609 ./media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r1.ebuild
 1803300609 ./media-plugins/vdr-zappilot/vdr-zappilot-0.0.5.ebuild
-1912152010 ./media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild
 2010091139 ./media-plugins/xsynth-dssi/xsynth-dssi-0.9.4.ebuild
 2007041239 ./media-plugins/mythplugins/mythplugins-31.0.ebuild
 2005151539 ./media-plugins/gst-plugins-srt/gst-plugins-srt-1.16.2.ebuild
@@ -20348,7 +20326,7 @@
 2009020009 ./media-sound/abcmidi/abcmidi-2020.01.22.ebuild
 2008111739 ./media-sound/aeolus/aeolus-0.9.9.ebuild
 1703112346 ./media-sound/alac_decoder/alac_decoder-0.2.0-r1.ebuild
-2005061039 ./media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
+2012030239 ./media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
 2005062039 ./media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
 2010211109 ./media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
 2011090239 ./media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
@@ -20423,7 +20401,6 @@
 2011141839 ./media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild
 2011141839 ./media-sound/dcadec/dcadec-0.2.0.ebuild
 1702282250 ./media-sound/dcaenc/dcaenc-2-r1.ebuild
-1702282250 ./media-sound/dcaenc/dcaenc-2.ebuild
 1702282250 ./media-sound/dcaenc/dcaenc-9999.ebuild
 2002112051 ./media-sound/dcd/dcd-0.95.ebuild
 1808152309 ./media-sound/declick/declick-0.6.5-r1.ebuild
@@ -20503,8 +20480,8 @@
 2006021939 ./media-sound/jack-rack/jack-rack-1.4.8_rc1-r1.ebuild
 1811250239 ./media-sound/jack-smf-utils/jack-smf-utils-1.0-r1.ebuild
 2010071009 ./media-sound/jack2/jack2-1.9.14.ebuild
-2011021309 ./media-sound/jack2/jack2-1.9.16.ebuild
 2011021309 ./media-sound/jack2/jack2-9999.ebuild
+2012031109 ./media-sound/jack2/jack2-1.9.16.ebuild
 2001231409 ./media-sound/jalv/jalv-1.6.4.ebuild
 2008082339 ./media-sound/jamin/jamin-0.98.9_pre20170111.ebuild
 1911101439 ./media-sound/justeport/justeport-0.2.ebuild
@@ -20584,14 +20561,14 @@
 1910171209 ./media-sound/multimux/multimux-0.2.5.2.ebuild
 2006251709 ./media-sound/mumble/mumble-1.3.1-r1.ebuild
 2008252139 ./media-sound/mumble/mumble-1.3.2.ebuild
-2010071639 ./media-sound/mumble/mumble-1.3.3.ebuild
 2011170309 ./media-sound/mumble/mumble-9999.ebuild
+2012030239 ./media-sound/mumble/mumble-1.3.3.ebuild
 1801230038 ./media-sound/munt-mt32emu-alsadrv/munt-mt32emu-alsadrv-2.3.0.ebuild
 1805120339 ./media-sound/mup/mup-6.6.ebuild
 2006212039 ./media-sound/murmur/murmur-1.3.1.ebuild
 2007091209 ./media-sound/murmur/murmur-1.3.2.ebuild
-2010071639 ./media-sound/murmur/murmur-1.3.3.ebuild
 2011171209 ./media-sound/murmur/murmur-9999.ebuild
+2012030239 ./media-sound/murmur/murmur-1.3.3.ebuild
 2008081539 ./media-sound/muse/muse-0.9.2_p20161002.ebuild
 2011142339 ./media-sound/musepack-tools/musepack-tools-465-r1.ebuild
 2009082109 ./media-sound/musescore/musescore-9999.ebuild
@@ -20672,8 +20649,8 @@
 2010131239 ./media-sound/qsynth/qsynth-0.6.3.ebuild
 2005210139 ./media-sound/qtagger/qtagger-1.0.1_p20150402.ebuild
 2005201639 ./media-sound/qtgain/qtgain-1.0.0.ebuild
-2011021309 ./media-sound/qtractor/qtractor-0.9.18.ebuild
 2011130009 ./media-sound/qtractor/qtractor-0.9.17.ebuild
+2012030239 ./media-sound/qtractor/qtractor-0.9.18.ebuild
 2005210139 ./media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
 2010131239 ./media-sound/quimup/quimup-1.4.4.ebuild
 2002161609 ./media-sound/quodlibet/quodlibet-4.2.1.ebuild
@@ -20839,7 +20816,7 @@
 2009051609 ./media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
 2009051609 ./media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
 1702282250 ./media-tv/w_scan/w_scan-20141122.ebuild
-2011290239 ./media-tv/w_scan/w_scan-20170107.ebuild
+2012030239 ./media-tv/w_scan/w_scan-20170107.ebuild
 1909231039 ./media-tv/xmltv/xmltv-0.5.70.ebuild
 2007051209 ./media-tv/xmltv/xmltv-0.6.1.ebuild
 1910042209 ./media-video/acidrip/acidrip-0.14-r4.ebuild
@@ -20908,15 +20885,11 @@
 2009130109 ./media-video/gpac/gpac-9999.ebuild
 2010091209 ./media-video/gpac/gpac-1.0.1.ebuild
 2005212308 ./media-video/guvcview/guvcview-2.0.6-r1.ebuild
-1910261809 ./media-video/gxine/gxine-0.5.907-r1.ebuild
 2002112051 ./media-video/gxine/gxine-0.5.909.ebuild
 2009071209 ./media-video/h264enc/h264enc-10.4.7-r1.ebuild
 2004262139 ./media-video/handbrake/handbrake-9999.ebuild
 2006271309 ./media-video/handbrake/handbrake-1.3.3.ebuild
 2008192139 ./media-video/handbrake/handbrake-1.3.3-r1.ebuild
-2004252239 ./media-video/harvid/harvid-0.8.0.ebuild
-2004252239 ./media-video/harvid/harvid-0.8.1.ebuild
-2004252239 ./media-video/harvid/harvid-0.8.2.ebuild
 2010141909 ./media-video/harvid/harvid-0.8.3-r1.ebuild
 2004261409 ./media-video/imagination/imagination-3.0-r2.ebuild
 1702282250 ./media-video/isight-firmware-tools/isight-firmware-tools-1.6-r1.ebuild
@@ -20950,10 +20923,7 @@
 2010221539 ./media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
 2011021309 ./media-video/motion/motion-4.3.1.ebuild
 1811101609 ./media-video/motiontrack/motiontrack-0.1.3-r2.ebuild
-2006041239 ./media-video/movit/movit-1.2.0.ebuild
-2011142339 ./media-video/movit/movit-1.6.1.ebuild
 2011142339 ./media-video/movit/movit-1.6.2.ebuild
-1702282250 ./media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
 1702282250 ./media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild
 2004032241 ./media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
 2002230040 ./media-video/mpglen/mpglen-0.1.ebuild
@@ -21060,7 +21030,7 @@
 1909290609 ./media-video/vobcopy/vobcopy-1.2.0.ebuild
 1911092239 ./media-video/vstrip/vstrip-0.8f.ebuild
 2007191909 ./media-video/webcamoid/webcamoid-8.1.0-r1.ebuild
-2011231939 ./media-video/webcamoid/webcamoid-8.7.1.ebuild
+2012030239 ./media-video/webcamoid/webcamoid-8.7.1.ebuild
 2009152139 ./media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
 2009152139 ./media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
 2009152139 ./media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -21131,7 +21101,7 @@
 2002230040 ./net-analyzer/bwmon/bwmon-1.3-r2.ebuild
 2007020939 ./net-analyzer/bwping/bwping-1.17.ebuild
 2009092339 ./net-analyzer/bwping/bwping-2.0.ebuild
-2010010109 ./net-analyzer/bwping/bwping-2.1.ebuild
+2012020639 ./net-analyzer/bwping/bwping-2.1.ebuild
 2005232139 ./net-analyzer/cacti-spine/cacti-spine-99999.ebuild
 2007190339 ./net-analyzer/cacti-spine/cacti-spine-1.2.13.ebuild
 2008030839 ./net-analyzer/cacti-spine/cacti-spine-1.2.14.ebuild
@@ -21167,12 +21137,12 @@
 2010101709 ./net-analyzer/driftnet/driftnet-1.3.0.ebuild
 2011271209 ./net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild
 2002112051 ./net-analyzer/egressor/egressor-1.0-r2.ebuild
-2006291709 ./net-analyzer/etherape/etherape-0.9.19.ebuild
+2012030239 ./net-analyzer/etherape/etherape-0.9.19.ebuild
 2011270339 ./net-analyzer/ethloop/ethloop-10-r4.ebuild
 2008131339 ./net-analyzer/ettercap/ettercap-9999.ebuild
 2009241009 ./net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
-2008150239 ./net-analyzer/fail2ban/fail2ban-99999999.ebuild
 2011201709 ./net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild
+2012031009 ./net-analyzer/fail2ban/fail2ban-99999999.ebuild
 2011271209 ./net-analyzer/firewalk/firewalk-5.0-r2.ebuild
 2011150109 ./net-analyzer/flent/flent-1.3.2.ebuild
 2010031839 ./net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild
@@ -21243,8 +21213,8 @@
 2002112051 ./net-analyzer/ipsumdump/ipsumdump-1.86.ebuild
 2006031339 ./net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild
 2006101539 ./net-analyzer/iptraf-ng/iptraf-ng-1.2.0-r1.ebuild
-2011271939 ./net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild
 2012010139 ./net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
+2012030239 ./net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild
 2011271209 ./net-analyzer/iptstate/iptstate-2.2.6.ebuild
 2001270509 ./net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild
 2004151609 ./net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild
@@ -21305,7 +21275,6 @@
 1911032309 ./net-analyzer/nagios-plugin-check_lm_sensors/nagios-plugin-check_lm_sensors-4.1.1_p20191028.ebuild
 2002112051 ./net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8.ebuild
 2005032110 ./net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10.ebuild
-1912152339 ./net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild
 2005060209 ./net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-26-r1.ebuild
 2008101839 ./net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-27.ebuild
 2010242039 ./net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
@@ -21427,12 +21396,10 @@
 2006040939 ./net-analyzer/sarg/sarg-2.4.0.ebuild
 1702282250 ./net-analyzer/sbd/sbd-1.37-r1.ebuild
 1702282250 ./net-analyzer/scanlogd/scanlogd-2.2.7.ebuild
-1805061738 ./net-analyzer/scanssh/scanssh-2.1.ebuild
-2007071139 ./net-analyzer/scanssh/scanssh-2.1-r2.ebuild
 2011271209 ./net-analyzer/scanssh/scanssh-2.1.2.ebuild
 2002071539 ./net-analyzer/scapy/scapy-2.4.3.ebuild
 2009022239 ./net-analyzer/scapy/scapy-9999.ebuild
-2011072139 ./net-analyzer/scapy/scapy-2.4.4.ebuild
+2012030239 ./net-analyzer/scapy/scapy-2.4.4.ebuild
 1811300139 ./net-analyzer/scli/scli-0.4.0-r1.ebuild
 2011271139 ./net-analyzer/sec/sec-2.8.3.ebuild
 2011271139 ./net-analyzer/sflowtool/sflowtool-5.06.ebuild
@@ -21515,7 +21482,6 @@
 1702282250 ./net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild
 2011271109 ./net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
 2004032241 ./net-analyzer/traceroute/traceroute-2.1.0.ebuild
-1702282250 ./net-analyzer/trafshow/trafshow-5.2.3.ebuild
 2011271939 ./net-analyzer/trafshow/trafshow-5.2.3-r1.ebuild
 1912111540 ./net-analyzer/tsung/tsung-1.7.0.ebuild
 1803271408 ./net-analyzer/ttcp/ttcp-1.12-r2.ebuild
@@ -21540,6 +21506,9 @@
 2011101139 ./net-analyzer/zabbix/zabbix-5.2.1.ebuild
 2011142339 ./net-analyzer/zabbix/zabbix-4.0.25.ebuild
 2011142339 ./net-analyzer/zabbix/zabbix-5.0.4.ebuild
+2012021239 ./net-analyzer/zabbix/zabbix-4.0.27.ebuild
+2012021239 ./net-analyzer/zabbix/zabbix-5.0.6.ebuild
+2012021209 ./net-analyzer/zabbix/zabbix-5.2.2.ebuild
 2010021709 ./net-analyzer/zmap/zmap-9999.ebuild
 2010071039 ./net-analyzer/zmap/zmap-2.1.1-r2.ebuild
 1702282250 ./net-analyzer/zniper/zniper-1.0-r1.ebuild
@@ -21644,11 +21613,11 @@
 2011252124 ./net-dns/https_dns_proxy/https_dns_proxy-0_pre20200925.ebuild
 2011252124 ./net-dns/https_dns_proxy/https_dns_proxy-9999.ebuild
 2004211009 ./net-dns/idnkit/idnkit-1.0-r2.ebuild
-2011291139 ./net-dns/idnkit/idnkit-2.3.ebuild
+2012030109 ./net-dns/idnkit/idnkit-2.3.ebuild
 2010171709 ./net-dns/knot/knot-2.9.7.ebuild
 2011140309 ./net-dns/knot/knot-3.0.2.ebuild
 2004032241 ./net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
-2011291139 ./net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
+2012031039 ./net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
 2011172209 ./net-dns/libidn/libidn-1.36.ebuild
 2006141939 ./net-dns/libidn2/libidn2-2.3.0.ebuild
 2008181439 ./net-dns/maradns/maradns-3.5.0005.ebuild
@@ -21657,8 +21626,8 @@
 2004171939 ./net-dns/mydns/mydns-1.2.8.31-r1.ebuild
 2002230040 ./net-dns/ndu/ndu-0.4-r4.ebuild
 2003220409 ./net-dns/nsd/nsd-4.2.4.ebuild
-2007151139 ./net-dns/nsd/nsd-4.3.2.ebuild
 2010081909 ./net-dns/nsd/nsd-4.3.3.ebuild
+2012021709 ./net-dns/nsd/nsd-4.3.4.ebuild
 1912111540 ./net-dns/odsclient/odsclient-1.03-r1.ebuild
 2006041239 ./net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
 2009291711 ./net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild
@@ -21717,9 +21686,8 @@
 2008201639 ./net-firewall/ipset/ipset-6.38-r1.ebuild
 2011020309 ./net-firewall/ipset/ipset-7.7.ebuild
 2011220439 ./net-firewall/ipset/ipset-7.9.ebuild
-2011151809 ./net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild
-2011151839 ./net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
 2011151809 ./net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
+2012021039 ./net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
 2003261841 ./net-firewall/iptables/iptables-1.6.2-r2.ebuild
 2004211009 ./net-firewall/iptables/iptables-1.6.1-r3.ebuild
 2008210409 ./net-firewall/iptables/iptables-1.8.4-r2.ebuild
@@ -21908,7 +21876,7 @@
 2009071209 ./net-im/slack/slack-4.3.2-r2.ebuild
 2009071209 ./net-im/slack/slack-4.4.2.ebuild
 2009071209 ./net-im/slack/slack-4.4.3.ebuild
-2010161409 ./net-im/element-desktop-bin/element-desktop-bin-1.7.9.ebuild
+2012021609 ./net-im/element-desktop-bin/element-desktop-bin-1.7.14.ebuild
 2010080109 ./net-im/prosody-modules/prosody-modules-9999.ebuild
 2010121509 ./net-im/prosody-modules/prosody-modules-0_pre20201004.ebuild
 2006062109 ./net-irc/anope/anope-2.0.7.ebuild
@@ -22014,7 +21982,8 @@
 2010101039 ./net-libs/gloox/gloox-1.0.24.ebuild
 2004032241 ./net-libs/gnet/gnet-2.0.8-r2.ebuild
 2008302139 ./net-libs/gnome-online-accounts/gnome-online-accounts-3.36.0.ebuild
-2011271409 ./net-libs/gnutls/gnutls-3.6.15.ebuild
+2012030039 ./net-libs/gnutls/gnutls-3.6.15.ebuild
+2012030039 ./net-libs/gnutls/gnutls-3.7.0.ebuild
 1908021309 ./net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0.ebuild
 1905052209 ./net-libs/google-cloud-cpp/google-cloud-cpp-0.5.0.ebuild
 1906041939 ./net-libs/google-cloud-cpp/google-cloud-cpp-0.9.0.ebuild
@@ -22077,7 +22046,7 @@
 2007171409 ./net-libs/libecap/libecap-1.0.0.ebuild
 2004032241 ./net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
 2007081709 ./net-libs/libesmtp/libesmtp-9999.ebuild
-2007310009 ./net-libs/libetpan/libetpan-1.9.4-r1.ebuild
+2012030239 ./net-libs/libetpan/libetpan-1.9.4-r1.ebuild
 2002151310 ./net-libs/libflowmanager/libflowmanager-3.0.0-r1.ebuild
 2006010409 ./net-libs/libgadu/libgadu-1.12.2-r1.ebuild
 2009270609 ./net-libs/libgadu/libgadu-1.11.4.ebuild
@@ -22163,10 +22132,8 @@
 2008310709 ./net-libs/libnxml/libnxml-0.18.3-r1.ebuild
 2004032241 ./net-libs/liboauth/liboauth-1.0.3-r1.ebuild
 2002112051 ./net-libs/liboping/liboping-1.10.0-r2.ebuild
-1806040509 ./net-libs/libosmo-abis/libosmo-abis-9999.ebuild
 2009212239 ./net-libs/libosmo-dsp/libosmo-dsp-0.3.ebuild
 2009212239 ./net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild
-1806052039 ./net-libs/libosmo-netif/libosmo-netif-9999.ebuild
 1802120538 ./net-libs/libosmocore/libosmocore-0.10.2.ebuild
 1806052039 ./net-libs/libosmocore/libosmocore-0.8.0.ebuild
 1802120538 ./net-libs/libosmocore/libosmocore-9999.ebuild
@@ -22202,14 +22169,14 @@
 2004032241 ./net-libs/librsync/librsync-2.0.1-r1.ebuild
 2004071909 ./net-libs/librsync/librsync-0.9.7-r3.ebuild
 2004071839 ./net-libs/librsync/librsync-2.3.0.ebuild
-2005310209 ./net-libs/librsync/librsync-2.3.1.ebuild
+2012030209 ./net-libs/librsync/librsync-2.3.1.ebuild
 2010061139 ./net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
 2002112051 ./net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild
 2007200439 ./net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild
 2010121339 ./net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild
 2010270339 ./net-libs/libsignon-glib/libsignon-glib-2.1.ebuild
 2008241239 ./net-libs/libsmi/libsmi-0.4.8-r1.ebuild
-2011291139 ./net-libs/libsmi/libsmi-0.5.0-r1.ebuild
+2012030739 ./net-libs/libsmi/libsmi-0.5.0-r1.ebuild
 2007290809 ./net-libs/libsoup/libsoup-2.70.0.ebuild
 1907151840 ./net-libs/libsrsirc/libsrsirc-0.0.14-r1.ebuild
 2004032241 ./net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
@@ -22248,7 +22215,7 @@
 2006290939 ./net-libs/libvncserver/libvncserver-0.9.13.ebuild
 2001230639 ./net-libs/libwebsockets/libwebsockets-3.2.1.ebuild
 2010070339 ./net-libs/libwebsockets/libwebsockets-4.0.20.ebuild
-2011291139 ./net-libs/libwebsockets/libwebsockets-4.1.4.ebuild
+2012030209 ./net-libs/libwebsockets/libwebsockets-4.1.4.ebuild
 2007190239 ./net-libs/libzapojit/libzapojit-0.0.3.ebuild
 1905290739 ./net-libs/liquid-dsp/liquid-dsp-1.3.0.ebuild
 1905290739 ./net-libs/liquid-dsp/liquid-dsp-1.3.1.ebuild
@@ -22275,9 +22242,9 @@
 2006201739 ./net-libs/neon/neon-0.31.2.ebuild
 2002151310 ./net-libs/net6/net6-1.3.14-r2.ebuild
 1702282250 ./net-libs/netwib/netwib-5.39.0.ebuild
-2007301909 ./net-libs/nghttp2/nghttp2-9999.ebuild
 2009011309 ./net-libs/nghttp2/nghttp2-1.41.0.ebuild
-2011281539 ./net-libs/nghttp2/nghttp2-1.42.0.ebuild
+2012012309 ./net-libs/nghttp2/nghttp2-1.42.0.ebuild
+2012012309 ./net-libs/nghttp2/nghttp2-9999.ebuild
 2002112051 ./net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
 2002112051 ./net-libs/nghttp3/nghttp3-9999.ebuild
 2002112051 ./net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
@@ -22353,7 +22320,7 @@
 1912110241 ./net-libs/wandio/wandio-4.2.1.ebuild
 2005260939 ./net-libs/wandio/wandio-4.2.3_p1-r1.ebuild
 2011210109 ./net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
-2011280009 ./net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
+2012012039 ./net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
 2002112051 ./net-libs/wvstreams/wvstreams-99999.ebuild
 2007081009 ./net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
 2009182109 ./net-libs/xrootd/xrootd-5.0.2.ebuild
@@ -22448,14 +22415,14 @@
 1704041838 ./net-mail/mswatch/mswatch-1.2.0-r1.ebuild
 2007310139 ./net-mail/mu/mu-1.4.10.ebuild
 2008151239 ./net-mail/mu/mu-1.4.12.ebuild
-2011030839 ./net-mail/mu/mu-1.4.13.ebuild
+2012011309 ./net-mail/mu/mu-1.4.13.ebuild
 2005120939 ./net-mail/muchsync/muchsync-5.ebuild
 1805290208 ./net-mail/nmzmail/nmzmail-1.1.ebuild
 2007231609 ./net-mail/notmuch/notmuch-0.29.3-r2.ebuild
 2009140239 ./net-mail/notmuch/notmuch-0.31.ebuild
 2009202039 ./net-mail/notmuch/notmuch-0.30-r1.ebuild
 2011062109 ./net-mail/notmuch/notmuch-0.31-r2.ebuild
-2011130309 ./net-mail/notmuch/notmuch-0.31.2.ebuild
+2012011309 ./net-mail/notmuch/notmuch-0.31.2.ebuild
 1912242309 ./net-mail/pflogsumm/pflogsumm-1.1.5-r1.ebuild
 1912242309 ./net-mail/pflogsumm/pflogsumm-1.1.5-r2.ebuild
 2002151310 ./net-mail/pfqueue/pfqueue-0.5.6.ebuild
@@ -22698,7 +22665,7 @@
 2008111739 ./net-misc/igmpproxy/igmpproxy-0.2.1_p20200508.ebuild
 2011272009 ./net-misc/ip-sentinel/ip-sentinel-0.12-r1.ebuild
 2004032241 ./net-misc/ipcalc/ipcalc-0.41.ebuild
-2011291139 ./net-misc/ipcalc/ipcalc-0.42_p2.ebuild
+2012030739 ./net-misc/ipcalc/ipcalc-0.42_p2.ebuild
 1912011439 ./net-misc/iperf/iperf-2.0.13.ebuild
 2002151310 ./net-misc/iperf/iperf-3.6.ebuild
 2006151309 ./net-misc/iperf/iperf-3.7.ebuild
@@ -22740,10 +22707,8 @@
 1911042209 ./net-misc/l7-protocols/l7-protocols-2009.05.28-r1.ebuild
 2002140110 ./net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild
 1808310240 ./net-misc/lanmap/lanmap-81-r2.ebuild
-1806052039 ./net-misc/lcr/lcr-9999.ebuild
-2002030109 ./net-misc/libteam/libteam-1.22.ebuild
 2007271839 ./net-misc/libteam/libteam-9999.ebuild
-2011291139 ./net-misc/libteam/libteam-1.31.ebuild
+2012021809 ./net-misc/libteam/libteam-1.31.ebuild
 2008291939 ./net-misc/linux-eoip/linux-eoip-0.5.ebuild
 2011051739 ./net-misc/linuxptp/linuxptp-2.0-r1.ebuild
 1910051539 ./net-misc/liveice/liveice-2000530-r2.ebuild
@@ -22767,7 +22732,7 @@
 2008042139 ./net-misc/mikutter/mikutter-4.0.6.ebuild
 2008042139 ./net-misc/mikutter/mikutter-9999.ebuild
 2011252124 ./net-misc/minidlna/minidlna-1.2.1-r1.ebuild
-2011291139 ./net-misc/minidlna/minidlna-1.3.0.ebuild
+2012031009 ./net-misc/minidlna/minidlna-1.3.0.ebuild
 2002230040 ./net-misc/minissdpd/minissdpd-1.5.20190824.ebuild
 2010102139 ./net-misc/minissdpd/minissdpd-1.5.20200928.ebuild
 2005140939 ./net-misc/miniupnpd/miniupnpd-2.1.20200510.ebuild
@@ -22796,14 +22761,14 @@
 2004032241 ./net-misc/netifrc/netifrc-0.7.1.ebuild
 2004211009 ./net-misc/netifrc/netifrc-0.5.1.ebuild
 2009071239 ./net-misc/netifrc/netifrc-9999.ebuild
-2011291139 ./net-misc/netifrc/netifrc-0.7.1-r1.ebuild
+2012030739 ./net-misc/netifrc/netifrc-0.7.1-r1.ebuild
 1805091408 ./net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild
 1801032209 ./net-misc/netkit-bootpd/netkit-bootpd-2.4-r1.ebuild
 2004211009 ./net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
 2002112051 ./net-misc/netkit-routed/netkit-routed-0.17-r5.ebuild
 2010241639 ./net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
 2004032241 ./net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild
-2011231109 ./net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
+2012011109 ./net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
 1702282250 ./net-misc/netkit-timed/netkit-timed-0.17-r10.ebuild
 2003241639 ./net-misc/netpipe/netpipe-1.0.0_beta2-r2.ebuild
 2002230040 ./net-misc/netpipes/netpipes-4.2-r2.ebuild
@@ -22835,7 +22800,7 @@
 2005102009 ./net-misc/nyx/nyx-2.1.0-r1.ebuild
 1910052209 ./net-misc/ofono/ofono-1.16.ebuild
 1910210509 ./net-misc/ofono/ofono-1.30.ebuild
-2011291139 ./net-misc/ofono/ofono-1.31.ebuild
+2012030309 ./net-misc/ofono/ofono-1.31.ebuild
 2007171839 ./net-misc/oidentd/oidentd-2.5.0.ebuild
 1811232039 ./net-misc/olsrd/olsrd-0.9.6.1-r1.ebuild
 1708300038 ./net-misc/olsrd/olsrd-0.9.6.1.ebuild
@@ -22879,7 +22844,7 @@
 2004261539 ./net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild
 2004261539 ./net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
 2007221909 ./net-misc/putty/putty-9999.ebuild
-2007231239 ./net-misc/putty/putty-0.74.ebuild
+2012030239 ./net-misc/putty/putty-0.74.ebuild
 2001051415 ./net-misc/pyhoca-cli/pyhoca-cli-0.6.0.1.ebuild
 2001051415 ./net-misc/pyhoca-cli/pyhoca-cli-0.6.1.1.ebuild
 2001051415 ./net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
@@ -22909,7 +22874,7 @@
 1910111911 ./net-misc/redir/redir-3.2.ebuild
 1910111911 ./net-misc/redir/redir-3.3.ebuild
 2010071039 ./net-misc/remmina/remmina-1.4.8-r1.ebuild
-2011231939 ./net-misc/remmina/remmina-1.4.9.ebuild
+2012030239 ./net-misc/remmina/remmina-1.4.9.ebuild
 1908151909 ./net-misc/rinetd/rinetd-0.62-r2.ebuild
 2010252039 ./net-misc/rsync/rsync-3.2.3-r1.ebuild
 2010252039 ./net-misc/rsync/rsync-9999.ebuild
@@ -22938,7 +22903,7 @@
 2001261509 ./net-misc/shigofumi/shigofumi-0.3-r1.ebuild
 1702282250 ./net-misc/shmux/shmux-1.0.2-r1.ebuild
 1702282250 ./net-misc/shmux/shmux-1.0.2.ebuild
-1702282250 ./net-misc/sipcalc/sipcalc-1.1.6.ebuild
+2012030239 ./net-misc/sipcalc/sipcalc-1.1.6.ebuild
 2011010409 ./net-misc/sipsak/sipsak-0.9.7.ebuild
 1810201509 ./net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild
 1912110241 ./net-misc/sks/sks-1.1.6-r2.ebuild
@@ -22959,7 +22924,6 @@
 2006111439 ./net-misc/spiped/spiped-1.6.0-r1.ebuild
 1902180709 ./net-misc/spread/spread-4.4.1.ebuild
 1902121009 ./net-misc/spread/spread-5.0.1.ebuild
-1706042153 ./net-misc/srf-ip-conn-srv/srf-ip-conn-srv-9999.ebuild
 2010201139 ./net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild
 2002112051 ./net-misc/ssh-chain/ssh-chain-20131217.ebuild
 2010160639 ./net-misc/sshpass/sshpass-1.06.ebuild
@@ -23040,6 +23004,7 @@
 2011281339 ./net-misc/youtube-dl/youtube-dl-2020.11.26.ebuild
 2011291139 ./net-misc/youtube-dl/youtube-dl-2020.11.29.ebuild
 2011291139 ./net-misc/youtube-dl/youtube-dl-9999.ebuild
+2012012209 ./net-misc/youtube-dl/youtube-dl-2020.12.02.ebuild
 2011260709 ./net-misc/youtube-viewer/youtube-viewer-3.7.4-r2.ebuild
 2011260709 ./net-misc/youtube-viewer/youtube-viewer-9999.ebuild
 1904210639 ./net-misc/zerotier/zerotier-1.2.12.ebuild
@@ -23173,6 +23138,7 @@
 2008301509 ./net-p2p/qbittorrent/qbittorrent-4.2.5-r2.ebuild
 2008301509 ./net-p2p/qbittorrent/qbittorrent-9999.ebuild
 2011041509 ./net-p2p/qbittorrent/qbittorrent-4.3.0.1.ebuild
+2012011509 ./net-p2p/qbittorrent/qbittorrent-4.3.1.ebuild
 1810141409 ./net-p2p/resilio-sync/resilio-sync-2.6.1.ebuild
 1912081339 ./net-p2p/resilio-sync/resilio-sync-2.6.3.ebuild
 2006221139 ./net-p2p/retroshare/retroshare-0.6.5.ebuild
@@ -23269,11 +23235,8 @@
 1804252239 ./net-print/mtink/mtink-1.0.16-r2.ebuild
 1709300814 ./net-print/npadmin/npadmin-0.8.7-r1.ebuild
 2010242039 ./net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild
-2002230040 ./net-print/poster/poster-20060221-r2.ebuild
-2002230040 ./net-print/poster/poster-20060221-r3.ebuild
-2002230040 ./net-print/poster/poster-20060221.ebuild
-1901050009 ./net-print/splix/splix-2.0.0_p20130826-r1.ebuild
-1802062208 ./net-print/splix/splix-2.0.0_p20130826.ebuild
+2012020639 ./net-print/poster/poster-20060221-r3.ebuild
+2012020639 ./net-print/splix/splix-2.0.0_p20130826-r1.ebuild
 1911180909 ./net-print/sshlpr/sshlpr-1.ebuild
 2010210909 ./net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
 2003152212 ./net-proxy/3proxy/3proxy-0.8.13.ebuild
@@ -23303,6 +23266,7 @@
 2011061239 ./net-proxy/haproxy/haproxy-2.3.9999.ebuild
 2011291139 ./net-proxy/haproxy/haproxy-2.2.5.ebuild
 2011301209 ./net-proxy/haproxy/haproxy-2.3.2.ebuild
+2012011340 ./net-proxy/haproxy/haproxy-2.2.6.ebuild
 2011041509 ./net-proxy/hatop/hatop-0.8.0.ebuild
 1702282250 ./net-proxy/havp/havp-0.92a-r2.ebuild
 2008020739 ./net-proxy/mitmproxy/mitmproxy-5.1.1.ebuild
@@ -23337,8 +23301,7 @@
 2005291109 ./net-proxy/torsocks/torsocks-2.3.0.ebuild
 2004171709 ./net-proxy/trojan/trojan-9999.ebuild
 2009271239 ./net-proxy/trojan/trojan-1.16.0-r1.ebuild
-2002112051 ./net-proxy/tsocks/tsocks-1.8_beta5-r8.ebuild
-2011292039 ./net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild
+2012030109 ./net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild
 1712281839 ./net-proxy/wwwoffle/wwwoffle-2.9i-r1.ebuild
 2011290239 ./net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild
 2008060039 ./net-proxy/microsocks/microsocks-1.0.1_p20200805.ebuild
@@ -23376,7 +23339,7 @@
 2003292309 ./net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.2.ebuild
 1911261539 ./net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.12.ebuild
 2001261339 ./net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6.ebuild
-2006291909 ./net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild
+2012030239 ./net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild
 2004261739 ./net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r2.ebuild
 2004261409 ./net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0-r1.ebuild
 2009020009 ./net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.5.2.ebuild
@@ -23421,8 +23384,7 @@
 2010131239 ./net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
 1912040339 ./net-wireless/airspy/airspy-1.0.9.ebuild
 1912040339 ./net-wireless/airspy/airspy-9999.ebuild
-2002230040 ./net-wireless/airtraf/airtraf-1.1-r3.ebuild
-2011292039 ./net-wireless/airtraf/airtraf-1.1-r4.ebuild
+2012020639 ./net-wireless/airtraf/airtraf-1.1-r4.ebuild
 1805132239 ./net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild
 1808170009 ./net-wireless/bladerf-firmware/bladerf-firmware-2.2.0.ebuild
 2001211409 ./net-wireless/bladerf-firmware/bladerf-firmware-2.3.2.ebuild
@@ -23490,6 +23452,7 @@
 2009081609 ./net-wireless/iwd/iwd-1.8-r3.ebuild
 2009101409 ./net-wireless/iwd/iwd-9999.ebuild
 2011120339 ./net-wireless/iwd/iwd-1.9-r1.ebuild
+2012011839 ./net-wireless/iwd/iwd-1.10.ebuild
 2003170509 ./net-wireless/jackit/jackit-0.0_p20170918-r1.ebuild
 2008142139 ./net-wireless/kismet-rest/kismet-rest-2019.05.02.ebuild
 2008142139 ./net-wireless/kismet-rest/kismet-rest-9999.ebuild
@@ -23510,12 +23473,8 @@
 2010062009 ./net-wireless/nanovna-saver/nanovna-saver-0.3.7-r1.ebuild
 2010062009 ./net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
 1910052209 ./net-wireless/neard/neard-0.15-r1.ebuild
-1806052039 ./net-wireless/openbsc/openbsc-9999.ebuild
-1806052039 ./net-wireless/openggsn/openggsn-9999.ebuild
 1806281939 ./net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild
 2010311439 ./net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild
-1806052039 ./net-wireless/osmobts/osmobts-9999.ebuild
-1806052039 ./net-wireless/osmocom-bb/osmocom-bb-9999.ebuild
 1905080439 ./net-wireless/portapack-firmware/portapack-firmware-20190405.ebuild
 1808172339 ./net-wireless/portapack-havoc/portapack-havoc-0.0_p20180612.ebuild
 1902042109 ./net-wireless/qradiolink/qradiolink-9999.ebuild
@@ -23565,13 +23524,12 @@
 1910162109 ./net-wireless/unifi/unifi-5.6.42-r1.ebuild
 2011062309 ./net-wireless/unifi/unifi-6.1.25.ebuild
 2011171939 ./net-wireless/unifi/unifi-6.1.26.ebuild
-2011191739 ./net-wireless/unifi/unifi-6.0.37.ebuild
 2011301639 ./net-wireless/unifi/unifi-6.0.36.ebuild
 2011301639 ./net-wireless/unifi/unifi-6.0.40.ebuild
+2012021639 ./net-wireless/unifi/unifi-6.0.41.ebuild
 2006221709 ./net-wireless/urh/urh-2.8.8.ebuild
 2006221709 ./net-wireless/urh/urh-9999.ebuild
-2011292039 ./net-wireless/wavemon/wavemon-0.8.0.ebuild
-2012010139 ./net-wireless/wavemon/wavemon-0.7.6.ebuild
+2012030039 ./net-wireless/wavemon/wavemon-0.8.0.ebuild
 1905291309 ./net-wireless/wepattack/wepattack-0.1.3-r5.ebuild
 1809280334 ./net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild
 2004032241 ./net-wireless/wireless-regdb/wireless-regdb-20190301.ebuild
@@ -23581,7 +23539,6 @@
 2002181809 ./net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
 1911111739 ./net-wireless/yatebts/yatebts-6.0.0-r1.ebuild
 1803280309 ./net-wireless/yatebts/yatebts-9999.ebuild
-2004022239 ./net-wireless/dump978/dump978-9999.ebuild
 2009152009 ./net-wireless/sigdigger/sigdigger-0.1.0.ebuild
 2011242339 ./net-wireless/sigutils/sigutils-0.1.0-r1.ebuild
 2009152009 ./net-wireless/suscan/suscan-0.1.0.ebuild
@@ -23987,7 +23944,7 @@
 2003101139 ./sci-calculators/datamash/datamash-1.6.ebuild
 2004241039 ./sci-calculators/datamash/datamash-1.7.ebuild
 1910111911 ./sci-calculators/galculator/galculator-2.1.4.ebuild
-2011222039 ./sci-calculators/galculator/galculator-2.1.4-r1.ebuild
+2012020639 ./sci-calculators/galculator/galculator-2.1.4-r1.ebuild
 1702282250 ./sci-calculators/grpn/grpn-1.4.0.ebuild
 2011290239 ./sci-calculators/hcalc/hcalc-1.2-r1.ebuild
 1910051539 ./sci-calculators/hexcalc/hexcalc-1.11-r3.ebuild
@@ -23997,8 +23954,8 @@
 2004211009 ./sci-calculators/pcalc/pcalc-3-r1.ebuild
 1802070408 ./sci-calculators/qalculate-gtk/qalculate-gtk-2.2.0.ebuild
 2002081309 ./sci-calculators/qalculate-gtk/qalculate-gtk-0.9.9.ebuild
-2002081309 ./sci-calculators/qalculate-gtk/qalculate-gtk-3.2.0-r1.ebuild
 2002112051 ./sci-calculators/qalculate-gtk/qalculate-gtk-2.8.1.ebuild
+2012030239 ./sci-calculators/qalculate-gtk/qalculate-gtk-3.2.0-r1.ebuild
 1803312208 ./sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild
 2002112051 ./sci-calculators/tiemu/tiemu-3.03-r1.ebuild
 2009201709 ./sci-calculators/tilp2/tilp2-1.18.ebuild
@@ -24060,8 +24017,8 @@
 2009181339 ./sci-chemistry/nmrglue/nmrglue-0.7.ebuild
 1702282250 ./sci-chemistry/numbat/numbat-0.999-r1.ebuild
 1710160551 ./sci-chemistry/openbabel-perl/openbabel-perl-2.4.1.ebuild
-2009071209 ./sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild
 2009071209 ./sci-chemistry/openbabel/openbabel-2.4.1.ebuild
+2012020639 ./sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild
 1702282250 ./sci-chemistry/pdbcat/pdbcat-1.3.ebuild
 2009162339 ./sci-chemistry/pdbcns/pdbcns-2.0.010504.ebuild
 1702282250 ./sci-chemistry/pdbmat/pdbmat-3.89.ebuild
@@ -24114,6 +24071,7 @@
 1808262139 ./sci-chemistry/xds-bin/xds-bin-20170930.ebuild
 1912310209 ./sci-chemistry/xyza2pipe/xyza2pipe-20121001.ebuild
 2003111909 ./sci-chemistry/gnome-chemistry-utils/gnome-chemistry-utils-0.14.17.ebuild
+2012021539 ./sci-chemistry/modeller/modeller-9.25.ebuild
 1702282250 ./sci-electronics/Stage/Stage-4.1.1.ebuild
 1705021323 ./sci-electronics/Stage/Stage-4.3.0.ebuild
 1705021323 ./sci-electronics/Stage/Stage-9999.ebuild
@@ -24466,12 +24424,10 @@
 1808261409 ./sci-libs/itpp/itpp-4.3.1-r1.ebuild
 1805170209 ./sci-libs/jama/jama-1.2.5.ebuild
 2001161009 ./sci-libs/keras-applications/keras-applications-1.0.7.ebuild
-2002221109 ./sci-libs/keras-applications/keras-applications-1.0.8.ebuild
-2009251509 ./sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild
+2012022009 ./sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild
 2009181339 ./sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild
-2009181339 ./sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild
-2009251509 ./sci-libs/keras-preprocessing/keras-preprocessing-1.1.0-r1.ebuild
 2011050809 ./sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild
+2012022009 ./sci-libs/keras-preprocessing/keras-preprocessing-1.1.0-r1.ebuild
 2007051809 ./sci-libs/kim-api/kim-api-2.1.3-r1.ebuild
 2007191909 ./sci-libs/klu/klu-1.3.9.ebuild
 2011151809 ./sci-libs/lapack/lapack-3.8.0-r1.ebuild
@@ -24547,7 +24503,7 @@
 2003160309 ./sci-libs/matio/matio-1.5.17.ebuild
 1702282250 ./sci-libs/mc/mc-1.5.ebuild
 2001051415 ./sci-libs/med/med-4.0.0-r2.ebuild
-2002231739 ./sci-libs/med/med-4.0.0-r1.ebuild
+2012011109 ./sci-libs/med/med-4.1.0.ebuild
 2004241209 ./sci-libs/metis/metis-4.0.3-r2.ebuild
 2007211309 ./sci-libs/metis/metis-4.0.3-r1.ebuild
 2011072109 ./sci-libs/metis/metis-5.1.0-r4.ebuild
@@ -24802,7 +24758,7 @@
 2009192209 ./sci-mathematics/num-utils/num-utils-0.5-r2.ebuild
 2009192209 ./sci-mathematics/octave-epstk/octave-epstk-2.4.ebuild
 2011072109 ./sci-mathematics/octave/octave-5.2.0.ebuild
-2012010809 ./sci-mathematics/octave/octave-6.1.0.ebuild
+2012011939 ./sci-mathematics/octave/octave-6.1.0-r1.ebuild
 2011010339 ./sci-mathematics/otter/otter-3.3-r3.ebuild
 2002241609 ./sci-mathematics/pari-data/pari-data-20191216.ebuild
 2007231009 ./sci-mathematics/pari/pari-2.11.4.ebuild
@@ -24864,10 +24820,10 @@
 1908291909 ./sci-misc/ViSP-images/ViSP-images-3.2.0.ebuild
 2005151939 ./sci-misc/ViSP-images/ViSP-images-3.3.0.ebuild
 1702282250 ./sci-misc/apertium/apertium-3.2.0.ebuild
-1812070039 ./sci-misc/boinc/boinc-7.14.2.ebuild
 1804250109 ./sci-misc/boinc/boinc-7.8.6.ebuild
 1804250109 ./sci-misc/boinc/boinc-7.9.3.ebuild
 1812070039 ./sci-misc/boinc/boinc-9999.ebuild
+2012030239 ./sci-misc/boinc/boinc-7.14.2.ebuild
 1910012239 ./sci-misc/cdfplayer/cdfplayer-11.2.0.ebuild
 1910012239 ./sci-misc/cdfplayer/cdfplayer-11.3.0.ebuild
 2002112051 ./sci-misc/fitscut/fitscut-1.4.4.ebuild
@@ -24911,7 +24867,7 @@
 2006031109 ./sci-physics/geant/geant-4.10.6-r1.ebuild
 2006031109 ./sci-physics/geant/geant-4.10.6_p1-r1.ebuild
 2006031109 ./sci-physics/geant/geant-4.10.6_p2.ebuild
-2011181909 ./sci-physics/geant/geant-4.10.6.3.ebuild
+2012011309 ./sci-physics/geant/geant-4.10.6.3.ebuild
 2007241439 ./sci-physics/hepmc/hepmc-2.06.09-r1.ebuild
 2002112051 ./sci-physics/heppdt/heppdt-3.04.01-r1.ebuild
 1904170109 ./sci-physics/herwig++/herwig++-2.7.1-r1.ebuild
@@ -25013,1290 +24969,1290 @@
 2002151740 ./sec-policy/selinux-abrt/selinux-abrt-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-abrt/selinux-abrt-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-abrt/selinux-abrt-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-abrt/selinux-abrt-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-abrt/selinux-abrt-9999.ebuild
+2012030639 ./sec-policy/selinux-abrt/selinux-abrt-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-accountsd/selinux-accountsd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-accountsd/selinux-accountsd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-accountsd/selinux-accountsd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-accountsd/selinux-accountsd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-accountsd/selinux-accountsd-9999.ebuild
+2012030639 ./sec-policy/selinux-accountsd/selinux-accountsd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-acct/selinux-acct-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-acct/selinux-acct-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-acct/selinux-acct-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-acct/selinux-acct-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-acct/selinux-acct-9999.ebuild
+2012030639 ./sec-policy/selinux-acct/selinux-acct-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-ada/selinux-ada-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-ada/selinux-ada-2.20190609-r1.ebuild
 2002151740 ./sec-policy/selinux-afs/selinux-afs-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-afs/selinux-afs-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-afs/selinux-afs-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-afs/selinux-afs-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-afs/selinux-afs-9999.ebuild
+2012030639 ./sec-policy/selinux-afs/selinux-afs-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-aide/selinux-aide-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-aide/selinux-aide-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-aide/selinux-aide-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-aide/selinux-aide-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-aide/selinux-aide-9999.ebuild
+2012030639 ./sec-policy/selinux-aide/selinux-aide-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-alsa/selinux-alsa-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-alsa/selinux-alsa-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-alsa/selinux-alsa-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-alsa/selinux-alsa-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-alsa/selinux-alsa-9999.ebuild
+2012030639 ./sec-policy/selinux-alsa/selinux-alsa-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-amanda/selinux-amanda-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-amanda/selinux-amanda-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-amanda/selinux-amanda-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-amanda/selinux-amanda-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-amanda/selinux-amanda-9999.ebuild
+2012030639 ./sec-policy/selinux-amanda/selinux-amanda-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-amavis/selinux-amavis-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-amavis/selinux-amavis-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-amavis/selinux-amavis-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-amavis/selinux-amavis-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-amavis/selinux-amavis-9999.ebuild
+2012030639 ./sec-policy/selinux-amavis/selinux-amavis-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-android/selinux-android-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-android/selinux-android-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-android/selinux-android-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-android/selinux-android-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-android/selinux-android-9999.ebuild
+2012030639 ./sec-policy/selinux-android/selinux-android-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-apache/selinux-apache-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-apache/selinux-apache-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-apache/selinux-apache-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-apache/selinux-apache-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-apache/selinux-apache-9999.ebuild
+2012030639 ./sec-policy/selinux-apache/selinux-apache-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-apcupsd/selinux-apcupsd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-apcupsd/selinux-apcupsd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-apcupsd/selinux-apcupsd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-apcupsd/selinux-apcupsd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
+2012030639 ./sec-policy/selinux-apcupsd/selinux-apcupsd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-apm/selinux-apm-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-apm/selinux-apm-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-apm/selinux-apm-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-apm/selinux-apm-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-apm/selinux-apm-9999.ebuild
+2012030639 ./sec-policy/selinux-apm/selinux-apm-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-arpwatch/selinux-arpwatch-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-arpwatch/selinux-arpwatch-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-arpwatch/selinux-arpwatch-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-arpwatch/selinux-arpwatch-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-arpwatch/selinux-arpwatch-9999.ebuild
+2012030639 ./sec-policy/selinux-arpwatch/selinux-arpwatch-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-asterisk/selinux-asterisk-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-asterisk/selinux-asterisk-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-asterisk/selinux-asterisk-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-asterisk/selinux-asterisk-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-asterisk/selinux-asterisk-9999.ebuild
+2012030639 ./sec-policy/selinux-asterisk/selinux-asterisk-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-at/selinux-at-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-at/selinux-at-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-at/selinux-at-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-at/selinux-at-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-at/selinux-at-9999.ebuild
+2012030639 ./sec-policy/selinux-at/selinux-at-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-automount/selinux-automount-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-automount/selinux-automount-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-automount/selinux-automount-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-automount/selinux-automount-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-automount/selinux-automount-9999.ebuild
+2012030639 ./sec-policy/selinux-automount/selinux-automount-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-avahi/selinux-avahi-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-avahi/selinux-avahi-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-avahi/selinux-avahi-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-avahi/selinux-avahi-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-avahi/selinux-avahi-9999.ebuild
+2012030639 ./sec-policy/selinux-avahi/selinux-avahi-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-awstats/selinux-awstats-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-awstats/selinux-awstats-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-awstats/selinux-awstats-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-awstats/selinux-awstats-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-awstats/selinux-awstats-9999.ebuild
+2012030639 ./sec-policy/selinux-awstats/selinux-awstats-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-backup/selinux-backup-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-backup/selinux-backup-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-backup/selinux-backup-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-backup/selinux-backup-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-backup/selinux-backup-9999.ebuild
+2012030639 ./sec-policy/selinux-backup/selinux-backup-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-bacula/selinux-bacula-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-bacula/selinux-bacula-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-bacula/selinux-bacula-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-bacula/selinux-bacula-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-bacula/selinux-bacula-9999.ebuild
+2012030639 ./sec-policy/selinux-bacula/selinux-bacula-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-base-policy/selinux-base-policy-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-base-policy/selinux-base-policy-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+2012030639 ./sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild
 2011030839 ./sec-policy/selinux-base/selinux-base-2.20190201-r1.ebuild
 2011030839 ./sec-policy/selinux-base/selinux-base-2.20190609-r1.ebuild
 2011030839 ./sec-policy/selinux-base/selinux-base-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-base/selinux-base-9999.ebuild
+2012030639 ./sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-bind/selinux-bind-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-bind/selinux-bind-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-bind/selinux-bind-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-bind/selinux-bind-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-bind/selinux-bind-9999.ebuild
+2012030639 ./sec-policy/selinux-bind/selinux-bind-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-bitcoin/selinux-bitcoin-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-bitcoin/selinux-bitcoin-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-bitcoin/selinux-bitcoin-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-bitcoin/selinux-bitcoin-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-bitcoin/selinux-bitcoin-9999.ebuild
+2012030639 ./sec-policy/selinux-bitcoin/selinux-bitcoin-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-bitlbee/selinux-bitlbee-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-bitlbee/selinux-bitlbee-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-bitlbee/selinux-bitlbee-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-bitlbee/selinux-bitlbee-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-bitlbee/selinux-bitlbee-9999.ebuild
+2012030639 ./sec-policy/selinux-bitlbee/selinux-bitlbee-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-bluetooth/selinux-bluetooth-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-bluetooth/selinux-bluetooth-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-bluetooth/selinux-bluetooth-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-bluetooth/selinux-bluetooth-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-bluetooth/selinux-bluetooth-9999.ebuild
+2012030639 ./sec-policy/selinux-bluetooth/selinux-bluetooth-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-brctl/selinux-brctl-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-brctl/selinux-brctl-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-brctl/selinux-brctl-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-brctl/selinux-brctl-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-brctl/selinux-brctl-9999.ebuild
+2012030639 ./sec-policy/selinux-brctl/selinux-brctl-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-cachefilesd/selinux-cachefilesd-9999.ebuild
+2012030639 ./sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-calamaris/selinux-calamaris-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-calamaris/selinux-calamaris-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-calamaris/selinux-calamaris-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-calamaris/selinux-calamaris-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-calamaris/selinux-calamaris-9999.ebuild
+2012030639 ./sec-policy/selinux-calamaris/selinux-calamaris-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-canna/selinux-canna-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-canna/selinux-canna-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-canna/selinux-canna-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-canna/selinux-canna-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-canna/selinux-canna-9999.ebuild
+2012030639 ./sec-policy/selinux-canna/selinux-canna-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-ccs/selinux-ccs-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-ccs/selinux-ccs-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-ccs/selinux-ccs-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-ccs/selinux-ccs-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-ccs/selinux-ccs-9999.ebuild
+2012030639 ./sec-policy/selinux-ccs/selinux-ccs-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-cdrecord/selinux-cdrecord-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-cdrecord/selinux-cdrecord-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-cdrecord/selinux-cdrecord-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-cdrecord/selinux-cdrecord-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-cdrecord/selinux-cdrecord-9999.ebuild
+2012030639 ./sec-policy/selinux-cdrecord/selinux-cdrecord-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-ceph/selinux-ceph-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-ceph/selinux-ceph-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-ceph/selinux-ceph-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-ceph/selinux-ceph-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-ceph/selinux-ceph-9999.ebuild
+2012030639 ./sec-policy/selinux-ceph/selinux-ceph-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-cgmanager/selinux-cgmanager-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-cgmanager/selinux-cgmanager-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-cgmanager/selinux-cgmanager-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-cgmanager/selinux-cgmanager-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild
+2012030639 ./sec-policy/selinux-cgmanager/selinux-cgmanager-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-cgroup/selinux-cgroup-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-cgroup/selinux-cgroup-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-cgroup/selinux-cgroup-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-cgroup/selinux-cgroup-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-cgroup/selinux-cgroup-9999.ebuild
+2012030639 ./sec-policy/selinux-cgroup/selinux-cgroup-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-chromium/selinux-chromium-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-chromium/selinux-chromium-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-chromium/selinux-chromium-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-chromium/selinux-chromium-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-chromium/selinux-chromium-9999.ebuild
+2012030639 ./sec-policy/selinux-chromium/selinux-chromium-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-chronyd/selinux-chronyd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-chronyd/selinux-chronyd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-chronyd/selinux-chronyd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-chronyd/selinux-chronyd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-chronyd/selinux-chronyd-9999.ebuild
+2012030639 ./sec-policy/selinux-chronyd/selinux-chronyd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-clamav/selinux-clamav-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-clamav/selinux-clamav-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-clamav/selinux-clamav-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-clamav/selinux-clamav-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-clamav/selinux-clamav-9999.ebuild
+2012030639 ./sec-policy/selinux-clamav/selinux-clamav-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-clockspeed/selinux-clockspeed-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-clockspeed/selinux-clockspeed-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-clockspeed/selinux-clockspeed-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-clockspeed/selinux-clockspeed-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-clockspeed/selinux-clockspeed-9999.ebuild
+2012030639 ./sec-policy/selinux-clockspeed/selinux-clockspeed-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-collectd/selinux-collectd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-collectd/selinux-collectd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-collectd/selinux-collectd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-collectd/selinux-collectd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-collectd/selinux-collectd-9999.ebuild
+2012030639 ./sec-policy/selinux-collectd/selinux-collectd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-corosync/selinux-corosync-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-corosync/selinux-corosync-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-corosync/selinux-corosync-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-corosync/selinux-corosync-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-corosync/selinux-corosync-9999.ebuild
+2012030639 ./sec-policy/selinux-corosync/selinux-corosync-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-couchdb/selinux-couchdb-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-couchdb/selinux-couchdb-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-couchdb/selinux-couchdb-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-couchdb/selinux-couchdb-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-couchdb/selinux-couchdb-9999.ebuild
+2012030639 ./sec-policy/selinux-couchdb/selinux-couchdb-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-courier/selinux-courier-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-courier/selinux-courier-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-courier/selinux-courier-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-courier/selinux-courier-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-courier/selinux-courier-9999.ebuild
+2012030639 ./sec-policy/selinux-courier/selinux-courier-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-cpucontrol/selinux-cpucontrol-9999.ebuild
+2012030639 ./sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-9999.ebuild
+2012030639 ./sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-cups/selinux-cups-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-cups/selinux-cups-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-cups/selinux-cups-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-cups/selinux-cups-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-cups/selinux-cups-9999.ebuild
+2012030639 ./sec-policy/selinux-cups/selinux-cups-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-cvs/selinux-cvs-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-cvs/selinux-cvs-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-cvs/selinux-cvs-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-cvs/selinux-cvs-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-cvs/selinux-cvs-9999.ebuild
+2012030639 ./sec-policy/selinux-cvs/selinux-cvs-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-cyphesis/selinux-cyphesis-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-cyphesis/selinux-cyphesis-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-cyphesis/selinux-cyphesis-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-cyphesis/selinux-cyphesis-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-cyphesis/selinux-cyphesis-9999.ebuild
+2012030639 ./sec-policy/selinux-cyphesis/selinux-cyphesis-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-daemontools/selinux-daemontools-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-daemontools/selinux-daemontools-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-daemontools/selinux-daemontools-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-daemontools/selinux-daemontools-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-daemontools/selinux-daemontools-9999.ebuild
+2012030639 ./sec-policy/selinux-daemontools/selinux-daemontools-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-dante/selinux-dante-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-dante/selinux-dante-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-dante/selinux-dante-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-dante/selinux-dante-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-dante/selinux-dante-9999.ebuild
+2012030639 ./sec-policy/selinux-dante/selinux-dante-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-dbadm/selinux-dbadm-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-dbadm/selinux-dbadm-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-dbadm/selinux-dbadm-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-dbadm/selinux-dbadm-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-dbadm/selinux-dbadm-9999.ebuild
+2012030639 ./sec-policy/selinux-dbadm/selinux-dbadm-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-dbskk/selinux-dbskk-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-dbskk/selinux-dbskk-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-dbskk/selinux-dbskk-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-dbskk/selinux-dbskk-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-dbskk/selinux-dbskk-9999.ebuild
+2012030639 ./sec-policy/selinux-dbskk/selinux-dbskk-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-dbus/selinux-dbus-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-dbus/selinux-dbus-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-dbus/selinux-dbus-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-dbus/selinux-dbus-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-dbus/selinux-dbus-9999.ebuild
+2012030639 ./sec-policy/selinux-dbus/selinux-dbus-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-dcc/selinux-dcc-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-dcc/selinux-dcc-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-dcc/selinux-dcc-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-dcc/selinux-dcc-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-dcc/selinux-dcc-9999.ebuild
+2012030639 ./sec-policy/selinux-dcc/selinux-dcc-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-ddclient/selinux-ddclient-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-ddclient/selinux-ddclient-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-ddclient/selinux-ddclient-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-ddclient/selinux-ddclient-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-ddclient/selinux-ddclient-9999.ebuild
+2012030639 ./sec-policy/selinux-ddclient/selinux-ddclient-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-ddcprobe/selinux-ddcprobe-9999.ebuild
+2012030639 ./sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-denyhosts/selinux-denyhosts-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-denyhosts/selinux-denyhosts-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-denyhosts/selinux-denyhosts-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-denyhosts/selinux-denyhosts-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-denyhosts/selinux-denyhosts-9999.ebuild
+2012030639 ./sec-policy/selinux-denyhosts/selinux-denyhosts-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-devicekit/selinux-devicekit-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-devicekit/selinux-devicekit-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-devicekit/selinux-devicekit-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-devicekit/selinux-devicekit-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-devicekit/selinux-devicekit-9999.ebuild
+2012030639 ./sec-policy/selinux-devicekit/selinux-devicekit-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-dhcp/selinux-dhcp-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-dhcp/selinux-dhcp-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-dhcp/selinux-dhcp-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-dhcp/selinux-dhcp-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-dhcp/selinux-dhcp-9999.ebuild
+2012030639 ./sec-policy/selinux-dhcp/selinux-dhcp-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-dictd/selinux-dictd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-dictd/selinux-dictd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-dictd/selinux-dictd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-dictd/selinux-dictd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-dictd/selinux-dictd-9999.ebuild
+2012030639 ./sec-policy/selinux-dictd/selinux-dictd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-dirmngr/selinux-dirmngr-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-dirmngr/selinux-dirmngr-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-dirmngr/selinux-dirmngr-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-dirmngr/selinux-dirmngr-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-dirmngr/selinux-dirmngr-9999.ebuild
+2012030639 ./sec-policy/selinux-dirmngr/selinux-dirmngr-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-dirsrv/selinux-dirsrv-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-dirsrv/selinux-dirsrv-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-dirsrv/selinux-dirsrv-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-dirsrv/selinux-dirsrv-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild
+2012030639 ./sec-policy/selinux-dirsrv/selinux-dirsrv-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-distcc/selinux-distcc-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-distcc/selinux-distcc-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-distcc/selinux-distcc-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-distcc/selinux-distcc-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-distcc/selinux-distcc-9999.ebuild
+2012030639 ./sec-policy/selinux-distcc/selinux-distcc-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-djbdns/selinux-djbdns-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-djbdns/selinux-djbdns-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-djbdns/selinux-djbdns-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-djbdns/selinux-djbdns-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-djbdns/selinux-djbdns-9999.ebuild
+2012030639 ./sec-policy/selinux-djbdns/selinux-djbdns-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-dkim/selinux-dkim-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-dkim/selinux-dkim-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-dkim/selinux-dkim-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-dkim/selinux-dkim-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-dkim/selinux-dkim-9999.ebuild
+2012030639 ./sec-policy/selinux-dkim/selinux-dkim-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-dmidecode/selinux-dmidecode-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-dmidecode/selinux-dmidecode-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-dmidecode/selinux-dmidecode-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-dmidecode/selinux-dmidecode-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-dmidecode/selinux-dmidecode-9999.ebuild
+2012030639 ./sec-policy/selinux-dmidecode/selinux-dmidecode-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-dnsmasq/selinux-dnsmasq-9999.ebuild
+2012030639 ./sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-dovecot/selinux-dovecot-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-dovecot/selinux-dovecot-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-dovecot/selinux-dovecot-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-dovecot/selinux-dovecot-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-dovecot/selinux-dovecot-9999.ebuild
+2012030639 ./sec-policy/selinux-dovecot/selinux-dovecot-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-dpkg/selinux-dpkg-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-dpkg/selinux-dpkg-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-dpkg/selinux-dpkg-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-dpkg/selinux-dpkg-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-dpkg/selinux-dpkg-9999.ebuild
+2012030639 ./sec-policy/selinux-dpkg/selinux-dpkg-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-dracut/selinux-dracut-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-dracut/selinux-dracut-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-dracut/selinux-dracut-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-dracut/selinux-dracut-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-dracut/selinux-dracut-9999.ebuild
+2012030639 ./sec-policy/selinux-dracut/selinux-dracut-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-dropbox/selinux-dropbox-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-dropbox/selinux-dropbox-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-dropbox/selinux-dropbox-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-dropbox/selinux-dropbox-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-dropbox/selinux-dropbox-9999.ebuild
+2012030639 ./sec-policy/selinux-dropbox/selinux-dropbox-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-entropyd/selinux-entropyd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-entropyd/selinux-entropyd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-entropyd/selinux-entropyd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-entropyd/selinux-entropyd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-entropyd/selinux-entropyd-9999.ebuild
+2012030639 ./sec-policy/selinux-entropyd/selinux-entropyd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-evolution/selinux-evolution-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-evolution/selinux-evolution-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-evolution/selinux-evolution-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-evolution/selinux-evolution-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-evolution/selinux-evolution-9999.ebuild
+2012030639 ./sec-policy/selinux-evolution/selinux-evolution-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-exim/selinux-exim-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-exim/selinux-exim-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-exim/selinux-exim-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-exim/selinux-exim-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-exim/selinux-exim-9999.ebuild
+2012030639 ./sec-policy/selinux-exim/selinux-exim-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-fail2ban/selinux-fail2ban-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-fail2ban/selinux-fail2ban-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-fail2ban/selinux-fail2ban-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-fail2ban/selinux-fail2ban-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-fail2ban/selinux-fail2ban-9999.ebuild
+2012030639 ./sec-policy/selinux-fail2ban/selinux-fail2ban-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-fetchmail/selinux-fetchmail-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-fetchmail/selinux-fetchmail-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-fetchmail/selinux-fetchmail-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-fetchmail/selinux-fetchmail-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-fetchmail/selinux-fetchmail-9999.ebuild
+2012030639 ./sec-policy/selinux-fetchmail/selinux-fetchmail-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-finger/selinux-finger-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-finger/selinux-finger-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-finger/selinux-finger-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-finger/selinux-finger-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-finger/selinux-finger-9999.ebuild
+2012030639 ./sec-policy/selinux-finger/selinux-finger-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-flash/selinux-flash-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-flash/selinux-flash-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-flash/selinux-flash-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-flash/selinux-flash-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-flash/selinux-flash-9999.ebuild
+2012030639 ./sec-policy/selinux-flash/selinux-flash-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-fprintd/selinux-fprintd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-fprintd/selinux-fprintd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-fprintd/selinux-fprintd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-fprintd/selinux-fprintd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-fprintd/selinux-fprintd-9999.ebuild
+2012030639 ./sec-policy/selinux-fprintd/selinux-fprintd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-ftp/selinux-ftp-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-ftp/selinux-ftp-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-ftp/selinux-ftp-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-ftp/selinux-ftp-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-ftp/selinux-ftp-9999.ebuild
+2012030639 ./sec-policy/selinux-ftp/selinux-ftp-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-games/selinux-games-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-games/selinux-games-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-games/selinux-games-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-games/selinux-games-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-games/selinux-games-9999.ebuild
+2012030639 ./sec-policy/selinux-games/selinux-games-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-gatekeeper/selinux-gatekeeper-9999.ebuild
+2012030639 ./sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-git/selinux-git-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-git/selinux-git-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-git/selinux-git-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-git/selinux-git-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-git/selinux-git-9999.ebuild
+2012030639 ./sec-policy/selinux-git/selinux-git-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-gitosis/selinux-gitosis-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-gitosis/selinux-gitosis-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-gitosis/selinux-gitosis-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-gitosis/selinux-gitosis-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-gitosis/selinux-gitosis-9999.ebuild
+2012030639 ./sec-policy/selinux-gitosis/selinux-gitosis-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-gnome/selinux-gnome-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-gnome/selinux-gnome-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-gnome/selinux-gnome-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-gnome/selinux-gnome-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-gnome/selinux-gnome-9999.ebuild
+2012030639 ./sec-policy/selinux-gnome/selinux-gnome-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-googletalk/selinux-googletalk-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-googletalk/selinux-googletalk-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-googletalk/selinux-googletalk-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-googletalk/selinux-googletalk-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-googletalk/selinux-googletalk-9999.ebuild
+2012030639 ./sec-policy/selinux-googletalk/selinux-googletalk-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-gorg/selinux-gorg-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-gorg/selinux-gorg-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-gorg/selinux-gorg-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-gorg/selinux-gorg-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-gorg/selinux-gorg-9999.ebuild
+2012030639 ./sec-policy/selinux-gorg/selinux-gorg-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-gpg/selinux-gpg-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-gpg/selinux-gpg-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-gpg/selinux-gpg-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-gpg/selinux-gpg-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-gpg/selinux-gpg-9999.ebuild
+2012030639 ./sec-policy/selinux-gpg/selinux-gpg-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-gpm/selinux-gpm-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-gpm/selinux-gpm-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-gpm/selinux-gpm-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-gpm/selinux-gpm-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-gpm/selinux-gpm-9999.ebuild
+2012030639 ./sec-policy/selinux-gpm/selinux-gpm-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-gpsd/selinux-gpsd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-gpsd/selinux-gpsd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-gpsd/selinux-gpsd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-gpsd/selinux-gpsd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-gpsd/selinux-gpsd-9999.ebuild
+2012030639 ./sec-policy/selinux-gpsd/selinux-gpsd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-gssproxy/selinux-gssproxy-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-gssproxy/selinux-gssproxy-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-gssproxy/selinux-gssproxy-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-gssproxy/selinux-gssproxy-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-gssproxy/selinux-gssproxy-9999.ebuild
+2012030639 ./sec-policy/selinux-gssproxy/selinux-gssproxy-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-hddtemp/selinux-hddtemp-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-hddtemp/selinux-hddtemp-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-hddtemp/selinux-hddtemp-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-hddtemp/selinux-hddtemp-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-hddtemp/selinux-hddtemp-9999.ebuild
+2012030639 ./sec-policy/selinux-hddtemp/selinux-hddtemp-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-howl/selinux-howl-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-howl/selinux-howl-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-howl/selinux-howl-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-howl/selinux-howl-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-howl/selinux-howl-9999.ebuild
+2012030639 ./sec-policy/selinux-howl/selinux-howl-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-icecast/selinux-icecast-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-icecast/selinux-icecast-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-icecast/selinux-icecast-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-icecast/selinux-icecast-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-icecast/selinux-icecast-9999.ebuild
+2012030639 ./sec-policy/selinux-icecast/selinux-icecast-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-ifplugd/selinux-ifplugd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-ifplugd/selinux-ifplugd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-ifplugd/selinux-ifplugd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-ifplugd/selinux-ifplugd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-ifplugd/selinux-ifplugd-9999.ebuild
+2012030639 ./sec-policy/selinux-ifplugd/selinux-ifplugd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-imaze/selinux-imaze-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-imaze/selinux-imaze-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-imaze/selinux-imaze-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-imaze/selinux-imaze-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-imaze/selinux-imaze-9999.ebuild
+2012030639 ./sec-policy/selinux-imaze/selinux-imaze-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-inetd/selinux-inetd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-inetd/selinux-inetd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-inetd/selinux-inetd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-inetd/selinux-inetd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-inetd/selinux-inetd-9999.ebuild
+2012030639 ./sec-policy/selinux-inetd/selinux-inetd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-inn/selinux-inn-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-inn/selinux-inn-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-inn/selinux-inn-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-inn/selinux-inn-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-inn/selinux-inn-9999.ebuild
+2012030639 ./sec-policy/selinux-inn/selinux-inn-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-ipsec/selinux-ipsec-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-ipsec/selinux-ipsec-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-ipsec/selinux-ipsec-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-ipsec/selinux-ipsec-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-ipsec/selinux-ipsec-9999.ebuild
+2012030639 ./sec-policy/selinux-ipsec/selinux-ipsec-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-irc/selinux-irc-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-irc/selinux-irc-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-irc/selinux-irc-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-irc/selinux-irc-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-irc/selinux-irc-9999.ebuild
+2012030639 ./sec-policy/selinux-irc/selinux-irc-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-ircd/selinux-ircd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-ircd/selinux-ircd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-ircd/selinux-ircd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-ircd/selinux-ircd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-ircd/selinux-ircd-9999.ebuild
+2012030639 ./sec-policy/selinux-ircd/selinux-ircd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-irqbalance/selinux-irqbalance-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-irqbalance/selinux-irqbalance-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-irqbalance/selinux-irqbalance-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-irqbalance/selinux-irqbalance-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-irqbalance/selinux-irqbalance-9999.ebuild
+2012030639 ./sec-policy/selinux-irqbalance/selinux-irqbalance-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-jabber/selinux-jabber-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-jabber/selinux-jabber-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-jabber/selinux-jabber-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-jabber/selinux-jabber-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-jabber/selinux-jabber-9999.ebuild
+2012030639 ./sec-policy/selinux-jabber/selinux-jabber-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-java/selinux-java-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-java/selinux-java-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-java/selinux-java-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-java/selinux-java-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-java/selinux-java-9999.ebuild
+2012030639 ./sec-policy/selinux-java/selinux-java-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-kdeconnect/selinux-kdeconnect-9999.ebuild
+2012030639 ./sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-kdump/selinux-kdump-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-kdump/selinux-kdump-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-kdump/selinux-kdump-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-kdump/selinux-kdump-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-kdump/selinux-kdump-9999.ebuild
+2012030639 ./sec-policy/selinux-kdump/selinux-kdump-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-kerberos/selinux-kerberos-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-kerberos/selinux-kerberos-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-kerberos/selinux-kerberos-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-kerberos/selinux-kerberos-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-kerberos/selinux-kerberos-9999.ebuild
+2012030639 ./sec-policy/selinux-kerberos/selinux-kerberos-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-kerneloops/selinux-kerneloops-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-kerneloops/selinux-kerneloops-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-kerneloops/selinux-kerneloops-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-kerneloops/selinux-kerneloops-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-kerneloops/selinux-kerneloops-9999.ebuild
+2012030639 ./sec-policy/selinux-kerneloops/selinux-kerneloops-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-kismet/selinux-kismet-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-kismet/selinux-kismet-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-kismet/selinux-kismet-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-kismet/selinux-kismet-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-kismet/selinux-kismet-9999.ebuild
+2012030639 ./sec-policy/selinux-kismet/selinux-kismet-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-ksmtuned/selinux-ksmtuned-9999.ebuild
+2012030639 ./sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-kudzu/selinux-kudzu-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-kudzu/selinux-kudzu-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-kudzu/selinux-kudzu-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-kudzu/selinux-kudzu-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-kudzu/selinux-kudzu-9999.ebuild
+2012030639 ./sec-policy/selinux-kudzu/selinux-kudzu-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-ldap/selinux-ldap-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-ldap/selinux-ldap-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-ldap/selinux-ldap-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-ldap/selinux-ldap-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-ldap/selinux-ldap-9999.ebuild
+2012030639 ./sec-policy/selinux-ldap/selinux-ldap-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-links/selinux-links-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-links/selinux-links-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-links/selinux-links-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-links/selinux-links-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-links/selinux-links-9999.ebuild
+2012030639 ./sec-policy/selinux-links/selinux-links-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-lircd/selinux-lircd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-lircd/selinux-lircd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-lircd/selinux-lircd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-lircd/selinux-lircd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-lircd/selinux-lircd-9999.ebuild
+2012030639 ./sec-policy/selinux-lircd/selinux-lircd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-loadkeys/selinux-loadkeys-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-loadkeys/selinux-loadkeys-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-loadkeys/selinux-loadkeys-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-loadkeys/selinux-loadkeys-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-loadkeys/selinux-loadkeys-9999.ebuild
+2012030639 ./sec-policy/selinux-loadkeys/selinux-loadkeys-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-lockdev/selinux-lockdev-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-lockdev/selinux-lockdev-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-lockdev/selinux-lockdev-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-lockdev/selinux-lockdev-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-lockdev/selinux-lockdev-9999.ebuild
+2012030639 ./sec-policy/selinux-lockdev/selinux-lockdev-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-logrotate/selinux-logrotate-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-logrotate/selinux-logrotate-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-logrotate/selinux-logrotate-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-logrotate/selinux-logrotate-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-logrotate/selinux-logrotate-9999.ebuild
+2012030639 ./sec-policy/selinux-logrotate/selinux-logrotate-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-logsentry/selinux-logsentry-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-logsentry/selinux-logsentry-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-logsentry/selinux-logsentry-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-logsentry/selinux-logsentry-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-logsentry/selinux-logsentry-9999.ebuild
+2012030639 ./sec-policy/selinux-logsentry/selinux-logsentry-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-logwatch/selinux-logwatch-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-logwatch/selinux-logwatch-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-logwatch/selinux-logwatch-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-logwatch/selinux-logwatch-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-logwatch/selinux-logwatch-9999.ebuild
+2012030639 ./sec-policy/selinux-logwatch/selinux-logwatch-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-lpd/selinux-lpd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-lpd/selinux-lpd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-lpd/selinux-lpd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-lpd/selinux-lpd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-lpd/selinux-lpd-9999.ebuild
+2012030639 ./sec-policy/selinux-lpd/selinux-lpd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-mailman/selinux-mailman-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-mailman/selinux-mailman-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-mailman/selinux-mailman-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-mailman/selinux-mailman-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-mailman/selinux-mailman-9999.ebuild
+2012030639 ./sec-policy/selinux-mailman/selinux-mailman-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-makewhatis/selinux-makewhatis-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-makewhatis/selinux-makewhatis-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-makewhatis/selinux-makewhatis-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-makewhatis/selinux-makewhatis-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-makewhatis/selinux-makewhatis-9999.ebuild
+2012030639 ./sec-policy/selinux-makewhatis/selinux-makewhatis-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-mandb/selinux-mandb-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-mandb/selinux-mandb-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-mandb/selinux-mandb-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-mandb/selinux-mandb-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-mandb/selinux-mandb-9999.ebuild
+2012030639 ./sec-policy/selinux-mandb/selinux-mandb-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-mcelog/selinux-mcelog-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-mcelog/selinux-mcelog-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-mcelog/selinux-mcelog-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-mcelog/selinux-mcelog-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-mcelog/selinux-mcelog-9999.ebuild
+2012030639 ./sec-policy/selinux-mcelog/selinux-mcelog-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-memcached/selinux-memcached-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-memcached/selinux-memcached-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-memcached/selinux-memcached-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-memcached/selinux-memcached-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-memcached/selinux-memcached-9999.ebuild
+2012030639 ./sec-policy/selinux-memcached/selinux-memcached-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-milter/selinux-milter-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-milter/selinux-milter-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-milter/selinux-milter-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-milter/selinux-milter-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-milter/selinux-milter-9999.ebuild
+2012030639 ./sec-policy/selinux-milter/selinux-milter-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-modemmanager/selinux-modemmanager-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-modemmanager/selinux-modemmanager-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-modemmanager/selinux-modemmanager-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-modemmanager/selinux-modemmanager-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-modemmanager/selinux-modemmanager-9999.ebuild
+2012030639 ./sec-policy/selinux-modemmanager/selinux-modemmanager-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-mono/selinux-mono-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-mono/selinux-mono-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-mono/selinux-mono-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-mono/selinux-mono-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-mono/selinux-mono-9999.ebuild
+2012030639 ./sec-policy/selinux-mono/selinux-mono-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-mozilla/selinux-mozilla-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-mozilla/selinux-mozilla-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-mozilla/selinux-mozilla-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-mozilla/selinux-mozilla-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-mozilla/selinux-mozilla-9999.ebuild
+2012030639 ./sec-policy/selinux-mozilla/selinux-mozilla-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-mpd/selinux-mpd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-mpd/selinux-mpd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-mpd/selinux-mpd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-mpd/selinux-mpd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-mpd/selinux-mpd-9999.ebuild
+2012030639 ./sec-policy/selinux-mpd/selinux-mpd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-mplayer/selinux-mplayer-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-mplayer/selinux-mplayer-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-mplayer/selinux-mplayer-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-mplayer/selinux-mplayer-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-mplayer/selinux-mplayer-9999.ebuild
+2012030639 ./sec-policy/selinux-mplayer/selinux-mplayer-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-mrtg/selinux-mrtg-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-mrtg/selinux-mrtg-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-mrtg/selinux-mrtg-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-mrtg/selinux-mrtg-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-mrtg/selinux-mrtg-9999.ebuild
+2012030639 ./sec-policy/selinux-mrtg/selinux-mrtg-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-munin/selinux-munin-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-munin/selinux-munin-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-munin/selinux-munin-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-munin/selinux-munin-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-munin/selinux-munin-9999.ebuild
+2012030639 ./sec-policy/selinux-munin/selinux-munin-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-mutt/selinux-mutt-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-mutt/selinux-mutt-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-mutt/selinux-mutt-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-mutt/selinux-mutt-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-mutt/selinux-mutt-9999.ebuild
+2012030639 ./sec-policy/selinux-mutt/selinux-mutt-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-mysql/selinux-mysql-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-mysql/selinux-mysql-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-mysql/selinux-mysql-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-mysql/selinux-mysql-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-mysql/selinux-mysql-9999.ebuild
+2012030639 ./sec-policy/selinux-mysql/selinux-mysql-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-nagios/selinux-nagios-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-nagios/selinux-nagios-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-nagios/selinux-nagios-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-nagios/selinux-nagios-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-nagios/selinux-nagios-9999.ebuild
+2012030639 ./sec-policy/selinux-nagios/selinux-nagios-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-ncftool/selinux-ncftool-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-ncftool/selinux-ncftool-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-ncftool/selinux-ncftool-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-ncftool/selinux-ncftool-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-ncftool/selinux-ncftool-9999.ebuild
+2012030639 ./sec-policy/selinux-ncftool/selinux-ncftool-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-networkmanager/selinux-networkmanager-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-networkmanager/selinux-networkmanager-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-networkmanager/selinux-networkmanager-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-networkmanager/selinux-networkmanager-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-networkmanager/selinux-networkmanager-9999.ebuild
+2012030639 ./sec-policy/selinux-networkmanager/selinux-networkmanager-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-nginx/selinux-nginx-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-nginx/selinux-nginx-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-nginx/selinux-nginx-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-nginx/selinux-nginx-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-nginx/selinux-nginx-9999.ebuild
+2012030639 ./sec-policy/selinux-nginx/selinux-nginx-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-nslcd/selinux-nslcd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-nslcd/selinux-nslcd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-nslcd/selinux-nslcd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-nslcd/selinux-nslcd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-nslcd/selinux-nslcd-9999.ebuild
+2012030639 ./sec-policy/selinux-nslcd/selinux-nslcd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-ntop/selinux-ntop-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-ntop/selinux-ntop-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-ntop/selinux-ntop-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-ntop/selinux-ntop-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-ntop/selinux-ntop-9999.ebuild
+2012030639 ./sec-policy/selinux-ntop/selinux-ntop-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-ntp/selinux-ntp-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-ntp/selinux-ntp-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-ntp/selinux-ntp-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-ntp/selinux-ntp-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-ntp/selinux-ntp-9999.ebuild
+2012030639 ./sec-policy/selinux-ntp/selinux-ntp-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-nut/selinux-nut-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-nut/selinux-nut-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-nut/selinux-nut-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-nut/selinux-nut-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-nut/selinux-nut-9999.ebuild
+2012030639 ./sec-policy/selinux-nut/selinux-nut-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-nx/selinux-nx-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-nx/selinux-nx-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-nx/selinux-nx-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-nx/selinux-nx-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-nx/selinux-nx-9999.ebuild
+2012030639 ./sec-policy/selinux-nx/selinux-nx-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-oddjob/selinux-oddjob-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-oddjob/selinux-oddjob-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-oddjob/selinux-oddjob-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-oddjob/selinux-oddjob-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-oddjob/selinux-oddjob-9999.ebuild
+2012030639 ./sec-policy/selinux-oddjob/selinux-oddjob-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-oident/selinux-oident-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-oident/selinux-oident-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-oident/selinux-oident-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-oident/selinux-oident-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-oident/selinux-oident-9999.ebuild
+2012030639 ./sec-policy/selinux-oident/selinux-oident-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-openct/selinux-openct-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-openct/selinux-openct-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-openct/selinux-openct-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-openct/selinux-openct-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-openct/selinux-openct-9999.ebuild
+2012030639 ./sec-policy/selinux-openct/selinux-openct-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-openrc/selinux-openrc-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-openrc/selinux-openrc-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-openrc/selinux-openrc-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-openrc/selinux-openrc-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-openrc/selinux-openrc-9999.ebuild
+2012030639 ./sec-policy/selinux-openrc/selinux-openrc-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-openvpn/selinux-openvpn-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-openvpn/selinux-openvpn-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-openvpn/selinux-openvpn-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-openvpn/selinux-openvpn-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-openvpn/selinux-openvpn-9999.ebuild
+2012030639 ./sec-policy/selinux-openvpn/selinux-openvpn-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-pan/selinux-pan-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-pan/selinux-pan-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-pan/selinux-pan-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-pan/selinux-pan-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-pan/selinux-pan-9999.ebuild
+2012030639 ./sec-policy/selinux-pan/selinux-pan-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-pcmcia/selinux-pcmcia-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-pcmcia/selinux-pcmcia-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-pcmcia/selinux-pcmcia-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-pcmcia/selinux-pcmcia-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-pcmcia/selinux-pcmcia-9999.ebuild
+2012030639 ./sec-policy/selinux-pcmcia/selinux-pcmcia-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-pcscd/selinux-pcscd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-pcscd/selinux-pcscd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-pcscd/selinux-pcscd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-pcscd/selinux-pcscd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-pcscd/selinux-pcscd-9999.ebuild
+2012030639 ./sec-policy/selinux-pcscd/selinux-pcscd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-phpfpm/selinux-phpfpm-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-phpfpm/selinux-phpfpm-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-phpfpm/selinux-phpfpm-9999.ebuild
+2012030639 ./sec-policy/selinux-phpfpm/selinux-phpfpm-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-plymouthd/selinux-plymouthd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-plymouthd/selinux-plymouthd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-plymouthd/selinux-plymouthd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-plymouthd/selinux-plymouthd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-plymouthd/selinux-plymouthd-9999.ebuild
+2012030639 ./sec-policy/selinux-plymouthd/selinux-plymouthd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-podsleuth/selinux-podsleuth-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-podsleuth/selinux-podsleuth-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-podsleuth/selinux-podsleuth-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-podsleuth/selinux-podsleuth-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-podsleuth/selinux-podsleuth-9999.ebuild
+2012030639 ./sec-policy/selinux-podsleuth/selinux-podsleuth-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-policykit/selinux-policykit-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-policykit/selinux-policykit-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-policykit/selinux-policykit-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-policykit/selinux-policykit-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-policykit/selinux-policykit-9999.ebuild
+2012030639 ./sec-policy/selinux-policykit/selinux-policykit-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-portmap/selinux-portmap-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-portmap/selinux-portmap-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-portmap/selinux-portmap-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-portmap/selinux-portmap-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-portmap/selinux-portmap-9999.ebuild
+2012030639 ./sec-policy/selinux-portmap/selinux-portmap-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-postfix/selinux-postfix-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-postfix/selinux-postfix-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-postfix/selinux-postfix-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-postfix/selinux-postfix-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-postfix/selinux-postfix-9999.ebuild
+2012030639 ./sec-policy/selinux-postfix/selinux-postfix-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-postgresql/selinux-postgresql-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-postgresql/selinux-postgresql-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-postgresql/selinux-postgresql-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-postgresql/selinux-postgresql-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-postgresql/selinux-postgresql-9999.ebuild
+2012030639 ./sec-policy/selinux-postgresql/selinux-postgresql-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-postgrey/selinux-postgrey-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-postgrey/selinux-postgrey-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-postgrey/selinux-postgrey-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-postgrey/selinux-postgrey-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-postgrey/selinux-postgrey-9999.ebuild
+2012030639 ./sec-policy/selinux-postgrey/selinux-postgrey-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-ppp/selinux-ppp-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-ppp/selinux-ppp-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-ppp/selinux-ppp-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-ppp/selinux-ppp-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-ppp/selinux-ppp-9999.ebuild
+2012030639 ./sec-policy/selinux-ppp/selinux-ppp-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-prelink/selinux-prelink-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-prelink/selinux-prelink-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-prelink/selinux-prelink-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-prelink/selinux-prelink-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-prelink/selinux-prelink-9999.ebuild
+2012030639 ./sec-policy/selinux-prelink/selinux-prelink-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-prelude/selinux-prelude-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-prelude/selinux-prelude-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-prelude/selinux-prelude-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-prelude/selinux-prelude-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-prelude/selinux-prelude-9999.ebuild
+2012030639 ./sec-policy/selinux-prelude/selinux-prelude-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-privoxy/selinux-privoxy-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-privoxy/selinux-privoxy-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-privoxy/selinux-privoxy-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-privoxy/selinux-privoxy-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-privoxy/selinux-privoxy-9999.ebuild
+2012030639 ./sec-policy/selinux-privoxy/selinux-privoxy-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-procmail/selinux-procmail-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-procmail/selinux-procmail-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-procmail/selinux-procmail-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-procmail/selinux-procmail-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-procmail/selinux-procmail-9999.ebuild
+2012030639 ./sec-policy/selinux-procmail/selinux-procmail-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-psad/selinux-psad-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-psad/selinux-psad-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-psad/selinux-psad-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-psad/selinux-psad-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-psad/selinux-psad-9999.ebuild
+2012030639 ./sec-policy/selinux-psad/selinux-psad-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-publicfile/selinux-publicfile-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-publicfile/selinux-publicfile-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-publicfile/selinux-publicfile-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-publicfile/selinux-publicfile-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-publicfile/selinux-publicfile-9999.ebuild
+2012030639 ./sec-policy/selinux-publicfile/selinux-publicfile-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-pulseaudio/selinux-pulseaudio-9999.ebuild
+2012030639 ./sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-puppet/selinux-puppet-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-puppet/selinux-puppet-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-puppet/selinux-puppet-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-puppet/selinux-puppet-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-puppet/selinux-puppet-9999.ebuild
+2012030639 ./sec-policy/selinux-puppet/selinux-puppet-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-pyicqt/selinux-pyicqt-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-pyicqt/selinux-pyicqt-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-pyicqt/selinux-pyicqt-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-pyicqt/selinux-pyicqt-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-pyicqt/selinux-pyicqt-9999.ebuild
+2012030639 ./sec-policy/selinux-pyicqt/selinux-pyicqt-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-pyzor/selinux-pyzor-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-pyzor/selinux-pyzor-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-pyzor/selinux-pyzor-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-pyzor/selinux-pyzor-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-pyzor/selinux-pyzor-9999.ebuild
+2012030639 ./sec-policy/selinux-pyzor/selinux-pyzor-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-qemu/selinux-qemu-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-qemu/selinux-qemu-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-qemu/selinux-qemu-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-qemu/selinux-qemu-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-qemu/selinux-qemu-9999.ebuild
+2012030639 ./sec-policy/selinux-qemu/selinux-qemu-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-qmail/selinux-qmail-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-qmail/selinux-qmail-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-qmail/selinux-qmail-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-qmail/selinux-qmail-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-qmail/selinux-qmail-9999.ebuild
+2012030639 ./sec-policy/selinux-qmail/selinux-qmail-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-quota/selinux-quota-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-quota/selinux-quota-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-quota/selinux-quota-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-quota/selinux-quota-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-quota/selinux-quota-9999.ebuild
+2012030639 ./sec-policy/selinux-quota/selinux-quota-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-radius/selinux-radius-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-radius/selinux-radius-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-radius/selinux-radius-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-radius/selinux-radius-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-radius/selinux-radius-9999.ebuild
+2012030639 ./sec-policy/selinux-radius/selinux-radius-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-radvd/selinux-radvd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-radvd/selinux-radvd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-radvd/selinux-radvd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-radvd/selinux-radvd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-radvd/selinux-radvd-9999.ebuild
+2012030639 ./sec-policy/selinux-radvd/selinux-radvd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-razor/selinux-razor-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-razor/selinux-razor-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-razor/selinux-razor-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-razor/selinux-razor-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-razor/selinux-razor-9999.ebuild
+2012030639 ./sec-policy/selinux-razor/selinux-razor-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-redis/selinux-redis-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-redis/selinux-redis-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-redis/selinux-redis-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-redis/selinux-redis-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-redis/selinux-redis-9999.ebuild
+2012030639 ./sec-policy/selinux-redis/selinux-redis-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-remotelogin/selinux-remotelogin-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-remotelogin/selinux-remotelogin-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-remotelogin/selinux-remotelogin-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-remotelogin/selinux-remotelogin-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-remotelogin/selinux-remotelogin-9999.ebuild
+2012030639 ./sec-policy/selinux-remotelogin/selinux-remotelogin-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-resolvconf/selinux-resolvconf-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-resolvconf/selinux-resolvconf-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-resolvconf/selinux-resolvconf-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-resolvconf/selinux-resolvconf-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-resolvconf/selinux-resolvconf-9999.ebuild
+2012030639 ./sec-policy/selinux-resolvconf/selinux-resolvconf-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-rgmanager/selinux-rgmanager-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-rgmanager/selinux-rgmanager-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-rgmanager/selinux-rgmanager-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-rgmanager/selinux-rgmanager-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-rgmanager/selinux-rgmanager-9999.ebuild
+2012030639 ./sec-policy/selinux-rgmanager/selinux-rgmanager-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-rngd/selinux-rngd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-rngd/selinux-rngd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-rngd/selinux-rngd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-rngd/selinux-rngd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-rngd/selinux-rngd-9999.ebuild
+2012030639 ./sec-policy/selinux-rngd/selinux-rngd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-roundup/selinux-roundup-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-roundup/selinux-roundup-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-roundup/selinux-roundup-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-roundup/selinux-roundup-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-roundup/selinux-roundup-9999.ebuild
+2012030639 ./sec-policy/selinux-roundup/selinux-roundup-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-rpc/selinux-rpc-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-rpc/selinux-rpc-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-rpc/selinux-rpc-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-rpc/selinux-rpc-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-rpc/selinux-rpc-9999.ebuild
+2012030639 ./sec-policy/selinux-rpc/selinux-rpc-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-rpcbind/selinux-rpcbind-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-rpcbind/selinux-rpcbind-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-rpcbind/selinux-rpcbind-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-rpcbind/selinux-rpcbind-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-rpcbind/selinux-rpcbind-9999.ebuild
+2012030639 ./sec-policy/selinux-rpcbind/selinux-rpcbind-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-rpm/selinux-rpm-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-rpm/selinux-rpm-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-rpm/selinux-rpm-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-rpm/selinux-rpm-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-rpm/selinux-rpm-9999.ebuild
+2012030639 ./sec-policy/selinux-rpm/selinux-rpm-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-rssh/selinux-rssh-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-rssh/selinux-rssh-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-rssh/selinux-rssh-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-rssh/selinux-rssh-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-rssh/selinux-rssh-9999.ebuild
+2012030639 ./sec-policy/selinux-rssh/selinux-rssh-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-rtkit/selinux-rtkit-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-rtkit/selinux-rtkit-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-rtkit/selinux-rtkit-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-rtkit/selinux-rtkit-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-rtkit/selinux-rtkit-9999.ebuild
+2012030639 ./sec-policy/selinux-rtkit/selinux-rtkit-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-rtorrent/selinux-rtorrent-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-rtorrent/selinux-rtorrent-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-rtorrent/selinux-rtorrent-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-rtorrent/selinux-rtorrent-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-rtorrent/selinux-rtorrent-9999.ebuild
+2012030639 ./sec-policy/selinux-rtorrent/selinux-rtorrent-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-salt/selinux-salt-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-salt/selinux-salt-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-salt/selinux-salt-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-salt/selinux-salt-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-salt/selinux-salt-9999.ebuild
+2012030639 ./sec-policy/selinux-salt/selinux-salt-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-samba/selinux-samba-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-samba/selinux-samba-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-samba/selinux-samba-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-samba/selinux-samba-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-samba/selinux-samba-9999.ebuild
+2012030639 ./sec-policy/selinux-samba/selinux-samba-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-sasl/selinux-sasl-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-sasl/selinux-sasl-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-sasl/selinux-sasl-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-sasl/selinux-sasl-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-sasl/selinux-sasl-9999.ebuild
+2012030639 ./sec-policy/selinux-sasl/selinux-sasl-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-screen/selinux-screen-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-screen/selinux-screen-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-screen/selinux-screen-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-screen/selinux-screen-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-screen/selinux-screen-9999.ebuild
+2012030639 ./sec-policy/selinux-screen/selinux-screen-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-sendmail/selinux-sendmail-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-sendmail/selinux-sendmail-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-sendmail/selinux-sendmail-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-sendmail/selinux-sendmail-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-sendmail/selinux-sendmail-9999.ebuild
+2012030639 ./sec-policy/selinux-sendmail/selinux-sendmail-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-sensord/selinux-sensord-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-sensord/selinux-sensord-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-sensord/selinux-sensord-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-sensord/selinux-sensord-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-sensord/selinux-sensord-9999.ebuild
+2012030639 ./sec-policy/selinux-sensord/selinux-sensord-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-shorewall/selinux-shorewall-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-shorewall/selinux-shorewall-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-shorewall/selinux-shorewall-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-shorewall/selinux-shorewall-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-shorewall/selinux-shorewall-9999.ebuild
+2012030639 ./sec-policy/selinux-shorewall/selinux-shorewall-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-shutdown/selinux-shutdown-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-shutdown/selinux-shutdown-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-shutdown/selinux-shutdown-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-shutdown/selinux-shutdown-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-shutdown/selinux-shutdown-9999.ebuild
+2012030639 ./sec-policy/selinux-shutdown/selinux-shutdown-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-skype/selinux-skype-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-skype/selinux-skype-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-skype/selinux-skype-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-skype/selinux-skype-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-skype/selinux-skype-9999.ebuild
+2012030639 ./sec-policy/selinux-skype/selinux-skype-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-slocate/selinux-slocate-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-slocate/selinux-slocate-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-slocate/selinux-slocate-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-slocate/selinux-slocate-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-slocate/selinux-slocate-9999.ebuild
+2012030639 ./sec-policy/selinux-slocate/selinux-slocate-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-slrnpull/selinux-slrnpull-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-slrnpull/selinux-slrnpull-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-slrnpull/selinux-slrnpull-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-slrnpull/selinux-slrnpull-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-slrnpull/selinux-slrnpull-9999.ebuild
+2012030639 ./sec-policy/selinux-slrnpull/selinux-slrnpull-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-smartmon/selinux-smartmon-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-smartmon/selinux-smartmon-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-smartmon/selinux-smartmon-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-smartmon/selinux-smartmon-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-smartmon/selinux-smartmon-9999.ebuild
+2012030639 ./sec-policy/selinux-smartmon/selinux-smartmon-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-smokeping/selinux-smokeping-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-smokeping/selinux-smokeping-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-smokeping/selinux-smokeping-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-smokeping/selinux-smokeping-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-smokeping/selinux-smokeping-9999.ebuild
+2012030639 ./sec-policy/selinux-smokeping/selinux-smokeping-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-snmp/selinux-snmp-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-snmp/selinux-snmp-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-snmp/selinux-snmp-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-snmp/selinux-snmp-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-snmp/selinux-snmp-9999.ebuild
+2012030639 ./sec-policy/selinux-snmp/selinux-snmp-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-snort/selinux-snort-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-snort/selinux-snort-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-snort/selinux-snort-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-snort/selinux-snort-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-snort/selinux-snort-9999.ebuild
+2012030639 ./sec-policy/selinux-snort/selinux-snort-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-soundserver/selinux-soundserver-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-soundserver/selinux-soundserver-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-soundserver/selinux-soundserver-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-soundserver/selinux-soundserver-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-soundserver/selinux-soundserver-9999.ebuild
+2012030639 ./sec-policy/selinux-soundserver/selinux-soundserver-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-spamassassin/selinux-spamassassin-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-spamassassin/selinux-spamassassin-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-spamassassin/selinux-spamassassin-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-spamassassin/selinux-spamassassin-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-spamassassin/selinux-spamassassin-9999.ebuild
+2012030639 ./sec-policy/selinux-spamassassin/selinux-spamassassin-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-speedtouch/selinux-speedtouch-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-speedtouch/selinux-speedtouch-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-speedtouch/selinux-speedtouch-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-speedtouch/selinux-speedtouch-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-speedtouch/selinux-speedtouch-9999.ebuild
+2012030639 ./sec-policy/selinux-speedtouch/selinux-speedtouch-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-squid/selinux-squid-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-squid/selinux-squid-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-squid/selinux-squid-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-squid/selinux-squid-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-squid/selinux-squid-9999.ebuild
+2012030639 ./sec-policy/selinux-squid/selinux-squid-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-sssd/selinux-sssd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-sssd/selinux-sssd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-sssd/selinux-sssd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-sssd/selinux-sssd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-sssd/selinux-sssd-9999.ebuild
+2012030639 ./sec-policy/selinux-sssd/selinux-sssd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-stunnel/selinux-stunnel-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-stunnel/selinux-stunnel-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-stunnel/selinux-stunnel-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-stunnel/selinux-stunnel-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild
+2012030639 ./sec-policy/selinux-stunnel/selinux-stunnel-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-subsonic/selinux-subsonic-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-subsonic/selinux-subsonic-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-subsonic/selinux-subsonic-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-subsonic/selinux-subsonic-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-subsonic/selinux-subsonic-9999.ebuild
+2012030639 ./sec-policy/selinux-subsonic/selinux-subsonic-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-sudo/selinux-sudo-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-sudo/selinux-sudo-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-sudo/selinux-sudo-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-sudo/selinux-sudo-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-sudo/selinux-sudo-9999.ebuild
+2012030639 ./sec-policy/selinux-sudo/selinux-sudo-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-sxid/selinux-sxid-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-sxid/selinux-sxid-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-sxid/selinux-sxid-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-sxid/selinux-sxid-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-sxid/selinux-sxid-9999.ebuild
+2012030639 ./sec-policy/selinux-sxid/selinux-sxid-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-syncthing/selinux-syncthing-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-syncthing/selinux-syncthing-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-syncthing/selinux-syncthing-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-syncthing/selinux-syncthing-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-syncthing/selinux-syncthing-9999.ebuild
+2012030639 ./sec-policy/selinux-syncthing/selinux-syncthing-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-sysstat/selinux-sysstat-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-sysstat/selinux-sysstat-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-sysstat/selinux-sysstat-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-sysstat/selinux-sysstat-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-sysstat/selinux-sysstat-9999.ebuild
+2012030639 ./sec-policy/selinux-sysstat/selinux-sysstat-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-tboot/selinux-tboot-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-tboot/selinux-tboot-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-tboot/selinux-tboot-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-tboot/selinux-tboot-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-tboot/selinux-tboot-9999.ebuild
+2012030639 ./sec-policy/selinux-tboot/selinux-tboot-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-tcpd/selinux-tcpd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-tcpd/selinux-tcpd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-tcpd/selinux-tcpd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-tcpd/selinux-tcpd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-tcpd/selinux-tcpd-9999.ebuild
+2012030639 ./sec-policy/selinux-tcpd/selinux-tcpd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-tcsd/selinux-tcsd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-tcsd/selinux-tcsd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-tcsd/selinux-tcsd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-tcsd/selinux-tcsd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-tcsd/selinux-tcsd-9999.ebuild
+2012030639 ./sec-policy/selinux-tcsd/selinux-tcsd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-telnet/selinux-telnet-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-telnet/selinux-telnet-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-telnet/selinux-telnet-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-telnet/selinux-telnet-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-telnet/selinux-telnet-9999.ebuild
+2012030639 ./sec-policy/selinux-telnet/selinux-telnet-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-tftp/selinux-tftp-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-tftp/selinux-tftp-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-tftp/selinux-tftp-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-tftp/selinux-tftp-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-tftp/selinux-tftp-9999.ebuild
+2012030639 ./sec-policy/selinux-tftp/selinux-tftp-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-tgtd/selinux-tgtd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-tgtd/selinux-tgtd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-tgtd/selinux-tgtd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-tgtd/selinux-tgtd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-tgtd/selinux-tgtd-9999.ebuild
+2012030639 ./sec-policy/selinux-tgtd/selinux-tgtd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-thunderbird/selinux-thunderbird-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-thunderbird/selinux-thunderbird-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-thunderbird/selinux-thunderbird-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-thunderbird/selinux-thunderbird-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-thunderbird/selinux-thunderbird-9999.ebuild
+2012030639 ./sec-policy/selinux-thunderbird/selinux-thunderbird-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-timidity/selinux-timidity-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-timidity/selinux-timidity-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-timidity/selinux-timidity-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-timidity/selinux-timidity-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-timidity/selinux-timidity-9999.ebuild
+2012030639 ./sec-policy/selinux-timidity/selinux-timidity-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-tmpreaper/selinux-tmpreaper-9999.ebuild
+2012030639 ./sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-tor/selinux-tor-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-tor/selinux-tor-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-tor/selinux-tor-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-tor/selinux-tor-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-tor/selinux-tor-9999.ebuild
+2012030639 ./sec-policy/selinux-tor/selinux-tor-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-tripwire/selinux-tripwire-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-tripwire/selinux-tripwire-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-tripwire/selinux-tripwire-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-tripwire/selinux-tripwire-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-tripwire/selinux-tripwire-9999.ebuild
+2012030639 ./sec-policy/selinux-tripwire/selinux-tripwire-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-ucspitcp/selinux-ucspitcp-9999.ebuild
+2012030639 ./sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-ulogd/selinux-ulogd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-ulogd/selinux-ulogd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-ulogd/selinux-ulogd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-ulogd/selinux-ulogd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-ulogd/selinux-ulogd-9999.ebuild
+2012030639 ./sec-policy/selinux-ulogd/selinux-ulogd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-uml/selinux-uml-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-uml/selinux-uml-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-uml/selinux-uml-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-uml/selinux-uml-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-uml/selinux-uml-9999.ebuild
+2012030639 ./sec-policy/selinux-uml/selinux-uml-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-unconfined/selinux-unconfined-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-unconfined/selinux-unconfined-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-unconfined/selinux-unconfined-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-unconfined/selinux-unconfined-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-unconfined/selinux-unconfined-9999.ebuild
+2012030639 ./sec-policy/selinux-unconfined/selinux-unconfined-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-uptime/selinux-uptime-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-uptime/selinux-uptime-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-uptime/selinux-uptime-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-uptime/selinux-uptime-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-uptime/selinux-uptime-9999.ebuild
+2012030639 ./sec-policy/selinux-uptime/selinux-uptime-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-usbmuxd/selinux-usbmuxd-9999.ebuild
+2012030639 ./sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-uucp/selinux-uucp-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-uucp/selinux-uucp-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-uucp/selinux-uucp-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-uucp/selinux-uucp-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-uucp/selinux-uucp-9999.ebuild
+2012030639 ./sec-policy/selinux-uucp/selinux-uucp-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-uwimap/selinux-uwimap-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-uwimap/selinux-uwimap-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-uwimap/selinux-uwimap-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-uwimap/selinux-uwimap-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-uwimap/selinux-uwimap-9999.ebuild
+2012030639 ./sec-policy/selinux-uwimap/selinux-uwimap-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-uwsgi/selinux-uwsgi-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-uwsgi/selinux-uwsgi-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-uwsgi/selinux-uwsgi-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-uwsgi/selinux-uwsgi-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-uwsgi/selinux-uwsgi-9999.ebuild
+2012030639 ./sec-policy/selinux-uwsgi/selinux-uwsgi-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-varnishd/selinux-varnishd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-varnishd/selinux-varnishd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-varnishd/selinux-varnishd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-varnishd/selinux-varnishd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-varnishd/selinux-varnishd-9999.ebuild
+2012030639 ./sec-policy/selinux-varnishd/selinux-varnishd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-vbetool/selinux-vbetool-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-vbetool/selinux-vbetool-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-vbetool/selinux-vbetool-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-vbetool/selinux-vbetool-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-vbetool/selinux-vbetool-9999.ebuild
+2012030639 ./sec-policy/selinux-vbetool/selinux-vbetool-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-vdagent/selinux-vdagent-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-vdagent/selinux-vdagent-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-vdagent/selinux-vdagent-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-vdagent/selinux-vdagent-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-vdagent/selinux-vdagent-9999.ebuild
+2012030639 ./sec-policy/selinux-vdagent/selinux-vdagent-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-vde/selinux-vde-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-vde/selinux-vde-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-vde/selinux-vde-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-vde/selinux-vde-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-vde/selinux-vde-9999.ebuild
+2012030639 ./sec-policy/selinux-vde/selinux-vde-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-virt/selinux-virt-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-virt/selinux-virt-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-virt/selinux-virt-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-virt/selinux-virt-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-virt/selinux-virt-9999.ebuild
+2012030639 ./sec-policy/selinux-virt/selinux-virt-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-vlock/selinux-vlock-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-vlock/selinux-vlock-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-vlock/selinux-vlock-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-vlock/selinux-vlock-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-vlock/selinux-vlock-9999.ebuild
+2012030639 ./sec-policy/selinux-vlock/selinux-vlock-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-vmware/selinux-vmware-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-vmware/selinux-vmware-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-vmware/selinux-vmware-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-vmware/selinux-vmware-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-vmware/selinux-vmware-9999.ebuild
+2012030639 ./sec-policy/selinux-vmware/selinux-vmware-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-vnstatd/selinux-vnstatd-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-vnstatd/selinux-vnstatd-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-vnstatd/selinux-vnstatd-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-vnstatd/selinux-vnstatd-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-vnstatd/selinux-vnstatd-9999.ebuild
+2012030639 ./sec-policy/selinux-vnstatd/selinux-vnstatd-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-vpn/selinux-vpn-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-vpn/selinux-vpn-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-vpn/selinux-vpn-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-vpn/selinux-vpn-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-vpn/selinux-vpn-9999.ebuild
+2012030639 ./sec-policy/selinux-vpn/selinux-vpn-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-watchdog/selinux-watchdog-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-watchdog/selinux-watchdog-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-watchdog/selinux-watchdog-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-watchdog/selinux-watchdog-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-watchdog/selinux-watchdog-9999.ebuild
+2012030639 ./sec-policy/selinux-watchdog/selinux-watchdog-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-webalizer/selinux-webalizer-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-webalizer/selinux-webalizer-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-webalizer/selinux-webalizer-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-webalizer/selinux-webalizer-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-webalizer/selinux-webalizer-9999.ebuild
+2012030639 ./sec-policy/selinux-webalizer/selinux-webalizer-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-wine/selinux-wine-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-wine/selinux-wine-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-wine/selinux-wine-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-wine/selinux-wine-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-wine/selinux-wine-9999.ebuild
+2012030639 ./sec-policy/selinux-wine/selinux-wine-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-wireshark/selinux-wireshark-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-wireshark/selinux-wireshark-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-wireshark/selinux-wireshark-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-wireshark/selinux-wireshark-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-wireshark/selinux-wireshark-9999.ebuild
+2012030639 ./sec-policy/selinux-wireshark/selinux-wireshark-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-wm/selinux-wm-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-wm/selinux-wm-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-wm/selinux-wm-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-wm/selinux-wm-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-wm/selinux-wm-9999.ebuild
+2012030639 ./sec-policy/selinux-wm/selinux-wm-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-xen/selinux-xen-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-xen/selinux-xen-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-xen/selinux-xen-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-xen/selinux-xen-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-xen/selinux-xen-9999.ebuild
+2012030639 ./sec-policy/selinux-xen/selinux-xen-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-xfs/selinux-xfs-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-xfs/selinux-xfs-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-xfs/selinux-xfs-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-xfs/selinux-xfs-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-xfs/selinux-xfs-9999.ebuild
+2012030639 ./sec-policy/selinux-xfs/selinux-xfs-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-xprint/selinux-xprint-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-xprint/selinux-xprint-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-xprint/selinux-xprint-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-xprint/selinux-xprint-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-xprint/selinux-xprint-9999.ebuild
+2012030639 ./sec-policy/selinux-xprint/selinux-xprint-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-xscreensaver/selinux-xscreensaver-9999.ebuild
+2012030639 ./sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-xserver/selinux-xserver-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-xserver/selinux-xserver-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-xserver/selinux-xserver-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-xserver/selinux-xserver-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-xserver/selinux-xserver-9999.ebuild
+2012030639 ./sec-policy/selinux-xserver/selinux-xserver-2.20200818-r2.ebuild
 2002151740 ./sec-policy/selinux-zabbix/selinux-zabbix-2.20190201-r1.ebuild
 2010120609 ./sec-policy/selinux-zabbix/selinux-zabbix-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-zabbix/selinux-zabbix-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-zabbix/selinux-zabbix-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-zabbix/selinux-zabbix-9999.ebuild
+2012030639 ./sec-policy/selinux-zabbix/selinux-zabbix-2.20200818-r2.ebuild
 2010120609 ./sec-policy/selinux-colord/selinux-colord-2.20190609-r1.ebuild
 2010130639 ./sec-policy/selinux-colord/selinux-colord-2.20200818-r1.ebuild
-2011300739 ./sec-policy/selinux-colord/selinux-colord-2.20200818-r2.ebuild
 2011300739 ./sec-policy/selinux-colord/selinux-colord-9999.ebuild
+2012030639 ./sec-policy/selinux-colord/selinux-colord-2.20200818-r2.ebuild
 2010062239 ./sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild
 2010062239 ./sys-apps/accountsservice/accountsservice-0.6.55.ebuild
 1910111911 ./sys-apps/ack/ack-3.0.0.ebuild
 1912102109 ./sys-apps/ack/ack-3.2.0.ebuild
 2006111709 ./sys-apps/ack/ack-3.3.1.ebuild
-2007080009 ./sys-apps/ack/ack-3.4.0.ebuild
+2012030239 ./sys-apps/ack/ack-3.4.0.ebuild
 2004211009 ./sys-apps/acl/acl-2.2.53.ebuild
 2011232009 ./sys-apps/acl/acl-2.2.53-r1.ebuild
 2006171909 ./sys-apps/agedu/agedu-20200617.ebuild
@@ -26341,8 +26297,8 @@
 1712021939 ./sys-apps/ccs-tools/ccs-tools-1.8.3_p20130214.ebuild
 1908171339 ./sys-apps/checkpolicy/checkpolicy-2.9.ebuild
 2002151639 ./sys-apps/checkpolicy/checkpolicy-3.0.ebuild
-2009150709 ./sys-apps/checkpolicy/checkpolicy-3.1.ebuild
 2009150709 ./sys-apps/checkpolicy/checkpolicy-9999.ebuild
+2012030639 ./sys-apps/checkpolicy/checkpolicy-3.1.ebuild
 1902221439 ./sys-apps/chname/chname-1.1.ebuild
 2002091509 ./sys-apps/cinit/cinit-0.2.1.ebuild
 1907281509 ./sys-apps/ckbcomp/ckbcomp-1.164.ebuild
@@ -26372,7 +26328,7 @@
 2010220909 ./sys-apps/dbus-broker/dbus-broker-24.ebuild
 2010220909 ./sys-apps/dbus-broker/dbus-broker-9999.ebuild
 2006182109 ./sys-apps/dbus/dbus-1.12.18.ebuild
-2011242239 ./sys-apps/dbus/dbus-1.12.20.ebuild
+2012022239 ./sys-apps/dbus/dbus-1.12.20.ebuild
 1902101539 ./sys-apps/dcfldd/dcfldd-1.3.4.1-r1.ebuild
 2001020339 ./sys-apps/dcfldd/dcfldd-1.5.ebuild
 2001270339 ./sys-apps/dcfldd/dcfldd-1.6.ebuild
@@ -26432,8 +26388,8 @@
 2003160109 ./sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild
 2008221339 ./sys-apps/firejail-lts/firejail-lts-0.9.56.2-r2.ebuild
 2011150309 ./sys-apps/firejail/firejail-0.9.64.ebuild
-2011201409 ./sys-apps/firejail/firejail-0.9.64-r1.ebuild
 2011201409 ./sys-apps/firejail/firejail-9999.ebuild
+2012030239 ./sys-apps/firejail/firejail-0.9.64-r1.ebuild
 2002112051 ./sys-apps/fix-gnustack/fix-gnustack-0.1.ebuild
 2006212039 ./sys-apps/flashrom/flashrom-1.2-r1.ebuild
 2008311739 ./sys-apps/flashrom/flashrom-9999.ebuild
@@ -26441,11 +26397,12 @@
 2011130809 ./sys-apps/flashrom/flashrom-1.2-r2.ebuild
 2008081539 ./sys-apps/frandom/frandom-1.1-r1.ebuild
 2006241909 ./sys-apps/fwts/fwts-20.05.00.ebuild
+2012021839 ./sys-apps/fwts/fwts-20.11.00.ebuild
 2010062239 ./sys-apps/fwupd/fwupd-1.3.10.ebuild
 2010062239 ./sys-apps/fwupd/fwupd-1.3.11.ebuild
 2011120009 ./sys-apps/fwupd/fwupd-1.5.1-r1.ebuild
-2011240109 ./sys-apps/fwupd/fwupd-1.5.2.ebuild
 2011241609 ./sys-apps/fwupd/fwupd-1.4.6.ebuild
+2012022009 ./sys-apps/fwupd/fwupd-1.5.2-r1.ebuild
 2004032241 ./sys-apps/fxload/fxload-20081013-r1.ebuild
 2005300709 ./sys-apps/gawk/gawk-4.2.1-r1.ebuild
 2008170139 ./sys-apps/gawk/gawk-5.0.1.ebuild
@@ -26599,8 +26556,8 @@
 2007171109 ./sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild
 1908171339 ./sys-apps/mcstrans/mcstrans-2.9.ebuild
 2002151639 ./sys-apps/mcstrans/mcstrans-3.0.ebuild
-2009150709 ./sys-apps/mcstrans/mcstrans-3.1.ebuild
 2009150709 ./sys-apps/mcstrans/mcstrans-9999.ebuild
+2012030639 ./sys-apps/mcstrans/mcstrans-3.1.ebuild
 1909011109 ./sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
 2006052009 ./sys-apps/memtest86+/memtest86+-5.01-r5.ebuild
 1907222009 ./sys-apps/memtest86/memtest86-4.3.7-r2.ebuild
@@ -26643,9 +26600,9 @@
 2010042339 ./sys-apps/opal-utils/opal-utils-6.5.2.ebuild
 2010042339 ./sys-apps/opal-utils/opal-utils-6.6.2.ebuild
 2011030809 ./sys-apps/opal-utils/opal-utils-6.7.ebuild
-2003261841 ./sys-apps/openrc/openrc-9999.ebuild
-2004032241 ./sys-apps/openrc/openrc-0.41.2.ebuild
-2005312039 ./sys-apps/openrc/openrc-0.42.1.ebuild
+2012011439 ./sys-apps/openrc/openrc-0.41.2.ebuild
+2012011439 ./sys-apps/openrc/openrc-0.42.1.ebuild
+2012011439 ./sys-apps/openrc/openrc-9999.ebuild
 2003261841 ./sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild
 2004032241 ./sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild
 2004211009 ./sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild
@@ -26677,15 +26634,15 @@
 2010281939 ./sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
 2007021639 ./sys-apps/policycoreutils/policycoreutils-2.9.ebuild
 2007021639 ./sys-apps/policycoreutils/policycoreutils-3.0.ebuild
-2011180309 ./sys-apps/policycoreutils/policycoreutils-3.1.ebuild
 2011180309 ./sys-apps/policycoreutils/policycoreutils-9999.ebuild
+2012030639 ./sys-apps/policycoreutils/policycoreutils-3.1-r1.ebuild
 2009070039 ./sys-apps/portage/portage-2.3.99-r2.ebuild
 2009122339 ./sys-apps/portage/portage-9999.ebuild
 2009181139 ./sys-apps/portage/portage-3.0.4-r1.ebuild
 2011070209 ./sys-apps/portage/portage-3.0.8.ebuild
 2011190109 ./sys-apps/portage/portage-3.0.9.ebuild
 2011222309 ./sys-apps/portage/portage-3.0.10-r1.ebuild
-2011290039 ./sys-apps/portage/portage-3.0.11.ebuild
+2012021209 ./sys-apps/portage/portage-3.0.11-r1.ebuild
 2010142339 ./sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r4.ebuild
 2005281139 ./sys-apps/prctl/prctl-1.6-r1.ebuild
 2009170039 ./sys-apps/preload/preload-0.6.4-r3.ebuild
@@ -26706,8 +26663,8 @@
 2011261339 ./sys-apps/restartd/restartd-0.2.2-r1.ebuild
 1908171339 ./sys-apps/restorecond/restorecond-2.9.ebuild
 2002151639 ./sys-apps/restorecond/restorecond-3.0.ebuild
-2009150709 ./sys-apps/restorecond/restorecond-3.1.ebuild
 2009150709 ./sys-apps/restorecond/restorecond-9999.ebuild
+2012030639 ./sys-apps/restorecond/restorecond-3.1.ebuild
 2006070509 ./sys-apps/ripgrep/ripgrep-12.1.1.ebuild
 2002230040 ./sys-apps/rkflashtool/rkflashtool-6.1.ebuild
 1904210639 ./sys-apps/rng-tools/rng-tools-6.6-r1.ebuild
@@ -26760,19 +26717,19 @@
 2004032241 ./sys-apps/sdparm/sdparm-1.10.ebuild
 1908171339 ./sys-apps/secilc/secilc-2.9.ebuild
 2002151639 ./sys-apps/secilc/secilc-3.0.ebuild
-2009150709 ./sys-apps/secilc/secilc-3.1.ebuild
 2009150709 ./sys-apps/secilc/secilc-9999.ebuild
+2012030639 ./sys-apps/secilc/secilc-3.1.ebuild
 2004032241 ./sys-apps/sed/sed-4.7.ebuild
 2006120139 ./sys-apps/sed/sed-4.8.ebuild
 2007021639 ./sys-apps/selinux-python/selinux-python-2.9.ebuild
 2007021639 ./sys-apps/selinux-python/selinux-python-3.0.ebuild
 2009150709 ./sys-apps/selinux-python/selinux-python-3.1.ebuild
-2010260039 ./sys-apps/selinux-python/selinux-python-3.1-r1.ebuild
 2010260039 ./sys-apps/selinux-python/selinux-python-9999.ebuild
+2012030639 ./sys-apps/selinux-python/selinux-python-3.1-r1.ebuild
 1908171339 ./sys-apps/semodule-utils/semodule-utils-2.9.ebuild
 2002151639 ./sys-apps/semodule-utils/semodule-utils-3.0.ebuild
-2009150709 ./sys-apps/semodule-utils/semodule-utils-3.1.ebuild
 2009150709 ./sys-apps/semodule-utils/semodule-utils-9999.ebuild
+2012030639 ./sys-apps/semodule-utils/semodule-utils-3.1.ebuild
 2002112051 ./sys-apps/sensei-raw-ctl/sensei-raw-ctl-0.0_pre20180729.ebuild
 1908101709 ./sys-apps/servicelog/servicelog-1.1.14.ebuild
 2011031009 ./sys-apps/servicelog/servicelog-1.1.15.ebuild
@@ -26786,7 +26743,7 @@
 2010061909 ./sys-apps/smartmontools/smartmontools-7.1.ebuild
 2008081539 ./sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r4.ebuild
 2010091909 ./sys-apps/smc-sum/smc-sum-2.5.0.20200722.ebuild
-2011301639 ./sys-apps/smcipmitool/smcipmitool-2.24.0.201007.ebuild
+2012020009 ./sys-apps/smcipmitool/smcipmitool-2.24.0.201007-r1.ebuild
 2004010839 ./sys-apps/sparc-utils/sparc-utils-1.9-r6.ebuild
 1702282250 ./sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild
 1901201539 ./sys-apps/stroke/stroke-0.1.3-r1.ebuild
@@ -26841,16 +26798,16 @@
 2004032241 ./sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild
 2008200209 ./sys-apps/usbredir/usbredir-0.8.0.ebuild
 2007112009 ./sys-apps/usbutils/usbutils-012.ebuild
-2010222239 ./sys-apps/usbutils/usbutils-013.ebuild
+2012030209 ./sys-apps/usbutils/usbutils-013.ebuild
 1702282250 ./sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild
 1901121409 ./sys-apps/usermode-utilities/usermode-utilities-20070815-r4.ebuild
 2004032241 ./sys-apps/utempter/utempter-0.5.5.6.ebuild
 2004291939 ./sys-apps/util-linux/util-linux-2.33.2.ebuild
 2004291939 ./sys-apps/util-linux/util-linux-2.34-r3.ebuild
-2009051839 ./sys-apps/util-linux/util-linux-2.35.2.ebuild
 2010262039 ./sys-apps/util-linux/util-linux-2.36.ebuild
 2010262039 ./sys-apps/util-linux/util-linux-9999.ebuild
 2011202339 ./sys-apps/util-linux/util-linux-2.36.1-r1.ebuild
+2012021739 ./sys-apps/util-linux/util-linux-2.35.2.ebuild
 1911270209 ./sys-apps/vbetool/vbetool-1.1.ebuild
 2003261841 ./sys-apps/watchdog/watchdog-5.15.ebuild
 2004301339 ./sys-apps/watchdog/watchdog-5.16.ebuild
@@ -26885,7 +26842,7 @@
 2010102209 ./sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild
 2011130339 ./sys-apps/flatpak/flatpak-1.8.2.ebuild
 2011280039 ./sys-apps/flatpak/flatpak-1.9.2.ebuild
-2011281439 ./sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+2012022239 ./sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
 2002092009 ./sys-auth/authenticator/authenticator-0.2.4-r1.ebuild
 2002092009 ./sys-auth/authenticator/authenticator-9999.ebuild
 1912100909 ./sys-auth/docker_auth/docker_auth-1.3.1.ebuild
@@ -26923,7 +26880,7 @@
 1912311709 ./sys-auth/nss-mdns/nss-mdns-0.14.1.ebuild
 2009131039 ./sys-auth/nss-myhostname/nss-myhostname-0.3-r1.ebuild
 2005261939 ./sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild
-2009050339 ./sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild
+2012022009 ./sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild
 2004032241 ./sys-auth/nss_ldap/nss_ldap-265-r5.ebuild
 1912110241 ./sys-auth/oath-toolkit/oath-toolkit-2.6.1.ebuild
 2006081009 ./sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
@@ -26974,6 +26931,7 @@
 2009231339 ./sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.25.ebuild
 2006242209 ./sys-auth/AusweisApp2/AusweisApp2-9999.ebuild
 2010071039 ./sys-auth/AusweisApp2/AusweisApp2-1.20.2.ebuild
+2012030039 ./sys-auth/AusweisApp2/AusweisApp2-1.22.0.ebuild
 2009170009 ./sys-auth/solo-python/solo-python-0.0.26.ebuild
 2011140009 ./sys-auth/seatd/seatd-0.4.0.ebuild
 2011140009 ./sys-auth/seatd/seatd-9999.ebuild
@@ -27004,7 +26962,7 @@
 1702282250 ./sys-block/flashbench/flashbench-20120606.ebuild
 2009162339 ./sys-block/fwdl/fwdl-1.2.3.ebuild
 1910120139 ./sys-block/gpart/gpart-0.3.ebuild
-2004221209 ./sys-block/gparted/gparted-1.1.0.ebuild
+2012030239 ./sys-block/gparted/gparted-1.1.0.ebuild
 1702282250 ./sys-block/hdrecover/hdrecover-0.5.ebuild
 1712020139 ./sys-block/hpacucli/hpacucli-9.30.15.0.ebuild
 1712020139 ./sys-block/hpacucli/hpacucli-9.40.12.0.ebuild
@@ -27138,7 +27096,7 @@
 1906282209 ./sys-boot/silo/silo-1.4.14_p20170829.ebuild
 2006030539 ./sys-boot/silo/silo-1.4.14_p20200602.ebuild
 1910052209 ./sys-boot/syslinux/syslinux-6.04_pre1.ebuild
-2005270139 ./sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
+2012020639 ./sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
 2010240809 ./sys-boot/systemd-boot/systemd-boot-245.ebuild
 2002161639 ./sys-boot/tboot/tboot-1.9.11.ebuild
 2011181009 ./sys-boot/unetbootin/unetbootin-700.ebuild
@@ -27168,7 +27126,7 @@
 2011150309 ./sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
 2011122039 ./sys-cluster/corosync/corosync-2.4.5.ebuild
 2011122039 ./sys-cluster/corosync/corosync-3.1.0.ebuild
-2011232009 ./sys-cluster/corosync/corosync-2.3.5.ebuild
+2012020109 ./sys-cluster/corosync/corosync-2.3.5.ebuild
 2001051415 ./sys-cluster/crmsh/crmsh-3.0.3.ebuild
 2001051415 ./sys-cluster/crmsh/crmsh-4.1.0.ebuild
 1902160109 ./sys-cluster/csync2/csync2-2.0-r2.ebuild
@@ -27322,7 +27280,7 @@
 2005170039 ./sys-cluster/placement/placement-2020.1.9999.ebuild
 2005302109 ./sys-cluster/placement/placement-3.0.0.ebuild
 2010190239 ./sys-cluster/placement/placement-2020.2.9999.ebuild
-2010190239 ./sys-cluster/placement/placement-4.0.0.ebuild
+2012030239 ./sys-cluster/placement/placement-4.0.0.ebuild
 1902152239 ./sys-cluster/ploop/ploop-1.14.1.ebuild
 1804020008 ./sys-cluster/pmix/pmix-2.1.1.ebuild
 1702282250 ./sys-cluster/poolmon/poolmon-0.5.ebuild
@@ -27336,11 +27294,10 @@
 2002222009 ./sys-cluster/resource-agents/resource-agents-4.0.1.ebuild
 2010211609 ./sys-cluster/resource-agents/resource-agents-4.6.1.ebuild
 2004032241 ./sys-cluster/sanlock/sanlock-3.6.0.ebuild
-2008212139 ./sys-cluster/sanlock/sanlock-3.8.2.ebuild
+2012030739 ./sys-cluster/sanlock/sanlock-3.8.2.ebuild
 2010161439 ./sys-cluster/singularity/singularity-3.6.4.ebuild
 2011272239 ./sys-cluster/singularity/singularity-3.7.0.ebuild
-2008291339 ./sys-cluster/slurm/slurm-20.02.4.1.ebuild
-2009201639 ./sys-cluster/slurm/slurm-20.02.5.1.ebuild
+2012011539 ./sys-cluster/slurm/slurm-20.11.0.1.ebuild
 2011261909 ./sys-cluster/spark-bin/spark-bin-2.4.3.ebuild
 2011261909 ./sys-cluster/spark-bin/spark-bin-2.4.7-r1.ebuild
 2011261909 ./sys-cluster/spark-bin/spark-bin-3.0.1-r2.ebuild
@@ -27378,13 +27335,13 @@
 2004211009 ./sys-devel/autoconf-archive/autoconf-archive-2018.03.13.ebuild
 2008171539 ./sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
 2004211009 ./sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
-2011032139 ./sys-devel/autoconf-wrapper/autoconf-wrapper-14_pre2.ebuild
+2012012039 ./sys-devel/autoconf-wrapper/autoconf-wrapper-14_pre3.ebuild
 2003261841 ./sys-devel/autoconf/autoconf-9999.ebuild
 2004211009 ./sys-devel/autoconf/autoconf-2.13-r1.ebuild
 2004211009 ./sys-devel/autoconf/autoconf-2.64-r1.ebuild
 2004211009 ./sys-devel/autoconf/autoconf-2.69-r4.ebuild
 2009071139 ./sys-devel/autoconf/autoconf-2.69-r5.ebuild
-2011111939 ./sys-devel/autoconf/autoconf-2.70_beta3-r1.ebuild
+2012020009 ./sys-devel/autoconf/autoconf-2.70_beta4.ebuild
 2004032241 ./sys-devel/autogen/autogen-5.18.16-r1.ebuild
 2004211009 ./sys-devel/automake-wrapper/automake-wrapper-11.ebuild
 2003261841 ./sys-devel/automake/automake-1.16.1-r2.ebuild
@@ -27439,7 +27396,7 @@
 2011211939 ./sys-devel/bison/bison-3.6.4.ebuild
 2011211939 ./sys-devel/bison/bison-3.7.1-r1.ebuild
 2011230009 ./sys-devel/bison/bison-3.7.4.ebuild
-2011271939 ./sys-devel/bison/bison-3.7.3.ebuild
+2012031009 ./sys-devel/bison/bison-3.7.3.ebuild
 2008231139 ./sys-devel/bmake/bmake-20200318.ebuild
 2012010009 ./sys-devel/bmake/bmake-20201117.ebuild
 2004032241 ./sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
@@ -27544,10 +27501,11 @@
 2004211009 ./sys-devel/patch/patch-2.7.6-r4.ebuild
 2009152309 ./sys-devel/pmake/pmake-1.111.3.3.ebuild
 2006050009 ./sys-devel/prelink/prelink-99999999.ebuild
-2009202339 ./sys-devel/prelink/prelink-20151030-r1.ebuild
+2012030239 ./sys-devel/prelink/prelink-20151030-r1.ebuild
 2006040939 ./sys-devel/qconf/qconf-2.5.ebuild
 2003261841 ./sys-devel/remake/remake-4.2.1.1.4-r1.ebuild
 1901180209 ./sys-devel/slibtool/slibtool-0.5.28.ebuild
+2012011109 ./sys-devel/slibtool/slibtool-0.5.31.ebuild
 2005221039 ./sys-devel/smatch/smatch-1.60.ebuild
 2005221039 ./sys-devel/smatch/smatch-9999.ebuild
 2004011039 ./sys-devel/sparse/sparse-0.6.1.ebuild
@@ -27594,7 +27552,7 @@
 1912111540 ./sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild
 1912111540 ./sys-firmware/b43-firmware/b43-firmware-6.30.163.46.ebuild
 1904182339 ./sys-firmware/b43legacy-firmware/b43legacy-firmware-3.130.20.0.ebuild
-1702282250 ./sys-firmware/bluez-firmware/bluez-firmware-1.2.ebuild
+2012030239 ./sys-firmware/bluez-firmware/bluez-firmware-1.2.ebuild
 2002101639 ./sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild
 2011070709 ./sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
 2011070709 ./sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
@@ -27691,7 +27649,7 @@
 1702282250 ./sys-fs/dmg2img/dmg2img-1.6.7.ebuild
 1811111639 ./sys-fs/dmraid/dmraid-1.0.0_rc16-r4.ebuild
 2004032241 ./sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild
-2004050609 ./sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
+2012030239 ./sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
 2004211009 ./sys-fs/dosfstools/dosfstools-4.1.ebuild
 2003081409 ./sys-fs/duperemove/duperemove-0.11.1.ebuild
 2011031139 ./sys-fs/duperemove/duperemove-0.11.2.ebuild
@@ -27747,7 +27705,7 @@
 2002230040 ./sys-fs/iprutils/iprutils-2.4.7.ebuild
 2005200209 ./sys-fs/iprutils/iprutils-2.4.18.1.ebuild
 1912111540 ./sys-fs/jdiskreport-bin/jdiskreport-bin-1.4.1.ebuild
-2008202109 ./sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
+2012030239 ./sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
 2002112051 ./sys-fs/jmtpfs/jmtpfs-0.5-r1.ebuild
 2011172009 ./sys-fs/ldapfuse/ldapfuse-1.0-r3.ebuild
 1702282250 ./sys-fs/lde/lde-2.6.1-r1.ebuild
@@ -27770,10 +27728,10 @@
 1906302139 ./sys-fs/mp3fs/mp3fs-0.91-r1.ebuild
 2002140110 ./sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild
 2005112139 ./sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild
-2010280739 ./sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
+2012031009 ./sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
 2007171039 ./sys-fs/mtools/mtools-4.0.24.ebuild
 2010261239 ./sys-fs/mtools/mtools-4.0.25.ebuild
-2011281939 ./sys-fs/mtools/mtools-4.0.26.ebuild
+2012030239 ./sys-fs/mtools/mtools-4.0.26.ebuild
 1911101539 ./sys-fs/mtpfs/mtpfs-1.1-r5.ebuild
 2005111509 ./sys-fs/multipath-tools/multipath-tools-0.8.4.ebuild
 2008200209 ./sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
@@ -27795,10 +27753,10 @@
 2010070709 ./sys-fs/rar2fs/rar2fs-1.29.1.ebuild
 2001091509 ./sys-fs/reiser4progs/reiser4progs-1.2.1.ebuild
 2007052339 ./sys-fs/reiser4progs/reiser4progs-2.0.2.ebuild
-2008191239 ./sys-fs/reiser4progs/reiser4progs-2.0.3.ebuild
+2012030239 ./sys-fs/reiser4progs/reiser4progs-2.0.3.ebuild
 1702282250 ./sys-fs/reiserfs-defrag/reiserfs-defrag-0.2.2.ebuild
 2004032241 ./sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild
-2008311239 ./sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
+2012030239 ./sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
 2003080109 ./sys-fs/safecopy/safecopy-1.7.ebuild
 1811061039 ./sys-fs/shake/shake-1.0.ebuild
 2010091139 ./sys-fs/simple-mtpfs/simple-mtpfs-0.4.0.ebuild
@@ -27826,7 +27784,7 @@
 2008071739 ./sys-fs/udev/udev-9999.ebuild
 2008102109 ./sys-fs/udev/udev-245.5-r1.ebuild
 1907181639 ./sys-fs/udftools/udftools-2.1.ebuild
-2001011639 ./sys-fs/udftools/udftools-2.2.ebuild
+2012030239 ./sys-fs/udftools/udftools-2.2.ebuild
 2004191509 ./sys-fs/udiskie/udiskie-2.1.0.ebuild
 2004191509 ./sys-fs/udiskie/udiskie-2.1.1.ebuild
 2010071039 ./sys-fs/udiskie/udiskie-2.2.0.ebuild
@@ -27847,18 +27805,16 @@
 2010202239 ./sys-fs/xfsprogs/xfsprogs-5.9.0.ebuild
 2007241139 ./sys-fs/xwmfs/xwmfs-0.86.ebuild
 2003221409 ./sys-fs/yaffs2utils/yaffs2utils-0.2.9.ebuild
-2011120109 ./sys-fs/zerofree/zerofree-1.1.1.ebuild
+2012030239 ./sys-fs/zerofree/zerofree-1.1.1.ebuild
 2009022339 ./sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild
 2009281339 ./sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r1.ebuild
 2009281339 ./sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild
 2010220609 ./sys-fs/zfs-kmod/zfs-kmod-0.8.5.ebuild
 2011032339 ./sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
-2011122339 ./sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc6.ebuild
-2011252212 ./sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc7.ebuild
+2012012209 ./sys-fs/zfs-kmod/zfs-kmod-2.0.0.ebuild
 2011060609 ./sys-fs/zfs/zfs-0.8.5.ebuild
-2011122339 ./sys-fs/zfs/zfs-2.0.0_rc6.ebuild
-2011252212 ./sys-fs/zfs/zfs-2.0.0_rc7.ebuild
 2011252212 ./sys-fs/zfs/zfs-9999.ebuild
+2012012209 ./sys-fs/zfs/zfs-2.0.0.ebuild
 2010061709 ./sys-fs/fuse-overlayfs/fuse-overlayfs-1.1.2.ebuild
 2011070339 ./sys-fs/fuse-overlayfs/fuse-overlayfs-1.2.0.ebuild
 2011282339 ./sys-fs/fuse-overlayfs/fuse-overlayfs-1.3.0.ebuild
@@ -27958,6 +27914,12 @@
 2011281239 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.246.ebuild
 2011281239 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.246.ebuild
 2011281239 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.80-r1.ebuild
+2012021739 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.210.ebuild
+2012021739 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.161.ebuild
+2012021739 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.247.ebuild
+2012021739 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.247.ebuild
+2012021739 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.81.ebuild
+2012021739 ./sys-kernel/gentoo-sources/gentoo-sources-5.9.12.ebuild
 2010261209 ./sys-kernel/git-sources/git-sources-5.10_rc1.ebuild
 2011021809 ./sys-kernel/git-sources/git-sources-5.10_rc2.ebuild
 2011091109 ./sys-kernel/git-sources/git-sources-5.10_rc3.ebuild
@@ -28000,6 +27962,7 @@
 2011021309 ./sys-kernel/pf-sources/pf-sources-5.9_p2.ebuild
 2011110939 ./sys-kernel/pf-sources/pf-sources-5.9_p4.ebuild
 2011231139 ./sys-kernel/pf-sources/pf-sources-5.9_p5.ebuild
+2012022109 ./sys-kernel/pf-sources/pf-sources-5.9_p6.ebuild
 1903250339 ./sys-kernel/raspberrypi-image/raspberrypi-image-4.14.98_p20190215.ebuild
 1912031639 ./sys-kernel/raspberrypi-image/raspberrypi-image-4.19.75_p20190925.ebuild
 2010140209 ./sys-kernel/raspberrypi-image/raspberrypi-image-5.4.51_p20200902.ebuild
@@ -28019,17 +27982,17 @@
 2011160639 ./sys-kernel/rt-sources/rt-sources-4.9.240_p155.ebuild
 2011160639 ./sys-kernel/rt-sources/rt-sources-5.4.70_p40.ebuild
 2011160639 ./sys-kernel/rt-sources/rt-sources-5.9.1_p20.ebuild
-2011242139 ./sys-kernel/vanilla-sources/vanilla-sources-4.14.209.ebuild
-2011242139 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.160.ebuild
-2011242139 ./sys-kernel/vanilla-sources/vanilla-sources-4.4.246.ebuild
-2011242139 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.80.ebuild
-2011242139 ./sys-kernel/vanilla-sources/vanilla-sources-5.9.11.ebuild
-2011251409 ./sys-kernel/vanilla-sources/vanilla-sources-4.9.246.ebuild
+2012021609 ./sys-kernel/vanilla-sources/vanilla-sources-4.14.210.ebuild
+2012021609 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.161.ebuild
+2012021609 ./sys-kernel/vanilla-sources/vanilla-sources-4.4.247.ebuild
+2012021609 ./sys-kernel/vanilla-sources/vanilla-sources-4.9.247.ebuild
+2012021609 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.81.ebuild
+2012021609 ./sys-kernel/vanilla-sources/vanilla-sources-5.9.12.ebuild
 1907151840 ./sys-kernel/xbox-sources/xbox-sources-2.6.16.26.ebuild
 1912251739 ./sys-kernel/xnu-headers/xnu-headers-3789.70.16-r5.ebuild
 1912251739 ./sys-kernel/xnu-headers/xnu-headers-4570.71.2-r5.ebuild
 1912251739 ./sys-kernel/xnu-headers/xnu-headers-4903.241.1-r5.ebuild
-2011241939 ./sys-kernel/zen-sources/zen-sources-5.9.10.ebuild
+2012020409 ./sys-kernel/zen-sources/zen-sources-5.9.11.ebuild
 2003261841 ./sys-kernel/installkernel-gentoo/installkernel-gentoo-1.ebuild
 2004270309 ./sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild
 2010240809 ./sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild
@@ -28042,6 +28005,8 @@
 2011230339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.9.10.ebuild
 2011242309 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.80.ebuild
 2011242309 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.9.11.ebuild
+2012022339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.81.ebuild
+2012022339 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.9.12.ebuild
 2010230839 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.72-r1.ebuild
 2010280509 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.72.ebuild
 2011112209 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.8.ebuild
@@ -28062,6 +28027,8 @@
 2011262309 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.80-r1.ebuild
 2011262039 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.80-r2.ebuild
 2011300509 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.80-r3.ebuild
+2012022339 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.81.ebuild
+2012022339 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.12.ebuild
 2011070709 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.72.ebuild
 2011112209 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.77.ebuild
 2011112209 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.9.8.ebuild
@@ -28074,6 +28041,8 @@
 2011242309 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.9.11.ebuild
 2011262039 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.80-r1.ebuild
 2011262309 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.80.ebuild
+2012022339 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.81.ebuild
+2012022339 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.9.12.ebuild
 2007181939 ./sys-kernel/bliss-initramfs/bliss-initramfs-8.1.0-r1.ebuild
 2009201639 ./sys-kernel/bliss-initramfs/bliss-initramfs-9.3.0.ebuild
 2007152309 ./sys-kernel/bliss-kernel-bin/bliss-kernel-bin-4.14.178.ebuild
@@ -28154,7 +28123,7 @@
 2008152339 ./sys-libs/ldb/ldb-2.2.0-r1.ebuild
 2011102109 ./sys-libs/ldb/ldb-2.1.4-r1.ebuild
 2011241909 ./sys-libs/libaal/libaal-1.0.7-r1.ebuild
-2011241909 ./sys-libs/libaal/libaal-1.0.7-r2.ebuild
+2012030239 ./sys-libs/libaal/libaal-1.0.7-r2.ebuild
 2005071639 ./sys-libs/libapparmor/libapparmor-2.13.4.ebuild
 2010101309 ./sys-libs/libapparmor/libapparmor-3.0.0.ebuild
 2006132027 ./sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild
@@ -28207,17 +28176,17 @@
 2011292339 ./sys-libs/libseccomp/libseccomp-2.5.1.ebuild
 2005072109 ./sys-libs/libselinux/libselinux-2.9-r1.ebuild
 2005282309 ./sys-libs/libselinux/libselinux-3.0.ebuild
-2011160909 ./sys-libs/libselinux/libselinux-3.1-r1.ebuild
 2011212339 ./sys-libs/libselinux/libselinux-9999.ebuild
+2012030639 ./sys-libs/libselinux/libselinux-3.1-r1.ebuild
 2002110039 ./sys-libs/libsemanage/libsemanage-2.9.ebuild
 2007021539 ./sys-libs/libsemanage/libsemanage-3.0-r1.ebuild
 2007021539 ./sys-libs/libsemanage/libsemanage-3.0.ebuild
-2011160909 ./sys-libs/libsemanage/libsemanage-3.1-r1.ebuild
 2011212339 ./sys-libs/libsemanage/libsemanage-9999.ebuild
+2012030639 ./sys-libs/libsemanage/libsemanage-3.1-r1.ebuild
 1908171339 ./sys-libs/libsepol/libsepol-2.9.ebuild
 2007020109 ./sys-libs/libsepol/libsepol-3.0.ebuild
-2009150709 ./sys-libs/libsepol/libsepol-3.1.ebuild
 2009150709 ./sys-libs/libsepol/libsepol-9999.ebuild
+2012030639 ./sys-libs/libsepol/libsepol-3.1.ebuild
 1908101709 ./sys-libs/libservicelog/libservicelog-1.1.18.ebuild
 2011301209 ./sys-libs/libsmbios/libsmbios-2.4.3.ebuild
 1805212239 ./sys-libs/libstatgrab/libstatgrab-0.91.ebuild
@@ -28259,8 +28228,8 @@
 2011212139 ./sys-libs/newlib/newlib-4.0.0.ebuild
 2011212139 ./sys-libs/newlib/newlib-9999.ebuild
 2002112051 ./sys-libs/nss-usrfiles/nss-usrfiles-2.18.1.ebuild
-2003220009 ./sys-libs/nss_wrapper/nss_wrapper-1.1.10.ebuild
 2005091209 ./sys-libs/nss_wrapper/nss_wrapper-1.1.6.ebuild
+2012030039 ./sys-libs/nss_wrapper/nss_wrapper-1.1.10.ebuild
 2001301109 ./sys-libs/obstack-standalone/obstack-standalone-1.1.ebuild
 2010091139 ./sys-libs/openipmi/openipmi-2.0.29.ebuild
 2011252212 ./sys-libs/pam/pam-1.5.1.ebuild
@@ -28281,14 +28250,14 @@
 2006280009 ./sys-libs/tdb/tdb-1.4.3.ebuild
 2006132027 ./sys-libs/tevent/tevent-0.10.2.ebuild
 2008021839 ./sys-libs/timezone-data/timezone-data-2020a.ebuild
-2011292039 ./sys-libs/timezone-data/timezone-data-2020d.ebuild
+2012030039 ./sys-libs/timezone-data/timezone-data-2020d.ebuild
 2002021609 ./sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
 2002021609 ./sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild
 2002021609 ./sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
 2005301839 ./sys-libs/uclibc-ng/uclibc-ng-1.0.33.ebuild
 2009042009 ./sys-libs/uclibc-ng/uclibc-ng-1.0.35.ebuild
-2003220009 ./sys-libs/uid_wrapper/uid_wrapper-1.2.8.ebuild
 2005091209 ./sys-libs/uid_wrapper/uid_wrapper-1.2.7.ebuild
+2012030039 ./sys-libs/uid_wrapper/uid_wrapper-1.2.8.ebuild
 2004211009 ./sys-libs/zlib/zlib-1.2.11-r2.ebuild
 2010272239 ./sys-libs/zlib/zlib-1.2.11-r3.ebuild
 2007161209 ./sys-libs/liburing/liburing-0.6.ebuild
@@ -28305,7 +28274,7 @@
 2004032241 ./sys-power/acpid/acpid-2.0.32-r1.ebuild
 2010091139 ./sys-power/acpid/acpid-2.0.32-r2.ebuild
 2002112309 ./sys-power/acpilight/acpilight-1.2.ebuild
-2009011939 ./sys-power/acpilight/acpilight-1.2-r1.ebuild
+2012021939 ./sys-power/acpilight/acpilight-1.2-r1.ebuild
 1702282250 ./sys-power/acpitool/acpitool-0.5.1-r1.ebuild
 2005062039 ./sys-power/apcupsd/apcupsd-3.14.13.ebuild
 2005062039 ./sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
@@ -28359,7 +28328,7 @@
 2004032241 ./sys-process/audit/audit-2.8.3.ebuild
 2008150239 ./sys-process/audit/audit-2.8.4.ebuild
 2008150239 ./sys-process/audit/audit-2.8.5.ebuild
-2010260039 ./sys-process/audit/audit-2.8.5-r2.ebuild
+2012030639 ./sys-process/audit/audit-2.8.5-r2.ebuild
 2009231339 ./sys-process/bcron/bcron-0.11.ebuild
 2009251209 ./sys-process/criu/criu-3.14-r2.ebuild
 2011250709 ./sys-process/criu/criu-3.15.ebuild
@@ -28385,7 +28354,7 @@
 2001271309 ./sys-process/gnome-usage/gnome-usage-3.32.0.ebuild
 2004190539 ./sys-process/htop/htop-2.2.0.ebuild
 2009031439 ./sys-process/htop/htop-3.0.1.ebuild
-2009151309 ./sys-process/htop/htop-3.0.2.ebuild
+2012030739 ./sys-process/htop/htop-3.0.2.ebuild
 2006270039 ./sys-process/incron/incron-0.5.12_p20191114.ebuild
 2010280739 ./sys-process/iotop/iotop-0.6.ebuild
 1910071209 ./sys-process/latencytop/latencytop-0.5-r1.ebuild
@@ -28733,7 +28702,7 @@
 1908200639 ./www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0-r1.ebuild
 1706121125 ./www-apache/mod_whatkilledus/mod_whatkilledus-2.01.ebuild
 2008021509 ./www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild
-2009031539 ./www-apache/mod_wsgi/mod_wsgi-4.7.1.ebuild
+2012021739 ./www-apache/mod_wsgi/mod_wsgi-4.7.1.ebuild
 2009260639 ./www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r1.ebuild
 1805280108 ./www-apache/modsec-flameeyes/modsec-flameeyes-20130216.ebuild
 1805280108 ./www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild
@@ -28883,8 +28852,8 @@
 2011302139 ./www-client/chromium/chromium-87.0.4280.66.ebuild
 2011302139 ./www-client/chromium/chromium-88.0.4324.11.ebuild
 2002231739 ./www-client/dillo/dillo-9999.ebuild
-2008031009 ./www-client/dillo/dillo-3.1_pre20181005.ebuild
 2008061509 ./www-client/dillo/dillo-3.0.5-r3.ebuild
+2012030239 ./www-client/dillo/dillo-3.1_pre20181005.ebuild
 2009201639 ./www-client/elinks/elinks-0.13.4-r1.ebuild
 2010280039 ./www-client/elinks/elinks-0.13.5.ebuild
 2011111439 ./www-client/elinks/elinks-0.13.5-r100.ebuild
@@ -28895,11 +28864,11 @@
 1703072117 ./www-client/fetch/fetch-1.0-r3.ebuild
 2011252309 ./www-client/firefox-bin/firefox-bin-78.5.0.ebuild
 2011252309 ./www-client/firefox-bin/firefox-bin-83.0.ebuild
-2011252309 ./www-client/firefox/firefox-78.5.0.ebuild
-2011281709 ./www-client/firefox/firefox-83.0.ebuild
+2012030539 ./www-client/firefox/firefox-78.5.0.ebuild
+2012030539 ./www-client/firefox/firefox-83.0.ebuild
 2011172039 ./www-client/google-chrome-beta/google-chrome-beta-87.0.4280.66.ebuild
-2011200109 ./www-client/google-chrome-unstable/google-chrome-unstable-88.0.4324.11.ebuild
-2011172309 ./www-client/google-chrome/google-chrome-87.0.4280.66.ebuild
+2012021039 ./www-client/google-chrome-unstable/google-chrome-unstable-88.0.4324.27.ebuild
+2012030039 ./www-client/google-chrome/google-chrome-87.0.4280.88.ebuild
 2002231739 ./www-client/httrack/httrack-3.49.2-r2.ebuild
 1808061609 ./www-client/jd/jd-2.8.5_p120826.ebuild
 1808081609 ./www-client/jd/jd-2.8.9_p150226.ebuild
@@ -28948,7 +28917,7 @@
 2011162309 ./www-client/w3m/w3m-0.5.3_p20190105.ebuild
 1902061639 ./www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild
 2006212039 ./www-client/w3mmee/w3mmee-0.3.2_p24-r12.ebuild
-2011182039 ./www-client/microsoft-edge-dev/microsoft-edge-dev-88.0.702.0.ebuild
+2012012339 ./www-client/microsoft-edge-dev/microsoft-edge-dev-88.0.705.9.ebuild
 2005131309 ./www-misc/awstats/awstats-7.8-r1.ebuild
 2002230040 ./www-misc/bookmarksync/bookmarksync-0.3.4-r3.ebuild
 2010072109 ./www-misc/buku/buku-4.3-r1.ebuild
@@ -28972,16 +28941,16 @@
 1912112339 ./www-misc/vdradmin-am/vdradmin-am-3.6.9-r3.ebuild
 1912112339 ./www-misc/vdradmin-am/vdradmin-am-3.6.9.ebuild
 2001122209 ./www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild
-2003011439 ./www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
+2012030509 ./www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
 1902092209 ./www-misc/visitors/visitors-0.7-r2.ebuild
 1907151840 ./www-misc/wsmake/wsmake-0.6.4-r1.ebuild
 1904231239 ./www-misc/wsmake/wsmake-0.6.4.ebuild
 2005172009 ./www-misc/xxv/xxv-1.6.1-r1.ebuild
 2011111239 ./www-plugins/adobe-flash/adobe-flash-32.0.0.453.ebuild
 2008250009 ./www-plugins/browserpass/browserpass-3.0.7.ebuild
-2011172309 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4280.66.ebuild
 2011172039 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4280.66_beta.ebuild
-2011200109 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-88.0.4324.11_alpha.ebuild
+2012030039 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4280.88.ebuild
+2012021039 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-88.0.4324.27_alpha.ebuild
 1909232039 ./www-plugins/google-talkplugin/google-talkplugin-5.41.3.0.ebuild
 1909232039 ./www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
 2006081209 ./www-plugins/lightspark/lightspark-0.8.2-r1.ebuild
@@ -28991,6 +28960,7 @@
 2009061009 ./www-servers/adsf/adsf-1.4.3.ebuild
 2010011639 ./www-servers/apache/apache-2.4.46-r1.ebuild
 2010011639 ./www-servers/apache/apache-2.4.46.ebuild
+2012021509 ./www-servers/apache/apache-2.4.46-r3.ebuild
 2001051839 ./www-servers/boa/boa-0.94.14_rc21-r2.ebuild
 2003192239 ./www-servers/bozohttpd/bozohttpd-20190228.ebuild
 2007122209 ./www-servers/caddy/caddy-2.0.0.ebuild
@@ -29018,6 +28988,7 @@
 2009302109 ./www-servers/nginx/nginx-1.19.3.ebuild
 2010292009 ./www-servers/nginx/nginx-1.19.4.ebuild
 2011242309 ./www-servers/nginx/nginx-1.19.5.ebuild
+2012030239 ./www-servers/nginx/nginx-1.19.5-r1.ebuild
 1912111540 ./www-servers/ocsigenserver/ocsigenserver-2.8.ebuild
 1912111540 ./www-servers/ocsigenserver/ocsigenserver-9999.ebuild
 1803140138 ./www-servers/pound/pound-2.7f-r1.ebuild
@@ -29115,7 +29086,7 @@
 2003261841 ./x11-apps/xkbprint/xkbprint-1.0.5.ebuild
 2004032241 ./x11-apps/xkbutils/xkbutils-1.0.4.ebuild
 2004032241 ./x11-apps/xkill/xkill-1.0.5.ebuild
-2004032241 ./x11-apps/xload/xload-1.1.3.ebuild
+2012030239 ./x11-apps/xload/xload-1.1.3.ebuild
 2006190109 ./x11-apps/xlogo/xlogo-1.0.5.ebuild
 2004032241 ./x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild
 2004032241 ./x11-apps/xlsclients/xlsclients-1.1.4.ebuild
@@ -29150,9 +29121,9 @@
 2005190009 ./x11-base/xorg-drivers/xorg-drivers-9999.ebuild
 2005190009 ./x11-base/xorg-proto/xorg-proto-9999.ebuild
 2006242039 ./x11-base/xorg-proto/xorg-proto-2020.1.ebuild
-2007260009 ./x11-base/xorg-server/xorg-server-9999.ebuild
 2008091539 ./x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
-2008252339 ./x11-base/xorg-server/xorg-server-1.20.9.ebuild
+2012012109 ./x11-base/xorg-server/xorg-server-1.20.10.ebuild
+2012012109 ./x11-base/xorg-server/xorg-server-9999.ebuild
 2004032241 ./x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
 2011182139 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r5.ebuild
 2011182139 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r5.ebuild
@@ -29225,7 +29196,7 @@
 2006290009 ./x11-libs/goffice/goffice-0.10.47.ebuild
 2009121609 ./x11-libs/goffice/goffice-0.10.48.ebuild
 2004032241 ./x11-libs/goocanvas/goocanvas-1.0.0.ebuild
-2008022209 ./x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild
+2012030239 ./x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild
 2006132027 ./x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
 2009181139 ./x11-libs/gtk+/gtk+-3.24.20.ebuild
 2011141239 ./x11-libs/gtk+/gtk+-3.24.22.ebuild
@@ -29244,7 +29215,7 @@
 2007152009 ./x11-libs/libQGLViewer/libQGLViewer-2.7.2.ebuild
 2011052009 ./x11-libs/libSM/libSM-1.2.3-r1.ebuild
 2009181139 ./x11-libs/libX11/libX11-1.6.12.ebuild
-2011230039 ./x11-libs/libX11/libX11-1.7.0.ebuild
+2012012309 ./x11-libs/libX11/libX11-1.7.0.ebuild
 2004032241 ./x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
 2004032241 ./x11-libs/libXau/libXau-1.0.9.ebuild
 2011090239 ./x11-libs/libXau/libXau-1.0.9-r1.ebuild
@@ -29415,7 +29386,7 @@
 2009160009 ./x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild
 2009160009 ./x11-misc/cairo-clock/cairo-clock-0.3.4-r2.ebuild
 1703211727 ./x11-misc/cbatticon/cbatticon-1.6.5.ebuild
-2011300309 ./x11-misc/cbatticon/cbatticon-1.6.10.ebuild
+2012020639 ./x11-misc/cbatticon/cbatticon-1.6.10.ebuild
 2010041809 ./x11-misc/cdm/cdm-0.6.1_pre20180107.ebuild
 2010041809 ./x11-misc/cdm/cdm-0.7.ebuild
 1805220439 ./x11-misc/chgres/chgres-0.1-r2.ebuild
@@ -29473,6 +29444,7 @@
 2009201709 ./x11-misc/grsync/grsync-1.2.8.ebuild
 2004200009 ./x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.2.ebuild
 2007121809 ./x11-misc/grub2-theme-preview/grub2-theme-preview-1.5.1.ebuild
+2012021539 ./x11-misc/grub2-theme-preview/grub2-theme-preview-2.1.0.ebuild
 1910111911 ./x11-misc/grun/grun-0.9.3-r1.ebuild
 1702282250 ./x11-misc/gtk2fontsel/gtk2fontsel-0.1-r1.ebuild
 2002021409 ./x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild
@@ -29484,7 +29456,7 @@
 2002021309 ./x11-misc/habak/habak-0.2.5-r3.ebuild
 2002112051 ./x11-misc/habak/habak-0.2.5-r2.ebuild
 1805220439 ./x11-misc/hsetroot/hsetroot-1.0.2.ebuild
-2011300209 ./x11-misc/hsetroot/hsetroot-1.0.5.ebuild
+2012020639 ./x11-misc/hsetroot/hsetroot-1.0.5.ebuild
 1909121739 ./x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
 2003112309 ./x11-misc/i3blocks/i3blocks-1.5.ebuild
 2002112051 ./x11-misc/i3lock/i3lock-2.10-r1.ebuild
@@ -29510,7 +29482,7 @@
 2001061909 ./x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
 2002112051 ./x11-misc/light-locker/light-locker-1.9.0-r2.ebuild
 2006081939 ./x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild
-2011291139 ./x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
+2012030809 ./x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
 1811061009 ./x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.3.4.ebuild
 2004050839 ./x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.4.0.ebuild
 2010111009 ./x11-misc/lightdm/lightdm-1.30.0-r2.ebuild
@@ -29535,7 +29507,7 @@
 1703221028 ./x11-misc/mgm/mgm-1.2-r1.ebuild
 1902221439 ./x11-misc/mixer_app/mixer_app-1.8.0-r1.ebuild
 2008070639 ./x11-misc/mozo/mozo-1.24.0.ebuild
-2009252339 ./x11-misc/mozo/mozo-1.24.0-r1.ebuild
+2012030239 ./x11-misc/mozo/mozo-1.24.0-r1.ebuild
 2008250139 ./x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
 1910111911 ./x11-misc/netwmpager/netwmpager-2.05.ebuild
 1808051439 ./x11-misc/nitrogen/nitrogen-1.6.1.ebuild
@@ -29625,6 +29597,7 @@
 2011252124 ./x11-misc/spacefm/spacefm-9999.ebuild
 2011010939 ./x11-misc/splatmoji/splatmoji-1.1.1.ebuild
 1712161139 ./x11-misc/spnavcfg/spnavcfg-0.3.ebuild
+2012011709 ./x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild
 1805220439 ./x11-misc/sprop/sprop-0.1-r1.ebuild
 1708311302 ./x11-misc/sselp/sselp-0.2-r1.ebuild
 1709110046 ./x11-misc/sselp/sselp-9999.ebuild
@@ -29639,7 +29612,7 @@
 2010270909 ./x11-misc/sxhkd/sxhkd-0.6.2.ebuild
 2005150139 ./x11-misc/synergy/synergy-2.0.0.ebuild
 2011301309 ./x11-misc/synergy/synergy-1.12.0.ebuild
-2011301209 ./x11-misc/synergy/synergy-1.9.1-r1.ebuild
+2012020639 ./x11-misc/synergy/synergy-1.9.1-r1.ebuild
 1805220439 ./x11-misc/tabbed/tabbed-0.6.ebuild
 1812260009 ./x11-misc/tint2/tint2-16.2.ebuild
 1812252339 ./x11-misc/tint2/tint2-16.6.1.ebuild
@@ -29691,7 +29664,7 @@
 2002230040 ./x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild
 2004110939 ./x11-misc/xautolock/xautolock-2.2_p6.ebuild
 2009041139 ./x11-misc/xautolock/xautolock-2.2_p7.ebuild
-1805220439 ./x11-misc/xautomation/xautomation-1.09-r1.ebuild
+2012030239 ./x11-misc/xautomation/xautomation-1.09-r1.ebuild
 1807091809 ./x11-misc/xbatt/xbatt-1.3_rc1.ebuild
 2009231339 ./x11-misc/xbattbar/xbattbar-1.4.9.ebuild
 2005270839 ./x11-misc/xbindkeys/xbindkeys-1.8.6-r1.ebuild
@@ -29718,7 +29691,7 @@
 2010311409 ./x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r1.ebuild
 2002112051 ./x11-misc/xdialog/xdialog-2.3.1.ebuild
 2002112051 ./x11-misc/xdiskusage/xdiskusage-1.51.ebuild
-2006191509 ./x11-misc/xdiskusage/xdiskusage-1.52.ebuild
+2012030239 ./x11-misc/xdiskusage/xdiskusage-1.52.ebuild
 1911180139 ./x11-misc/xdo/xdo-0.5.7.ebuild
 2011142339 ./x11-misc/xdock/xdock-0.3.0.ebuild
 2011300239 ./x11-misc/xdotool/xdotool-3.20160805.1.ebuild
@@ -29787,7 +29760,7 @@
 1805220439 ./x11-misc/xsnap/xsnap-1.5.15-r1.ebuild
 2002022339 ./x11-misc/xsnap/xsnap-1.5.15-r2.ebuild
 2002112051 ./x11-misc/xsnow/xsnow-1.42-r2.ebuild
-2009041609 ./x11-misc/xsnow/xsnow-3.0.7.ebuild
+2012030239 ./x11-misc/xsnow/xsnow-3.0.7.ebuild
 1710281306 ./x11-misc/xsr/xsr-1.0.0.ebuild
 2011271209 ./x11-misc/xsri/xsri-2.1.0_p17_p12.ebuild
 1702282250 ./x11-misc/xss-lock/xss-lock-0.3.0_p20140302-r1.ebuild
@@ -29956,16 +29929,16 @@
 1809192139 ./x11-plugins/wmbatteries/wmbatteries-0.1.3-r1.ebuild
 1812090209 ./x11-plugins/wmbattery/wmbattery-2.50.ebuild
 1812090209 ./x11-plugins/wmbattery/wmbattery-2.51.ebuild
-1911031939 ./x11-plugins/wmbattery/wmbattery-2.54.ebuild
+2012030509 ./x11-plugins/wmbattery/wmbattery-2.54.ebuild
 1805220439 ./x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
 2003081439 ./x11-plugins/wmbiff/wmbiff-0.4.35.ebuild
-2011292039 ./x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
+2012030509 ./x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
 2003011839 ./x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild
 2003081439 ./x11-plugins/wmbio/wmbio-1.02.ebuild
 2003281709 ./x11-plugins/wmblob/wmblob-1.0.3.ebuild
-2011292039 ./x11-plugins/wmblob/wmblob-1.0.4.ebuild
+2012030509 ./x11-plugins/wmblob/wmblob-1.0.4.ebuild
 1805220439 ./x11-plugins/wmbutton/wmbutton-0.7.0.ebuild
-2011292039 ./x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
+2012030509 ./x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
 1811092139 ./x11-plugins/wmcalc/wmcalc-0.6-r1.ebuild
 1809192109 ./x11-plugins/wmcalc/wmcalc-0.7.ebuild
 2003291439 ./x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild
@@ -30001,12 +29974,12 @@
 1810211139 ./x11-plugins/wmitime/wmitime-0.5-r1.ebuild
 1805220439 ./x11-plugins/wmix/wmix-3.2.ebuild
 2001292139 ./x11-plugins/wmix/wmix-3.4.ebuild
-2011292039 ./x11-plugins/wmix/wmix-3.5.ebuild
+2012030509 ./x11-plugins/wmix/wmix-3.5.ebuild
 1808022339 ./x11-plugins/wmlife/wmlife-1.0.1-r1.ebuild
 1810211139 ./x11-plugins/wmload/wmload-0.9.7-r1.ebuild
 1907151840 ./x11-plugins/wmlongrun/wmlongrun-0.3.1.ebuild
 1702282250 ./x11-plugins/wmmaiload/wmmaiload-2.2.1-r1.ebuild
-2011292039 ./x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
+2012030509 ./x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
 2001300409 ./x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild
 2002112051 ./x11-plugins/wmmemload/wmmemload-0.1.8-r1.ebuild
 2011212109 ./x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
@@ -30025,7 +29998,7 @@
 1809152339 ./x11-plugins/wmpager/wmpager-1.2-r2.ebuild
 1702282250 ./x11-plugins/wmpasman/wmpasman-0.8.5.3.ebuild
 1704032118 ./x11-plugins/wmpasman/wmpasman-2.0.ebuild
-1812311309 ./x11-plugins/wmpasman/wmpasman-2.2.ebuild
+2012030509 ./x11-plugins/wmpasman/wmpasman-2.2.ebuild
 2002112051 ./x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild
 2002030239 ./x11-plugins/wmping/wmping-0.2.1-r1.ebuild
 2006131209 ./x11-plugins/wmpop3/wmpop3-0.5.6a-r1.ebuild
@@ -30095,7 +30068,7 @@
 2009272339 ./x11-terms/terminology/terminology-1.8.1.ebuild
 2002151509 ./x11-terms/tilda/tilda-1.4.1.ebuild
 2002151509 ./x11-terms/tilda/tilda-1.5.0.ebuild
-2008252139 ./x11-terms/tilda/tilda-1.5.2.ebuild
+2012030239 ./x11-terms/tilda/tilda-1.5.2.ebuild
 2005081846 ./x11-terms/xfce4-terminal/xfce4-terminal-0.8.9.2.ebuild
 2004032241 ./x11-terms/xterm/xterm-337.ebuild
 2004200309 ./x11-terms/xterm/xterm-351.ebuild
@@ -30127,7 +30100,7 @@
 1702282250 ./x11-themes/echo-icon-theme/echo-icon-theme-0.3.89.0_pre20081031.ebuild
 2006221909 ./x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.15.1.ebuild
 1912310209 ./x11-themes/experience/experience-3.04-r1.ebuild
-1702282250 ./x11-themes/faenza-icon-theme/faenza-icon-theme-1.3.1.ebuild
+2012030239 ./x11-themes/faenza-icon-theme/faenza-icon-theme-1.3.1.ebuild
 1904030039 ./x11-themes/fedora-backgrounds/fedora-backgrounds-27.0.1.ebuild
 1904030039 ./x11-themes/fedora-backgrounds/fedora-backgrounds-28.1.5.ebuild
 1904030039 ./x11-themes/fedora-backgrounds/fedora-backgrounds-29.1.3.ebuild
@@ -30170,7 +30143,7 @@
 2005231339 ./x11-themes/greybird/greybird-9999.ebuild
 2006131539 ./x11-themes/greybird/greybird-3.22.11.ebuild
 2009041209 ./x11-themes/greybird/greybird-3.22.12.ebuild
-1712192239 ./x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r3.ebuild
+2012030239 ./x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r3.ebuild
 2004032241 ./x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild
 2007201609 ./x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild
 1912241509 ./x11-themes/gtk-engines-candido/gtk-engines-candido-0.9.1.ebuild
@@ -30282,7 +30255,7 @@
 1704041231 ./x11-themes/vertex-theme/vertex-theme-20170128-r1.ebuild
 1703270003 ./x11-themes/vertex-theme/vertex-theme-20170128.ebuild
 2002112051 ./x11-themes/windowmaker-themes/windowmaker-themes-0.1-r1.ebuild
-1806202209 ./x11-themes/wm-icons/wm-icons-0.4.0.ebuild
+2012030239 ./x11-themes/wm-icons/wm-icons-0.4.0.ebuild
 2004032241 ./x11-themes/xcursor-themes/xcursor-themes-1.0.6.ebuild
 1806030209 ./x11-themes/xfce-gant-icon-theme/xfce-gant-icon-theme-3.9_p6-r1.ebuild
 2004062109 ./x11-themes/xfwm4-themes/xfwm4-themes-4.10.0-r1.ebuild
@@ -30325,7 +30298,8 @@
 2002061439 ./x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
 2006071439 ./x11-wm/herbstluftwm/herbstluftwm-0.8.2.ebuild
 2006081141 ./x11-wm/herbstluftwm/herbstluftwm-0.8.3.ebuild
-2006081141 ./x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+2012011709 ./x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild
+2012011709 ./x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
 2011150309 ./x11-wm/i3-gaps/i3-gaps-4.18.2.ebuild
 2011241009 ./x11-wm/i3-gaps/i3-gaps-4.19.ebuild
 2006040939 ./x11-wm/i3/i3-4.18.ebuild
@@ -30437,7 +30411,7 @@
 1912061739 ./xfce-extra/multiload-nandhp/multiload-nandhp-0.3-r4.ebuild
 2007041609 ./xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.4.0.ebuild
 1910102139 ./xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.ebuild
-2006292139 ./xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.1.ebuild
+2012030239 ./xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.1.ebuild
 1910102139 ./xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.2.0.ebuild
 2002112051 ./xfce-extra/thunar-volman/thunar-volman-0.9.5.ebuild
 2008210539 ./xfce-extra/thunar-volman/thunar-volman-4.15.0.ebuild
@@ -30450,7 +30424,7 @@
 1910102139 ./xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.3.ebuild
 2007191709 ./xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.1.ebuild
 1811241709 ./xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1.ebuild
-2011021309 ./xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.2.ebuild
+2012030239 ./xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.2.ebuild
 2010211109 ./xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.1.0.ebuild
 2002112051 ./xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.8.0.ebuild
 2011172239 ./xfce-extra/xfce4-dict/xfce4-dict-0.8.4.ebuild
@@ -30461,7 +30435,7 @@
 1910131439 ./xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.1.ebuild
 1910131439 ./xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.2.ebuild
 1912312009 ./xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.0.ebuild
-1807101539 ./xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.4.ebuild
+2012030239 ./xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.4.ebuild
 1912061739 ./xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6-r4.ebuild
 2005291909 ./xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r6.ebuild
 2011090239 ./xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.3.0.ebuild
@@ -30478,12 +30452,12 @@
 2006292139 ./xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild
 2010062139 ./xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
 2011090239 ./xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.11.ebuild
-2003261841 ./xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild
+2012030239 ./xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild
 1911031709 ./xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0-r1.ebuild
 2011201309 ./xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild
 1910202009 ./xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.1.ebuild
 2003091039 ./xfce-extra/xfce4-statusnotifier-plugin/xfce4-statusnotifier-plugin-0.2.2.ebuild
-2010211139 ./xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.3.ebuild
+2012030239 ./xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.3.ebuild
 2007191709 ./xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.3.ebuild
 2009181139 ./xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.1.1.ebuild
 2009181139 ./xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.1.ebuild
@@ -30495,7 +30469,7 @@
 2011100039 ./xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.10.2.ebuild
 2009181139 ./xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.6.ebuild
 1912261609 ./xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6-r3.ebuild
-2011091139 ./xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild
+2012030239 ./xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild
 1910102139 ./xfce-extra/xfdashboard/xfdashboard-0.7.5.ebuild
 2011171409 ./xfce-extra/xfdashboard/xfdashboard-0.7.90.ebuild
 2001032239 ./skel.ebuild
@@ -30762,9 +30736,9 @@
 2011280409 metadata/md5-cache/acct-group/minidlna-0
 2011290239 metadata/md5-cache/acct-group/sniproxy-0
 2011290239 metadata/md5-cache/acct-group/ziproxy-0
-2012010109 metadata/md5-cache/acct-group/Manifest.gz
 2012010109 metadata/md5-cache/acct-group/dbmail-0
-2011302239 metadata/md5-cache/acct-group/gatling-0
+2012011340 metadata/md5-cache/acct-group/Manifest.gz
+2012011340 metadata/md5-cache/acct-group/gatling-0-r1
 2011061444 metadata/md5-cache/acct-user/abrt-0
 2011061444 metadata/md5-cache/acct-user/airdcppd-0
 2011061444 metadata/md5-cache/acct-user/alias-0
@@ -31007,9 +30981,9 @@
 2011280409 metadata/md5-cache/acct-user/minidlna-0
 2011290239 metadata/md5-cache/acct-user/sniproxy-0
 2011290239 metadata/md5-cache/acct-user/ziproxy-0
-2012010109 metadata/md5-cache/acct-user/Manifest.gz
 2012010109 metadata/md5-cache/acct-user/dbmail-0
-2011302239 metadata/md5-cache/acct-user/gatling-0
+2012011340 metadata/md5-cache/acct-user/Manifest.gz
+2012011340 metadata/md5-cache/acct-user/gatling-0-r1
 2002230040 metadata/md5-cache/app-accessibility/sound-icons-0.1
 2004032241 metadata/md5-cache/app-accessibility/mbrola-3.0.1h-r6
 2009251309 metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
@@ -31088,7 +31062,6 @@
 2002112051 metadata/md5-cache/app-admin/newsyslog-1.1-r1
 2002122109 metadata/md5-cache/app-admin/lastpass-binary-component-4.19.0-r1
 2003091609 metadata/md5-cache/app-admin/needrestart-3.3
-2003211239 metadata/md5-cache/app-admin/gentoo-perl-helpers-0.4.0
 2003231639 metadata/md5-cache/app-admin/needrestart-3.5
 2003261841 metadata/md5-cache/app-admin/perl-cleaner-2.28
 2003261841 metadata/md5-cache/app-admin/superadduser-1.15
@@ -31103,7 +31076,6 @@
 2005271939 metadata/md5-cache/app-admin/checksec-2.2.0
 2005271939 metadata/md5-cache/app-admin/checksec-2.2.1
 2006072009 metadata/md5-cache/app-admin/checksec-2.2.2
-2008011009 metadata/md5-cache/app-admin/sshguard-2.4.1
 2008041839 metadata/md5-cache/app-admin/pwgen-2.08
 2008051739 metadata/md5-cache/app-admin/checksec-2.2.3
 2008270139 metadata/md5-cache/app-admin/stow-2.3.1
@@ -31140,7 +31112,6 @@
 2011061709 metadata/md5-cache/app-admin/hcloud-1.20.0
 2011061444 metadata/md5-cache/app-admin/logcheck-1.3.18-r1
 2011061444 metadata/md5-cache/app-admin/tenshi-0.17
-2011091739 metadata/md5-cache/app-admin/mongo-tools-100.2.0
 2011091739 metadata/md5-cache/app-admin/mongo-tools-4.0.20
 2011091739 metadata/md5-cache/app-admin/mongo-tools-4.2.10
 2011092139 metadata/md5-cache/app-admin/spectre-meltdown-checker-0.44
@@ -31158,14 +31129,6 @@
 2011252124 metadata/md5-cache/app-admin/abrt-2.14.2
 2011252124 metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r1
 2011252124 metadata/md5-cache/app-admin/analog-6.0.13
-2011252124 metadata/md5-cache/app-admin/ansible-2.10.0-r2
-2011252124 metadata/md5-cache/app-admin/ansible-2.10.1
-2011252124 metadata/md5-cache/app-admin/ansible-9999
-2011252124 metadata/md5-cache/app-admin/ansible-base-2.10.2
-2011252124 metadata/md5-cache/app-admin/ansible-base-2.10.3
-2011252124 metadata/md5-cache/app-admin/ansible-cmdb-1.28
-2011252124 metadata/md5-cache/app-admin/ansible-lint-4.0.1
-2011252124 metadata/md5-cache/app-admin/ansible-lint-4.1.0
 2011252124 metadata/md5-cache/app-admin/apache-tools-2.4.41
 2011252124 metadata/md5-cache/app-admin/apache-tools-2.4.43
 2011252124 metadata/md5-cache/app-admin/apache-tools-2.4.46
@@ -31187,9 +31150,7 @@
 2011252124 metadata/md5-cache/app-admin/chrpath-0.16
 2011252124 metadata/md5-cache/app-admin/clog-1.3.0
 2011252124 metadata/md5-cache/app-admin/clsync-0.4.4
-2011252124 metadata/md5-cache/app-admin/clsync-0.4.5
 2011252124 metadata/md5-cache/app-admin/clsync-9999
-2011252124 metadata/md5-cache/app-admin/clustershell-1.8.3
 2011252124 metadata/md5-cache/app-admin/conky-1.10.8-r10
 2011252124 metadata/md5-cache/app-admin/conky-1.10.8-r9
 2011252124 metadata/md5-cache/app-admin/conky-1.11.6-r2
@@ -31207,17 +31168,11 @@
 2011252124 metadata/md5-cache/app-admin/cronolog-1.6.2-r5
 2011252124 metadata/md5-cache/app-admin/cygwin-rebase-4.4.4
 2011252124 metadata/md5-cache/app-admin/cygwin-rebase-9999
-2011252124 metadata/md5-cache/app-admin/diamond-4.0.515.20170311
-2011252124 metadata/md5-cache/app-admin/diamond-4.0.515.20200620
 2011252124 metadata/md5-cache/app-admin/dio-1.5.2-r1
 2011252124 metadata/md5-cache/app-admin/doas-6.0
 2011252124 metadata/md5-cache/app-admin/doas-6.6.1
 2011252124 metadata/md5-cache/app-admin/docker-bench-0.2.2
 2011252124 metadata/md5-cache/app-admin/drush-6.7.0-r1
-2011252124 metadata/md5-cache/app-admin/eclean-kernel-0.4.3
-2011252124 metadata/md5-cache/app-admin/eclean-kernel-2.99.1
-2011252124 metadata/md5-cache/app-admin/eclean-kernel-2.99.2
-2011252124 metadata/md5-cache/app-admin/eclean-kernel-9999
 2011252124 metadata/md5-cache/app-admin/elektra-0.8.20-r1
 2011252124 metadata/md5-cache/app-admin/entr-4.5
 2011252124 metadata/md5-cache/app-admin/entr-4.6
@@ -31241,14 +31196,8 @@
 2011252124 metadata/md5-cache/app-admin/gamin-0.1.10-r1
 2011252124 metadata/md5-cache/app-admin/genromfs-0.5.2
 2011252124 metadata/md5-cache/app-admin/github-backup-utils-2.22.0
-2011252124 metadata/md5-cache/app-admin/gixy-0.1.20
 2011252124 metadata/md5-cache/app-admin/gkrellm-2.3.11-r1
 2011252124 metadata/md5-cache/app-admin/gkrellm-9999
-2011252124 metadata/md5-cache/app-admin/glance-20.0.0
-2011252124 metadata/md5-cache/app-admin/glance-20.0.1
-2011252124 metadata/md5-cache/app-admin/glance-2020.1.9999
-2011252124 metadata/md5-cache/app-admin/glance-2020.2.9999
-2011252124 metadata/md5-cache/app-admin/glance-21.0.0
 2011252124 metadata/md5-cache/app-admin/gnome-abrt-1.3.6
 2011252124 metadata/md5-cache/app-admin/gnome-system-log-3.9.90
 2011252124 metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20130823
@@ -31297,8 +31246,6 @@
 2011252124 metadata/md5-cache/app-admin/monit-5.27.0
 2011252124 metadata/md5-cache/app-admin/monit-5.27.1
 2011252124 metadata/md5-cache/app-admin/multilog-watch-1.12-r1
-2011252124 metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201
-2011252124 metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201-r1
 2011252124 metadata/md5-cache/app-admin/pass-1.7.3
 2011252124 metadata/md5-cache/app-admin/pass-9999
 2011252124 metadata/md5-cache/app-admin/pass-otp-1.2.0
@@ -31310,8 +31257,6 @@
 2011252124 metadata/md5-cache/app-admin/prelude-manager-5.1.0
 2011252124 metadata/md5-cache/app-admin/prelude-manager-5.2.0
 2011252124 metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1
-2011252124 metadata/md5-cache/app-admin/ps_mem-3.13-r1
-2011252124 metadata/md5-cache/app-admin/ps_mem-3.13_p20200417
 2011252124 metadata/md5-cache/app-admin/psmon-1.39-r1
 2011252124 metadata/md5-cache/app-admin/puppet-5.5.19-r1
 2011252124 metadata/md5-cache/app-admin/puppet-5.5.21
@@ -31327,8 +31272,6 @@
 2011252124 metadata/md5-cache/app-admin/puppetserver-6.13.0
 2011252124 metadata/md5-cache/app-admin/puppetserver-6.14.0
 2011252124 metadata/md5-cache/app-admin/pwcrypt-1.2.2-r2
-2011252124 metadata/md5-cache/app-admin/pwman3-0.10.0-r1
-2011252124 metadata/md5-cache/app-admin/pwman3-0.11.1
 2011252124 metadata/md5-cache/app-admin/pydf-12-r1
 2011252124 metadata/md5-cache/app-admin/qpage-3.3
 2011252124 metadata/md5-cache/app-admin/qtpass-1.3.2-r1
@@ -31346,25 +31289,15 @@
 2011252124 metadata/md5-cache/app-admin/rsyslog-8.2010.0
 2011252124 metadata/md5-cache/app-admin/sagan-1.0.0_rc3
 2011252124 metadata/md5-cache/app-admin/sagan-1.0.0_rc3-r1
-2011252124 metadata/md5-cache/app-admin/salt-2019.2.7
-2011252124 metadata/md5-cache/app-admin/salt-3000.5
-2011252124 metadata/md5-cache/app-admin/salt-3001.3
-2011252124 metadata/md5-cache/app-admin/salt-3002.1
-2011252124 metadata/md5-cache/app-admin/salt-3002.2
 2011252124 metadata/md5-cache/app-admin/selint-1.1.0
 2011252124 metadata/md5-cache/app-admin/selint-9999
 2011252124 metadata/md5-cache/app-admin/serf-0.8.1-r1
-2011252124 metadata/md5-cache/app-admin/setools-4.2.2
-2011252124 metadata/md5-cache/app-admin/setools-4.3.0
-2011252124 metadata/md5-cache/app-admin/setools-9999
 2011252124 metadata/md5-cache/app-admin/socklog-2.1.0
 2011252124 metadata/md5-cache/app-admin/sshguard-99999
 2011252124 metadata/md5-cache/app-admin/su-exec-0.2
 2011252124 metadata/md5-cache/app-admin/sud-1.3-r1
 2011252124 metadata/md5-cache/app-admin/sudo-1.9.3_p1
 2011252124 metadata/md5-cache/app-admin/sudo-9999
-2011252124 metadata/md5-cache/app-admin/supervisor-4.2.0
-2011252124 metadata/md5-cache/app-admin/supervisor-4.2.1
 2011252124 metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
 2011252124 metadata/md5-cache/app-admin/sxid-4.2-r2
 2011252124 metadata/md5-cache/app-admin/sysklogd-2.1.2
@@ -31395,10 +31328,7 @@
 2011252124 metadata/md5-cache/app-admin/verynice-1.1-r3
 2011252124 metadata/md5-cache/app-admin/watchfolder-0.3.3-r1
 2011252124 metadata/md5-cache/app-admin/webalizer-2.23.08
-2011252124 metadata/md5-cache/app-admin/webapp-config-1.55-r1
-2011252124 metadata/md5-cache/app-admin/webapp-config-9999
 2011252124 metadata/md5-cache/app-admin/whowatch-99999
-2011252124 metadata/md5-cache/app-admin/xkcdpass-1.17.3-r1
 2011252124 metadata/md5-cache/app-admin/xstow-1.0.1
 2011252124 metadata/md5-cache/app-admin/xtail-2.1-r1
 2011252124 metadata/md5-cache/app-admin/yadm-2.4.0
@@ -31408,14 +31338,58 @@
 2011262339 metadata/md5-cache/app-admin/whowatch-1.8.6
 2011272009 metadata/md5-cache/app-admin/graylog-4.0.1
 2011282239 metadata/md5-cache/app-admin/helm-3.4.1
-2012010109 metadata/md5-cache/app-admin/Manifest.gz
-2012010109 metadata/md5-cache/app-admin/cdist-6.9.2
-2011302039 metadata/md5-cache/app-admin/sudo-1.9.4
-2011252124 metadata/md5-cache/app-antivirus/Manifest.gz
+2012031039 metadata/md5-cache/app-admin/Manifest.gz
+2012011340 metadata/md5-cache/app-admin/ansible-2.10.0-r2
+2012031039 metadata/md5-cache/app-admin/ansible-2.10.1
+2012011340 metadata/md5-cache/app-admin/ansible-9999
+2012011340 metadata/md5-cache/app-admin/ansible-base-2.10.2
+2012031039 metadata/md5-cache/app-admin/ansible-base-2.10.3
+2012011340 metadata/md5-cache/app-admin/ansible-cmdb-1.28
+2012011340 metadata/md5-cache/app-admin/ansible-lint-4.0.1
+2012011340 metadata/md5-cache/app-admin/ansible-lint-4.1.0
+2012011340 metadata/md5-cache/app-admin/cdist-6.9.2
+2012020639 metadata/md5-cache/app-admin/clsync-0.4.5
+2012011340 metadata/md5-cache/app-admin/clustershell-1.8.3
+2012011340 metadata/md5-cache/app-admin/diamond-4.0.515.20170311
+2012011340 metadata/md5-cache/app-admin/diamond-4.0.515.20200620
+2012011340 metadata/md5-cache/app-admin/eclean-kernel-0.4.3
+2012011340 metadata/md5-cache/app-admin/eclean-kernel-2.99.1
+2012011340 metadata/md5-cache/app-admin/eclean-kernel-2.99.2
+2012011340 metadata/md5-cache/app-admin/eclean-kernel-9999
+2012020639 metadata/md5-cache/app-admin/gentoo-perl-helpers-0.4.0
+2012011340 metadata/md5-cache/app-admin/gixy-0.1.20
+2012011340 metadata/md5-cache/app-admin/glance-20.0.0
+2012011340 metadata/md5-cache/app-admin/glance-20.0.1
+2012011340 metadata/md5-cache/app-admin/glance-2020.1.9999
+2012011340 metadata/md5-cache/app-admin/glance-2020.2.9999
+2012021739 metadata/md5-cache/app-admin/glance-21.0.0
+2012030739 metadata/md5-cache/app-admin/mongo-tools-100.2.0
+2012011340 metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201
+2012011340 metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201-r1
+2012011340 metadata/md5-cache/app-admin/ps_mem-3.13-r1
+2012011340 metadata/md5-cache/app-admin/ps_mem-3.13_p20200417
+2012011340 metadata/md5-cache/app-admin/pwman3-0.10.0-r1
+2012011340 metadata/md5-cache/app-admin/pwman3-0.11.1
+2012011340 metadata/md5-cache/app-admin/salt-2019.2.7
+2012011340 metadata/md5-cache/app-admin/salt-3000.5
+2012011340 metadata/md5-cache/app-admin/salt-3001.3
+2012011340 metadata/md5-cache/app-admin/salt-3002.1
+2012011340 metadata/md5-cache/app-admin/salt-3002.2
+2012011340 metadata/md5-cache/app-admin/setools-4.2.2
+2012030639 metadata/md5-cache/app-admin/setools-4.3.0
+2012011340 metadata/md5-cache/app-admin/setools-9999
+2012030239 metadata/md5-cache/app-admin/sshguard-2.4.1
+2012011409 metadata/md5-cache/app-admin/sudo-1.9.4
+2012011340 metadata/md5-cache/app-admin/supervisor-4.2.0
+2012011340 metadata/md5-cache/app-admin/supervisor-4.2.1
+2012011340 metadata/md5-cache/app-admin/webapp-config-1.55-r1
+2012011340 metadata/md5-cache/app-admin/webapp-config-9999
+2012011340 metadata/md5-cache/app-admin/xkcdpass-1.17.3-r1
 2011252124 metadata/md5-cache/app-antivirus/clamav-0.102.4
 2011252124 metadata/md5-cache/app-antivirus/clamav-0.103.0-r1
 2011252124 metadata/md5-cache/app-antivirus/clamtk-6.06
-2011252124 metadata/md5-cache/app-antivirus/fangfrisch-1.2.0-r1
+2012011340 metadata/md5-cache/app-antivirus/Manifest.gz
+2012011340 metadata/md5-cache/app-antivirus/fangfrisch-1.2.0-r1
 1909082140 metadata/md5-cache/app-arch/atool-0.39.0-r1
 1802120308 metadata/md5-cache/app-arch/stenc-1.0.7
 1812182009 metadata/md5-cache/app-arch/stuffit-5.2.0.611
@@ -31433,14 +31407,10 @@
 2011141839 metadata/md5-cache/app-arch/fastjar-0.98-r3
 2011141839 metadata/md5-cache/app-arch/gtk-splitter-2.2.1-r2
 2011141839 metadata/md5-cache/app-arch/libpar2-0.4
-2011252124 metadata/md5-cache/app-arch/Manifest.gz
 2011252124 metadata/md5-cache/app-arch/advancecomp-2.2_pre20190301
 2011252124 metadata/md5-cache/app-arch/afio-2.5.1-r2
 2011252124 metadata/md5-cache/app-arch/arc-5.21p
 2011252124 metadata/md5-cache/app-arch/arj-3.10.22-r7
-2011252124 metadata/md5-cache/app-arch/bloscpack-0.16.0
-2011252124 metadata/md5-cache/app-arch/brotli-1.0.9-r1
-2011252124 metadata/md5-cache/app-arch/brotli-9999
 2011252124 metadata/md5-cache/app-arch/bsdsfv-1.18-r2
 2011252124 metadata/md5-cache/app-arch/bzip2-1.0.6-r11
 2011252124 metadata/md5-cache/app-arch/bzip2-1.0.7-r1
@@ -31498,7 +31468,6 @@
 2011252124 metadata/md5-cache/app-arch/par2cmdline-0.7.3
 2011252124 metadata/md5-cache/app-arch/par2cmdline-0.7.4
 2011252124 metadata/md5-cache/app-arch/par2cmdline-0.8.0
-2011252124 metadata/md5-cache/app-arch/patool-1.12
 2011252124 metadata/md5-cache/app-arch/pax-20161104
 2011252124 metadata/md5-cache/app-arch/pbzip2-1.1.12
 2011252124 metadata/md5-cache/app-arch/pbzip2-1.1.13
@@ -31524,7 +31493,6 @@
 2011252124 metadata/md5-cache/app-arch/tapeutils-0.4
 2011252124 metadata/md5-cache/app-arch/tar-1.32
 2011252124 metadata/md5-cache/app-arch/tar-1.32.90
-2011252124 metadata/md5-cache/app-arch/tardelta-1.0.1
 2011252124 metadata/md5-cache/app-arch/tarsync-0.2.1-r1
 2011252124 metadata/md5-cache/app-arch/torrentzip-0.9
 2011252124 metadata/md5-cache/app-arch/torrentzip-0.9-r1
@@ -31538,17 +31506,13 @@
 2011252124 metadata/md5-cache/app-arch/unrar-5.9.4
 2011252124 metadata/md5-cache/app-arch/unrar-6.0.1
 2011252124 metadata/md5-cache/app-arch/unrar-6.0.2
-2011252124 metadata/md5-cache/app-arch/unrpa-2.3.0
 2011252124 metadata/md5-cache/app-arch/unshield-1.4.3
 2011252124 metadata/md5-cache/app-arch/unzip-6.0_p25-r1
 2011252124 metadata/md5-cache/app-arch/upx-3.96
-2011252124 metadata/md5-cache/app-arch/vimball-0.5.1
-2011252124 metadata/md5-cache/app-arch/vimball-9999
 2011252124 metadata/md5-cache/app-arch/wimlib-1.12.0
 2011252124 metadata/md5-cache/app-arch/wimlib-1.13.0
 2011252124 metadata/md5-cache/app-arch/xar-1.8-r2
 2011252124 metadata/md5-cache/app-arch/xar-1.8-r3
-2011252124 metadata/md5-cache/app-arch/xarchiver-0.5.4.15
 2011252124 metadata/md5-cache/app-arch/xdms-1.3.2-r1
 2011252124 metadata/md5-cache/app-arch/xz-utils-5.2.5
 2011252124 metadata/md5-cache/app-arch/xz-utils-9999
@@ -31560,6 +31524,17 @@
 2011252124 metadata/md5-cache/app-arch/zpaq-extras-3
 2011252124 metadata/md5-cache/app-arch/zstd-1.4.4-r4
 2011252124 metadata/md5-cache/app-arch/zstd-1.4.5
+2012030239 metadata/md5-cache/app-arch/Manifest.gz
+2012011340 metadata/md5-cache/app-arch/bloscpack-0.16.0
+2012011340 metadata/md5-cache/app-arch/brotli-1.0.9-r1
+2012011340 metadata/md5-cache/app-arch/brotli-9999
+2012011439 metadata/md5-cache/app-arch/libarchive-3.5.0
+2012011340 metadata/md5-cache/app-arch/patool-1.12
+2012011340 metadata/md5-cache/app-arch/tardelta-1.0.1
+2012011340 metadata/md5-cache/app-arch/unrpa-2.3.0
+2012011340 metadata/md5-cache/app-arch/vimball-0.5.1
+2012011340 metadata/md5-cache/app-arch/vimball-9999
+2012030239 metadata/md5-cache/app-arch/xarchiver-0.5.4.15
 1806240109 metadata/md5-cache/app-backup/ccollect-0.8
 1706110808 metadata/md5-cache/app-backup/cdbkup-1.0-r2
 1906012109 metadata/md5-cache/app-backup/consul-backinator-1.6.5
@@ -31594,8 +31569,6 @@
 2011252124 metadata/md5-cache/app-backup/amanda-3.4.5
 2011252124 metadata/md5-cache/app-backup/amanda-3.5-r1
 2011252124 metadata/md5-cache/app-backup/amanda-3.5.1-r1
-2011252124 metadata/md5-cache/app-backup/attic-0.16-r1
-2011252124 metadata/md5-cache/app-backup/attic-9999
 2011252124 metadata/md5-cache/app-backup/backintime-1.2.1
 2011252124 metadata/md5-cache/app-backup/backintime-9999
 2011252124 metadata/md5-cache/app-backup/backup-manager-0.7.14
@@ -31606,13 +31579,6 @@
 2011252124 metadata/md5-cache/app-backup/bareos-17.2.10
 2011252124 metadata/md5-cache/app-backup/bareos-18.2.9
 2011252124 metadata/md5-cache/app-backup/bareos-19.2.8
-2011252124 metadata/md5-cache/app-backup/borgbackup-1.1.11-r2
-2011252124 metadata/md5-cache/app-backup/borgbackup-1.1.13
-2011252124 metadata/md5-cache/app-backup/borgbackup-1.1.14
-2011252124 metadata/md5-cache/app-backup/borgbackup-9999
-2011252124 metadata/md5-cache/app-backup/borgmatic-1.5.10
-2011252124 metadata/md5-cache/app-backup/borgweb-0.2.0-r2
-2011252124 metadata/md5-cache/app-backup/borgweb-0.3.0
 2011252124 metadata/md5-cache/app-backup/btrbk-0.29.1
 2011252124 metadata/md5-cache/app-backup/btrbk-0.30.0
 2011252124 metadata/md5-cache/app-backup/btrbk-9999
@@ -31622,17 +31588,11 @@
 2011252124 metadata/md5-cache/app-backup/cpdup-1.18
 2011252124 metadata/md5-cache/app-backup/dar-2.5.11
 2011252124 metadata/md5-cache/app-backup/dar-2.6.10
-2011252124 metadata/md5-cache/app-backup/duplicity-0.8.15
-2011252124 metadata/md5-cache/app-backup/duplicity-0.8.16
-2011252124 metadata/md5-cache/app-backup/duplicity-0.8.17
 2011252124 metadata/md5-cache/app-backup/fsarchiver-0.8.5
 2011252124 metadata/md5-cache/app-backup/kfoldersync-3.4.1
 2011252124 metadata/md5-cache/app-backup/kup-0.8.0
 2011252124 metadata/md5-cache/app-backup/luckybackup-0.5.0
 2011252124 metadata/md5-cache/app-backup/pdumpfs-1.3-r2
-2011252124 metadata/md5-cache/app-backup/rdiff-backup-2.0.0
-2011252124 metadata/md5-cache/app-backup/rdiff-backup-2.0.5
-2011252124 metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
 2011252124 metadata/md5-cache/app-backup/rdup-1.1.15
 2011252124 metadata/md5-cache/app-backup/rear-2.6
 2011252124 metadata/md5-cache/app-backup/reoback-1.0_p3-r1
@@ -31648,13 +31608,28 @@
 2011252124 metadata/md5-cache/app-backup/tarsnap-1.0.39
 2011252124 metadata/md5-cache/app-backup/tsm-8.1.6.0
 2011252124 metadata/md5-cache/app-backup/tsm-8.1.6.0-r1
-2011252124 metadata/md5-cache/app-backup/untangle-https-backup-0.0.10-r1
 2011252124 metadata/md5-cache/app-backup/zbackup-1.4.4-r1
 2011252124 metadata/md5-cache/app-backup/zbackup-9999
-2011281009 metadata/md5-cache/app-backup/Manifest.gz
-2011272209 metadata/md5-cache/app-backup/borgmatic-1.5.12
 2011271909 metadata/md5-cache/app-backup/duply-2.2.2
 2011281009 metadata/md5-cache/app-backup/rdedup-1.0.2
+2012011340 metadata/md5-cache/app-backup/Manifest.gz
+2012011340 metadata/md5-cache/app-backup/attic-0.16-r1
+2012011340 metadata/md5-cache/app-backup/attic-9999
+2012011340 metadata/md5-cache/app-backup/borgbackup-1.1.11-r2
+2012011340 metadata/md5-cache/app-backup/borgbackup-1.1.13
+2012011340 metadata/md5-cache/app-backup/borgbackup-1.1.14
+2012011340 metadata/md5-cache/app-backup/borgbackup-9999
+2012011340 metadata/md5-cache/app-backup/borgmatic-1.5.10
+2012011340 metadata/md5-cache/app-backup/borgmatic-1.5.12
+2012011340 metadata/md5-cache/app-backup/borgweb-0.2.0-r2
+2012011340 metadata/md5-cache/app-backup/borgweb-0.3.0
+2012011340 metadata/md5-cache/app-backup/duplicity-0.8.15
+2012011340 metadata/md5-cache/app-backup/duplicity-0.8.16
+2012011340 metadata/md5-cache/app-backup/duplicity-0.8.17
+2012011340 metadata/md5-cache/app-backup/rdiff-backup-2.0.0
+2012011340 metadata/md5-cache/app-backup/rdiff-backup-2.0.5
+2012011340 metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
+2012011340 metadata/md5-cache/app-backup/untangle-https-backup-0.0.10-r1
 1905211939 metadata/md5-cache/app-benchmarks/bonnie++-1.98
 1907151840 metadata/md5-cache/app-benchmarks/forkbomb-1.4-r1
 1910290939 metadata/md5-cache/app-benchmarks/geekbench-2.4.2
@@ -31821,8 +31796,6 @@
 2011131609 metadata/md5-cache/app-crypt/easy-rsa-3.0.7
 2011131609 metadata/md5-cache/app-crypt/easy-rsa-3.0.8
 2011252124 metadata/md5-cache/app-crypt/WiRouterKeyRec-1.1.2
-2011252124 metadata/md5-cache/app-crypt/acme-1.9.0
-2011252124 metadata/md5-cache/app-crypt/acme-9999
 2011252124 metadata/md5-cache/app-crypt/acme-client-0.1.16
 2011252124 metadata/md5-cache/app-crypt/acr38u-1.7.11-r3
 2011252124 metadata/md5-cache/app-crypt/aescrypt-3.0.6b
@@ -31835,13 +31808,6 @@
 2011252124 metadata/md5-cache/app-crypt/ccid-1.4.31
 2011252124 metadata/md5-cache/app-crypt/ccid-1.4.32
 2011252124 metadata/md5-cache/app-crypt/ccid-1.4.33
-2011252124 metadata/md5-cache/app-crypt/certbot-1.9.0
-2011252124 metadata/md5-cache/app-crypt/certbot-9999
-2011252124 metadata/md5-cache/app-crypt/certbot-apache-1.9.0
-2011252124 metadata/md5-cache/app-crypt/certbot-apache-9999
-2011252124 metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0-r1
-2011252124 metadata/md5-cache/app-crypt/certbot-nginx-1.9.0
-2011252124 metadata/md5-cache/app-crypt/certbot-nginx-9999
 2011252124 metadata/md5-cache/app-crypt/chntpw-140201
 2011252124 metadata/md5-cache/app-crypt/ckpass-0.2-r1
 2011252124 metadata/md5-cache/app-crypt/codecrypt-1.8-r1
@@ -31859,16 +31825,10 @@
 2011252124 metadata/md5-cache/app-crypt/elettra-1.0
 2011252124 metadata/md5-cache/app-crypt/gcr-3.36.0
 2011252124 metadata/md5-cache/app-crypt/gifshuffle-2.0-r1
-2011252124 metadata/md5-cache/app-crypt/glep63-check-9
 2011252124 metadata/md5-cache/app-crypt/gnupg-2.2.20-r2
 2011252124 metadata/md5-cache/app-crypt/gnupg-2.2.24
 2011252124 metadata/md5-cache/app-crypt/gnupg-2.2.25
 2011252124 metadata/md5-cache/app-crypt/gorilla-1.4-r1
-2011252124 metadata/md5-cache/app-crypt/gpgme-1.13.0
-2011252124 metadata/md5-cache/app-crypt/gpgme-1.13.0-r1
-2011252124 metadata/md5-cache/app-crypt/gpgme-1.13.1
-2011252124 metadata/md5-cache/app-crypt/gpgme-1.14.0
-2011252124 metadata/md5-cache/app-crypt/gpgme-1.15.0
 2011252124 metadata/md5-cache/app-crypt/gpgstats-0.5-r1
 2011252124 metadata/md5-cache/app-crypt/hashcat-5.1.0
 2011252124 metadata/md5-cache/app-crypt/hashcat-6.0.0-r1
@@ -31939,7 +31899,6 @@
 2011252124 metadata/md5-cache/app-crypt/pdfcrack-0.19
 2011252124 metadata/md5-cache/app-crypt/pesign-113
 2011252124 metadata/md5-cache/app-crypt/pinentry-1.1.0-r3
-2011252124 metadata/md5-cache/app-crypt/pius-3.0.0-r1
 2011252124 metadata/md5-cache/app-crypt/pkcrack-1.2.2-r1
 2011252124 metadata/md5-cache/app-crypt/qca-2.3.1
 2011252124 metadata/md5-cache/app-crypt/rhash-1.3.6-r1
@@ -31961,16 +31920,13 @@
 2011252124 metadata/md5-cache/app-crypt/simple-tpm-pk11-0.06
 2011252124 metadata/md5-cache/app-crypt/ssdeep-2.14.1
 2011252124 metadata/md5-cache/app-crypt/ssss-0.5-r1
-2011252124 metadata/md5-cache/app-crypt/ssss-0.5.6
 2011252124 metadata/md5-cache/app-crypt/stan-0.4.1-r1
 2011252124 metadata/md5-cache/app-crypt/stoken-0.92-r1
-2011252124 metadata/md5-cache/app-crypt/swtpm-0.5.1-r1
 2011252124 metadata/md5-cache/app-crypt/tc-play-2.0-r1
 2011252124 metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r2
 2011252124 metadata/md5-cache/app-crypt/tpm-tools-1.3.9.1-r1
 2011252124 metadata/md5-cache/app-crypt/tpm-tools-1.3.9.2
 2011252124 metadata/md5-cache/app-crypt/tpm2-abrmd-2.3.3
-2011252124 metadata/md5-cache/app-crypt/tpm2-pkcs11-1.5.0
 2011252124 metadata/md5-cache/app-crypt/tpm2-tools-4.3.0
 2011252124 metadata/md5-cache/app-crypt/tpm2-tools-5.0
 2011252124 metadata/md5-cache/app-crypt/tpm2-totp-0.3.0
@@ -31980,8 +31936,6 @@
 2011252124 metadata/md5-cache/app-crypt/trousers-0.3.15
 2011252124 metadata/md5-cache/app-crypt/veracrypt-1.24_p7
 2011252124 metadata/md5-cache/app-crypt/xor-analyze-0.5-r1
-2011252124 metadata/md5-cache/app-crypt/yubikey-manager-3.1.0-r1
-2011252124 metadata/md5-cache/app-crypt/yubikey-manager-3.1.1-r1
 2011252124 metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.4-r2
 2011252124 metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.5
 2011252124 metadata/md5-cache/app-crypt/zulucrypt-5.1.0
@@ -31994,9 +31948,35 @@
 2011281009 metadata/md5-cache/app-crypt/nitrocli-0.3.3
 2011281009 metadata/md5-cache/app-crypt/nitrocli-0.3.4
 2011292309 metadata/md5-cache/app-crypt/cardpeek-0.8.4
-2011302339 metadata/md5-cache/app-crypt/Manifest.gz
-2011302339 metadata/md5-cache/app-crypt/acme-tiny-4.1.0
-2011302339 metadata/md5-cache/app-crypt/acme-tiny-9999
+2012030709 metadata/md5-cache/app-crypt/Manifest.gz
+2012030709 metadata/md5-cache/app-crypt/acme-1.10.0
+2012030709 metadata/md5-cache/app-crypt/acme-1.9.0
+2012011340 metadata/md5-cache/app-crypt/acme-9999
+2012011340 metadata/md5-cache/app-crypt/acme-tiny-4.1.0
+2012011340 metadata/md5-cache/app-crypt/acme-tiny-9999
+2012030639 metadata/md5-cache/app-crypt/certbot-1.10.0
+2012011340 metadata/md5-cache/app-crypt/certbot-1.9.0
+2012011340 metadata/md5-cache/app-crypt/certbot-9999
+2012030639 metadata/md5-cache/app-crypt/certbot-apache-1.10.0
+2012011340 metadata/md5-cache/app-crypt/certbot-apache-1.9.0
+2012011340 metadata/md5-cache/app-crypt/certbot-apache-9999
+2012011340 metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0-r1
+2012030639 metadata/md5-cache/app-crypt/certbot-nginx-1.10.0
+2012011340 metadata/md5-cache/app-crypt/certbot-nginx-1.9.0
+2012011340 metadata/md5-cache/app-crypt/certbot-nginx-9999
+2012011340 metadata/md5-cache/app-crypt/glep63-check-9
+2012011340 metadata/md5-cache/app-crypt/gpgme-1.13.0
+2012011340 metadata/md5-cache/app-crypt/gpgme-1.13.0-r1
+2012011340 metadata/md5-cache/app-crypt/gpgme-1.13.1
+2012011340 metadata/md5-cache/app-crypt/gpgme-1.14.0
+2012011340 metadata/md5-cache/app-crypt/gpgme-1.15.0
+2012011340 metadata/md5-cache/app-crypt/openpgp-keys-django-20201201
+2012011340 metadata/md5-cache/app-crypt/pius-3.0.0-r1
+2012030239 metadata/md5-cache/app-crypt/ssss-0.5.6
+2012011340 metadata/md5-cache/app-crypt/swtpm-0.5.1-r1
+2012011340 metadata/md5-cache/app-crypt/tpm2-pkcs11-1.5.0
+2012011340 metadata/md5-cache/app-crypt/yubikey-manager-3.1.0-r1
+2012011340 metadata/md5-cache/app-crypt/yubikey-manager-3.1.1-r1
 1910181539 metadata/md5-cache/app-dicts/bookview-3.2.1
 1808151104 metadata/md5-cache/app-dicts/freedict-deu-eng-1.0
 1702282308 metadata/md5-cache/app-dicts/libydpdict-1.0.2
@@ -32645,8 +32625,6 @@
 2011181909 metadata/md5-cache/app-doc/geant-docs-4.10.6
 2011181909 metadata/md5-cache/app-doc/geant-docs-4.10.6c
 2011252124 metadata/md5-cache/app-doc/NaturalDocs-1.52-r1
-2011252124 metadata/md5-cache/app-doc/cppman-0.4.8-r2
-2011252124 metadata/md5-cache/app-doc/cppman-0.4.9
 2011252124 metadata/md5-cache/app-doc/doxygen-1.8.17
 2011252124 metadata/md5-cache/app-doc/doxygen-9999
 2011252124 metadata/md5-cache/app-doc/elisp-manual-18.1.03
@@ -32662,12 +32640,14 @@
 2011252124 metadata/md5-cache/app-doc/kicad-doc-5.1.7
 2011252124 metadata/md5-cache/app-doc/kicad-doc-5.1.8
 2011252124 metadata/md5-cache/app-doc/linux-kernel-in-a-nutshell-1-r1
-2011252124 metadata/md5-cache/app-doc/mathjax-docs-2.7.7
 2011252124 metadata/md5-cache/app-doc/psmark-2.1
 2011252124 metadata/md5-cache/app-doc/votca-csg-manual-9999
 2011252124 metadata/md5-cache/app-doc/zeal-0.6.1_p20200815
-2011290239 metadata/md5-cache/app-doc/Manifest.gz
 2011290239 metadata/md5-cache/app-doc/halibut-1.2
+2012011340 metadata/md5-cache/app-doc/Manifest.gz
+2012011340 metadata/md5-cache/app-doc/cppman-0.4.8-r2
+2012011340 metadata/md5-cache/app-doc/cppman-0.4.9
+2012011340 metadata/md5-cache/app-doc/mathjax-docs-2.7.7
 1702282308 metadata/md5-cache/app-editors/jupp-3.1_p30
 1811251609 metadata/md5-cache/app-editors/jupp-3.1_p38
 1702282308 metadata/md5-cache/app-editors/le-1.16.1
@@ -32685,9 +32665,7 @@
 2006070938 metadata/md5-cache/app-editors/vis-0.5
 2006090809 metadata/md5-cache/app-editors/kakoune-2020.01.16-r1
 2006090809 metadata/md5-cache/app-editors/kakoune-2020.01.16_p20200601
-2007051009 metadata/md5-cache/app-editors/vis-0.6
 2008291509 metadata/md5-cache/app-editors/jed-0.99.19-r1
-2009021410 metadata/md5-cache/app-editors/vis-9999
 2009071209 metadata/md5-cache/app-editors/hteditor-2.1.1_pre20161206
 2009121921 metadata/md5-cache/app-editors/mousepad-0.4.2
 2011202309 metadata/md5-cache/app-editors/mousepad-0.4.90
@@ -32743,8 +32721,6 @@
 2011252124 metadata/md5-cache/app-editors/moe-1.10
 2011252124 metadata/md5-cache/app-editors/moe-1.9
 2011252124 metadata/md5-cache/app-editors/nano-4.9.3
-2011252124 metadata/md5-cache/app-editors/nano-5.2
-2011252124 metadata/md5-cache/app-editors/nano-5.3-r1
 2011252124 metadata/md5-cache/app-editors/nano-9999
 2011252124 metadata/md5-cache/app-editors/ne-3.1.1
 2011252124 metadata/md5-cache/app-editors/ne-3.3.0
@@ -32759,18 +32735,12 @@
 2011252124 metadata/md5-cache/app-editors/notepadqq-9999
 2011252124 metadata/md5-cache/app-editors/okteta-0.26.4
 2011252124 metadata/md5-cache/app-editors/pluma-1.24.0
-2011252124 metadata/md5-cache/app-editors/pluma-1.24.1
-2011252124 metadata/md5-cache/app-editors/pyvim-3.0.2
 2011252124 metadata/md5-cache/app-editors/qemacs-0.4.1_pre20170225
-2011252124 metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316
 2011252124 metadata/md5-cache/app-editors/qxmledit-0.9.12
-2011252124 metadata/md5-cache/app-editors/retext-7.1.0
-2011252124 metadata/md5-cache/app-editors/retext-9999
 2011252124 metadata/md5-cache/app-editors/sandy-0.4-r1
 2011252124 metadata/md5-cache/app-editors/scite-4.2.1
 2011252124 metadata/md5-cache/app-editors/scite-4.3.3
 2011252124 metadata/md5-cache/app-editors/scite-4.4.4
-2011252124 metadata/md5-cache/app-editors/shed-1.15
 2011252124 metadata/md5-cache/app-editors/tea-47.0.0
 2011252124 metadata/md5-cache/app-editors/teco-36_p19940820
 2011252124 metadata/md5-cache/app-editors/ted-2.23
@@ -32804,9 +32774,19 @@
 2011281539 metadata/md5-cache/app-editors/emacs-27.1-r3
 2011281539 metadata/md5-cache/app-editors/emacs-27.1.9999-r1
 2011281539 metadata/md5-cache/app-editors/emacs-28.0.9999
-2012010009 metadata/md5-cache/app-editors/Manifest.gz
 2012010009 metadata/md5-cache/app-editors/hexcurse-1.60.0
 2011302109 metadata/md5-cache/app-editors/mousepad-0.5.0
+2012031109 metadata/md5-cache/app-editors/Manifest.gz
+2012031009 metadata/md5-cache/app-editors/nano-5.3-r1
+2012022009 metadata/md5-cache/app-editors/nano-5.4
+2012030239 metadata/md5-cache/app-editors/pluma-1.24.1
+2012011340 metadata/md5-cache/app-editors/pyvim-3.0.2
+2012011340 metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316
+2012011340 metadata/md5-cache/app-editors/retext-7.1.0
+2012011340 metadata/md5-cache/app-editors/retext-9999
+2012030239 metadata/md5-cache/app-editors/shed-1.15
+2012031109 metadata/md5-cache/app-editors/vis-0.6
+2012031109 metadata/md5-cache/app-editors/vis-9999
 2009251309 metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
 2009251309 metadata/md5-cache/app-emacs/adaptive-wrap-0.7
 2009251309 metadata/md5-cache/app-emacs/analog-1.9.99
@@ -33047,7 +33027,6 @@
 2011211209 metadata/md5-cache/app-emacs/ddskk-16.3
 2011211209 metadata/md5-cache/app-emacs/ddskk-17.1
 2011221209 metadata/md5-cache/app-emacs/yaml-mode-0.0.15
-2011252124 metadata/md5-cache/app-emacs/Manifest.gz
 2011252124 metadata/md5-cache/app-emacs/bbdb-3.1.2-r2
 2011252124 metadata/md5-cache/app-emacs/bbdb-3.2_pre20180106
 2011252124 metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3
@@ -33063,7 +33042,6 @@
 2011252124 metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
 2011252124 metadata/md5-cache/app-emacs/mpg123-el-1.60
 2011252124 metadata/md5-cache/app-emacs/mpg123-el-1.61
-2011252124 metadata/md5-cache/app-emacs/pymacs-0.26-r2
 2011252124 metadata/md5-cache/app-emacs/redo+-1.19
 2011252124 metadata/md5-cache/app-emacs/semi-1.14.6-r2
 2011252124 metadata/md5-cache/app-emacs/slime-2.15
@@ -33073,6 +33051,8 @@
 2011252124 metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
 2011252124 metadata/md5-cache/app-emacs/yc-4.0.13
 2011252124 metadata/md5-cache/app-emacs/zenirc-2.112-r1
+2012011340 metadata/md5-cache/app-emacs/Manifest.gz
+2012011340 metadata/md5-cache/app-emacs/pymacs-0.26-r2
 1804270439 metadata/md5-cache/app-emulation/bochs-2.6.9
 1910051539 metadata/md5-cache/app-emulation/dlx-1.0.0
 1709080309 metadata/md5-cache/app-emulation/docker-bench-security-1.3.2
@@ -33124,7 +33104,6 @@
 2008300209 metadata/md5-cache/app-emulation/conmon-2.0.20
 2009020709 metadata/md5-cache/app-emulation/virtualbox-additions-6.0.24
 2009021410 metadata/md5-cache/app-emulation/docker-gc-9999
-2009021410 metadata/md5-cache/app-emulation/rex-client-9999
 2009091139 metadata/md5-cache/app-emulation/virtualbox-additions-6.1.14
 2009121921 metadata/md5-cache/app-emulation/libvirt-snmp-0.0.4
 2009141809 metadata/md5-cache/app-emulation/cadvisor-0.36.0
@@ -33150,9 +33129,6 @@
 2011252124 metadata/md5-cache/app-emulation/buildah-1.14.11
 2011252124 metadata/md5-cache/app-emulation/buildah-1.15.1
 2011252124 metadata/md5-cache/app-emulation/buildah-1.16.1
-2011252124 metadata/md5-cache/app-emulation/cloud-init-19.4
-2011252124 metadata/md5-cache/app-emulation/cloud-init-20.1
-2011252124 metadata/md5-cache/app-emulation/cloud-init-9999
 2011252124 metadata/md5-cache/app-emulation/coldfire-0.3.1
 2011252124 metadata/md5-cache/app-emulation/containerd-1.3.7
 2011252124 metadata/md5-cache/app-emulation/cri-tools-1.18.0
@@ -33160,17 +33136,9 @@
 2011252124 metadata/md5-cache/app-emulation/crun-0.14.1
 2011252124 metadata/md5-cache/app-emulation/crun-0.15
 2011252124 metadata/md5-cache/app-emulation/dinero-4.7-r1
-2011252124 metadata/md5-cache/app-emulation/diskimage-builder-3.3.1
-2011252124 metadata/md5-cache/app-emulation/diskimage-builder-3.4.0
-2011252124 metadata/md5-cache/app-emulation/diskimage-builder-9999
 2011252124 metadata/md5-cache/app-emulation/distrobuilder-1.1
 2011252124 metadata/md5-cache/app-emulation/dlx-1.5.20
 2011252124 metadata/md5-cache/app-emulation/docker-19.03.13-r2
-2011252124 metadata/md5-cache/app-emulation/docker-compose-1.25.5
-2011252124 metadata/md5-cache/app-emulation/docker-compose-1.26.2
-2011252124 metadata/md5-cache/app-emulation/docker-compose-1.27.2
-2011252124 metadata/md5-cache/app-emulation/docker-compose-1.27.3
-2011252124 metadata/md5-cache/app-emulation/docker-compose-1.27.4
 2011252124 metadata/md5-cache/app-emulation/docker-registry-2.7.1
 2011252124 metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
 2011252124 metadata/md5-cache/app-emulation/dynamips-0.2.18
@@ -33188,13 +33156,11 @@
 2011252124 metadata/md5-cache/app-emulation/free42-2.5.20
 2011252124 metadata/md5-cache/app-emulation/free42-2.5.21
 2011252124 metadata/md5-cache/app-emulation/fs-uae-3.0.5
-2011252124 metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.5
 2011252124 metadata/md5-cache/app-emulation/fuse-1.5.7
 2011252124 metadata/md5-cache/app-emulation/fuse-utils-1.4.3
 2011252124 metadata/md5-cache/app-emulation/gallium-nine-standalone-0.7
 2011252124 metadata/md5-cache/app-emulation/gallium-nine-standalone-9999
 2011252124 metadata/md5-cache/app-emulation/genymotion-bin-3.1.2
-2011252124 metadata/md5-cache/app-emulation/glean-1.17.0
 2011252124 metadata/md5-cache/app-emulation/gxemul-0.6.0-r1
 2011252124 metadata/md5-cache/app-emulation/gxemul-0.6.2
 2011252124 metadata/md5-cache/app-emulation/hercules-3.10
@@ -33221,8 +33187,6 @@
 2011252124 metadata/md5-cache/app-emulation/nemu-9999
 2011252124 metadata/md5-cache/app-emulation/open-vm-tools-11.2.0_p16938113
 2011252124 metadata/md5-cache/app-emulation/pcem-16-r1
-2011252124 metadata/md5-cache/app-emulation/protontricks-1.4.1
-2011252124 metadata/md5-cache/app-emulation/protontricks-1.4.2
 2011252124 metadata/md5-cache/app-emulation/punes-0.106
 2011252124 metadata/md5-cache/app-emulation/q4wine-1.3.12
 2011252124 metadata/md5-cache/app-emulation/qemu-5.1.0-r2
@@ -33235,9 +33199,6 @@
 2011252124 metadata/md5-cache/app-emulation/qt-virt-manager-9999
 2011252124 metadata/md5-cache/app-emulation/runc-1.0.0_rc10-r1
 2011252124 metadata/md5-cache/app-emulation/runv-0.7.0
-2011252124 metadata/md5-cache/app-emulation/sen-0.6.0
-2011252124 metadata/md5-cache/app-emulation/sen-0.6.1
-2011252124 metadata/md5-cache/app-emulation/sen-0.6.1_p20200905
 2011252124 metadata/md5-cache/app-emulation/simh-3.11.1
 2011252124 metadata/md5-cache/app-emulation/simplevirt-0.0_p20181012-r1
 2011252124 metadata/md5-cache/app-emulation/ski-1.3.2-r4
@@ -33259,9 +33220,6 @@
 2011252124 metadata/md5-cache/app-emulation/vagrant-2.2.9-r1
 2011252124 metadata/md5-cache/app-emulation/vice-3.4_p37498
 2011252124 metadata/md5-cache/app-emulation/vice-3.4_p38553
-2011252124 metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3
-2011252124 metadata/md5-cache/app-emulation/virt-manager-3.1.0
-2011252124 metadata/md5-cache/app-emulation/virt-manager-9999
 2011252124 metadata/md5-cache/app-emulation/virt-viewer-7.0
 2011252124 metadata/md5-cache/app-emulation/virt-viewer-8.0
 2011252124 metadata/md5-cache/app-emulation/virt-viewer-9.0
@@ -33289,9 +33247,6 @@
 2011252124 metadata/md5-cache/app-emulation/wine-staging-5.18
 2011252124 metadata/md5-cache/app-emulation/wine-staging-5.20
 2011252124 metadata/md5-cache/app-emulation/wine-staging-5.21
-2011252124 metadata/md5-cache/app-emulation/wine-staging-5.22
-2011252124 metadata/md5-cache/app-emulation/wine-staging-5.22-r1
-2011252124 metadata/md5-cache/app-emulation/wine-staging-9999
 2011252124 metadata/md5-cache/app-emulation/wine-vanilla-4.0.3
 2011252124 metadata/md5-cache/app-emulation/wine-vanilla-5.0.1
 2011252124 metadata/md5-cache/app-emulation/wine-vanilla-5.0.2
@@ -33299,9 +33254,6 @@
 2011252124 metadata/md5-cache/app-emulation/wine-vanilla-5.19
 2011252124 metadata/md5-cache/app-emulation/wine-vanilla-5.20
 2011252124 metadata/md5-cache/app-emulation/wine-vanilla-5.21
-2011252124 metadata/md5-cache/app-emulation/wine-vanilla-5.22
-2011252124 metadata/md5-cache/app-emulation/wine-vanilla-5.22-r1
-2011252124 metadata/md5-cache/app-emulation/wine-vanilla-9999
 2011252124 metadata/md5-cache/app-emulation/x48-0.6.4-r2
 2011252124 metadata/md5-cache/app-emulation/xe-guest-utilities-6.2.0_p1120
 2011252124 metadata/md5-cache/app-emulation/xen-4.13.2-r1
@@ -33313,9 +33265,38 @@
 2011281009 metadata/md5-cache/app-emulation/firecracker-0.21.1-r1
 2011272339 metadata/md5-cache/app-emulation/snapd-2.47.1-r1
 2011280009 metadata/md5-cache/app-emulation/snapd-2.48
-2011272009 metadata/md5-cache/app-emulation/xen-4.13.2-r2
 2011272009 metadata/md5-cache/app-emulation/xen-4.14.0-r6
-2011290409 metadata/md5-cache/app-emulation/Manifest.gz
+2012031109 metadata/md5-cache/app-emulation/Manifest.gz
+2012011340 metadata/md5-cache/app-emulation/cloud-init-19.4
+2012011340 metadata/md5-cache/app-emulation/cloud-init-20.1
+2012011340 metadata/md5-cache/app-emulation/cloud-init-9999
+2012030009 metadata/md5-cache/app-emulation/containerd-1.3.9
+2012011340 metadata/md5-cache/app-emulation/diskimage-builder-3.3.1
+2012011340 metadata/md5-cache/app-emulation/diskimage-builder-3.4.0
+2012011340 metadata/md5-cache/app-emulation/diskimage-builder-9999
+2012030009 metadata/md5-cache/app-emulation/docker-19.03.14
+2012011340 metadata/md5-cache/app-emulation/docker-compose-1.25.5
+2012011340 metadata/md5-cache/app-emulation/docker-compose-1.26.2
+2012011340 metadata/md5-cache/app-emulation/docker-compose-1.27.2
+2012011340 metadata/md5-cache/app-emulation/docker-compose-1.27.3
+2012011340 metadata/md5-cache/app-emulation/docker-compose-1.27.4
+2012030009 metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20201105
+2012011340 metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.5
+2012011340 metadata/md5-cache/app-emulation/glean-1.17.0
+2012030039 metadata/md5-cache/app-emulation/pcem-17
+2012011340 metadata/md5-cache/app-emulation/protontricks-1.4.1
+2012011340 metadata/md5-cache/app-emulation/protontricks-1.4.2
+2012011340 metadata/md5-cache/app-emulation/sen-0.6.0
+2012011340 metadata/md5-cache/app-emulation/sen-0.6.1
+2012011340 metadata/md5-cache/app-emulation/sen-0.6.1_p20200905
+2012011340 metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3
+2012011340 metadata/md5-cache/app-emulation/virt-manager-3.1.0
+2012011340 metadata/md5-cache/app-emulation/virt-manager-9999
+2012011809 metadata/md5-cache/app-emulation/wine-staging-5.22-r2
+2012011809 metadata/md5-cache/app-emulation/wine-staging-9999
+2012011809 metadata/md5-cache/app-emulation/wine-vanilla-5.22-r2
+2012011809 metadata/md5-cache/app-emulation/wine-vanilla-9999
+2012031109 metadata/md5-cache/app-emulation/xen-4.13.2-r2
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1-r1
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1.1
 1911131109 metadata/md5-cache/app-eselect/eselect-lcdfilter-2
@@ -33381,7 +33362,6 @@
 2011252124 metadata/md5-cache/app-forensics/afl-2.56b
 2011252124 metadata/md5-cache/app-forensics/afl-2.57b
 2011252124 metadata/md5-cache/app-forensics/aide-0.16-r1
-2011252124 metadata/md5-cache/app-forensics/aide-0.16.2_p20200614
 2011252124 metadata/md5-cache/app-forensics/chkrootkit-0.53
 2011252124 metadata/md5-cache/app-forensics/cmospwd-5.1-r1
 2011252124 metadata/md5-cache/app-forensics/dfxml-20170921-r1
@@ -33403,8 +33383,9 @@
 2011252124 metadata/md5-cache/app-forensics/sleuthkit-4.9.0
 2011252124 metadata/md5-cache/app-forensics/unhide-20130526
 2011252124 metadata/md5-cache/app-forensics/yasat-848
-2011260639 metadata/md5-cache/app-forensics/Manifest.gz
 2011260639 metadata/md5-cache/app-forensics/sleuthkit-4.10.1
+2012030239 metadata/md5-cache/app-forensics/Manifest.gz
+2012030239 metadata/md5-cache/app-forensics/aide-0.16.2_p20200614
 1910230639 metadata/md5-cache/app-i18n/cstools-3.42-r1
 1707181708 metadata/md5-cache/app-i18n/freewnn-1.1.1_alpha23
 1708161738 metadata/md5-cache/app-i18n/ibus-fbterm-1.0.1
@@ -33445,7 +33426,6 @@
 2007041709 metadata/md5-cache/app-i18n/tegaki-zinnia-japanese-0.3
 2008011539 metadata/md5-cache/app-i18n/libcangjie-1.3
 2008231639 metadata/md5-cache/app-i18n/tomoe-gtk-0.6.0-r6
-2009021410 metadata/md5-cache/app-i18n/kde-l10n-scripts-9999
 2009021739 metadata/md5-cache/app-i18n/sunpinyin-data-20140820
 2009031709 metadata/md5-cache/app-i18n/ibus-table-others-1.3.11
 2009031709 metadata/md5-cache/app-i18n/ibus-table-others-1.3.9
@@ -33557,8 +33537,6 @@
 2011252124 metadata/md5-cache/app-i18n/mozc-2.23.2815.102
 2011252124 metadata/md5-cache/app-i18n/mozc-9999
 2011252124 metadata/md5-cache/app-i18n/multiskkserv-20100128
-2011252124 metadata/md5-cache/app-i18n/nkf-2.1.4
-2011252124 metadata/md5-cache/app-i18n/nkf-2.1.5
 2011252124 metadata/md5-cache/app-i18n/opencc-1.0.5
 2011252124 metadata/md5-cache/app-i18n/opencc-1.0.6
 2011252124 metadata/md5-cache/app-i18n/opencc-9999
@@ -33581,8 +33559,6 @@
 2011252124 metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001
 2011252124 metadata/md5-cache/app-i18n/tagainijisho-9999
 2011252124 metadata/md5-cache/app-i18n/tomoe-0.6.0-r6
-2011252124 metadata/md5-cache/app-i18n/transifex-client-0.13.9
-2011252124 metadata/md5-cache/app-i18n/transifex-client-0.14.2
 2011252124 metadata/md5-cache/app-i18n/uchardet-0.0.6-r2
 2011252124 metadata/md5-cache/app-i18n/uchardet-0.0.7
 2011252124 metadata/md5-cache/app-i18n/uchardet-9999
@@ -33593,8 +33569,12 @@
 2011252124 metadata/md5-cache/app-i18n/yaskkserv-1.1.1-r1
 2011252124 metadata/md5-cache/app-i18n/zinnia-0.06-r3
 2011252124 metadata/md5-cache/app-i18n/zinnia-tomoe-0.6.0_p20080911
-2011290239 metadata/md5-cache/app-i18n/Manifest.gz
 2011290239 metadata/md5-cache/app-i18n/uim-1.8.8
+2012030939 metadata/md5-cache/app-i18n/Manifest.gz
+2012011340 metadata/md5-cache/app-i18n/nkf-2.1.4
+2012011340 metadata/md5-cache/app-i18n/nkf-2.1.5
+2012011340 metadata/md5-cache/app-i18n/transifex-client-0.13.9
+2012011340 metadata/md5-cache/app-i18n/transifex-client-0.14.2
 2002112051 metadata/md5-cache/app-laptop/hdaps-gl-0.0.7
 2011252124 metadata/md5-cache/app-laptop/Manifest.gz
 2011252124 metadata/md5-cache/app-laptop/dispad-0.3.1-r1
@@ -33768,7 +33748,6 @@
 2009262309 metadata/md5-cache/app-misc/joymouse-0.5-r1
 2010062209 metadata/md5-cache/app-misc/spire-0.11.1
 2010080139 metadata/md5-cache/app-misc/go-jira-1.0.27
-2010112109 metadata/md5-cache/app-misc/dtach-0.9
 2010091139 metadata/md5-cache/app-misc/fr24feed-1.0.25_p3
 2010260239 metadata/md5-cache/app-misc/glastree-1.04_p20150525
 2011061444 metadata/md5-cache/app-misc/carbon-c-relay-3.5
@@ -33788,7 +33767,6 @@
 2011252124 metadata/md5-cache/app-misc/anki-2.1.13-r1
 2011252124 metadata/md5-cache/app-misc/anki-2.1.15
 2011252124 metadata/md5-cache/app-misc/asciicast-tools-0.0_pre20190410
-2011252124 metadata/md5-cache/app-misc/asciinema-2.0.2
 2011252124 metadata/md5-cache/app-misc/astrolog-5.40-r3
 2011252124 metadata/md5-cache/app-misc/away-0.9.5-r2
 2011252124 metadata/md5-cache/app-misc/banner-1.3.3
@@ -33801,8 +33779,6 @@
 2011252124 metadata/md5-cache/app-misc/bgrep-0_p20110121-r1
 2011252124 metadata/md5-cache/app-misc/bijiben-3.36.3
 2011252124 metadata/md5-cache/app-misc/binclock-1.5
-2011252124 metadata/md5-cache/app-misc/binwalk-2.2.0
-2011252124 metadata/md5-cache/app-misc/binwalk-9999
 2011252124 metadata/md5-cache/app-misc/birthday-1.6.2-r1
 2011252124 metadata/md5-cache/app-misc/blink1-1.98
 2011252124 metadata/md5-cache/app-misc/bottlerocket-0.04c-r2
@@ -33817,8 +33793,6 @@
 2011252124 metadata/md5-cache/app-misc/cdctl-0.16
 2011252124 metadata/md5-cache/app-misc/cdircmp-0.3-r2
 2011252124 metadata/md5-cache/app-misc/cdspeed-0.4-r2
-2011252124 metadata/md5-cache/app-misc/chkcrontab-1.7
-2011252124 metadata/md5-cache/app-misc/chkcrontab-1.7-r1
 2011252124 metadata/md5-cache/app-misc/ckermit-8.0.211-r4
 2011252124 metadata/md5-cache/app-misc/ckermit-9.0.302
 2011252124 metadata/md5-cache/app-misc/clockywock-0.3.1a
@@ -33880,7 +33854,6 @@
 2011252124 metadata/md5-cache/app-misc/flirc-3.22.4
 2011252124 metadata/md5-cache/app-misc/flirc-3.24.0
 2011252124 metadata/md5-cache/app-misc/flirc-3.25.2
-2011252124 metadata/md5-cache/app-misc/freewvs-0.1.1
 2011252124 metadata/md5-cache/app-misc/fslurp-2.1.4
 2011252124 metadata/md5-cache/app-misc/fsniper-1.3.1-r2
 2011252124 metadata/md5-cache/app-misc/g15composer-3.2-r1
@@ -33895,7 +33868,6 @@
 2011252124 metadata/md5-cache/app-misc/g810-led-0.3.6
 2011252124 metadata/md5-cache/app-misc/gcal-3.6.3
 2011252124 metadata/md5-cache/app-misc/gcal-4.1
-2011252124 metadata/md5-cache/app-misc/gcalcli-4.2.0
 2011252124 metadata/md5-cache/app-misc/geekcode-1.7.3-r1
 2011252124 metadata/md5-cache/app-misc/gentoo-0.20.7
 2011252124 metadata/md5-cache/app-misc/geoclue-2.4.13
@@ -33907,9 +33879,6 @@
 2011252124 metadata/md5-cache/app-misc/gnuit-4.9.5-r2
 2011252124 metadata/md5-cache/app-misc/golly-3.4
 2011252124 metadata/md5-cache/app-misc/golly-4.0
-2011252124 metadata/md5-cache/app-misc/goobook-3.4-r1
-2011252124 metadata/md5-cache/app-misc/gramps-5.1.2-r1
-2011252124 metadata/md5-cache/app-misc/gramps-5.1.3
 2011252124 metadata/md5-cache/app-misc/graphlcd-base-2.0.0-r1
 2011252124 metadata/md5-cache/app-misc/grc-1.11-r1
 2011252124 metadata/md5-cache/app-misc/grc-1.11.3
@@ -33922,8 +33891,6 @@
 2011252124 metadata/md5-cache/app-misc/hivex-1.3.18
 2011252124 metadata/md5-cache/app-misc/hodie-1.5
 2011252124 metadata/md5-cache/app-misc/i2bits-0.1.0
-2011252124 metadata/md5-cache/app-misc/icdiff-1.9.1
-2011252124 metadata/md5-cache/app-misc/icdiff-1.9.5
 2011252124 metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
 2011252124 metadata/md5-cache/app-misc/irtrans-irclient-6.01.05-r1
 2011252124 metadata/md5-cache/app-misc/irtrans-irserver-6.09.04-r1
@@ -33933,22 +33900,17 @@
 2011252124 metadata/md5-cache/app-misc/jq-1.6-r3
 2011252124 metadata/md5-cache/app-misc/jq-1.7_pre20201109
 2011252124 metadata/md5-cache/app-misc/kanatest-0.4.8
-2011252124 metadata/md5-cache/app-misc/khal-0.10.1-r1
-2011252124 metadata/md5-cache/app-misc/khard-0.13.0
-2011252124 metadata/md5-cache/app-misc/khard-0.17.0
 2011252124 metadata/md5-cache/app-misc/klavaro-3.0.1
 2011252124 metadata/md5-cache/app-misc/kryoflux-dtc-2.6-r1
 2011252124 metadata/md5-cache/app-misc/lcd4linux-0.11.0_pre20170527-r5
 2011252124 metadata/md5-cache/app-misc/lcdproc-0.5.9_p20200721
 2011252124 metadata/md5-cache/app-misc/leave-20100918-r1
 2011252124 metadata/md5-cache/app-misc/ledit-2.03
-2011252124 metadata/md5-cache/app-misc/lfm-3.1
 2011252124 metadata/md5-cache/app-misc/linux-logo-5.11-r4
 2011252124 metadata/md5-cache/app-misc/linux-logo-5.11-r5
 2011252124 metadata/md5-cache/app-misc/linux-logo-6.0
 2011252124 metadata/md5-cache/app-misc/linuxspa-0.7.1-r2
 2011252124 metadata/md5-cache/app-misc/lirc-0.10.1-r3
-2011252124 metadata/md5-cache/app-misc/lirc-0.10.1-r4
 2011252124 metadata/md5-cache/app-misc/livecd-tools-2.8
 2011252124 metadata/md5-cache/app-misc/livecd-tools-9999
 2011252124 metadata/md5-cache/app-misc/lockfile-progs-0.1.17
@@ -34014,9 +33976,6 @@
 2011252124 metadata/md5-cache/app-misc/qlcplus-5.0.0_alpha3
 2011252124 metadata/md5-cache/app-misc/radeontop-1.2
 2011252124 metadata/md5-cache/app-misc/radeontop-9999
-2011252124 metadata/md5-cache/app-misc/ranger-1.9.2
-2011252124 metadata/md5-cache/app-misc/ranger-1.9.3
-2011252124 metadata/md5-cache/app-misc/ranger-9999
 2011252124 metadata/md5-cache/app-misc/razertool-0.0.7-r4
 2011252124 metadata/md5-cache/app-misc/rbutil-1.4.1
 2011252124 metadata/md5-cache/app-misc/realpath-1.18
@@ -34026,8 +33985,6 @@
 2011252124 metadata/md5-cache/app-misc/reptyr-0.6.2
 2011252124 metadata/md5-cache/app-misc/reptyr-0.7.0
 2011252124 metadata/md5-cache/app-misc/reptyr-0.8.0
-2011252124 metadata/md5-cache/app-misc/resolve-march-native-0.9.4
-2011252124 metadata/md5-cache/app-misc/resolve-march-native-1.0.0
 2011252124 metadata/md5-cache/app-misc/rioutil-1.5.4
 2011252124 metadata/md5-cache/app-misc/rl-0.2.7-r1
 2011252124 metadata/md5-cache/app-misc/rundeck-bin-2.6.8
@@ -34038,10 +33995,6 @@
 2011252124 metadata/md5-cache/app-misc/slmon-0.5.13
 2011252124 metadata/md5-cache/app-misc/smtm-1.6.10-r1
 2011252124 metadata/md5-cache/app-misc/socnetv-2.2
-2011252124 metadata/md5-cache/app-misc/solaar-1.0.1-r1
-2011252124 metadata/md5-cache/app-misc/solaar-1.0.2
-2011252124 metadata/md5-cache/app-misc/solaar-1.0.3_rc1
-2011252124 metadata/md5-cache/app-misc/solaar-9999
 2011252124 metadata/md5-cache/app-misc/sonypid-1.9
 2011252124 metadata/md5-cache/app-misc/spacenavd-0.7.1
 2011252124 metadata/md5-cache/app-misc/sphinx-2.2.11
@@ -34064,11 +34017,6 @@
 2011252124 metadata/md5-cache/app-misc/tmux-9999
 2011252124 metadata/md5-cache/app-misc/tmux-mem-cpu-load-3.4.0
 2011252124 metadata/md5-cache/app-misc/tmux-mem-cpu-load-9999
-2011252124 metadata/md5-cache/app-misc/tmux2html-0.1.11
-2011252124 metadata/md5-cache/app-misc/tmuxp-1.5.4
-2011252124 metadata/md5-cache/app-misc/tmuxp-1.5.5
-2011252124 metadata/md5-cache/app-misc/tmuxp-1.5.6
-2011252124 metadata/md5-cache/app-misc/tmuxp-1.6.2
 2011252124 metadata/md5-cache/app-misc/todo-2.11.0
 2011252124 metadata/md5-cache/app-misc/todo-2.12.0-r1
 2011252124 metadata/md5-cache/app-misc/tpconfig-3.1.3-r2
@@ -34077,8 +34025,6 @@
 2011252124 metadata/md5-cache/app-misc/tracker-2.3.4
 2011252124 metadata/md5-cache/app-misc/tracker-miners-2.3.3
 2011252124 metadata/md5-cache/app-misc/transfolio-1.0.1-r1
-2011252124 metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816
-2011252124 metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816-r1
 2011252124 metadata/md5-cache/app-misc/ttyload-0.5.3
 2011252124 metadata/md5-cache/app-misc/ttyrec-1.0.8-r2
 2011252124 metadata/md5-cache/app-misc/ttysnoop-0.12d
@@ -34104,8 +34050,6 @@
 2011252124 metadata/md5-cache/app-misc/worker-3.8.3-r100
 2011252124 metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2
 2011252124 metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
-2011252124 metadata/md5-cache/app-misc/yq-2.11.1
-2011252124 metadata/md5-cache/app-misc/yq-2.9.2-r1
 2011252124 metadata/md5-cache/app-misc/ytree-2.02
 2011252124 metadata/md5-cache/app-misc/zisofs-tools-1.0.8
 2011252124 metadata/md5-cache/app-misc/zygrib-8.0.1-r1
@@ -34116,9 +34060,46 @@
 2011281009 metadata/md5-cache/app-misc/skim-0.6.9
 2011281009 metadata/md5-cache/app-misc/skim-0.7.0
 2011281009 metadata/md5-cache/app-misc/skim-0.8.1
-2011282109 metadata/md5-cache/app-misc/rox-filer-2.11
-2011291709 metadata/md5-cache/app-misc/Manifest.gz
 2011291709 metadata/md5-cache/app-misc/ckb-0.4.2-r1
+2012030539 metadata/md5-cache/app-misc/Manifest.gz
+2012011340 metadata/md5-cache/app-misc/asciinema-2.0.2
+2012011340 metadata/md5-cache/app-misc/binwalk-2.2.0
+2012011340 metadata/md5-cache/app-misc/binwalk-9999
+2012011340 metadata/md5-cache/app-misc/chkcrontab-1.7
+2012011340 metadata/md5-cache/app-misc/chkcrontab-1.7-r1
+2012011309 metadata/md5-cache/app-misc/dtach-0.9
+2012011340 metadata/md5-cache/app-misc/freewvs-0.1.1
+2012011340 metadata/md5-cache/app-misc/gcalcli-4.2.0
+2012011340 metadata/md5-cache/app-misc/goobook-3.4-r1
+2012011340 metadata/md5-cache/app-misc/gramps-5.1.2-r1
+2012011340 metadata/md5-cache/app-misc/gramps-5.1.3
+2012011340 metadata/md5-cache/app-misc/icdiff-1.9.1
+2012011340 metadata/md5-cache/app-misc/icdiff-1.9.5
+2012011340 metadata/md5-cache/app-misc/khal-0.10.1-r1
+2012011340 metadata/md5-cache/app-misc/khard-0.13.0
+2012011340 metadata/md5-cache/app-misc/khard-0.17.0
+2012011340 metadata/md5-cache/app-misc/lfm-3.1
+2012030539 metadata/md5-cache/app-misc/lirc-0.10.1-r4
+2012011340 metadata/md5-cache/app-misc/ranger-1.9.2
+2012011340 metadata/md5-cache/app-misc/ranger-1.9.3
+2012011340 metadata/md5-cache/app-misc/ranger-9999
+2012011340 metadata/md5-cache/app-misc/resolve-march-native-0.9.4
+2012011340 metadata/md5-cache/app-misc/resolve-march-native-1.0.0
+2012030239 metadata/md5-cache/app-misc/rox-filer-2.11
+2012011340 metadata/md5-cache/app-misc/solaar-1.0.1-r1
+2012030239 metadata/md5-cache/app-misc/solaar-1.0.2
+2012011340 metadata/md5-cache/app-misc/solaar-1.0.3_rc1
+2012030209 metadata/md5-cache/app-misc/solaar-9999
+2012011809 metadata/md5-cache/app-misc/spacenavd-0.8
+2012011340 metadata/md5-cache/app-misc/tmux2html-0.1.11
+2012011340 metadata/md5-cache/app-misc/tmuxp-1.5.4
+2012011340 metadata/md5-cache/app-misc/tmuxp-1.5.5
+2012011340 metadata/md5-cache/app-misc/tmuxp-1.5.6
+2012011340 metadata/md5-cache/app-misc/tmuxp-1.6.2
+2012011340 metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816
+2012011340 metadata/md5-cache/app-misc/trash-cli-0.17.1.14_p20170816-r1
+2012011340 metadata/md5-cache/app-misc/yq-2.11.1
+2012011340 metadata/md5-cache/app-misc/yq-2.9.2-r1
 1702282309 metadata/md5-cache/app-mobilephone/anyremote-6.5
 1710020739 metadata/md5-cache/app-mobilephone/dfu-util-0.9
 1908291509 metadata/md5-cache/app-mobilephone/gnocky-0.0.7
@@ -34217,14 +34198,14 @@
 2009121921 metadata/md5-cache/app-officeext/ct2n-1.5.0
 2009121921 metadata/md5-cache/app-officeext/languagetool-5.0
 2009121921 metadata/md5-cache/app-officeext/ooofbtools-2.56
-2009121921 metadata/md5-cache/app-officeext/ooofbtools-2.57
 2009121921 metadata/md5-cache/app-officeext/texmaths-0.48
 2011090239 metadata/md5-cache/app-officeext/texmaths-0.48.2
-2011252124 metadata/md5-cache/app-officeext/Manifest.gz
 2011252124 metadata/md5-cache/app-officeext/barcode-1.3.5.0-r1
 2011252124 metadata/md5-cache/app-officeext/dmaths-3.4.9.0-r1
 2011252124 metadata/md5-cache/app-officeext/ooo2gd-3.0.0-r1
 2011252124 metadata/md5-cache/app-officeext/sun-templates-1.0.0-r1
+2012020639 metadata/md5-cache/app-officeext/Manifest.gz
+2012020639 metadata/md5-cache/app-officeext/ooofbtools-2.57
 1902181039 metadata/md5-cache/app-pda/ideviceinstaller-1.1.0
 1911201439 metadata/md5-cache/app-pda/libusbmuxd-1.0.10-r1
 2007181809 metadata/md5-cache/app-pda/ifuse-1.1.3-r1
@@ -34280,92 +34261,93 @@
 2011252124 metadata/md5-cache/app-portage/conf-update-1.0.3-r1
 2011252124 metadata/md5-cache/app-portage/cpuid2cpuflags-9999
 2011252124 metadata/md5-cache/app-portage/deltup-0.4.6-r1
-2011252124 metadata/md5-cache/app-portage/diffmask-0.3.3-r4
-2011252124 metadata/md5-cache/app-portage/diffmask-9999
-2011252124 metadata/md5-cache/app-portage/distpatch-0.1.2-r2
 2011252124 metadata/md5-cache/app-portage/eix-0.34.10
 2011252124 metadata/md5-cache/app-portage/eix-0.34.11
 2011252124 metadata/md5-cache/app-portage/eix-0.34.9
-2011252124 metadata/md5-cache/app-portage/elicense-1.0.2
-2011252124 metadata/md5-cache/app-portage/elicense-9999
-2011252124 metadata/md5-cache/app-portage/elogv-0.7.8-r3
-2011252124 metadata/md5-cache/app-portage/elogv-0.7.9
-2011252124 metadata/md5-cache/app-portage/elogviewer-3.0-r2
-2011252124 metadata/md5-cache/app-portage/esearch-1.3-r3
-2011252124 metadata/md5-cache/app-portage/esearch-9999
-2011252124 metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.1-r1
-2011252124 metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.2
-2011252124 metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.3
-2011252124 metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4
-2011252124 metadata/md5-cache/app-portage/flaggie-0.2.1-r1
-2011252124 metadata/md5-cache/app-portage/flaggie-9999
 2011252124 metadata/md5-cache/app-portage/fquery-0.2.3
 2011252124 metadata/md5-cache/app-portage/fquery-0.2.3-r1
-2011252124 metadata/md5-cache/app-portage/g-octave-0.4.1-r7
-2011252124 metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1
-2011252124 metadata/md5-cache/app-portage/gander-0.0.1
-2011252124 metadata/md5-cache/app-portage/gemato-15.2
-2011252124 metadata/md5-cache/app-portage/gemato-16.1
-2011252124 metadata/md5-cache/app-portage/gemato-16.2
-2011252124 metadata/md5-cache/app-portage/gemato-9999
 2011252124 metadata/md5-cache/app-portage/genlop-0.30.10-r1
 2011252124 metadata/md5-cache/app-portage/genlop-0.30.10-r2
 2011252124 metadata/md5-cache/app-portage/genlop-0.30.9-r1
 2011252124 metadata/md5-cache/app-portage/genlop-9999
-2011252124 metadata/md5-cache/app-portage/gentoolkit-0.4.6
-2011252124 metadata/md5-cache/app-portage/gentoolkit-0.4.7
-2011252124 metadata/md5-cache/app-portage/gentoolkit-0.4.8
-2011252124 metadata/md5-cache/app-portage/gentoolkit-0.5.0-r2
-2011252124 metadata/md5-cache/app-portage/gentoolkit-9999
-2011252124 metadata/md5-cache/app-portage/gentoopm-0.3.1
-2011252124 metadata/md5-cache/app-portage/gentoopm-0.3.2
-2011252124 metadata/md5-cache/app-portage/gentoopm-9999
 2011252124 metadata/md5-cache/app-portage/getdelta-0.7.9-r2
 2011252124 metadata/md5-cache/app-portage/golop-9999
-2011252124 metadata/md5-cache/app-portage/gpyutils-0.4.5
-2011252124 metadata/md5-cache/app-portage/gpyutils-9999
-2011252124 metadata/md5-cache/app-portage/grs-0.7
-2011252124 metadata/md5-cache/app-portage/grs-9999
-2011252124 metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
 2011252124 metadata/md5-cache/app-portage/gverify-2
 2011252124 metadata/md5-cache/app-portage/hackport-0.6.6
 2011252124 metadata/md5-cache/app-portage/hackport-9999
 2011252124 metadata/md5-cache/app-portage/kuroo-0.90.5_p20180410
 2011252124 metadata/md5-cache/app-portage/kuroo-9999
-2011252124 metadata/md5-cache/app-portage/layman-2.4.3
-2011252124 metadata/md5-cache/app-portage/layman-9999
-2011252124 metadata/md5-cache/app-portage/metagen-0.7.2
-2011252124 metadata/md5-cache/app-portage/metagen-9999
-2011252124 metadata/md5-cache/app-portage/mirrorselect-2.2.3
-2011252124 metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
-2011252124 metadata/md5-cache/app-portage/mirrorselect-2.2.6-r1
-2011252124 metadata/md5-cache/app-portage/mirrorselect-9999
-2011252124 metadata/md5-cache/app-portage/nattka-0.2.10
-2011252124 metadata/md5-cache/app-portage/nattka-0.2.9
-2011252124 metadata/md5-cache/app-portage/nattka-9999
-2011252124 metadata/md5-cache/app-portage/overlint-0.5.3-r1
-2011252124 metadata/md5-cache/app-portage/overlint-0.5.3-r2
-2011252124 metadata/md5-cache/app-portage/pfl-3.1-r1
 2011252124 metadata/md5-cache/app-portage/portage-utils-9999
 2011252124 metadata/md5-cache/app-portage/porticron-0.7.1
 2011252124 metadata/md5-cache/app-portage/portpeek-3.1.5
 2011252124 metadata/md5-cache/app-portage/pram-9
 2011252124 metadata/md5-cache/app-portage/repo-commit-9999
-2011252124 metadata/md5-cache/app-portage/repoman-2.3.23
-2011252124 metadata/md5-cache/app-portage/repoman-3.0.1
-2011252124 metadata/md5-cache/app-portage/repoman-3.0.2
-2011252124 metadata/md5-cache/app-portage/repoman-9999
-2011252124 metadata/md5-cache/app-portage/smart-live-rebuild-1.3.6
-2011252124 metadata/md5-cache/app-portage/smart-live-rebuild-9999
 2011252124 metadata/md5-cache/app-portage/splat-0.08-r1
-2011252124 metadata/md5-cache/app-portage/tatt-0.7-r1
-2011252124 metadata/md5-cache/app-portage/tatt-9999
 2011252124 metadata/md5-cache/app-portage/ufed-0.96
 2011252124 metadata/md5-cache/app-portage/ufed-9999
 2011252124 metadata/md5-cache/app-portage/unsymlink-lib-18
 2011252124 metadata/md5-cache/app-portage/unsymlink-lib-19
-2011281109 metadata/md5-cache/app-portage/Manifest.gz
-2011281109 metadata/md5-cache/app-portage/nattka-0.2.11
+2012030239 metadata/md5-cache/app-portage/Manifest.gz
+2012011340 metadata/md5-cache/app-portage/diffmask-0.3.3-r4
+2012011340 metadata/md5-cache/app-portage/diffmask-9999
+2012011340 metadata/md5-cache/app-portage/distpatch-0.1.2-r2
+2012011340 metadata/md5-cache/app-portage/elicense-1.0.2
+2012011340 metadata/md5-cache/app-portage/elicense-9999
+2012011340 metadata/md5-cache/app-portage/elogv-0.7.8-r3
+2012011340 metadata/md5-cache/app-portage/elogv-0.7.9
+2012030239 metadata/md5-cache/app-portage/elogviewer-3.0-r2
+2012011340 metadata/md5-cache/app-portage/esearch-1.3-r3
+2012011340 metadata/md5-cache/app-portage/esearch-9999
+2012011340 metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.1-r1
+2012011340 metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.2
+2012011340 metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.3
+2012011340 metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4
+2012011340 metadata/md5-cache/app-portage/flaggie-0.2.1-r1
+2012011340 metadata/md5-cache/app-portage/flaggie-9999
+2012011340 metadata/md5-cache/app-portage/g-octave-0.4.1-r7
+2012011340 metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1
+2012011340 metadata/md5-cache/app-portage/gander-0.0.1
+2012011340 metadata/md5-cache/app-portage/gemato-15.2
+2012011340 metadata/md5-cache/app-portage/gemato-16.1
+2012011340 metadata/md5-cache/app-portage/gemato-16.2
+2012011340 metadata/md5-cache/app-portage/gemato-9999
+2012011340 metadata/md5-cache/app-portage/gentoolkit-0.4.6
+2012011340 metadata/md5-cache/app-portage/gentoolkit-0.4.7
+2012011340 metadata/md5-cache/app-portage/gentoolkit-0.4.8
+2012011340 metadata/md5-cache/app-portage/gentoolkit-0.5.0-r2
+2012011340 metadata/md5-cache/app-portage/gentoolkit-9999
+2012011340 metadata/md5-cache/app-portage/gentoopm-0.3.1
+2012011340 metadata/md5-cache/app-portage/gentoopm-0.3.2
+2012011340 metadata/md5-cache/app-portage/gentoopm-9999
+2012011340 metadata/md5-cache/app-portage/gpyutils-0.4.5
+2012011340 metadata/md5-cache/app-portage/gpyutils-9999
+2012011340 metadata/md5-cache/app-portage/grs-0.7
+2012011340 metadata/md5-cache/app-portage/grs-9999
+2012011340 metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
+2012011340 metadata/md5-cache/app-portage/layman-2.4.3
+2012011340 metadata/md5-cache/app-portage/layman-9999
+2012011340 metadata/md5-cache/app-portage/metagen-0.7.2
+2012011340 metadata/md5-cache/app-portage/metagen-9999
+2012011340 metadata/md5-cache/app-portage/mirrorselect-2.2.3
+2012011340 metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
+2012011340 metadata/md5-cache/app-portage/mirrorselect-2.2.6-r1
+2012011340 metadata/md5-cache/app-portage/mirrorselect-9999
+2012011340 metadata/md5-cache/app-portage/nattka-0.2.10
+2012011340 metadata/md5-cache/app-portage/nattka-0.2.11
+2012011340 metadata/md5-cache/app-portage/nattka-0.2.9
+2012011340 metadata/md5-cache/app-portage/nattka-9999
+2012011340 metadata/md5-cache/app-portage/overlint-0.5.3-r1
+2012011340 metadata/md5-cache/app-portage/overlint-0.5.3-r2
+2012011340 metadata/md5-cache/app-portage/pfl-3.1-r1
+2012011340 metadata/md5-cache/app-portage/repoman-2.3.23
+2012011340 metadata/md5-cache/app-portage/repoman-3.0.1
+2012011340 metadata/md5-cache/app-portage/repoman-3.0.2
+2012011340 metadata/md5-cache/app-portage/repoman-9999
+2012011340 metadata/md5-cache/app-portage/smart-live-rebuild-1.3.6
+2012011340 metadata/md5-cache/app-portage/smart-live-rebuild-9999
+2012030209 metadata/md5-cache/app-portage/tatt-0.7-r1
+2012030209 metadata/md5-cache/app-portage/tatt-0.8
+2012011340 metadata/md5-cache/app-portage/tatt-9999
 1712261510 metadata/md5-cache/app-shells/dsh-0.25.10-r1
 1910170740 metadata/md5-cache/app-shells/psh-1.8.1-r3
 1907092339 metadata/md5-cache/app-shells/rush-2.0
@@ -34426,9 +34408,6 @@
 2011252124 metadata/md5-cache/app-shells/mpibash-9999
 2011252124 metadata/md5-cache/app-shells/pdmenu-1.3.4-r1
 2011252124 metadata/md5-cache/app-shells/posh-0.14.1
-2011252124 metadata/md5-cache/app-shells/powerline-2.7-r1
-2011252124 metadata/md5-cache/app-shells/powerline-2.7-r2
-2011252124 metadata/md5-cache/app-shells/powerline-9999
 2011252124 metadata/md5-cache/app-shells/quoter-4.2
 2011252124 metadata/md5-cache/app-shells/rrs-1.70-r2
 2011252124 metadata/md5-cache/app-shells/sash-3.8
@@ -34439,8 +34418,6 @@
 2011252124 metadata/md5-cache/app-shells/squirrelsh-1.2.7
 2011252124 metadata/md5-cache/app-shells/tcsh-6.20.00
 2011252124 metadata/md5-cache/app-shells/tcsh-6.21.00-r1
-2011252124 metadata/md5-cache/app-shells/thefuck-3.27
-2011252124 metadata/md5-cache/app-shells/thefuck-3.28
 2011252124 metadata/md5-cache/app-shells/tmux-bash-completion-9999
 2011252124 metadata/md5-cache/app-shells/yash-2.49
 2011252124 metadata/md5-cache/app-shells/yash-2.50
@@ -34448,7 +34425,6 @@
 2011252124 metadata/md5-cache/app-shells/zsh-9999
 2011270209 metadata/md5-cache/app-shells/tcsh-6.22.02
 2011281009 metadata/md5-cache/app-shells/mcfly-0.3.6
-2011292239 metadata/md5-cache/app-shells/Manifest.gz
 2011292239 metadata/md5-cache/app-shells/bash-2.05b_p13
 2011292239 metadata/md5-cache/app-shells/bash-3.0_p22
 2011292239 metadata/md5-cache/app-shells/bash-3.1_p23
@@ -34460,6 +34436,12 @@
 2011292239 metadata/md5-cache/app-shells/bash-4.4_p23-r2
 2011292239 metadata/md5-cache/app-shells/bash-5.0_p18
 2011292239 metadata/md5-cache/app-shells/bash-5.1_rc3
+2012031039 metadata/md5-cache/app-shells/Manifest.gz
+2012011340 metadata/md5-cache/app-shells/powerline-2.7-r1
+2012011340 metadata/md5-cache/app-shells/powerline-2.7-r2
+2012031039 metadata/md5-cache/app-shells/powerline-9999
+2012031039 metadata/md5-cache/app-shells/thefuck-3.28
+2012031039 metadata/md5-cache/app-shells/thefuck-3.30
 1801051609 metadata/md5-cache/app-text/antixls-0.3b
 1803271139 metadata/md5-cache/app-text/convmv-2.05
 1910111840 metadata/md5-cache/app-text/dbacl-1.14
@@ -34489,7 +34471,6 @@
 1912272239 metadata/md5-cache/app-text/cpdf-2.3.1
 2001220109 metadata/md5-cache/app-text/rtf2html-0.2.0-r1
 2001220109 metadata/md5-cache/app-text/xml2-0.5
-2002081639 metadata/md5-cache/app-text/liblangtag-0.6.3
 2002112051 metadata/md5-cache/app-text/xhtml11-20101123
 2002171539 metadata/md5-cache/app-text/catdoc-0.95-r1
 2002230040 metadata/md5-cache/app-text/refbase-0.9.6_p20180223
@@ -34560,7 +34541,6 @@
 2008301909 metadata/md5-cache/app-text/languagetool-4.5
 2008301909 metadata/md5-cache/app-text/languagetool-4.6
 2009041409 metadata/md5-cache/app-text/enchant-2.2.8
-2009110409 metadata/md5-cache/app-text/sword-modules-2.1
 2009121921 metadata/md5-cache/app-text/gtkspell-2.0.16-r1
 2009121921 metadata/md5-cache/app-text/po4a-0.57
 2009121921 metadata/md5-cache/app-text/po4a-0.60
@@ -34584,7 +34564,6 @@
 2011231309 metadata/md5-cache/app-text/libmwaw-0.3.17
 2011242239 metadata/md5-cache/app-text/poppler-data-0.4.10
 2011241409 metadata/md5-cache/app-text/qpdf-10.0.1-r2
-2011241409 metadata/md5-cache/app-text/qpdf-10.0.4
 2011241409 metadata/md5-cache/app-text/qpdf-9.0.2-r1
 2011241409 metadata/md5-cache/app-text/qpdf-9.1.1-r2
 2011252124 metadata/md5-cache/app-text/a2ps-4.14-r6
@@ -34609,7 +34588,6 @@
 2011252124 metadata/md5-cache/app-text/blogc-9999
 2011252124 metadata/md5-cache/app-text/bogosort-0.4.2-r1
 2011252124 metadata/md5-cache/app-text/c2ps-4.0
-2011252124 metadata/md5-cache/app-text/capyt-1.1.1
 2011252124 metadata/md5-cache/app-text/cb2bib-2.0.0-r1
 2011252124 metadata/md5-cache/app-text/chasen-2.4.4-r3
 2011252124 metadata/md5-cache/app-text/cherrytree-0.99.0_p20200523
@@ -34629,8 +34607,6 @@
 2011252124 metadata/md5-cache/app-text/csvfix-1.6
 2011252124 metadata/md5-cache/app-text/cuneiform-1.1.0-r3
 2011252124 metadata/md5-cache/app-text/cwtext-0.96-r1
-2011252124 metadata/md5-cache/app-text/dblatex-0.3.11
-2011252124 metadata/md5-cache/app-text/dblatex-0.3.11-r1
 2011252124 metadata/md5-cache/app-text/delta-20060803-r1
 2011252124 metadata/md5-cache/app-text/dictd-1.13.0-r1
 2011252124 metadata/md5-cache/app-text/diction-1.13
@@ -34646,7 +34622,6 @@
 2011252124 metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r4
 2011252124 metadata/md5-cache/app-text/dos2unix-7.3.5
 2011252124 metadata/md5-cache/app-text/dos2unix-7.4.1
-2011252124 metadata/md5-cache/app-text/dos2unix-7.4.2
 2011252124 metadata/md5-cache/app-text/dvipng-1.15-r1
 2011252124 metadata/md5-cache/app-text/dvipng-1.17
 2011252124 metadata/md5-cache/app-text/dvisvgm-2.1.3
@@ -34670,10 +34645,8 @@
 2011252124 metadata/md5-cache/app-text/foliate-2.4.2-r1
 2011252124 metadata/md5-cache/app-text/foliate-2.5.0
 2011252124 metadata/md5-cache/app-text/ghostscript-gpl-9.52-r1
-2011252124 metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r2
 2011252124 metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r2
 2011252124 metadata/md5-cache/app-text/goldendict-1.5.0_rc2-r2
-2011252124 metadata/md5-cache/app-text/grip-4.5.2-r1
 2011252124 metadata/md5-cache/app-text/groonga-6.1.2
 2011252124 metadata/md5-cache/app-text/groonga-8.0.2
 2011252124 metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.1
@@ -34693,7 +34666,6 @@
 2011252124 metadata/md5-cache/app-text/htmlc-2.60.0
 2011252124 metadata/md5-cache/app-text/htmldoc-1.8.30
 2011252124 metadata/md5-cache/app-text/htmlinc-1.0_beta1-r2
-2011252124 metadata/md5-cache/app-text/htmlmin-0.1.12
 2011252124 metadata/md5-cache/app-text/htmlrecode-1.3.1-r1
 2011252124 metadata/md5-cache/app-text/htmltidy-20090325-r2
 2011252124 metadata/md5-cache/app-text/htp-1.19
@@ -34716,9 +34688,6 @@
 2011252124 metadata/md5-cache/app-text/kbibtex-0.9.2
 2011252124 metadata/md5-cache/app-text/kchmviewer-7.7-r1
 2011252124 metadata/md5-cache/app-text/kjots-5.0.2-r2
-2011252124 metadata/md5-cache/app-text/krop-0.5.1-r1
-2011252124 metadata/md5-cache/app-text/krop-0.6.0
-2011252124 metadata/md5-cache/app-text/krop-9999
 2011252124 metadata/md5-cache/app-text/lcdf-typetools-2.106
 2011252124 metadata/md5-cache/app-text/lcdf-typetools-2.108
 2011252124 metadata/md5-cache/app-text/letterize-1.4
@@ -34754,9 +34723,6 @@
 2011252124 metadata/md5-cache/app-text/mupdf-1.18.0-r2
 2011252124 metadata/md5-cache/app-text/namazu-2.0.21
 2011252124 metadata/md5-cache/app-text/namazu-2.0.22_pre7
-2011252124 metadata/md5-cache/app-text/nfoview-1.27.1
-2011252124 metadata/md5-cache/app-text/nfoview-1.28
-2011252124 metadata/md5-cache/app-text/nfoview-9999
 2011252124 metadata/md5-cache/app-text/nuspell-3.1.2
 2011252124 metadata/md5-cache/app-text/nuspell-4.0.0
 2011252124 metadata/md5-cache/app-text/nuspell-4.0.1
@@ -34770,37 +34736,24 @@
 2011252124 metadata/md5-cache/app-text/opensp-1.5.2-r6
 2011252124 metadata/md5-cache/app-text/ots-0.5.0-r1
 2011252124 metadata/md5-cache/app-text/pandoc-2.9.2.1
-2011252124 metadata/md5-cache/app-text/paperwork-1.3.1
-2011252124 metadata/md5-cache/app-text/paperwork-backend-1.3.1
-2011252124 metadata/md5-cache/app-text/paperwork-backend-1.3.1-r1
 2011252124 metadata/md5-cache/app-text/paps-0.6.8-r2
 2011252124 metadata/md5-cache/app-text/par-1.52-r1
 2011252124 metadata/md5-cache/app-text/par-1.53.0
 2011252124 metadata/md5-cache/app-text/pdf2html-1.4
-2011252124 metadata/md5-cache/app-text/pdfarranger-1.3.1
-2011252124 metadata/md5-cache/app-text/pdfarranger-1.5.3-r1
-2011252124 metadata/md5-cache/app-text/pdfarranger-1.6.2
-2011252124 metadata/md5-cache/app-text/pdfminer-20191020
 2011252124 metadata/md5-cache/app-text/pdftk-3.0.0
 2011252124 metadata/md5-cache/app-text/pdftk-3.0.8
 2011252124 metadata/md5-cache/app-text/pdftk-9999
-2011252124 metadata/md5-cache/app-text/pelican-4.2.0
-2011252124 metadata/md5-cache/app-text/pelican-4.5.1
-2011252124 metadata/md5-cache/app-text/pelican-9999
 2011252124 metadata/md5-cache/app-text/pep-2.8-r2
 2011252124 metadata/md5-cache/app-text/pinfo-0.6.13
 2011252124 metadata/md5-cache/app-text/pinfo-99999
 2011252124 metadata/md5-cache/app-text/podofo-0.9.6_p20190928
 2011252124 metadata/md5-cache/app-text/poppler-20.11.0
-2011252124 metadata/md5-cache/app-text/poppler-9999
 2011252124 metadata/md5-cache/app-text/ps2eps-1.68
 2011252124 metadata/md5-cache/app-text/psiconv-0.8.3-r1
 2011252124 metadata/md5-cache/app-text/pspdftool-0.03
 2011252124 metadata/md5-cache/app-text/pspresent-1.3-r1
 2011252124 metadata/md5-cache/app-text/pstotext-1.9-r4
 2011252124 metadata/md5-cache/app-text/psutils-1.17-r3
-2011252124 metadata/md5-cache/app-text/pytextile-3.0.3
-2011252124 metadata/md5-cache/app-text/pytextile-4.0.1
 2011252124 metadata/md5-cache/app-text/q-text-as-data-2.0.10
 2011252124 metadata/md5-cache/app-text/qpdfview-0.4.18
 2011252124 metadata/md5-cache/app-text/qpdfview-0.4.18_p1
@@ -34808,14 +34761,9 @@
 2011252124 metadata/md5-cache/app-text/recode-3.6_p20-r1
 2011252124 metadata/md5-cache/app-text/recode-3.7.6-r1
 2011252124 metadata/md5-cache/app-text/reed-5.4
-2011252124 metadata/md5-cache/app-text/restview-2.9.2
 2011252124 metadata/md5-cache/app-text/rman-3.2-r1
-2011252124 metadata/md5-cache/app-text/rnc2rng-2.6.1
-2011252124 metadata/md5-cache/app-text/rnc2rng-2.6.2
-2011252124 metadata/md5-cache/app-text/rnc2rng-2.6.4
 2011252124 metadata/md5-cache/app-text/rnv-1.7.11-r1
 2011252124 metadata/md5-cache/app-text/ronn-0.7.3-r3
-2011252124 metadata/md5-cache/app-text/rpl-1.6.7
 2011252124 metadata/md5-cache/app-text/sablotron-1.0.3-r1
 2011252124 metadata/md5-cache/app-text/sablotron-1.0.3-r2
 2011252124 metadata/md5-cache/app-text/scdoc-1.10.0
@@ -34849,8 +34797,6 @@
 2011252124 metadata/md5-cache/app-text/ttf2pk2-2.0_p20200406
 2011252124 metadata/md5-cache/app-text/ttf2pt1-3.4.4-r1
 2011252124 metadata/md5-cache/app-text/txt2pdbdoc-1.4.4
-2011252124 metadata/md5-cache/app-text/txt2tags-3.3
-2011252124 metadata/md5-cache/app-text/txt2tags-3.7
 2011252124 metadata/md5-cache/app-text/unac-1.8.0
 2011252124 metadata/md5-cache/app-text/unpaper-9999
 2011252124 metadata/md5-cache/app-text/uudeview-0.5.20-r2
@@ -34862,15 +34808,11 @@
 2011252124 metadata/md5-cache/app-text/wscr-1.2-r2
 2011252124 metadata/md5-cache/app-text/wv-1.2.9-r2
 2011252124 metadata/md5-cache/app-text/wv2-0.4.2-r2
-2011252124 metadata/md5-cache/app-text/xapers-0.9.0
 2011252124 metadata/md5-cache/app-text/xchm-1.23-r1
 2011252124 metadata/md5-cache/app-text/xdvik-22.87.03-r2
 2011252124 metadata/md5-cache/app-text/xiphos-4.2.1
 2011252124 metadata/md5-cache/app-text/xlhtml-0.5.1_p6
-2011252124 metadata/md5-cache/app-text/xlsx2csv-0.7.6
 2011252124 metadata/md5-cache/app-text/xml2doc-20030510-r1
-2011252124 metadata/md5-cache/app-text/xmldiff-2.3
-2011252124 metadata/md5-cache/app-text/xmldiff-2.4
 2011252124 metadata/md5-cache/app-text/xmlstarlet-1.6.1
 2011252124 metadata/md5-cache/app-text/xmlto-0.0.28-r3
 2011252124 metadata/md5-cache/app-text/xournal-0.4.8.2016
@@ -34913,12 +34855,53 @@
 2011281109 metadata/md5-cache/app-text/ansifilter-2.17
 2011281239 metadata/md5-cache/app-text/docbook2X-0.8.8-r4
 2011281109 metadata/md5-cache/app-text/wgetpaste-2.29-r1
-2011300309 metadata/md5-cache/app-text/Manifest.gz
 2011291639 metadata/md5-cache/app-text/calibre-4.22.0
 2011291639 metadata/md5-cache/app-text/calibre-4.23.0
 2011291639 metadata/md5-cache/app-text/calibre-5.4.2
-2011300309 metadata/md5-cache/app-text/xchm-1.31
 2011300309 metadata/md5-cache/app-text/xchm-9999
+2012031039 metadata/md5-cache/app-text/Manifest.gz
+2012011340 metadata/md5-cache/app-text/capyt-1.1.1
+2012011340 metadata/md5-cache/app-text/dblatex-0.3.11
+2012011340 metadata/md5-cache/app-text/dblatex-0.3.11-r1
+2012030239 metadata/md5-cache/app-text/dos2unix-7.4.2
+2012011139 metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r2
+2012011340 metadata/md5-cache/app-text/grip-4.5.2-r1
+2012011340 metadata/md5-cache/app-text/htmlmin-0.1.12
+2012011340 metadata/md5-cache/app-text/krop-0.5.1-r1
+2012011340 metadata/md5-cache/app-text/krop-0.6.0
+2012011340 metadata/md5-cache/app-text/krop-9999
+2012020509 metadata/md5-cache/app-text/liblangtag-0.6.3
+2012011340 metadata/md5-cache/app-text/nfoview-1.27.1
+2012011340 metadata/md5-cache/app-text/nfoview-1.28
+2012011340 metadata/md5-cache/app-text/nfoview-9999
+2012011340 metadata/md5-cache/app-text/paperwork-1.3.1
+2012011340 metadata/md5-cache/app-text/paperwork-backend-1.3.1
+2012011340 metadata/md5-cache/app-text/paperwork-backend-1.3.1-r1
+2012011340 metadata/md5-cache/app-text/pdfarranger-1.3.1
+2012011340 metadata/md5-cache/app-text/pdfarranger-1.5.3-r1
+2012011340 metadata/md5-cache/app-text/pdfarranger-1.6.2
+2012011340 metadata/md5-cache/app-text/pdfminer-20191020
+2012011340 metadata/md5-cache/app-text/pelican-4.2.0
+2012011340 metadata/md5-cache/app-text/pelican-4.5.1
+2012011340 metadata/md5-cache/app-text/pelican-9999
+2012021309 metadata/md5-cache/app-text/poppler-20.12.0
+2012021309 metadata/md5-cache/app-text/poppler-9999
+2012011340 metadata/md5-cache/app-text/pytextile-3.0.3
+2012011340 metadata/md5-cache/app-text/pytextile-4.0.1
+2012031039 metadata/md5-cache/app-text/qpdf-10.0.4
+2012011340 metadata/md5-cache/app-text/restview-2.9.2
+2012011340 metadata/md5-cache/app-text/rnc2rng-2.6.1
+2012011340 metadata/md5-cache/app-text/rnc2rng-2.6.2
+2012030439 metadata/md5-cache/app-text/rnc2rng-2.6.4
+2012011340 metadata/md5-cache/app-text/rpl-1.6.7
+2012020439 metadata/md5-cache/app-text/sword-modules-2.2
+2012011340 metadata/md5-cache/app-text/txt2tags-3.3
+2012011340 metadata/md5-cache/app-text/txt2tags-3.7
+2012011340 metadata/md5-cache/app-text/xapers-0.9.0
+2012020639 metadata/md5-cache/app-text/xchm-1.31
+2012011340 metadata/md5-cache/app-text/xlsx2csv-0.7.6
+2012011340 metadata/md5-cache/app-text/xmldiff-2.3
+2012011340 metadata/md5-cache/app-text/xmldiff-2.4
 1911262256 metadata/md5-cache/app-vim/ackvim-1.0.9-r1
 1911262256 metadata/md5-cache/app-vim/airline-themes-0_pre20181021
 1911262256 metadata/md5-cache/app-vim/alternate-2.18-r2
@@ -35131,10 +35114,8 @@
 2011252124 metadata/md5-cache/app-vim/iris-1.0.0
 2011252124 metadata/md5-cache/app-vim/jedi-0.10.0
 2011252124 metadata/md5-cache/app-vim/jedi-0.8_p20171015-r1
-2011252124 metadata/md5-cache/app-vim/pyclewn-2.1-r2
 2011252124 metadata/md5-cache/app-vim/pydiction-1.2.3-r2
 2011252124 metadata/md5-cache/app-vim/pydoc-2.0-r1
-2011252124 metadata/md5-cache/app-vim/pydoc-2.0-r2
 2011252124 metadata/md5-cache/app-vim/splice-1.1.0-r3
 2011252124 metadata/md5-cache/app-vim/taglist-4.6
 2011252124 metadata/md5-cache/app-vim/vim-latex-1.10.0-r1
@@ -35159,8 +35140,10 @@
 2011252124 metadata/md5-cache/app-vim/vimpython-1.13-r2
 2011252124 metadata/md5-cache/app-vim/vimpython-1.13-r3
 2011252124 metadata/md5-cache/app-vim/voom-5.3-r1
-2011281309 metadata/md5-cache/app-vim/Manifest.gz
 2011281309 metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
+2012030239 metadata/md5-cache/app-vim/Manifest.gz
+2012011340 metadata/md5-cache/app-vim/pyclewn-2.1-r2
+2012030239 metadata/md5-cache/app-vim/pydoc-2.0-r2
 1704032208 metadata/md5-cache/app-xemacs/dired-1.19
 1704032208 metadata/md5-cache/app-xemacs/easypg-1.02
 1704032208 metadata/md5-cache/app-xemacs/ediff-1.77
@@ -35629,8 +35612,9 @@
 2011252124 metadata/md5-cache/dev-cpp/websocketpp-0.8.1-r1
 2011252124 metadata/md5-cache/dev-cpp/yaml-cpp-0.6.3-r3
 2011291139 metadata/md5-cache/dev-cpp/tclap-1.2.2
-2012010009 metadata/md5-cache/dev-cpp/Manifest.gz
 2012010009 metadata/md5-cache/dev-cpp/amqp-cpp-4.3.10
+2012012209 metadata/md5-cache/dev-cpp/Manifest.gz
+2012012209 metadata/md5-cache/dev-cpp/argparse-2.1
 1702282310 metadata/md5-cache/dev-db/gigabase-3.83-r2
 1910170740 metadata/md5-cache/dev-db/innotop-1.12.0
 1702282310 metadata/md5-cache/dev-db/lmdb++-0.9.14.0
@@ -35680,7 +35664,6 @@
 2011252124 metadata/md5-cache/dev-db/aerospike-server-community-4.1.0.1
 2011252124 metadata/md5-cache/dev-db/aerospike-server-community-9999
 2011252124 metadata/md5-cache/dev-db/apgdiff-2.4
-2011252124 metadata/md5-cache/dev-db/barman-2.10
 2011252124 metadata/md5-cache/dev-db/bucardo-5.4.1
 2011252124 metadata/md5-cache/dev-db/cdb-0.75-r4
 2011252124 metadata/md5-cache/dev-db/cockroach-19.1.1
@@ -35735,11 +35718,7 @@
 2011252124 metadata/md5-cache/dev-db/mongodb-4.0.20
 2011252124 metadata/md5-cache/dev-db/mongodb-4.2.10
 2011252124 metadata/md5-cache/dev-db/mongodb-4.2.8
-2011252124 metadata/md5-cache/dev-db/mongodb-4.4.1
 2011252124 metadata/md5-cache/dev-db/mtop-0.6.6-r3
-2011252124 metadata/md5-cache/dev-db/mycli-1.20.1
-2011252124 metadata/md5-cache/dev-db/mycli-1.21.1-r1
-2011252124 metadata/md5-cache/dev-db/mycli-9999
 2011252124 metadata/md5-cache/dev-db/mydumper-0.9.3-r1
 2011252124 metadata/md5-cache/dev-db/mydumper-0.9.5
 2011252124 metadata/md5-cache/dev-db/mydumper-0.9.5-r1
@@ -35759,7 +35738,6 @@
 2011252124 metadata/md5-cache/dev-db/mysql-connector-c++-8.0.19
 2011252124 metadata/md5-cache/dev-db/mysql-connector-c++-8.0.20
 2011252124 metadata/md5-cache/dev-db/mysql-connector-c++-8.0.21
-2011252124 metadata/md5-cache/dev-db/mysql-connector-c++-8.0.22
 2011252124 metadata/md5-cache/dev-db/mysql-init-scripts-2.3-r3
 2011252124 metadata/md5-cache/dev-db/mysql-super-smack-1.3-r4
 2011252124 metadata/md5-cache/dev-db/mytop-1.6-r4
@@ -35782,9 +35760,7 @@
 2011252124 metadata/md5-cache/dev-db/percona-xtrabackup-2.4.15
 2011252124 metadata/md5-cache/dev-db/percona-xtrabackup-2.4.20
 2011252124 metadata/md5-cache/dev-db/percona-xtrabackup-8.0.13
-2011252124 metadata/md5-cache/dev-db/pg_activity-1.6.2
 2011252124 metadata/md5-cache/dev-db/pg_top-3.7.0
-2011252124 metadata/md5-cache/dev-db/pg_top-4.0.0
 2011252124 metadata/md5-cache/dev-db/pgadmin4-4.17-r1
 2011252124 metadata/md5-cache/dev-db/pgadmin4-4.25
 2011252124 metadata/md5-cache/dev-db/pgadmin4-4.26
@@ -35793,14 +35769,11 @@
 2011252124 metadata/md5-cache/dev-db/pgagent-4.0.0
 2011252124 metadata/md5-cache/dev-db/pgagent-4.0.0-r1
 2011252124 metadata/md5-cache/dev-db/pgbouncer-1.15.0
-2011252124 metadata/md5-cache/dev-db/pgcli-2.2.0
-2011252124 metadata/md5-cache/dev-db/pgcli-3.0.0
 2011252124 metadata/md5-cache/dev-db/pgmodeler-0.9.2
 2011252124 metadata/md5-cache/dev-db/pgpool2-3.7.10
 2011252124 metadata/md5-cache/dev-db/pgpool2-4.0.5
 2011252124 metadata/md5-cache/dev-db/pgpool2-9999
 2011252124 metadata/md5-cache/dev-db/pgrouting-2.6.2-r1
-2011252124 metadata/md5-cache/dev-db/pgxnclient-1.3-r2
 2011252124 metadata/md5-cache/dev-db/postgis-2.5.3-r1
 2011252124 metadata/md5-cache/dev-db/postgis-2.5.4
 2011252124 metadata/md5-cache/dev-db/postgis-2.5.5
@@ -35816,15 +35789,12 @@
 2011252124 metadata/md5-cache/dev-db/postgresql-13.1
 2011252124 metadata/md5-cache/dev-db/postgresql-9.5.24
 2011252124 metadata/md5-cache/dev-db/postgresql-9.6.20
-2011252124 metadata/md5-cache/dev-db/postgresql-9999
-2011252124 metadata/md5-cache/dev-db/qdbm-1.8.78-r2
 2011252124 metadata/md5-cache/dev-db/qt5-sqlcipher-1.0.11
 2011252124 metadata/md5-cache/dev-db/redis-5.0.10
 2011252124 metadata/md5-cache/dev-db/redis-6.0.9
 2011252124 metadata/md5-cache/dev-db/repmgr-3.0.1
 2011252124 metadata/md5-cache/dev-db/repmgr-3.3.2
 2011252124 metadata/md5-cache/dev-db/repmgr-5.1.0
-2011252124 metadata/md5-cache/dev-db/sadisplay-0.4.9
 2011252124 metadata/md5-cache/dev-db/slony1-2.2.6
 2011252124 metadata/md5-cache/dev-db/slony1-2.2.7
 2011252124 metadata/md5-cache/dev-db/spatialite-4.3.0a
@@ -35853,11 +35823,25 @@
 2011281239 metadata/md5-cache/dev-db/mariadb-10.2.36
 2011281239 metadata/md5-cache/dev-db/mariadb-10.3.27
 2011281239 metadata/md5-cache/dev-db/mariadb-10.4.17
-2011300709 metadata/md5-cache/dev-db/Manifest.gz
 2011300439 metadata/md5-cache/dev-db/mysql-8.0.22
-2011292039 metadata/md5-cache/dev-db/mytop-1.9.1
 2011300639 metadata/md5-cache/dev-db/pg_top-4.0.0-r1
 2011300709 metadata/md5-cache/dev-db/pgbadger-11.4
+2012031039 metadata/md5-cache/dev-db/Manifest.gz
+2012011340 metadata/md5-cache/dev-db/barman-2.10
+2012030739 metadata/md5-cache/dev-db/mongodb-4.4.1
+2012011340 metadata/md5-cache/dev-db/mycli-1.20.1
+2012011340 metadata/md5-cache/dev-db/mycli-1.21.1-r1
+2012011340 metadata/md5-cache/dev-db/mycli-9999
+2012031039 metadata/md5-cache/dev-db/mysql-connector-c++-8.0.22
+2012020639 metadata/md5-cache/dev-db/mytop-1.9.1
+2012011340 metadata/md5-cache/dev-db/pg_activity-1.6.2
+2012020639 metadata/md5-cache/dev-db/pg_top-4.0.0
+2012011340 metadata/md5-cache/dev-db/pgcli-2.2.0
+2012011340 metadata/md5-cache/dev-db/pgcli-3.0.0
+2012011340 metadata/md5-cache/dev-db/pgxnclient-1.3-r2
+2012022239 metadata/md5-cache/dev-db/postgresql-9999
+2012011509 metadata/md5-cache/dev-db/qdbm-1.8.78-r2
+2012011340 metadata/md5-cache/dev-db/sadisplay-0.4.9
 2005162339 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 2005162339 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
 2011252124 metadata/md5-cache/dev-dotnet/Manifest.gz
@@ -35895,9 +35879,6 @@
 2011252124 metadata/md5-cache/dev-embedded/cpik-0.7.4_p4
 2011252124 metadata/md5-cache/dev-embedded/dc-tool-ip-1.0.4
 2011252124 metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1
-2011252124 metadata/md5-cache/dev-embedded/esptool-2.8
-2011252124 metadata/md5-cache/dev-embedded/esptool-2.8-r1
-2011252124 metadata/md5-cache/dev-embedded/esptool-2.8-r2
 2011252124 metadata/md5-cache/dev-embedded/gnusim8085-1.3.7
 2011252124 metadata/md5-cache/dev-embedded/gpsim-0.29.0
 2011252124 metadata/md5-cache/dev-embedded/gpsim-0.30.0
@@ -35914,7 +35895,6 @@
 2011252124 metadata/md5-cache/dev-embedded/mcu8051ide-1.4.10
 2011252124 metadata/md5-cache/dev-embedded/mspdebug-0.24
 2011252124 metadata/md5-cache/dev-embedded/mspdebug-0.25
-2011252124 metadata/md5-cache/dev-embedded/nodemcu-uploader-0.4.3-r1
 2011252124 metadata/md5-cache/dev-embedded/openocd-0.10.0
 2011252124 metadata/md5-cache/dev-embedded/openocd-0.10.0-r1
 2011252124 metadata/md5-cache/dev-embedded/openocd-0.9.0
@@ -35925,7 +35905,6 @@
 2011252124 metadata/md5-cache/dev-embedded/picp-0.6.8
 2011252124 metadata/md5-cache/dev-embedded/picprog-1.9.1
 2011252124 metadata/md5-cache/dev-embedded/pk2cmd-1.20
-2011252124 metadata/md5-cache/dev-embedded/platformio-5.0.1
 2011252124 metadata/md5-cache/dev-embedded/ponyprog-2.07c-r2
 2011252124 metadata/md5-cache/dev-embedded/ponyprog-3.0.0
 2011252124 metadata/md5-cache/dev-embedded/powersoftplus-libftdi-0.1.8-r1
@@ -35951,8 +35930,13 @@
 2011252124 metadata/md5-cache/dev-embedded/xa-2.3.10
 2011252124 metadata/md5-cache/dev-embedded/zmac-1.3-r1
 2011260839 metadata/md5-cache/dev-embedded/rpi-eeprom-10.2_p1
-2011281239 metadata/md5-cache/dev-embedded/Manifest.gz
-2011281239 metadata/md5-cache/dev-embedded/esptool-3.0
+2012011340 metadata/md5-cache/dev-embedded/Manifest.gz
+2012011340 metadata/md5-cache/dev-embedded/esptool-2.8
+2012011340 metadata/md5-cache/dev-embedded/esptool-2.8-r1
+2012011340 metadata/md5-cache/dev-embedded/esptool-2.8-r2
+2012011340 metadata/md5-cache/dev-embedded/esptool-3.0
+2012011340 metadata/md5-cache/dev-embedded/nodemcu-uploader-0.4.3-r1
+2012011340 metadata/md5-cache/dev-embedded/platformio-5.0.1
 2005120109 metadata/md5-cache/dev-erlang/eredis-1.0.8
 2005120109 metadata/md5-cache/dev-erlang/goldrush-0.1.9
 2005120109 metadata/md5-cache/dev-erlang/hamcrest-0.1.0_p20160709
@@ -37068,12 +37052,8 @@
 2011252124 metadata/md5-cache/dev-java/bcpkix-1.50-r2
 2011252124 metadata/md5-cache/dev-java/bcpkix-1.52-r1
 2011252124 metadata/md5-cache/dev-java/bcprov-1.38-r4
-2011252124 metadata/md5-cache/dev-java/bcprov-1.40-r2
 2011252124 metadata/md5-cache/dev-java/bcprov-1.45-r2
-2011252124 metadata/md5-cache/dev-java/bcprov-1.48-r2
-2011252124 metadata/md5-cache/dev-java/bcprov-1.49-r4
 2011252124 metadata/md5-cache/dev-java/bcprov-1.50-r2
-2011252124 metadata/md5-cache/dev-java/bcprov-1.50-r3
 2011252124 metadata/md5-cache/dev-java/bcprov-1.50-r4
 2011252124 metadata/md5-cache/dev-java/bcprov-1.52-r1
 2011252124 metadata/md5-cache/dev-java/bcprov-1.52-r2
@@ -37173,7 +37153,6 @@
 2011252124 metadata/md5-cache/dev-java/disruptor-3.2.0
 2011252124 metadata/md5-cache/dev-java/dnsjava-2.1.6
 2011252124 metadata/md5-cache/dev-java/dnsjava-2.1.7
-2011252124 metadata/md5-cache/dev-java/dnsjava-2.1.8
 2011252124 metadata/md5-cache/dev-java/dom4j-1.6.1-r7
 2011252124 metadata/md5-cache/dev-java/dtdparser-1.21-r2
 2011252124 metadata/md5-cache/dev-java/dynalang-0.4-r1
@@ -37183,7 +37162,6 @@
 2011252124 metadata/md5-cache/dev-java/eclipse-ecj-4.10
 2011252124 metadata/md5-cache/dev-java/eclipse-ecj-4.4.2-r1
 2011252124 metadata/md5-cache/dev-java/eclipse-ecj-4.5.1
-2011252124 metadata/md5-cache/dev-java/eclipsito-0_pre20130713
 2011252124 metadata/md5-cache/dev-java/eclipsito-20180510
 2011252124 metadata/md5-cache/dev-java/ecs-1.4.2-r2
 2011252124 metadata/md5-cache/dev-java/edtftpj-2.4.0
@@ -37297,8 +37275,6 @@
 2011252124 metadata/md5-cache/dev-java/jarbundler-2.3.1
 2011252124 metadata/md5-cache/dev-java/jargs-1.0
 2011252124 metadata/md5-cache/dev-java/jarjar-1.4
-2011252124 metadata/md5-cache/dev-java/java-config-2.3.1
-2011252124 metadata/md5-cache/dev-java/java-config-9999
 2011252124 metadata/md5-cache/dev-java/java-dep-check-0.3-r1
 2011252124 metadata/md5-cache/dev-java/java-dep-check-0.4
 2011252124 metadata/md5-cache/dev-java/java-getopt-1.0.14
@@ -37309,8 +37285,6 @@
 2011252124 metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719
 2011252124 metadata/md5-cache/dev-java/javassist-2.6-r2
 2011252124 metadata/md5-cache/dev-java/javassist-3.18.2
-2011252124 metadata/md5-cache/dev-java/javatoolkit-0.6.3
-2011252124 metadata/md5-cache/dev-java/javatoolkit-0.6.4
 2011252124 metadata/md5-cache/dev-java/javax-inject-1-r2
 2011252124 metadata/md5-cache/dev-java/javax-inject-1-r3
 2011252124 metadata/md5-cache/dev-java/javolution-4.0.2-r1
@@ -37673,8 +37647,13 @@
 2011252124 metadata/md5-cache/dev-java/xz-java-1.8
 2011252124 metadata/md5-cache/dev-java/yanfs-1.0
 2011252124 metadata/md5-cache/dev-java/zeus-jscl-1.64-r1
-2011281009 metadata/md5-cache/dev-java/Manifest.gz
 2011281009 metadata/md5-cache/dev-java/icedtea-web-1.8.4-r1
+2012030239 metadata/md5-cache/dev-java/Manifest.gz
+2012030239 metadata/md5-cache/dev-java/dnsjava-2.1.8
+2012011340 metadata/md5-cache/dev-java/java-config-2.3.1
+2012011340 metadata/md5-cache/dev-java/java-config-9999
+2012011340 metadata/md5-cache/dev-java/javatoolkit-0.6.3
+2012011340 metadata/md5-cache/dev-java/javatoolkit-0.6.4
 1702282312 metadata/md5-cache/dev-lang/ats-0.2.9
 1910152339 metadata/md5-cache/dev-lang/duktape-2.4.0
 1702282312 metadata/md5-cache/dev-lang/esco-0.512
@@ -37682,7 +37661,6 @@
 1906221109 metadata/md5-cache/dev-lang/execline-2.5.1.0
 1702282312 metadata/md5-cache/dev-lang/inform-6.33.1_p2
 1910022239 metadata/md5-cache/dev-lang/mono-basic-4.8
-1702282312 metadata/md5-cache/dev-lang/nwcc-0.8.2
 1702282312 metadata/md5-cache/dev-lang/nwcc-0.8.3
 1911290109 metadata/md5-cache/dev-lang/execline-2.5.3.0
 1912130439 metadata/md5-cache/dev-lang/bashforth-0.58a
@@ -37746,10 +37724,6 @@
 2011252124 metadata/md5-cache/dev-lang/execline-2.1.1.0
 2011252124 metadata/md5-cache/dev-lang/f2c-20100827-r1
 2011252124 metadata/md5-cache/dev-lang/ferite-1.1.17-r1
-2011252124 metadata/md5-cache/dev-lang/fpc-2.6.4
-2011252124 metadata/md5-cache/dev-lang/fpc-3.0.0
-2011252124 metadata/md5-cache/dev-lang/fpc-3.0.2
-2011252124 metadata/md5-cache/dev-lang/fpc-3.0.2-r1
 2011252124 metadata/md5-cache/dev-lang/fpc-3.0.4
 2011252124 metadata/md5-cache/dev-lang/gdl-1.0.0_rc3
 2011252124 metadata/md5-cache/dev-lang/gforth-0.7.3-r1
@@ -37778,10 +37752,6 @@
 2011252124 metadata/md5-cache/dev-lang/go-9999
 2011252124 metadata/md5-cache/dev-lang/gprolog-1.4.5
 2011252124 metadata/md5-cache/dev-lang/helium-1.8.1
-2011252124 metadata/md5-cache/dev-lang/hy-0.14.0
-2011252124 metadata/md5-cache/dev-lang/hy-0.15.0
-2011252124 metadata/md5-cache/dev-lang/hy-0.16.0
-2011252124 metadata/md5-cache/dev-lang/hy-0.17.0
 2011252124 metadata/md5-cache/dev-lang/icon-9.5.1-r1
 2011252124 metadata/md5-cache/dev-lang/icon-9.5.1-r2
 2011252124 metadata/md5-cache/dev-lang/icon-9.5.20h
@@ -37791,9 +37761,6 @@
 2011252124 metadata/md5-cache/dev-lang/janet-1.12.2
 2011252124 metadata/md5-cache/dev-lang/janet-1.9.1
 2011252124 metadata/md5-cache/dev-lang/jimtcl-0.76
-2011252124 metadata/md5-cache/dev-lang/jsonnet-0.15.0
-2011252124 metadata/md5-cache/dev-lang/jsonnet-0.16.0
-2011252124 metadata/md5-cache/dev-lang/jsonnet-0.16.0-r2
 2011252124 metadata/md5-cache/dev-lang/julia-1.2.0
 2011252124 metadata/md5-cache/dev-lang/julia-1.3.0
 2011252124 metadata/md5-cache/dev-lang/julia-1.4.0-r1
@@ -37801,9 +37768,6 @@
 2011252124 metadata/md5-cache/dev-lang/julia-1.5.2
 2011252124 metadata/md5-cache/dev-lang/jwasm-2.13
 2011252124 metadata/md5-cache/dev-lang/lazarus-1.0.12
-2011252124 metadata/md5-cache/dev-lang/lfe-0.10.1
-2011252124 metadata/md5-cache/dev-lang/lfe-0.7
-2011252124 metadata/md5-cache/dev-lang/lfe-1.0
 2011252124 metadata/md5-cache/dev-lang/lfe-1.1.1
 2011252124 metadata/md5-cache/dev-lang/lisaac-0.13.1-r2
 2011252124 metadata/md5-cache/dev-lang/logtalk-3.36.0
@@ -37854,10 +37818,6 @@
 2011252124 metadata/md5-cache/dev-lang/orc-0.4.28-r1
 2011252124 metadata/md5-cache/dev-lang/orc-0.4.29
 2011252124 metadata/md5-cache/dev-lang/orc-0.4.31
-2011252124 metadata/md5-cache/dev-lang/parrot-7.1.0-r1
-2011252124 metadata/md5-cache/dev-lang/parrot-7.11.0-r1
-2011252124 metadata/md5-cache/dev-lang/parrot-7.5.0-r1
-2011252124 metadata/md5-cache/dev-lang/parrot-8.1.0-r1
 2011252124 metadata/md5-cache/dev-lang/parrot-8.1.0-r2
 2011252124 metadata/md5-cache/dev-lang/pcc-1.1.0-r1
 2011252124 metadata/md5-cache/dev-lang/pcc-9999
@@ -37961,14 +37921,21 @@
 2011262239 metadata/md5-cache/dev-lang/rust-1.48.0
 2011271939 metadata/md5-cache/dev-lang/rust-1.47.0-r2
 2011271939 metadata/md5-cache/dev-lang/rust-bin-1.47.0-r1
-2011290109 metadata/md5-cache/dev-lang/jsonnet-0.17.0-r1
 2011290239 metadata/md5-cache/dev-lang/srf-1.0-r2
 2011292039 metadata/md5-cache/dev-lang/spidermonkey-78.5.0
-2011301939 metadata/md5-cache/dev-lang/Manifest.gz
 2011301939 metadata/md5-cache/dev-lang/lua-5.4.1-r1
 2011300939 metadata/md5-cache/dev-lang/moarvm-2020.11
 2011300939 metadata/md5-cache/dev-lang/nqp-2020.11
 2011300939 metadata/md5-cache/dev-lang/rakudo-2020.11
+2012020339 metadata/md5-cache/dev-lang/Manifest.gz
+2012011340 metadata/md5-cache/dev-lang/hy-0.14.0
+2012011340 metadata/md5-cache/dev-lang/hy-0.15.0
+2012011340 metadata/md5-cache/dev-lang/hy-0.16.0
+2012011340 metadata/md5-cache/dev-lang/hy-0.17.0
+2012011340 metadata/md5-cache/dev-lang/jsonnet-0.15.0
+2012011340 metadata/md5-cache/dev-lang/jsonnet-0.16.0
+2012011340 metadata/md5-cache/dev-lang/jsonnet-0.16.0-r2
+2012011340 metadata/md5-cache/dev-lang/jsonnet-0.17.0-r1
 1808290309 metadata/md5-cache/dev-libs/bcm2835-1.57
 1806262009 metadata/md5-cache/dev-libs/cudnn-7.1.4
 1811301839 metadata/md5-cache/dev-libs/cudnn-7.4.1.5
@@ -38135,17 +38102,13 @@
 2011252124 metadata/md5-cache/dev-libs/boost-mpl-cartesian_product-20161205
 2011252124 metadata/md5-cache/dev-libs/botan-2.15.0
 2011252124 metadata/md5-cache/dev-libs/botan-2.16.0
-2011252124 metadata/md5-cache/dev-libs/botan-2.17.2
 2011252124 metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200110
 2011252124 metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200902
 2011252124 metadata/md5-cache/dev-libs/c-blosc-1.20.1
 2011252124 metadata/md5-cache/dev-libs/c-capnproto-0.3
 2011252124 metadata/md5-cache/dev-libs/caliper-1.5.0
-2011252124 metadata/md5-cache/dev-libs/capnproto-0.6.0
-2011252124 metadata/md5-cache/dev-libs/capnproto-0.6.1
 2011252124 metadata/md5-cache/dev-libs/capnproto-0.7.0
 2011252124 metadata/md5-cache/dev-libs/capnproto-0.8.0
-2011252124 metadata/md5-cache/dev-libs/capstone-4.0.2-r2
 2011252124 metadata/md5-cache/dev-libs/cereal-1.3.0
 2011252124 metadata/md5-cache/dev-libs/cgilib-0.7-r1
 2011252124 metadata/md5-cache/dev-libs/cgreen-1.3.0
@@ -38160,7 +38123,6 @@
 2011252124 metadata/md5-cache/dev-libs/cloog-9999
 2011252124 metadata/md5-cache/dev-libs/collada-dom-2.5.0
 2011252124 metadata/md5-cache/dev-libs/collada-dom-9999
-2011252124 metadata/md5-cache/dev-libs/concurrencykit-0.7.0-r1
 2011252124 metadata/md5-cache/dev-libs/confuse-3.0
 2011252124 metadata/md5-cache/dev-libs/confuse-3.2.2
 2011252124 metadata/md5-cache/dev-libs/confuse-3.3
@@ -38194,7 +38156,6 @@
 2011252124 metadata/md5-cache/dev-libs/ding-libs-0.5.0
 2011252124 metadata/md5-cache/dev-libs/ding-libs-0.6.0
 2011252124 metadata/md5-cache/dev-libs/ding-libs-0.6.1
-2011252124 metadata/md5-cache/dev-libs/distorm64-3.5.0
 2011252124 metadata/md5-cache/dev-libs/dmalloc-5.5.2-r7
 2011252124 metadata/md5-cache/dev-libs/dmalloc-999999
 2011252124 metadata/md5-cache/dev-libs/dotconf-1.3-r1
@@ -38229,7 +38190,6 @@
 2011252124 metadata/md5-cache/dev-libs/geoip-1.6.9-r1
 2011252124 metadata/md5-cache/dev-libs/gf-complete-0.0.0
 2011252124 metadata/md5-cache/dev-libs/gf-complete-2.0.0
-2011252124 metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1
 2011252124 metadata/md5-cache/dev-libs/gf2x-1.3.0
 2011252124 metadata/md5-cache/dev-libs/girara-0.3.3
 2011252124 metadata/md5-cache/dev-libs/girara-0.3.4
@@ -38241,7 +38201,6 @@
 2011252124 metadata/md5-cache/dev-libs/glib-2.64.5
 2011252124 metadata/md5-cache/dev-libs/glib-2.66.2
 2011252124 metadata/md5-cache/dev-libs/gmime-2.6.23-r1
-2011252124 metadata/md5-cache/dev-libs/gmime-3.2.7
 2011252124 metadata/md5-cache/dev-libs/gmp-6.2.0-r1
 2011252124 metadata/md5-cache/dev-libs/gmp-6.2.1
 2011252124 metadata/md5-cache/dev-libs/go-fuse-0_p20140812-r1
@@ -38304,9 +38263,6 @@
 2011252124 metadata/md5-cache/dev-libs/judy-1.0.5-r2
 2011252124 metadata/md5-cache/dev-libs/kasync-0.3.0
 2011252124 metadata/md5-cache/dev-libs/kdiagram-2.7.0
-2011252124 metadata/md5-cache/dev-libs/keystone-0.9.1
-2011252124 metadata/md5-cache/dev-libs/keystone-0.9.1-r1
-2011252124 metadata/md5-cache/dev-libs/keystone-9999
 2011252124 metadata/md5-cache/dev-libs/klibc-2.0.4-r3
 2011252124 metadata/md5-cache/dev-libs/kpathsea-6.3.2_p20200406
 2011252124 metadata/md5-cache/dev-libs/kpeoplevcard-0.1
@@ -38402,8 +38358,6 @@
 2011252124 metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r3
 2011252124 metadata/md5-cache/dev-libs/libdivecomputer-9999
 2011252124 metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1
-2011252124 metadata/md5-cache/dev-libs/libdnet-1.14-r1
-2011252124 metadata/md5-cache/dev-libs/libdnet-9999
 2011252124 metadata/md5-cache/dev-libs/libdnsres-0.1a-r2
 2011252124 metadata/md5-cache/dev-libs/libdnsres-0.1a-r3
 2011252124 metadata/md5-cache/dev-libs/libdynd-0.7.2
@@ -38479,7 +38433,6 @@
 2011252124 metadata/md5-cache/dev-libs/libintl-0.19.8.1
 2011252124 metadata/md5-cache/dev-libs/libintl-0.20.1
 2011252124 metadata/md5-cache/dev-libs/libintl-0.20.2
-2011252124 metadata/md5-cache/dev-libs/libintl-0.21
 2011252124 metadata/md5-cache/dev-libs/libixion-0.15.0
 2011252124 metadata/md5-cache/dev-libs/libixion-9999
 2011252124 metadata/md5-cache/dev-libs/libjcat-0.1.3
@@ -38494,8 +38447,6 @@
 2011252124 metadata/md5-cache/dev-libs/liblist-2.4
 2011252124 metadata/md5-cache/dev-libs/liblogging-1.0.6
 2011252124 metadata/md5-cache/dev-libs/liblognorm-2.0.6
-2011252124 metadata/md5-cache/dev-libs/liblouis-3.10.0
-2011252124 metadata/md5-cache/dev-libs/liblouis-3.13.0
 2011252124 metadata/md5-cache/dev-libs/libltdl-2.4.6
 2011252124 metadata/md5-cache/dev-libs/libmateweather-1.24.0-r1
 2011252124 metadata/md5-cache/dev-libs/libmateweather-1.24.1
@@ -38510,7 +38461,6 @@
 2011252124 metadata/md5-cache/dev-libs/libmix-2.05-r7
 2011252124 metadata/md5-cache/dev-libs/libmoe-1.5.8-r3
 2011252124 metadata/md5-cache/dev-libs/libmowgli-2.1.3-r2
-2011252124 metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha
 2011252124 metadata/md5-cache/dev-libs/libmspack-0.9.1_alpha-r1
 2011252124 metadata/md5-cache/dev-libs/libmspack-9999
 2011252124 metadata/md5-cache/dev-libs/libnatspec-0.3.0
@@ -38519,8 +38469,6 @@
 2011252124 metadata/md5-cache/dev-libs/libnl-1.1.4
 2011252124 metadata/md5-cache/dev-libs/libnl-1.1.4-r1
 2011252124 metadata/md5-cache/dev-libs/libnl-1.1.9999
-2011252124 metadata/md5-cache/dev-libs/libnl-3.5.0
-2011252124 metadata/md5-cache/dev-libs/libnl-99999999
 2011252124 metadata/md5-cache/dev-libs/libnsfb-0.2.0-r2
 2011252124 metadata/md5-cache/dev-libs/libnsfb-0.2.1-r1
 2011252124 metadata/md5-cache/dev-libs/libnsfb-0.2.2-r1
@@ -38550,18 +38498,9 @@
 2011252124 metadata/md5-cache/dev-libs/libplatform-9999
 2011252124 metadata/md5-cache/dev-libs/libpqxx-7.1.2
 2011252124 metadata/md5-cache/dev-libs/libpqxx-7.2.1
-2011252124 metadata/md5-cache/dev-libs/libprelude-4.0.0
-2011252124 metadata/md5-cache/dev-libs/libprelude-4.1.0
-2011252124 metadata/md5-cache/dev-libs/libprelude-5.1.1
-2011252124 metadata/md5-cache/dev-libs/libprelude-5.2.0
-2011252124 metadata/md5-cache/dev-libs/libpreludedb-4.0.0-r1
-2011252124 metadata/md5-cache/dev-libs/libpreludedb-4.1.0-r1
-2011252124 metadata/md5-cache/dev-libs/libpreludedb-5.1.0
-2011252124 metadata/md5-cache/dev-libs/libpreludedb-5.2.0
 2011252124 metadata/md5-cache/dev-libs/libpthread-stubs-0.4-r1
 2011252124 metadata/md5-cache/dev-libs/libpwquality-1.4.2
 2011252124 metadata/md5-cache/dev-libs/libpwquality-1.4.4
-2011252124 metadata/md5-cache/dev-libs/libpy-0.2.5-r1
 2011252124 metadata/md5-cache/dev-libs/libqtxdg-3.5.0
 2011252124 metadata/md5-cache/dev-libs/libqtxdg-3.6.0
 2011252124 metadata/md5-cache/dev-libs/libratbag-0.9
@@ -38660,7 +38599,6 @@
 2011252124 metadata/md5-cache/dev-libs/libx86emu-1.1
 2011252124 metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
 2011252124 metadata/md5-cache/dev-libs/libxdiff-0.23-r2
-2011252124 metadata/md5-cache/dev-libs/libxml2-2.9.10-r3
 2011252124 metadata/md5-cache/dev-libs/libxmlb-0.1.15
 2011252124 metadata/md5-cache/dev-libs/libxmlb-0.2.0
 2011252124 metadata/md5-cache/dev-libs/libxmlb-0.2.1
@@ -38683,9 +38621,6 @@
 2011252124 metadata/md5-cache/dev-libs/m17n-lib-1.7.0
 2011252124 metadata/md5-cache/dev-libs/m17n-lib-1.8.0
 2011252124 metadata/md5-cache/dev-libs/maloc-1.5-r1
-2011252124 metadata/md5-cache/dev-libs/marisa-0.2.5
-2011252124 metadata/md5-cache/dev-libs/marisa-0.2.6
-2011252124 metadata/md5-cache/dev-libs/marisa-9999
 2011252124 metadata/md5-cache/dev-libs/mathjax-2.7.0
 2011252124 metadata/md5-cache/dev-libs/mathjax-2.7.4
 2011252124 metadata/md5-cache/dev-libs/mimetic-0.9.8
@@ -38728,7 +38663,6 @@
 2011252124 metadata/md5-cache/dev-libs/nspr-4.29
 2011252124 metadata/md5-cache/dev-libs/nss-3.56
 2011252124 metadata/md5-cache/dev-libs/nss-3.58-r2
-2011252124 metadata/md5-cache/dev-libs/nss-3.59
 2011252124 metadata/md5-cache/dev-libs/nss-pem-1.0.5
 2011252124 metadata/md5-cache/dev-libs/nss-pem-1.0.6
 2011252124 metadata/md5-cache/dev-libs/nsync-1.20.1
@@ -38765,14 +38699,10 @@
 2011252124 metadata/md5-cache/dev-libs/pcc-libs-1.1.0
 2011252124 metadata/md5-cache/dev-libs/pcc-libs-9999
 2011252124 metadata/md5-cache/dev-libs/pegtl-2.8.3
-2011252124 metadata/md5-cache/dev-libs/pigpio-76
-2011252124 metadata/md5-cache/dev-libs/pigpio-77
-2011252124 metadata/md5-cache/dev-libs/pigpio-78
 2011252124 metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1
 2011252124 metadata/md5-cache/dev-libs/poco-1.10.1
 2011252124 metadata/md5-cache/dev-libs/poco-1.9.0-r2
 2011252124 metadata/md5-cache/dev-libs/popt-1.16-r2
-2011252124 metadata/md5-cache/dev-libs/popt-1.18
 2011252124 metadata/md5-cache/dev-libs/ppl-1.2-r3
 2011252124 metadata/md5-cache/dev-libs/processor-trace-1.6.1
 2011252124 metadata/md5-cache/dev-libs/processor-trace-1.6.2
@@ -38900,19 +38830,16 @@
 2011252124 metadata/md5-cache/dev-libs/vc-intrinsics-0_p20200904
 2011252124 metadata/md5-cache/dev-libs/voikko-fi-2.3
 2011252124 metadata/md5-cache/dev-libs/volume_key-0.3.11
-2011252124 metadata/md5-cache/dev-libs/volume_key-0.3.12-r1
 2011252124 metadata/md5-cache/dev-libs/wayland-1.18.0
 2011252124 metadata/md5-cache/dev-libs/wayland-9999
 2011252124 metadata/md5-cache/dev-libs/wayland-protocols-9999
 2011252124 metadata/md5-cache/dev-libs/weston-8.0.0
-2011252124 metadata/md5-cache/dev-libs/weston-9.0.0
 2011252124 metadata/md5-cache/dev-libs/weston-9999
 2011252124 metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre1153059
 2011252124 metadata/md5-cache/dev-libs/xapian-1.2.25
 2011252124 metadata/md5-cache/dev-libs/xapian-1.4.14
 2011252124 metadata/md5-cache/dev-libs/xapian-1.4.15
 2011252124 metadata/md5-cache/dev-libs/xapian-1.4.16
-2011252124 metadata/md5-cache/dev-libs/xapian-1.4.17
 2011252124 metadata/md5-cache/dev-libs/xapian-bindings-1.4.14
 2011252124 metadata/md5-cache/dev-libs/xapian-bindings-1.4.15
 2011252124 metadata/md5-cache/dev-libs/xapian-bindings-1.4.16
@@ -38937,13 +38864,11 @@
 2011260839 metadata/md5-cache/dev-libs/librelp-1.7.0
 2011260209 metadata/md5-cache/dev-libs/protobuf-3.13.0
 2011261139 metadata/md5-cache/dev-libs/volume_key-0.3.12-r2
-2011270139 metadata/md5-cache/dev-libs/libmanette-0.2.4
 2011262209 metadata/md5-cache/dev-libs/libowfat-0.32-r2
 2011262039 metadata/md5-cache/dev-libs/libressl-3.3.0
 2011262139 metadata/md5-cache/dev-libs/pugixml-1.11
 2011262039 metadata/md5-cache/dev-libs/rocksdb-6.14.5
 2011280039 metadata/md5-cache/dev-libs/libmanette-0.2.5
-2011271939 metadata/md5-cache/dev-libs/mpc-1.2.1
 2011280309 metadata/md5-cache/dev-libs/nettle-3.6-r3
 2011282209 metadata/md5-cache/dev-libs/icu-68.1
 2011281509 metadata/md5-cache/dev-libs/jansson-2.13.1
@@ -38951,16 +38876,58 @@
 2011291139 metadata/md5-cache/dev-libs/leatherman-1.12.2
 2011281539 metadata/md5-cache/dev-libs/libev-4.33
 2011281409 metadata/md5-cache/dev-libs/libinput-1.16.4
-2011292039 metadata/md5-cache/dev-libs/libinput-1.16.3
 2011292209 metadata/md5-cache/dev-libs/libmpack-1.0.5
 2011300609 metadata/md5-cache/dev-libs/mathjax-2.7.7
-2012010939 metadata/md5-cache/dev-libs/Manifest.gz
-2012010939 metadata/md5-cache/dev-libs/efl-1.25.1-r10
 2011302209 metadata/md5-cache/dev-libs/libarcus-4.8.0
 2011302209 metadata/md5-cache/dev-libs/libcharon-4.8.0
 2011302209 metadata/md5-cache/dev-libs/libnest2d-0.4
 2011302209 metadata/md5-cache/dev-libs/libsavitar-4.8.0
 2011302209 metadata/md5-cache/dev-libs/stb-20200713
+2012031009 metadata/md5-cache/dev-libs/Manifest.gz
+2012030239 metadata/md5-cache/dev-libs/botan-2.17.2
+2012011340 metadata/md5-cache/dev-libs/capstone-4.0.2-r2
+2012020009 metadata/md5-cache/dev-libs/concurrencykit-0.7.0-r1
+2012011340 metadata/md5-cache/dev-libs/distorm64-3.5.0
+2012011439 metadata/md5-cache/dev-libs/efl-1.25.1-r10
+2012011839 metadata/md5-cache/dev-libs/ell-0.35
+2012030239 metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1
+2012011309 metadata/md5-cache/dev-libs/gmime-3.2.7
+2012011340 metadata/md5-cache/dev-libs/keystone-0.9.1
+2012011340 metadata/md5-cache/dev-libs/keystone-0.9.1-r1
+2012011340 metadata/md5-cache/dev-libs/keystone-9999
+2012011340 metadata/md5-cache/dev-libs/libdnet-1.14-r1
+2012011340 metadata/md5-cache/dev-libs/libdnet-9999
+2012030139 metadata/md5-cache/dev-libs/libinput-1.16.3
+2012030209 metadata/md5-cache/dev-libs/libintl-0.21
+2012011340 metadata/md5-cache/dev-libs/liblouis-3.10.0
+2012011340 metadata/md5-cache/dev-libs/liblouis-3.13.0
+2012012039 metadata/md5-cache/dev-libs/libmanette-0.2.4
+2012011209 metadata/md5-cache/dev-libs/libmspack-0.10.1_alpha
+2012011340 metadata/md5-cache/dev-libs/libnl-3.5.0
+2012011340 metadata/md5-cache/dev-libs/libnl-99999999
+2012011340 metadata/md5-cache/dev-libs/libprelude-4.0.0
+2012011340 metadata/md5-cache/dev-libs/libprelude-4.1.0
+2012011340 metadata/md5-cache/dev-libs/libprelude-5.1.1
+2012011340 metadata/md5-cache/dev-libs/libprelude-5.2.0
+2012011340 metadata/md5-cache/dev-libs/libpreludedb-4.0.0-r1
+2012011340 metadata/md5-cache/dev-libs/libpreludedb-4.1.0-r1
+2012011340 metadata/md5-cache/dev-libs/libpreludedb-5.1.0
+2012011340 metadata/md5-cache/dev-libs/libpreludedb-5.2.0
+2012011340 metadata/md5-cache/dev-libs/libpy-0.2.5-r1
+2012030339 metadata/md5-cache/dev-libs/libxml2-2.9.10-r4
+2012011340 metadata/md5-cache/dev-libs/marisa-0.2.5
+2012011340 metadata/md5-cache/dev-libs/marisa-0.2.6
+2012011340 metadata/md5-cache/dev-libs/marisa-9999
+2012030209 metadata/md5-cache/dev-libs/mpc-1.2.1
+2012012009 metadata/md5-cache/dev-libs/nss-3.59-r1
+2012011340 metadata/md5-cache/dev-libs/pigpio-76
+2012011340 metadata/md5-cache/dev-libs/pigpio-77
+2012011340 metadata/md5-cache/dev-libs/pigpio-78
+2012011539 metadata/md5-cache/dev-libs/popt-1.18
+2012020339 metadata/md5-cache/dev-libs/rocksdb-6.14.6
+2012031009 metadata/md5-cache/dev-libs/volume_key-0.3.12-r1
+2012030239 metadata/md5-cache/dev-libs/weston-9.0.0
+2012011309 metadata/md5-cache/dev-libs/xapian-1.4.17
 1910111840 metadata/md5-cache/dev-lisp/hyperspec-7.0-r1
 2011252124 metadata/md5-cache/dev-lisp/Manifest.gz
 2011252124 metadata/md5-cache/dev-lisp/abcl-1.5.0
@@ -39036,12 +39003,6 @@
 2011252124 metadata/md5-cache/dev-lua/luaexpat-1.3.0-r2
 2011252124 metadata/md5-cache/dev-lua/luaexpat-1.3.3-r2
 2011252124 metadata/md5-cache/dev-lua/luafilesystem-1.8.0-r1
-2011252124 metadata/md5-cache/dev-lua/lualdap-1.2.0
-2011252124 metadata/md5-cache/dev-lua/luaossl-20150727
-2011252124 metadata/md5-cache/dev-lua/luaossl-20180708
-2011252124 metadata/md5-cache/dev-lua/luaossl-20181207
-2011252124 metadata/md5-cache/dev-lua/luaossl-20190731
-2011252124 metadata/md5-cache/dev-lua/luaposix-35.0
 2011252124 metadata/md5-cache/dev-lua/luasec-0.9
 2011252124 metadata/md5-cache/dev-lua/luasec-9999
 2011252124 metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r5
@@ -39075,24 +39036,18 @@
 2011282109 metadata/md5-cache/dev-lua/penlight-1.9.2
 2011291909 metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r101
 2011300339 metadata/md5-cache/dev-lua/busted-htest-1.0.0
-2011292039 metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r1
 2011292039 metadata/md5-cache/dev-lua/lua-term-0.7
 2011291909 metadata/md5-cache/dev-lua/lua-term-0.7-r101
-2011292039 metadata/md5-cache/dev-lua/lua-utf8-0.1.3
 2011292039 metadata/md5-cache/dev-lua/lua_cliargs-3.0_p2
-2011292039 metadata/md5-cache/dev-lua/luacheck-0.23.0-r1
 2011291909 metadata/md5-cache/dev-lua/luaexpat-1.3.0-r101
 2011291909 metadata/md5-cache/dev-lua/luaexpat-1.3.3-r101
 2011291909 metadata/md5-cache/dev-lua/luafilesystem-1.8.0-r101
 2011300439 metadata/md5-cache/dev-lua/luarocks-3.3.1
-2011300439 metadata/md5-cache/dev-lua/luarocks-3.4.0
 2011291909 metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r101
 2011292039 metadata/md5-cache/dev-lua/luassert-1.8.0
 2011292039 metadata/md5-cache/dev-lua/luasystem-0.2.1_p0
-2011300109 metadata/md5-cache/dev-lua/mpack-1.0.8
 2011300109 metadata/md5-cache/dev-lua/mpack-1.0.8-r100
 2011292039 metadata/md5-cache/dev-lua/penlight-1.7.0
-2012010209 metadata/md5-cache/dev-lua/Manifest.gz
 2011301639 metadata/md5-cache/dev-lua/busted-2.0.0-r101
 2011301639 metadata/md5-cache/dev-lua/busted-htest-1.0.0-r100
 2011301639 metadata/md5-cache/dev-lua/inifile-1.0
@@ -39111,6 +39066,22 @@
 2011301639 metadata/md5-cache/dev-lua/say-1.3_p1-r101
 2012010209 metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r1
 2012010209 metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100
+2012030809 metadata/md5-cache/dev-lua/Manifest.gz
+2012030809 metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r1
+2012011340 metadata/md5-cache/dev-lua/lua-cjson-2.1.0.8
+2012011340 metadata/md5-cache/dev-lua/lua-cjson-2.1.0.8-r100
+2012030809 metadata/md5-cache/dev-lua/lua-utf8-0.1.3
+2012030809 metadata/md5-cache/dev-lua/luacheck-0.23.0-r1
+2012011509 metadata/md5-cache/dev-lua/luacov-0.14.0
+2012011509 metadata/md5-cache/dev-lua/luacov-0.14.0-r100
+2012020309 metadata/md5-cache/dev-lua/lualdap-1.2.5
+2012020309 metadata/md5-cache/dev-lua/lualdap-1.2.5-r100
+2012030239 metadata/md5-cache/dev-lua/luaossl-20200709
+2012030239 metadata/md5-cache/dev-lua/luaossl-20200709-r100
+2012030309 metadata/md5-cache/dev-lua/luaposix-35.0
+2012030309 metadata/md5-cache/dev-lua/luaposix-35.0-r100
+2012011539 metadata/md5-cache/dev-lua/luarocks-3.4.0
+2012011340 metadata/md5-cache/dev-lua/mpack-1.0.8-r1
 1704021208 metadata/md5-cache/dev-ml/async_extra-0.9.0
 1704021208 metadata/md5-cache/dev-ml/async_kernel-0.9.0
 1704021208 metadata/md5-cache/dev-ml/async_rpc_kernel-0.9.0
@@ -39131,20 +39102,13 @@
 1704021208 metadata/md5-cache/dev-ml/fieldslib-0.9.0
 1802120109 metadata/md5-cache/dev-ml/integers-0.2.2
 1704021208 metadata/md5-cache/dev-ml/jane-street-headers-0.9.0
-1910111840 metadata/md5-cache/dev-ml/lwt-3.1.0
 1702282313 metadata/md5-cache/dev-ml/ocaml-doc-4.04
 1707021908 metadata/md5-cache/dev-ml/ocaml-doc-4.05
 1706211938 metadata/md5-cache/dev-ml/ocaml-magic-mime-1.1.0
-1912131839 metadata/md5-cache/dev-ml/biniou-1.0.12
-1912131839 metadata/md5-cache/dev-ml/biniou-1.0.13
-1912131839 metadata/md5-cache/dev-ml/biniou-1.1.0
 1912131839 metadata/md5-cache/dev-ml/biniou-1.2.0
 1912131839 metadata/md5-cache/dev-ml/cppo-1.4.1
 1912131839 metadata/md5-cache/dev-ml/cppo-1.5.0
-1912131839 metadata/md5-cache/dev-ml/easy-format-1.0.2
 1912131839 metadata/md5-cache/dev-ml/easy-format-1.2.0
-1912131839 metadata/md5-cache/dev-ml/iTeML-2.5
-1912131839 metadata/md5-cache/dev-ml/iTeML-2.6
 1912131839 metadata/md5-cache/dev-ml/iTeML-2.7
 1912131839 metadata/md5-cache/dev-ml/merlin-extend-0.3
 1912131839 metadata/md5-cache/dev-ml/ocaml-dispatch-0.4.0
@@ -39166,7 +39130,6 @@
 2006132239 metadata/md5-cache/dev-ml/seq-0.1
 2009121921 metadata/md5-cache/dev-ml/menhir-20181006
 2009121921 metadata/md5-cache/dev-ml/menhir-20190924
-2009121921 metadata/md5-cache/dev-ml/ppx_tools-5.3.4.08.0
 2009202339 metadata/md5-cache/dev-ml/camomile-0.8.5-r2
 2010031709 metadata/md5-cache/dev-ml/facile-1.1.3
 2010031709 metadata/md5-cache/dev-ml/lablgtk-2.18.8-r1
@@ -39192,7 +39155,6 @@
 2010131609 metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.5
 2010131609 metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.6
 2010131609 metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.7
-2010131609 metadata/md5-cache/dev-ml/ocaml-sqlite3-4.2.0
 2010131609 metadata/md5-cache/dev-ml/ocaml-sqlite3-4.3.0
 2010131609 metadata/md5-cache/dev-ml/ocaml-uri-1.9.4
 2010131609 metadata/md5-cache/dev-ml/octavius-1.1.0
@@ -39253,8 +39215,6 @@
 2010280709 metadata/md5-cache/dev-ml/camlp5-7.12
 2010280709 metadata/md5-cache/dev-ml/cmdliner-1.0.4
 2010280709 metadata/md5-cache/dev-ml/dose3-5.0.1-r1
-2010280709 metadata/md5-cache/dev-ml/dune-2.7.1
-2010280709 metadata/md5-cache/dev-ml/extlib-1.7.7
 2010280709 metadata/md5-cache/dev-ml/ocaml-autoconf-1.1-r1
 2010280709 metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1
 2010280709 metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r1
@@ -39273,7 +39233,6 @@
 2010311309 metadata/md5-cache/dev-ml/cairo2-0.6.1
 2010311309 metadata/md5-cache/dev-ml/camomile-1.0.2
 2010311309 metadata/md5-cache/dev-ml/cinaps-0.14.0
-2010311309 metadata/md5-cache/dev-ml/cppo-1.6.6
 2010311309 metadata/md5-cache/dev-ml/cryptokit-1.16.1-r1
 2010311309 metadata/md5-cache/dev-ml/csexp-1.3.2
 2010311309 metadata/md5-cache/dev-ml/dune-configurator-2.7.1
@@ -39360,27 +39319,20 @@
 2011180439 metadata/md5-cache/dev-ml/camldbm-1.0
 2011180439 metadata/md5-cache/dev-ml/camldbm-1.2
 2011170309 metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.2
-2011170309 metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.3
-2011170309 metadata/md5-cache/dev-ml/ocaml-ctypes-0.12.1
-2011170309 metadata/md5-cache/dev-ml/ocaml-ctypes-0.13.0
 2011252124 metadata/md5-cache/dev-ml/batteries-2.7.0
 2011252124 metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0
-2011252124 metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0-r1
 2011252124 metadata/md5-cache/dev-ml/calendar-2.04
 2011252124 metadata/md5-cache/dev-ml/camlidl-1.05-r1
 2011252124 metadata/md5-cache/dev-ml/camlzip-1.06
 2011252124 metadata/md5-cache/dev-ml/camlzip-1.07
 2011252124 metadata/md5-cache/dev-ml/cryptokit-1.10
 2011252124 metadata/md5-cache/dev-ml/cryptokit-1.11
-2011252124 metadata/md5-cache/dev-ml/csv-1.5
-2011252124 metadata/md5-cache/dev-ml/csv-1.6
 2011252124 metadata/md5-cache/dev-ml/csv-1.7
 2011252124 metadata/md5-cache/dev-ml/cudf-0.9
 2011252124 metadata/md5-cache/dev-ml/deriving-0.7.1
 2011252124 metadata/md5-cache/dev-ml/eliom-6.2.0
 2011252124 metadata/md5-cache/dev-ml/eliom-9999
 2011252124 metadata/md5-cache/dev-ml/extlib-1.7.1
-2011252124 metadata/md5-cache/dev-ml/extlib-1.7.2
 2011252124 metadata/md5-cache/dev-ml/findlib-1.8.1
 2011252124 metadata/md5-cache/dev-ml/gen-0.4.0.1
 2011252124 metadata/md5-cache/dev-ml/gsl-ocaml-1.19.1
@@ -39391,37 +39343,25 @@
 2011252124 metadata/md5-cache/dev-ml/lablgl-1.06-r1
 2011252124 metadata/md5-cache/dev-ml/lablgtk-2.18.5
 2011252124 metadata/md5-cache/dev-ml/labltk-8.06.2
-2011252124 metadata/md5-cache/dev-ml/lwt-3.0.0
 2011252124 metadata/md5-cache/dev-ml/lwt_react-1.0.1
-2011252124 metadata/md5-cache/dev-ml/lwt_ssl-1.0.1
 2011252124 metadata/md5-cache/dev-ml/macaque-0.7.4
 2011252124 metadata/md5-cache/dev-ml/markup-0.7.5
 2011252124 metadata/md5-cache/dev-ml/mtime-1.1.0
 2011252124 metadata/md5-cache/dev-ml/num-1.3
 2011252124 metadata/md5-cache/dev-ml/num-1.3-r1
 2011252124 metadata/md5-cache/dev-ml/oasis-0.4.10
-2011252124 metadata/md5-cache/dev-ml/oasis-0.4.8
 2011252124 metadata/md5-cache/dev-ml/ocaml-cohttp-0.22.0
 2011252124 metadata/md5-cache/dev-ml/ocaml-conduit-0.15.4
 2011252124 metadata/md5-cache/dev-ml/ocaml-data-notation-0.0.11-r1
-2011252124 metadata/md5-cache/dev-ml/ocaml-dispatch-0.3.0
-2011252124 metadata/md5-cache/dev-ml/ocaml-expat-1.0.0
-2011252124 metadata/md5-cache/dev-ml/ocaml-expat-1.1.0
 2011252124 metadata/md5-cache/dev-ml/ocaml-expect-0.0.5
-2011252124 metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.1
-2011252124 metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.2
 2011252124 metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r2
-2011252124 metadata/md5-cache/dev-ml/ocaml-hashcons-1.2
 2011252124 metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
 2011252124 metadata/md5-cache/dev-ml/ocaml-magic-mime-1.0.0
 2011252124 metadata/md5-cache/dev-ml/ocaml-re-1.7.1
-2011252124 metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.2
-2011252124 metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.3
 2011252124 metadata/md5-cache/dev-ml/ocaml-ssl-0.5.3-r1
 2011252124 metadata/md5-cache/dev-ml/ocamlbuild-0.14.0
 2011252124 metadata/md5-cache/dev-ml/ocamlgraph-1.8.7-r1
 2011252124 metadata/md5-cache/dev-ml/ocamlify-0.0.2
-2011252124 metadata/md5-cache/dev-ml/ocamlmod-0.0.8
 2011252124 metadata/md5-cache/dev-ml/ocamlmod-0.0.9
 2011252124 metadata/md5-cache/dev-ml/ocamlnet-4.1.2
 2011252124 metadata/md5-cache/dev-ml/ocplib-endian-1.0
@@ -39434,9 +39374,6 @@
 2011252124 metadata/md5-cache/dev-ml/pcre-ocaml-7.2.3
 2011252124 metadata/md5-cache/dev-ml/pgocaml-2.3
 2011252124 metadata/md5-cache/dev-ml/ppx_deriving-4.2-r1
-2011252124 metadata/md5-cache/dev-ml/ppx_tools-5.0.4.03.0
-2011252124 metadata/md5-cache/dev-ml/ppx_tools-5.0.4.05.0
-2011252124 metadata/md5-cache/dev-ml/qcheck-0.6
 2011252124 metadata/md5-cache/dev-ml/qcheck-0.7
 2011252124 metadata/md5-cache/dev-ml/stringext-1.4.3
 2011252124 metadata/md5-cache/dev-ml/type-conv-113.00.02
@@ -39445,14 +39382,18 @@
 2011252124 metadata/md5-cache/dev-ml/zarith-1.10
 2011252124 metadata/md5-cache/dev-ml/zarith-1.7
 2011252124 metadata/md5-cache/dev-ml/zarith-1.9.1
-2011292039 metadata/md5-cache/dev-ml/Manifest.gz
-2011292039 metadata/md5-cache/dev-ml/findlib-1.8.1-r1
 2011291339 metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1
 2011291339 metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0
 2011291409 metadata/md5-cache/dev-ml/llvm-ocaml-11.0.1.9999
 2011291409 metadata/md5-cache/dev-ml/llvm-ocaml-11.0.1_rc1
 2011291339 metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0.9999
 2011291339 metadata/md5-cache/dev-ml/llvm-ocaml-9.0.1
+2012030509 metadata/md5-cache/dev-ml/Manifest.gz
+2012030509 metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0-r1
+2012030509 metadata/md5-cache/dev-ml/cppo-1.6.6
+2012030509 metadata/md5-cache/dev-ml/dune-2.7.1
+2012030509 metadata/md5-cache/dev-ml/extlib-1.7.7
+2012030239 metadata/md5-cache/dev-ml/findlib-1.8.1-r1
 1910170740 metadata/md5-cache/dev-perl/Alien-Gnuplot-1.33.0
 1910170740 metadata/md5-cache/dev-perl/Apache-CGI-Builder-1.300.0-r2
 1910170740 metadata/md5-cache/dev-perl/Apache2-AuthenNTLM-0.20.0-r2
@@ -40833,7 +40774,6 @@
 2008311739 metadata/md5-cache/dev-perl/Class-Trigger-0.150.0
 2008311739 metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0-r1
 2008310909 metadata/md5-cache/dev-perl/File-NFSLock-1.290.0
-2008310909 metadata/md5-cache/dev-perl/File-Next-1.180.0-r1
 2008310939 metadata/md5-cache/dev-perl/File-Path-Expand-1.20.0-r2
 2008310939 metadata/md5-cache/dev-perl/File-ReadBackwards-1.50.0-r2
 2008311009 metadata/md5-cache/dev-perl/File-Remove-1.580.0
@@ -41487,7 +41427,6 @@
 2011281239 metadata/md5-cache/dev-perl/File-chdir-0.101.100
 2011281309 metadata/md5-cache/dev-perl/Hook-LexWrap-0.260.0
 2011281309 metadata/md5-cache/dev-perl/Import-Into-1.2.5
-2011282239 metadata/md5-cache/dev-perl/Manifest.gz
 2011281309 metadata/md5-cache/dev-perl/Pod-Markdown-Github-0.40.0
 2011281309 metadata/md5-cache/dev-perl/Pod-Readme-1.2.3
 2011281239 metadata/md5-cache/dev-perl/Shell-Config-Generate-0.330.0
@@ -41499,6 +41438,8 @@
 2011281309 metadata/md5-cache/dev-perl/Test-utf8-1.10.0
 2011281239 metadata/md5-cache/dev-perl/Time-Duration-1.200.0
 2011281239 metadata/md5-cache/dev-perl/XML-LibXML-2.20.100
+2012030239 metadata/md5-cache/dev-perl/File-Next-1.180.0-r1
+2012030239 metadata/md5-cache/dev-perl/Manifest.gz
 1811020409 metadata/md5-cache/dev-php/File_Iterator-1.3.4
 1908161609 metadata/md5-cache/dev-php/PEAR-Config-2.0.0_pre20140323-r1
 1811020409 metadata/md5-cache/dev-php/PEAR-DB_DataObject-1.11.5-r1
@@ -41534,8 +41475,6 @@
 1702282315 metadata/md5-cache/dev-php/cli-prompt-1.0.0
 1812180409 metadata/md5-cache/dev-php/cli-prompt-1.0.3
 1707271838 metadata/md5-cache/dev-php/cphplib-0.51-r1
-1806072239 metadata/md5-cache/dev-php/doctrine-1.2.5
-1806072239 metadata/md5-cache/dev-php/doctrine-2.4.6
 1806072239 metadata/md5-cache/dev-php/doctrine-2.6.1
 1910132209 metadata/md5-cache/dev-php/jpgraph-4.0.2
 1803201638 metadata/md5-cache/dev-php/jpgraph-4.2.0
@@ -41879,7 +41818,6 @@
 2011252124 metadata/md5-cache/dev-php/pecl-uuid-1.2.0
 2011252124 metadata/md5-cache/dev-php/pecl-xdiff-2.0.1-r2
 2011252124 metadata/md5-cache/dev-php/pecl-yaml-2.0.4
-2011252124 metadata/md5-cache/dev-php/pecl-yaml-2.1.0
 2011252124 metadata/md5-cache/dev-php/pecl-yaz-1.2.3
 2011252124 metadata/md5-cache/dev-php/realpath_turbo-2.0.0
 2011252124 metadata/md5-cache/dev-php/swoole-4.2.13
@@ -41904,7 +41842,6 @@
 2011252124 metadata/md5-cache/dev-php/xhprof-2.1.4
 2011261639 metadata/md5-cache/dev-php/pecl-zmq-1.1.3-r3
 2011261639 metadata/md5-cache/dev-php/pecl-zmq-9999
-2011300409 metadata/md5-cache/dev-php/Manifest.gz
 2011300409 metadata/md5-cache/dev-php/PHP_CodeCoverage-7.0.12
 2011300409 metadata/md5-cache/dev-php/awl-0.61
 2011300409 metadata/md5-cache/dev-php/myclabs-deepcopy-1.10.2
@@ -41914,6 +41851,8 @@
 2011300409 metadata/md5-cache/dev-php/theseer-tokenizer-1.2.0
 2011300409 metadata/md5-cache/dev-php/zetacomponents-Base-1.9.1
 2011300409 metadata/md5-cache/dev-php/zetacomponents-ConsoleTools-1.7.2
+2012030239 metadata/md5-cache/dev-php/Manifest.gz
+2012030239 metadata/md5-cache/dev-php/pecl-yaml-2.1.0
 2005091439 metadata/md5-cache/dev-python/nltk-data-20200312-r1
 2007080039 metadata/md5-cache/dev-python/python-docs-2.7.18
 2008292109 metadata/md5-cache/dev-python/pypy-exe-bin-7.3.1_p1
@@ -41930,1066 +41869,31 @@
 2011221509 metadata/md5-cache/dev-python/pypy-exe-bin-7.3.3
 2011221509 metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.3
 2011221509 metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.3_p37
-2011252124 metadata/md5-cache/dev-python/3to2-1.1.1-r1
-2011252124 metadata/md5-cache/dev-python/APScheduler-3.6.3
-2011252124 metadata/md5-cache/dev-python/Babel-2.8.0-r2
-2011252124 metadata/md5-cache/dev-python/Babel-2.8.1
-2011252124 metadata/md5-cache/dev-python/BitVector-3.4.9
-2011252124 metadata/md5-cache/dev-python/GitPython-3.1.11
-2011252124 metadata/md5-cache/dev-python/GridDataFormats-0.4.0-r1
-2011252124 metadata/md5-cache/dev-python/HeapDict-1.0.0
-2011252124 metadata/md5-cache/dev-python/MechanicalSoup-0.12.0
-2011252124 metadata/md5-cache/dev-python/PyContracts-1.8.14-r1
-2011252124 metadata/md5-cache/dev-python/PyECLib-1.6.0
-2011252124 metadata/md5-cache/dev-python/PyGithub-1.53
-2011252124 metadata/md5-cache/dev-python/PyICU-2.5
-2011252124 metadata/md5-cache/dev-python/PyPDF2-1.26.0
 2011252124 metadata/md5-cache/dev-python/PyQt5-sip-4.19.24
-2011252124 metadata/md5-cache/dev-python/PyRSS2Gen-1.1-r1
-2011252124 metadata/md5-cache/dev-python/PySDL2-0.9.7
-2011252124 metadata/md5-cache/dev-python/PySensors-0.0.4
-2011252124 metadata/md5-cache/dev-python/PySocks-1.7.1-r1
-2011252124 metadata/md5-cache/dev-python/PyUtilib-5.7.2
 2011252124 metadata/md5-cache/dev-python/PythonQt-3.2-r1
 2011252124 metadata/md5-cache/dev-python/PythonQt-9999
-2011252124 metadata/md5-cache/dev-python/QtPy-1.9.0-r2
-2011252124 metadata/md5-cache/dev-python/Rx-3.1.0
-2011252124 metadata/md5-cache/dev-python/SaltTesting-2018.9.21
-2011252124 metadata/md5-cache/dev-python/WSME-0.10.0
-2011252124 metadata/md5-cache/dev-python/XenAPI-2.14
-2011252124 metadata/md5-cache/dev-python/absl-py-0.10.0
-2011252124 metadata/md5-cache/dev-python/aiocontextvars-0.2.2
-2011252124 metadata/md5-cache/dev-python/aiodns-2.0.0-r1
-2011252124 metadata/md5-cache/dev-python/aiofiles-0.5.0
-2011252124 metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0
-2011252124 metadata/md5-cache/dev-python/aiohttp-socks-0.5.5
-2011252124 metadata/md5-cache/dev-python/aiorpcX-0.18.4-r1
-2011252124 metadata/md5-cache/dev-python/aiosmtpd-1.2
-2011252124 metadata/md5-cache/dev-python/aiosmtpd-1.2.2
-2011252124 metadata/md5-cache/dev-python/alabaster-0.7.12
-2011252124 metadata/md5-cache/dev-python/alagitpull-0.0.23-r1
-2011252124 metadata/md5-cache/dev-python/alembic-1.4.3
-2011252124 metadata/md5-cache/dev-python/ament_package-0.9.2
-2011252124 metadata/md5-cache/dev-python/amodem-1.15.1
-2011252124 metadata/md5-cache/dev-python/aniso8601-8.0.0
-2011252124 metadata/md5-cache/dev-python/ansi-0.1.5
-2011252124 metadata/md5-cache/dev-python/ansi2html-1.5.2-r2
-2011252124 metadata/md5-cache/dev-python/ansi2html-1.6.0
-2011252124 metadata/md5-cache/dev-python/ansicolor-0.2.6-r1
-2011252124 metadata/md5-cache/dev-python/ansicolor-9999
-2011252124 metadata/md5-cache/dev-python/anyqt-0.0.8-r1
-2011252124 metadata/md5-cache/dev-python/aodhclient-1.2.0
-2011252124 metadata/md5-cache/dev-python/aodhclient-2.1.1
-2011252124 metadata/md5-cache/dev-python/apipkg-1.5-r1
-2011252124 metadata/md5-cache/dev-python/apispec-3.3.0
-2011252124 metadata/md5-cache/dev-python/appdirs-1.4.4-r1
-2011252124 metadata/md5-cache/dev-python/apsw-3.32.2_p1
-2011252124 metadata/md5-cache/dev-python/argcomplete-1.12.0-r1
-2011252124 metadata/md5-cache/dev-python/argcomplete-1.12.1-r1
-2011252124 metadata/md5-cache/dev-python/argcomplete-1.12.2
-2011252124 metadata/md5-cache/dev-python/argh-0.26.2-r2
-2011252124 metadata/md5-cache/dev-python/argon2-cffi-20.1.0
-2011252124 metadata/md5-cache/dev-python/argparse-manpage-1.4
-2011252124 metadata/md5-cache/dev-python/arpeggio-1.10.0
-2011252124 metadata/md5-cache/dev-python/arpeggio-1.9.2
-2011252124 metadata/md5-cache/dev-python/arrow-0.17.0
-2011252124 metadata/md5-cache/dev-python/asgiref-3.3.0
-2011252124 metadata/md5-cache/dev-python/asgiref-3.3.1
-2011252124 metadata/md5-cache/dev-python/asn1crypto-0.24.0
-2011252124 metadata/md5-cache/dev-python/asteval-0.9.18
-2011252124 metadata/md5-cache/dev-python/astor-0.8.1
-2011252124 metadata/md5-cache/dev-python/astroid-2.4.2-r1
-2011252124 metadata/md5-cache/dev-python/asttokens-2.0.4
-2011252124 metadata/md5-cache/dev-python/astunparse-1.6.3
-2011252124 metadata/md5-cache/dev-python/atomicwrites-1.4.0-r1
-2011252124 metadata/md5-cache/dev-python/atpublic-1.0
-2011252124 metadata/md5-cache/dev-python/attrs-20.1.0-r1
-2011252124 metadata/md5-cache/dev-python/attrs-20.2.0-r1
-2011252124 metadata/md5-cache/dev-python/audioread-2.1.8-r2
-2011252124 metadata/md5-cache/dev-python/authheaders-0.13.0
-2011252124 metadata/md5-cache/dev-python/authres-1.2.0
-2011252124 metadata/md5-cache/dev-python/autobahn-20.4.3
-2011252124 metadata/md5-cache/dev-python/autobahn-20.7.1
-2011252124 metadata/md5-cache/dev-python/automaton-1.12.1
-2011252124 metadata/md5-cache/dev-python/autopep8-1.5.4
-2011252124 metadata/md5-cache/dev-python/autopep8-9999
-2011252124 metadata/md5-cache/dev-python/autoprop-1.0.2
-2011252124 metadata/md5-cache/dev-python/awesome-slugify-1.6.5
-2011252124 metadata/md5-cache/dev-python/aws-sam-translator-1.27.0
-2011252124 metadata/md5-cache/dev-python/aws-sam-translator-1.28.1
-2011252124 metadata/md5-cache/dev-python/aws-sam-translator-1.29.0
-2011252124 metadata/md5-cache/dev-python/aws-sam-translator-1.30.0
-2011252124 metadata/md5-cache/dev-python/aws-sam-translator-1.30.1
-2011252124 metadata/md5-cache/dev-python/aws-sam-translator-1.31.0
-2011252124 metadata/md5-cache/dev-python/aws-xray-sdk-python-2.6.0
-2011252124 metadata/md5-cache/dev-python/babelfish-0.5.5-r1
-2011252124 metadata/md5-cache/dev-python/babelfish-9999
-2011252124 metadata/md5-cache/dev-python/backcall-0.2.0
-2011252124 metadata/md5-cache/dev-python/backports-1.0-r1
-2011252124 metadata/md5-cache/dev-python/backports-csv-1.0.7
-2011252124 metadata/md5-cache/dev-python/backports-os-0.1.1
-2011252124 metadata/md5-cache/dev-python/backports-tempfile-1.0
-2011252124 metadata/md5-cache/dev-python/backports-weakref-1.0_p1
-2011252124 metadata/md5-cache/dev-python/bandit-1.6.2-r1
-2011252124 metadata/md5-cache/dev-python/bareos-19.2.8
-2011252124 metadata/md5-cache/dev-python/bashate-0.6.0
-2011252124 metadata/md5-cache/dev-python/basho-erlastic-2.1.1
-2011252124 metadata/md5-cache/dev-python/bcrypt-3.1.7-r2
-2011252124 metadata/md5-cache/dev-python/bcrypt-3.2.0
-2011252124 metadata/md5-cache/dev-python/beagle-0.3.0
-2011252124 metadata/md5-cache/dev-python/bert-2.2.0
-2011252124 metadata/md5-cache/dev-python/betamax-matchers-0.4.0
-2011252124 metadata/md5-cache/dev-python/bibtexparser-1.1.0
-2011252124 metadata/md5-cache/dev-python/billiard-3.6.0.0
-2011252124 metadata/md5-cache/dev-python/binaryornot-0.4.4-r1
-2011252124 metadata/md5-cache/dev-python/bitarray-0.8.3
-2011252124 metadata/md5-cache/dev-python/bitarray-1.6.1
-2011252124 metadata/md5-cache/dev-python/bitstring-3.1.7
-2011252124 metadata/md5-cache/dev-python/blessed-1.17.11
-2011252124 metadata/md5-cache/dev-python/blessings-1.7-r1
-2011252124 metadata/md5-cache/dev-python/blosc-1.9.2
-2011252124 metadata/md5-cache/dev-python/bluelet-0.2.0
-2011252124 metadata/md5-cache/dev-python/blurb-1.0.7
-2011252124 metadata/md5-cache/dev-python/booleanOperations-0.9.0-r1
-2011252124 metadata/md5-cache/dev-python/boto-2.49.0-r3
-2011252124 metadata/md5-cache/dev-python/boto3-1.15.18
-2011252124 metadata/md5-cache/dev-python/boto3-1.16.16
-2011252124 metadata/md5-cache/dev-python/boto3-1.16.20
-2011252124 metadata/md5-cache/dev-python/boto3-1.16.21
-2011252124 metadata/md5-cache/dev-python/boto3-1.16.22
-2011252124 metadata/md5-cache/dev-python/boto3-1.16.23
-2011252124 metadata/md5-cache/dev-python/boto3-1.16.24
-2011252124 metadata/md5-cache/dev-python/boto3-1.16.25
-2011252124 metadata/md5-cache/dev-python/boto3-9999
-2011252124 metadata/md5-cache/dev-python/botocore-1.18.18
-2011252124 metadata/md5-cache/dev-python/botocore-1.19.16
-2011252124 metadata/md5-cache/dev-python/botocore-1.19.20
-2011252124 metadata/md5-cache/dev-python/botocore-1.19.21
-2011252124 metadata/md5-cache/dev-python/botocore-1.19.22
-2011252124 metadata/md5-cache/dev-python/botocore-1.19.23
-2011252124 metadata/md5-cache/dev-python/botocore-1.19.24
-2011252124 metadata/md5-cache/dev-python/botocore-1.19.25
-2011252124 metadata/md5-cache/dev-python/botocore-9999
-2011252124 metadata/md5-cache/dev-python/bottle-0.12.18-r1
-2011252124 metadata/md5-cache/dev-python/bottle-0.12.19
-2011252124 metadata/md5-cache/dev-python/bottleneck-1.3.2
-2011252124 metadata/md5-cache/dev-python/bpython-0.20
-2011252124 metadata/md5-cache/dev-python/braintree-4.4.0
-2011252124 metadata/md5-cache/dev-python/breathe-4.14.1
-2011252124 metadata/md5-cache/dev-python/breathe-4.22.1
 2011252124 metadata/md5-cache/dev-python/brython-3.7.3
 2011252124 metadata/md5-cache/dev-python/brython-3.7.4
-2011252124 metadata/md5-cache/dev-python/bsddb3-6.2.7
-2011252124 metadata/md5-cache/dev-python/cached-property-1.5.2
-2011252124 metadata/md5-cache/dev-python/cachelib-0.1
-2011252124 metadata/md5-cache/dev-python/cachetools-4.1.1
-2011252124 metadata/md5-cache/dev-python/cairocffi-1.1.0
-2011252124 metadata/md5-cache/dev-python/cairocffi-1.2.0
 2011252124 metadata/md5-cache/dev-python/cangjie-1.3-r1
-2011252124 metadata/md5-cache/dev-python/capturer-3.0
-2011252124 metadata/md5-cache/dev-python/carbon-1.1.5
-2011252124 metadata/md5-cache/dev-python/case-1.5.3
-2011252124 metadata/md5-cache/dev-python/castellan-1.2.2
-2011252124 metadata/md5-cache/dev-python/casttube-0.2.0
-2011252124 metadata/md5-cache/dev-python/catkin_pkg-0.4.23
-2011252124 metadata/md5-cache/dev-python/catkin_pkg-9999
-2011252124 metadata/md5-cache/dev-python/cbor-1.0.0-r1
-2011252124 metadata/md5-cache/dev-python/cbor2-5.1.2
-2011252124 metadata/md5-cache/dev-python/cbor2-5.2.0
-2011252124 metadata/md5-cache/dev-python/celery-4.3.0
-2011252124 metadata/md5-cache/dev-python/certifi-10001
-2011252124 metadata/md5-cache/dev-python/certifi-10001-r1
-2011252124 metadata/md5-cache/dev-python/cfn-python-lint-0.41.0
-2011252124 metadata/md5-cache/dev-python/cfn-python-lint-0.42.0
-2011252124 metadata/md5-cache/dev-python/cgroup-utils-0.8
-2011252124 metadata/md5-cache/dev-python/chai-1.1.2
-2011252124 metadata/md5-cache/dev-python/chainmap-1.0.3
-2011252124 metadata/md5-cache/dev-python/chameleon-3.8.1
-2011252124 metadata/md5-cache/dev-python/chardet-3.0.4-r1
-2011252124 metadata/md5-cache/dev-python/chart-studio-1.1.0
-2011252124 metadata/md5-cache/dev-python/cheetah-2.4.4-r1
 2011252124 metadata/md5-cache/dev-python/cheetah-docs-0.9.16_alpha1
-2011252124 metadata/md5-cache/dev-python/cheetah3-3.2.4
-2011252124 metadata/md5-cache/dev-python/cheetah3-3.2.6
-2011252124 metadata/md5-cache/dev-python/cheroot-8.4.4
-2011252124 metadata/md5-cache/dev-python/cheroot-8.4.5
-2011252124 metadata/md5-cache/dev-python/cheroot-8.4.8
-2011252124 metadata/md5-cache/dev-python/cherrypy-18.6.0
-2011252124 metadata/md5-cache/dev-python/chump-1.6.0-r1
-2011252124 metadata/md5-cache/dev-python/citeproc-py-0.4.0-r1
-2011252124 metadata/md5-cache/dev-python/cjkwrap-2.2-r1
 2011252124 metadata/md5-cache/dev-python/clang-python-10.0.1
 2011252124 metadata/md5-cache/dev-python/clang-python-11.0.0
 2011252124 metadata/md5-cache/dev-python/clang-python-9.0.1
-2011252124 metadata/md5-cache/dev-python/cli_helpers-2.1.0
-2011252124 metadata/md5-cache/dev-python/cli_helpers-9999
-2011252124 metadata/md5-cache/dev-python/click-6.7-r2
-2011252124 metadata/md5-cache/dev-python/click-default-group-1.2.2
-2011252124 metadata/md5-cache/dev-python/click-log-0.3.2
-2011252124 metadata/md5-cache/dev-python/click-plugins-1.0.3
-2011252124 metadata/md5-cache/dev-python/click-plugins-1.1.1
-2011252124 metadata/md5-cache/dev-python/click-threading-0.4.4
-2011252124 metadata/md5-cache/dev-python/cliff-3.4.0
-2011252124 metadata/md5-cache/dev-python/cliff-3.5.0
-2011252124 metadata/md5-cache/dev-python/clint-0.5.1-r3
-2011252124 metadata/md5-cache/dev-python/cloudpickle-1.6.0
-2011252124 metadata/md5-cache/dev-python/cmd2-1.3.8
-2011252124 metadata/md5-cache/dev-python/cmd2-1.4.0
-2011252124 metadata/md5-cache/dev-python/collective-checkdocs-0.2-r1
-2011252124 metadata/md5-cache/dev-python/colorama-0.4.3-r1
-2011252124 metadata/md5-cache/dev-python/colorama-0.4.4
-2011252124 metadata/md5-cache/dev-python/colorclass-2.2.0-r1
-2011252124 metadata/md5-cache/dev-python/coloredlogs-14.0
-2011252124 metadata/md5-cache/dev-python/colorlog-3.1.4
-2011252124 metadata/md5-cache/dev-python/colorspacious-1.1.2
-2011252124 metadata/md5-cache/dev-python/commonmark-0.9.1
-2011252124 metadata/md5-cache/dev-python/configargparse-1.2.3
-2011252124 metadata/md5-cache/dev-python/configclass-0.2.0
-2011252124 metadata/md5-cache/dev-python/configobj-5.0.6
-2011252124 metadata/md5-cache/dev-python/configshell-fb-1.1.28
-2011252124 metadata/md5-cache/dev-python/confuse-1.0.0
-2011252124 metadata/md5-cache/dev-python/confuse-1.4.0
-2011252124 metadata/md5-cache/dev-python/consonance-0.1.3-r1
-2011252124 metadata/md5-cache/dev-python/construct-2.10.56
-2011252124 metadata/md5-cache/dev-python/contextvars-2.4
-2011252124 metadata/md5-cache/dev-python/cookies-2.2.1-r1
-2011252124 metadata/md5-cache/dev-python/coreapi-2.3.3-r1
-2011252124 metadata/md5-cache/dev-python/coreschema-0.0.4
-2011252124 metadata/md5-cache/dev-python/couchdb-python-1.1
-2011252124 metadata/md5-cache/dev-python/cov-core-1.15.0-r2
-2011252124 metadata/md5-cache/dev-python/coverage-4.5.4
-2011252124 metadata/md5-cache/dev-python/cppy-1.1.0
-2011252124 metadata/md5-cache/dev-python/crcmod-1.7-r4
-2011252124 metadata/md5-cache/dev-python/croniter-0.3.30
-2011252124 metadata/md5-cache/dev-python/cryptography-3.2
-2011252124 metadata/md5-cache/dev-python/css-parser-1.0.4-r1
-2011252124 metadata/md5-cache/dev-python/cssselect2-0.3.0
-2011252124 metadata/md5-cache/dev-python/cssselect2-0.4.1
-2011252124 metadata/md5-cache/dev-python/cssutils-1.0.2-r2
-2011252124 metadata/md5-cache/dev-python/ctypescrypto-0.5
-2011252124 metadata/md5-cache/dev-python/ctypescrypto-9999
-2011252124 metadata/md5-cache/dev-python/ctypesgen-1.0.2
-2011252124 metadata/md5-cache/dev-python/cursive-0.2.2
-2011252124 metadata/md5-cache/dev-python/cursive-0.2.2-r1
-2011252124 metadata/md5-cache/dev-python/curtsies-0.3.0-r2
-2011252124 metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
-2011252124 metadata/md5-cache/dev-python/cx_Freeze-6.1
-2011252124 metadata/md5-cache/dev-python/cycler-0.10.0-r1
-2011252124 metadata/md5-cache/dev-python/cython-0.29.15
-2011252124 metadata/md5-cache/dev-python/cython-0.29.21
-2011252124 metadata/md5-cache/dev-python/cython-0.29.21-r1
-2011252124 metadata/md5-cache/dev-python/cytoolz-0.10.0
-2011252124 metadata/md5-cache/dev-python/daemonize-2.5.0
 2011252124 metadata/md5-cache/dev-python/dbus-python-1.2.16-r1
-2011252124 metadata/md5-cache/dev-python/dbusmock-0.19
-2011252124 metadata/md5-cache/dev-python/dbutils-1.3
-2011252124 metadata/md5-cache/dev-python/ddt-1.2.2
-2011252124 metadata/md5-cache/dev-python/debtcollector-2.2.0
-2011252124 metadata/md5-cache/dev-python/decorator-4.4.2-r1
-2011252124 metadata/md5-cache/dev-python/defcon-0.6.0-r1
-2011252124 metadata/md5-cache/dev-python/defusedxml-0.7.0_rc1
-2011252124 metadata/md5-cache/dev-python/denonavr-0.9.5
-2011252124 metadata/md5-cache/dev-python/denonavr-0.9.7
-2011252124 metadata/md5-cache/dev-python/deprecated-1.2.10
-2011252124 metadata/md5-cache/dev-python/deprecation-2.1.0
-2011252124 metadata/md5-cache/dev-python/dicttoxml-1.7.4-r1
-2011252124 metadata/md5-cache/dev-python/diff-cover-2.3.0
-2011252124 metadata/md5-cache/dev-python/diff-match-patch-20181111
-2011252124 metadata/md5-cache/dev-python/diff-match-patch-20200713
-2011252124 metadata/md5-cache/dev-python/dill-0.3.2
-2011252124 metadata/md5-cache/dev-python/dill-0.3.3
-2011252124 metadata/md5-cache/dev-python/discogs-client-2.2.2
-2011252124 metadata/md5-cache/dev-python/diskcache-5.0.3
-2011252124 metadata/md5-cache/dev-python/diskcache-5.1.0
-2011252124 metadata/md5-cache/dev-python/dissononce-0.34.3-r1
-2011252124 metadata/md5-cache/dev-python/distro-1.5.0-r1
-2011252124 metadata/md5-cache/dev-python/dj-database-url-0.5.0
-2011252124 metadata/md5-cache/dev-python/django-2.2.16
-2011252124 metadata/md5-cache/dev-python/django-2.2.17
-2011252124 metadata/md5-cache/dev-python/django-3.0.10-r1
-2011252124 metadata/md5-cache/dev-python/django-3.0.11
-2011252124 metadata/md5-cache/dev-python/django-3.1.1-r1
-2011252124 metadata/md5-cache/dev-python/django-3.1.2-r1
-2011252124 metadata/md5-cache/dev-python/django-allauth-0.42.0
-2011252124 metadata/md5-cache/dev-python/django-appconf-1.0.4
-2011252124 metadata/md5-cache/dev-python/django-auth-ldap-2.1.0
-2011252124 metadata/md5-cache/dev-python/django-cacheops-4.2
-2011252124 metadata/md5-cache/dev-python/django-compressor-2.4
-2011252124 metadata/md5-cache/dev-python/django-cors-headers-3.2.1
-2011252124 metadata/md5-cache/dev-python/django-debug-toolbar-3.1
-2011252124 metadata/md5-cache/dev-python/django-extensions-3.0.9
-2011252124 metadata/md5-cache/dev-python/django-filter-2.2.0
-2011252124 metadata/md5-cache/dev-python/django-gravatar2-1.4.4
-2011252124 metadata/md5-cache/dev-python/django-haystack-3.0
-2011252124 metadata/md5-cache/dev-python/django-js-asset-1.2.2
-2011252124 metadata/md5-cache/dev-python/django-mptt-0.11.0
-2011252124 metadata/md5-cache/dev-python/django-otp-1.0.2
-2011252124 metadata/md5-cache/dev-python/django-pglocks-1.0.4
-2011252124 metadata/md5-cache/dev-python/django-picklefield-3.0.1
-2011252124 metadata/md5-cache/dev-python/django-prometheus-2.0.0
-2011252124 metadata/md5-cache/dev-python/django-q-1.3.3
-2011252124 metadata/md5-cache/dev-python/django-redis-4.10.0
-2011252124 metadata/md5-cache/dev-python/django-rq-2.3.2
-2011252124 metadata/md5-cache/dev-python/django-sortedm2m-3.0.2
-2011252124 metadata/md5-cache/dev-python/django-tables2-2.2.1
-2011252124 metadata/md5-cache/dev-python/django-tagging-0.5.0
-2011252124 metadata/md5-cache/dev-python/django-taggit-1.2.0
-2011252124 metadata/md5-cache/dev-python/django-taggit-serializer-0.1.7
-2011252124 metadata/md5-cache/dev-python/django-timezone-field-4.0
-2011252124 metadata/md5-cache/dev-python/django_polymorphic-3.0.0
-2011252124 metadata/md5-cache/dev-python/djangorestframework-3.11.1
-2011252124 metadata/md5-cache/dev-python/dkimpy-1.0.5
-2011252124 metadata/md5-cache/dev-python/dns-lexicon-3.3.4
-2011252124 metadata/md5-cache/dev-python/dnspython-1.16.0-r1
-2011252124 metadata/md5-cache/dev-python/dnspython-2.0.0
-2011252124 metadata/md5-cache/dev-python/doc8-0.6.0
-2011252124 metadata/md5-cache/dev-python/docker-py-4.3.1
-2011252124 metadata/md5-cache/dev-python/docker-py-4.4.0
-2011252124 metadata/md5-cache/dev-python/docker-pycreds-0.4.0
-2011252124 metadata/md5-cache/dev-python/dockerpty-0.4.1-r1
-2011252124 metadata/md5-cache/dev-python/docopt-0.6.2-r3
-2011252124 metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
-2011252124 metadata/md5-cache/dev-python/docutils-0.16-r1
-2011252124 metadata/md5-cache/dev-python/docutils-glep-1.2
-2011252124 metadata/md5-cache/dev-python/dogpile-cache-1.0.2
-2011252124 metadata/md5-cache/dev-python/dogpile-cache-1.1.0
-2011252124 metadata/md5-cache/dev-python/dogpile-cache-1.1.1
-2011252124 metadata/md5-cache/dev-python/doit-0.33.1
-2011252124 metadata/md5-cache/dev-python/doit-py-0.5.0
-2011252124 metadata/md5-cache/dev-python/doublex-1.9.2
-2011252124 metadata/md5-cache/dev-python/doublex-expects-0.7.1
-2011252124 metadata/md5-cache/dev-python/drf-yasg-1.17.1
-2011252124 metadata/md5-cache/dev-python/duecredit-0.7.0
-2011252124 metadata/md5-cache/dev-python/dugong-3.7.3
-2011252124 metadata/md5-cache/dev-python/dulwich-0.20.6
-2011252124 metadata/md5-cache/dev-python/easy-thumbnails-2.7
-2011252124 metadata/md5-cache/dev-python/easy-thumbnails-2.7.1
-2011252124 metadata/md5-cache/dev-python/easyprocess-0.3
-2011252124 metadata/md5-cache/dev-python/ebuildtester-0.1.16
-2011252124 metadata/md5-cache/dev-python/ecdsa-0.14.1-r2
-2011252124 metadata/md5-cache/dev-python/ecdsa-0.15-r1
-2011252124 metadata/md5-cache/dev-python/ecdsa-0.16.0-r1
-2011252124 metadata/md5-cache/dev-python/ecdsa-0.16.1
-2011252124 metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
-2011252124 metadata/md5-cache/dev-python/elasticsearch-curator-5.8.1-r1
-2011252124 metadata/md5-cache/dev-python/elasticsearch-py-7.7.0
-2011252124 metadata/md5-cache/dev-python/elementpath-2.0.3
-2011252124 metadata/md5-cache/dev-python/emcee-3.0.2
-2011252124 metadata/md5-cache/dev-python/emoji-0.5.4
-2011252124 metadata/md5-cache/dev-python/empy-3.3.4
-2011252124 metadata/md5-cache/dev-python/entrypoint2-0.2.1
-2011252124 metadata/md5-cache/dev-python/entrypoint2-0.2.3
-2011252124 metadata/md5-cache/dev-python/enzyme-0.4.1-r2
-2011252124 metadata/md5-cache/dev-python/enzyme-9999
-2011252124 metadata/md5-cache/dev-python/eradicate-2.0.0
-2011252124 metadata/md5-cache/dev-python/errorhandler-2.0.1
-2011252124 metadata/md5-cache/dev-python/et_xmlfile-1.0.1
-2011252124 metadata/md5-cache/dev-python/eventlet-0.26.1
-2011252124 metadata/md5-cache/dev-python/exam-0.10.6
-2011252124 metadata/md5-cache/dev-python/exdown-0.7.0
-2011252124 metadata/md5-cache/dev-python/executing-0.5.3
-2011252124 metadata/md5-cache/dev-python/expects-0.9.0
-2011252124 metadata/md5-cache/dev-python/extras-1.0.0-r1
-2011252124 metadata/md5-cache/dev-python/eyeD3-0.8.11-r1
-2011252124 metadata/md5-cache/dev-python/eyeD3-0.9.5
-2011252124 metadata/md5-cache/dev-python/fakeredis-1.4.5
-2011252124 metadata/md5-cache/dev-python/falcon-2.0.0
-2011252124 metadata/md5-cache/dev-python/fasteners-0.15
-2011252124 metadata/md5-cache/dev-python/fastjsonschema-2.14.5
-2011252124 metadata/md5-cache/dev-python/fcl-0.0.12
-2011252124 metadata/md5-cache/dev-python/feedgenerator-1.9.1-r1
-2011252124 metadata/md5-cache/dev-python/feedparser-5.2.1
-2011252124 metadata/md5-cache/dev-python/fido2-0.7.3
-2011252124 metadata/md5-cache/dev-python/fido2-0.8.1
-2011252124 metadata/md5-cache/dev-python/filetype-1.0.7
-2011252124 metadata/md5-cache/dev-python/findimports-1.5.2
-2011252124 metadata/md5-cache/dev-python/fitsio-0.9.11
-2011252124 metadata/md5-cache/dev-python/fixtures-3.0.0-r1
-2011252124 metadata/md5-cache/dev-python/flake8-3.8.1
-2011252124 metadata/md5-cache/dev-python/flake8-import-order-0.18
-2011252124 metadata/md5-cache/dev-python/flake8-polyfill-1.0.2
-2011252124 metadata/md5-cache/dev-python/flask-9999
-2011252124 metadata/md5-cache/dev-python/flask-api-2.0
-2011252124 metadata/md5-cache/dev-python/flask-assets-0.12
-2011252124 metadata/md5-cache/dev-python/flask-babel-2.0.0
-2011252124 metadata/md5-cache/dev-python/flask-babelex-0.9.4
-2011252124 metadata/md5-cache/dev-python/flask-compress-1.8.0
-2011252124 metadata/md5-cache/dev-python/flask-cors-2.1.0
-2011252124 metadata/md5-cache/dev-python/flask-debug-0.4.3-r1
-2011252124 metadata/md5-cache/dev-python/flask-gravatar-0.5.0
-2011252124 metadata/md5-cache/dev-python/flask-htmlmin-2.0.2
-2011252124 metadata/md5-cache/dev-python/flask-login-0.5.0
-2011252124 metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
-2011252124 metadata/md5-cache/dev-python/flask-migrate-2.5.2
-2011252124 metadata/md5-cache/dev-python/flask-mongoengine-0.9.5
-2011252124 metadata/md5-cache/dev-python/flask-mongoengine-1.0.0
-2011252124 metadata/md5-cache/dev-python/flask-nav-0.6-r2
-2011252124 metadata/md5-cache/dev-python/flask-paginate-0.7.0
-2011252124 metadata/md5-cache/dev-python/flask-paranoid-0.2.0-r1
-2011252124 metadata/md5-cache/dev-python/flask-principal-0.4.0-r1
-2011252124 metadata/md5-cache/dev-python/flask-restful-0.3.8
-2011252124 metadata/md5-cache/dev-python/flask-script-2.0.6
-2011252124 metadata/md5-cache/dev-python/flask-security-3.4.4
-2011252124 metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
-2011252124 metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4
-2011252124 metadata/md5-cache/dev-python/flask-wtf-0.14.3
-2011252124 metadata/md5-cache/dev-python/flatbuffers-1.12
-2011252124 metadata/md5-cache/dev-python/fleep-1.0.1
-2011252124 metadata/md5-cache/dev-python/fleep-9999
-2011252124 metadata/md5-cache/dev-python/flexmock-0.10.4
-2011252124 metadata/md5-cache/dev-python/flit-2.1.0
-2011252124 metadata/md5-cache/dev-python/flit_core-2.1.0
-2011252124 metadata/md5-cache/dev-python/flufl-bounce-3.0.1
-2011252124 metadata/md5-cache/dev-python/flufl-i18n-2.0.2
-2011252124 metadata/md5-cache/dev-python/flufl-lock-5.0.1
-2011252124 metadata/md5-cache/dev-python/fonttools-4.1.0
-2011252124 metadata/md5-cache/dev-python/fqdn-1.5.0
-2011252124 metadata/md5-cache/dev-python/freezegun-0.3.15-r1
-2011252124 metadata/md5-cache/dev-python/freezegun-1.0.0-r1
-2011252124 metadata/md5-cache/dev-python/frozen-flask-0.15
-2011252124 metadata/md5-cache/dev-python/frozendict-1.2
-2011252124 metadata/md5-cache/dev-python/fs-2.4.11
-2011252124 metadata/md5-cache/dev-python/fsspec-0.8.2
-2011252124 metadata/md5-cache/dev-python/fudge-1.1.1
-2011252124 metadata/md5-cache/dev-python/funcsigs-1.0.2-r2
-2011252124 metadata/md5-cache/dev-python/funcy-1.10.1
-2011252124 metadata/md5-cache/dev-python/funcy-1.14
-2011252124 metadata/md5-cache/dev-python/fuse-python-1.0.0
-2011252124 metadata/md5-cache/dev-python/fusepy-3.0.1
-2011252124 metadata/md5-cache/dev-python/future-0.18.2-r1
-2011252124 metadata/md5-cache/dev-python/futurist-1.8.1
-2011252124 metadata/md5-cache/dev-python/fuzzywuzzy-0.18.0
-2011252124 metadata/md5-cache/dev-python/gast-0.2.2
-2011252124 metadata/md5-cache/dev-python/gast-0.3.3
-2011252124 metadata/md5-cache/dev-python/gast-0.3.3-r1
-2011252124 metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5-r1
-2011252124 metadata/md5-cache/dev-python/genshi-0.7.3-r1
-2011252124 metadata/md5-cache/dev-python/genson-1.1.0
-2011252124 metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
-2011252124 metadata/md5-cache/dev-python/gevent-websocket-0.10.1
-2011252124 metadata/md5-cache/dev-python/geventhttpclient-1.4.4-r1
-2011252124 metadata/md5-cache/dev-python/git-review-1.28.0
-2011252124 metadata/md5-cache/dev-python/gitdb-4.0.5
-2011252124 metadata/md5-cache/dev-python/gitdb2-2.0.3
-2011252124 metadata/md5-cache/dev-python/github3-1.3.0
-2011252124 metadata/md5-cache/dev-python/glance_store-1.0.1
-2011252124 metadata/md5-cache/dev-python/glance_store-2.3.0
-2011252124 metadata/md5-cache/dev-python/glooey-0.3.4
-2011252124 metadata/md5-cache/dev-python/google-api-core-1.17.0
-2011252124 metadata/md5-cache/dev-python/google-api-python-client-1.8.3-r1
-2011252124 metadata/md5-cache/dev-python/google-apitools-0.5.31
-2011252124 metadata/md5-cache/dev-python/google-auth-1.20.1
-2011252124 metadata/md5-cache/dev-python/google-auth-httplib2-0.0.4
-2011252124 metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1-r1
-2011252124 metadata/md5-cache/dev-python/google-pasta-0.1.1
-2011252124 metadata/md5-cache/dev-python/google-pasta-0.2.0
-2011252124 metadata/md5-cache/dev-python/google-reauth-python-0.1.0-r1
-2011252124 metadata/md5-cache/dev-python/googleapis-common-protos-1.51.0
 2011252124 metadata/md5-cache/dev-python/graph-tool-2.35
 2011252124 metadata/md5-cache/dev-python/graph-tool-9999
-2011252124 metadata/md5-cache/dev-python/graphviz-0.14.2
-2011252124 metadata/md5-cache/dev-python/graphviz-0.15
-2011252124 metadata/md5-cache/dev-python/greenstalk-1.0.1
-2011252124 metadata/md5-cache/dev-python/grpcio-1.28.1
-2011252124 metadata/md5-cache/dev-python/grpcio-1.32.0-r1
-2011252124 metadata/md5-cache/dev-python/grpcio-testing-1.32.0
-2011252124 metadata/md5-cache/dev-python/grpcio-tools-1.32.0
-2011252124 metadata/md5-cache/dev-python/gsd-1.5.3-r1
 2011252124 metadata/md5-cache/dev-python/gst-python-1.16.2
-2011252124 metadata/md5-cache/dev-python/guessit-3.1.1
-2011252124 metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11-r1
-2011252124 metadata/md5-cache/dev-python/h11-0.11.0
-2011252124 metadata/md5-cache/dev-python/h5py-2.10.0-r1
-2011252124 metadata/md5-cache/dev-python/hacking-2.0.0
-2011252124 metadata/md5-cache/dev-python/hcloud-python-1.10.0
-2011252124 metadata/md5-cache/dev-python/hcloud-python-1.9.0
-2011252124 metadata/md5-cache/dev-python/helpdev-0.7.1
-2011252124 metadata/md5-cache/dev-python/hgdistver-0.25
-2011252124 metadata/md5-cache/dev-python/hiredis-1.0.1
-2011252124 metadata/md5-cache/dev-python/hiredis-1.0.1-r1
-2011252124 metadata/md5-cache/dev-python/hiredis-1.1.0
-2011252124 metadata/md5-cache/dev-python/hpack-3.0.0
-2011252124 metadata/md5-cache/dev-python/hpack-4.0.0
-2011252124 metadata/md5-cache/dev-python/html2text-2020.1.16-r1
-2011252124 metadata/md5-cache/dev-python/html5-parser-0.4.9
-2011252124 metadata/md5-cache/dev-python/html5lib-1.1
-2011252124 metadata/md5-cache/dev-python/httmock-1.2.5
-2011252124 metadata/md5-cache/dev-python/http-parser-0.9.0
-2011252124 metadata/md5-cache/dev-python/httpauth-0.3
-2011252124 metadata/md5-cache/dev-python/httplib2-0.18.1-r1
-2011252124 metadata/md5-cache/dev-python/httpretty-0.9.6
-2011252124 metadata/md5-cache/dev-python/httpretty-1.0.2-r1
-2011252124 metadata/md5-cache/dev-python/httpretty-1.0.3
-2011252124 metadata/md5-cache/dev-python/httpstat-1.3.0
-2011252124 metadata/md5-cache/dev-python/humanfriendly-8.2
-2011252124 metadata/md5-cache/dev-python/hyper-h2-3.2.0
-2011252124 metadata/md5-cache/dev-python/hyper-h2-4.0.0
-2011252124 metadata/md5-cache/dev-python/hyperframe-5.2.0
-2011252124 metadata/md5-cache/dev-python/hyperframe-6.0.0
-2011252124 metadata/md5-cache/dev-python/hypothesis-5.24.4
-2011252124 metadata/md5-cache/dev-python/hypothesis-5.35.4
-2011252124 metadata/md5-cache/dev-python/hypothesis-5.36.2
-2011252124 metadata/md5-cache/dev-python/hypothesis-5.41.0
-2011252124 metadata/md5-cache/dev-python/hypothesis-5.41.1
-2011252124 metadata/md5-cache/dev-python/hypothesis-5.41.2
-2011252124 metadata/md5-cache/dev-python/icalendar-4.0.7
-2011252124 metadata/md5-cache/dev-python/idna-2.10-r1
-2011252124 metadata/md5-cache/dev-python/ifaddr-0.1.6
-2011252124 metadata/md5-cache/dev-python/ifaddr-0.1.7
-2011252124 metadata/md5-cache/dev-python/ijson-3.1.1
-2011252124 metadata/md5-cache/dev-python/imageio-2.6.1
-2011252124 metadata/md5-cache/dev-python/imagesize-1.1.0
-2011252124 metadata/md5-cache/dev-python/imagesize-1.2.0
-2011252124 metadata/md5-cache/dev-python/imapclient-2.1.0
-2011252124 metadata/md5-cache/dev-python/iminuit-1.3.8
-2011252124 metadata/md5-cache/dev-python/immutables-0.14
-2011252124 metadata/md5-cache/dev-python/importlib_metadata-1.7.0-r2
-2011252124 metadata/md5-cache/dev-python/importlib_metadata-2.0.0
-2011252124 metadata/md5-cache/dev-python/importlib_metadata-3.0.0
-2011252124 metadata/md5-cache/dev-python/importlib_resources-1.5.0-r2
-2011252124 metadata/md5-cache/dev-python/imread-0.7.3
-2011252124 metadata/md5-cache/dev-python/indexed_gzip-0.8.10
-2011252124 metadata/md5-cache/dev-python/inflect-4.1.0
-2011252124 metadata/md5-cache/dev-python/inflection-0.5.1
-2011252124 metadata/md5-cache/dev-python/influxdb-5.3.0-r1
-2011252124 metadata/md5-cache/dev-python/iniparse-0.4-r2
-2011252124 metadata/md5-cache/dev-python/iniparse-0.5
-2011252124 metadata/md5-cache/dev-python/intelhex-2.3.0
-2011252124 metadata/md5-cache/dev-python/intervaltree-3.0.2
-2011252124 metadata/md5-cache/dev-python/intreehooks-1.0
-2011252124 metadata/md5-cache/dev-python/iocapture-0.1.2-r2
-2011252124 metadata/md5-cache/dev-python/ioflo-2.0.0
-2011252124 metadata/md5-cache/dev-python/ioflo-2.0.2
-2011252124 metadata/md5-cache/dev-python/ipaddr-2.2.0-r1
-2011252124 metadata/md5-cache/dev-python/ipdb-0.10.3-r1
-2011252124 metadata/md5-cache/dev-python/ipy-1.00
-2011252124 metadata/md5-cache/dev-python/ipykernel-5.3.4
-2011252124 metadata/md5-cache/dev-python/ipykernel-5.3.4-r1
-2011252124 metadata/md5-cache/dev-python/ipyparallel-6.3.0
-2011252124 metadata/md5-cache/dev-python/ipyparallel-6.3.0-r1
-2011252124 metadata/md5-cache/dev-python/ipython-7.16.1
-2011252124 metadata/md5-cache/dev-python/ipython-7.18.1
-2011252124 metadata/md5-cache/dev-python/ipython-7.19.0
-2011252124 metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r1
-2011252124 metadata/md5-cache/dev-python/ipywidgets-7.5.1
-2011252124 metadata/md5-cache/dev-python/ipywidgets-7.5.1-r1
-2011252124 metadata/md5-cache/dev-python/irc-19.0.1
-2011252124 metadata/md5-cache/dev-python/iso8601-0.1.12-r1
-2011252124 metadata/md5-cache/dev-python/isodate-0.6.0-r1
-2011252124 metadata/md5-cache/dev-python/isort-4.3.15
-2011252124 metadata/md5-cache/dev-python/isort-4.3.21_p2-r1
-2011252124 metadata/md5-cache/dev-python/itypes-1.1.0
-2011252124 metadata/md5-cache/dev-python/jaraco-collections-3.0.0
-2011252124 metadata/md5-cache/dev-python/jaraco-context-3.0.0
-2011252124 metadata/md5-cache/dev-python/jaraco-logging-3.0.0-r1
-2011252124 metadata/md5-cache/dev-python/jaraco-packaging-8.1.0-r1
-2011252124 metadata/md5-cache/dev-python/jaraco-packaging-8.1.1
-2011252124 metadata/md5-cache/dev-python/jaraco-stream-3.0.0
-2011252124 metadata/md5-cache/dev-python/jaraco-text-3.2.0
-2011252124 metadata/md5-cache/dev-python/jdcal-1.4.1
-2011252124 metadata/md5-cache/dev-python/jedi-0.17.1-r1
-2011252124 metadata/md5-cache/dev-python/jedi-0.17.2-r1
-2011252124 metadata/md5-cache/dev-python/jeepney-0.4.3
-2011252124 metadata/md5-cache/dev-python/jeepney-0.5.0
-2011252124 metadata/md5-cache/dev-python/jellyfish-0.8.2
-2011252124 metadata/md5-cache/dev-python/jikanpy-4.2.1
-2011252124 metadata/md5-cache/dev-python/jinja-2.11.2-r1
-2011252124 metadata/md5-cache/dev-python/jinja2-time-0.2.0
-2011252124 metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
-2011252124 metadata/md5-cache/dev-python/jmespath-0.10.0
-2011252124 metadata/md5-cache/dev-python/joblib-0.17.0
-2011252124 metadata/md5-cache/dev-python/josepy-1.4.0
-2011252124 metadata/md5-cache/dev-python/jsmin-2.2.2
-2011252124 metadata/md5-cache/dev-python/json-rpc-1.13.0
-2011252124 metadata/md5-cache/dev-python/jsondiff-1.2.0
-2011252124 metadata/md5-cache/dev-python/jsonext-0.4.2
-2011252124 metadata/md5-cache/dev-python/jsonmerge-1.6.0
-2011252124 metadata/md5-cache/dev-python/jsonpatch-1.26
-2011252124 metadata/md5-cache/dev-python/jsonpatch-1.27
-2011252124 metadata/md5-cache/dev-python/jsonpickle-1.4.1-r2
-2011252124 metadata/md5-cache/dev-python/jsonpointer-2.0-r1
-2011252124 metadata/md5-cache/dev-python/jsonref-0.1
-2011252124 metadata/md5-cache/dev-python/jsonrpclib-0.4.1
-2011252124 metadata/md5-cache/dev-python/jsonrpclib-0.4.2
-2011252124 metadata/md5-cache/dev-python/jsonrpclib-9999
-2011252124 metadata/md5-cache/dev-python/jsonschema-3.2.0
-2011252124 metadata/md5-cache/dev-python/jsonxs-0.6
-2011252124 metadata/md5-cache/dev-python/junit-xml-1.9
-2011252124 metadata/md5-cache/dev-python/jupyter-1.0.0-r3
-2011252124 metadata/md5-cache/dev-python/jupyter_client-6.1.6-r1
-2011252124 metadata/md5-cache/dev-python/jupyter_client-6.1.6-r2
-2011252124 metadata/md5-cache/dev-python/jupyter_console-6.1.0-r2
-2011252124 metadata/md5-cache/dev-python/jupyter_core-4.6.3
-2011252124 metadata/md5-cache/dev-python/jupyter_core-4.6.3-r1
-2011252124 metadata/md5-cache/dev-python/jupyterlab_pygments-0.1.2
-2011252124 metadata/md5-cache/dev-python/jwcrypto-0.8.0
-2011252124 metadata/md5-cache/dev-python/kafka-python-1.4.7
-2011252124 metadata/md5-cache/dev-python/kaitaistruct-0.8
-2011252124 metadata/md5-cache/dev-python/kaitaistruct-0.9
-2011252124 metadata/md5-cache/dev-python/kaptan-0.5.12-r1
-2011252124 metadata/md5-cache/dev-python/kazoo-2.8.0
-2011252124 metadata/md5-cache/dev-python/kconfiglib-14.1.0
-2011252124 metadata/md5-cache/dev-python/keep-2.10
-2011252124 metadata/md5-cache/dev-python/keep-2.9
-2011252124 metadata/md5-cache/dev-python/keyring-21.4.0
-2011252124 metadata/md5-cache/dev-python/keystoneauth-4.2.1
-2011252124 metadata/md5-cache/dev-python/klein-20.6.0
-2011252124 metadata/md5-cache/dev-python/kombu-4.6.8
-2011252124 metadata/md5-cache/dev-python/kombu-5.0.1
-2011252124 metadata/md5-cache/dev-python/lark-parser-0.7.8
-2011252124 metadata/md5-cache/dev-python/latexcodec-2.0.0
-2011252124 metadata/md5-cache/dev-python/lazr-config-2.2.2
-2011252124 metadata/md5-cache/dev-python/lazr-delegates-2.0.4
-2011252124 metadata/md5-cache/dev-python/lazy-object-proxy-1.5.0
-2011252124 metadata/md5-cache/dev-python/lcdproc-0.03_p20150508
-2011252124 metadata/md5-cache/dev-python/ldap3-2.7
-2011252124 metadata/md5-cache/dev-python/ldap3-2.8.1
-2011252124 metadata/md5-cache/dev-python/ldappool-2.4.1
-2011252124 metadata/md5-cache/dev-python/lesscpy-0.14.0
-2011252124 metadata/md5-cache/dev-python/libarchive-c-2.9
-2011252124 metadata/md5-cache/dev-python/libcloud-3.1.0
-2011252124 metadata/md5-cache/dev-python/liblarch-3.0.1
-2011252124 metadata/md5-cache/dev-python/libnacl-1.6.1
-2011252124 metadata/md5-cache/dev-python/libnacl-1.7.2
-2011252124 metadata/md5-cache/dev-python/libpillowfight-0.3.0
-2011252124 metadata/md5-cache/dev-python/libpy_simdjson-0.4.0
-2011252124 metadata/md5-cache/dev-python/libsass-0.20.0
-2011252124 metadata/md5-cache/dev-python/libsass-0.20.1
-2011252124 metadata/md5-cache/dev-python/libtmux-0.8.3
-2011252124 metadata/md5-cache/dev-python/libtmux-0.8.5
-2011252124 metadata/md5-cache/dev-python/libvirt-python-6.7.0
-2011252124 metadata/md5-cache/dev-python/libvirt-python-6.8.0
-2011252124 metadata/md5-cache/dev-python/libvirt-python-6.9.0
-2011252124 metadata/md5-cache/dev-python/libvirt-python-9999
-2011252124 metadata/md5-cache/dev-python/line_profiler-3.0.2
-2011252124 metadata/md5-cache/dev-python/linecache2-1.0.0-r1
-2011252124 metadata/md5-cache/dev-python/lit-10.0.1
-2011252124 metadata/md5-cache/dev-python/lit-11.0.0
-2011252124 metadata/md5-cache/dev-python/lit-9.0.1
-2011252124 metadata/md5-cache/dev-python/livereload-2.6.1
-2011252124 metadata/md5-cache/dev-python/llfuse-1.3.6
-2011252124 metadata/md5-cache/dev-python/llvmlite-0.34.0
-2011252124 metadata/md5-cache/dev-python/lmdb-1.0.0
-2011252124 metadata/md5-cache/dev-python/lmfit-1.0.1
-2011252124 metadata/md5-cache/dev-python/locket-0.2.0-r1
-2011252124 metadata/md5-cache/dev-python/lockfile-0.12.2-r2
-2011252124 metadata/md5-cache/dev-python/logbook-1.5.3
-2011252124 metadata/md5-cache/dev-python/logfury-0.1.2-r1
-2011252124 metadata/md5-cache/dev-python/loguru-0.5.3
-2011252124 metadata/md5-cache/dev-python/logutils-0.3.5
-2011252124 metadata/md5-cache/dev-python/loky-2.9.0
-2011252124 metadata/md5-cache/dev-python/lunr-0.5.6
-2011252124 metadata/md5-cache/dev-python/lz4-3.0.2
-2011252124 metadata/md5-cache/dev-python/lz4-3.1.1
-2011252124 metadata/md5-cache/dev-python/m2crypto-0.35.2-r1
-2011252124 metadata/md5-cache/dev-python/m2crypto-0.36.0-r1
-2011252124 metadata/md5-cache/dev-python/mako-1.1.3-r1
-2011252124 metadata/md5-cache/dev-python/mamba-0.11.1
-2011252124 metadata/md5-cache/dev-python/mando-0.6.4
-2011252124 metadata/md5-cache/dev-python/manuel-1.9.0
-2011252124 metadata/md5-cache/dev-python/markdown-2.6.11
-2011252124 metadata/md5-cache/dev-python/markdown2-2.3.10
-2011252124 metadata/md5-cache/dev-python/markdown2-2.3.9
-2011252124 metadata/md5-cache/dev-python/markups-3.0.0-r1
-2011252124 metadata/md5-cache/dev-python/markupsafe-1.1.1-r1
-2011252124 metadata/md5-cache/dev-python/marshmallow-3.5.1
-2011252124 metadata/md5-cache/dev-python/matplotlib-3.2.2-r2
-2011252124 metadata/md5-cache/dev-python/matplotlib-3.3.0-r1
-2011252124 metadata/md5-cache/dev-python/matplotlib-3.3.2
-2011252124 metadata/md5-cache/dev-python/matterhook-0.2
-2011252124 metadata/md5-cache/dev-python/mccabe-0.6.1-r1
-2011252124 metadata/md5-cache/dev-python/mccabe-0.6.1-r2
-2011252124 metadata/md5-cache/dev-python/mdx_gh_links-0.2
-2011252124 metadata/md5-cache/dev-python/mecab-python-0.996
-2011252124 metadata/md5-cache/dev-python/mechanize-0.4.5
-2011252124 metadata/md5-cache/dev-python/mediafile-0.2.0
-2011252124 metadata/md5-cache/dev-python/memory_profiler-0.57
-2011252124 metadata/md5-cache/dev-python/mergedict-1.0.0
-2011252124 metadata/md5-cache/dev-python/metakernel-0.25.0-r1
-2011252124 metadata/md5-cache/dev-python/micawber-0.5.1
-2011252124 metadata/md5-cache/dev-python/mimerender-0.6.0
-2011252124 metadata/md5-cache/dev-python/minidb-2.0.4
-2011252124 metadata/md5-cache/dev-python/minimock-1.2.8-r1
-2011252124 metadata/md5-cache/dev-python/miniupnpc-2.1.20201016
-2011252124 metadata/md5-cache/dev-python/miniupnpc-2.2.0
-2011252124 metadata/md5-cache/dev-python/misaka-2.1.1
-2011252124 metadata/md5-cache/dev-python/mkautodoc-0.1.0
-2011252124 metadata/md5-cache/dev-python/mkdocs-1.1
-2011252124 metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1
-2011252124 metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1
-2011252124 metadata/md5-cache/dev-python/mmtf-python-1.1.2-r1
-2011252124 metadata/md5-cache/dev-python/mock-3.0.5-r2
-2011252124 metadata/md5-cache/dev-python/mongoengine-0.20.0
-2011252124 metadata/md5-cache/dev-python/mongoengine-0.21.0
-2011252124 metadata/md5-cache/dev-python/more-itertools-8.5.0
-2011252124 metadata/md5-cache/dev-python/moto-1.3.14-r3
-2011252124 metadata/md5-cache/dev-python/moto-1.3.16-r1
-2011252124 metadata/md5-cache/dev-python/moviepy-1.0.1-r1
-2011252124 metadata/md5-cache/dev-python/mox3-0.24.0
-2011252124 metadata/md5-cache/dev-python/mpdlcd-0.5.2
-2011252124 metadata/md5-cache/dev-python/mpi4py-3.0.3
-2011252124 metadata/md5-cache/dev-python/mpmath-1.1.0
-2011252124 metadata/md5-cache/dev-python/msgpack-0.6.2
-2011252124 metadata/md5-cache/dev-python/msgpack-1.0.0
-2011252124 metadata/md5-cache/dev-python/mss-6.0.0
-2011252124 metadata/md5-cache/dev-python/munkres-1.1.2
-2011252124 metadata/md5-cache/dev-python/mygpoclient-1.8
-2011252124 metadata/md5-cache/dev-python/mypy-0.782
-2011252124 metadata/md5-cache/dev-python/mypy-0.790
-2011252124 metadata/md5-cache/dev-python/mysqlclient-1.4.6-r1
-2011252124 metadata/md5-cache/dev-python/nagiosplugin-1.3.2-r1
 2011252124 metadata/md5-cache/dev-python/namespace-google-1-r1
 2011252124 metadata/md5-cache/dev-python/namespace-repoze-1
 2011252124 metadata/md5-cache/dev-python/namespace-sphinxcontrib-1.0
 2011252124 metadata/md5-cache/dev-python/namespace-zope-1-r1
-2011252124 metadata/md5-cache/dev-python/natsort-7.0.1
 2011252124 metadata/md5-cache/dev-python/nautilus-python-1.2.3-r1
-2011252124 metadata/md5-cache/dev-python/nbclient-0.5.1
-2011252124 metadata/md5-cache/dev-python/nbconvert-5.6.1
-2011252124 metadata/md5-cache/dev-python/nbconvert-6.0.7
-2011252124 metadata/md5-cache/dev-python/nbdime-2.0.0-r1
-2011252124 metadata/md5-cache/dev-python/nbformat-5.0.7
-2011252124 metadata/md5-cache/dev-python/nbformat-5.0.8
-2011252124 metadata/md5-cache/dev-python/nbsphinx-0.7.1-r1
-2011252124 metadata/md5-cache/dev-python/nbval-0.9.1-r1
-2011252124 metadata/md5-cache/dev-python/ndg-httpsclient-0.4.0
-2011252124 metadata/md5-cache/dev-python/ndg-httpsclient-0.4.2-r1
-2011252124 metadata/md5-cache/dev-python/neovim-remote-2.4.0
-2011252124 metadata/md5-cache/dev-python/neovim-remote-9999
-2011252124 metadata/md5-cache/dev-python/nest_asyncio-1.4.3
-2011252124 metadata/md5-cache/dev-python/netaddr-0.8.0
-2011252124 metadata/md5-cache/dev-python/netcdf4-python-1.2.2-r1
-2011252124 metadata/md5-cache/dev-python/netifaces-0.10.9
-2011252124 metadata/md5-cache/dev-python/networkx-2.5
-2011252124 metadata/md5-cache/dev-python/neutron-lib-2.3.0
-2011252124 metadata/md5-cache/dev-python/neutron-lib-2.6.1
-2011252124 metadata/md5-cache/dev-python/nltk-3.5
-2011252124 metadata/md5-cache/dev-python/nnpy-1.4.2
-2011252124 metadata/md5-cache/dev-python/node-semver-0.8.0
-2011252124 metadata/md5-cache/dev-python/nodeenv-1.3.5
-2011252124 metadata/md5-cache/dev-python/nose-1.3.7-r6
-2011252124 metadata/md5-cache/dev-python/nose-1.3.7-r7
-2011252124 metadata/md5-cache/dev-python/nose-cover3-0.1.0-r1
-2011252124 metadata/md5-cache/dev-python/nose-exclude-0.5.0-r1
-2011252124 metadata/md5-cache/dev-python/nose-parameterized-0.5.0
-2011252124 metadata/md5-cache/dev-python/nose-random-1.0.0
-2011252124 metadata/md5-cache/dev-python/nose-show-skipped-0.1
-2011252124 metadata/md5-cache/dev-python/nose2-0.9.1-r1
-2011252124 metadata/md5-cache/dev-python/nose_fixes-1.3
-2011252124 metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r3
-2011252124 metadata/md5-cache/dev-python/nosexcover-1.0.11-r1
-2011252124 metadata/md5-cache/dev-python/notebook-6.1.3
-2011252124 metadata/md5-cache/dev-python/notebook-6.1.4
-2011252124 metadata/md5-cache/dev-python/notebook-6.1.5
-2011252124 metadata/md5-cache/dev-python/notify2-0.3.1-r2
-2011252124 metadata/md5-cache/dev-python/nototools-0_pre20200207
-2011252124 metadata/md5-cache/dev-python/ntlm-auth-1.5.0
-2011252124 metadata/md5-cache/dev-python/ntplib-0.3.3
-2011252124 metadata/md5-cache/dev-python/nuitka-0.6.9.1
-2011252124 metadata/md5-cache/dev-python/nuitka-0.6.9.6
-2011252124 metadata/md5-cache/dev-python/numexpr-2.7.2
-2011252124 metadata/md5-cache/dev-python/numpy-1.19.0
-2011252124 metadata/md5-cache/dev-python/numpy-1.19.1
-2011252124 metadata/md5-cache/dev-python/numpy-1.19.2
-2011252124 metadata/md5-cache/dev-python/numpy-1.19.4
-2011252124 metadata/md5-cache/dev-python/numpy-python2-1.16.6
-2011252124 metadata/md5-cache/dev-python/numpydoc-0.9.1
-2011252124 metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
-2011252124 metadata/md5-cache/dev-python/oauth2client-4.1.3-r1
-2011252124 metadata/md5-cache/dev-python/oauthlib-3.1.0
-2011252124 metadata/md5-cache/dev-python/objgraph-3.5.0
-2011252124 metadata/md5-cache/dev-python/oct2py-5.2.0-r1
-2011252124 metadata/md5-cache/dev-python/octave_kernel-0.32.0-r1
-2011252124 metadata/md5-cache/dev-python/odfpy-1.3.6
-2011252124 metadata/md5-cache/dev-python/olefile-0.46-r1
-2011252124 metadata/md5-cache/dev-python/onkyo-eiscp-1.2.7
-2011252124 metadata/md5-cache/dev-python/openpyxl-3.0.5
-2011252124 metadata/md5-cache/dev-python/openstackdocstheme-2.2.5
-2011252124 metadata/md5-cache/dev-python/openstacksdk-0.50.0
-2011252124 metadata/md5-cache/dev-python/opt-einsum-3.0.1-r1
-2011252124 metadata/md5-cache/dev-python/opt-einsum-3.3.0
-2011252124 metadata/md5-cache/dev-python/ordered-set-4.0.1
-2011252124 metadata/md5-cache/dev-python/ordered-set-4.0.2
-2011252124 metadata/md5-cache/dev-python/os-brick-2.8.2
-2011252124 metadata/md5-cache/dev-python/os-brick-3.0.1
-2011252124 metadata/md5-cache/dev-python/os-client-config-2.1.0
-2011252124 metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-0.1.3
-2011252124 metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-9999
-2011252124 metadata/md5-cache/dev-python/os-ken-1.2.0
-2011252124 metadata/md5-cache/dev-python/os-service-types-1.7.0
-2011252124 metadata/md5-cache/dev-python/os-testr-2.0.0
-2011252124 metadata/md5-cache/dev-python/os-vif-1.15.2
-2011252124 metadata/md5-cache/dev-python/os-vif-2.2.0
-2011252124 metadata/md5-cache/dev-python/os-win-4.2.0
-2011252124 metadata/md5-cache/dev-python/osc-lib-2.2.1
-2011252124 metadata/md5-cache/dev-python/oslo-concurrency-4.3.1
-2011252124 metadata/md5-cache/dev-python/oslo-config-8.3.2
-2011252124 metadata/md5-cache/dev-python/oslo-config-8.3.3
-2011252124 metadata/md5-cache/dev-python/oslo-context-3.1.1
-2011252124 metadata/md5-cache/dev-python/oslo-i18n-5.0.1
-2011252124 metadata/md5-cache/dev-python/oslo-log-4.4.0
-2011252124 metadata/md5-cache/dev-python/oslo-messaging-12.1.1
-2011252124 metadata/md5-cache/dev-python/oslo-messaging-12.5.1
-2011252124 metadata/md5-cache/dev-python/oslo-middleware-4.0.2
-2011252124 metadata/md5-cache/dev-python/oslo-privsep-1.33.3
-2011252124 metadata/md5-cache/dev-python/oslo-rootwrap-5.15.2
-2011252124 metadata/md5-cache/dev-python/oslo-serialization-4.0.1
-2011252124 metadata/md5-cache/dev-python/oslo-service-2.1.1
-2011252124 metadata/md5-cache/dev-python/oslo-sphinx-4.18.0
-2011252124 metadata/md5-cache/dev-python/oslo-utils-4.6.0
-2011252124 metadata/md5-cache/dev-python/oslo-versionedobjects-2.0.2
-2011252124 metadata/md5-cache/dev-python/oslo-versionedobjects-2.3.0
-2011252124 metadata/md5-cache/dev-python/oslo-vmware-2.32.2
-2011252124 metadata/md5-cache/dev-python/oslotest-4.4.1
-2011252124 metadata/md5-cache/dev-python/osprofiler-3.4.0
-2011252124 metadata/md5-cache/dev-python/osrf_pycommon-0.1.10-r1
-2011252124 metadata/md5-cache/dev-python/ovs-2.13.0
-2011252124 metadata/md5-cache/dev-python/ovsdbapp-0.17.2
-2011252124 metadata/md5-cache/dev-python/owslib-0.20.0
-2011252124 metadata/md5-cache/dev-python/packaging-20.4-r1
-2011252124 metadata/md5-cache/dev-python/pafy-0.5.5
-2011252124 metadata/md5-cache/dev-python/pafy-9999
-2011252124 metadata/md5-cache/dev-python/paho-mqtt-1.5.0
-2011252124 metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
-2011252124 metadata/md5-cache/dev-python/pandas-1.1.2-r1
-2011252124 metadata/md5-cache/dev-python/pandas-1.1.4-r1
-2011252124 metadata/md5-cache/dev-python/pandas-datareader-0.8.1
-2011252124 metadata/md5-cache/dev-python/parameterized-0.7.4
-2011252124 metadata/md5-cache/dev-python/parametrized-0.1
-2011252124 metadata/md5-cache/dev-python/paramiko-2.7.1
-2011252124 metadata/md5-cache/dev-python/paramiko-2.7.2
-2011252124 metadata/md5-cache/dev-python/parsedatetime-2.6
-2011252124 metadata/md5-cache/dev-python/parso-0.7.0-r1
-2011252124 metadata/md5-cache/dev-python/parso-0.7.1-r1
-2011252124 metadata/md5-cache/dev-python/parso-0.8.0
-2011252124 metadata/md5-cache/dev-python/partd-1.1.0
-2011252124 metadata/md5-cache/dev-python/parver-0.3.1
-2011252124 metadata/md5-cache/dev-python/paste-3.5.0
-2011252124 metadata/md5-cache/dev-python/patch-ng-1.17.4
-2011252124 metadata/md5-cache/dev-python/path-and-address-2.0.1
-2011252124 metadata/md5-cache/dev-python/pathtools-0.1.2-r3
-2011252124 metadata/md5-cache/dev-python/patsy-0.5.1
-2011252124 metadata/md5-cache/dev-python/pbkdf2-1.3-r1
-2011252124 metadata/md5-cache/dev-python/pdfrw-0.4
-2011252124 metadata/md5-cache/dev-python/pebble-4.5.3
-2011252124 metadata/md5-cache/dev-python/pecan-1.3.3-r2
-2011252124 metadata/md5-cache/dev-python/peewee-3.13.2
-2011252124 metadata/md5-cache/dev-python/pelican-minify-0.9
-2011252124 metadata/md5-cache/dev-python/pep8-1.7.1
-2011252124 metadata/md5-cache/dev-python/pew-1.1.1
-2011252124 metadata/md5-cache/dev-python/pexpect-4.8.0-r1
-2011252124 metadata/md5-cache/dev-python/pgspecial-1.11.10
-2011252124 metadata/md5-cache/dev-python/phonenumbers-8.12.11
-2011252124 metadata/md5-cache/dev-python/phonenumbers-8.12.12
-2011252124 metadata/md5-cache/dev-python/phonenumbers-8.12.13
 2011252124 metadata/md5-cache/dev-python/picklemagic-0.0_pre20160415
-2011252124 metadata/md5-cache/dev-python/pickleshare-0.7.5
-2011252124 metadata/md5-cache/dev-python/pid-2.2.5
-2011252124 metadata/md5-cache/dev-python/pid-3.0.4
-2011252124 metadata/md5-cache/dev-python/piexif-1.1.3
-2011252124 metadata/md5-cache/dev-python/pikepdf-1.18.0
-2011252124 metadata/md5-cache/dev-python/pilkit-2.0
-2011252124 metadata/md5-cache/dev-python/pillow-7.0.0
-2011252124 metadata/md5-cache/dev-python/pillow-7.2.0
-2011252124 metadata/md5-cache/dev-python/pipenv-2020.11.4
-2011252124 metadata/md5-cache/dev-python/pipenv-2020.8.13
-2011252124 metadata/md5-cache/dev-python/pipfile-0.0.2
-2011252124 metadata/md5-cache/dev-python/pkgconfig-1.5.1
-2011252124 metadata/md5-cache/dev-python/plotly-1.9.6
-2011252124 metadata/md5-cache/dev-python/plotly-4.10.0
-2011252124 metadata/md5-cache/dev-python/plotly-geo-1.0.0
-2011252124 metadata/md5-cache/dev-python/pluginbase-1.0.0
-2011252124 metadata/md5-cache/dev-python/plumbum-1.6.8
-2011252124 metadata/md5-cache/dev-python/ply-3.11-r1
-2011252124 metadata/md5-cache/dev-python/plyr-1.0.6
-2011252124 metadata/md5-cache/dev-python/plyvel-1.3.0
-2011252124 metadata/md5-cache/dev-python/pocketlint-0.20
-2011252124 metadata/md5-cache/dev-python/pockets-0.9.1
-2011252124 metadata/md5-cache/dev-python/podcastparser-0.6.5
-2011252124 metadata/md5-cache/dev-python/polib-1.1.0-r1
-2011252124 metadata/md5-cache/dev-python/polygon-3.0.7
-2011252124 metadata/md5-cache/dev-python/pony-0.7.13
-2011252124 metadata/md5-cache/dev-python/pony-0.7.14
-2011252124 metadata/md5-cache/dev-python/pooch-1.2.0
-2011252124 metadata/md5-cache/dev-python/portend-2.6
-2011252124 metadata/md5-cache/dev-python/poyo-0.5.0
-2011252124 metadata/md5-cache/dev-python/precis-i18n-1.0.2
-2011252124 metadata/md5-cache/dev-python/pretend-1.0.9-r1
-2011252124 metadata/md5-cache/dev-python/pretty-yaml-20.4.0
-2011252124 metadata/md5-cache/dev-python/prettytable-0.7.2-r1
-2011252124 metadata/md5-cache/dev-python/prettytable-2.0.0
-2011252124 metadata/md5-cache/dev-python/priority-1.3.0
-2011252124 metadata/md5-cache/dev-python/progress-1.5
-2011252124 metadata/md5-cache/dev-python/progressbar-2.5
-2011252124 metadata/md5-cache/dev-python/progressbar2-3.39.3
-2011252124 metadata/md5-cache/dev-python/prometheus_client-0.8.0
-2011252124 metadata/md5-cache/dev-python/prometheus_client-0.9.0
-2011252124 metadata/md5-cache/dev-python/prompt_toolkit-2.0.10-r1
-2011252124 metadata/md5-cache/dev-python/prompt_toolkit-3.0.7
-2011252124 metadata/md5-cache/dev-python/protobuf-python-3.12.2-r1
-2011252124 metadata/md5-cache/dev-python/protobuf-python-3.12.4-r1
-2011252124 metadata/md5-cache/dev-python/protobuf-python-3.13.0-r1
-2011252124 metadata/md5-cache/dev-python/protobuf-python-3.14.0
-2011252124 metadata/md5-cache/dev-python/protobuf-python-9999
-2011252124 metadata/md5-cache/dev-python/prov-1.5.3
-2011252124 metadata/md5-cache/dev-python/pslab-python-1.0.1-r1
-2011252124 metadata/md5-cache/dev-python/psutil-5.7.0-r1
-2011252124 metadata/md5-cache/dev-python/psutil-5.7.2-r1
-2011252124 metadata/md5-cache/dev-python/psycopg-2.8.5-r1
-2011252124 metadata/md5-cache/dev-python/psycopg-2.8.6-r1
-2011252124 metadata/md5-cache/dev-python/ptpython-2.0.6
-2011252124 metadata/md5-cache/dev-python/ptvsd-4.3.2
-2011252124 metadata/md5-cache/dev-python/publicsuffix-2.20191221
-2011252124 metadata/md5-cache/dev-python/pudb-2019.2
-2011252124 metadata/md5-cache/dev-python/pure-sasl-0.6.1
-2011252124 metadata/md5-cache/dev-python/pushbullet-py-0.12.0
-2011252124 metadata/md5-cache/dev-python/pweave-0.30.3-r1
-2011252124 metadata/md5-cache/dev-python/py-1.9.0-r1
-2011252124 metadata/md5-cache/dev-python/py-amqp-2.5.2
-2011252124 metadata/md5-cache/dev-python/py-amqp-2.6.1
-2011252124 metadata/md5-cache/dev-python/py-cpuinfo-6.0.0
-2011252124 metadata/md5-cache/dev-python/py-cpuinfo-7.0.0
-2011252124 metadata/md5-cache/dev-python/py-gfm-0.1.4
-2011252124 metadata/md5-cache/dev-python/py-ubjson-0.16.1
-2011252124 metadata/md5-cache/dev-python/pyClamd-0.4.0-r2
-2011252124 metadata/md5-cache/dev-python/pyFFTW-0.11.1
-2011252124 metadata/md5-cache/dev-python/pyFFTW-9999
-2011252124 metadata/md5-cache/dev-python/pyGPG-0.2
-2011252124 metadata/md5-cache/dev-python/pyGPG-9999
-2011252124 metadata/md5-cache/dev-python/pyTenable-1.1.3
-2011252124 metadata/md5-cache/dev-python/pyacoustid-1.2.0
-2011252124 metadata/md5-cache/dev-python/pyalsa-1.1.6-r1
-2011252124 metadata/md5-cache/dev-python/pyamg-3.2.1-r1
-2011252124 metadata/md5-cache/dev-python/pyasn1-0.4.8-r1
 2011252124 metadata/md5-cache/dev-python/pyatspi-2.36.0
-2011252124 metadata/md5-cache/dev-python/pyaudio-0.2.11-r1
-2011252124 metadata/md5-cache/dev-python/pybind11-2.5.0
-2011252124 metadata/md5-cache/dev-python/pybind11-2.6.1
-2011252124 metadata/md5-cache/dev-python/pybluez-0.23
-2011252124 metadata/md5-cache/dev-python/pybtex-0.22.2
-2011252124 metadata/md5-cache/dev-python/pycadf-2.9.0-r1
-2011252124 metadata/md5-cache/dev-python/pycairo-1.20.0
-2011252124 metadata/md5-cache/dev-python/pycapnp-0.6.4
-2011252124 metadata/md5-cache/dev-python/pycares-3.1.1
-2011252124 metadata/md5-cache/dev-python/pycdio-2.1.0
-2011252124 metadata/md5-cache/dev-python/pychm-0.8.6
-2011252124 metadata/md5-cache/dev-python/pychromecast-4.1.0
-2011252124 metadata/md5-cache/dev-python/pychroot-0.10.2
-2011252124 metadata/md5-cache/dev-python/pychroot-9999
-2011252124 metadata/md5-cache/dev-python/pyclipper-1.2.0
-2011252124 metadata/md5-cache/dev-python/pycodestyle-2.6.0
-2011252124 metadata/md5-cache/dev-python/pycollada-0.7.1
-2011252124 metadata/md5-cache/dev-python/pycountry-20.7.3
-2011252124 metadata/md5-cache/dev-python/pycparser-2.20-r1
-2011252124 metadata/md5-cache/dev-python/pycryptodome-3.9.8-r1
-2011252124 metadata/md5-cache/dev-python/pycryptodome-3.9.9
-2011252124 metadata/md5-cache/dev-python/pycryptodomex-3.9.8
-2011252124 metadata/md5-cache/dev-python/pycryptodomex-3.9.9
-2011252124 metadata/md5-cache/dev-python/pycson-0.8
-2011252124 metadata/md5-cache/dev-python/pycuda-2019.1.2
-2011252124 metadata/md5-cache/dev-python/pycups-1.9.73-r2
-2011252124 metadata/md5-cache/dev-python/pycurl-7.43.0.6
-2011252124 metadata/md5-cache/dev-python/pycxx-7.1.2-r2
-2011252124 metadata/md5-cache/dev-python/pydantic-1.6.1
-2011252124 metadata/md5-cache/dev-python/pydata-sphinx-theme-0.4.0
-2011252124 metadata/md5-cache/dev-python/pydata-sphinx-theme-0.4.1
-2011252124 metadata/md5-cache/dev-python/pydecomp-0.3
-2011252124 metadata/md5-cache/dev-python/pydecomp-9999
-2011252124 metadata/md5-cache/dev-python/pydiff-0.2-r1
-2011252124 metadata/md5-cache/dev-python/pydispatcher-2.1.2
-2011252124 metadata/md5-cache/dev-python/pydns-3.2.1
-2011252124 metadata/md5-cache/dev-python/pydot-1.4.1
-2011252124 metadata/md5-cache/dev-python/pydotplus-2.0.2
-2011252124 metadata/md5-cache/dev-python/pyelftools-0.26
-2011252124 metadata/md5-cache/dev-python/pyenchant-3.1.0
-2011252124 metadata/md5-cache/dev-python/pyfakefs-4.1.0
-2011252124 metadata/md5-cache/dev-python/pyfakefs-4.2.0
-2011252124 metadata/md5-cache/dev-python/pyfakefs-4.2.1
-2011252124 metadata/md5-cache/dev-python/pyfakefs-4.3.0
-2011252124 metadata/md5-cache/dev-python/pyfakefs-4.3.1
-2011252124 metadata/md5-cache/dev-python/pyfeyn-1.0.0-r2
-2011252124 metadata/md5-cache/dev-python/pyflakes-2.2.0
-2011252124 metadata/md5-cache/dev-python/pyfltk-1.3.3
-2011252124 metadata/md5-cache/dev-python/pyformance-0.4-r1
-2011252124 metadata/md5-cache/dev-python/pyftpdlib-1.5.6-r1
-2011252124 metadata/md5-cache/dev-python/pygal-2.4.0-r1
-2011252124 metadata/md5-cache/dev-python/pygame-2.0.0
-2011252124 metadata/md5-cache/dev-python/pygame-2.0.0_pre10
-2011252124 metadata/md5-cache/dev-python/pygame-9999
-2011252124 metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r4
-2011252124 metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r5
-2011252124 metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r1
-2011252124 metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2
-2011252124 metadata/md5-cache/dev-python/pyghmi-1.5.5
-2011252124 metadata/md5-cache/dev-python/pygit2-1.3.0
-2011252124 metadata/md5-cache/dev-python/pygit2-1.4.0
-2011252124 metadata/md5-cache/dev-python/pyglet-1.5.10
-2011252124 metadata/md5-cache/dev-python/pyglet-1.5.11
-2011252124 metadata/md5-cache/dev-python/pyglet-1.5.7-r1
-2011252124 metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5
 2011252124 metadata/md5-cache/dev-python/pygobject-3.34.0-r1
 2011252124 metadata/md5-cache/dev-python/pygobject-3.36.1-r1
-2011252124 metadata/md5-cache/dev-python/pygpgme-0.3-r2
-2011252124 metadata/md5-cache/dev-python/pygraphviz-1.6
-2011252124 metadata/md5-cache/dev-python/pygresql-5.2
-2011252124 metadata/md5-cache/dev-python/pyh2o-1
 2011252124 metadata/md5-cache/dev-python/pyilmbase-2.5.2-r1
-2011252124 metadata/md5-cache/dev-python/pyinotify-0.9.6
-2011252124 metadata/md5-cache/dev-python/pyjwt-1.7.1-r1
-2011252124 metadata/md5-cache/dev-python/pykerberos-1.3.0
-2011252124 metadata/md5-cache/dev-python/pykerberos-1.3.0-r1
-2011252124 metadata/md5-cache/dev-python/pykka-2.0.2
-2011252124 metadata/md5-cache/dev-python/pykwalify-1.7.0
-2011252124 metadata/md5-cache/dev-python/pylast-4.0.0
-2011252124 metadata/md5-cache/dev-python/pylatex-1.4.0
-2011252124 metadata/md5-cache/dev-python/pylatex-1.4.1
-2011252124 metadata/md5-cache/dev-python/pylibacl-0.5.3
-2011252124 metadata/md5-cache/dev-python/pylibacl-0.5.4_p20191217
-2011252124 metadata/md5-cache/dev-python/pylibmc-1.6.1-r1
-2011252124 metadata/md5-cache/dev-python/pylint-2.6.0
-2011252124 metadata/md5-cache/dev-python/pylru-1.2.0
-2011252124 metadata/md5-cache/dev-python/pyls-black-0.4.6
-2011252124 metadata/md5-cache/dev-python/pyls-spyder-0.1.1
-2011252124 metadata/md5-cache/dev-python/pymad-0.10
-2011252124 metadata/md5-cache/dev-python/pymdstat-0.4.2-r1
-2011252124 metadata/md5-cache/dev-python/pymediainfo-4.3
-2011252124 metadata/md5-cache/dev-python/pymediainfo-5.0.3
-2011252124 metadata/md5-cache/dev-python/pymetar-1.1-r1
-2011252124 metadata/md5-cache/dev-python/pymilter-1.0.4-r1
-2011252124 metadata/md5-cache/dev-python/pymongo-3.11.0-r1
-2011252124 metadata/md5-cache/dev-python/pymongo-3.11.1
-2011252124 metadata/md5-cache/dev-python/pymountboot-0.2.3
-2011252124 metadata/md5-cache/dev-python/pymountboot-9999
-2011252124 metadata/md5-cache/dev-python/pympler-0.6
-2011252124 metadata/md5-cache/dev-python/pymssql-2.1.3
-2011252124 metadata/md5-cache/dev-python/pymysql-0.10.1
-2011252124 metadata/md5-cache/dev-python/pynacl-1.4.0
-2011252124 metadata/md5-cache/dev-python/pynput-1.6.8
-2011252124 metadata/md5-cache/dev-python/pynput-9999
-2011252124 metadata/md5-cache/dev-python/pynvim-0.4.1
-2011252124 metadata/md5-cache/dev-python/pyocr-0.7.2
-2011252124 metadata/md5-cache/dev-python/pyopencl-2020.2
-2011252124 metadata/md5-cache/dev-python/pyopencl-2020.2.2
-2011252124 metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.5
-2011252124 metadata/md5-cache/dev-python/pyopenssl-19.1.0-r1
 2011252124 metadata/md5-cache/dev-python/pyotherside-1.5.9
-2011252124 metadata/md5-cache/dev-python/pyotp-2.4.1
-2011252124 metadata/md5-cache/dev-python/pypam-0.5.0-r6
-2011252124 metadata/md5-cache/dev-python/pyparsing-2.4.7-r1
-2011252124 metadata/md5-cache/dev-python/pyparted-3.11.6
-2011252124 metadata/md5-cache/dev-python/pyparted-3.11.7
-2011252124 metadata/md5-cache/dev-python/pypax-0.9.5
-2011252124 metadata/md5-cache/dev-python/pypax-9999
-2011252124 metadata/md5-cache/dev-python/pypcap-1.2.3
-2011252124 metadata/md5-cache/dev-python/pypeg2-2.15.2-r1
-2011252124 metadata/md5-cache/dev-python/pyperclip-1.7.0
-2011252124 metadata/md5-cache/dev-python/pyphen-0.10.0
-2011252124 metadata/md5-cache/dev-python/pyphen-0.9.5
-2011252124 metadata/md5-cache/dev-python/pypng-0.0.20
-2011252124 metadata/md5-cache/dev-python/pyprof2calltree-1.4.4
-2011252124 metadata/md5-cache/dev-python/pyproj-2.6.1_p1
-2011252124 metadata/md5-cache/dev-python/pyproject2setuppy-8
-2011252124 metadata/md5-cache/dev-python/pypugjs-5.9.5
 2011252124 metadata/md5-cache/dev-python/pypy-7.3.1-r3
 2011252124 metadata/md5-cache/dev-python/pypy-7.3.2
 2011252124 metadata/md5-cache/dev-python/pypy-7.3.3
@@ -43012,834 +41916,1885 @@
 2011252124 metadata/md5-cache/dev-python/pypy3-exe-7.3.3_p37
 2011252124 metadata/md5-cache/dev-python/pypy3-exe-7.3.3_rc1
 2011252124 metadata/md5-cache/dev-python/pypy3-exe-7.3.3_rc1_p37
-2011252124 metadata/md5-cache/dev-python/pyqrcode-1.2.1-r1
-2011252124 metadata/md5-cache/dev-python/pyqt-distutils-0.7.3
-2011252124 metadata/md5-cache/dev-python/pyqtgraph-0.11.0_rc0
-2011252124 metadata/md5-cache/dev-python/pyquery-1.4.1-r1
-2011252124 metadata/md5-cache/dev-python/pyre2-1.0.7
-2011252124 metadata/md5-cache/dev-python/pyrfc3339-1.1
-2011252124 metadata/md5-cache/dev-python/pyro-4.80
-2011252124 metadata/md5-cache/dev-python/pyroute2-0.5.14
-2011252124 metadata/md5-cache/dev-python/pyrqlite-2.0
-2011252124 metadata/md5-cache/dev-python/pyrsistent-0.17.3
-2011252124 metadata/md5-cache/dev-python/pyscard-1.9.9
-2011252124 metadata/md5-cache/dev-python/pyscreenshot-2.2
-2011252124 metadata/md5-cache/dev-python/pyserial-3.4
 2011252124 metadata/md5-cache/dev-python/pyside2-5.15.1
-2011252124 metadata/md5-cache/dev-python/pysmi-0.3.4
-2011252124 metadata/md5-cache/dev-python/pysnmp-4.4.12-r1
-2011252124 metadata/md5-cache/dev-python/pysnmp-999999
-2011252124 metadata/md5-cache/dev-python/pysnmp-mibs-0.1.6
-2011252124 metadata/md5-cache/dev-python/pysol_cards-0.10.1
-2011252124 metadata/md5-cache/dev-python/pyspectrum2-0.2.0
-2011252124 metadata/md5-cache/dev-python/pyspf-2.0.14
-2011252124 metadata/md5-cache/dev-python/pysrt-1.1.2
-2011252124 metadata/md5-cache/dev-python/pysrt-9999
-2011252124 metadata/md5-cache/dev-python/pysvg-0.2.2_p3
-2011252124 metadata/md5-cache/dev-python/pysvn-1.9.11
-2011252124 metadata/md5-cache/dev-python/pytables-3.6.1
-2011252124 metadata/md5-cache/dev-python/pyte-0.8.0-r1
-2011252124 metadata/md5-cache/dev-python/pytest-4.6.11-r1
-2011252124 metadata/md5-cache/dev-python/pytest-5.4.3
-2011252124 metadata/md5-cache/dev-python/pytest-cache-1.0-r2
-2011252124 metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
-2011252124 metadata/md5-cache/dev-python/pytest-cov-2.8.1
-2011252124 metadata/md5-cache/dev-python/pytest-datadir-1.3.1
-2011252124 metadata/md5-cache/dev-python/pytest-describe-1.0.0
-2011252124 metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
-2011252124 metadata/md5-cache/dev-python/pytest-faulthandler-1.6.0
-2011252124 metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1
-2011252124 metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r1
-2011252124 metadata/md5-cache/dev-python/pytest-flake8-0.9.1
-2011252124 metadata/md5-cache/dev-python/pytest-flakes-4.0.0
-2011252124 metadata/md5-cache/dev-python/pytest-forked-1.3.0-r1
-2011252124 metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8-r1
-2011252124 metadata/md5-cache/dev-python/pytest-html-1.22.1
-2011252124 metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3
-2011252124 metadata/md5-cache/dev-python/pytest-metadata-1.8.0
-2011252124 metadata/md5-cache/dev-python/pytest-ordering-0.6
-2011252124 metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r1
-2011252124 metadata/md5-cache/dev-python/pytest-pylint-0.17.0
-2011252124 metadata/md5-cache/dev-python/pytest-qt-3.3.0
-2011252124 metadata/md5-cache/dev-python/pytest-regressions-2.0.1
-2011252124 metadata/md5-cache/dev-python/pytest-regressions-2.0.2
-2011252124 metadata/md5-cache/dev-python/pytest-rerunfailures-9.1.1
-2011252124 metadata/md5-cache/dev-python/pytest-salt-2019.2.1_p1
-2011252124 metadata/md5-cache/dev-python/pytest-salt-2020.1.27
-2011252124 metadata/md5-cache/dev-python/pytest-salt-factories-0.94.4
-2011252124 metadata/md5-cache/dev-python/pytest-services-2.2.0
-2011252124 metadata/md5-cache/dev-python/pytest-services-2.2.1
-2011252124 metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r1
-2011252124 metadata/md5-cache/dev-python/pytest-subtesthack-0.1.1
-2011252124 metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12
-2011252124 metadata/md5-cache/dev-python/pytest-testmon-0.9.15
-2011252124 metadata/md5-cache/dev-python/pytest-timeout-1.4.2-r1
-2011252124 metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r1
-2011252124 metadata/md5-cache/dev-python/pytest-xdist-1.34.0-r1
-2011252124 metadata/md5-cache/dev-python/pytest-xprocess-0.15.0
-2011252124 metadata/md5-cache/dev-python/pytest-xprocess-0.16.0
-2011252124 metadata/md5-cache/dev-python/pytest-xvfb-2.0.0
-2011252124 metadata/md5-cache/dev-python/python-augeas-1.1.0
-2011252124 metadata/md5-cache/dev-python/python-axolotl-0.2.3-r1
-2011252124 metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2-r1
-2011252124 metadata/md5-cache/dev-python/python-backoff-1.6.0
-2011252124 metadata/md5-cache/dev-python/python-barbicanclient-4.8.1
-2011252124 metadata/md5-cache/dev-python/python-blazarclient-3.1.1
-2011252124 metadata/md5-cache/dev-python/python-bugzilla-3.0.2
 2011252124 metadata/md5-cache/dev-python/python-caja-1.24.0-r1
 2011252124 metadata/md5-cache/dev-python/python-caja-1.24.0-r2
-2011252124 metadata/md5-cache/dev-python/python-ceilometerclient-2.9.0
-2011252124 metadata/md5-cache/dev-python/python-cinderclient-7.2.0
-2011252124 metadata/md5-cache/dev-python/python-cstruct-1.8
-2011252124 metadata/md5-cache/dev-python/python-ctags-1.5.0
-2011252124 metadata/md5-cache/dev-python/python-daemon-2.2.4
-2011252124 metadata/md5-cache/dev-python/python-dateutil-2.8.1-r2
-2011252124 metadata/md5-cache/dev-python/python-debian-0.1.37
-2011252124 metadata/md5-cache/dev-python/python-discid-1.2.0
-2011252124 metadata/md5-cache/dev-python/python-distutils-extra-2.45
-2011252124 metadata/md5-cache/dev-python/python-dotenv-0.14.0
-2011252124 metadata/md5-cache/dev-python/python-dotenv-0.15.0
-2011252124 metadata/md5-cache/dev-python/python-editor-1.0.4-r1
-2011252124 metadata/md5-cache/dev-python/python-efl-1.25.0
-2011252124 metadata/md5-cache/dev-python/python-email-validator-1.1.1
-2011252124 metadata/md5-cache/dev-python/python-email-validator-1.1.2
-2011252124 metadata/md5-cache/dev-python/python-engineio-3.12.1
-2011252124 metadata/md5-cache/dev-python/python-etcd-0.4.5-r1
-2011252124 metadata/md5-cache/dev-python/python-ethtool-0.14
-2011252124 metadata/md5-cache/dev-python/python-evdev-1.3.0
-2011252124 metadata/md5-cache/dev-python/python-fastimport-0.9.8-r1
-2011252124 metadata/md5-cache/dev-python/python-gammu-2.11
-2011252124 metadata/md5-cache/dev-python/python-gflags-3.1.2-r1
-2011252124 metadata/md5-cache/dev-python/python-glanceclient-3.2.2
-2011252124 metadata/md5-cache/dev-python/python-gnupg-0.4.6
-2011252124 metadata/md5-cache/dev-python/python-heatclient-2.2.1
-2011252124 metadata/md5-cache/dev-python/python-iptables-1.0.0-r1
-2011252124 metadata/md5-cache/dev-python/python-ironicclient-4.1.0
-2011252124 metadata/md5-cache/dev-python/python-ironicclient-4.4.0
-2011252124 metadata/md5-cache/dev-python/python-jose-3.2.0-r1
-2011252124 metadata/md5-cache/dev-python/python-jsonrpc-server-0.3.4
-2011252124 metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1
-2011252124 metadata/md5-cache/dev-python/python-keystoneclient-4.1.1
-2011252124 metadata/md5-cache/dev-python/python-language-server-0.34.1
-2011252124 metadata/md5-cache/dev-python/python-language-server-0.35.1-r1
-2011252124 metadata/md5-cache/dev-python/python-language-server-0.36.1
-2011252124 metadata/md5-cache/dev-python/python-ldap-3.3.1
-2011252124 metadata/md5-cache/dev-python/python-ldap-9999
-2011252124 metadata/md5-cache/dev-python/python-levenshtein-0.12.0
-2011252124 metadata/md5-cache/dev-python/python-lhafile-0.2.2
-2011252124 metadata/md5-cache/dev-python/python-libevdev-0.8
-2011252124 metadata/md5-cache/dev-python/python-linux-procfs-0.6.1
-2011252124 metadata/md5-cache/dev-python/python-ly-0.9.6
-2011252124 metadata/md5-cache/dev-python/python-lzo-1.12-r1
-2011252124 metadata/md5-cache/dev-python/python-magic-0.4.18
-2011252124 metadata/md5-cache/dev-python/python-magnumclient-3.2.1
-2011252124 metadata/md5-cache/dev-python/python-manilaclient-2.3.0
-2011252124 metadata/md5-cache/dev-python/python-markdown-math-0.7
-2011252124 metadata/md5-cache/dev-python/python-memcached-1.59-r1
-2011252124 metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r3
-2011252124 metadata/md5-cache/dev-python/python-mistralclient-4.1.1
-2011252124 metadata/md5-cache/dev-python/python-monascaclient-2.2.1
-2011252124 metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.7.1
-2011252124 metadata/md5-cache/dev-python/python-nbxmpp-1.0.2
-2011252124 metadata/md5-cache/dev-python/python-netlink-0.1
-2011252124 metadata/md5-cache/dev-python/python-neutronclient-6.12.1
-2011252124 metadata/md5-cache/dev-python/python-neutronclient-7.2.1
-2011252124 metadata/md5-cache/dev-python/python-novaclient-17.0.0
-2011252124 metadata/md5-cache/dev-python/python-novaclient-17.2.1
-2011252124 metadata/md5-cache/dev-python/python-openstackclient-5.2.1
-2011252124 metadata/md5-cache/dev-python/python-openstackclient-5.4.0
-2011252124 metadata/md5-cache/dev-python/python-podman-1.6.0
-2011252124 metadata/md5-cache/dev-python/python-poppler-qt5-0.75.0
-2011252124 metadata/md5-cache/dev-python/python-prctl-1.7
-2011252124 metadata/md5-cache/dev-python/python-redmine-2.3.0
-2011252124 metadata/md5-cache/dev-python/python-senlinclient-2.1.1
-2011252124 metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r2
-2011252124 metadata/md5-cache/dev-python/python-slip-0.6.5
-2011252124 metadata/md5-cache/dev-python/python-slugify-1.2.6
-2011252124 metadata/md5-cache/dev-python/python-slugify-4.0.1
-2011252124 metadata/md5-cache/dev-python/python-socks-1.1.0
-2011252124 metadata/md5-cache/dev-python/python-sshpubkeys-3.1.0
-2011252124 metadata/md5-cache/dev-python/python-stdnum-1.14
-2011252124 metadata/md5-cache/dev-python/python-swiftclient-3.10.1
-2011252124 metadata/md5-cache/dev-python/python-systemd-234
-2011252124 metadata/md5-cache/dev-python/python-termstyle-0.1.10
-2011252124 metadata/md5-cache/dev-python/python-troveclient-5.1.1
-2011252124 metadata/md5-cache/dev-python/python-utils-2.3.0
-2011252124 metadata/md5-cache/dev-python/python-varlink-30.3.0
-2011252124 metadata/md5-cache/dev-python/python-vitrageclient-4.1.1
-2011252124 metadata/md5-cache/dev-python/python-xlib-0.28
-2011252124 metadata/md5-cache/dev-python/python-xlib-0.29
-2011252124 metadata/md5-cache/dev-python/python-xmlsec-1.3.9
-2011252124 metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1
-2011252124 metadata/md5-cache/dev-python/python-zipstream-1.1.4
-2011252124 metadata/md5-cache/dev-python/python-zunclient-4.1.1
-2011252124 metadata/md5-cache/dev-python/python3-lxc-3.0.4
-2011252124 metadata/md5-cache/dev-python/python3-openid-3.2.0
-2011252124 metadata/md5-cache/dev-python/python3-saml-1.9.0
 2011252124 metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
 2011252124 metadata/md5-cache/dev-python/python_orocos_kdl-9999
-2011252124 metadata/md5-cache/dev-python/pythondialog-3.5.1
-2011252124 metadata/md5-cache/dev-python/pythonz-bd-1.11.4
-2011252124 metadata/md5-cache/dev-python/pytidylib-0.3.2-r1
-2011252124 metadata/md5-cache/dev-python/pytoml-0.1.20
-2011252124 metadata/md5-cache/dev-python/pytools-2020.4
-2011252124 metadata/md5-cache/dev-python/pytools-9999
-2011252124 metadata/md5-cache/dev-python/pytz-2020.1-r1
-2011252124 metadata/md5-cache/dev-python/pytz-2020.4
-2011252124 metadata/md5-cache/dev-python/pyu2f-0.1.4-r1
-2011252124 metadata/md5-cache/dev-python/pyudev-0.22.0
-2011252124 metadata/md5-cache/dev-python/pyusb-1.0.2-r1
-2011252124 metadata/md5-cache/dev-python/pyvirtualdisplay-1.3.2
-2011252124 metadata/md5-cache/dev-python/pywavelets-1.1.1
-2011252124 metadata/md5-cache/dev-python/pywinrm-0.4.1
-2011252124 metadata/md5-cache/dev-python/pyx-0.15
-2011252124 metadata/md5-cache/dev-python/pyxattr-0.7.1
-2011252124 metadata/md5-cache/dev-python/pyxdg-0.26-r2
-2011252124 metadata/md5-cache/dev-python/pyyaml-5.3.1-r1
-2011252124 metadata/md5-cache/dev-python/pyzbar-0.1.8
-2011252124 metadata/md5-cache/dev-python/pyzmq-19.0.2
-2011252124 metadata/md5-cache/dev-python/pyzmq-20.0.0
-2011252124 metadata/md5-cache/dev-python/qdarkstyle-2.8.1
-2011252124 metadata/md5-cache/dev-python/qrcode-6.1
 2011252124 metadata/md5-cache/dev-python/qscintilla-python-2.11.5
-2011252124 metadata/md5-cache/dev-python/qtawesome-0.7.2
-2011252124 metadata/md5-cache/dev-python/qtawesome-1.0.1
-2011252124 metadata/md5-cache/dev-python/qtconsole-4.7.6
-2011252124 metadata/md5-cache/dev-python/qtconsole-4.7.7
-2011252124 metadata/md5-cache/dev-python/qtconsole-5.0.0
-2011252124 metadata/md5-cache/dev-python/qtconsole-5.0.1
-2011252124 metadata/md5-cache/dev-python/qtsass-0.3.0
-2011252124 metadata/md5-cache/dev-python/quantities-0.12.4
 2011252124 metadata/md5-cache/dev-python/quex-0.71.0-r1
-2011252124 metadata/md5-cache/dev-python/radon-4.1.0
-2011252124 metadata/md5-cache/dev-python/raet-0.6.8-r1
-2011252124 metadata/md5-cache/dev-python/random2-1.0.1-r1
-2011252124 metadata/md5-cache/dev-python/rarfile-3.1
-2011252124 metadata/md5-cache/dev-python/ratelimit-1.4.1
-2011252124 metadata/md5-cache/dev-python/rcssmin-1.0.6
-2011252124 metadata/md5-cache/dev-python/rdflib-5.0.0
-2011252124 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.1
-2011252124 metadata/md5-cache/dev-python/rebulk-2.0.1
-2011252124 metadata/md5-cache/dev-python/recommonmark-0.6.0
-2011252124 metadata/md5-cache/dev-python/redis-py-3.3.11
-2011252124 metadata/md5-cache/dev-python/redis-py-3.5.3
-2011252124 metadata/md5-cache/dev-python/rednose-0.4.3
-2011252124 metadata/md5-cache/dev-python/reflink-0.2.1-r1
-2011252124 metadata/md5-cache/dev-python/rencode-1.0.6
-2011252124 metadata/md5-cache/dev-python/reno-3.2.0-r1
-2011252124 metadata/md5-cache/dev-python/reportlab-3.5.48
-2011252124 metadata/md5-cache/dev-python/repoze-lru-0.7-r1
-2011252124 metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.8
-2011252124 metadata/md5-cache/dev-python/requests-2.24.0-r1
-2011252124 metadata/md5-cache/dev-python/requests-cache-0.5.2
-2011252124 metadata/md5-cache/dev-python/requests-credssp-1.1.1
-2011252124 metadata/md5-cache/dev-python/requests-file-1.4.3
-2011252124 metadata/md5-cache/dev-python/requests-kerberos-0.12.0-r1
-2011252124 metadata/md5-cache/dev-python/requests-mock-1.8.0
-2011252124 metadata/md5-cache/dev-python/requests-ntlm-1.1.0-r1
-2011252124 metadata/md5-cache/dev-python/requests-oauthlib-1.3.0
-2011252124 metadata/md5-cache/dev-python/requests-unixsocket-0.2.0
-2011252124 metadata/md5-cache/dev-python/requests_download-0.1.2
-2011252124 metadata/md5-cache/dev-python/requests_pkcs12-1.7
-2011252124 metadata/md5-cache/dev-python/requestsexceptions-1.4.0
-2011252124 metadata/md5-cache/dev-python/responses-0.12.0
-2011252124 metadata/md5-cache/dev-python/responses-0.12.1
-2011252124 metadata/md5-cache/dev-python/restructuredtext-lint-1.3.0
-2011252124 metadata/md5-cache/dev-python/resumable-urlretrieve-0.1.5
-2011252124 metadata/md5-cache/dev-python/retry-decorator-1.1.1
-2011252124 metadata/md5-cache/dev-python/retrying-1.3.3
-2011252124 metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
-2011252124 metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
-2011252124 metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
-2011252124 metadata/md5-cache/dev-python/rjsmin-1.1.0
-2011252124 metadata/md5-cache/dev-python/robot-detection-0.4.0
-2011252124 metadata/md5-cache/dev-python/roman-3.2
-2011252124 metadata/md5-cache/dev-python/rope-0.17.0
-2011252124 metadata/md5-cache/dev-python/rope-0.18.0
-2011252124 metadata/md5-cache/dev-python/ropemode-0.5
-2011252124 metadata/md5-cache/dev-python/rosdistro-0.8.3
-2011252124 metadata/md5-cache/dev-python/rosdistro-9999
-2011252124 metadata/md5-cache/dev-python/rospkg-1.2.8-r1
-2011252124 metadata/md5-cache/dev-python/rospkg-9999
-2011252124 metadata/md5-cache/dev-python/routes-2.5.1
-2011252124 metadata/md5-cache/dev-python/rply-0.7.7-r1
-2011252124 metadata/md5-cache/dev-python/rpy-2.9.0
-2011252124 metadata/md5-cache/dev-python/rpyc-4.1.4
-2011252124 metadata/md5-cache/dev-python/rq-1.6.1
-2011252124 metadata/md5-cache/dev-python/rsa-4.2
-2011252124 metadata/md5-cache/dev-python/rst-linker-2.0.0
-2011252124 metadata/md5-cache/dev-python/rtimulib-7.2.1-r1
-2011252124 metadata/md5-cache/dev-python/rtslib-fb-2.1.74
-2011252124 metadata/md5-cache/dev-python/ruamel-yaml-0.16.12-r1
-2011252124 metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.2-r1
-2011252124 metadata/md5-cache/dev-python/ryu-4.34
-2011252124 metadata/md5-cache/dev-python/s3fs-0.4.2
-2011252124 metadata/md5-cache/dev-python/s3transfer-0.3.3
-2011252124 metadata/md5-cache/dev-python/sabyenc-4.0.2
-2011252124 metadata/md5-cache/dev-python/sarge-0.1.5
-2011252124 metadata/md5-cache/dev-python/scandir-1.10.0-r2
-2011252124 metadata/md5-cache/dev-python/scikit-build-0.11.1
-2011252124 metadata/md5-cache/dev-python/scipy-1.1.0
-2011252124 metadata/md5-cache/dev-python/scipy-1.4.1
-2011252124 metadata/md5-cache/dev-python/scipy-1.5.2
-2011252124 metadata/md5-cache/dev-python/scipy-1.5.3
-2011252124 metadata/md5-cache/dev-python/scipy-1.5.4
-2011252124 metadata/md5-cache/dev-python/seaborn-0.10.1
-2011252124 metadata/md5-cache/dev-python/secretstorage-3.1.2
-2011252124 metadata/md5-cache/dev-python/secretstorage-3.2.0
-2011252124 metadata/md5-cache/dev-python/secretstorage-3.3.0
-2011252124 metadata/md5-cache/dev-python/semantic_version-2.8.5
-2011252124 metadata/md5-cache/dev-python/semver-2.13.0
-2011252124 metadata/md5-cache/dev-python/send2trash-1.5.0-r1
-2011252124 metadata/md5-cache/dev-python/sentinels-1.0.0
-2011252124 metadata/md5-cache/dev-python/sentry-sdk-0.19.4
-2011252124 metadata/md5-cache/dev-python/serpent-1.30
-2011252124 metadata/md5-cache/dev-python/serpent-1.30.2
-2011252124 metadata/md5-cache/dev-python/serverfiles-0.2.1
-2011252124 metadata/md5-cache/dev-python/setproctitle-1.2
-2011252124 metadata/md5-cache/dev-python/setuptools-46.4.0-r3
-2011252124 metadata/md5-cache/dev-python/setuptools-50.3.0
-2011252124 metadata/md5-cache/dev-python/setuptools_scm-4.1.2-r1
-2011252124 metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1
-2011252124 metadata/md5-cache/dev-python/setuptools_trial-0.6.0-r1
-2011252124 metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
-2011252124 metadata/md5-cache/dev-python/sgmllib3k-1.0.0
-2011252124 metadata/md5-cache/dev-python/sh-1.14.0
 2011252124 metadata/md5-cache/dev-python/shiboken2-5.15.1
-2011252124 metadata/md5-cache/dev-python/shutilwhich-1.1.0
-2011252124 metadata/md5-cache/dev-python/simplebayes-1.5.7
-2011252124 metadata/md5-cache/dev-python/simpleeval-0.9.10
-2011252124 metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
-2011252124 metadata/md5-cache/dev-python/simplejson-3.17.2-r1
-2011252124 metadata/md5-cache/dev-python/simplekml-1.3.1
-2011252124 metadata/md5-cache/dev-python/simplesoapy-1.5.1-r1
-2011252124 metadata/md5-cache/dev-python/simplesoapy-9999
-2011252124 metadata/md5-cache/dev-python/simplespectral-1.0.0
-2011252124 metadata/md5-cache/dev-python/simplespectral-9999
-2011252124 metadata/md5-cache/dev-python/simpy-3.0.13
 2011252124 metadata/md5-cache/dev-python/sip-4.19.24
-2011252124 metadata/md5-cache/dev-python/six-1.15.0-r1
-2011252124 metadata/md5-cache/dev-python/slackclient-2.5.0
-2011252124 metadata/md5-cache/dev-python/slimit-0.8.1-r1
-2011252124 metadata/md5-cache/dev-python/slixmpp-1.4.2
-2011252124 metadata/md5-cache/dev-python/slixmpp-1.5.2
-2011252124 metadata/md5-cache/dev-python/slixmpp-9999
-2011252124 metadata/md5-cache/dev-python/smmap-3.0.4
-2011252124 metadata/md5-cache/dev-python/smmap2-2.0.3
-2011252124 metadata/md5-cache/dev-python/snakeoil-9999
-2011252124 metadata/md5-cache/dev-python/snaketrace-0.1.1
-2011252124 metadata/md5-cache/dev-python/snappy-0.5.1-r1
-2011252124 metadata/md5-cache/dev-python/snapshottest-0.5.1
-2011252124 metadata/md5-cache/dev-python/socketio-client-0.7.2
-2011252124 metadata/md5-cache/dev-python/socketio-client-nexus-0.7.6
-2011252124 metadata/md5-cache/dev-python/sortedcollections-0.5.3
-2011252124 metadata/md5-cache/dev-python/sortedcontainers-2.2.2-r1
-2011252124 metadata/md5-cache/dev-python/sparql-wrapper-1.8.5
-2011252124 metadata/md5-cache/dev-python/speaklater-1.3-r1
-2011252124 metadata/md5-cache/dev-python/speg-0.3-r1
-2011252124 metadata/md5-cache/dev-python/sphinx-2.4.4
-2011252124 metadata/md5-cache/dev-python/sphinx-3.2.1
-2011252124 metadata/md5-cache/dev-python/sphinx-3.3.1
-2011252124 metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0
-2011252124 metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
-2011252124 metadata/md5-cache/dev-python/sphinx-gallery-0.3.1-r1
-2011252124 metadata/md5-cache/dev-python/sphinx-gallery-0.8.1
-2011252124 metadata/md5-cache/dev-python/sphinx-issues-1.2.0
-2011252124 metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
-2011252124 metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4
-2011252124 metadata/md5-cache/dev-python/sphinx-notfound-page-0.5
-2011252124 metadata/md5-cache/dev-python/sphinx-panels-0.4.1
-2011252124 metadata/md5-cache/dev-python/sphinx-prompt-1.3.0
-2011252124 metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1
-2011252124 metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1
-2011252124 metadata/md5-cache/dev-python/sphinx_rtd_theme-0.2.4
-2011252124 metadata/md5-cache/dev-python/sphinx_rtd_theme-0.4.3-r1
-2011252124 metadata/md5-cache/dev-python/sphinx_selective_exclude-1.0.3
-2011252124 metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2
-2011252124 metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2
-2011252124 metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2
-2011252124 metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.6.1
-2011252124 metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.1-r2
-2011252124 metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.3
-2011252124 metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.7.0
-2011252124 metadata/md5-cache/dev-python/sphinxcontrib-httpexample-0.10.3
-2011252124 metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1
-2011252124 metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2
-2011252124 metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1
-2011252124 metadata/md5-cache/dev-python/sphinxcontrib-pretty-searchresults-0.3.5
-2011252124 metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.16
-2011252124 metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3
-2011252124 metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.4
-2011252124 metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.3.0
-2011252124 metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.0.1
-2011252124 metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.1.0
-2011252124 metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4
-2011252124 metadata/md5-cache/dev-python/spur-0.3.22
-2011252124 metadata/md5-cache/dev-python/spyder-4.2.0
-2011252124 metadata/md5-cache/dev-python/spyder-kernels-1.10.0
-2011252124 metadata/md5-cache/dev-python/spyder-line-profiler-0.2.1
-2011252124 metadata/md5-cache/dev-python/spyder-memory-profiler-0.2.1
-2011252124 metadata/md5-cache/dev-python/spyder-notebook-0.3.1
-2011252124 metadata/md5-cache/dev-python/spyder-terminal-0.5.0
-2011252124 metadata/md5-cache/dev-python/spyder-unittest-0.4.1
-2011252124 metadata/md5-cache/dev-python/spyder-vim-0_pre20201026
-2011252124 metadata/md5-cache/dev-python/sqlalchemy-1.3.17
-2011252124 metadata/md5-cache/dev-python/sqlalchemy-1.3.20
-2011252124 metadata/md5-cache/dev-python/sqlalchemy-migrate-0.13.0
-2011252124 metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0
-2011252124 metadata/md5-cache/dev-python/sqlalchemy-rqlite-9999
-2011252124 metadata/md5-cache/dev-python/sqlparse-0.3.1
-2011252124 metadata/md5-cache/dev-python/sqlparse-0.4.1
-2011252124 metadata/md5-cache/dev-python/sshtunnel-0.1.4-r2
-2011252124 metadata/md5-cache/dev-python/sshtunnel-0.1.5
-2011252124 metadata/md5-cache/dev-python/ssl-fetch-0.4
-2011252124 metadata/md5-cache/dev-python/ssl-fetch-9999
-2011252124 metadata/md5-cache/dev-python/stapler-1.0.0_p20200531
-2011252124 metadata/md5-cache/dev-python/statsd-3.3.0
-2011252124 metadata/md5-cache/dev-python/statsmodels-0.11.1
-2011252124 metadata/md5-cache/dev-python/statsmodels-0.12.0
-2011252124 metadata/md5-cache/dev-python/statsmodels-0.12.1
-2011252124 metadata/md5-cache/dev-python/statsmodels-9999
-2011252124 metadata/md5-cache/dev-python/stestr-2.1.0-r1
-2011252124 metadata/md5-cache/dev-python/stevedore-3.2.2
-2011252124 metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1
-2011252124 metadata/md5-cache/dev-python/stripe-2.46.0
-2011252124 metadata/md5-cache/dev-python/subunit-1.4.0
-2011252124 metadata/md5-cache/dev-python/subvertpy-0.10.1
-2011252124 metadata/md5-cache/dev-python/suds-0.6-r1
-2011252124 metadata/md5-cache/dev-python/suds-0.8.4
-2011252124 metadata/md5-cache/dev-python/sure-1.4.11
-2011252124 metadata/md5-cache/dev-python/svg-path-4.0.2
-2011252124 metadata/md5-cache/dev-python/svgwrite-1.4
-2011252124 metadata/md5-cache/dev-python/swagger-spec-validator-2.5.0
-2011252124 metadata/md5-cache/dev-python/sybil-1.4.0
-2011252124 metadata/md5-cache/dev-python/sybil-2.0.0
-2011252124 metadata/md5-cache/dev-python/symengine-0.6.1-r1
-2011252124 metadata/md5-cache/dev-python/sympy-1.6.2
-2011252124 metadata/md5-cache/dev-python/sympy-1.7_rc1
-2011252124 metadata/md5-cache/dev-python/tabulate-0.8.7
-2011252124 metadata/md5-cache/dev-python/tagpy-2018.1-r1
-2011252124 metadata/md5-cache/dev-python/tappy-3.0
-2011252124 metadata/md5-cache/dev-python/taskflow-4.1.0
-2011252124 metadata/md5-cache/dev-python/tblib-1.7.0
-2011252124 metadata/md5-cache/dev-python/tempita-0.5.3-r3
-2011252124 metadata/md5-cache/dev-python/tempora-3.0.0
-2011252124 metadata/md5-cache/dev-python/tempora-4.0.0
-2011252124 metadata/md5-cache/dev-python/tenacity-6.2.0
-2011252124 metadata/md5-cache/dev-python/termcolor-1.1.0-r2
-2011252124 metadata/md5-cache/dev-python/terminado-0.8.3
-2011252124 metadata/md5-cache/dev-python/terminado-0.9.1
-2011252124 metadata/md5-cache/dev-python/terminaltables-3.1.0
-2011252124 metadata/md5-cache/dev-python/terminaltables-9999
-2011252124 metadata/md5-cache/dev-python/test_server-0.0.31
-2011252124 metadata/md5-cache/dev-python/testfixtures-6.15.0
-2011252124 metadata/md5-cache/dev-python/testrepository-0.0.20
-2011252124 metadata/md5-cache/dev-python/testresources-2.0.1
-2011252124 metadata/md5-cache/dev-python/testscenarios-0.5.0-r1
-2011252124 metadata/md5-cache/dev-python/testtools-2.4.0-r1
-2011252124 metadata/md5-cache/dev-python/text-unidecode-1.3
-2011252124 metadata/md5-cache/dev-python/texttable-1.6.3
-2011252124 metadata/md5-cache/dev-python/textx-1.4
-2011252124 metadata/md5-cache/dev-python/theano-1.0.5
-2011252124 metadata/md5-cache/dev-python/threadpoolctl-2.1.0
-2011252124 metadata/md5-cache/dev-python/three-merge-0.1.1
-2011252124 metadata/md5-cache/dev-python/thrift-0.11.0
-2011252124 metadata/md5-cache/dev-python/tikzplotlib-0.9.4
-2011252124 metadata/md5-cache/dev-python/tinycss-0.4
-2011252124 metadata/md5-cache/dev-python/tinycss2-1.0.2
-2011252124 metadata/md5-cache/dev-python/tinycss2-1.1.0
-2011252124 metadata/md5-cache/dev-python/tinyrpc-1.0.1
-2011252124 metadata/md5-cache/dev-python/tld-0.12.2
-2011252124 metadata/md5-cache/dev-python/tldextract-2.2.1
-2011252124 metadata/md5-cache/dev-python/toml-0.10.1-r1
-2011252124 metadata/md5-cache/dev-python/toolz-0.11.1
-2011252124 metadata/md5-cache/dev-python/towncrier-19.2.0
-2011252124 metadata/md5-cache/dev-python/tox-3.20.1
-2011252124 metadata/md5-cache/dev-python/tox-3.20.1-r1
-2011252124 metadata/md5-cache/dev-python/tqdm-4.53.0
-2011252124 metadata/md5-cache/dev-python/tqdm-9999
-2011252124 metadata/md5-cache/dev-python/traceback2-1.4.0-r1
-2011252124 metadata/md5-cache/dev-python/traitlets-4.3.3
-2011252124 metadata/md5-cache/dev-python/traitlets-5.0.5
-2011252124 metadata/md5-cache/dev-python/transitions-0.8.2-r1
-2011252124 metadata/md5-cache/dev-python/translate-toolkit-2.5.1
-2011252124 metadata/md5-cache/dev-python/translate-toolkit-3.2.0
-2011252124 metadata/md5-cache/dev-python/treq-20.9.0
-2011252124 metadata/md5-cache/dev-python/tubes-0.2.0-r1
-2011252124 metadata/md5-cache/dev-python/tvdb_api-2.0-r1
-2011252124 metadata/md5-cache/dev-python/twisted-19.10.0
-2011252124 metadata/md5-cache/dev-python/twisted-20.3.0
-2011252124 metadata/md5-cache/dev-python/twython-3.7.0
-2011252124 metadata/md5-cache/dev-python/txAMQP-0.8.2
-2011252124 metadata/md5-cache/dev-python/txaio-20.4.1
-2011252124 metadata/md5-cache/dev-python/txgithub-15.0.0-r1
-2011252124 metadata/md5-cache/dev-python/txrequests-0.9.6
-2011252124 metadata/md5-cache/dev-python/typing-3.7.4.3
-2011252124 metadata/md5-cache/dev-python/tzlocal-2.1
-2011252124 metadata/md5-cache/dev-python/ubelt-0.9.1
-2011252124 metadata/md5-cache/dev-python/ujson-1.35-r1
-2011252124 metadata/md5-cache/dev-python/ujson-4.0.1
-2011252124 metadata/md5-cache/dev-python/uncertainties-3.1.4-r1
-2011252124 metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1
-2011252124 metadata/md5-cache/dev-python/unidecode-0.04.21
-2011252124 metadata/md5-cache/dev-python/unidecode-1.1.1
-2011252124 metadata/md5-cache/dev-python/unittest-mixins-1.6-r1
-2011252124 metadata/md5-cache/dev-python/unittest2-1.1.0-r1
-2011252124 metadata/md5-cache/dev-python/uranium-4.7.0
-2011252124 metadata/md5-cache/dev-python/urdf_parser_py-0.4.3
-2011252124 metadata/md5-cache/dev-python/uritemplate-3.0.1-r1
-2011252124 metadata/md5-cache/dev-python/urlgrabber-4.0.0
-2011252124 metadata/md5-cache/dev-python/urllib3-1.24.2-r1
-2011252124 metadata/md5-cache/dev-python/urllib3-1.26.0
-2011252124 metadata/md5-cache/dev-python/urllib3-1.26.1
-2011252124 metadata/md5-cache/dev-python/urwid-2.1.1
-2011252124 metadata/md5-cache/dev-python/urwidtrees-1.0.3
-2011252124 metadata/md5-cache/dev-python/utidylib-0.6-r1
-2011252124 metadata/md5-cache/dev-python/uvloop-0.14.0
-2011252124 metadata/md5-cache/dev-python/vcstools-0.1.42
-2011252124 metadata/md5-cache/dev-python/vcversioner-2.16.0.0
-2011252124 metadata/md5-cache/dev-python/vdf-3.3
-2011252124 metadata/md5-cache/dev-python/vdirsyncer-0.16.8
-2011252124 metadata/md5-cache/dev-python/vecrec-0.3.0
-2011252124 metadata/md5-cache/dev-python/verboselogs-1.7
-2011252124 metadata/md5-cache/dev-python/versioneer-0.18-r1
-2011252124 metadata/md5-cache/dev-python/versioneer-0.19
-2011252124 metadata/md5-cache/dev-python/vine-1.3.0
-2011252124 metadata/md5-cache/dev-python/virtualenv-16.7.10-r1
-2011252124 metadata/md5-cache/dev-python/virtualenv-clone-0.5.3
-2011252124 metadata/md5-cache/dev-python/virtualenvwrapper-4.8.4-r1
-2011252124 metadata/md5-cache/dev-python/visitor-0.1.3-r1
-2011252124 metadata/md5-cache/dev-python/vncdotool-0.13.0
-2011252124 metadata/md5-cache/dev-python/vobject-0.9.6.1-r2
-2011252124 metadata/md5-cache/dev-python/voluptuous-0.12.0
-2011252124 metadata/md5-cache/dev-python/vpython-7.6.1-r2
-2011252124 metadata/md5-cache/dev-python/wand-0.6.3
-2011252124 metadata/md5-cache/dev-python/warlock-1.3.3
-2011252124 metadata/md5-cache/dev-python/watchdog-0.10.3
-2011252124 metadata/md5-cache/dev-python/watchdog-0.10.4
-2011252124 metadata/md5-cache/dev-python/watchdog-0.8.3-r2
-2011252124 metadata/md5-cache/dev-python/wcwidth-0.2.5-r1
-2011252124 metadata/md5-cache/dev-python/weasyprint-51
-2011252124 metadata/md5-cache/dev-python/webassets-2.0
-2011252124 metadata/md5-cache/dev-python/webcolors-1.11.1
-2011252124 metadata/md5-cache/dev-python/webencodings-0.5.1-r1
-2011252124 metadata/md5-cache/dev-python/webob-1.8.6
-2011252124 metadata/md5-cache/dev-python/websocket-client-0.57.0
-2011252124 metadata/md5-cache/dev-python/websockets-8.1
-2011252124 metadata/md5-cache/dev-python/websockify-0.9.0
-2011252124 metadata/md5-cache/dev-python/websockify-0.9.0-r1
-2011252124 metadata/md5-cache/dev-python/werkzeug-1.0.1-r1
-2011252124 metadata/md5-cache/dev-python/whichcraft-0.6.1
-2011252124 metadata/md5-cache/dev-python/whisper-1.1.5
-2011252124 metadata/md5-cache/dev-python/whoosh-2.7.4-r1
-2011252124 metadata/md5-cache/dev-python/widgetsnbextension-3.5.1
-2011252124 metadata/md5-cache/dev-python/widgetsnbextension-3.5.1-r1
-2011252124 metadata/md5-cache/dev-python/wrapt-1.12.1
-2011252124 metadata/md5-cache/dev-python/ws4py-0.5.1-r1
-2011252124 metadata/md5-cache/dev-python/ws4py-9999
-2011252124 metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
-2011252124 metadata/md5-cache/dev-python/wsproto-0.15.0
-2011252124 metadata/md5-cache/dev-python/wsproto-1.0.0
-2011252124 metadata/md5-cache/dev-python/wstools-0.4.8
-2011252124 metadata/md5-cache/dev-python/wtforms-2.3.3
-2011252124 metadata/md5-cache/dev-python/wurlitzer-2.0.1
-2011252124 metadata/md5-cache/dev-python/www-authenticate-0.9.2
-2011252124 metadata/md5-cache/dev-python/wxpython-4.0.7
-2011252124 metadata/md5-cache/dev-python/xapp-2.0.1
-2011252124 metadata/md5-cache/dev-python/xarray-0.12.1
-2011252124 metadata/md5-cache/dev-python/xarray-0.16.0
-2011252124 metadata/md5-cache/dev-python/xarray-0.16.1
-2011252124 metadata/md5-cache/dev-python/xcffib-0.10.1
-2011252124 metadata/md5-cache/dev-python/xdoctest-0.15.0
-2011252124 metadata/md5-cache/dev-python/xlrd-1.2.0
-2011252124 metadata/md5-cache/dev-python/xlsxwriter-1.3.7
-2011252124 metadata/md5-cache/dev-python/xlutils-2.0.0-r1
-2011252124 metadata/md5-cache/dev-python/xlwt-1.3.0-r1
-2011252124 metadata/md5-cache/dev-python/xmlschema-1.2.3-r1
-2011252124 metadata/md5-cache/dev-python/xmlschema-1.2.4
-2011252124 metadata/md5-cache/dev-python/xmlschema-1.2.5
-2011252124 metadata/md5-cache/dev-python/xmlschema-1.3.0
-2011252124 metadata/md5-cache/dev-python/xmltodict-0.12.0-r1
-2011252124 metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
-2011252124 metadata/md5-cache/dev-python/xxhash-2.0.0
-2011252124 metadata/md5-cache/dev-python/yapf-0.30.0
-2011252124 metadata/md5-cache/dev-python/yappi-1.2.5-r1
-2011252124 metadata/md5-cache/dev-python/yappi-1.3.0
-2011252124 metadata/md5-cache/dev-python/yapsy-1.12.2
-2011252124 metadata/md5-cache/dev-python/yaql-1.1.3
-2011252124 metadata/md5-cache/dev-python/yarl-1.6.2
-2011252124 metadata/md5-cache/dev-python/yaswfp-0.9.3-r1
-2011252124 metadata/md5-cache/dev-python/zVMCloudConnector-1.4.1
-2011252124 metadata/md5-cache/dev-python/zc-lockfile-2.0
-2011252124 metadata/md5-cache/dev-python/zconfig-3.5.0
-2011252124 metadata/md5-cache/dev-python/zeep-3.4.0
-2011252124 metadata/md5-cache/dev-python/zeroconf-0.24.4
-2011252124 metadata/md5-cache/dev-python/zict-0.1.4
-2011252124 metadata/md5-cache/dev-python/zope-component-4.4.1
-2011252124 metadata/md5-cache/dev-python/zope-configuration-4.4.0
-2011252124 metadata/md5-cache/dev-python/zope-deprecation-4.4.0
-2011252124 metadata/md5-cache/dev-python/zope-event-4.5.0-r1
-2011252124 metadata/md5-cache/dev-python/zope-exceptions-4.4
-2011252124 metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.1
-2011252124 metadata/md5-cache/dev-python/zope-interface-5.1.2
-2011252124 metadata/md5-cache/dev-python/zope-interface-5.2.0
-2011252124 metadata/md5-cache/dev-python/zope-schema-6.0.0
-2011252124 metadata/md5-cache/dev-python/zope-testing-4.7-r2
-2011252124 metadata/md5-cache/dev-python/zope-testrunner-5.2
-2011252124 metadata/md5-cache/dev-python/zstandard-0.14.0-r1
-2011252124 metadata/md5-cache/dev-python/zstandard-0.8.1-r1
-2011252124 metadata/md5-cache/dev-python/zstd-1.4.5.1
-2011252124 metadata/md5-cache/dev-python/zxcvbn-4.4.28
-2011261139 metadata/md5-cache/dev-python/automaton-2.2.0
-2011261139 metadata/md5-cache/dev-python/awscli-1.18.160
-2011261139 metadata/md5-cache/dev-python/boto3-1.16.9
-2011261139 metadata/md5-cache/dev-python/botocore-1.19.9
-2011261139 metadata/md5-cache/dev-python/cfn-python-lint-0.39.0
-2011261109 metadata/md5-cache/dev-python/dbutils-2.0
-2011261139 metadata/md5-cache/dev-python/dominate-2.6.0
-2011261209 metadata/md5-cache/dev-python/fakeredis-1.4.4
-2011261009 metadata/md5-cache/dev-python/feedparser-6.0.2
-2011261139 metadata/md5-cache/dev-python/futurist-2.3.0
-2011261139 metadata/md5-cache/dev-python/humanize-3.1.0
-2011260909 metadata/md5-cache/dev-python/markdown-3.3.3
-2011261139 metadata/md5-cache/dev-python/microversion-parse-1.0.1
-2011261139 metadata/md5-cache/dev-python/mongomock-3.21.0
-2011261009 metadata/md5-cache/dev-python/pbr-5.5.1
-2011261009 metadata/md5-cache/dev-python/pygments-2.7.2
-2011260139 metadata/md5-cache/dev-python/pytaglib-1.4.6
-2011261409 metadata/md5-cache/dev-python/pytest-6.1.1
-2011260909 metadata/md5-cache/dev-python/pytrie-0.4.0
-2011261209 metadata/md5-cache/dev-python/rq-1.5.2
-2011261209 metadata/md5-cache/dev-python/sentry-sdk-0.19.1
-2011261139 metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.0.0
-2011260909 metadata/md5-cache/dev-python/tqdm-4.51.0
-2011260909 metadata/md5-cache/dev-python/u-msgpack-2.7.1
-2011261009 metadata/md5-cache/dev-python/urllib3-1.25.11
-2011261009 metadata/md5-cache/dev-python/virtualenv-20.1.0
-2011270309 metadata/md5-cache/dev-python/aiohttp-3.6.2-r1
-2011270309 metadata/md5-cache/dev-python/aiohttp-3.7.2-r1
-2011270309 metadata/md5-cache/dev-python/aiohttp-3.7.3
-2011262239 metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1
-2011262239 metadata/md5-cache/dev-python/blockdiag-2.0.1
-2011270309 metadata/md5-cache/dev-python/dask-2.30.0
-2011262239 metadata/md5-cache/dev-python/dataclasses-0.7
-2011271239 metadata/md5-cache/dev-python/hypothesis-5.37.5
-2011270309 metadata/md5-cache/dev-python/idna-ssl-1.1.0-r1
-2011271139 metadata/md5-cache/dev-python/lxml-4.6.1
-2011270209 metadata/md5-cache/dev-python/pybind11-2.6.0
-2011271239 metadata/md5-cache/dev-python/pykka-2.0.3
-2011271239 metadata/md5-cache/dev-python/pytest-xprocess-0.17.0
-2011262239 metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0
-2011262239 metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.4.0
-2011271909 metadata/md5-cache/dev-python/kiwisolver-1.3.0
-2011271909 metadata/md5-cache/dev-python/mysql-connector-python-8.0.22
-2011271909 metadata/md5-cache/dev-python/nest_asyncio-1.4.2
-2011271909 metadata/md5-cache/dev-python/os-resource-classes-1.0.0
-2011271909 metadata/md5-cache/dev-python/os-traits-2.4.0
-2011271909 metadata/md5-cache/dev-python/os-win-5.1.0
-2011271909 metadata/md5-cache/dev-python/os-xenapi-0.3.4-r1
-2011271909 metadata/md5-cache/dev-python/oslo-cache-2.6.1
-2011271909 metadata/md5-cache/dev-python/oslo-db-8.4.0
-2011271909 metadata/md5-cache/dev-python/oslo-middleware-4.1.1
-2011271909 metadata/md5-cache/dev-python/oslo-policy-3.5.0
-2011271909 metadata/md5-cache/dev-python/oslo-privsep-2.4.0
-2011271909 metadata/md5-cache/dev-python/oslo-reports-2.2.0
-2011271909 metadata/md5-cache/dev-python/oslo-rootwrap-6.2.0
-2011271909 metadata/md5-cache/dev-python/oslo-service-2.4.0
-2011271909 metadata/md5-cache/dev-python/oslo-upgradecheck-1.1.1
-2011271909 metadata/md5-cache/dev-python/oslo-vmware-3.7.0
-2011271909 metadata/md5-cache/dev-python/ovsdbapp-1.5.0
-2011271909 metadata/md5-cache/dev-python/pandocfilters-1.4.3
-2011271609 metadata/md5-cache/dev-python/pika-1.1.0
-2011272309 metadata/md5-cache/dev-python/pillow-8.0.1
-2011271609 metadata/md5-cache/dev-python/pmw-2.0.1-r2
-2011271909 metadata/md5-cache/dev-python/pycadf-3.1.1
-2011271909 metadata/md5-cache/dev-python/pysaml2-6.1.0
-2011271909 metadata/md5-cache/dev-python/pytest-django-4.1.0
-2011271909 metadata/md5-cache/dev-python/python-barbicanclient-5.0.1
-2011271909 metadata/md5-cache/dev-python/python-bugzilla-3.0.1
-2011271909 metadata/md5-cache/dev-python/python-designateclient-4.1.0
-2011271909 metadata/md5-cache/dev-python/python-octaviaclient-2.2.0
-2011271909 metadata/md5-cache/dev-python/python-saharaclient-3.2.1
-2011271909 metadata/md5-cache/dev-python/python-zaqarclient-2.0.1
-2011271909 metadata/md5-cache/dev-python/taskflow-4.5.0
-2011271909 metadata/md5-cache/dev-python/tooz-2.7.1
-2011271909 metadata/md5-cache/dev-python/vncdotool-1.0.0
 2011281239 metadata/md5-cache/dev-python/PyQt5-5.15.1
 2011281239 metadata/md5-cache/dev-python/PyQtWebEngine-5.15.1
-2011291139 metadata/md5-cache/dev-python/aiohttp-3.7.1-r1
-2011281909 metadata/md5-cache/dev-python/async_timeout-3.0.1
-2011281139 metadata/md5-cache/dev-python/attrs-20.3.0
-2011281509 metadata/md5-cache/dev-python/automat-20.2.0
-2011281909 metadata/md5-cache/dev-python/beautifulsoup-4.9.3
-2011281739 metadata/md5-cache/dev-python/betamax-0.8.1
-2011281709 metadata/md5-cache/dev-python/black-20.8_beta1
-2011281739 metadata/md5-cache/dev-python/bleach-3.2.1
-2011281539 metadata/md5-cache/dev-python/blessed-1.17.12
-2011281139 metadata/md5-cache/dev-python/blinker-1.4-r2
-2011281139 metadata/md5-cache/dev-python/brotlipy-0.7.0-r3
-2011291139 metadata/md5-cache/dev-python/castellan-3.6.0
-2011281039 metadata/md5-cache/dev-python/cffi-1.14.0-r3
-2011281739 metadata/md5-cache/dev-python/characteristic-14.3.0-r3
 2011291209 metadata/md5-cache/dev-python/clang-python-12.0.0.9999
-2011281139 metadata/md5-cache/dev-python/click-7.1.2-r1
-2011281509 metadata/md5-cache/dev-python/constantly-15.1.0-r1
-2011281709 metadata/md5-cache/dev-python/contextlib2-0.6.0_p1-r1
-2011281709 metadata/md5-cache/dev-python/coverage-5.3
-2011281709 metadata/md5-cache/dev-python/cssselect-1.1.0-r1
-2011281839 metadata/md5-cache/dev-python/csv23-0.3.2-r1
-2011281709 metadata/md5-cache/dev-python/distlib-0.3.1-r1
-2011281139 metadata/md5-cache/dev-python/elementpath-2.0.4
-2011281739 metadata/md5-cache/dev-python/entrypoints-0.3-r2
-2011281209 metadata/md5-cache/dev-python/execnet-1.7.1-r1
-2011281839 metadata/md5-cache/dev-python/fields-5.0.0-r2
-2011281209 metadata/md5-cache/dev-python/filelock-3.0.12-r1
-2011281909 metadata/md5-cache/dev-python/flake8-3.8.3-r1
-2011281839 metadata/md5-cache/dev-python/flaky-3.7.0-r1
-2011281139 metadata/md5-cache/dev-python/flask-1.1.2-r1
-2011281709 metadata/md5-cache/dev-python/genty-1.3.2-r1
-2011281739 metadata/md5-cache/dev-python/gevent-20.9.0
-2011281509 metadata/md5-cache/dev-python/gmpy-2.0.8-r2
-2011281709 metadata/md5-cache/dev-python/greenlet-0.4.17
-2011281139 metadata/md5-cache/dev-python/httpbin-0.7.0-r1
-2011281509 metadata/md5-cache/dev-python/hyperlink-20.0.1
-2011281439 metadata/md5-cache/dev-python/hypothesis-5.41.3
-2011282309 metadata/md5-cache/dev-python/hypothesis-5.41.4
-2011281139 metadata/md5-cache/dev-python/importlib_metadata-3.1.0
-2011281139 metadata/md5-cache/dev-python/importlib_resources-3.3.0
-2011281509 metadata/md5-cache/dev-python/incremental-17.5.0
-2011281139 metadata/md5-cache/dev-python/inflect-5.0.2
-2011281109 metadata/md5-cache/dev-python/iniconfig-1.0.0
-2011281909 metadata/md5-cache/dev-python/isort-5.6.3
-2011281139 metadata/md5-cache/dev-python/itsdangerous-1.1.0-r1
-2011281739 metadata/md5-cache/dev-python/jaraco-classes-3.1.0
-2011281839 metadata/md5-cache/dev-python/jaraco-envs-2.0.0
-2011281839 metadata/md5-cache/dev-python/jaraco-functools-3.0.1
-2011281139 metadata/md5-cache/dev-python/jaraco-itertools-5.0.0
-2011282009 metadata/md5-cache/dev-python/jeepney-0.6.0
-2011281839 metadata/md5-cache/dev-python/keyring-21.5.0
-2011291139 metadata/md5-cache/dev-python/keystonemiddleware-9.1.0
-2011291209 metadata/md5-cache/dev-python/lit-12.0.0.9999
-2011291139 metadata/md5-cache/dev-python/lxml-4.6.2
-2011281509 metadata/md5-cache/dev-python/m2r-0.2.1
-2011281509 metadata/md5-cache/dev-python/mistune-0.8.4-r1
-2011281709 metadata/md5-cache/dev-python/monotonic-1.5-r1
-2011281109 metadata/md5-cache/dev-python/more-itertools-8.6.0
-2011281109 metadata/md5-cache/dev-python/multidict-5.0.0
-2011281739 metadata/md5-cache/dev-python/munch-2.5.0-r1
 2011281139 metadata/md5-cache/dev-python/namespace-jaraco-2-r2
 2011281709 metadata/md5-cache/dev-python/namespace-paste-1-r1
-2011281439 metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
-2011291139 metadata/md5-cache/dev-python/os-brick-4.0.1
-2011281209 metadata/md5-cache/dev-python/packaging-20.5
-2011282309 metadata/md5-cache/dev-python/packaging-20.7
-2011281709 metadata/md5-cache/dev-python/passlib-1.7.4
-2011281739 metadata/md5-cache/dev-python/pastedeploy-2.1.1
-2011281739 metadata/md5-cache/dev-python/path-py-15.0.0
-2011281709 metadata/md5-cache/dev-python/pathlib2-2.3.5-r1
-2011281109 metadata/md5-cache/dev-python/pathspec-0.8.0
-2011281909 metadata/md5-cache/dev-python/pip-20.2.4
-2011281709 metadata/md5-cache/dev-python/pkginfo-1.5.0.1-r1
-2011281109 metadata/md5-cache/dev-python/pluggy-0.13.1-r1
-2011281839 metadata/md5-cache/dev-python/portend-2.7.0
-2011281709 metadata/md5-cache/dev-python/process-tests-2.1.1
-2011290339 metadata/md5-cache/dev-python/psutil-5.7.3
-2011281839 metadata/md5-cache/dev-python/ptyprocess-0.6.0-r1
-2011281539 metadata/md5-cache/dev-python/pyaes-1.6.1-r2
-2011281439 metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r1
-2011281739 metadata/md5-cache/dev-python/pydocstyle-5.1.1
-2011281139 metadata/md5-cache/dev-python/pyfakefs-4.3.2
-2011281509 metadata/md5-cache/dev-python/pyhamcrest-2.0.2
-2011281909 metadata/md5-cache/dev-python/pylama-7.7.1-r1
-2011291139 metadata/md5-cache/dev-python/pylibacl-0.6.0
-2011281209 metadata/md5-cache/dev-python/pyopenssl-20.0.0
-2011281909 metadata/md5-cache/dev-python/pypiserver-1.4.2
-2011291139 metadata/md5-cache/dev-python/pypowervm-1.1.24
-2011281739 metadata/md5-cache/dev-python/pyproject2setuppy-9
-2011281909 metadata/md5-cache/dev-python/pyquery-1.4.3
-2011281509 metadata/md5-cache/dev-python/pyserial-3.5
-2011281139 metadata/md5-cache/dev-python/pytest-6.1.2
-2011281909 metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
-2011282009 metadata/md5-cache/dev-python/pytest-asyncio-0.14.0
-2011281439 metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
-2011281139 metadata/md5-cache/dev-python/pytest-httpbin-1.0.0-r1
-2011281739 metadata/md5-cache/dev-python/pytest-localserver-0.5.0
-2011281139 metadata/md5-cache/dev-python/pytest-mock-3.3.1
-2011281209 metadata/md5-cache/dev-python/pytest-xdist-2.1.0
 2011290109 metadata/md5-cache/dev-python/python-docs-3.8.6
-2011281239 metadata/md5-cache/dev-python/python-mpd-1.1.0-r1
-2011290339 metadata/md5-cache/dev-python/re-assert-1.1.0
-2011281839 metadata/md5-cache/dev-python/readme_renderer-28.0
-2011281239 metadata/md5-cache/dev-python/reedsolomon-1.5.4
-2011281709 metadata/md5-cache/dev-python/regex-2020.4.4-r1
-2011281139 metadata/md5-cache/dev-python/requests-2.25.0
-2011281839 metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
-2011281739 metadata/md5-cache/dev-python/rfc3986-1.4.0
-2011281739 metadata/md5-cache/dev-python/scripttest-1.3.0-r1
-2011281709 metadata/md5-cache/dev-python/scrypt-0.8.16
-2011281439 metadata/md5-cache/dev-python/service_identity-18.1.0-r1
-2011281909 metadata/md5-cache/dev-python/setuptools-git-1.2-r2
-2011281109 metadata/md5-cache/dev-python/snakeoil-0.8.8
-2011281639 metadata/md5-cache/dev-python/snowballstemmer-2.0.0
-2011281839 metadata/md5-cache/dev-python/socketpool-0.5.3-r3
-2011281139 metadata/md5-cache/dev-python/sortedcontainers-2.3.0
-2011281909 metadata/md5-cache/dev-python/soupsieve-2.0.1
-2011281839 metadata/md5-cache/dev-python/tempora-4.0.1
-2011281839 metadata/md5-cache/dev-python/testpath-0.4.4-r1
-2011281139 metadata/md5-cache/dev-python/toml-0.10.2
-2011281739 metadata/md5-cache/dev-python/tqdm-4.54.0
-2011281439 metadata/md5-cache/dev-python/trustme-0.6.0-r1
-2011281909 metadata/md5-cache/dev-python/twine-3.2.0
-2011281639 metadata/md5-cache/dev-python/typed-ast-1.4.1
-2011281139 metadata/md5-cache/dev-python/typing-extensions-3.7.4.3
-2011281439 metadata/md5-cache/dev-python/urllib3-1.26.2
-2011281139 metadata/md5-cache/dev-python/vcrpy-4.1.1
-2011281909 metadata/md5-cache/dev-python/virtualenv-20.2.1
-2011281739 metadata/md5-cache/dev-python/waitress-1.4.4
-2011281909 metadata/md5-cache/dev-python/webtest-2.0.35
-2011281739 metadata/md5-cache/dev-python/wheel-0.35.1-r1
-2011281909 metadata/md5-cache/dev-python/wsgiproxy2-0.4.6-r1
-2011291139 metadata/md5-cache/dev-python/xcffib-0.11.0
-2011281139 metadata/md5-cache/dev-python/xmlschema-1.3.1
-2011281139 metadata/md5-cache/dev-python/yarl-1.6.3
-2011281139 metadata/md5-cache/dev-python/zipp-3.4.0
 2011291409 metadata/md5-cache/dev-python/clang-python-11.0.1.9999
 2011291409 metadata/md5-cache/dev-python/clang-python-11.0.1_rc1
-2011292039 metadata/md5-cache/dev-python/configobj-5.0.6-r1
-2011300009 metadata/md5-cache/dev-python/django-3.1.3
-2011300009 metadata/md5-cache/dev-python/kiwisolver-1.3.1
-2011291409 metadata/md5-cache/dev-python/lit-11.0.1.9999
-2011291409 metadata/md5-cache/dev-python/lit-11.0.1_rc1
-2011300009 metadata/md5-cache/dev-python/matplotlib-3.3.3
-2011292039 metadata/md5-cache/dev-python/numpy-1.19.3
-2011300009 metadata/md5-cache/dev-python/numpydoc-1.1.0
-2011291409 metadata/md5-cache/dev-python/rq-1.7.0
-2011292039 metadata/md5-cache/dev-python/rst-linker-2.1.1
-2011292309 metadata/md5-cache/dev-python/sympy-1.7
-2011300409 metadata/md5-cache/dev-python/wand-0.6.5
-2012010609 metadata/md5-cache/dev-python/Manifest.gz
-2011301139 metadata/md5-cache/dev-python/PyGithub-1.54
-2012010039 metadata/md5-cache/dev-python/async_generator-1.10
-2012010039 metadata/md5-cache/dev-python/cmd2-1.3.11
-2011301109 metadata/md5-cache/dev-python/cryptography-3.2.1
-2012010039 metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
-2011301139 metadata/md5-cache/dev-python/jsonpickle-1.4.2
-2012010039 metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
-2012010039 metadata/md5-cache/dev-python/pygame-1.9.6-r1
-2012010609 metadata/md5-cache/dev-python/pygresql-5.2.1
 2011302209 metadata/md5-cache/dev-python/pynest2d-4.8.0
-2012010039 metadata/md5-cache/dev-python/pyopengl-3.1.0-r1
-2012010039 metadata/md5-cache/dev-python/pyopengl-3.1.5
-2012010039 metadata/md5-cache/dev-python/selenium-3.141.0-r1
-2012010039 metadata/md5-cache/dev-python/setproctitle-1.1.10-r1
-2012010039 metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
-2012010039 metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1
-2012010039 metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4
-2011301139 metadata/md5-cache/dev-python/sybil-2.0.1
 2012010109 metadata/md5-cache/dev-python/thunarx-python-0.5.1-r1
-2011302209 metadata/md5-cache/dev-python/uranium-4.8.0
-2012010139 metadata/md5-cache/dev-python/xarray-0.16.2
-2011301139 metadata/md5-cache/dev-python/xcffib-0.11.1
+2012011340 metadata/md5-cache/dev-python/3to2-1.1.1-r1
+2012011340 metadata/md5-cache/dev-python/APScheduler-3.6.3
+2012011340 metadata/md5-cache/dev-python/Babel-2.8.0-r2
+2012011340 metadata/md5-cache/dev-python/Babel-2.8.1
+2012011340 metadata/md5-cache/dev-python/BitVector-3.4.9
+2012011340 metadata/md5-cache/dev-python/GitPython-3.1.11
+2012011340 metadata/md5-cache/dev-python/GridDataFormats-0.4.0-r1
+2012011340 metadata/md5-cache/dev-python/HeapDict-1.0.0
+2012031109 metadata/md5-cache/dev-python/Manifest.gz
+2012011340 metadata/md5-cache/dev-python/MechanicalSoup-0.12.0
+2012011340 metadata/md5-cache/dev-python/PyContracts-1.8.14-r1
+2012011340 metadata/md5-cache/dev-python/PyECLib-1.6.0
+2012011340 metadata/md5-cache/dev-python/PyGithub-1.53
+2012011340 metadata/md5-cache/dev-python/PyGithub-1.54
+2012011340 metadata/md5-cache/dev-python/PyICU-2.5
+2012011340 metadata/md5-cache/dev-python/PyPDF2-1.26.0
+2012011340 metadata/md5-cache/dev-python/PyRSS2Gen-1.1-r1
+2012011340 metadata/md5-cache/dev-python/PySDL2-0.9.7
+2012030109 metadata/md5-cache/dev-python/PySensors-0.0.4
+2012011340 metadata/md5-cache/dev-python/PySocks-1.7.1-r1
+2012011340 metadata/md5-cache/dev-python/PyUtilib-5.7.2
+2012011340 metadata/md5-cache/dev-python/QtPy-1.9.0-r2
+2012011340 metadata/md5-cache/dev-python/Rx-3.1.0
+2012011340 metadata/md5-cache/dev-python/SaltTesting-2018.9.21
+2012011340 metadata/md5-cache/dev-python/WSME-0.10.0
+2012011340 metadata/md5-cache/dev-python/XenAPI-2.14
+2012011340 metadata/md5-cache/dev-python/absl-py-0.10.0
+2012011340 metadata/md5-cache/dev-python/aiocontextvars-0.2.2
+2012011340 metadata/md5-cache/dev-python/aiodns-2.0.0-r1
+2012011340 metadata/md5-cache/dev-python/aiofiles-0.5.0
+2012011340 metadata/md5-cache/dev-python/aiohttp-3.6.2-r1
+2012011340 metadata/md5-cache/dev-python/aiohttp-3.7.1-r1
+2012011340 metadata/md5-cache/dev-python/aiohttp-3.7.2-r1
+2012011340 metadata/md5-cache/dev-python/aiohttp-3.7.3
+2012011340 metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1
+2012011340 metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0
+2012011340 metadata/md5-cache/dev-python/aiohttp-socks-0.5.5
+2012011340 metadata/md5-cache/dev-python/aiorpcX-0.18.4-r1
+2012011340 metadata/md5-cache/dev-python/aiosmtpd-1.2
+2012011340 metadata/md5-cache/dev-python/aiosmtpd-1.2.2
+2012011340 metadata/md5-cache/dev-python/alabaster-0.7.12
+2012011340 metadata/md5-cache/dev-python/alagitpull-0.0.23-r1
+2012011340 metadata/md5-cache/dev-python/alembic-1.4.3
+2012011340 metadata/md5-cache/dev-python/ament_package-0.9.2
+2012011340 metadata/md5-cache/dev-python/amodem-1.15.1
+2012011340 metadata/md5-cache/dev-python/aniso8601-8.0.0
+2012011340 metadata/md5-cache/dev-python/ansi-0.1.5
+2012011340 metadata/md5-cache/dev-python/ansi2html-1.5.2-r2
+2012011340 metadata/md5-cache/dev-python/ansi2html-1.6.0
+2012011340 metadata/md5-cache/dev-python/ansicolor-0.2.6-r1
+2012011340 metadata/md5-cache/dev-python/ansicolor-9999
+2012011340 metadata/md5-cache/dev-python/anyqt-0.0.8-r1
+2012011340 metadata/md5-cache/dev-python/aodhclient-1.2.0
+2012011340 metadata/md5-cache/dev-python/aodhclient-2.1.1
+2012011340 metadata/md5-cache/dev-python/apipkg-1.5-r1
+2012011340 metadata/md5-cache/dev-python/apispec-3.3.0
+2012011340 metadata/md5-cache/dev-python/appdirs-1.4.4-r1
+2012011340 metadata/md5-cache/dev-python/apsw-3.32.2_p1
+2012011340 metadata/md5-cache/dev-python/argcomplete-1.12.0-r1
+2012011340 metadata/md5-cache/dev-python/argcomplete-1.12.1-r1
+2012011340 metadata/md5-cache/dev-python/argcomplete-1.12.2
+2012011340 metadata/md5-cache/dev-python/argh-0.26.2-r2
+2012011340 metadata/md5-cache/dev-python/argon2-cffi-20.1.0
+2012011340 metadata/md5-cache/dev-python/argparse-manpage-1.4
+2012011340 metadata/md5-cache/dev-python/arpeggio-1.10.0
+2012011340 metadata/md5-cache/dev-python/arpeggio-1.9.2
+2012011340 metadata/md5-cache/dev-python/arrow-0.17.0
+2012011340 metadata/md5-cache/dev-python/asgiref-3.3.0
+2012011340 metadata/md5-cache/dev-python/asgiref-3.3.1
+2012011340 metadata/md5-cache/dev-python/asn1crypto-0.24.0
+2012011340 metadata/md5-cache/dev-python/asn1crypto-1.4.0
+2012011340 metadata/md5-cache/dev-python/asteval-0.9.18
+2012011340 metadata/md5-cache/dev-python/astor-0.8.1
+2012011340 metadata/md5-cache/dev-python/astroid-2.4.2-r1
+2012011340 metadata/md5-cache/dev-python/asttokens-2.0.4
+2012011340 metadata/md5-cache/dev-python/astunparse-1.6.3
+2012011340 metadata/md5-cache/dev-python/async_generator-1.10
+2012011340 metadata/md5-cache/dev-python/async_timeout-3.0.1
+2012011340 metadata/md5-cache/dev-python/atomicwrites-1.4.0-r1
+2012011340 metadata/md5-cache/dev-python/atpublic-1.0
+2012011340 metadata/md5-cache/dev-python/attrs-20.1.0-r1
+2012011340 metadata/md5-cache/dev-python/attrs-20.2.0-r1
+2012011340 metadata/md5-cache/dev-python/attrs-20.3.0
+2012011340 metadata/md5-cache/dev-python/audioread-2.1.8-r2
+2012011340 metadata/md5-cache/dev-python/authheaders-0.13.0
+2012011340 metadata/md5-cache/dev-python/authres-1.2.0
+2012011340 metadata/md5-cache/dev-python/autobahn-20.4.3
+2012011340 metadata/md5-cache/dev-python/autobahn-20.7.1
+2012011340 metadata/md5-cache/dev-python/automat-20.2.0
+2012011340 metadata/md5-cache/dev-python/automaton-1.12.1
+2012011340 metadata/md5-cache/dev-python/automaton-2.2.0
+2012011340 metadata/md5-cache/dev-python/autopep8-1.5.4
+2012011340 metadata/md5-cache/dev-python/autopep8-9999
+2012011340 metadata/md5-cache/dev-python/autoprop-1.0.2
+2012011340 metadata/md5-cache/dev-python/awesome-slugify-1.6.5
+2012011340 metadata/md5-cache/dev-python/aws-sam-translator-1.27.0
+2012011340 metadata/md5-cache/dev-python/aws-sam-translator-1.28.1
+2012011340 metadata/md5-cache/dev-python/aws-sam-translator-1.29.0
+2012011340 metadata/md5-cache/dev-python/aws-sam-translator-1.30.0
+2012011340 metadata/md5-cache/dev-python/aws-sam-translator-1.30.1
+2012011340 metadata/md5-cache/dev-python/aws-sam-translator-1.31.0
+2012021839 metadata/md5-cache/dev-python/aws-sam-translator-1.32.0-r1
+2012011340 metadata/md5-cache/dev-python/aws-xray-sdk-python-2.6.0
+2012011340 metadata/md5-cache/dev-python/awscli-1.18.160
+2012011340 metadata/md5-cache/dev-python/babelfish-0.5.5-r1
+2012011340 metadata/md5-cache/dev-python/babelfish-9999
+2012011340 metadata/md5-cache/dev-python/backcall-0.2.0
+2012011340 metadata/md5-cache/dev-python/backports-1.0-r1
+2012011340 metadata/md5-cache/dev-python/backports-csv-1.0.7
+2012011340 metadata/md5-cache/dev-python/backports-os-0.1.1
+2012011340 metadata/md5-cache/dev-python/backports-tempfile-1.0
+2012011340 metadata/md5-cache/dev-python/backports-weakref-1.0_p1
+2012011340 metadata/md5-cache/dev-python/bandit-1.6.2-r1
+2012011340 metadata/md5-cache/dev-python/bareos-19.2.8
+2012030109 metadata/md5-cache/dev-python/bashate-0.6.0
+2012011340 metadata/md5-cache/dev-python/basho-erlastic-2.1.1
+2012011340 metadata/md5-cache/dev-python/bcrypt-3.1.7-r2
+2012011340 metadata/md5-cache/dev-python/bcrypt-3.2.0
+2012011340 metadata/md5-cache/dev-python/beagle-0.3.0
+2012011340 metadata/md5-cache/dev-python/beautifulsoup-4.9.3
+2012011340 metadata/md5-cache/dev-python/bert-2.2.0
+2012011340 metadata/md5-cache/dev-python/betamax-0.8.1
+2012011340 metadata/md5-cache/dev-python/betamax-matchers-0.4.0
+2012011340 metadata/md5-cache/dev-python/bibtexparser-1.1.0
+2012011340 metadata/md5-cache/dev-python/billiard-3.6.0.0
+2012011340 metadata/md5-cache/dev-python/binaryornot-0.4.4-r1
+2012021209 metadata/md5-cache/dev-python/bitarray-1.6.1
+2012011340 metadata/md5-cache/dev-python/bitstring-3.1.7
+2012011340 metadata/md5-cache/dev-python/black-20.8_beta1
+2012011340 metadata/md5-cache/dev-python/bleach-3.2.1
+2012011340 metadata/md5-cache/dev-python/blessed-1.17.11
+2012011340 metadata/md5-cache/dev-python/blessed-1.17.12
+2012011340 metadata/md5-cache/dev-python/blessings-1.7-r1
+2012011340 metadata/md5-cache/dev-python/blinker-1.4-r2
+2012011340 metadata/md5-cache/dev-python/blockdiag-2.0.1
+2012011340 metadata/md5-cache/dev-python/blosc-1.9.2
+2012011340 metadata/md5-cache/dev-python/bluelet-0.2.0
+2012030109 metadata/md5-cache/dev-python/blurb-1.0.7
+2012011340 metadata/md5-cache/dev-python/booleanOperations-0.9.0-r1
+2012011340 metadata/md5-cache/dev-python/boto-2.49.0-r3
+2012011340 metadata/md5-cache/dev-python/boto3-1.15.18
+2012011340 metadata/md5-cache/dev-python/boto3-1.16.16
+2012011340 metadata/md5-cache/dev-python/boto3-1.16.20
+2012011340 metadata/md5-cache/dev-python/boto3-1.16.21
+2012011340 metadata/md5-cache/dev-python/boto3-1.16.22
+2012011340 metadata/md5-cache/dev-python/boto3-1.16.23
+2012011340 metadata/md5-cache/dev-python/boto3-1.16.24
+2012011340 metadata/md5-cache/dev-python/boto3-1.16.25
+2012011340 metadata/md5-cache/dev-python/boto3-1.16.26
+2012021239 metadata/md5-cache/dev-python/boto3-1.16.28
+2012011340 metadata/md5-cache/dev-python/boto3-1.16.9
+2012011340 metadata/md5-cache/dev-python/boto3-9999
+2012011340 metadata/md5-cache/dev-python/botocore-1.18.18
+2012011340 metadata/md5-cache/dev-python/botocore-1.19.16
+2012011340 metadata/md5-cache/dev-python/botocore-1.19.20
+2012011340 metadata/md5-cache/dev-python/botocore-1.19.21
+2012011340 metadata/md5-cache/dev-python/botocore-1.19.22
+2012011340 metadata/md5-cache/dev-python/botocore-1.19.23
+2012011340 metadata/md5-cache/dev-python/botocore-1.19.24
+2012011340 metadata/md5-cache/dev-python/botocore-1.19.25
+2012011340 metadata/md5-cache/dev-python/botocore-1.19.26
+2012021239 metadata/md5-cache/dev-python/botocore-1.19.28
+2012011340 metadata/md5-cache/dev-python/botocore-1.19.9
+2012011340 metadata/md5-cache/dev-python/botocore-9999
+2012011340 metadata/md5-cache/dev-python/bottle-0.12.18-r1
+2012011340 metadata/md5-cache/dev-python/bottle-0.12.19
+2012011340 metadata/md5-cache/dev-python/bottleneck-1.3.2
+2012011340 metadata/md5-cache/dev-python/bpython-0.20
+2012011340 metadata/md5-cache/dev-python/bpython-0.20.1
+2012011340 metadata/md5-cache/dev-python/braintree-4.4.0
+2012011340 metadata/md5-cache/dev-python/breathe-4.14.1
+2012011340 metadata/md5-cache/dev-python/breathe-4.22.1
+2012011340 metadata/md5-cache/dev-python/brotlicffi-0.8.0
+2012011340 metadata/md5-cache/dev-python/brotlipy-0.7.0-r3
+2012011340 metadata/md5-cache/dev-python/bsddb3-6.2.7
+2012011340 metadata/md5-cache/dev-python/cached-property-1.5.2
+2012030139 metadata/md5-cache/dev-python/cachelib-0.1
+2012011340 metadata/md5-cache/dev-python/cachetools-4.1.1
+2012011340 metadata/md5-cache/dev-python/cairocffi-1.1.0
+2012011340 metadata/md5-cache/dev-python/cairocffi-1.2.0
+2012011340 metadata/md5-cache/dev-python/capturer-3.0
+2012011340 metadata/md5-cache/dev-python/carbon-1.1.5
+2012011340 metadata/md5-cache/dev-python/case-1.5.3
+2012011340 metadata/md5-cache/dev-python/castellan-1.2.2
+2012011340 metadata/md5-cache/dev-python/castellan-3.6.0
+2012030139 metadata/md5-cache/dev-python/casttube-0.2.0
+2012011340 metadata/md5-cache/dev-python/catkin_pkg-0.4.23
+2012011340 metadata/md5-cache/dev-python/catkin_pkg-9999
+2012011340 metadata/md5-cache/dev-python/cbor-1.0.0-r1
+2012011340 metadata/md5-cache/dev-python/cbor2-5.1.2
+2012011340 metadata/md5-cache/dev-python/cbor2-5.2.0
+2012011340 metadata/md5-cache/dev-python/celery-4.3.0
+2012011340 metadata/md5-cache/dev-python/certifi-10001
+2012011340 metadata/md5-cache/dev-python/certifi-10001-r1
+2012011340 metadata/md5-cache/dev-python/cffi-1.14.0-r3
+2012011340 metadata/md5-cache/dev-python/cfn-python-lint-0.39.0
+2012011340 metadata/md5-cache/dev-python/cfn-python-lint-0.41.0
+2012011340 metadata/md5-cache/dev-python/cfn-python-lint-0.42.0
+2012011340 metadata/md5-cache/dev-python/cgroup-utils-0.8
+2012011340 metadata/md5-cache/dev-python/chai-1.1.2
+2012011340 metadata/md5-cache/dev-python/chainmap-1.0.3
+2012011340 metadata/md5-cache/dev-python/chameleon-3.8.1
+2012011340 metadata/md5-cache/dev-python/characteristic-14.3.0-r3
+2012011340 metadata/md5-cache/dev-python/chardet-3.0.4-r1
+2012011340 metadata/md5-cache/dev-python/chart-studio-1.1.0
+2012011340 metadata/md5-cache/dev-python/cheetah-2.4.4-r1
+2012011340 metadata/md5-cache/dev-python/cheetah3-3.2.4
+2012011340 metadata/md5-cache/dev-python/cheetah3-3.2.6
+2012011340 metadata/md5-cache/dev-python/cheroot-8.4.4
+2012011340 metadata/md5-cache/dev-python/cheroot-8.4.5
+2012011340 metadata/md5-cache/dev-python/cheroot-8.4.8
+2012011340 metadata/md5-cache/dev-python/cherrypy-18.6.0
+2012011340 metadata/md5-cache/dev-python/chump-1.6.0-r1
+2012030439 metadata/md5-cache/dev-python/citeproc-py-0.4.0-r1
+2012011340 metadata/md5-cache/dev-python/cjkwrap-2.2-r1
+2012011340 metadata/md5-cache/dev-python/cli_helpers-2.1.0
+2012011340 metadata/md5-cache/dev-python/cli_helpers-9999
+2012011340 metadata/md5-cache/dev-python/click-6.7-r2
+2012011340 metadata/md5-cache/dev-python/click-7.1.2-r1
+2012011409 metadata/md5-cache/dev-python/click-default-group-1.2.2
+2012011340 metadata/md5-cache/dev-python/click-log-0.3.2
+2012011340 metadata/md5-cache/dev-python/click-plugins-1.0.3
+2012011340 metadata/md5-cache/dev-python/click-plugins-1.1.1
+2012011340 metadata/md5-cache/dev-python/click-threading-0.4.4
+2012011340 metadata/md5-cache/dev-python/cliff-3.4.0
+2012011340 metadata/md5-cache/dev-python/cliff-3.5.0
+2012011340 metadata/md5-cache/dev-python/clint-0.5.1-r3
+2012011340 metadata/md5-cache/dev-python/cloudpickle-1.6.0
+2012011340 metadata/md5-cache/dev-python/cmd2-1.3.11
+2012011340 metadata/md5-cache/dev-python/cmd2-1.3.8
+2012011340 metadata/md5-cache/dev-python/cmd2-1.4.0
+2012011340 metadata/md5-cache/dev-python/collective-checkdocs-0.2-r1
+2012011340 metadata/md5-cache/dev-python/colorama-0.4.3-r1
+2012011340 metadata/md5-cache/dev-python/colorama-0.4.4
+2012011340 metadata/md5-cache/dev-python/colorclass-2.2.0-r1
+2012011340 metadata/md5-cache/dev-python/coloredlogs-14.0
+2012011340 metadata/md5-cache/dev-python/colorlog-3.1.4
+2012011340 metadata/md5-cache/dev-python/colorspacious-1.1.2
+2012011340 metadata/md5-cache/dev-python/commonmark-0.9.1
+2012011340 metadata/md5-cache/dev-python/configargparse-1.2.3
+2012011340 metadata/md5-cache/dev-python/configclass-0.2.0
+2012030239 metadata/md5-cache/dev-python/configobj-5.0.6-r1
+2012011340 metadata/md5-cache/dev-python/configshell-fb-1.1.28
+2012011340 metadata/md5-cache/dev-python/confuse-1.0.0
+2012011340 metadata/md5-cache/dev-python/confuse-1.4.0
+2012011340 metadata/md5-cache/dev-python/consonance-0.1.3-r1
+2012011340 metadata/md5-cache/dev-python/constantly-15.1.0-r1
+2012011340 metadata/md5-cache/dev-python/construct-2.10.56
+2012011340 metadata/md5-cache/dev-python/contextlib2-0.6.0_p1-r1
+2012011340 metadata/md5-cache/dev-python/contextvars-2.4
+2012011340 metadata/md5-cache/dev-python/cookies-2.2.1-r1
+2012030139 metadata/md5-cache/dev-python/coreapi-2.3.3-r1
+2012030139 metadata/md5-cache/dev-python/coreschema-0.0.4
+2012011340 metadata/md5-cache/dev-python/couchdb-python-1.1
+2012011340 metadata/md5-cache/dev-python/cov-core-1.15.0-r2
+2012011340 metadata/md5-cache/dev-python/coverage-4.5.4
+2012011340 metadata/md5-cache/dev-python/coverage-5.3
+2012011340 metadata/md5-cache/dev-python/cppy-1.1.0
+2012011340 metadata/md5-cache/dev-python/crcmod-1.7-r4
+2012011340 metadata/md5-cache/dev-python/croniter-0.3.30
+2012011340 metadata/md5-cache/dev-python/cryptography-3.2
+2012031039 metadata/md5-cache/dev-python/cryptography-3.2.1
+2012011340 metadata/md5-cache/dev-python/css-parser-1.0.4-r1
+2012011340 metadata/md5-cache/dev-python/cssselect-1.1.0-r1
+2012011340 metadata/md5-cache/dev-python/cssselect2-0.3.0
+2012011340 metadata/md5-cache/dev-python/cssselect2-0.4.1
+2012011340 metadata/md5-cache/dev-python/cssutils-1.0.2-r2
+2012011340 metadata/md5-cache/dev-python/csv23-0.3.2-r1
+2012030239 metadata/md5-cache/dev-python/ctypescrypto-0.5
+2012030239 metadata/md5-cache/dev-python/ctypescrypto-9999
+2012011340 metadata/md5-cache/dev-python/ctypesgen-1.0.2
+2012011340 metadata/md5-cache/dev-python/cursive-0.2.2
+2012021739 metadata/md5-cache/dev-python/cursive-0.2.2-r1
+2012011340 metadata/md5-cache/dev-python/curtsies-0.3.0-r2
+2012011340 metadata/md5-cache/dev-python/curtsies-0.3.4
+2012011340 metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
+2012011340 metadata/md5-cache/dev-python/cx_Freeze-6.1
+2012011340 metadata/md5-cache/dev-python/cycler-0.10.0-r1
+2012011340 metadata/md5-cache/dev-python/cython-0.29.15
+2012011340 metadata/md5-cache/dev-python/cython-0.29.21
+2012011340 metadata/md5-cache/dev-python/cython-0.29.21-r1
+2012011340 metadata/md5-cache/dev-python/cytoolz-0.10.0
+2012011340 metadata/md5-cache/dev-python/daemonize-2.5.0
+2012011340 metadata/md5-cache/dev-python/dask-2.30.0
+2012030209 metadata/md5-cache/dev-python/dataclasses-0.7
+2012011340 metadata/md5-cache/dev-python/dbusmock-0.19
+2012011340 metadata/md5-cache/dev-python/dbutils-1.3
+2012011340 metadata/md5-cache/dev-python/dbutils-2.0
+2012011340 metadata/md5-cache/dev-python/ddt-1.2.2
+2012011340 metadata/md5-cache/dev-python/debtcollector-2.2.0
+2012011340 metadata/md5-cache/dev-python/decorator-4.4.2-r1
+2012011340 metadata/md5-cache/dev-python/defcon-0.6.0-r1
+2012011340 metadata/md5-cache/dev-python/defusedxml-0.7.0_rc1
+2012011340 metadata/md5-cache/dev-python/denonavr-0.9.5
+2012011340 metadata/md5-cache/dev-python/denonavr-0.9.7
+2012011340 metadata/md5-cache/dev-python/deprecated-1.2.10
+2012011340 metadata/md5-cache/dev-python/deprecation-2.1.0
+2012011340 metadata/md5-cache/dev-python/dicttoxml-1.7.4-r1
+2012011340 metadata/md5-cache/dev-python/diff-cover-2.3.0
+2012011340 metadata/md5-cache/dev-python/diff-match-patch-20181111
+2012011340 metadata/md5-cache/dev-python/diff-match-patch-20200713
+2012011340 metadata/md5-cache/dev-python/dill-0.3.2
+2012011340 metadata/md5-cache/dev-python/dill-0.3.3
+2012011340 metadata/md5-cache/dev-python/discogs-client-2.2.2
+2012011340 metadata/md5-cache/dev-python/diskcache-5.0.3
+2012011340 metadata/md5-cache/dev-python/diskcache-5.1.0
+2012011340 metadata/md5-cache/dev-python/dissononce-0.34.3-r1
+2012011340 metadata/md5-cache/dev-python/distlib-0.3.1-r1
+2012011340 metadata/md5-cache/dev-python/distro-1.5.0-r1
+2012011340 metadata/md5-cache/dev-python/dj-database-url-0.5.0
+2012011340 metadata/md5-cache/dev-python/django-2.2.16
+2012011340 metadata/md5-cache/dev-python/django-2.2.17
+2012011340 metadata/md5-cache/dev-python/django-3.0.10-r1
+2012011340 metadata/md5-cache/dev-python/django-3.0.11
+2012011340 metadata/md5-cache/dev-python/django-3.1.1-r1
+2012011340 metadata/md5-cache/dev-python/django-3.1.2-r1
+2012011340 metadata/md5-cache/dev-python/django-3.1.3
+2012011340 metadata/md5-cache/dev-python/django-3.1.4
+2012011340 metadata/md5-cache/dev-python/django-allauth-0.42.0
+2012011340 metadata/md5-cache/dev-python/django-appconf-1.0.4
+2012011340 metadata/md5-cache/dev-python/django-auth-ldap-2.1.0
+2012011340 metadata/md5-cache/dev-python/django-cacheops-4.2
+2012011340 metadata/md5-cache/dev-python/django-compressor-2.4
+2012011340 metadata/md5-cache/dev-python/django-cors-headers-3.2.1
+2012011340 metadata/md5-cache/dev-python/django-debug-toolbar-3.1
+2012011340 metadata/md5-cache/dev-python/django-extensions-3.0.9
+2012011340 metadata/md5-cache/dev-python/django-filter-2.2.0
+2012011340 metadata/md5-cache/dev-python/django-gravatar2-1.4.4
+2012011340 metadata/md5-cache/dev-python/django-haystack-3.0
+2012011340 metadata/md5-cache/dev-python/django-js-asset-1.2.2
+2012011340 metadata/md5-cache/dev-python/django-mptt-0.11.0
+2012011340 metadata/md5-cache/dev-python/django-otp-1.0.2
+2012011340 metadata/md5-cache/dev-python/django-pglocks-1.0.4
+2012011340 metadata/md5-cache/dev-python/django-picklefield-3.0.1
+2012011340 metadata/md5-cache/dev-python/django-prometheus-2.0.0
+2012011340 metadata/md5-cache/dev-python/django-q-1.3.3
+2012011340 metadata/md5-cache/dev-python/django-redis-4.10.0
+2012011340 metadata/md5-cache/dev-python/django-rq-2.3.2
+2012011340 metadata/md5-cache/dev-python/django-sortedm2m-3.0.2
+2012011340 metadata/md5-cache/dev-python/django-tables2-2.2.1
+2012011340 metadata/md5-cache/dev-python/django-tagging-0.5.0
+2012011340 metadata/md5-cache/dev-python/django-taggit-1.2.0
+2012011340 metadata/md5-cache/dev-python/django-taggit-serializer-0.1.7
+2012011340 metadata/md5-cache/dev-python/django-timezone-field-4.0
+2012011340 metadata/md5-cache/dev-python/django_polymorphic-3.0.0
+2012011340 metadata/md5-cache/dev-python/djangorestframework-3.11.1
+2012011340 metadata/md5-cache/dev-python/dkimpy-1.0.5
+2012030239 metadata/md5-cache/dev-python/dns-lexicon-3.3.4
+2012011340 metadata/md5-cache/dev-python/dnspython-1.16.0-r1
+2012011340 metadata/md5-cache/dev-python/dnspython-2.0.0
+2012011340 metadata/md5-cache/dev-python/doc8-0.6.0
+2012011340 metadata/md5-cache/dev-python/docker-py-4.3.1
+2012011340 metadata/md5-cache/dev-python/docker-py-4.4.0
+2012011340 metadata/md5-cache/dev-python/docker-pycreds-0.4.0
+2012011340 metadata/md5-cache/dev-python/dockerpty-0.4.1-r1
+2012011340 metadata/md5-cache/dev-python/docopt-0.6.2-r3
+2012011340 metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
+2012011340 metadata/md5-cache/dev-python/docutils-0.16-r1
+2012011340 metadata/md5-cache/dev-python/docutils-glep-1.2
+2012011340 metadata/md5-cache/dev-python/dogpile-cache-1.0.2
+2012011340 metadata/md5-cache/dev-python/dogpile-cache-1.1.0
+2012011340 metadata/md5-cache/dev-python/dogpile-cache-1.1.1
+2012011340 metadata/md5-cache/dev-python/doit-0.33.1
+2012011340 metadata/md5-cache/dev-python/doit-py-0.5.0
+2012011340 metadata/md5-cache/dev-python/dominate-2.6.0
+2012011340 metadata/md5-cache/dev-python/doublex-1.9.2
+2012011340 metadata/md5-cache/dev-python/doublex-expects-0.7.1
+2012011340 metadata/md5-cache/dev-python/drf-yasg-1.17.1
+2012030439 metadata/md5-cache/dev-python/duecredit-0.7.0
+2012011340 metadata/md5-cache/dev-python/dugong-3.7.3
+2012011340 metadata/md5-cache/dev-python/dulwich-0.20.6
+2012011340 metadata/md5-cache/dev-python/easy-thumbnails-2.7
+2012011340 metadata/md5-cache/dev-python/easy-thumbnails-2.7.1
+2012011340 metadata/md5-cache/dev-python/easyprocess-0.3
+2012011340 metadata/md5-cache/dev-python/ebuildtester-0.1.16
+2012011340 metadata/md5-cache/dev-python/ecdsa-0.14.1-r2
+2012011340 metadata/md5-cache/dev-python/ecdsa-0.15-r1
+2012011340 metadata/md5-cache/dev-python/ecdsa-0.16.0-r1
+2012011340 metadata/md5-cache/dev-python/ecdsa-0.16.1
+2012011340 metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
+2012011340 metadata/md5-cache/dev-python/elasticsearch-curator-5.8.1-r1
+2012011340 metadata/md5-cache/dev-python/elasticsearch-py-7.7.0
+2012011340 metadata/md5-cache/dev-python/elementpath-2.0.3
+2012011340 metadata/md5-cache/dev-python/elementpath-2.0.4
+2012011340 metadata/md5-cache/dev-python/emcee-3.0.2
+2012011340 metadata/md5-cache/dev-python/emoji-0.5.4
+2012011340 metadata/md5-cache/dev-python/empy-3.3.4
+2012011340 metadata/md5-cache/dev-python/entrypoint2-0.2.1
+2012011340 metadata/md5-cache/dev-python/entrypoint2-0.2.3
+2012011340 metadata/md5-cache/dev-python/entrypoints-0.3-r2
+2012011340 metadata/md5-cache/dev-python/enzyme-0.4.1-r2
+2012011340 metadata/md5-cache/dev-python/enzyme-9999
+2012011340 metadata/md5-cache/dev-python/eradicate-2.0.0
+2012011340 metadata/md5-cache/dev-python/errorhandler-2.0.1
+2012011340 metadata/md5-cache/dev-python/et_xmlfile-1.0.1
+2012011340 metadata/md5-cache/dev-python/eventlet-0.26.1
+2012011340 metadata/md5-cache/dev-python/exam-0.10.6
+2012011340 metadata/md5-cache/dev-python/exdown-0.7.0
+2012011340 metadata/md5-cache/dev-python/execnet-1.7.1-r1
+2012011340 metadata/md5-cache/dev-python/executing-0.5.3
+2012011340 metadata/md5-cache/dev-python/expects-0.9.0
+2012012039 metadata/md5-cache/dev-python/extras-1.0.0-r1
+2012011340 metadata/md5-cache/dev-python/eyeD3-0.8.11-r1
+2012011340 metadata/md5-cache/dev-python/eyeD3-0.9.5
+2012011340 metadata/md5-cache/dev-python/fakeredis-1.4.4
+2012011340 metadata/md5-cache/dev-python/fakeredis-1.4.5
+2012011340 metadata/md5-cache/dev-python/falcon-2.0.0
+2012012039 metadata/md5-cache/dev-python/fasteners-0.15
+2012011340 metadata/md5-cache/dev-python/fastjsonschema-2.14.5
+2012011340 metadata/md5-cache/dev-python/fcl-0.0.12
+2012011340 metadata/md5-cache/dev-python/feedgenerator-1.9.1-r1
+2012011340 metadata/md5-cache/dev-python/feedparser-5.2.1
+2012011340 metadata/md5-cache/dev-python/feedparser-6.0.2
+2012011340 metadata/md5-cache/dev-python/fido2-0.7.3
+2012011340 metadata/md5-cache/dev-python/fido2-0.8.1
+2012011340 metadata/md5-cache/dev-python/fields-5.0.0-r2
+2012011340 metadata/md5-cache/dev-python/filelock-3.0.12-r1
+2012011340 metadata/md5-cache/dev-python/filetype-1.0.7
+2012011340 metadata/md5-cache/dev-python/findimports-1.5.2
+2012011340 metadata/md5-cache/dev-python/fitsio-0.9.11
+2012011340 metadata/md5-cache/dev-python/fixtures-3.0.0-r1
+2012011340 metadata/md5-cache/dev-python/flake8-3.8.1
+2012011340 metadata/md5-cache/dev-python/flake8-3.8.3-r1
+2012011340 metadata/md5-cache/dev-python/flake8-import-order-0.18
+2012011340 metadata/md5-cache/dev-python/flake8-polyfill-1.0.2
+2012011340 metadata/md5-cache/dev-python/flaky-3.7.0-r1
+2012011340 metadata/md5-cache/dev-python/flask-1.1.2-r1
+2012011340 metadata/md5-cache/dev-python/flask-9999
+2012011340 metadata/md5-cache/dev-python/flask-api-2.0
+2012011340 metadata/md5-cache/dev-python/flask-assets-0.12
+2012011340 metadata/md5-cache/dev-python/flask-babel-2.0.0
+2012011340 metadata/md5-cache/dev-python/flask-babelex-0.9.4
+2012011340 metadata/md5-cache/dev-python/flask-compress-1.8.0
+2012011340 metadata/md5-cache/dev-python/flask-cors-2.1.0
+2012030739 metadata/md5-cache/dev-python/flask-cors-3.0.9
+2012011340 metadata/md5-cache/dev-python/flask-debug-0.4.3-r1
+2012011340 metadata/md5-cache/dev-python/flask-gravatar-0.5.0
+2012011340 metadata/md5-cache/dev-python/flask-htmlmin-2.0.2
+2012011340 metadata/md5-cache/dev-python/flask-login-0.5.0
+2012011340 metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
+2012011340 metadata/md5-cache/dev-python/flask-migrate-2.5.2
+2012011340 metadata/md5-cache/dev-python/flask-mongoengine-0.9.5
+2012011340 metadata/md5-cache/dev-python/flask-mongoengine-1.0.0
+2012011340 metadata/md5-cache/dev-python/flask-nav-0.6-r2
+2012011340 metadata/md5-cache/dev-python/flask-paginate-0.7.0
+2012011340 metadata/md5-cache/dev-python/flask-paranoid-0.2.0-r1
+2012011340 metadata/md5-cache/dev-python/flask-principal-0.4.0-r1
+2012011340 metadata/md5-cache/dev-python/flask-restful-0.3.8
+2012011340 metadata/md5-cache/dev-python/flask-script-2.0.6
+2012011340 metadata/md5-cache/dev-python/flask-security-3.4.4
+2012011340 metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
+2012011340 metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4
+2012011340 metadata/md5-cache/dev-python/flask-wtf-0.14.3
+2012011340 metadata/md5-cache/dev-python/flatbuffers-1.12
+2012030439 metadata/md5-cache/dev-python/fleep-1.0.1
+2012030439 metadata/md5-cache/dev-python/fleep-9999
+2012011340 metadata/md5-cache/dev-python/flexmock-0.10.4
+2012011340 metadata/md5-cache/dev-python/flit-2.1.0
+2012011340 metadata/md5-cache/dev-python/flit_core-2.1.0
+2012011340 metadata/md5-cache/dev-python/flufl-bounce-3.0.1
+2012011340 metadata/md5-cache/dev-python/flufl-i18n-2.0.2
+2012011340 metadata/md5-cache/dev-python/flufl-lock-5.0.1
+2012011340 metadata/md5-cache/dev-python/fonttools-4.1.0
+2012011340 metadata/md5-cache/dev-python/fqdn-1.5.0
+2012011340 metadata/md5-cache/dev-python/freezegun-0.3.15-r1
+2012011340 metadata/md5-cache/dev-python/freezegun-1.0.0-r1
+2012011340 metadata/md5-cache/dev-python/frozen-flask-0.15
+2012011340 metadata/md5-cache/dev-python/frozendict-1.2
+2012011340 metadata/md5-cache/dev-python/fs-2.4.11
+2012011340 metadata/md5-cache/dev-python/fsspec-0.8.2
+2012011340 metadata/md5-cache/dev-python/fudge-1.1.1
+2012011340 metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
+2012011340 metadata/md5-cache/dev-python/funcsigs-1.0.2-r2
+2012011340 metadata/md5-cache/dev-python/funcy-1.10.1
+2012011340 metadata/md5-cache/dev-python/funcy-1.14
+2012011340 metadata/md5-cache/dev-python/fuse-python-1.0.0
+2012011340 metadata/md5-cache/dev-python/fusepy-3.0.1
+2012011340 metadata/md5-cache/dev-python/future-0.18.2-r1
+2012011340 metadata/md5-cache/dev-python/futurist-1.8.1
+2012011340 metadata/md5-cache/dev-python/futurist-2.3.0
+2012011340 metadata/md5-cache/dev-python/fuzzywuzzy-0.18.0
+2012022009 metadata/md5-cache/dev-python/gast-0.3.3-r1
+2012011340 metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5-r1
+2012011340 metadata/md5-cache/dev-python/genshi-0.7.3-r1
+2012011340 metadata/md5-cache/dev-python/genson-1.1.0
+2012011340 metadata/md5-cache/dev-python/genty-1.3.2-r1
+2012011340 metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
+2012011340 metadata/md5-cache/dev-python/gevent-20.9.0
+2012011340 metadata/md5-cache/dev-python/gevent-websocket-0.10.1
+2012011340 metadata/md5-cache/dev-python/geventhttpclient-1.4.4-r1
+2012011340 metadata/md5-cache/dev-python/git-review-1.28.0
+2012011340 metadata/md5-cache/dev-python/gitdb-4.0.5
+2012011340 metadata/md5-cache/dev-python/gitdb2-2.0.3
+2012011340 metadata/md5-cache/dev-python/github3-1.3.0
+2012011340 metadata/md5-cache/dev-python/glance_store-1.0.1
+2012021739 metadata/md5-cache/dev-python/glance_store-2.3.0
+2012011340 metadata/md5-cache/dev-python/glooey-0.3.4
+2012011340 metadata/md5-cache/dev-python/gmpy-2.0.8-r2
+2012011340 metadata/md5-cache/dev-python/google-api-core-1.17.0
+2012011340 metadata/md5-cache/dev-python/google-api-python-client-1.8.3-r1
+2012011340 metadata/md5-cache/dev-python/google-apitools-0.5.31
+2012011340 metadata/md5-cache/dev-python/google-auth-1.20.1
+2012011340 metadata/md5-cache/dev-python/google-auth-httplib2-0.0.4
+2012011340 metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1-r1
+2012011340 metadata/md5-cache/dev-python/google-pasta-0.1.1
+2012011340 metadata/md5-cache/dev-python/google-pasta-0.2.0
+2012011340 metadata/md5-cache/dev-python/google-reauth-python-0.1.0-r1
+2012011340 metadata/md5-cache/dev-python/googleapis-common-protos-1.51.0
+2012011340 metadata/md5-cache/dev-python/graphviz-0.14.2
+2012011340 metadata/md5-cache/dev-python/graphviz-0.15
+2012011340 metadata/md5-cache/dev-python/greenlet-0.4.17
+2012011340 metadata/md5-cache/dev-python/greenstalk-1.0.1
+2012011340 metadata/md5-cache/dev-python/grpcio-1.28.1
+2012011340 metadata/md5-cache/dev-python/grpcio-1.32.0-r1
+2012011340 metadata/md5-cache/dev-python/grpcio-testing-1.32.0
+2012011340 metadata/md5-cache/dev-python/grpcio-tools-1.32.0
+2012011340 metadata/md5-cache/dev-python/gsd-1.5.3-r1
+2012011340 metadata/md5-cache/dev-python/guessit-3.1.1
+2012011340 metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11-r1
+2012011340 metadata/md5-cache/dev-python/h11-0.11.0
+2012011340 metadata/md5-cache/dev-python/h5py-2.10.0-r1
+2012011340 metadata/md5-cache/dev-python/hacking-2.0.0
+2012011340 metadata/md5-cache/dev-python/hcloud-python-1.10.0
+2012011340 metadata/md5-cache/dev-python/hcloud-python-1.9.0
+2012011340 metadata/md5-cache/dev-python/helpdev-0.7.1
+2012011340 metadata/md5-cache/dev-python/hgdistver-0.25
+2012011340 metadata/md5-cache/dev-python/hiredis-1.0.1
+2012011340 metadata/md5-cache/dev-python/hiredis-1.0.1-r1
+2012011340 metadata/md5-cache/dev-python/hiredis-1.1.0
+2012011340 metadata/md5-cache/dev-python/hpack-3.0.0
+2012011340 metadata/md5-cache/dev-python/hpack-4.0.0
+2012011340 metadata/md5-cache/dev-python/html2text-2020.1.16-r1
+2012011340 metadata/md5-cache/dev-python/html5-parser-0.4.9
+2012011340 metadata/md5-cache/dev-python/html5lib-1.1
+2012011340 metadata/md5-cache/dev-python/httmock-1.2.5
+2012011340 metadata/md5-cache/dev-python/http-parser-0.9.0
+2012011340 metadata/md5-cache/dev-python/httpauth-0.3
+2012011340 metadata/md5-cache/dev-python/httpbin-0.7.0-r1
+2012021309 metadata/md5-cache/dev-python/httpbin-0.7.0-r2
+2012011340 metadata/md5-cache/dev-python/httplib2-0.18.1-r1
+2012011340 metadata/md5-cache/dev-python/httpretty-0.9.6
+2012011340 metadata/md5-cache/dev-python/httpretty-1.0.2-r1
+2012011340 metadata/md5-cache/dev-python/httpretty-1.0.3
+2012011340 metadata/md5-cache/dev-python/httpstat-1.3.0
+2012011340 metadata/md5-cache/dev-python/humanfriendly-8.2
+2012011340 metadata/md5-cache/dev-python/humanize-3.1.0
+2012011340 metadata/md5-cache/dev-python/hyper-h2-3.2.0
+2012011340 metadata/md5-cache/dev-python/hyper-h2-4.0.0
+2012011340 metadata/md5-cache/dev-python/hyperframe-5.2.0
+2012011340 metadata/md5-cache/dev-python/hyperframe-6.0.0
+2012011340 metadata/md5-cache/dev-python/hyperlink-20.0.1
+2012011340 metadata/md5-cache/dev-python/hypothesis-5.24.4
+2012011340 metadata/md5-cache/dev-python/hypothesis-5.35.4
+2012011340 metadata/md5-cache/dev-python/hypothesis-5.36.2
+2012011340 metadata/md5-cache/dev-python/hypothesis-5.37.5
+2012011340 metadata/md5-cache/dev-python/hypothesis-5.41.0
+2012011340 metadata/md5-cache/dev-python/hypothesis-5.41.1
+2012011340 metadata/md5-cache/dev-python/hypothesis-5.41.2
+2012011340 metadata/md5-cache/dev-python/hypothesis-5.41.3
+2012011340 metadata/md5-cache/dev-python/hypothesis-5.41.4
+2012011340 metadata/md5-cache/dev-python/icalendar-4.0.7
+2012011340 metadata/md5-cache/dev-python/idna-2.10-r1
+2012011340 metadata/md5-cache/dev-python/idna-ssl-1.1.0-r1
+2012011340 metadata/md5-cache/dev-python/ifaddr-0.1.6
+2012011340 metadata/md5-cache/dev-python/ifaddr-0.1.7
+2012011340 metadata/md5-cache/dev-python/ijson-3.1.1
+2012011340 metadata/md5-cache/dev-python/imageio-2.6.1
+2012011340 metadata/md5-cache/dev-python/imagesize-1.1.0
+2012011340 metadata/md5-cache/dev-python/imagesize-1.2.0
+2012011340 metadata/md5-cache/dev-python/imapclient-2.1.0
+2012011340 metadata/md5-cache/dev-python/iminuit-1.3.8
+2012011340 metadata/md5-cache/dev-python/immutables-0.14
+2012011340 metadata/md5-cache/dev-python/importlib_metadata-1.7.0-r2
+2012011340 metadata/md5-cache/dev-python/importlib_metadata-2.0.0
+2012011340 metadata/md5-cache/dev-python/importlib_metadata-3.1.0
+2012021509 metadata/md5-cache/dev-python/importlib_metadata-3.1.1
+2012011340 metadata/md5-cache/dev-python/importlib_resources-1.5.0-r2
+2012011340 metadata/md5-cache/dev-python/importlib_resources-3.3.0
+2012011340 metadata/md5-cache/dev-python/imread-0.7.3
+2012011340 metadata/md5-cache/dev-python/incremental-17.5.0
+2012011340 metadata/md5-cache/dev-python/indexed_gzip-0.8.10
+2012011340 metadata/md5-cache/dev-python/inflect-4.1.0
+2012011340 metadata/md5-cache/dev-python/inflect-5.0.2
+2012011340 metadata/md5-cache/dev-python/inflection-0.5.1
+2012011340 metadata/md5-cache/dev-python/influxdb-5.3.0-r1
+2012011340 metadata/md5-cache/dev-python/iniconfig-1.0.0
+2012011340 metadata/md5-cache/dev-python/iniparse-0.4-r2
+2012011340 metadata/md5-cache/dev-python/iniparse-0.5
+2012011340 metadata/md5-cache/dev-python/intelhex-2.3.0
+2012011340 metadata/md5-cache/dev-python/intervaltree-3.0.2
+2012011340 metadata/md5-cache/dev-python/intreehooks-1.0
+2012011340 metadata/md5-cache/dev-python/iocapture-0.1.2-r2
+2012011340 metadata/md5-cache/dev-python/ioflo-2.0.0
+2012011340 metadata/md5-cache/dev-python/ioflo-2.0.2
+2012011340 metadata/md5-cache/dev-python/ipaddr-2.2.0-r1
+2012011340 metadata/md5-cache/dev-python/ipdb-0.10.3-r1
+2012011340 metadata/md5-cache/dev-python/ipy-1.00
+2012011340 metadata/md5-cache/dev-python/ipykernel-5.3.4
+2012011340 metadata/md5-cache/dev-python/ipykernel-5.3.4-r1
+2012011340 metadata/md5-cache/dev-python/ipyparallel-6.3.0
+2012011340 metadata/md5-cache/dev-python/ipyparallel-6.3.0-r1
+2012011340 metadata/md5-cache/dev-python/ipython-7.16.1
+2012011340 metadata/md5-cache/dev-python/ipython-7.18.1
+2012011340 metadata/md5-cache/dev-python/ipython-7.19.0
+2012011340 metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r1
+2012011340 metadata/md5-cache/dev-python/ipywidgets-7.5.1
+2012011340 metadata/md5-cache/dev-python/ipywidgets-7.5.1-r1
+2012011340 metadata/md5-cache/dev-python/irc-19.0.1
+2012011340 metadata/md5-cache/dev-python/iso8601-0.1.12-r1
+2012011340 metadata/md5-cache/dev-python/isodate-0.6.0-r1
+2012011340 metadata/md5-cache/dev-python/isort-4.3.15
+2012011340 metadata/md5-cache/dev-python/isort-4.3.21_p2-r1
+2012011340 metadata/md5-cache/dev-python/isort-5.6.3
+2012011340 metadata/md5-cache/dev-python/itsdangerous-1.1.0-r1
+2012030139 metadata/md5-cache/dev-python/itypes-1.1.0
+2012011340 metadata/md5-cache/dev-python/jaraco-classes-3.1.0
+2012011340 metadata/md5-cache/dev-python/jaraco-collections-3.0.0
+2012011340 metadata/md5-cache/dev-python/jaraco-context-3.0.0
+2012011340 metadata/md5-cache/dev-python/jaraco-envs-2.0.0
+2012011340 metadata/md5-cache/dev-python/jaraco-functools-3.0.1
+2012011340 metadata/md5-cache/dev-python/jaraco-itertools-5.0.0
+2012011340 metadata/md5-cache/dev-python/jaraco-logging-3.0.0-r1
+2012011340 metadata/md5-cache/dev-python/jaraco-packaging-8.1.0-r1
+2012011340 metadata/md5-cache/dev-python/jaraco-packaging-8.1.1
+2012011340 metadata/md5-cache/dev-python/jaraco-stream-3.0.0
+2012011340 metadata/md5-cache/dev-python/jaraco-text-3.2.0
+2012011340 metadata/md5-cache/dev-python/jdcal-1.4.1
+2012011340 metadata/md5-cache/dev-python/jedi-0.17.1-r1
+2012011340 metadata/md5-cache/dev-python/jedi-0.17.2-r1
+2012011340 metadata/md5-cache/dev-python/jeepney-0.4.3
+2012011340 metadata/md5-cache/dev-python/jeepney-0.5.0
+2012011340 metadata/md5-cache/dev-python/jeepney-0.6.0
+2012011340 metadata/md5-cache/dev-python/jellyfish-0.8.2
+2012011340 metadata/md5-cache/dev-python/jikanpy-4.2.1
+2012011340 metadata/md5-cache/dev-python/jinja-2.11.2-r1
+2012011340 metadata/md5-cache/dev-python/jinja2-time-0.2.0
+2012011340 metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
+2012011340 metadata/md5-cache/dev-python/jmespath-0.10.0
+2012011340 metadata/md5-cache/dev-python/joblib-0.17.0
+2012011340 metadata/md5-cache/dev-python/josepy-1.4.0
+2012020439 metadata/md5-cache/dev-python/josepy-1.5.0
+2012011340 metadata/md5-cache/dev-python/jsmin-2.2.2
+2012011340 metadata/md5-cache/dev-python/json-rpc-1.13.0
+2012011340 metadata/md5-cache/dev-python/jsondiff-1.2.0
+2012011340 metadata/md5-cache/dev-python/jsonext-0.4.2
+2012011340 metadata/md5-cache/dev-python/jsonmerge-1.6.0
+2012011340 metadata/md5-cache/dev-python/jsonpatch-1.26
+2012011340 metadata/md5-cache/dev-python/jsonpatch-1.27
+2012021239 metadata/md5-cache/dev-python/jsonpatch-1.28
+2012011340 metadata/md5-cache/dev-python/jsonpickle-1.4.1-r2
+2012011340 metadata/md5-cache/dev-python/jsonpickle-1.4.2
+2012011340 metadata/md5-cache/dev-python/jsonpointer-2.0-r1
+2012011340 metadata/md5-cache/dev-python/jsonref-0.1
+2012011340 metadata/md5-cache/dev-python/jsonrpclib-0.4.1
+2012011340 metadata/md5-cache/dev-python/jsonrpclib-0.4.2
+2012011340 metadata/md5-cache/dev-python/jsonrpclib-9999
+2012011340 metadata/md5-cache/dev-python/jsonschema-3.2.0
+2012011340 metadata/md5-cache/dev-python/jsonxs-0.6
+2012011340 metadata/md5-cache/dev-python/junit-xml-1.9
+2012011340 metadata/md5-cache/dev-python/jupyter-1.0.0-r3
+2012011340 metadata/md5-cache/dev-python/jupyter_client-6.1.6-r1
+2012011340 metadata/md5-cache/dev-python/jupyter_client-6.1.6-r2
+2012011340 metadata/md5-cache/dev-python/jupyter_console-6.1.0-r2
+2012011340 metadata/md5-cache/dev-python/jupyter_core-4.6.3
+2012011340 metadata/md5-cache/dev-python/jupyter_core-4.6.3-r1
+2012011340 metadata/md5-cache/dev-python/jupyterlab_pygments-0.1.2
+2012011340 metadata/md5-cache/dev-python/jwcrypto-0.8.0
+2012011340 metadata/md5-cache/dev-python/kafka-python-1.4.7
+2012011340 metadata/md5-cache/dev-python/kaitaistruct-0.8
+2012011340 metadata/md5-cache/dev-python/kaitaistruct-0.9
+2012011340 metadata/md5-cache/dev-python/kaptan-0.5.12-r1
+2012011340 metadata/md5-cache/dev-python/kazoo-2.8.0
+2012011340 metadata/md5-cache/dev-python/kconfiglib-14.1.0
+2012011340 metadata/md5-cache/dev-python/keep-2.10
+2012011340 metadata/md5-cache/dev-python/keep-2.9
+2012011340 metadata/md5-cache/dev-python/keyring-21.4.0
+2012011340 metadata/md5-cache/dev-python/keyring-21.5.0
+2012011340 metadata/md5-cache/dev-python/keystoneauth-4.2.1
+2012011340 metadata/md5-cache/dev-python/keystonemiddleware-9.1.0
+2012011340 metadata/md5-cache/dev-python/kiwisolver-1.3.0
+2012011340 metadata/md5-cache/dev-python/kiwisolver-1.3.1
+2012011340 metadata/md5-cache/dev-python/klein-20.6.0
+2012021139 metadata/md5-cache/dev-python/kombu-5.0.1
+2012011340 metadata/md5-cache/dev-python/lark-parser-0.7.8
+2012011340 metadata/md5-cache/dev-python/latexcodec-2.0.0
+2012011340 metadata/md5-cache/dev-python/lazr-config-2.2.2
+2012011340 metadata/md5-cache/dev-python/lazr-delegates-2.0.4
+2012011340 metadata/md5-cache/dev-python/lazy-object-proxy-1.5.0
+2012011340 metadata/md5-cache/dev-python/lcdproc-0.03_p20150508
+2012011340 metadata/md5-cache/dev-python/ldap3-2.7
+2012011340 metadata/md5-cache/dev-python/ldap3-2.8.1
+2012011340 metadata/md5-cache/dev-python/ldappool-2.4.1
+2012011340 metadata/md5-cache/dev-python/lesscpy-0.14.0
+2012011340 metadata/md5-cache/dev-python/libarchive-c-2.9
+2012011340 metadata/md5-cache/dev-python/libcloud-3.1.0
+2012011340 metadata/md5-cache/dev-python/liblarch-3.0.1
+2012011340 metadata/md5-cache/dev-python/libnacl-1.6.1
+2012011340 metadata/md5-cache/dev-python/libnacl-1.7.2
+2012011340 metadata/md5-cache/dev-python/libpillowfight-0.3.0
+2012011340 metadata/md5-cache/dev-python/libpy_simdjson-0.4.0
+2012011340 metadata/md5-cache/dev-python/libsass-0.20.0
+2012011340 metadata/md5-cache/dev-python/libsass-0.20.1
+2012011340 metadata/md5-cache/dev-python/libtmux-0.8.3
+2012011340 metadata/md5-cache/dev-python/libtmux-0.8.5
+2012011340 metadata/md5-cache/dev-python/libvirt-python-6.7.0
+2012011340 metadata/md5-cache/dev-python/libvirt-python-6.8.0
+2012011340 metadata/md5-cache/dev-python/libvirt-python-6.9.0
+2012011340 metadata/md5-cache/dev-python/libvirt-python-9999
+2012011340 metadata/md5-cache/dev-python/line_profiler-3.0.2
+2012011340 metadata/md5-cache/dev-python/linecache2-1.0.0-r1
+2012011340 metadata/md5-cache/dev-python/lit-10.0.1
+2012011340 metadata/md5-cache/dev-python/lit-11.0.0
+2012011340 metadata/md5-cache/dev-python/lit-11.0.1.9999
+2012011340 metadata/md5-cache/dev-python/lit-11.0.1_rc1
+2012011340 metadata/md5-cache/dev-python/lit-12.0.0.9999
+2012011340 metadata/md5-cache/dev-python/lit-9.0.1
+2012011340 metadata/md5-cache/dev-python/livereload-2.6.1
+2012011340 metadata/md5-cache/dev-python/llfuse-1.3.6
+2012011340 metadata/md5-cache/dev-python/llvmlite-0.34.0
+2012011340 metadata/md5-cache/dev-python/llvmlite-0.35.0
+2012011340 metadata/md5-cache/dev-python/lmdb-1.0.0
+2012011340 metadata/md5-cache/dev-python/lmfit-1.0.1
+2012011340 metadata/md5-cache/dev-python/locket-0.2.0-r1
+2012011340 metadata/md5-cache/dev-python/lockfile-0.12.2-r2
+2012011340 metadata/md5-cache/dev-python/logbook-1.5.3
+2012011340 metadata/md5-cache/dev-python/logfury-0.1.2-r1
+2012011340 metadata/md5-cache/dev-python/loguru-0.5.3
+2012011340 metadata/md5-cache/dev-python/logutils-0.3.5
+2012011340 metadata/md5-cache/dev-python/loky-2.9.0
+2012011340 metadata/md5-cache/dev-python/lunr-0.5.6
+2012011340 metadata/md5-cache/dev-python/lxml-4.6.1
+2012030209 metadata/md5-cache/dev-python/lxml-4.6.2
+2012011340 metadata/md5-cache/dev-python/lz4-3.0.2
+2012011340 metadata/md5-cache/dev-python/lz4-3.1.1
+2012011340 metadata/md5-cache/dev-python/m2crypto-0.35.2-r1
+2012011340 metadata/md5-cache/dev-python/m2crypto-0.36.0-r1
+2012011340 metadata/md5-cache/dev-python/m2r-0.2.1
+2012011340 metadata/md5-cache/dev-python/mako-1.1.3-r1
+2012011340 metadata/md5-cache/dev-python/mamba-0.11.1
+2012011340 metadata/md5-cache/dev-python/mando-0.6.4
+2012011340 metadata/md5-cache/dev-python/manuel-1.9.0
+2012011340 metadata/md5-cache/dev-python/markdown-2.6.11
+2012011340 metadata/md5-cache/dev-python/markdown-3.3.3
+2012011340 metadata/md5-cache/dev-python/markdown2-2.3.10
+2012011340 metadata/md5-cache/dev-python/markdown2-2.3.9
+2012011340 metadata/md5-cache/dev-python/markups-3.0.0-r1
+2012011340 metadata/md5-cache/dev-python/markupsafe-1.1.1-r1
+2012011340 metadata/md5-cache/dev-python/marshmallow-3.5.1
+2012011340 metadata/md5-cache/dev-python/matplotlib-3.2.2-r2
+2012011340 metadata/md5-cache/dev-python/matplotlib-3.3.0-r1
+2012011340 metadata/md5-cache/dev-python/matplotlib-3.3.2
+2012011340 metadata/md5-cache/dev-python/matplotlib-3.3.3
+2012011340 metadata/md5-cache/dev-python/matterhook-0.2
+2012011340 metadata/md5-cache/dev-python/mccabe-0.6.1-r1
+2012011340 metadata/md5-cache/dev-python/mccabe-0.6.1-r2
+2012011340 metadata/md5-cache/dev-python/mdx_gh_links-0.2
+2012011340 metadata/md5-cache/dev-python/mecab-python-0.996
+2012011340 metadata/md5-cache/dev-python/mechanize-0.4.5
+2012031109 metadata/md5-cache/dev-python/mediafile-0.6.0
+2012011340 metadata/md5-cache/dev-python/memory_profiler-0.57
+2012011340 metadata/md5-cache/dev-python/mergedict-1.0.0
+2012011340 metadata/md5-cache/dev-python/metakernel-0.25.0-r1
+2012011340 metadata/md5-cache/dev-python/micawber-0.5.1
+2012011340 metadata/md5-cache/dev-python/microversion-parse-1.0.1
+2012011340 metadata/md5-cache/dev-python/mimerender-0.6.0
+2012011340 metadata/md5-cache/dev-python/minidb-2.0.4
+2012011340 metadata/md5-cache/dev-python/minimock-1.2.8-r1
+2012011340 metadata/md5-cache/dev-python/miniupnpc-2.1.20201016
+2012011340 metadata/md5-cache/dev-python/miniupnpc-2.2.0
+2012011340 metadata/md5-cache/dev-python/misaka-2.1.1
+2012011340 metadata/md5-cache/dev-python/mistune-0.8.4-r1
+2012011340 metadata/md5-cache/dev-python/mkautodoc-0.1.0
+2012011340 metadata/md5-cache/dev-python/mkdocs-1.1
+2012011340 metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1
+2012011340 metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1
+2012011340 metadata/md5-cache/dev-python/mmtf-python-1.1.2-r1
+2012011340 metadata/md5-cache/dev-python/mock-3.0.5-r2
+2012011340 metadata/md5-cache/dev-python/mongoengine-0.20.0
+2012011340 metadata/md5-cache/dev-python/mongoengine-0.21.0
+2012011340 metadata/md5-cache/dev-python/mongomock-3.21.0
+2012011340 metadata/md5-cache/dev-python/monotonic-1.5-r1
+2012011340 metadata/md5-cache/dev-python/more-itertools-8.5.0
+2012011340 metadata/md5-cache/dev-python/more-itertools-8.6.0
+2012011340 metadata/md5-cache/dev-python/moto-1.3.14-r3
+2012011340 metadata/md5-cache/dev-python/moto-1.3.16-r1
+2012011340 metadata/md5-cache/dev-python/moviepy-1.0.1-r1
+2012011340 metadata/md5-cache/dev-python/mox3-0.24.0
+2012011340 metadata/md5-cache/dev-python/mpdlcd-0.5.2
+2012011340 metadata/md5-cache/dev-python/mpi4py-3.0.3
+2012011340 metadata/md5-cache/dev-python/mpmath-1.1.0
+2012011340 metadata/md5-cache/dev-python/msgpack-0.6.2
+2012011340 metadata/md5-cache/dev-python/msgpack-1.0.0
+2012011340 metadata/md5-cache/dev-python/mss-6.0.0
+2012011340 metadata/md5-cache/dev-python/multidict-5.0.0
+2012011340 metadata/md5-cache/dev-python/munch-2.5.0-r1
+2012011340 metadata/md5-cache/dev-python/munkres-1.1.2
+2012011340 metadata/md5-cache/dev-python/mygpoclient-1.8
+2012011340 metadata/md5-cache/dev-python/mypy-0.782
+2012011340 metadata/md5-cache/dev-python/mypy-0.790
+2012011340 metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
+2012011340 metadata/md5-cache/dev-python/mysql-connector-python-8.0.22
+2012011340 metadata/md5-cache/dev-python/mysqlclient-1.4.6-r1
+2012011340 metadata/md5-cache/dev-python/nagiosplugin-1.3.2-r1
+2012011340 metadata/md5-cache/dev-python/natsort-7.0.1
+2012011340 metadata/md5-cache/dev-python/nbclient-0.5.1
+2012011340 metadata/md5-cache/dev-python/nbconvert-5.6.1
+2012011340 metadata/md5-cache/dev-python/nbconvert-6.0.7
+2012011340 metadata/md5-cache/dev-python/nbdime-2.0.0-r1
+2012011340 metadata/md5-cache/dev-python/nbformat-5.0.7
+2012011340 metadata/md5-cache/dev-python/nbformat-5.0.8
+2012011340 metadata/md5-cache/dev-python/nbsphinx-0.7.1-r1
+2012011340 metadata/md5-cache/dev-python/nbval-0.9.1-r1
+2012011340 metadata/md5-cache/dev-python/ndg-httpsclient-0.4.0
+2012011340 metadata/md5-cache/dev-python/ndg-httpsclient-0.4.2-r1
+2012011340 metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
+2012011340 metadata/md5-cache/dev-python/neovim-remote-2.4.0
+2012011340 metadata/md5-cache/dev-python/neovim-remote-9999
+2012011340 metadata/md5-cache/dev-python/nest_asyncio-1.4.2
+2012011340 metadata/md5-cache/dev-python/nest_asyncio-1.4.3
+2012011340 metadata/md5-cache/dev-python/netaddr-0.8.0
+2012011340 metadata/md5-cache/dev-python/netcdf4-python-1.2.2-r1
+2012011340 metadata/md5-cache/dev-python/netifaces-0.10.9
+2012011340 metadata/md5-cache/dev-python/networkx-2.5
+2012021209 metadata/md5-cache/dev-python/neutron-lib-2.6.1
+2012011340 metadata/md5-cache/dev-python/nltk-3.5
+2012011340 metadata/md5-cache/dev-python/nnpy-1.4.2
+2012011340 metadata/md5-cache/dev-python/node-semver-0.8.0
+2012011340 metadata/md5-cache/dev-python/nodeenv-1.3.5
+2012011340 metadata/md5-cache/dev-python/nose-1.3.7-r6
+2012011340 metadata/md5-cache/dev-python/nose-1.3.7-r7
+2012011340 metadata/md5-cache/dev-python/nose-cover3-0.1.0-r1
+2012011340 metadata/md5-cache/dev-python/nose-exclude-0.5.0-r1
+2012011340 metadata/md5-cache/dev-python/nose-parameterized-0.5.0
+2012011340 metadata/md5-cache/dev-python/nose-random-1.0.0
+2012011340 metadata/md5-cache/dev-python/nose-show-skipped-0.1
+2012011340 metadata/md5-cache/dev-python/nose2-0.9.1-r1
+2012030239 metadata/md5-cache/dev-python/nose2-0.9.2
+2012011340 metadata/md5-cache/dev-python/nose_fixes-1.3
+2012011340 metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r3
+2012011340 metadata/md5-cache/dev-python/nosexcover-1.0.11-r1
+2012011340 metadata/md5-cache/dev-python/notebook-6.1.3
+2012011340 metadata/md5-cache/dev-python/notebook-6.1.4
+2012011340 metadata/md5-cache/dev-python/notebook-6.1.5
+2012011340 metadata/md5-cache/dev-python/notify2-0.3.1-r2
+2012011340 metadata/md5-cache/dev-python/nototools-0_pre20200207
+2012011340 metadata/md5-cache/dev-python/ntlm-auth-1.5.0
+2012011340 metadata/md5-cache/dev-python/ntplib-0.3.3
+2012011340 metadata/md5-cache/dev-python/nuitka-0.6.9.1
+2012011340 metadata/md5-cache/dev-python/nuitka-0.6.9.6
+2012011340 metadata/md5-cache/dev-python/numexpr-2.7.2
+2012011340 metadata/md5-cache/dev-python/numpy-1.19.0
+2012011340 metadata/md5-cache/dev-python/numpy-1.19.1
+2012011340 metadata/md5-cache/dev-python/numpy-1.19.2
+2012031009 metadata/md5-cache/dev-python/numpy-1.19.3
+2012011340 metadata/md5-cache/dev-python/numpy-1.19.4
+2012011340 metadata/md5-cache/dev-python/numpy-python2-1.16.6
+2012011340 metadata/md5-cache/dev-python/numpydoc-0.9.1
+2012011340 metadata/md5-cache/dev-python/numpydoc-1.1.0
+2012011340 metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
+2012011340 metadata/md5-cache/dev-python/oauth2client-4.1.3-r1
+2012011340 metadata/md5-cache/dev-python/oauthlib-3.1.0
+2012011340 metadata/md5-cache/dev-python/objgraph-3.5.0
+2012011340 metadata/md5-cache/dev-python/oct2py-5.2.0-r1
+2012011340 metadata/md5-cache/dev-python/octave_kernel-0.32.0-r1
+2012011340 metadata/md5-cache/dev-python/odfpy-1.3.6
+2012011340 metadata/md5-cache/dev-python/olefile-0.46-r1
+2012011340 metadata/md5-cache/dev-python/onkyo-eiscp-1.2.7
+2012011340 metadata/md5-cache/dev-python/openpyxl-3.0.5
+2012011340 metadata/md5-cache/dev-python/openstackdocstheme-2.2.5
+2012011340 metadata/md5-cache/dev-python/openstacksdk-0.50.0
+2012011340 metadata/md5-cache/dev-python/opt-einsum-3.0.1-r1
+2012011340 metadata/md5-cache/dev-python/opt-einsum-3.3.0
+2012011340 metadata/md5-cache/dev-python/ordered-set-4.0.1
+2012011340 metadata/md5-cache/dev-python/ordered-set-4.0.2
+2012011340 metadata/md5-cache/dev-python/os-brick-2.8.2
+2012011340 metadata/md5-cache/dev-python/os-brick-3.0.1
+2012011340 metadata/md5-cache/dev-python/os-brick-4.0.1
+2012011340 metadata/md5-cache/dev-python/os-client-config-2.1.0
+2012011340 metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-0.1.3
+2012011340 metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-9999
+2012011340 metadata/md5-cache/dev-python/os-ken-1.2.0
+2012011340 metadata/md5-cache/dev-python/os-resource-classes-1.0.0
+2012011340 metadata/md5-cache/dev-python/os-service-types-1.7.0
+2012011340 metadata/md5-cache/dev-python/os-testr-2.0.0
+2012011340 metadata/md5-cache/dev-python/os-traits-2.4.0
+2012021209 metadata/md5-cache/dev-python/os-vif-2.2.0
+2012011340 metadata/md5-cache/dev-python/os-win-4.2.0
+2012011340 metadata/md5-cache/dev-python/os-win-5.1.0
+2012011340 metadata/md5-cache/dev-python/os-xenapi-0.3.4-r1
+2012011340 metadata/md5-cache/dev-python/osc-lib-2.2.1
+2012011340 metadata/md5-cache/dev-python/oslo-cache-2.6.1
+2012011340 metadata/md5-cache/dev-python/oslo-concurrency-4.3.1
+2012011340 metadata/md5-cache/dev-python/oslo-config-8.3.2
+2012011340 metadata/md5-cache/dev-python/oslo-config-8.3.3
+2012011340 metadata/md5-cache/dev-python/oslo-context-3.1.1
+2012011340 metadata/md5-cache/dev-python/oslo-db-8.4.0
+2012011340 metadata/md5-cache/dev-python/oslo-i18n-5.0.1
+2012011340 metadata/md5-cache/dev-python/oslo-log-4.4.0
+2012021209 metadata/md5-cache/dev-python/oslo-messaging-12.5.1
+2012011340 metadata/md5-cache/dev-python/oslo-middleware-4.0.2
+2012011340 metadata/md5-cache/dev-python/oslo-middleware-4.1.1
+2012011340 metadata/md5-cache/dev-python/oslo-policy-3.5.0
+2012011340 metadata/md5-cache/dev-python/oslo-privsep-1.33.3
+2012011340 metadata/md5-cache/dev-python/oslo-privsep-2.4.0
+2012011340 metadata/md5-cache/dev-python/oslo-reports-2.2.0
+2012011340 metadata/md5-cache/dev-python/oslo-rootwrap-5.15.2
+2012011340 metadata/md5-cache/dev-python/oslo-rootwrap-6.2.0
+2012011340 metadata/md5-cache/dev-python/oslo-serialization-4.0.1
+2012011340 metadata/md5-cache/dev-python/oslo-service-2.1.1
+2012011340 metadata/md5-cache/dev-python/oslo-service-2.4.0
+2012011340 metadata/md5-cache/dev-python/oslo-sphinx-4.18.0
+2012011340 metadata/md5-cache/dev-python/oslo-upgradecheck-1.1.1
+2012011340 metadata/md5-cache/dev-python/oslo-utils-4.6.0
+2012021209 metadata/md5-cache/dev-python/oslo-versionedobjects-2.3.0
+2012011340 metadata/md5-cache/dev-python/oslo-vmware-2.32.2
+2012011340 metadata/md5-cache/dev-python/oslo-vmware-3.7.0
+2012011340 metadata/md5-cache/dev-python/oslotest-4.4.1
+2012011340 metadata/md5-cache/dev-python/osprofiler-3.4.0
+2012011340 metadata/md5-cache/dev-python/osrf_pycommon-0.1.10-r1
+2012011340 metadata/md5-cache/dev-python/ovs-2.13.0
+2012011340 metadata/md5-cache/dev-python/ovsdbapp-0.17.2
+2012011340 metadata/md5-cache/dev-python/ovsdbapp-1.5.0
+2012011340 metadata/md5-cache/dev-python/owslib-0.20.0
+2012011340 metadata/md5-cache/dev-python/packaging-20.4-r1
+2012011340 metadata/md5-cache/dev-python/packaging-20.5
+2012011340 metadata/md5-cache/dev-python/packaging-20.7
+2012011340 metadata/md5-cache/dev-python/pafy-0.5.5
+2012011340 metadata/md5-cache/dev-python/pafy-9999
+2012011340 metadata/md5-cache/dev-python/paho-mqtt-1.5.0
+2012011340 metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
+2012011340 metadata/md5-cache/dev-python/pandas-1.1.2-r1
+2012011340 metadata/md5-cache/dev-python/pandas-1.1.4-r1
+2012011340 metadata/md5-cache/dev-python/pandas-datareader-0.8.1
+2012011340 metadata/md5-cache/dev-python/pandocfilters-1.4.3
+2012011340 metadata/md5-cache/dev-python/parameterized-0.7.4
+2012011340 metadata/md5-cache/dev-python/parametrized-0.1
+2012011340 metadata/md5-cache/dev-python/paramiko-2.7.1
+2012011340 metadata/md5-cache/dev-python/paramiko-2.7.2
+2012011340 metadata/md5-cache/dev-python/parsedatetime-2.6
+2012011340 metadata/md5-cache/dev-python/parso-0.7.0-r1
+2012011340 metadata/md5-cache/dev-python/parso-0.7.1-r1
+2012011340 metadata/md5-cache/dev-python/parso-0.8.0
+2012011340 metadata/md5-cache/dev-python/partd-1.1.0
+2012011340 metadata/md5-cache/dev-python/parver-0.3.1
+2012011340 metadata/md5-cache/dev-python/passlib-1.7.4
+2012011340 metadata/md5-cache/dev-python/paste-3.5.0
+2012011340 metadata/md5-cache/dev-python/pastedeploy-2.1.1
+2012011340 metadata/md5-cache/dev-python/patch-ng-1.17.4
+2012011340 metadata/md5-cache/dev-python/path-and-address-2.0.1
+2012011340 metadata/md5-cache/dev-python/path-py-15.0.0
+2012011340 metadata/md5-cache/dev-python/pathlib2-2.3.5-r1
+2012011340 metadata/md5-cache/dev-python/pathspec-0.8.0
+2012011340 metadata/md5-cache/dev-python/pathtools-0.1.2-r3
+2012011340 metadata/md5-cache/dev-python/patsy-0.5.1
+2012011340 metadata/md5-cache/dev-python/pbkdf2-1.3-r1
+2012011340 metadata/md5-cache/dev-python/pbr-5.5.1
+2012011340 metadata/md5-cache/dev-python/pdfrw-0.4
+2012011340 metadata/md5-cache/dev-python/pebble-4.5.3
+2012011340 metadata/md5-cache/dev-python/pecan-1.3.3-r2
+2012011340 metadata/md5-cache/dev-python/peewee-3.13.2
+2012011340 metadata/md5-cache/dev-python/pelican-minify-0.9
+2012011340 metadata/md5-cache/dev-python/pep8-1.7.1
+2012011340 metadata/md5-cache/dev-python/pew-1.1.1
+2012011340 metadata/md5-cache/dev-python/pexpect-4.8.0-r1
+2012011340 metadata/md5-cache/dev-python/pgspecial-1.11.10
+2012011340 metadata/md5-cache/dev-python/phonenumbers-8.12.11
+2012011340 metadata/md5-cache/dev-python/phonenumbers-8.12.12
+2012011340 metadata/md5-cache/dev-python/phonenumbers-8.12.13
+2012011340 metadata/md5-cache/dev-python/pickleshare-0.7.5
+2012011340 metadata/md5-cache/dev-python/pid-2.2.5
+2012011340 metadata/md5-cache/dev-python/pid-3.0.4
+2012011340 metadata/md5-cache/dev-python/piexif-1.1.3
+2012011340 metadata/md5-cache/dev-python/pika-1.1.0
+2012011340 metadata/md5-cache/dev-python/pikepdf-1.18.0
+2012011409 metadata/md5-cache/dev-python/pikepdf-2.2.0
+2012011340 metadata/md5-cache/dev-python/pilkit-2.0
+2012011340 metadata/md5-cache/dev-python/pillow-7.0.0
+2012011340 metadata/md5-cache/dev-python/pillow-7.2.0
+2012030209 metadata/md5-cache/dev-python/pillow-8.0.1
+2012011340 metadata/md5-cache/dev-python/pip-20.2.4
+2012011340 metadata/md5-cache/dev-python/pipenv-2020.11.4
+2012011340 metadata/md5-cache/dev-python/pipenv-2020.8.13
+2012011340 metadata/md5-cache/dev-python/pipfile-0.0.2
+2012011340 metadata/md5-cache/dev-python/pkgconfig-1.5.1
+2012011340 metadata/md5-cache/dev-python/pkginfo-1.5.0.1-r1
+2012011340 metadata/md5-cache/dev-python/plotly-1.9.6
+2012011340 metadata/md5-cache/dev-python/plotly-4.10.0
+2012011340 metadata/md5-cache/dev-python/plotly-geo-1.0.0
+2012011340 metadata/md5-cache/dev-python/pluggy-0.13.1-r1
+2012011340 metadata/md5-cache/dev-python/pluginbase-1.0.0
+2012011340 metadata/md5-cache/dev-python/plumbum-1.6.8
+2012011340 metadata/md5-cache/dev-python/plumbum-1.6.9
+2012011340 metadata/md5-cache/dev-python/ply-3.11-r1
+2012011340 metadata/md5-cache/dev-python/plyr-1.0.6
+2012011340 metadata/md5-cache/dev-python/plyvel-1.3.0
+2012011340 metadata/md5-cache/dev-python/pmw-2.0.1-r2
+2012011340 metadata/md5-cache/dev-python/pocketlint-0.20
+2012011340 metadata/md5-cache/dev-python/pockets-0.9.1
+2012011340 metadata/md5-cache/dev-python/podcastparser-0.6.5
+2012011340 metadata/md5-cache/dev-python/polib-1.1.0-r1
+2012011340 metadata/md5-cache/dev-python/polygon-3.0.7
+2012011340 metadata/md5-cache/dev-python/pony-0.7.13
+2012011340 metadata/md5-cache/dev-python/pony-0.7.14
+2012011340 metadata/md5-cache/dev-python/pooch-1.2.0
+2012011340 metadata/md5-cache/dev-python/portend-2.6
+2012011340 metadata/md5-cache/dev-python/portend-2.7.0
+2012011340 metadata/md5-cache/dev-python/poyo-0.5.0
+2012011340 metadata/md5-cache/dev-python/precis-i18n-1.0.2
+2012011340 metadata/md5-cache/dev-python/pretend-1.0.9-r1
+2012011340 metadata/md5-cache/dev-python/pretty-yaml-20.4.0
+2012011340 metadata/md5-cache/dev-python/prettytable-0.7.2-r1
+2012011340 metadata/md5-cache/dev-python/prettytable-2.0.0
+2012011340 metadata/md5-cache/dev-python/priority-1.3.0
+2012011340 metadata/md5-cache/dev-python/process-tests-2.1.1
+2012011340 metadata/md5-cache/dev-python/progress-1.5
+2012011340 metadata/md5-cache/dev-python/progressbar-2.5
+2012011340 metadata/md5-cache/dev-python/progressbar2-3.39.3
+2012011340 metadata/md5-cache/dev-python/prometheus_client-0.8.0
+2012011340 metadata/md5-cache/dev-python/prometheus_client-0.9.0
+2012011340 metadata/md5-cache/dev-python/prompt_toolkit-2.0.10-r1
+2012011340 metadata/md5-cache/dev-python/prompt_toolkit-3.0.7
+2012011340 metadata/md5-cache/dev-python/protobuf-python-3.12.2-r1
+2012011340 metadata/md5-cache/dev-python/protobuf-python-3.12.4-r1
+2012011340 metadata/md5-cache/dev-python/protobuf-python-3.13.0-r1
+2012011340 metadata/md5-cache/dev-python/protobuf-python-3.14.0
+2012011340 metadata/md5-cache/dev-python/protobuf-python-9999
+2012011340 metadata/md5-cache/dev-python/prov-1.5.3
+2012011340 metadata/md5-cache/dev-python/pslab-python-1.0.1-r1
+2012011340 metadata/md5-cache/dev-python/psutil-5.7.0-r1
+2012011340 metadata/md5-cache/dev-python/psutil-5.7.2-r1
+2012011340 metadata/md5-cache/dev-python/psutil-5.7.3
+2012011340 metadata/md5-cache/dev-python/psycopg-2.8.5-r1
+2012011340 metadata/md5-cache/dev-python/psycopg-2.8.6-r1
+2012011340 metadata/md5-cache/dev-python/ptpython-2.0.6
+2012011340 metadata/md5-cache/dev-python/ptvsd-4.3.2
+2012011340 metadata/md5-cache/dev-python/ptyprocess-0.6.0-r1
+2012011340 metadata/md5-cache/dev-python/publicsuffix-2.20191221
+2012011340 metadata/md5-cache/dev-python/pudb-2019.2
+2012011340 metadata/md5-cache/dev-python/pure-sasl-0.6.1
+2012011340 metadata/md5-cache/dev-python/pushbullet-py-0.12.0
+2012011340 metadata/md5-cache/dev-python/pweave-0.30.3-r1
+2012011340 metadata/md5-cache/dev-python/py-1.9.0-r1
+2012021139 metadata/md5-cache/dev-python/py-amqp-2.6.1
+2012011340 metadata/md5-cache/dev-python/py-cpuinfo-6.0.0
+2012011340 metadata/md5-cache/dev-python/py-cpuinfo-7.0.0
+2012011340 metadata/md5-cache/dev-python/py-gfm-0.1.4
+2012011340 metadata/md5-cache/dev-python/py-ubjson-0.16.1
+2012011340 metadata/md5-cache/dev-python/pyClamd-0.4.0-r2
+2012011340 metadata/md5-cache/dev-python/pyFFTW-0.11.1
+2012011340 metadata/md5-cache/dev-python/pyFFTW-9999
+2012011340 metadata/md5-cache/dev-python/pyGPG-0.2
+2012011340 metadata/md5-cache/dev-python/pyGPG-9999
+2012011340 metadata/md5-cache/dev-python/pyTenable-1.1.3
+2012011340 metadata/md5-cache/dev-python/pyacoustid-1.2.0
+2012011340 metadata/md5-cache/dev-python/pyaes-1.6.1-r2
+2012030239 metadata/md5-cache/dev-python/pyalsa-1.1.6-r1
+2012011340 metadata/md5-cache/dev-python/pyamg-3.2.1-r1
+2012011340 metadata/md5-cache/dev-python/pyasn1-0.4.8-r1
+2012011340 metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r1
+2012011340 metadata/md5-cache/dev-python/pyaudio-0.2.11-r1
+2012011340 metadata/md5-cache/dev-python/pybind11-2.5.0
+2012011340 metadata/md5-cache/dev-python/pybind11-2.6.0
+2012011340 metadata/md5-cache/dev-python/pybind11-2.6.1
+2012011340 metadata/md5-cache/dev-python/pybluez-0.23
+2012011340 metadata/md5-cache/dev-python/pybtex-0.22.2
+2012011340 metadata/md5-cache/dev-python/pycadf-2.9.0-r1
+2012011340 metadata/md5-cache/dev-python/pycadf-3.1.1
+2012011340 metadata/md5-cache/dev-python/pycairo-1.20.0
+2012011340 metadata/md5-cache/dev-python/pycapnp-0.6.4
+2012011340 metadata/md5-cache/dev-python/pycares-3.1.1
+2012011340 metadata/md5-cache/dev-python/pycdio-2.1.0
+2012011340 metadata/md5-cache/dev-python/pychm-0.8.6
+2012011340 metadata/md5-cache/dev-python/pychromecast-4.1.0
+2012011340 metadata/md5-cache/dev-python/pychroot-0.10.2
+2012011340 metadata/md5-cache/dev-python/pychroot-9999
+2012011340 metadata/md5-cache/dev-python/pyclipper-1.2.0
+2012011340 metadata/md5-cache/dev-python/pycodestyle-2.6.0
+2012011340 metadata/md5-cache/dev-python/pycollada-0.7.1
+2012011340 metadata/md5-cache/dev-python/pycountry-20.7.3
+2012011340 metadata/md5-cache/dev-python/pycparser-2.20-r1
+2012011340 metadata/md5-cache/dev-python/pycryptodome-3.9.8-r1
+2012011340 metadata/md5-cache/dev-python/pycryptodome-3.9.9
+2012011340 metadata/md5-cache/dev-python/pycryptodomex-3.9.8
+2012011340 metadata/md5-cache/dev-python/pycryptodomex-3.9.9
+2012011340 metadata/md5-cache/dev-python/pycson-0.8
+2012011340 metadata/md5-cache/dev-python/pycuda-2019.1.2
+2012011340 metadata/md5-cache/dev-python/pycups-1.9.73-r2
+2012011340 metadata/md5-cache/dev-python/pycurl-7.43.0.6
+2012011340 metadata/md5-cache/dev-python/pycxx-7.1.2-r2
+2012011340 metadata/md5-cache/dev-python/pydantic-1.6.1
+2012011340 metadata/md5-cache/dev-python/pydata-sphinx-theme-0.4.0
+2012011340 metadata/md5-cache/dev-python/pydata-sphinx-theme-0.4.1
+2012011340 metadata/md5-cache/dev-python/pydecomp-0.3
+2012011340 metadata/md5-cache/dev-python/pydecomp-9999
+2012011340 metadata/md5-cache/dev-python/pydiff-0.2-r1
+2012011340 metadata/md5-cache/dev-python/pydispatcher-2.1.2
+2012011340 metadata/md5-cache/dev-python/pydns-3.2.1
+2012011340 metadata/md5-cache/dev-python/pydocstyle-5.1.1
+2012011340 metadata/md5-cache/dev-python/pydot-1.4.1
+2012011340 metadata/md5-cache/dev-python/pydotplus-2.0.2
+2012011340 metadata/md5-cache/dev-python/pyelftools-0.26
+2012011340 metadata/md5-cache/dev-python/pyenchant-3.1.0
+2012011340 metadata/md5-cache/dev-python/pyfakefs-4.1.0
+2012011340 metadata/md5-cache/dev-python/pyfakefs-4.2.0
+2012011340 metadata/md5-cache/dev-python/pyfakefs-4.2.1
+2012011340 metadata/md5-cache/dev-python/pyfakefs-4.3.0
+2012011340 metadata/md5-cache/dev-python/pyfakefs-4.3.1
+2012011340 metadata/md5-cache/dev-python/pyfakefs-4.3.2
+2012011340 metadata/md5-cache/dev-python/pyfeyn-1.0.0-r2
+2012011340 metadata/md5-cache/dev-python/pyflakes-2.2.0
+2012011340 metadata/md5-cache/dev-python/pyfltk-1.3.3
+2012011340 metadata/md5-cache/dev-python/pyformance-0.4-r1
+2012011340 metadata/md5-cache/dev-python/pyftpdlib-1.5.6-r1
+2012011340 metadata/md5-cache/dev-python/pygal-2.4.0-r1
+2012011340 metadata/md5-cache/dev-python/pygame-1.9.6-r1
+2012031039 metadata/md5-cache/dev-python/pygame-2.0.0
+2012011340 metadata/md5-cache/dev-python/pygame-2.0.0_pre10
+2012011340 metadata/md5-cache/dev-python/pygame-9999
+2012011340 metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r4
+2012011340 metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r5
+2012011340 metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r1
+2012011340 metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2
+2012011340 metadata/md5-cache/dev-python/pyghmi-1.5.5
+2012011340 metadata/md5-cache/dev-python/pygit2-1.3.0
+2012011340 metadata/md5-cache/dev-python/pygit2-1.4.0
+2012011340 metadata/md5-cache/dev-python/pyglet-1.5.10
+2012011340 metadata/md5-cache/dev-python/pyglet-1.5.11
+2012011340 metadata/md5-cache/dev-python/pyglet-1.5.7-r1
+2012011340 metadata/md5-cache/dev-python/pygments-2.7.2
+2012011340 metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5
+2012011340 metadata/md5-cache/dev-python/pygpgme-0.3-r2
+2012011340 metadata/md5-cache/dev-python/pygraphviz-1.6
+2012011340 metadata/md5-cache/dev-python/pygresql-5.2
+2012011340 metadata/md5-cache/dev-python/pygresql-5.2.1
+2012011340 metadata/md5-cache/dev-python/pyh2o-1
+2012011340 metadata/md5-cache/dev-python/pyhamcrest-2.0.2
+2012011340 metadata/md5-cache/dev-python/pyinotify-0.9.6
+2012011340 metadata/md5-cache/dev-python/pyjwt-1.7.1-r1
+2012011340 metadata/md5-cache/dev-python/pykerberos-1.3.0
+2012011340 metadata/md5-cache/dev-python/pykerberos-1.3.0-r1
+2012011340 metadata/md5-cache/dev-python/pykka-2.0.2
+2012011340 metadata/md5-cache/dev-python/pykka-2.0.3
+2012011340 metadata/md5-cache/dev-python/pykwalify-1.7.0
+2012011340 metadata/md5-cache/dev-python/pylama-7.7.1-r1
+2012011340 metadata/md5-cache/dev-python/pylast-4.0.0
+2012011340 metadata/md5-cache/dev-python/pylatex-1.4.0
+2012011340 metadata/md5-cache/dev-python/pylatex-1.4.1
+2012011340 metadata/md5-cache/dev-python/pylibacl-0.5.3
+2012011340 metadata/md5-cache/dev-python/pylibacl-0.5.4_p20191217
+2012011340 metadata/md5-cache/dev-python/pylibacl-0.6.0
+2012011340 metadata/md5-cache/dev-python/pylibmc-1.6.1-r1
+2012011340 metadata/md5-cache/dev-python/pylint-2.6.0
+2012011340 metadata/md5-cache/dev-python/pylru-1.2.0
+2012011340 metadata/md5-cache/dev-python/pyls-black-0.4.6
+2012011340 metadata/md5-cache/dev-python/pyls-spyder-0.1.1
+2012011340 metadata/md5-cache/dev-python/pymad-0.10
+2012011340 metadata/md5-cache/dev-python/pymdstat-0.4.2-r1
+2012011340 metadata/md5-cache/dev-python/pymediainfo-4.3
+2012011340 metadata/md5-cache/dev-python/pymediainfo-5.0.3
+2012011340 metadata/md5-cache/dev-python/pymetar-1.1-r1
+2012011340 metadata/md5-cache/dev-python/pymilter-1.0.4-r1
+2012011340 metadata/md5-cache/dev-python/pymongo-3.11.0-r1
+2012011340 metadata/md5-cache/dev-python/pymongo-3.11.1
+2012011340 metadata/md5-cache/dev-python/pymountboot-0.2.3
+2012011340 metadata/md5-cache/dev-python/pymountboot-9999
+2012011340 metadata/md5-cache/dev-python/pympler-0.6
+2012011340 metadata/md5-cache/dev-python/pymssql-2.1.3
+2012011340 metadata/md5-cache/dev-python/pymysql-0.10.1
+2012011340 metadata/md5-cache/dev-python/pynacl-1.4.0
+2012011340 metadata/md5-cache/dev-python/pynput-1.6.8
+2012011340 metadata/md5-cache/dev-python/pynput-9999
+2012031009 metadata/md5-cache/dev-python/pynvim-0.4.1
+2012031009 metadata/md5-cache/dev-python/pynvim-0.4.2
+2012011340 metadata/md5-cache/dev-python/pyocr-0.7.2
+2012011340 metadata/md5-cache/dev-python/pyopencl-2020.2
+2012011340 metadata/md5-cache/dev-python/pyopencl-2020.2.2
+2012011340 metadata/md5-cache/dev-python/pyopengl-3.1.0-r1
+2012011340 metadata/md5-cache/dev-python/pyopengl-3.1.5
+2012011340 metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.5
+2012011340 metadata/md5-cache/dev-python/pyopenssl-19.1.0-r1
+2012021539 metadata/md5-cache/dev-python/pyopenssl-20.0.0-r1
+2012011340 metadata/md5-cache/dev-python/pyotp-2.4.1
+2012011340 metadata/md5-cache/dev-python/pypam-0.5.0-r6
+2012011340 metadata/md5-cache/dev-python/pyparsing-2.4.7-r1
+2012011340 metadata/md5-cache/dev-python/pyparted-3.11.6
+2012011340 metadata/md5-cache/dev-python/pyparted-3.11.7
+2012011340 metadata/md5-cache/dev-python/pypax-0.9.5
+2012011340 metadata/md5-cache/dev-python/pypax-9999
+2012011340 metadata/md5-cache/dev-python/pypcap-1.2.3
+2012011340 metadata/md5-cache/dev-python/pypeg2-2.15.2-r1
+2012011340 metadata/md5-cache/dev-python/pyperclip-1.7.0
+2012011340 metadata/md5-cache/dev-python/pyphen-0.10.0
+2012011340 metadata/md5-cache/dev-python/pyphen-0.9.5
+2012011340 metadata/md5-cache/dev-python/pypiserver-1.4.2
+2012011340 metadata/md5-cache/dev-python/pypng-0.0.20
+2012011340 metadata/md5-cache/dev-python/pypowervm-1.1.24
+2012011340 metadata/md5-cache/dev-python/pyprof2calltree-1.4.4
+2012011340 metadata/md5-cache/dev-python/pyproj-2.6.1_p1
+2012011340 metadata/md5-cache/dev-python/pyproject2setuppy-8
+2012011340 metadata/md5-cache/dev-python/pyproject2setuppy-9
+2012011340 metadata/md5-cache/dev-python/pypugjs-5.9.5
+2012011340 metadata/md5-cache/dev-python/pyqrcode-1.2.1-r1
+2012011340 metadata/md5-cache/dev-python/pyqt-distutils-0.7.3
+2012011340 metadata/md5-cache/dev-python/pyqtgraph-0.11.0_rc0
+2012011340 metadata/md5-cache/dev-python/pyquery-1.4.1-r1
+2012011340 metadata/md5-cache/dev-python/pyquery-1.4.3
+2012011340 metadata/md5-cache/dev-python/pyre2-1.0.7
+2012011340 metadata/md5-cache/dev-python/pyrfc3339-1.1
+2012011340 metadata/md5-cache/dev-python/pyro-4.80
+2012011340 metadata/md5-cache/dev-python/pyroute2-0.5.14
+2012011340 metadata/md5-cache/dev-python/pyrqlite-2.0
+2012011340 metadata/md5-cache/dev-python/pyrsistent-0.17.3
+2012011340 metadata/md5-cache/dev-python/pysaml2-6.1.0
+2012011340 metadata/md5-cache/dev-python/pyscard-1.9.9
+2012011340 metadata/md5-cache/dev-python/pyscreenshot-2.2
+2012011340 metadata/md5-cache/dev-python/pyserial-3.4
+2012011340 metadata/md5-cache/dev-python/pyserial-3.5
+2012022339 metadata/md5-cache/dev-python/pysimdjson-3.1.1
+2012011340 metadata/md5-cache/dev-python/pysmi-0.3.4
+2012011340 metadata/md5-cache/dev-python/pysnmp-4.4.12-r1
+2012011340 metadata/md5-cache/dev-python/pysnmp-999999
+2012011340 metadata/md5-cache/dev-python/pysnmp-mibs-0.1.6
+2012011340 metadata/md5-cache/dev-python/pysol_cards-0.10.1
+2012011340 metadata/md5-cache/dev-python/pyspectrum2-0.2.0
+2012011340 metadata/md5-cache/dev-python/pyspf-2.0.14
+2012011340 metadata/md5-cache/dev-python/pysrt-1.1.2
+2012011340 metadata/md5-cache/dev-python/pysrt-9999
+2012011340 metadata/md5-cache/dev-python/pysvg-0.2.2_p3
+2012011340 metadata/md5-cache/dev-python/pysvn-1.9.11
+2012011340 metadata/md5-cache/dev-python/pytables-3.6.1
+2012011340 metadata/md5-cache/dev-python/pytaglib-1.4.6
+2012011340 metadata/md5-cache/dev-python/pyte-0.8.0-r1
+2012011340 metadata/md5-cache/dev-python/pytest-4.6.11-r1
+2012011340 metadata/md5-cache/dev-python/pytest-5.4.3
+2012021339 metadata/md5-cache/dev-python/pytest-6.1.2
+2012011340 metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
+2012011340 metadata/md5-cache/dev-python/pytest-asyncio-0.14.0
+2012011340 metadata/md5-cache/dev-python/pytest-cache-1.0-r2
+2012011340 metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
+2012011409 metadata/md5-cache/dev-python/pytest-cov-2.10.1
+2012011340 metadata/md5-cache/dev-python/pytest-cov-2.8.1
+2012011340 metadata/md5-cache/dev-python/pytest-datadir-1.3.1
+2012011340 metadata/md5-cache/dev-python/pytest-describe-1.0.0
+2012011340 metadata/md5-cache/dev-python/pytest-django-4.1.0
+2012011340 metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
+2012011340 metadata/md5-cache/dev-python/pytest-faulthandler-1.6.0
+2012011340 metadata/md5-cache/dev-python/pytest-faulthandler-2.0.1
+2012011340 metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r1
+2012011340 metadata/md5-cache/dev-python/pytest-flake8-0.9.1
+2012011340 metadata/md5-cache/dev-python/pytest-flakes-4.0.0
+2012011340 metadata/md5-cache/dev-python/pytest-forked-1.3.0-r1
+2012011340 metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
+2012011340 metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8-r1
+2012011340 metadata/md5-cache/dev-python/pytest-html-1.22.1
+2012011340 metadata/md5-cache/dev-python/pytest-httpbin-1.0.0-r1
+2012011340 metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3
+2012011340 metadata/md5-cache/dev-python/pytest-localserver-0.5.0
+2012011340 metadata/md5-cache/dev-python/pytest-metadata-1.8.0
+2012011340 metadata/md5-cache/dev-python/pytest-mock-3.3.1
+2012011340 metadata/md5-cache/dev-python/pytest-ordering-0.6
+2012011340 metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r1
+2012011340 metadata/md5-cache/dev-python/pytest-pylint-0.17.0
+2012011340 metadata/md5-cache/dev-python/pytest-qt-3.3.0
+2012011340 metadata/md5-cache/dev-python/pytest-regressions-2.0.1
+2012011340 metadata/md5-cache/dev-python/pytest-regressions-2.0.2
+2012011340 metadata/md5-cache/dev-python/pytest-rerunfailures-9.1.1
+2012011340 metadata/md5-cache/dev-python/pytest-salt-2019.2.1_p1
+2012011340 metadata/md5-cache/dev-python/pytest-salt-2020.1.27
+2012011340 metadata/md5-cache/dev-python/pytest-salt-factories-0.94.4
+2012011340 metadata/md5-cache/dev-python/pytest-services-2.2.0
+2012011340 metadata/md5-cache/dev-python/pytest-services-2.2.1
+2012011340 metadata/md5-cache/dev-python/pytest-shutil-1.7.0-r1
+2012011340 metadata/md5-cache/dev-python/pytest-subtesthack-0.1.1
+2012011340 metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12
+2012011340 metadata/md5-cache/dev-python/pytest-testmon-0.9.15
+2012011340 metadata/md5-cache/dev-python/pytest-timeout-1.4.2-r1
+2012011340 metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r1
+2012011340 metadata/md5-cache/dev-python/pytest-xdist-1.34.0-r1
+2012012109 metadata/md5-cache/dev-python/pytest-xdist-2.1.0
+2012011340 metadata/md5-cache/dev-python/pytest-xprocess-0.15.0
+2012011340 metadata/md5-cache/dev-python/pytest-xprocess-0.16.0
+2012011340 metadata/md5-cache/dev-python/pytest-xprocess-0.17.0
+2012011340 metadata/md5-cache/dev-python/pytest-xvfb-2.0.0
+2012030639 metadata/md5-cache/dev-python/python-augeas-1.1.0
+2012011340 metadata/md5-cache/dev-python/python-axolotl-0.2.3-r1
+2012011340 metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2-r1
+2012011340 metadata/md5-cache/dev-python/python-backoff-1.6.0
+2012011340 metadata/md5-cache/dev-python/python-barbicanclient-4.8.1
+2012011340 metadata/md5-cache/dev-python/python-barbicanclient-5.0.1
+2012011340 metadata/md5-cache/dev-python/python-blazarclient-3.1.1
+2012011340 metadata/md5-cache/dev-python/python-bugzilla-3.0.1
+2012011340 metadata/md5-cache/dev-python/python-bugzilla-3.0.2
+2012011340 metadata/md5-cache/dev-python/python-ceilometerclient-2.9.0
+2012011340 metadata/md5-cache/dev-python/python-cinderclient-7.2.0
+2012011340 metadata/md5-cache/dev-python/python-cstruct-1.8
+2012011340 metadata/md5-cache/dev-python/python-ctags-1.5.0
+2012011340 metadata/md5-cache/dev-python/python-daemon-2.2.4
+2012011340 metadata/md5-cache/dev-python/python-dateutil-2.8.1-r2
+2012011340 metadata/md5-cache/dev-python/python-debian-0.1.37
+2012011340 metadata/md5-cache/dev-python/python-designateclient-4.1.0
+2012011340 metadata/md5-cache/dev-python/python-discid-1.2.0
+2012011340 metadata/md5-cache/dev-python/python-distutils-extra-2.45
+2012011340 metadata/md5-cache/dev-python/python-dotenv-0.14.0
+2012011340 metadata/md5-cache/dev-python/python-dotenv-0.15.0
+2012011340 metadata/md5-cache/dev-python/python-editor-1.0.4-r1
+2012011340 metadata/md5-cache/dev-python/python-efl-1.25.0
+2012011340 metadata/md5-cache/dev-python/python-email-validator-1.1.1
+2012011340 metadata/md5-cache/dev-python/python-email-validator-1.1.2
+2012011340 metadata/md5-cache/dev-python/python-engineio-3.12.1
+2012011340 metadata/md5-cache/dev-python/python-etcd-0.4.5-r1
+2012011340 metadata/md5-cache/dev-python/python-ethtool-0.14
+2012011340 metadata/md5-cache/dev-python/python-evdev-1.3.0
+2012011340 metadata/md5-cache/dev-python/python-fastimport-0.9.8-r1
+2012011340 metadata/md5-cache/dev-python/python-gammu-2.11
+2012011340 metadata/md5-cache/dev-python/python-gflags-3.1.2-r1
+2012011340 metadata/md5-cache/dev-python/python-glanceclient-3.2.2
+2012011340 metadata/md5-cache/dev-python/python-gnupg-0.4.6
+2012011340 metadata/md5-cache/dev-python/python-heatclient-2.2.1
+2012011340 metadata/md5-cache/dev-python/python-iptables-1.0.0-r1
+2012011340 metadata/md5-cache/dev-python/python-ironicclient-4.1.0
+2012030239 metadata/md5-cache/dev-python/python-ironicclient-4.4.0
+2012011340 metadata/md5-cache/dev-python/python-jose-3.2.0-r1
+2012011340 metadata/md5-cache/dev-python/python-jsonrpc-server-0.3.4
+2012011340 metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1
+2012011340 metadata/md5-cache/dev-python/python-keystoneclient-4.1.1
+2012011340 metadata/md5-cache/dev-python/python-language-server-0.34.1
+2012011340 metadata/md5-cache/dev-python/python-language-server-0.35.1-r1
+2012011340 metadata/md5-cache/dev-python/python-language-server-0.36.1
+2012011340 metadata/md5-cache/dev-python/python-ldap-3.3.1
+2012011340 metadata/md5-cache/dev-python/python-ldap-9999
+2012011340 metadata/md5-cache/dev-python/python-levenshtein-0.12.0
+2012011340 metadata/md5-cache/dev-python/python-lhafile-0.2.2
+2012011340 metadata/md5-cache/dev-python/python-libevdev-0.8
+2012011340 metadata/md5-cache/dev-python/python-linux-procfs-0.6.1
+2012011340 metadata/md5-cache/dev-python/python-ly-0.9.6
+2012011340 metadata/md5-cache/dev-python/python-lzo-1.12-r1
+2012011340 metadata/md5-cache/dev-python/python-magic-0.4.18
+2012011340 metadata/md5-cache/dev-python/python-magnumclient-3.2.1
+2012011340 metadata/md5-cache/dev-python/python-manilaclient-2.3.0
+2012011340 metadata/md5-cache/dev-python/python-markdown-math-0.7
+2012011340 metadata/md5-cache/dev-python/python-memcached-1.59-r1
+2012012039 metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r3
+2012011340 metadata/md5-cache/dev-python/python-mistralclient-4.1.1
+2012011340 metadata/md5-cache/dev-python/python-monascaclient-2.2.1
+2012011340 metadata/md5-cache/dev-python/python-mpd-1.1.0-r1
+2012011340 metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.7.1
+2012011340 metadata/md5-cache/dev-python/python-nbxmpp-1.0.2
+2012011340 metadata/md5-cache/dev-python/python-netlink-0.1
+2012011340 metadata/md5-cache/dev-python/python-neutronclient-6.12.1
+2012011340 metadata/md5-cache/dev-python/python-neutronclient-7.2.1
+2012011340 metadata/md5-cache/dev-python/python-novaclient-17.0.0
+2012011340 metadata/md5-cache/dev-python/python-novaclient-17.2.1
+2012011340 metadata/md5-cache/dev-python/python-octaviaclient-2.2.0
+2012011340 metadata/md5-cache/dev-python/python-openstackclient-5.2.1
+2012011340 metadata/md5-cache/dev-python/python-openstackclient-5.4.0
+2012011340 metadata/md5-cache/dev-python/python-podman-1.6.0
+2012011340 metadata/md5-cache/dev-python/python-poppler-qt5-0.75.0
+2012011340 metadata/md5-cache/dev-python/python-prctl-1.7
+2012011340 metadata/md5-cache/dev-python/python-redmine-2.3.0
+2012011340 metadata/md5-cache/dev-python/python-saharaclient-3.2.1
+2012011340 metadata/md5-cache/dev-python/python-senlinclient-2.1.1
+2012011340 metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r2
+2012011340 metadata/md5-cache/dev-python/python-slip-0.6.5
+2012011340 metadata/md5-cache/dev-python/python-slugify-1.2.6
+2012011340 metadata/md5-cache/dev-python/python-slugify-4.0.1
+2012011340 metadata/md5-cache/dev-python/python-socks-1.1.0
+2012011340 metadata/md5-cache/dev-python/python-sshpubkeys-3.1.0
+2012011340 metadata/md5-cache/dev-python/python-stdnum-1.14
+2012011340 metadata/md5-cache/dev-python/python-swiftclient-3.10.1
+2012011340 metadata/md5-cache/dev-python/python-systemd-234
+2012011340 metadata/md5-cache/dev-python/python-termstyle-0.1.10
+2012011340 metadata/md5-cache/dev-python/python-troveclient-5.1.1
+2012011340 metadata/md5-cache/dev-python/python-utils-2.3.0
+2012011340 metadata/md5-cache/dev-python/python-varlink-30.3.0
+2012011340 metadata/md5-cache/dev-python/python-vitrageclient-4.1.1
+2012011340 metadata/md5-cache/dev-python/python-xlib-0.28
+2012011340 metadata/md5-cache/dev-python/python-xlib-0.29
+2012011340 metadata/md5-cache/dev-python/python-xmlsec-1.3.9
+2012011340 metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1
+2012011409 metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r1
+2012011340 metadata/md5-cache/dev-python/python-zaqarclient-2.0.1
+2012011340 metadata/md5-cache/dev-python/python-zipstream-1.1.4
+2012011340 metadata/md5-cache/dev-python/python-zunclient-4.1.1
+2012011340 metadata/md5-cache/dev-python/python3-lxc-3.0.4
+2012011340 metadata/md5-cache/dev-python/python3-openid-3.2.0
+2012011340 metadata/md5-cache/dev-python/python3-saml-1.9.0
+2012011340 metadata/md5-cache/dev-python/pythondialog-3.5.1
+2012011340 metadata/md5-cache/dev-python/pythonz-bd-1.11.4
+2012011340 metadata/md5-cache/dev-python/pytidylib-0.3.2-r1
+2012011340 metadata/md5-cache/dev-python/pytoml-0.1.20
+2012011340 metadata/md5-cache/dev-python/pytools-2020.4
+2012011340 metadata/md5-cache/dev-python/pytools-9999
+2012011340 metadata/md5-cache/dev-python/pytrie-0.4.0
+2012011340 metadata/md5-cache/dev-python/pytz-2020.1-r1
+2012011340 metadata/md5-cache/dev-python/pytz-2020.4
+2012011340 metadata/md5-cache/dev-python/pyu2f-0.1.4-r1
+2012011340 metadata/md5-cache/dev-python/pyudev-0.22.0
+2012011340 metadata/md5-cache/dev-python/pyusb-1.0.2-r1
+2012020239 metadata/md5-cache/dev-python/pyusb-1.1.0
+2012011340 metadata/md5-cache/dev-python/pyvirtualdisplay-1.3.2
+2012011340 metadata/md5-cache/dev-python/pywavelets-1.1.1
+2012011340 metadata/md5-cache/dev-python/pywinrm-0.4.1
+2012011340 metadata/md5-cache/dev-python/pyx-0.15
+2012011340 metadata/md5-cache/dev-python/pyxattr-0.7.1
+2012011340 metadata/md5-cache/dev-python/pyxdg-0.26-r2
+2012011340 metadata/md5-cache/dev-python/pyyaml-5.3.1-r1
+2012011340 metadata/md5-cache/dev-python/pyzbar-0.1.8
+2012011340 metadata/md5-cache/dev-python/pyzmq-19.0.2
+2012011340 metadata/md5-cache/dev-python/pyzmq-20.0.0
+2012011340 metadata/md5-cache/dev-python/qdarkstyle-2.8.1
+2012011340 metadata/md5-cache/dev-python/qrcode-6.1
+2012011340 metadata/md5-cache/dev-python/qtawesome-0.7.2
+2012011340 metadata/md5-cache/dev-python/qtawesome-1.0.1
+2012011340 metadata/md5-cache/dev-python/qtconsole-4.7.6
+2012011340 metadata/md5-cache/dev-python/qtconsole-4.7.7
+2012011340 metadata/md5-cache/dev-python/qtconsole-5.0.0
+2012011340 metadata/md5-cache/dev-python/qtconsole-5.0.1
+2012011340 metadata/md5-cache/dev-python/qtsass-0.3.0
+2012011340 metadata/md5-cache/dev-python/quantities-0.12.4
+2012011340 metadata/md5-cache/dev-python/radon-4.1.0
+2012011340 metadata/md5-cache/dev-python/raet-0.6.8-r1
+2012011340 metadata/md5-cache/dev-python/random2-1.0.1-r1
+2012011340 metadata/md5-cache/dev-python/rarfile-3.1
+2012011340 metadata/md5-cache/dev-python/ratelimit-1.4.1
+2012011340 metadata/md5-cache/dev-python/rcssmin-1.0.6
+2012011340 metadata/md5-cache/dev-python/rdflib-5.0.0
+2012011340 metadata/md5-cache/dev-python/re-assert-1.1.0
+2012011340 metadata/md5-cache/dev-python/readme_renderer-28.0
+2012011340 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.1
+2012011340 metadata/md5-cache/dev-python/rebulk-2.0.1
+2012011340 metadata/md5-cache/dev-python/recommonmark-0.6.0
+2012011340 metadata/md5-cache/dev-python/redis-py-3.3.11
+2012011340 metadata/md5-cache/dev-python/redis-py-3.5.3
+2012011340 metadata/md5-cache/dev-python/rednose-0.4.3
+2012011340 metadata/md5-cache/dev-python/reedsolomon-1.5.4
+2012011340 metadata/md5-cache/dev-python/reflink-0.2.1-r1
+2012011340 metadata/md5-cache/dev-python/regex-2020.4.4-r1
+2012011340 metadata/md5-cache/dev-python/rencode-1.0.6
+2012011340 metadata/md5-cache/dev-python/reno-3.2.0-r1
+2012011340 metadata/md5-cache/dev-python/reportlab-3.5.48
+2012011340 metadata/md5-cache/dev-python/repoze-lru-0.7-r1
+2012011340 metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.8
+2012011340 metadata/md5-cache/dev-python/requests-2.24.0-r1
+2012011340 metadata/md5-cache/dev-python/requests-2.25.0
+2012011340 metadata/md5-cache/dev-python/requests-cache-0.5.2
+2012011340 metadata/md5-cache/dev-python/requests-credssp-1.1.1
+2012030239 metadata/md5-cache/dev-python/requests-file-1.4.3
+2012011340 metadata/md5-cache/dev-python/requests-kerberos-0.12.0-r1
+2012011340 metadata/md5-cache/dev-python/requests-mock-1.8.0
+2012011340 metadata/md5-cache/dev-python/requests-ntlm-1.1.0-r1
+2012011340 metadata/md5-cache/dev-python/requests-oauthlib-1.3.0
+2012011340 metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
+2012011340 metadata/md5-cache/dev-python/requests-unixsocket-0.2.0
+2012011340 metadata/md5-cache/dev-python/requests_download-0.1.2
+2012011340 metadata/md5-cache/dev-python/requests_pkcs12-1.7
+2012011340 metadata/md5-cache/dev-python/requestsexceptions-1.4.0
+2012011340 metadata/md5-cache/dev-python/responses-0.12.0
+2012011340 metadata/md5-cache/dev-python/responses-0.12.1
+2012011340 metadata/md5-cache/dev-python/restructuredtext-lint-1.3.0
+2012011340 metadata/md5-cache/dev-python/resumable-urlretrieve-0.1.5
+2012011340 metadata/md5-cache/dev-python/retry-decorator-1.1.1
+2012011340 metadata/md5-cache/dev-python/retrying-1.3.3
+2012011340 metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
+2012011340 metadata/md5-cache/dev-python/rfc3986-1.4.0
+2012011340 metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
+2012011340 metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
+2012011340 metadata/md5-cache/dev-python/rjsmin-1.1.0
+2012011340 metadata/md5-cache/dev-python/robot-detection-0.4.0
+2012011340 metadata/md5-cache/dev-python/roman-3.2
+2012011340 metadata/md5-cache/dev-python/rope-0.17.0
+2012011340 metadata/md5-cache/dev-python/rope-0.18.0
+2012011340 metadata/md5-cache/dev-python/ropemode-0.5
+2012011340 metadata/md5-cache/dev-python/rosdistro-0.8.3
+2012011340 metadata/md5-cache/dev-python/rosdistro-9999
+2012011340 metadata/md5-cache/dev-python/rospkg-1.2.8-r1
+2012011340 metadata/md5-cache/dev-python/rospkg-9999
+2012011340 metadata/md5-cache/dev-python/routes-2.5.1
+2012011340 metadata/md5-cache/dev-python/rply-0.7.7-r1
+2012011340 metadata/md5-cache/dev-python/rpy-2.9.0
+2012011340 metadata/md5-cache/dev-python/rpyc-4.1.4
+2012011340 metadata/md5-cache/dev-python/rpyc-4.1.5
+2012011340 metadata/md5-cache/dev-python/rq-1.5.2
+2012011340 metadata/md5-cache/dev-python/rq-1.6.1
+2012011340 metadata/md5-cache/dev-python/rq-1.7.0
+2012011340 metadata/md5-cache/dev-python/rsa-4.2
+2012021309 metadata/md5-cache/dev-python/rst-linker-2.1.1
+2012011340 metadata/md5-cache/dev-python/rtimulib-7.2.1-r1
+2012011340 metadata/md5-cache/dev-python/rtslib-fb-2.1.74
+2012011340 metadata/md5-cache/dev-python/ruamel-yaml-0.16.12-r1
+2012011340 metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.2-r1
+2012011340 metadata/md5-cache/dev-python/ryu-4.34
+2012011340 metadata/md5-cache/dev-python/s3fs-0.4.2
+2012011340 metadata/md5-cache/dev-python/s3transfer-0.3.3
+2012011340 metadata/md5-cache/dev-python/sabyenc-4.0.2
+2012011340 metadata/md5-cache/dev-python/sarge-0.1.5
+2012011340 metadata/md5-cache/dev-python/scandir-1.10.0-r2
+2012011340 metadata/md5-cache/dev-python/scikit-build-0.11.1
+2012011340 metadata/md5-cache/dev-python/scipy-1.1.0
+2012011340 metadata/md5-cache/dev-python/scipy-1.4.1
+2012011340 metadata/md5-cache/dev-python/scipy-1.5.2
+2012011340 metadata/md5-cache/dev-python/scipy-1.5.3
+2012011340 metadata/md5-cache/dev-python/scipy-1.5.4
+2012011340 metadata/md5-cache/dev-python/scripttest-1.3.0-r1
+2012011340 metadata/md5-cache/dev-python/scrypt-0.8.16
+2012011340 metadata/md5-cache/dev-python/seaborn-0.10.1
+2012011340 metadata/md5-cache/dev-python/secretstorage-3.1.2
+2012011340 metadata/md5-cache/dev-python/secretstorage-3.2.0
+2012011340 metadata/md5-cache/dev-python/secretstorage-3.3.0
+2012011340 metadata/md5-cache/dev-python/selenium-3.141.0-r1
+2012011340 metadata/md5-cache/dev-python/semantic_version-2.8.5
+2012011340 metadata/md5-cache/dev-python/semver-2.13.0
+2012011340 metadata/md5-cache/dev-python/send2trash-1.5.0-r1
+2012011340 metadata/md5-cache/dev-python/sentinels-1.0.0
+2012011340 metadata/md5-cache/dev-python/sentry-sdk-0.19.1
+2012011340 metadata/md5-cache/dev-python/sentry-sdk-0.19.4
+2012011340 metadata/md5-cache/dev-python/serpent-1.30
+2012011340 metadata/md5-cache/dev-python/serpent-1.30.2
+2012011340 metadata/md5-cache/dev-python/serverfiles-0.2.1
+2012011340 metadata/md5-cache/dev-python/service_identity-18.1.0-r1
+2012011340 metadata/md5-cache/dev-python/setproctitle-1.1.10-r1
+2012011340 metadata/md5-cache/dev-python/setproctitle-1.2
+2012011340 metadata/md5-cache/dev-python/setuptools-46.4.0-r3
+2012011340 metadata/md5-cache/dev-python/setuptools-50.3.0
+2012011340 metadata/md5-cache/dev-python/setuptools-git-1.2-r2
+2012011340 metadata/md5-cache/dev-python/setuptools_scm-4.1.2-r1
+2012011340 metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1
+2012011340 metadata/md5-cache/dev-python/setuptools_trial-0.6.0-r1
+2012011340 metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
+2012011340 metadata/md5-cache/dev-python/sgmllib3k-1.0.0
+2012011340 metadata/md5-cache/dev-python/sh-1.14.0
+2012011340 metadata/md5-cache/dev-python/shutilwhich-1.1.0
+2012011340 metadata/md5-cache/dev-python/simplebayes-1.5.7
+2012011340 metadata/md5-cache/dev-python/simpleeval-0.9.10
+2012011340 metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
+2012011340 metadata/md5-cache/dev-python/simplejson-3.17.2-r1
+2012011340 metadata/md5-cache/dev-python/simplekml-1.3.1
+2012011340 metadata/md5-cache/dev-python/simplesoapy-1.5.1-r1
+2012011340 metadata/md5-cache/dev-python/simplesoapy-9999
+2012011340 metadata/md5-cache/dev-python/simplespectral-1.0.0
+2012011340 metadata/md5-cache/dev-python/simplespectral-9999
+2012011340 metadata/md5-cache/dev-python/simpy-3.0.13
+2012011340 metadata/md5-cache/dev-python/six-1.15.0-r1
+2012011340 metadata/md5-cache/dev-python/slackclient-2.5.0
+2012011340 metadata/md5-cache/dev-python/slimit-0.8.1-r1
+2012011340 metadata/md5-cache/dev-python/slixmpp-1.4.2
+2012011340 metadata/md5-cache/dev-python/slixmpp-1.5.2
+2012011340 metadata/md5-cache/dev-python/slixmpp-9999
+2012011340 metadata/md5-cache/dev-python/smmap-3.0.4
+2012011340 metadata/md5-cache/dev-python/smmap2-2.0.3
+2012011340 metadata/md5-cache/dev-python/snakeoil-0.8.8
+2012011340 metadata/md5-cache/dev-python/snakeoil-9999
+2012011340 metadata/md5-cache/dev-python/snaketrace-0.1.1
+2012011340 metadata/md5-cache/dev-python/snappy-0.5.1-r1
+2012011340 metadata/md5-cache/dev-python/snapshottest-0.5.1
+2012011340 metadata/md5-cache/dev-python/snowballstemmer-2.0.0
+2012011340 metadata/md5-cache/dev-python/socketio-client-0.7.2
+2012011340 metadata/md5-cache/dev-python/socketio-client-nexus-0.7.6
+2012011340 metadata/md5-cache/dev-python/socketpool-0.5.3-r3
+2012011340 metadata/md5-cache/dev-python/sortedcollections-0.5.3
+2012011340 metadata/md5-cache/dev-python/sortedcontainers-2.2.2-r1
+2012011340 metadata/md5-cache/dev-python/sortedcontainers-2.3.0
+2012011340 metadata/md5-cache/dev-python/soupsieve-2.0.1
+2012011340 metadata/md5-cache/dev-python/sparql-wrapper-1.8.5
+2012011340 metadata/md5-cache/dev-python/speaklater-1.3-r1
+2012011340 metadata/md5-cache/dev-python/speg-0.3-r1
+2012011340 metadata/md5-cache/dev-python/sphinx-2.4.4
+2012020039 metadata/md5-cache/dev-python/sphinx-3.2.1
+2012011340 metadata/md5-cache/dev-python/sphinx-3.3.1
+2012011340 metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
+2012011340 metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0
+2012011340 metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
+2012011340 metadata/md5-cache/dev-python/sphinx-gallery-0.3.1-r1
+2012011340 metadata/md5-cache/dev-python/sphinx-gallery-0.8.1
+2012011340 metadata/md5-cache/dev-python/sphinx-issues-1.2.0
+2012011340 metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
+2012011340 metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4
+2012011340 metadata/md5-cache/dev-python/sphinx-notfound-page-0.5
+2012011340 metadata/md5-cache/dev-python/sphinx-panels-0.4.1
+2012011340 metadata/md5-cache/dev-python/sphinx-prompt-1.3.0
+2012011340 metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1
+2012011340 metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1
+2012011340 metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1
+2012011340 metadata/md5-cache/dev-python/sphinx_rtd_theme-0.2.4
+2012011340 metadata/md5-cache/dev-python/sphinx_rtd_theme-0.4.3-r1
+2012011340 metadata/md5-cache/dev-python/sphinx_selective_exclude-1.0.3
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.6.1
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.1-r2
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.3
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.7.0
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-httpexample-0.10.3
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-pretty-searchresults-0.3.5
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.16
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.4
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.3.0
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.4.0
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.0.0
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.0.1
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.1.0
+2012011340 metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4
+2012011340 metadata/md5-cache/dev-python/spur-0.3.22
+2012011340 metadata/md5-cache/dev-python/spyder-4.2.0
+2012011340 metadata/md5-cache/dev-python/spyder-kernels-1.10.0
+2012011340 metadata/md5-cache/dev-python/spyder-line-profiler-0.2.1
+2012011340 metadata/md5-cache/dev-python/spyder-memory-profiler-0.2.1
+2012011340 metadata/md5-cache/dev-python/spyder-notebook-0.3.1
+2012011340 metadata/md5-cache/dev-python/spyder-terminal-0.5.0
+2012011340 metadata/md5-cache/dev-python/spyder-unittest-0.4.1
+2012011340 metadata/md5-cache/dev-python/spyder-vim-0_pre20201026
+2012011340 metadata/md5-cache/dev-python/sqlalchemy-1.3.17
+2012011340 metadata/md5-cache/dev-python/sqlalchemy-1.3.20
+2012011340 metadata/md5-cache/dev-python/sqlalchemy-migrate-0.13.0
+2012011340 metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0
+2012011340 metadata/md5-cache/dev-python/sqlalchemy-rqlite-9999
+2012011340 metadata/md5-cache/dev-python/sqlparse-0.3.1
+2012011340 metadata/md5-cache/dev-python/sqlparse-0.4.1
+2012011340 metadata/md5-cache/dev-python/sshtunnel-0.1.4-r2
+2012022139 metadata/md5-cache/dev-python/sshtunnel-0.1.5
+2012030509 metadata/md5-cache/dev-python/sshtunnel-0.3.1
+2012011340 metadata/md5-cache/dev-python/ssl-fetch-0.4
+2012011340 metadata/md5-cache/dev-python/ssl-fetch-9999
+2012011340 metadata/md5-cache/dev-python/stapler-1.0.0_p20200531
+2012011340 metadata/md5-cache/dev-python/statsd-3.3.0
+2012011340 metadata/md5-cache/dev-python/statsmodels-0.11.1
+2012011340 metadata/md5-cache/dev-python/statsmodels-0.12.0
+2012011340 metadata/md5-cache/dev-python/statsmodels-0.12.1
+2012011340 metadata/md5-cache/dev-python/statsmodels-9999
+2012011340 metadata/md5-cache/dev-python/stestr-2.1.0-r1
+2012011340 metadata/md5-cache/dev-python/stevedore-3.2.2
+2012011340 metadata/md5-cache/dev-python/stevedore-3.3.0
+2012011340 metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1
+2012011340 metadata/md5-cache/dev-python/stripe-2.46.0
+2012011340 metadata/md5-cache/dev-python/subunit-1.4.0
+2012011340 metadata/md5-cache/dev-python/subvertpy-0.10.1
+2012011340 metadata/md5-cache/dev-python/suds-0.6-r1
+2012011340 metadata/md5-cache/dev-python/suds-0.8.4
+2012011340 metadata/md5-cache/dev-python/sure-1.4.11
+2012011340 metadata/md5-cache/dev-python/svg-path-4.0.2
+2012011340 metadata/md5-cache/dev-python/svgwrite-1.4
+2012011340 metadata/md5-cache/dev-python/swagger-spec-validator-2.5.0
+2012011340 metadata/md5-cache/dev-python/sybil-1.4.0
+2012011340 metadata/md5-cache/dev-python/sybil-2.0.0
+2012011340 metadata/md5-cache/dev-python/sybil-2.0.1
+2012011340 metadata/md5-cache/dev-python/symengine-0.6.1-r1
+2012011340 metadata/md5-cache/dev-python/sympy-1.6.2
+2012011340 metadata/md5-cache/dev-python/sympy-1.7
+2012011340 metadata/md5-cache/dev-python/sympy-1.7_rc1
+2012011340 metadata/md5-cache/dev-python/tabulate-0.8.7
+2012011340 metadata/md5-cache/dev-python/tagpy-2018.1-r1
+2012011340 metadata/md5-cache/dev-python/tappy-3.0
+2012011340 metadata/md5-cache/dev-python/taskflow-4.1.0
+2012011340 metadata/md5-cache/dev-python/taskflow-4.5.0
+2012011340 metadata/md5-cache/dev-python/tblib-1.7.0
+2012011340 metadata/md5-cache/dev-python/tempita-0.5.3-r3
+2012011340 metadata/md5-cache/dev-python/tempora-3.0.0
+2012011340 metadata/md5-cache/dev-python/tempora-4.0.0
+2012011340 metadata/md5-cache/dev-python/tempora-4.0.1
+2012011340 metadata/md5-cache/dev-python/tenacity-6.2.0
+2012011340 metadata/md5-cache/dev-python/termcolor-1.1.0-r2
+2012011340 metadata/md5-cache/dev-python/terminado-0.8.3
+2012011340 metadata/md5-cache/dev-python/terminado-0.9.1
+2012011340 metadata/md5-cache/dev-python/terminaltables-3.1.0
+2012011340 metadata/md5-cache/dev-python/terminaltables-9999
+2012011340 metadata/md5-cache/dev-python/test_server-0.0.31
+2012011340 metadata/md5-cache/dev-python/testfixtures-6.15.0
+2012011340 metadata/md5-cache/dev-python/testpath-0.4.4-r1
+2012011340 metadata/md5-cache/dev-python/testrepository-0.0.20
+2012011340 metadata/md5-cache/dev-python/testresources-2.0.1
+2012012039 metadata/md5-cache/dev-python/testscenarios-0.5.0-r1
+2012012039 metadata/md5-cache/dev-python/testtools-2.4.0-r1
+2012011340 metadata/md5-cache/dev-python/text-unidecode-1.3
+2012011340 metadata/md5-cache/dev-python/texttable-1.6.3
+2012011340 metadata/md5-cache/dev-python/textx-1.4
+2012011340 metadata/md5-cache/dev-python/theano-1.0.5
+2012011340 metadata/md5-cache/dev-python/threadpoolctl-2.1.0
+2012011340 metadata/md5-cache/dev-python/three-merge-0.1.1
+2012011340 metadata/md5-cache/dev-python/thrift-0.11.0
+2012011340 metadata/md5-cache/dev-python/tikzplotlib-0.9.4
+2012011340 metadata/md5-cache/dev-python/tinycss-0.4
+2012011340 metadata/md5-cache/dev-python/tinycss2-1.0.2
+2012011340 metadata/md5-cache/dev-python/tinycss2-1.1.0
+2012011340 metadata/md5-cache/dev-python/tinyrpc-1.0.1
+2012011340 metadata/md5-cache/dev-python/tld-0.12.2
+2012030239 metadata/md5-cache/dev-python/tldextract-2.2.1
+2012011340 metadata/md5-cache/dev-python/toml-0.10.1-r1
+2012011340 metadata/md5-cache/dev-python/toml-0.10.2
+2012011340 metadata/md5-cache/dev-python/toolz-0.11.1
+2012011340 metadata/md5-cache/dev-python/tooz-2.7.1
+2012011409 metadata/md5-cache/dev-python/towncrier-19.2.0
+2012011340 metadata/md5-cache/dev-python/tox-3.20.1
+2012011340 metadata/md5-cache/dev-python/tox-3.20.1-r1
+2012011340 metadata/md5-cache/dev-python/tqdm-4.51.0
+2012011340 metadata/md5-cache/dev-python/tqdm-4.53.0
+2012011340 metadata/md5-cache/dev-python/tqdm-4.54.0
+2012011340 metadata/md5-cache/dev-python/tqdm-9999
+2012011340 metadata/md5-cache/dev-python/traceback2-1.4.0-r1
+2012011340 metadata/md5-cache/dev-python/traitlets-4.3.3
+2012011340 metadata/md5-cache/dev-python/traitlets-5.0.5
+2012011340 metadata/md5-cache/dev-python/transitions-0.8.2-r1
+2012011340 metadata/md5-cache/dev-python/translate-toolkit-2.5.1
+2012011340 metadata/md5-cache/dev-python/translate-toolkit-3.2.0
+2012011340 metadata/md5-cache/dev-python/treq-20.9.0
+2012011340 metadata/md5-cache/dev-python/trustme-0.6.0-r1
+2012011340 metadata/md5-cache/dev-python/tubes-0.2.0-r1
+2012011340 metadata/md5-cache/dev-python/tvdb_api-2.0-r1
+2012011340 metadata/md5-cache/dev-python/twine-3.2.0
+2012011340 metadata/md5-cache/dev-python/twisted-19.10.0
+2012011409 metadata/md5-cache/dev-python/twisted-20.3.0
+2012011340 metadata/md5-cache/dev-python/twython-3.7.0
+2012011340 metadata/md5-cache/dev-python/txAMQP-0.8.2
+2012011340 metadata/md5-cache/dev-python/txaio-20.4.1
+2012011340 metadata/md5-cache/dev-python/txgithub-15.0.0-r1
+2012011340 metadata/md5-cache/dev-python/txrequests-0.9.6
+2012011340 metadata/md5-cache/dev-python/typed-ast-1.4.1
+2012011340 metadata/md5-cache/dev-python/typing-3.7.4.3
+2012011340 metadata/md5-cache/dev-python/typing-extensions-3.7.4.3
+2012011340 metadata/md5-cache/dev-python/tzlocal-2.1
+2012011340 metadata/md5-cache/dev-python/u-msgpack-2.7.1
+2012011340 metadata/md5-cache/dev-python/ubelt-0.9.1
+2012011340 metadata/md5-cache/dev-python/ujson-1.35-r1
+2012011340 metadata/md5-cache/dev-python/ujson-4.0.1
+2012011340 metadata/md5-cache/dev-python/uncertainties-3.1.4-r1
+2012011340 metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1
+2012011340 metadata/md5-cache/dev-python/unidecode-0.04.21
+2012011340 metadata/md5-cache/dev-python/unidecode-1.1.1
+2012011340 metadata/md5-cache/dev-python/unittest-mixins-1.6-r1
+2012011340 metadata/md5-cache/dev-python/unittest2-1.1.0-r1
+2012011340 metadata/md5-cache/dev-python/uranium-4.7.0
+2012011340 metadata/md5-cache/dev-python/uranium-4.8.0
+2012011340 metadata/md5-cache/dev-python/urdf_parser_py-0.4.3
+2012011340 metadata/md5-cache/dev-python/uritemplate-3.0.1-r1
+2012011340 metadata/md5-cache/dev-python/urlgrabber-4.0.0
+2012011340 metadata/md5-cache/dev-python/urllib3-1.24.2-r1
+2012011340 metadata/md5-cache/dev-python/urllib3-1.25.11
+2012011340 metadata/md5-cache/dev-python/urllib3-1.26.0
+2012011340 metadata/md5-cache/dev-python/urllib3-1.26.1
+2012011340 metadata/md5-cache/dev-python/urllib3-1.26.2
+2012021409 metadata/md5-cache/dev-python/urllib3-1.26.2-r1
+2012011340 metadata/md5-cache/dev-python/urwid-2.1.1
+2012011340 metadata/md5-cache/dev-python/urwidtrees-1.0.3
+2012011340 metadata/md5-cache/dev-python/utidylib-0.6-r1
+2012011340 metadata/md5-cache/dev-python/uvloop-0.14.0
+2012011340 metadata/md5-cache/dev-python/vcrpy-4.1.1
+2012011340 metadata/md5-cache/dev-python/vcstools-0.1.42
+2012011340 metadata/md5-cache/dev-python/vcversioner-2.16.0.0
+2012011340 metadata/md5-cache/dev-python/vdf-3.3
+2012011340 metadata/md5-cache/dev-python/vdirsyncer-0.16.8
+2012011340 metadata/md5-cache/dev-python/vecrec-0.3.0
+2012011340 metadata/md5-cache/dev-python/verboselogs-1.7
+2012011340 metadata/md5-cache/dev-python/versioneer-0.18-r1
+2012011340 metadata/md5-cache/dev-python/versioneer-0.19
+2012011340 metadata/md5-cache/dev-python/vine-1.3.0
+2012011340 metadata/md5-cache/dev-python/virtualenv-16.7.10-r1
+2012011340 metadata/md5-cache/dev-python/virtualenv-20.1.0
+2012011340 metadata/md5-cache/dev-python/virtualenv-20.2.1
+2012011340 metadata/md5-cache/dev-python/virtualenv-clone-0.5.3
+2012011340 metadata/md5-cache/dev-python/virtualenvwrapper-4.8.4-r1
+2012011340 metadata/md5-cache/dev-python/visitor-0.1.3-r1
+2012011340 metadata/md5-cache/dev-python/vncdotool-0.13.0
+2012011340 metadata/md5-cache/dev-python/vncdotool-1.0.0
+2012011340 metadata/md5-cache/dev-python/vobject-0.9.6.1-r2
+2012011340 metadata/md5-cache/dev-python/voluptuous-0.12.0
+2012011340 metadata/md5-cache/dev-python/vpython-7.6.1-r2
+2012011340 metadata/md5-cache/dev-python/waitress-1.4.4
+2012011340 metadata/md5-cache/dev-python/wand-0.6.3
+2012011340 metadata/md5-cache/dev-python/wand-0.6.5
+2012011340 metadata/md5-cache/dev-python/warlock-1.3.3
+2012011340 metadata/md5-cache/dev-python/watchdog-0.10.3
+2012011340 metadata/md5-cache/dev-python/watchdog-0.10.4
+2012011340 metadata/md5-cache/dev-python/watchdog-0.8.3-r2
+2012011340 metadata/md5-cache/dev-python/wcwidth-0.2.5-r1
+2012011340 metadata/md5-cache/dev-python/weasyprint-51
+2012011340 metadata/md5-cache/dev-python/webassets-2.0
+2012011340 metadata/md5-cache/dev-python/webcolors-1.11.1
+2012011340 metadata/md5-cache/dev-python/webencodings-0.5.1-r1
+2012011340 metadata/md5-cache/dev-python/webob-1.8.6
+2012011340 metadata/md5-cache/dev-python/websocket-client-0.57.0
+2012011340 metadata/md5-cache/dev-python/websockets-8.1
+2012011340 metadata/md5-cache/dev-python/websockify-0.9.0
+2012011340 metadata/md5-cache/dev-python/websockify-0.9.0-r1
+2012011340 metadata/md5-cache/dev-python/webtest-2.0.35
+2012011340 metadata/md5-cache/dev-python/werkzeug-1.0.1-r1
+2012011340 metadata/md5-cache/dev-python/wheel-0.35.1-r1
+2012021239 metadata/md5-cache/dev-python/wheel-0.36.0
+2012011340 metadata/md5-cache/dev-python/whichcraft-0.6.1
+2012011340 metadata/md5-cache/dev-python/whisper-1.1.5
+2012011340 metadata/md5-cache/dev-python/whoosh-2.7.4-r1
+2012011340 metadata/md5-cache/dev-python/widgetsnbextension-3.5.1
+2012011340 metadata/md5-cache/dev-python/widgetsnbextension-3.5.1-r1
+2012011340 metadata/md5-cache/dev-python/wrapt-1.12.1
+2012011340 metadata/md5-cache/dev-python/ws4py-0.5.1-r1
+2012011340 metadata/md5-cache/dev-python/ws4py-9999
+2012011340 metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
+2012011340 metadata/md5-cache/dev-python/wsgiproxy2-0.4.6-r1
+2012011340 metadata/md5-cache/dev-python/wsproto-0.15.0
+2012011340 metadata/md5-cache/dev-python/wsproto-1.0.0
+2012011340 metadata/md5-cache/dev-python/wstools-0.4.8
+2012011340 metadata/md5-cache/dev-python/wtforms-2.3.3
+2012011340 metadata/md5-cache/dev-python/wurlitzer-2.0.1
+2012011340 metadata/md5-cache/dev-python/www-authenticate-0.9.2
+2012011340 metadata/md5-cache/dev-python/wxpython-4.0.7
+2012011340 metadata/md5-cache/dev-python/xapp-2.0.1
+2012011340 metadata/md5-cache/dev-python/xarray-0.12.1
+2012011340 metadata/md5-cache/dev-python/xarray-0.16.0
+2012011340 metadata/md5-cache/dev-python/xarray-0.16.1
+2012011340 metadata/md5-cache/dev-python/xarray-0.16.2
+2012011340 metadata/md5-cache/dev-python/xcffib-0.10.1
+2012011340 metadata/md5-cache/dev-python/xcffib-0.11.0
+2012011340 metadata/md5-cache/dev-python/xcffib-0.11.1
+2012011340 metadata/md5-cache/dev-python/xdoctest-0.15.0
+2012011340 metadata/md5-cache/dev-python/xlrd-1.2.0
+2012011340 metadata/md5-cache/dev-python/xlsxwriter-1.3.7
+2012011340 metadata/md5-cache/dev-python/xlutils-2.0.0-r1
+2012011340 metadata/md5-cache/dev-python/xlwt-1.3.0-r1
+2012011340 metadata/md5-cache/dev-python/xmlschema-1.2.3-r1
+2012011340 metadata/md5-cache/dev-python/xmlschema-1.2.4
+2012011340 metadata/md5-cache/dev-python/xmlschema-1.2.5
+2012011340 metadata/md5-cache/dev-python/xmlschema-1.3.0
+2012011340 metadata/md5-cache/dev-python/xmlschema-1.3.1
+2012011340 metadata/md5-cache/dev-python/xmltodict-0.12.0-r1
+2012011340 metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
+2012011340 metadata/md5-cache/dev-python/xxhash-2.0.0
+2012011340 metadata/md5-cache/dev-python/yapf-0.30.0
+2012011340 metadata/md5-cache/dev-python/yappi-1.2.5-r1
+2012011340 metadata/md5-cache/dev-python/yappi-1.3.0
+2012011340 metadata/md5-cache/dev-python/yapsy-1.12.2
+2012011340 metadata/md5-cache/dev-python/yaql-1.1.3
+2012011340 metadata/md5-cache/dev-python/yarl-1.6.2
+2012011340 metadata/md5-cache/dev-python/yarl-1.6.3
+2012011340 metadata/md5-cache/dev-python/yaswfp-0.9.3-r1
+2012011340 metadata/md5-cache/dev-python/zVMCloudConnector-1.4.1
+2012011340 metadata/md5-cache/dev-python/zc-lockfile-2.0
+2012011340 metadata/md5-cache/dev-python/zconfig-3.5.0
+2012011340 metadata/md5-cache/dev-python/zeep-3.4.0
+2012011340 metadata/md5-cache/dev-python/zeroconf-0.24.4
+2012011340 metadata/md5-cache/dev-python/zict-0.1.4
+2012011340 metadata/md5-cache/dev-python/zipp-3.4.0
+2012011340 metadata/md5-cache/dev-python/zope-component-4.4.1
+2012011340 metadata/md5-cache/dev-python/zope-configuration-4.4.0
+2012011340 metadata/md5-cache/dev-python/zope-deprecation-4.4.0
+2012011340 metadata/md5-cache/dev-python/zope-event-4.5.0-r1
+2012011340 metadata/md5-cache/dev-python/zope-exceptions-4.4
+2012011340 metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.1
+2012011340 metadata/md5-cache/dev-python/zope-interface-5.1.2
+2012011340 metadata/md5-cache/dev-python/zope-interface-5.2.0
+2012011340 metadata/md5-cache/dev-python/zope-schema-6.0.0
+2012011340 metadata/md5-cache/dev-python/zope-testing-4.7-r2
+2012011340 metadata/md5-cache/dev-python/zope-testrunner-5.2
+2012011340 metadata/md5-cache/dev-python/zstandard-0.14.0-r1
+2012011340 metadata/md5-cache/dev-python/zstandard-0.8.1-r1
+2012011340 metadata/md5-cache/dev-python/zstd-1.4.5.1
+2012011340 metadata/md5-cache/dev-python/zxcvbn-4.4.28
 2010181809 metadata/md5-cache/dev-qt/qt-docs-5.15.1_p202009071124
 2011252124 metadata/md5-cache/dev-qt/qt-creator-4.12.3
 2011252124 metadata/md5-cache/dev-qt/qt-creator-9999
@@ -43958,7 +43913,6 @@
 2011280109 metadata/md5-cache/dev-qt/qtwebengine-5.15.2
 2011282339 metadata/md5-cache/dev-qt/Manifest.gz
 2011282339 metadata/md5-cache/dev-qt/qtnetwork-5.15.2
-2011252124 metadata/md5-cache/dev-ros/Manifest.gz
 2011252124 metadata/md5-cache/dev-ros/actionlib-1.13.2
 2011252124 metadata/md5-cache/dev-ros/actionlib-9999
 2011252124 metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0
@@ -44057,28 +44011,9 @@
 2011252124 metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.10.0
 2011252124 metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.9.5
 2011252124 metadata/md5-cache/dev-ros/ament_cmake_xmllint-9999
-2011252124 metadata/md5-cache/dev-ros/ament_copyright-0.10.0
-2011252124 metadata/md5-cache/dev-ros/ament_copyright-9999
-2011252124 metadata/md5-cache/dev-ros/ament_cppcheck-0.10.0
-2011252124 metadata/md5-cache/dev-ros/ament_cppcheck-9999
-2011252124 metadata/md5-cache/dev-ros/ament_cpplint-0.10.0
-2011252124 metadata/md5-cache/dev-ros/ament_cpplint-9999
-2011252124 metadata/md5-cache/dev-ros/ament_flake8-0.10.0
-2011252124 metadata/md5-cache/dev-ros/ament_flake8-9999
-2011252124 metadata/md5-cache/dev-ros/ament_lint-0.10.0
-2011252124 metadata/md5-cache/dev-ros/ament_lint-0.9.5
-2011252124 metadata/md5-cache/dev-ros/ament_lint-9999
 2011252124 metadata/md5-cache/dev-ros/ament_lint_auto-0.10.0
 2011252124 metadata/md5-cache/dev-ros/ament_lint_auto-0.9.5
 2011252124 metadata/md5-cache/dev-ros/ament_lint_auto-9999
-2011252124 metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.0
-2011252124 metadata/md5-cache/dev-ros/ament_lint_cmake-9999
-2011252124 metadata/md5-cache/dev-ros/ament_pep257-0.10.0
-2011252124 metadata/md5-cache/dev-ros/ament_pep257-9999
-2011252124 metadata/md5-cache/dev-ros/ament_uncrustify-0.10.0
-2011252124 metadata/md5-cache/dev-ros/ament_uncrustify-9999
-2011252124 metadata/md5-cache/dev-ros/ament_xmllint-0.10.0
-2011252124 metadata/md5-cache/dev-ros/ament_xmllint-9999
 2011252124 metadata/md5-cache/dev-ros/angles-1.9.13
 2011252124 metadata/md5-cache/dev-ros/angles-9999
 2011252124 metadata/md5-cache/dev-ros/audio_capture-0.3.6
@@ -44911,6 +44846,26 @@
 2011252124 metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
 2011252124 metadata/md5-cache/dev-ros/xmlrpcpp-1.15.9
 2011252124 metadata/md5-cache/dev-ros/xmlrpcpp-9999
+2012011340 metadata/md5-cache/dev-ros/Manifest.gz
+2012011340 metadata/md5-cache/dev-ros/ament_copyright-0.10.0
+2012011340 metadata/md5-cache/dev-ros/ament_copyright-9999
+2012011340 metadata/md5-cache/dev-ros/ament_cppcheck-0.10.0
+2012011340 metadata/md5-cache/dev-ros/ament_cppcheck-9999
+2012011340 metadata/md5-cache/dev-ros/ament_cpplint-0.10.0
+2012011340 metadata/md5-cache/dev-ros/ament_cpplint-9999
+2012011340 metadata/md5-cache/dev-ros/ament_flake8-0.10.0
+2012011340 metadata/md5-cache/dev-ros/ament_flake8-9999
+2012011340 metadata/md5-cache/dev-ros/ament_lint-0.10.0
+2012011340 metadata/md5-cache/dev-ros/ament_lint-0.9.5
+2012011340 metadata/md5-cache/dev-ros/ament_lint-9999
+2012011340 metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.0
+2012011340 metadata/md5-cache/dev-ros/ament_lint_cmake-9999
+2012011340 metadata/md5-cache/dev-ros/ament_pep257-0.10.0
+2012011340 metadata/md5-cache/dev-ros/ament_pep257-9999
+2012011340 metadata/md5-cache/dev-ros/ament_uncrustify-0.10.0
+2012011340 metadata/md5-cache/dev-ros/ament_uncrustify-9999
+2012011340 metadata/md5-cache/dev-ros/ament_xmllint-0.10.0
+2012011340 metadata/md5-cache/dev-ros/ament_xmllint-9999
 2011252124 metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
 2011252124 metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1
 2011252124 metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
@@ -45609,11 +45564,7 @@
 2011252124 metadata/md5-cache/dev-ruby/redis-4.1.4
 2011252124 metadata/md5-cache/dev-ruby/ref-2.0.0
 2011252124 metadata/md5-cache/dev-ruby/regexp_parser-0.5.0
-2011252124 metadata/md5-cache/dev-ruby/regexp_parser-1.5.1
 2011252124 metadata/md5-cache/dev-ruby/regexp_parser-1.7.1
-2011252124 metadata/md5-cache/dev-ruby/regexp_parser-1.8.0
-2011252124 metadata/md5-cache/dev-ruby/regexp_parser-1.8.1
-2011252124 metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
 2011252124 metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0
 2011252124 metadata/md5-cache/dev-ruby/request_store-1.5.0
 2011252124 metadata/md5-cache/dev-ruby/rest-client-2.1.0
@@ -46080,7 +46031,12 @@
 2011281009 metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
 2011290339 metadata/md5-cache/dev-ruby/open4-1.3.4
 2011290339 metadata/md5-cache/dev-ruby/pry-0.13.1
-2011291409 metadata/md5-cache/dev-ruby/Manifest.gz
+2012021039 metadata/md5-cache/dev-ruby/Manifest.gz
+2012011009 metadata/md5-cache/dev-ruby/listen-3.3.3
+2012011009 metadata/md5-cache/dev-ruby/nokogumbo-2.0.4
+2012021039 metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
+2012021039 metadata/md5-cache/dev-ruby/regexp_parser-2.0.0
+2012011009 metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.0
 1807201639 metadata/md5-cache/dev-scheme/gauche-gl-0.6
 1807201639 metadata/md5-cache/dev-scheme/gauche-mecab-1.0.2
 1802122238 metadata/md5-cache/dev-scheme/goosh-1.3-r1
@@ -46138,7 +46094,6 @@
 2011071809 metadata/md5-cache/dev-tcltk/tcllib-1.19
 2011071809 metadata/md5-cache/dev-tcltk/tktreectrl-2.4.1
 2011172239 metadata/md5-cache/dev-tcltk/tcllib-1.20
-2011252124 metadata/md5-cache/dev-tcltk/Manifest.gz
 2011252124 metadata/md5-cache/dev-tcltk/blt-2.4z-r13
 2011252124 metadata/md5-cache/dev-tcltk/blt-2.4z-r14
 2011252124 metadata/md5-cache/dev-tcltk/bwidget-1.9.12
@@ -46153,7 +46108,6 @@
 2011252124 metadata/md5-cache/dev-tcltk/itk-4.0.1
 2011252124 metadata/md5-cache/dev-tcltk/itk-4.1.0
 2011252124 metadata/md5-cache/dev-tcltk/iwidgets-4.1.1
-2011252124 metadata/md5-cache/dev-tcltk/snack-2.2.10-r9
 2011252124 metadata/md5-cache/dev-tcltk/tablelist-5.8
 2011252124 metadata/md5-cache/dev-tcltk/tablelist-6.3
 2011252124 metadata/md5-cache/dev-tcltk/tcl3d-0.5.0
@@ -46178,6 +46132,8 @@
 2011252124 metadata/md5-cache/dev-tcltk/tkzinc-3.3.6
 2011252124 metadata/md5-cache/dev-tcltk/tls-1.7.16
 2011252124 metadata/md5-cache/dev-tcltk/tls-1.7.22
+2012011340 metadata/md5-cache/dev-tcltk/Manifest.gz
+2012011340 metadata/md5-cache/dev-tcltk/snack-2.2.10-r9
 1702282321 metadata/md5-cache/dev-tex/cpp2latex-2.3-r2
 1912110241 metadata/md5-cache/dev-tex/biber-2.12
 1912151409 metadata/md5-cache/dev-tex/style-check-0.14
@@ -46208,9 +46164,7 @@
 2009021410 metadata/md5-cache/dev-tex/latexdiff-9999
 2009061109 metadata/md5-cache/dev-tex/latex2html-2017.2-r2
 2011241409 metadata/md5-cache/dev-tex/frakturx-20070103-r1
-2011252124 metadata/md5-cache/dev-tex/Manifest.gz
 2011252124 metadata/md5-cache/dev-tex/catdvi-0.14-r2
-2011252124 metadata/md5-cache/dev-tex/dot2tex-2.11.3
 2011252124 metadata/md5-cache/dev-tex/dvi2gr-0.4-r1
 2011252124 metadata/md5-cache/dev-tex/hevea-2.29
 2011252124 metadata/md5-cache/dev-tex/hevea-2.30
@@ -46226,11 +46180,13 @@
 2011252124 metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1
 2011252124 metadata/md5-cache/dev-tex/pythontex-0.17
 2011252124 metadata/md5-cache/dev-tex/rail-1.2_p1-r1
-2011252124 metadata/md5-cache/dev-tex/rubber-1.5.1
 2011252124 metadata/md5-cache/dev-tex/sketch-0.3.7
 2011252124 metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r11
 2011252124 metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r8
 2011252124 metadata/md5-cache/dev-tex/tth-4.08
+2012031109 metadata/md5-cache/dev-tex/Manifest.gz
+2012031109 metadata/md5-cache/dev-tex/dot2tex-2.11.3
+2012011340 metadata/md5-cache/dev-tex/rubber-1.5.1
 2008121539 metadata/md5-cache/dev-texlive/texlive-basic-2020-r1
 2008121539 metadata/md5-cache/dev-texlive/texlive-bibtexextra-2020
 2008121539 metadata/md5-cache/dev-texlive/texlive-context-2020
@@ -46345,7 +46301,6 @@
 2004032241 metadata/md5-cache/dev-util/patchutils-0.3.4
 2004032241 metadata/md5-cache/dev-util/shtool-2.0.8-r1
 2004032241 metadata/md5-cache/dev-util/treecc-0.3.10-r1
-2004032241 metadata/md5-cache/dev-util/xfce4-dev-tools-4.14.0
 2004060109 metadata/md5-cache/dev-util/sgb-20030623-r1
 2004060109 metadata/md5-cache/dev-util/sgb-20090810
 2004090109 metadata/md5-cache/dev-util/clinfo-2.2.18.03.26
@@ -46397,7 +46352,6 @@
 2009151739 metadata/md5-cache/dev-util/packer-1.5.6
 2009161539 metadata/md5-cache/dev-util/packer-1.6.1
 2009141809 metadata/md5-cache/dev-util/webhook-2.7.0
-2009171539 metadata/md5-cache/dev-util/idea-community-2020.2.2.202.7319.50
 2009181139 metadata/md5-cache/dev-util/byacc-20200330
 2009181209 metadata/md5-cache/dev-util/debootstrap-1.0.123
 2009212109 metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r3
@@ -46411,7 +46365,6 @@
 2010031409 metadata/md5-cache/dev-util/checkbashisms-2.20.2
 2010031409 metadata/md5-cache/dev-util/checkbashisms-2.20.3
 2010031409 metadata/md5-cache/dev-util/checkbashisms-2.20.4
-2010071939 metadata/md5-cache/dev-util/idea-community-2020.2.3.202.7660.26
 2010091139 metadata/md5-cache/dev-util/re2c-2.0.3
 2010121539 metadata/md5-cache/dev-util/cproto-4.7q
 2010131809 metadata/md5-cache/dev-util/android-studio-4.1.0.19.201.6858069
@@ -46492,31 +46445,7 @@
 2011252124 metadata/md5-cache/dev-util/bsdiff-4.3-r4
 2011252124 metadata/md5-cache/dev-util/btyacc-3.0-r3
 2011252124 metadata/md5-cache/dev-util/build2-0.13.0
-2011252124 metadata/md5-cache/dev-util/buildbot-2.8.2-r1
-2011252124 metadata/md5-cache/dev-util/buildbot-2.8.4
-2011252124 metadata/md5-cache/dev-util/buildbot-9999
-2011252124 metadata/md5-cache/dev-util/buildbot-badges-2.8.2
-2011252124 metadata/md5-cache/dev-util/buildbot-badges-2.8.4
-2011252124 metadata/md5-cache/dev-util/buildbot-console-view-2.8.2
-2011252124 metadata/md5-cache/dev-util/buildbot-console-view-2.8.4
-2011252124 metadata/md5-cache/dev-util/buildbot-grid-view-2.8.2
-2011252124 metadata/md5-cache/dev-util/buildbot-grid-view-2.8.4
-2011252124 metadata/md5-cache/dev-util/buildbot-pkg-2.8.2
-2011252124 metadata/md5-cache/dev-util/buildbot-pkg-2.8.4
-2011252124 metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.2
-2011252124 metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.4
-2011252124 metadata/md5-cache/dev-util/buildbot-worker-2.8.2
-2011252124 metadata/md5-cache/dev-util/buildbot-worker-2.8.4
-2011252124 metadata/md5-cache/dev-util/buildbot-worker-9999
-2011252124 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.2
-2011252124 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.4
-2011252124 metadata/md5-cache/dev-util/buildbot-www-2.8.2
-2011252124 metadata/md5-cache/dev-util/buildbot-www-2.8.4
 2011252124 metadata/md5-cache/dev-util/bustle-0.5.4
-2011252124 metadata/md5-cache/dev-util/catalyst-3.0.14
-2011252124 metadata/md5-cache/dev-util/catalyst-9999
-2011252124 metadata/md5-cache/dev-util/catfish-1.4.13
-2011252124 metadata/md5-cache/dev-util/catfish-4.15.0
 2011252124 metadata/md5-cache/dev-util/catkin-0.8.8-r1
 2011252124 metadata/md5-cache/dev-util/catkin-9999
 2011252124 metadata/md5-cache/dev-util/ccache-3.7.12
@@ -46531,8 +46460,6 @@
 2011252124 metadata/md5-cache/dev-util/chroot-wrapper-0.9.3
 2011252124 metadata/md5-cache/dev-util/clazy-1.7-r1
 2011252124 metadata/md5-cache/dev-util/clazy-1.8
-2011252124 metadata/md5-cache/dev-util/cligh-0.3
-2011252124 metadata/md5-cache/dev-util/cligh-9999
 2011252124 metadata/md5-cache/dev-util/cmake-3.13.5
 2011252124 metadata/md5-cache/dev-util/cmake-3.16.5
 2011252124 metadata/md5-cache/dev-util/cmake-3.17.4-r1
@@ -46546,23 +46473,12 @@
 2011252124 metadata/md5-cache/dev-util/codeblocks-20.03-r1
 2011252124 metadata/md5-cache/dev-util/codeblocks-20.03-r2
 2011252124 metadata/md5-cache/dev-util/codeblocks-9999
-2011252124 metadata/md5-cache/dev-util/comparator-2.12
-2011252124 metadata/md5-cache/dev-util/conan-1.28.0
-2011252124 metadata/md5-cache/dev-util/conan-1.28.1
 2011252124 metadata/md5-cache/dev-util/conf2struct-1.0
 2011252124 metadata/md5-cache/dev-util/conf2struct-1.3
 2011252124 metadata/md5-cache/dev-util/conf2struct-9999
-2011252124 metadata/md5-cache/dev-util/cookiecutter-1.7.2
-2011252124 metadata/md5-cache/dev-util/cookiecutter-1.7.2-r1
-2011252124 metadata/md5-cache/dev-util/cppcheck-1.86
-2011252124 metadata/md5-cache/dev-util/cppcheck-1.87
-2011252124 metadata/md5-cache/dev-util/cppcheck-1.88
-2011252124 metadata/md5-cache/dev-util/cppcheck-9999
 2011252124 metadata/md5-cache/dev-util/cppunit-1.14.0
 2011252124 metadata/md5-cache/dev-util/cppunit-9999
 2011252124 metadata/md5-cache/dev-util/cpputest-4.0
-2011252124 metadata/md5-cache/dev-util/cram-0.7
-2011252124 metadata/md5-cache/dev-util/cram-0.7-r1
 2011252124 metadata/md5-cache/dev-util/crash-7.2.8-r1
 2011252124 metadata/md5-cache/dev-util/creduce-2.11.0_pre20191110
 2011252124 metadata/md5-cache/dev-util/cscope-15.8a-r1
@@ -46605,10 +46521,7 @@
 2011252124 metadata/md5-cache/dev-util/diffuse-0.5.0_alpha7-r1
 2011252124 metadata/md5-cache/dev-util/dirdiff-2.1-r3
 2011252124 metadata/md5-cache/dev-util/dissembler-0.9-r1
-2011252124 metadata/md5-cache/dev-util/distro-info-0.22
 2011252124 metadata/md5-cache/dev-util/docker-ls-0.3.1
-2011252124 metadata/md5-cache/dev-util/dogtail-0.9.11
-2011252124 metadata/md5-cache/dev-util/dput-ng-1.28-r1
 2011252124 metadata/md5-cache/dev-util/dropwatch-1.4_p20150706
 2011252124 metadata/md5-cache/dev-util/duma-2.5.15-r2
 2011252124 metadata/md5-cache/dev-util/dwarves-1.17
@@ -46628,19 +46541,12 @@
 2011252124 metadata/md5-cache/dev-util/eric-18.03
 2011252124 metadata/md5-cache/dev-util/eric-19.11-r1
 2011252124 metadata/md5-cache/dev-util/findbugs-3.0.1
-2011252124 metadata/md5-cache/dev-util/flawfinder-2.0.11
 2011252124 metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r2
 2011252124 metadata/md5-cache/dev-util/ftnchek-3.3.1-r2
 2011252124 metadata/md5-cache/dev-util/fuzz-0.6-r1
-2011252124 metadata/md5-cache/dev-util/gcovr-4.2
-2011252124 metadata/md5-cache/dev-util/gdbus-codegen-2.62.6
-2011252124 metadata/md5-cache/dev-util/gdbus-codegen-2.64.5
-2011252124 metadata/md5-cache/dev-util/gdbus-codegen-2.66.0
 2011252124 metadata/md5-cache/dev-util/geany-9999
 2011252124 metadata/md5-cache/dev-util/geany-plugins-1.37-r100
 2011252124 metadata/md5-cache/dev-util/gengetopt-2.23
-2011252124 metadata/md5-cache/dev-util/gertty-1.6.0-r1
-2011252124 metadata/md5-cache/dev-util/gertty-9999
 2011252124 metadata/md5-cache/dev-util/github-cli-0.10.1
 2011252124 metadata/md5-cache/dev-util/github-cli-0.11.0
 2011252124 metadata/md5-cache/dev-util/github-cli-0.9.0-r1
@@ -46666,20 +46572,12 @@
 2011252124 metadata/md5-cache/dev-util/google-perftools-2.8
 2011252124 metadata/md5-cache/dev-util/gource-0.51
 2011252124 metadata/md5-cache/dev-util/gperf-3.1
-2011252124 metadata/md5-cache/dev-util/gprof2dot-2019.11.30
 2011252124 metadata/md5-cache/dev-util/gtk-builder-convert-2.24.32-r1
 2011252124 metadata/md5-cache/dev-util/gtk-doc-1.32-r1
-2011252124 metadata/md5-cache/dev-util/gtk-doc-1.32-r2
 2011252124 metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.20
 2011252124 metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.21
-2011252124 metadata/md5-cache/dev-util/gyp-20200512145953
-2011252124 metadata/md5-cache/dev-util/gyp-99999999999999
 2011252124 metadata/md5-cache/dev-util/heaptrack-9999
 2011252124 metadata/md5-cache/dev-util/hfstospell-0.5.2
-2011252124 metadata/md5-cache/dev-util/howdoi-1.2.1
-2011252124 metadata/md5-cache/dev-util/howdoi-2.0.5
-2011252124 metadata/md5-cache/dev-util/howdoi-2.0.6
-2011252124 metadata/md5-cache/dev-util/howdoi-2.0.7
 2011252124 metadata/md5-cache/dev-util/huc-0.1-r1
 2011252124 metadata/md5-cache/dev-util/hxd-0.70.02-r2
 2011252124 metadata/md5-cache/dev-util/icemon-3.1.0
@@ -46738,10 +46636,7 @@
 2011252124 metadata/md5-cache/dev-util/mdds-1.6.0
 2011252124 metadata/md5-cache/dev-util/mdds-1.7.0
 2011252124 metadata/md5-cache/dev-util/mdds-9999
-2011252124 metadata/md5-cache/dev-util/meld-3.20.2-r1
 2011252124 metadata/md5-cache/dev-util/memprof-0.6.2-r1
-2011252124 metadata/md5-cache/dev-util/meson-0.55.3
-2011252124 metadata/md5-cache/dev-util/meson-9999
 2011252124 metadata/md5-cache/dev-util/min-cscope-16.1.0
 2011252124 metadata/md5-cache/dev-util/mingw64-runtime-7.0.0-r1
 2011252124 metadata/md5-cache/dev-util/mingw64-runtime-8.0.0
@@ -46781,7 +46676,6 @@
 2011252124 metadata/md5-cache/dev-util/omake-0.10.3
 2011252124 metadata/md5-cache/dev-util/omake-0.9.8.6.0_rc1
 2011252124 metadata/md5-cache/dev-util/oprofile-1.3.0
-2011252124 metadata/md5-cache/dev-util/oprofile-1.4.0
 2011252124 metadata/md5-cache/dev-util/ostree-2019.5
 2011252124 metadata/md5-cache/dev-util/ostree-2020.6
 2011252124 metadata/md5-cache/dev-util/ostree-2020.7
@@ -46794,7 +46688,6 @@
 2011252124 metadata/md5-cache/dev-util/perf-5.7-r1
 2011252124 metadata/md5-cache/dev-util/perf-5.8
 2011252124 metadata/md5-cache/dev-util/perf-5.9.9
-2011252124 metadata/md5-cache/dev-util/pkgcheck-9999
 2011252124 metadata/md5-cache/dev-util/pkgconf-1.6.3
 2011252124 metadata/md5-cache/dev-util/pkgconf-1.7.2
 2011252124 metadata/md5-cache/dev-util/pkgconf-1.7.3-r1
@@ -46840,7 +46733,6 @@
 2011252124 metadata/md5-cache/dev-util/ragel-7.0.0.10-r2
 2011252124 metadata/md5-cache/dev-util/ragel-7.0.0.12
 2011252124 metadata/md5-cache/dev-util/rats-2.4
-2011252124 metadata/md5-cache/dev-util/rbtools-1.0.3
 2011252124 metadata/md5-cache/dev-util/rebar-2.6.4-r1
 2011252124 metadata/md5-cache/dev-util/redo-0.42a
 2011252124 metadata/md5-cache/dev-util/redo-0.42c
@@ -46853,12 +46745,6 @@
 2011252124 metadata/md5-cache/dev-util/rocminfo-3.8.0
 2011252124 metadata/md5-cache/dev-util/rocminfo-3.9.0
 2011252124 metadata/md5-cache/dev-util/rocminfo-9999
-2011252124 metadata/md5-cache/dev-util/rosdep-0.19.0-r1
-2011252124 metadata/md5-cache/dev-util/rosdep-9999
-2011252124 metadata/md5-cache/dev-util/rosinstall-0.7.8
-2011252124 metadata/md5-cache/dev-util/rosinstall-9999
-2011252124 metadata/md5-cache/dev-util/rosinstall_generator-0.1.22-r1
-2011252124 metadata/md5-cache/dev-util/rosinstall_generator-9999
 2011252124 metadata/md5-cache/dev-util/rpmdevtools-8.10-r2
 2011252124 metadata/md5-cache/dev-util/rpmdevtools-9.2
 2011252124 metadata/md5-cache/dev-util/rr-5.4.0
@@ -46868,9 +46754,6 @@
 2011252124 metadata/md5-cache/dev-util/scala-ide-4.7.0
 2011252124 metadata/md5-cache/dev-util/scanmem-0.17
 2011252124 metadata/md5-cache/dev-util/schroot-1.6.10_p7
-2011252124 metadata/md5-cache/dev-util/scons-3.1.1
-2011252124 metadata/md5-cache/dev-util/scons-3.1.2
-2011252124 metadata/md5-cache/dev-util/scons-4.0.1
 2011252124 metadata/md5-cache/dev-util/sel-0.08.4-r2
 2011252124 metadata/md5-cache/dev-util/serialtalk-1.2-r1
 2011252124 metadata/md5-cache/dev-util/serialtalk-9999
@@ -46925,7 +46808,6 @@
 2011252124 metadata/md5-cache/dev-util/usb-robot-0.2.0
 2011252124 metadata/md5-cache/dev-util/valgrind-3.16.1
 2011252124 metadata/md5-cache/dev-util/valgrind-9999
-2011252124 metadata/md5-cache/dev-util/vint-0.3.21
 2011252124 metadata/md5-cache/dev-util/visual-regexp-3.0-r1
 2011252124 metadata/md5-cache/dev-util/visual-regexp-3.1
 2011252124 metadata/md5-cache/dev-util/visualvm-1.4.1
@@ -46938,20 +46820,14 @@
 2011252124 metadata/md5-cache/dev-util/vulkan-tools-1.2.141
 2011252124 metadata/md5-cache/dev-util/vulkan-tools-1.2.154
 2011252124 metadata/md5-cache/dev-util/vulkan-tools-9999
-2011252124 metadata/md5-cache/dev-util/watchman-4.9.0
 2011252124 metadata/md5-cache/dev-util/weka-3.7.13
 2011252124 metadata/md5-cache/dev-util/weka-3.8.0
 2011252124 metadata/md5-cache/dev-util/wiggle-0.9-r1
-2011252124 metadata/md5-cache/dev-util/wiggle-1.0
-2011252124 metadata/md5-cache/dev-util/wstool-0.1.18
-2011252124 metadata/md5-cache/dev-util/wstool-9999
 2011252124 metadata/md5-cache/dev-util/xdelta-1.1.4-r3
 2011252124 metadata/md5-cache/dev-util/xdelta-3.1.0
 2011252124 metadata/md5-cache/dev-util/xmlindent-0.2.17-r2
 2011252124 metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1
 2011252124 metadata/md5-cache/dev-util/yacc-1.9.1-r6
-2011252124 metadata/md5-cache/dev-util/ydiff-1.1
-2011252124 metadata/md5-cache/dev-util/ydiff-1.2
 2011252124 metadata/md5-cache/dev-util/yuicompressor-2.4.8-r2
 2011260209 metadata/md5-cache/dev-util/idea-community-2020.2.4.202.8194.7
 2011281009 metadata/md5-cache/dev-util/bingrep-0.8.2
@@ -46964,7 +46840,6 @@
 2011281009 metadata/md5-cache/dev-util/cargo-license-0.3.0
 2011281009 metadata/md5-cache/dev-util/cbindgen-0.15.0
 2011272109 metadata/md5-cache/dev-util/difffilter-0.3.3-r1
-2011272309 metadata/md5-cache/dev-util/diffoscope-162
 2011281009 metadata/md5-cache/dev-util/git-delta-0.4.4
 2011280039 metadata/md5-cache/dev-util/ostree-2020.8
 2011281009 metadata/md5-cache/dev-util/rustup-1.22.1-r2
@@ -46974,23 +46849,104 @@
 2011281009 metadata/md5-cache/dev-util/wasmer-0.11.0
 2011290339 metadata/md5-cache/dev-util/aruba-1.0.3-r1
 2011281539 metadata/md5-cache/dev-util/cunit-2.1_p3
-2011282039 metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
 2011281339 metadata/md5-cache/dev-util/kyua-0.13-r2
 2011291209 metadata/md5-cache/dev-util/lldb-12.0.0.9999
-2011281109 metadata/md5-cache/dev-util/pkgcheck-0.7.7
 2011281109 metadata/md5-cache/dev-util/rustup-1.23.0
-2011292039 metadata/md5-cache/dev-util/debhelper-13.2.1
-2011292039 metadata/md5-cache/dev-util/indent-2.2.12
 2011300509 metadata/md5-cache/dev-util/jenkins-bin-2.268
 2011291409 metadata/md5-cache/dev-util/lldb-11.0.1.9999
 2011291409 metadata/md5-cache/dev-util/lldb-11.0.1_rc1
 2011292139 metadata/md5-cache/dev-util/ninja-1.10.2
-2011292039 metadata/md5-cache/dev-util/shflags-1.2.3
-2011302139 metadata/md5-cache/dev-util/Manifest.gz
 2011301139 metadata/md5-cache/dev-util/ccache-4.1
-2011301239 metadata/md5-cache/dev-util/cmake-3.19.1
 2011302139 metadata/md5-cache/dev-util/imediff2-1.1.2-r6
-2011300939 metadata/md5-cache/dev-util/rbtools-2.0
+2012030909 metadata/md5-cache/dev-util/Manifest.gz
+2012011340 metadata/md5-cache/dev-util/buildbot-2.8.2-r1
+2012011340 metadata/md5-cache/dev-util/buildbot-2.8.4
+2012011340 metadata/md5-cache/dev-util/buildbot-9999
+2012011340 metadata/md5-cache/dev-util/buildbot-badges-2.8.2
+2012011340 metadata/md5-cache/dev-util/buildbot-badges-2.8.4
+2012011340 metadata/md5-cache/dev-util/buildbot-console-view-2.8.2
+2012011340 metadata/md5-cache/dev-util/buildbot-console-view-2.8.4
+2012011340 metadata/md5-cache/dev-util/buildbot-grid-view-2.8.2
+2012011340 metadata/md5-cache/dev-util/buildbot-grid-view-2.8.4
+2012011340 metadata/md5-cache/dev-util/buildbot-pkg-2.8.2
+2012011340 metadata/md5-cache/dev-util/buildbot-pkg-2.8.4
+2012011340 metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.2
+2012011340 metadata/md5-cache/dev-util/buildbot-waterfall-view-2.8.4
+2012011340 metadata/md5-cache/dev-util/buildbot-worker-2.8.2
+2012011340 metadata/md5-cache/dev-util/buildbot-worker-2.8.4
+2012011340 metadata/md5-cache/dev-util/buildbot-worker-9999
+2012011340 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.2
+2012011340 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-2.8.4
+2012011340 metadata/md5-cache/dev-util/buildbot-www-2.8.2
+2012011340 metadata/md5-cache/dev-util/buildbot-www-2.8.4
+2012011340 metadata/md5-cache/dev-util/catalyst-3.0.14
+2012011340 metadata/md5-cache/dev-util/catalyst-9999
+2012011340 metadata/md5-cache/dev-util/catfish-1.4.13
+2012011340 metadata/md5-cache/dev-util/catfish-4.15.0
+2012011340 metadata/md5-cache/dev-util/cligh-0.3
+2012011340 metadata/md5-cache/dev-util/cligh-9999
+2012022209 metadata/md5-cache/dev-util/cmake-3.19.1
+2012011340 metadata/md5-cache/dev-util/comparator-2.12
+2012011340 metadata/md5-cache/dev-util/conan-1.28.0
+2012011340 metadata/md5-cache/dev-util/conan-1.28.1
+2012011340 metadata/md5-cache/dev-util/cookiecutter-1.7.2
+2012011340 metadata/md5-cache/dev-util/cookiecutter-1.7.2-r1
+2012011340 metadata/md5-cache/dev-util/cppcheck-1.86
+2012011340 metadata/md5-cache/dev-util/cppcheck-1.87
+2012011340 metadata/md5-cache/dev-util/cppcheck-1.88
+2012011340 metadata/md5-cache/dev-util/cppcheck-9999
+2012011340 metadata/md5-cache/dev-util/cram-0.7
+2012011340 metadata/md5-cache/dev-util/cram-0.7-r1
+2012030209 metadata/md5-cache/dev-util/debhelper-13.2.1
+2012030809 metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
+2012011340 metadata/md5-cache/dev-util/diffoscope-162
+2012011340 metadata/md5-cache/dev-util/distro-info-0.22
+2012011340 metadata/md5-cache/dev-util/dogtail-0.9.11
+2012011340 metadata/md5-cache/dev-util/dput-ng-1.28-r1
+2012011340 metadata/md5-cache/dev-util/flawfinder-2.0.11
+2012011340 metadata/md5-cache/dev-util/gcovr-4.2
+2012011340 metadata/md5-cache/dev-util/gdbus-codegen-2.62.6
+2012011340 metadata/md5-cache/dev-util/gdbus-codegen-2.64.5
+2012011340 metadata/md5-cache/dev-util/gdbus-codegen-2.66.0
+2012011340 metadata/md5-cache/dev-util/gertty-1.6.0-r1
+2012011340 metadata/md5-cache/dev-util/gertty-9999
+2012011340 metadata/md5-cache/dev-util/gprof2dot-2019.11.30
+2012022239 metadata/md5-cache/dev-util/gtk-doc-1.32-r2
+2012011340 metadata/md5-cache/dev-util/gyp-20200512145953
+2012011340 metadata/md5-cache/dev-util/gyp-99999999999999
+2012011340 metadata/md5-cache/dev-util/howdoi-1.2.1
+2012011340 metadata/md5-cache/dev-util/howdoi-2.0.5
+2012011340 metadata/md5-cache/dev-util/howdoi-2.0.6
+2012011340 metadata/md5-cache/dev-util/howdoi-2.0.7
+2012022209 metadata/md5-cache/dev-util/idea-community-2020.3.0.203.5981.155
+2012030839 metadata/md5-cache/dev-util/indent-2.2.12
+2012030909 metadata/md5-cache/dev-util/jenkins-bin-2.263.1
+2012030239 metadata/md5-cache/dev-util/meld-3.20.2-r1
+2012011340 metadata/md5-cache/dev-util/meson-0.55.3
+2012011340 metadata/md5-cache/dev-util/meson-9999
+2012030239 metadata/md5-cache/dev-util/oprofile-1.4.0
+2012011340 metadata/md5-cache/dev-util/pkgcheck-0.7.7
+2012011340 metadata/md5-cache/dev-util/pkgcheck-9999
+2012011340 metadata/md5-cache/dev-util/rbtools-1.0.3
+2012011340 metadata/md5-cache/dev-util/rbtools-2.0
+2012011340 metadata/md5-cache/dev-util/rosdep-0.19.0-r1
+2012011340 metadata/md5-cache/dev-util/rosdep-9999
+2012011340 metadata/md5-cache/dev-util/rosinstall-0.7.8
+2012011340 metadata/md5-cache/dev-util/rosinstall-9999
+2012011340 metadata/md5-cache/dev-util/rosinstall_generator-0.1.22-r1
+2012011340 metadata/md5-cache/dev-util/rosinstall_generator-9999
+2012011340 metadata/md5-cache/dev-util/scons-3.1.1
+2012011340 metadata/md5-cache/dev-util/scons-3.1.2
+2012011340 metadata/md5-cache/dev-util/scons-4.0.1
+2012030039 metadata/md5-cache/dev-util/shflags-1.2.3
+2012011340 metadata/md5-cache/dev-util/vint-0.3.21
+2012011340 metadata/md5-cache/dev-util/watchman-4.9.0
+2012030509 metadata/md5-cache/dev-util/wiggle-1.0
+2012011340 metadata/md5-cache/dev-util/wstool-0.1.18
+2012011340 metadata/md5-cache/dev-util/wstool-9999
+2012021339 metadata/md5-cache/dev-util/xfce4-dev-tools-4.14.0
+2012011340 metadata/md5-cache/dev-util/ydiff-1.1
+2012011340 metadata/md5-cache/dev-util/ydiff-1.2
 1910111911 metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 1809152309 metadata/md5-cache/dev-vcs/cvsutils-0.2.5-r1
@@ -47022,7 +46978,6 @@
 2011181839 metadata/md5-cache/dev-vcs/git-lfs-9999
 2011252124 metadata/md5-cache/dev-vcs/bfg-1.13.0
 2011252124 metadata/md5-cache/dev-vcs/cssc-1.4.0
-2011252124 metadata/md5-cache/dev-vcs/cssc-1.4.1
 2011252124 metadata/md5-cache/dev-vcs/cvs-1.12.12-r12
 2011252124 metadata/md5-cache/dev-vcs/cvs-fast-export-1.55
 2011252124 metadata/md5-cache/dev-vcs/cvsps-2.2_beta1-r1
@@ -47043,38 +46998,21 @@
 2011252124 metadata/md5-cache/dev-vcs/git-9999-r1
 2011252124 metadata/md5-cache/dev-vcs/git-9999-r2
 2011252124 metadata/md5-cache/dev-vcs/git-annex-8.20200810
-2011252124 metadata/md5-cache/dev-vcs/git-cola-3.5-r1
 2011252124 metadata/md5-cache/dev-vcs/git-flow-1.12.3
 2011252124 metadata/md5-cache/dev-vcs/git-mailz-0.14
 2011252124 metadata/md5-cache/dev-vcs/git-num-2.0.1
 2011252124 metadata/md5-cache/dev-vcs/git-tools-2017.10
 2011252124 metadata/md5-cache/dev-vcs/git-tools-2019.11
 2011252124 metadata/md5-cache/dev-vcs/gitg-3.32.1-r1
-2011252124 metadata/md5-cache/dev-vcs/github-pages-publish-0.1.3
 2011252124 metadata/md5-cache/dev-vcs/gitolite-2.3.1-r1
 2011252124 metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1
 2011252124 metadata/md5-cache/dev-vcs/gitsh-0.11.2
 2011252124 metadata/md5-cache/dev-vcs/gitstats-0_pre20201124
-2011252124 metadata/md5-cache/dev-vcs/hg-evolve-10.0.2-r1
-2011252124 metadata/md5-cache/dev-vcs/hg-evolve-10.1.0
-2011252124 metadata/md5-cache/dev-vcs/hg-git-0.9.0
-2011252124 metadata/md5-cache/dev-vcs/hg-git-0.9.0_rc1-r1
 2011252124 metadata/md5-cache/dev-vcs/hub-2.13.0
 2011252124 metadata/md5-cache/dev-vcs/hub-2.14.1
 2011252124 metadata/md5-cache/dev-vcs/hub-2.14.2
 2011252124 metadata/md5-cache/dev-vcs/kdesvn-2.1.0
 2011252124 metadata/md5-cache/dev-vcs/lab-0.17.2
-2011252124 metadata/md5-cache/dev-vcs/mercurial-5.2.2-r2
-2011252124 metadata/md5-cache/dev-vcs/mercurial-5.3.2-r1
-2011252124 metadata/md5-cache/dev-vcs/mercurial-5.4.2-r1
-2011252124 metadata/md5-cache/dev-vcs/mercurial-5.5.2
-2011252124 metadata/md5-cache/dev-vcs/python-gitlab-1.13.0
-2011252124 metadata/md5-cache/dev-vcs/python-gitlab-1.7.0
-2011252124 metadata/md5-cache/dev-vcs/python-gitlab-1.8.0
-2011252124 metadata/md5-cache/dev-vcs/python-gitlab-1.9.0
-2011252124 metadata/md5-cache/dev-vcs/python-gitlab-2.2.0
-2011252124 metadata/md5-cache/dev-vcs/python-gitlab-2.3.1
-2011252124 metadata/md5-cache/dev-vcs/python-gitlab-2.5.0
 2011252124 metadata/md5-cache/dev-vcs/qgit-2.9
 2011252124 metadata/md5-cache/dev-vcs/rcs-5.9.3
 2011252124 metadata/md5-cache/dev-vcs/rcs-5.9.4
@@ -47082,30 +47020,48 @@
 2011252124 metadata/md5-cache/dev-vcs/repo-2.5
 2011252124 metadata/md5-cache/dev-vcs/repo-2.8
 2011252124 metadata/md5-cache/dev-vcs/rsvndump-0.6-r1
-2011252124 metadata/md5-cache/dev-vcs/stgit-0.21
-2011252124 metadata/md5-cache/dev-vcs/stgit-0.22
-2011252124 metadata/md5-cache/dev-vcs/stgit-0.23
 2011252124 metadata/md5-cache/dev-vcs/subversion-1.14.0-r1
 2011252124 metadata/md5-cache/dev-vcs/svn2git-1.0.16
 2011252124 metadata/md5-cache/dev-vcs/svn2git-1.0.17
 2011252124 metadata/md5-cache/dev-vcs/svn2git-1.0.18
 2011252124 metadata/md5-cache/dev-vcs/svn2git-9999
-2011252124 metadata/md5-cache/dev-vcs/svneverever-1.3.2
-2011252124 metadata/md5-cache/dev-vcs/svneverever-1.4.2
-2011252124 metadata/md5-cache/dev-vcs/svneverever-1.5.0
 2011252124 metadata/md5-cache/dev-vcs/tig-2.5.1
 2011252124 metadata/md5-cache/dev-vcs/tig-9999
 2011252124 metadata/md5-cache/dev-vcs/topgit-0.19.12
 2011252124 metadata/md5-cache/dev-vcs/topgit-0.9-r1
-2011252124 metadata/md5-cache/dev-vcs/tortoisehg-5.5.1
-2011252124 metadata/md5-cache/dev-vcs/tortoisehg-5.5.2
-2011252124 metadata/md5-cache/dev-vcs/tortoisehg-5.6
-2011252124 metadata/md5-cache/dev-vcs/tortoisehg-9999
-2011281009 metadata/md5-cache/dev-vcs/mercurial-9999
 2011291339 metadata/md5-cache/dev-vcs/git-2.29.2
 2011291339 metadata/md5-cache/dev-vcs/git-9999-r3
-2011301139 metadata/md5-cache/dev-vcs/Manifest.gz
-2011301139 metadata/md5-cache/dev-vcs/mercurial-5.6
+2012030509 metadata/md5-cache/dev-vcs/Manifest.gz
+2012030509 metadata/md5-cache/dev-vcs/cssc-1.4.1
+2012011340 metadata/md5-cache/dev-vcs/git-cola-3.5-r1
+2012011340 metadata/md5-cache/dev-vcs/github-pages-publish-0.1.3
+2012011340 metadata/md5-cache/dev-vcs/hg-evolve-10.0.2-r1
+2012011340 metadata/md5-cache/dev-vcs/hg-evolve-10.1.0
+2012011340 metadata/md5-cache/dev-vcs/hg-git-0.9.0
+2012011340 metadata/md5-cache/dev-vcs/hg-git-0.9.0_rc1-r1
+2012011340 metadata/md5-cache/dev-vcs/mercurial-5.2.2-r2
+2012011340 metadata/md5-cache/dev-vcs/mercurial-5.3.2-r1
+2012011340 metadata/md5-cache/dev-vcs/mercurial-5.4.2-r1
+2012011340 metadata/md5-cache/dev-vcs/mercurial-5.5.2
+2012011340 metadata/md5-cache/dev-vcs/mercurial-5.6
+2012011340 metadata/md5-cache/dev-vcs/mercurial-9999
+2012011340 metadata/md5-cache/dev-vcs/python-gitlab-1.13.0
+2012011340 metadata/md5-cache/dev-vcs/python-gitlab-1.7.0
+2012011340 metadata/md5-cache/dev-vcs/python-gitlab-1.8.0
+2012011340 metadata/md5-cache/dev-vcs/python-gitlab-1.9.0
+2012011340 metadata/md5-cache/dev-vcs/python-gitlab-2.2.0
+2012011340 metadata/md5-cache/dev-vcs/python-gitlab-2.3.1
+2012011340 metadata/md5-cache/dev-vcs/python-gitlab-2.5.0
+2012011340 metadata/md5-cache/dev-vcs/stgit-0.21
+2012011340 metadata/md5-cache/dev-vcs/stgit-0.22
+2012011340 metadata/md5-cache/dev-vcs/stgit-0.23
+2012011340 metadata/md5-cache/dev-vcs/svneverever-1.3.2
+2012011340 metadata/md5-cache/dev-vcs/svneverever-1.4.2
+2012011340 metadata/md5-cache/dev-vcs/svneverever-1.5.0
+2012011340 metadata/md5-cache/dev-vcs/tortoisehg-5.5.1
+2012011340 metadata/md5-cache/dev-vcs/tortoisehg-5.5.2
+2012011340 metadata/md5-cache/dev-vcs/tortoisehg-5.6
+2012011340 metadata/md5-cache/dev-vcs/tortoisehg-9999
 1707090139 metadata/md5-cache/games-action/nighthawk-2.2-r1
 1702282322 metadata/md5-cache/games-action/tuxkart-0.4.0-r1
 1707090139 metadata/md5-cache/games-action/xbomber-101-r1
@@ -47187,14 +47143,14 @@
 2011252124 metadata/md5-cache/games-action/trine-1.08-r3
 2011252124 metadata/md5-cache/games-action/trosh-20-r1
 2011252124 metadata/md5-cache/games-action/trosh-20-r2
-2011252124 metadata/md5-cache/games-action/violetland-0.5
 2011252124 metadata/md5-cache/games-action/xblast-2.10.4-r1
 2011252124 metadata/md5-cache/games-action/xpilot-4.5.5-r1
-2011301909 metadata/md5-cache/games-action/Manifest.gz
 2011301909 metadata/md5-cache/games-action/descent1-freedata-1
 2011301909 metadata/md5-cache/games-action/descent2-freedata-1
 2011301909 metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20200615
 2011301909 metadata/md5-cache/games-action/dxx-rebirth-9999
+2012021509 metadata/md5-cache/games-action/Manifest.gz
+2012021509 metadata/md5-cache/games-action/violetland-0.5
 1910111911 metadata/md5-cache/games-arcade/aop-0.6-r1
 1910111911 metadata/md5-cache/games-arcade/ascii-invaders-0.1b-r1
 1910111911 metadata/md5-cache/games-arcade/gnake-0.94b-r1
@@ -47338,7 +47294,6 @@
 2010300139 metadata/md5-cache/games-board/gnushogi-1.4.1-r1
 2011061540 metadata/md5-cache/games-board/camato-0.7.4-r1
 2011061540 metadata/md5-cache/games-board/fruit-2.1-r1
-2011252124 metadata/md5-cache/games-board/Manifest.gz
 2011252124 metadata/md5-cache/games-board/ace-1.4-r2
 2011252124 metadata/md5-cache/games-board/ascal-0.1.1-r1
 2011252124 metadata/md5-cache/games-board/atakks-1.0-r1
@@ -47377,12 +47332,8 @@
 2011252124 metadata/md5-cache/games-board/phalanx-22-r1
 2011252124 metadata/md5-cache/games-board/pioneers-15.5
 2011252124 metadata/md5-cache/games-board/pokerth-1.1.2
-2011252124 metadata/md5-cache/games-board/pychess-1.0.0
-2011252124 metadata/md5-cache/games-board/pychess-1.0.2
-2011252124 metadata/md5-cache/games-board/pysolfc-2.6.4-r1
 2011252124 metadata/md5-cache/games-board/scid-4.6.2-r1
 2011252124 metadata/md5-cache/games-board/simsu-1.3.9
-2011252124 metadata/md5-cache/games-board/sjeng-11.2_p8_p1
 2011252124 metadata/md5-cache/games-board/stockfish-10
 2011252124 metadata/md5-cache/games-board/stockfish-11
 2011252124 metadata/md5-cache/games-board/tali-3.36.4
@@ -47395,6 +47346,11 @@
 2011252124 metadata/md5-cache/games-board/xmille-2.0-r3
 2011252124 metadata/md5-cache/games-board/xscrabble-2.10-r2
 2011252124 metadata/md5-cache/games-board/xskat-4.0-r1
+2012030239 metadata/md5-cache/games-board/Manifest.gz
+2012011340 metadata/md5-cache/games-board/pychess-1.0.0
+2012011340 metadata/md5-cache/games-board/pychess-1.0.2
+2012030239 metadata/md5-cache/games-board/pysolfc-2.6.4-r1
+2012021539 metadata/md5-cache/games-board/sjeng-11.2_p8_p1
 1911021809 metadata/md5-cache/games-emulation/desmume-0.9.11-r2
 1911110109 metadata/md5-cache/games-emulation/emutos-0.9.12
 1808150339 metadata/md5-cache/games-emulation/libretro-info-0.0.1_pre20180723
@@ -47410,7 +47366,6 @@
 2011252124 metadata/md5-cache/games-emulation/atari800-4.2.0
 2011252124 metadata/md5-cache/games-emulation/caps-20071115
 2011252124 metadata/md5-cache/games-emulation/dgen-sdl-1.33-r1
-2011252124 metadata/md5-cache/games-emulation/dolphin-5.0_p20200705
 2011252124 metadata/md5-cache/games-emulation/dolphin-9999
 2011252124 metadata/md5-cache/games-emulation/dosbox-0.74.3
 2011252124 metadata/md5-cache/games-emulation/dosbox-0.75_pre4302
@@ -47442,7 +47397,6 @@
 2011252124 metadata/md5-cache/games-emulation/libretro-twentyfortyeight-0.0.1_pre20180723
 2011252124 metadata/md5-cache/games-emulation/libretro-twentyfortyeight-9999
 2011252124 metadata/md5-cache/games-emulation/lxdream-0.9.1-r3
-2011252124 metadata/md5-cache/games-emulation/m64py-0.2.5
 2011252124 metadata/md5-cache/games-emulation/mamory-0.2.25-r1
 2011252124 metadata/md5-cache/games-emulation/mednafen-0.9.46
 2011252124 metadata/md5-cache/games-emulation/mednaffe-0.8.7
@@ -47475,8 +47429,10 @@
 2011252124 metadata/md5-cache/games-emulation/zsnes-1.51-r8
 2011252124 metadata/md5-cache/games-emulation/zsnes-1.51-r9
 2011281209 metadata/md5-cache/games-emulation/ppsspp-1.10.3
-2011301739 metadata/md5-cache/games-emulation/Manifest.gz
 2011301739 metadata/md5-cache/games-emulation/fceux-2.2.3-r100
+2012030239 metadata/md5-cache/games-emulation/Manifest.gz
+2012030239 metadata/md5-cache/games-emulation/dolphin-5.0_p20200705
+2012011340 metadata/md5-cache/games-emulation/m64py-0.2.5
 1707090139 metadata/md5-cache/games-engines/xzip-1.8.2-r3
 2004101409 metadata/md5-cache/games-engines/zoom-1.1.5-r1
 2010132009 metadata/md5-cache/games-engines/love-0.7.2-r2
@@ -47505,8 +47461,6 @@
 2011252124 metadata/md5-cache/games-engines/openxcom-1.0.0_p20180317
 2011252124 metadata/md5-cache/games-engines/openxcom-9999
 2011252124 metadata/md5-cache/games-engines/qtads-3.0.0
-2011252124 metadata/md5-cache/games-engines/renpy-6.99.12.4-r4
-2011252124 metadata/md5-cache/games-engines/renpy-7.3.5
 2011252124 metadata/md5-cache/games-engines/residualvm-0.2.1-r1
 2011252124 metadata/md5-cache/games-engines/residualvm-0.3.1-r2
 2011252124 metadata/md5-cache/games-engines/residualvm-9999
@@ -47518,8 +47472,10 @@
 2011252124 metadata/md5-cache/games-engines/stratagus-2.4.1
 2011252124 metadata/md5-cache/games-engines/stratagus-2.4.3
 2011281509 metadata/md5-cache/games-engines/dMagnetic-0.28
-2011302139 metadata/md5-cache/games-engines/Manifest.gz
 2011302139 metadata/md5-cache/games-engines/solarus-1.3.1-r100
+2012011340 metadata/md5-cache/games-engines/Manifest.gz
+2012011340 metadata/md5-cache/games-engines/renpy-6.99.12.4-r4
+2012011340 metadata/md5-cache/games-engines/renpy-7.3.5
 1911080039 metadata/md5-cache/games-fps/freedoom-0.12.1
 1910280309 metadata/md5-cache/games-fps/ut2004-bonuspack-ece-1-r4
 1910280309 metadata/md5-cache/games-fps/ut2004-bonuspack-mega-1-r3
@@ -47536,7 +47492,6 @@
 2011090239 metadata/md5-cache/games-fps/ut2004-3369.3-r3
 2011090239 metadata/md5-cache/games-fps/ut2004-bonuspack-cbp1-1-r3
 2011090239 metadata/md5-cache/games-fps/ut2004-bonuspack-cbp2-1-r3
-2011252124 metadata/md5-cache/games-fps/Manifest.gz
 2011252124 metadata/md5-cache/games-fps/alienarena-7.66
 2011252124 metadata/md5-cache/games-fps/avp-20150214-r1
 2011252124 metadata/md5-cache/games-fps/blackshades-20070723-r1
@@ -47545,7 +47500,6 @@
 2011252124 metadata/md5-cache/games-fps/doomsday-2.1.1-r1
 2011252124 metadata/md5-cache/games-fps/duke3d-data-1.0-r4
 2011252124 metadata/md5-cache/games-fps/duke3d-demodata-1.3
-2011252124 metadata/md5-cache/games-fps/eduke32-20200907.9257
 2011252124 metadata/md5-cache/games-fps/etqw-bin-1.5-r2
 2011252124 metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r2
 2011252124 metadata/md5-cache/games-fps/ezquake-bin-2.2
@@ -47588,6 +47542,8 @@
 2011252124 metadata/md5-cache/games-fps/ut2004-demo-3334-r1
 2011252124 metadata/md5-cache/games-fps/wolfgl-0.93-r2
 2011252124 metadata/md5-cache/games-fps/xonotic-0.8.2
+2012030039 metadata/md5-cache/games-fps/Manifest.gz
+2012030039 metadata/md5-cache/games-fps/eduke32-20201128.9276
 2010152339 metadata/md5-cache/games-kids/lletters-0.1.95-r4
 2011252124 metadata/md5-cache/games-kids/Manifest.gz
 2011252124 metadata/md5-cache/games-kids/gcompris-0.97-r1
@@ -47627,7 +47583,6 @@
 2011252124 metadata/md5-cache/games-misc/bsd-games-2.17-r5
 2011252124 metadata/md5-cache/games-misc/bsod-0.1-r1
 2011252124 metadata/md5-cache/games-misc/c++robots-0-r1
-2011252124 metadata/md5-cache/games-misc/doge-3.6.0
 2011252124 metadata/md5-cache/games-misc/fortune-mod-1.99.1-r3
 2011252124 metadata/md5-cache/games-misc/fortune-mod-kernelcookies-9
 2011252124 metadata/md5-cache/games-misc/fortune-mod-osfortune-1
@@ -47646,12 +47601,13 @@
 2011252124 metadata/md5-cache/games-misc/sdljoytest-11102003
 2011252124 metadata/md5-cache/games-misc/sound-of-sorting-0.6.6_pre20151107-r1
 2011252124 metadata/md5-cache/games-misc/typespeed-0.6.5-r2
-2011252124 metadata/md5-cache/games-misc/usolitaire-0.2.1
 2011252124 metadata/md5-cache/games-misc/wumpus-1.4-r1
 2011252124 metadata/md5-cache/games-misc/xcowsay-1.5.1
 2011252124 metadata/md5-cache/games-misc/xcruiser-0.30-r1
-2011270039 metadata/md5-cache/games-misc/Manifest.gz
 2011270039 metadata/md5-cache/games-misc/opengfx-0.6.0
+2012011340 metadata/md5-cache/games-misc/Manifest.gz
+2012011340 metadata/md5-cache/games-misc/doge-3.6.0
+2012011340 metadata/md5-cache/games-misc/usolitaire-0.2.1
 1807151809 metadata/md5-cache/games-mud/trebuchet-1.075-r1
 2002230040 metadata/md5-cache/games-mud/tintin-2.01.8
 2011252124 metadata/md5-cache/games-mud/Manifest.gz
@@ -47788,17 +47744,17 @@
 2011252124 metadata/md5-cache/games-roguelike/nethack-3.6.6
 2011252124 metadata/md5-cache/games-roguelike/powder-117-r1
 2011252124 metadata/md5-cache/games-roguelike/scourge-0.21.1-r1
-2011252124 metadata/md5-cache/games-roguelike/stone-soup-0.25.0
-2011252124 metadata/md5-cache/games-roguelike/stone-soup-0.25.1
-2011252124 metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r1
-2011252124 metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r100
 2011252124 metadata/md5-cache/games-roguelike/tome-2.3.5
 2011252124 metadata/md5-cache/games-roguelike/tomenet-4.6.1a
 2011252124 metadata/md5-cache/games-roguelike/tomenet-4.7.2
 2011252124 metadata/md5-cache/games-roguelike/wrogue-0.8.0b-r1
 2011252124 metadata/md5-cache/games-roguelike/zangband-2.7.4c
-2011302339 metadata/md5-cache/games-roguelike/Manifest.gz
 2011302339 metadata/md5-cache/games-roguelike/crossfire-client-1.71.0-r100
+2012011340 metadata/md5-cache/games-roguelike/Manifest.gz
+2012011340 metadata/md5-cache/games-roguelike/stone-soup-0.25.0
+2012011340 metadata/md5-cache/games-roguelike/stone-soup-0.25.1
+2012011340 metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r1
+2012011340 metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r100
 1805012309 metadata/md5-cache/games-rpg/freedink-data-1.08.20140901-r1
 1806081339 metadata/md5-cache/games-rpg/freedink-data-1.08.20170409
 1707090139 metadata/md5-cache/games-rpg/twclone-0.14-r1
@@ -47896,7 +47852,6 @@
 2012010339 metadata/md5-cache/games-simulation/corsix-th-0.64-r100
 2010031709 metadata/md5-cache/games-sports/gracer-0.1.5-r2
 2011222009 metadata/md5-cache/games-sports/bygfoot-2.3.2-r1
-2011252124 metadata/md5-cache/games-sports/Manifest.gz
 2011252124 metadata/md5-cache/games-sports/billardgl-1.75-r2
 2011252124 metadata/md5-cache/games-sports/dustrac-1.11.0-r1
 2011252124 metadata/md5-cache/games-sports/foobillard-3.0a-r1
@@ -47907,6 +47862,8 @@
 2011252124 metadata/md5-cache/games-sports/trophy-2.0.3-r1
 2011252124 metadata/md5-cache/games-sports/ultimatestunts-0.7.7-r1
 2011252124 metadata/md5-cache/games-sports/xmoto-0.6.1-r1
+2012011639 metadata/md5-cache/games-sports/Manifest.gz
+2012011639 metadata/md5-cache/games-sports/xmoto-0.6.1-r100
 1805241809 metadata/md5-cache/games-strategy/0ad-data-0.0.23_alpha
 2002112051 metadata/md5-cache/games-strategy/openra-20190314
 2002181739 metadata/md5-cache/games-strategy/wargus-data-0-r1
@@ -47918,7 +47875,6 @@
 2009121921 metadata/md5-cache/games-strategy/satellite-reign-1.13.06
 2011252124 metadata/md5-cache/games-strategy/0ad-0.0.23_alpha
 2011252124 metadata/md5-cache/games-strategy/0ad-0.0.23b_alpha
-2011252124 metadata/md5-cache/games-strategy/asc-2.6.0.0-r2
 2011252124 metadata/md5-cache/games-strategy/colobot-0.1.12
 2011252124 metadata/md5-cache/games-strategy/colobot-9999
 2011252124 metadata/md5-cache/games-strategy/colobot-data-0.1.12
@@ -47961,11 +47917,16 @@
 2011252124 metadata/md5-cache/games-strategy/warzone2100-3.2.3
 2011252124 metadata/md5-cache/games-strategy/warzone2100-3.3.0
 2011252124 metadata/md5-cache/games-strategy/wesnoth-1.15.4
-2011252124 metadata/md5-cache/games-strategy/widelands-0.20-r1
-2011252124 metadata/md5-cache/games-strategy/widelands-9999
 2011252124 metadata/md5-cache/games-strategy/xbattleai-1.2.2-r2
-2011261439 metadata/md5-cache/games-strategy/Manifest.gz
 2011261439 metadata/md5-cache/games-strategy/wesnoth-1.14.14
+2012030239 metadata/md5-cache/games-strategy/Manifest.gz
+2012020139 metadata/md5-cache/games-strategy/hedgewars-1.0.0-r100
+2012020209 metadata/md5-cache/games-strategy/naev-0.7.0
+2012020209 metadata/md5-cache/games-strategy/naev-0.7.0-r100
+2012020439 metadata/md5-cache/games-strategy/openra-20190314-r100
+2012020439 metadata/md5-cache/games-strategy/s25rttr-0.9.0_pre20200723-r100
+2012030239 metadata/md5-cache/games-strategy/widelands-0.20-r1
+2012030239 metadata/md5-cache/games-strategy/widelands-9999
 1909100139 metadata/md5-cache/games-util/deutex-5.2.0
 1702282323 metadata/md5-cache/games-util/gslist-0.8.11a-r1
 1707090139 metadata/md5-cache/games-util/qstat-2.11
@@ -47998,14 +47959,10 @@
 2011252124 metadata/md5-cache/games-util/linux-wbfs-manager-0.1.12
 2011252124 metadata/md5-cache/games-util/linux-wbfs-manager-9999
 2011252124 metadata/md5-cache/games-util/loki_patch-20091105
-2011252124 metadata/md5-cache/games-util/lutris-0.5.7.1
-2011252124 metadata/md5-cache/games-util/lutris-0.5.8
-2011252124 metadata/md5-cache/games-util/lutris-9999
 2011252124 metadata/md5-cache/games-util/mcrcon-0.7.1
 2011252124 metadata/md5-cache/games-util/pyfa-2.31.0
 2011252124 metadata/md5-cache/games-util/qjoypad-4.3.1
 2011252124 metadata/md5-cache/games-util/qstat-2.14
-2011252124 metadata/md5-cache/games-util/sc-controller-0.4.8.1
 2011252124 metadata/md5-cache/games-util/slade-3.1.12a
 2011252124 metadata/md5-cache/games-util/springlobby-0.266
 2011252124 metadata/md5-cache/games-util/springlobby-0.267
@@ -48020,11 +47977,16 @@
 2011252124 metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118
 2011252124 metadata/md5-cache/games-util/xqf-1.0.6.2
 2011270039 metadata/md5-cache/games-util/grfcodec-6.0.6
-2011270039 metadata/md5-cache/games-util/nml-0.5.3
 2011271139 metadata/md5-cache/games-util/pyfa-2.32.0
 2011271139 metadata/md5-cache/games-util/pyfa-9999
-2011300439 metadata/md5-cache/games-util/Manifest.gz
-2011300439 metadata/md5-cache/games-util/lutris-0.5.8.1
+2012011639 metadata/md5-cache/games-util/Manifest.gz
+2012011340 metadata/md5-cache/games-util/lutris-0.5.7.1
+2012011340 metadata/md5-cache/games-util/lutris-0.5.8
+2012011340 metadata/md5-cache/games-util/lutris-0.5.8.1
+2012011340 metadata/md5-cache/games-util/lutris-9999
+2012011340 metadata/md5-cache/games-util/nml-0.5.3
+2012011340 metadata/md5-cache/games-util/sc-controller-0.4.8.1
+2012011639 metadata/md5-cache/games-util/slade-3.1.12a-r100
 2006012339 metadata/md5-cache/gnome-base/gnome-light-3.34.4
 2007192109 metadata/md5-cache/gnome-base/gnome-core-libs-3.36.4
 2008302139 metadata/md5-cache/gnome-base/gnome-3.36.5
@@ -48032,7 +47994,6 @@
 2008302139 metadata/md5-cache/gnome-base/gnome-core-libs-3.36.5
 2008302139 metadata/md5-cache/gnome-base/gnome-extra-apps-3.36.5
 2008302139 metadata/md5-cache/gnome-base/gnome-light-3.36.5
-2011252124 metadata/md5-cache/gnome-base/Manifest.gz
 2011252124 metadata/md5-cache/gnome-base/dconf-0.34.0
 2011252124 metadata/md5-cache/gnome-base/dconf-0.36.0
 2011252124 metadata/md5-cache/gnome-base/dconf-editor-3.36.4
@@ -48052,8 +48013,6 @@
 2011252124 metadata/md5-cache/gnome-base/gnome-panel-3.36.2
 2011252124 metadata/md5-cache/gnome-base/gnome-session-3.36.0-r1
 2011252124 metadata/md5-cache/gnome-base/gnome-session-3.38.0
-2011252124 metadata/md5-cache/gnome-base/gnome-settings-daemon-3.36.1
-2011252124 metadata/md5-cache/gnome-base/gnome-settings-daemon-3.38.1
 2011252124 metadata/md5-cache/gnome-base/gnome-shell-3.36.7
 2011252124 metadata/md5-cache/gnome-base/gnome-shell-3.38.1
 2011252124 metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r5
@@ -48072,11 +48031,12 @@
 2011252124 metadata/md5-cache/gnome-base/librsvg-2.48.9
 2011252124 metadata/md5-cache/gnome-base/nautilus-3.36.3
 2011252124 metadata/md5-cache/gnome-base/orbit-2.14.19-r5
+2012022309 metadata/md5-cache/gnome-base/Manifest.gz
+2012022309 metadata/md5-cache/gnome-base/gnome-settings-daemon-3.36.1
+2012022309 metadata/md5-cache/gnome-base/gnome-settings-daemon-3.38.1
 2003261841 metadata/md5-cache/gnome-extra/gnome-utils-3.8.0
 2004032241 metadata/md5-cache/gnome-extra/polkit-gnome-0.105-r2
 2004202139 metadata/md5-cache/gnome-extra/gnome-shell-frippery-3.34.2
-2004230009 metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-7
-2004230009 metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-10
 2005231339 metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-33
 2006291909 metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-plus-27
 2008302339 metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-9
@@ -48085,13 +48045,7 @@
 2009121921 metadata/md5-cache/gnome-extra/cinnamon-translations-4.6.2
 2009121921 metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-27
 2009121921 metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713
-2009121921 metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-37
 2009121921 metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-39
-2009121921 metadata/md5-cache/gnome-extra/pch-session-3.34.3
-2009121921 metadata/md5-cache/gnome-extra/pch-session-3.36.1
-2009121921 metadata/md5-cache/gnome-extra/pch-session-3.36.2
-2010182109 metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-40
-2010182109 metadata/md5-cache/gnome-extra/pch-session-3.36.3
 2011252124 metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r3
 2011252124 metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r4
 2011252124 metadata/md5-cache/gnome-extra/cinnamon-4.4.8
@@ -48134,7 +48088,6 @@
 2011252124 metadata/md5-cache/gnome-extra/gnome-search-tool-3.6.0
 2011252124 metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-20.04.0-r1
 2011252124 metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-41
-2011252124 metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-42
 2011252124 metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.36.7
 2011252124 metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.38.1
 2011252124 metadata/md5-cache/gnome-extra/gnome-system-monitor-3.36.1
@@ -48167,9 +48120,17 @@
 2011252124 metadata/md5-cache/gnome-extra/yelp-xsl-3.34.2
 2011252124 metadata/md5-cache/gnome-extra/yelp-xsl-3.36.0
 2011252124 metadata/md5-cache/gnome-extra/zenity-3.32.0
-2011271539 metadata/md5-cache/gnome-extra/Manifest.gz
 2011271539 metadata/md5-cache/gnome-extra/gnome-software-3.34.2
 2011271539 metadata/md5-cache/gnome-extra/gnome-software-3.36.1
+2012020139 metadata/md5-cache/gnome-extra/Manifest.gz
+2012020139 metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-34
+2012020139 metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-10
+2012020139 metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-16
+2012020139 metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200901
+2012020139 metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-40
+2012020139 metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-42
+2012020139 metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-44
+2012020139 metadata/md5-cache/gnome-extra/pch-session-3.36.3
 2011252124 metadata/md5-cache/gnustep-apps/Manifest.gz
 2011252124 metadata/md5-cache/gnustep-apps/aclock-0.4.0-r1
 2011252124 metadata/md5-cache/gnustep-apps/addresses-0.4.8-r1
@@ -48319,10 +48280,10 @@
 2011252124 metadata/md5-cache/gui-libs/wlroots-9999
 2011252124 metadata/md5-cache/gui-libs/wpebackend-fdo-1.4.0
 2011252124 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-9999
-2011270209 metadata/md5-cache/gui-libs/libwpe-1.8.0
-2011270209 metadata/md5-cache/gui-libs/wpebackend-fdo-1.8.0
-2011281009 metadata/md5-cache/gui-libs/Manifest.gz
 2011281009 metadata/md5-cache/gui-libs/greetd-0.6.1
+2012012039 metadata/md5-cache/gui-libs/Manifest.gz
+2012012039 metadata/md5-cache/gui-libs/libwpe-1.8.0
+2012012039 metadata/md5-cache/gui-libs/wpebackend-fdo-1.8.0
 2011252124 metadata/md5-cache/gui-wm/Manifest.gz
 2011252124 metadata/md5-cache/gui-wm/hikari-2.2.2
 2011252124 metadata/md5-cache/gui-wm/sway-1.5
@@ -48579,7 +48540,6 @@
 2011292309 metadata/md5-cache/kde-apps/kaddressbook-20.08.3
 2011292309 metadata/md5-cache/kde-apps/kompare-20.08.3
 1905280009 metadata/md5-cache/kde-frameworks/kf-env-5
-2011252124 metadata/md5-cache/kde-frameworks/Manifest.gz
 2011252124 metadata/md5-cache/kde-frameworks/attica-5.74.0
 2011252124 metadata/md5-cache/kde-frameworks/attica-5.76.0
 2011252124 metadata/md5-cache/kde-frameworks/baloo-5.74.0
@@ -48598,8 +48558,6 @@
 2011252124 metadata/md5-cache/kde-frameworks/kactivities-5.76.0
 2011252124 metadata/md5-cache/kde-frameworks/kactivities-stats-5.74.0
 2011252124 metadata/md5-cache/kde-frameworks/kactivities-stats-5.76.0
-2011252124 metadata/md5-cache/kde-frameworks/kapidox-5.74.0
-2011252124 metadata/md5-cache/kde-frameworks/kapidox-5.76.0
 2011252124 metadata/md5-cache/kde-frameworks/karchive-5.74.0
 2011252124 metadata/md5-cache/kde-frameworks/karchive-5.76.0
 2011252124 metadata/md5-cache/kde-frameworks/kauth-5.74.0
@@ -48748,6 +48706,9 @@
 2011252124 metadata/md5-cache/kde-frameworks/syntax-highlighting-5.76.0
 2011252124 metadata/md5-cache/kde-frameworks/threadweaver-5.74.0
 2011252124 metadata/md5-cache/kde-frameworks/threadweaver-5.76.0
+2012011340 metadata/md5-cache/kde-frameworks/Manifest.gz
+2012011340 metadata/md5-cache/kde-frameworks/kapidox-5.74.0
+2012011340 metadata/md5-cache/kde-frameworks/kapidox-5.76.0
 2011252124 metadata/md5-cache/kde-misc/basket-2.49b
 2011252124 metadata/md5-cache/kde-misc/colord-kde-0.5.0-r2
 2011252124 metadata/md5-cache/kde-misc/kdeconnect-20.08.3
@@ -48782,104 +48743,104 @@
 2011271209 metadata/md5-cache/kde-misc/tellico-3.3.4
 2010080539 metadata/md5-cache/kde-plasma/plasma-meta-5.19.5
 2010092209 metadata/md5-cache/kde-plasma/breeze-grub-5.19.5
-2011111739 metadata/md5-cache/kde-plasma/breeze-grub-5.20.3
-2011111739 metadata/md5-cache/kde-plasma/plasma-meta-5.20.3
-2011252124 metadata/md5-cache/kde-plasma/Manifest.gz
 2011252124 metadata/md5-cache/kde-plasma/bluedevil-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/bluedevil-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/breeze-5.19.5-r1
-2011252124 metadata/md5-cache/kde-plasma/breeze-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/breeze-gtk-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/breeze-gtk-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/breeze-plymouth-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/breeze-plymouth-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/discover-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/discover-5.20.3-r1
 2011252124 metadata/md5-cache/kde-plasma/drkonqi-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/drkonqi-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/kactivitymanagerd-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/kactivitymanagerd-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/kde-cli-tools-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/kde-cli-tools-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/kde-gtk-config-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/kde-gtk-config-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/kdecoration-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/kdecoration-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/kdeplasma-addons-5.19.5-r1
-2011252124 metadata/md5-cache/kde-plasma/kdeplasma-addons-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/kgamma-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/kgamma-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/khotkeys-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/khotkeys-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/kinfocenter-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/kinfocenter-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/kmenuedit-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/kmenuedit-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/kscreen-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/kscreen-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/kscreenlocker-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/kscreenlocker-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/ksshaskpass-5.19.5-r1
-2011252124 metadata/md5-cache/kde-plasma/ksshaskpass-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/ksysguard-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/ksysguard-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/kwallet-pam-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/kwallet-pam-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/kwayland-integration-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/kwayland-integration-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/kwayland-server-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/kwayland-server-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/kwin-5.19.5-r1
-2011252124 metadata/md5-cache/kde-plasma/kwin-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/kwrited-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/kwrited-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/libkscreen-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/libkscreen-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/libksysguard-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/libksysguard-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/libkworkspace-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/libkworkspace-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/milou-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/milou-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/oxygen-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/oxygen-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/plasma-browser-integration-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/plasma-browser-integration-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/plasma-desktop-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/plasma-desktop-5.20.3
-2011252124 metadata/md5-cache/kde-plasma/plasma-disks-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/plasma-integration-5.19.5-r1
-2011252124 metadata/md5-cache/kde-plasma/plasma-integration-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/plasma-nm-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/plasma-nm-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/plasma-pa-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/plasma-pa-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/plasma-sdk-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/plasma-sdk-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.20.0
 2011252124 metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/plasma-vault-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/plasma-vault-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/plasma-workspace-5.19.5-r2
-2011252124 metadata/md5-cache/kde-plasma/plasma-workspace-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/plymouth-kcm-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/plymouth-kcm-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/polkit-kde-agent-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/polkit-kde-agent-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/powerdevil-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/powerdevil-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/sddm-kcm-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/sddm-kcm-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/systemsettings-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/systemsettings-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/user-manager-5.19.5
 2011252124 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.19.5
-2011252124 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.20.3
 2011252124 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.19.5-r1
-2011252124 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.20.3
+2012011939 metadata/md5-cache/kde-plasma/Manifest.gz
+2012011939 metadata/md5-cache/kde-plasma/bluedevil-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/breeze-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/breeze-grub-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/breeze-gtk-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/breeze-plymouth-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/discover-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/drkonqi-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/kactivitymanagerd-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/kde-cli-tools-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/kde-gtk-config-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/kdecoration-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/kdeplasma-addons-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/kgamma-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/khotkeys-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/kinfocenter-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/kmenuedit-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/kscreen-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/kscreenlocker-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/ksshaskpass-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/ksysguard-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/kwallet-pam-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/kwayland-integration-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/kwayland-server-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/kwin-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/kwrited-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/libkscreen-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/libksysguard-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/libkworkspace-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/milou-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/oxygen-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/plasma-browser-integration-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/plasma-desktop-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/plasma-disks-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/plasma-integration-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/plasma-meta-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/plasma-nm-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/plasma-pa-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/plasma-sdk-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/plasma-vault-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/plasma-workspace-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/plymouth-kcm-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/polkit-kde-agent-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/powerdevil-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/sddm-kcm-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/systemsettings-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.20.4
+2012011939 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.20.4
 1808310239 metadata/md5-cache/lxde-base/lxappearance-0.6.3
 1804072008 metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.1
 1804051913 metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r6
@@ -48897,17 +48858,17 @@
 2009121921 metadata/md5-cache/lxde-base/lxtask-0.1.8-r1
 2009121921 metadata/md5-cache/lxde-base/lxtask-0.1.9
 2011120009 metadata/md5-cache/lxde-base/lxpanel-0.10.0-r1
-2011252124 metadata/md5-cache/lxde-base/Manifest.gz
 2011252124 metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.3
 2011252124 metadata/md5-cache/lxde-base/lxde-common-0.99.1
 2011252124 metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.0-r1
 2011252124 metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.1
 2011252124 metadata/md5-cache/lxde-base/lxdm-0.5.3-r1
-2011252124 metadata/md5-cache/lxde-base/lxdm-0.5.3-r2
 2011252124 metadata/md5-cache/lxde-base/lxsession-0.5.4-r1
 2011252124 metadata/md5-cache/lxde-base/lxterminal-0.3.1
 2011252124 metadata/md5-cache/lxde-base/lxterminal-0.3.2
 2011252124 metadata/md5-cache/lxde-base/lxterminal-0.3.2-r1
+2012030239 metadata/md5-cache/lxde-base/Manifest.gz
+2012030239 metadata/md5-cache/lxde-base/lxdm-0.5.3-r2
 2007311939 metadata/md5-cache/lxqt-base/lxqt-meta-0.15.0
 2011231039 metadata/md5-cache/lxqt-base/lxqt-meta-0.16.0
 2011252124 metadata/md5-cache/lxqt-base/liblxqt-0.15.1
@@ -48955,15 +48916,10 @@
 2009141809 metadata/md5-cache/mail-client/aerc-0.4.0
 2009141809 metadata/md5-cache/mail-client/aerc-9999
 2011011439 metadata/md5-cache/mail-client/neomutt-20200925
-2011232109 metadata/md5-cache/mail-client/neomutt-99999999
-2011252124 metadata/md5-cache/mail-client/alot-0.9
-2011252124 metadata/md5-cache/mail-client/alot-0.9.1
-2011252124 metadata/md5-cache/mail-client/alot-9999
 2011252124 metadata/md5-cache/mail-client/alpine-2.23
 2011252124 metadata/md5-cache/mail-client/alpine-2.24
 2011252124 metadata/md5-cache/mail-client/balsa-2.6.1
 2011252124 metadata/md5-cache/mail-client/claws-mail-3.17.7
-2011252124 metadata/md5-cache/mail-client/claws-mail-3.17.8
 2011252124 metadata/md5-cache/mail-client/claws-mail-9999
 2011252124 metadata/md5-cache/mail-client/cone-1.0
 2011252124 metadata/md5-cache/mail-client/etpan-ng-0.7.1-r1
@@ -48978,15 +48934,21 @@
 2011252124 metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933-r1
 2011252124 metadata/md5-cache/mail-client/s-nail-14.9.16
 2011252124 metadata/md5-cache/mail-client/s-nail-14.9.19
-2011252309 metadata/md5-cache/mail-client/thunderbird-78.5.0
-2011252309 metadata/md5-cache/mail-client/thunderbird-bin-78.5.0
 2011252124 metadata/md5-cache/mail-client/trojita-0.7-r5
 2011252124 metadata/md5-cache/mail-client/trojita-9999
 2011270209 metadata/md5-cache/mail-client/mutt-2.0.2
 2011271839 metadata/md5-cache/mail-client/neomutt-20201120
-2011271839 metadata/md5-cache/mail-client/neomutt-20201127
-2011282309 metadata/md5-cache/mail-client/Manifest.gz
 2011282309 metadata/md5-cache/mail-client/roundcube-1.4.9
+2012030539 metadata/md5-cache/mail-client/Manifest.gz
+2012011340 metadata/md5-cache/mail-client/alot-0.9
+2012011340 metadata/md5-cache/mail-client/alot-0.9.1
+2012011340 metadata/md5-cache/mail-client/alot-9999
+2012030239 metadata/md5-cache/mail-client/claws-mail-3.17.8
+2012020639 metadata/md5-cache/mail-client/neomutt-20201127
+2012011709 metadata/md5-cache/mail-client/neomutt-20201127-r1
+2012011709 metadata/md5-cache/mail-client/neomutt-99999999
+2012030539 metadata/md5-cache/mail-client/thunderbird-78.5.1
+2012021639 metadata/md5-cache/mail-client/thunderbird-bin-78.5.1
 1910111911 metadata/md5-cache/mail-filter/mailfilter-0.8.4
 1906181439 metadata/md5-cache/mail-filter/postforward-1.1.1
 1902152139 metadata/md5-cache/mail-filter/sieve-connect-0.87-r1
@@ -49003,15 +48965,11 @@
 2009091239 metadata/md5-cache/mail-filter/zdkimfilter-2.2
 2011061444 metadata/md5-cache/mail-filter/mimedefang-2.84
 2011061444 metadata/md5-cache/mail-filter/policyd-weight-0.1.15.2-r2
-2011252124 metadata/md5-cache/mail-filter/Manifest.gz
-2011252124 metadata/md5-cache/mail-filter/afew-3.0.0
-2011252124 metadata/md5-cache/mail-filter/afew-3.0.1
 2011252124 metadata/md5-cache/mail-filter/amavisd-milter-1.5.0-r1
 2011252124 metadata/md5-cache/mail-filter/amavisd-milter-1.6.0-r1
 2011252124 metadata/md5-cache/mail-filter/amavisd-new-2.12.0-r5
 2011252124 metadata/md5-cache/mail-filter/bmf-0.9.4-r3
 2011252124 metadata/md5-cache/mail-filter/bogofilter-1.2.4-r3
-2011252124 metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2-r1
 2011252124 metadata/md5-cache/mail-filter/couriersrs-0.1.2
 2011252124 metadata/md5-cache/mail-filter/dcc-1.3.154
 2011252124 metadata/md5-cache/mail-filter/dcc-1.3.158
@@ -49048,8 +49006,6 @@
 2011252124 metadata/md5-cache/mail-filter/postgrey-1.37
 2011252124 metadata/md5-cache/mail-filter/postsrsd-1.6
 2011252124 metadata/md5-cache/mail-filter/procmail-3.22-r14
-2011252124 metadata/md5-cache/mail-filter/pyzor-1.0.0-r1
-2011252124 metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523
 2011252124 metadata/md5-cache/mail-filter/rblcheck-1.5-r2
 2011252124 metadata/md5-cache/mail-filter/rspamd-2.5-r1
 2011252124 metadata/md5-cache/mail-filter/rspamd-2.6-r2
@@ -49064,10 +49020,16 @@
 2011252124 metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
 2011252124 metadata/md5-cache/mail-filter/spamdyke-4.3.0
 2011252124 metadata/md5-cache/mail-filter/spamdyke-5.0.1
-2011252124 metadata/md5-cache/mail-filter/spf-engine-2.0.2-r1
-2011252124 metadata/md5-cache/mail-filter/spf-engine-2.9.2
 2011252124 metadata/md5-cache/mail-filter/sqlgrey-1.7.6-r2
 2011252124 metadata/md5-cache/mail-filter/sqlgrey-1.8.0
+2012021939 metadata/md5-cache/mail-filter/Manifest.gz
+2012011340 metadata/md5-cache/mail-filter/afew-3.0.0
+2012021939 metadata/md5-cache/mail-filter/afew-3.0.1
+2012011340 metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2-r1
+2012011340 metadata/md5-cache/mail-filter/pyzor-1.0.0-r1
+2012011340 metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523
+2012011340 metadata/md5-cache/mail-filter/spf-engine-2.0.2-r1
+2012011340 metadata/md5-cache/mail-filter/spf-engine-2.9.2
 1910071309 metadata/md5-cache/mail-mta/esmtp-1.2-r1
 2010262339 metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.4.5
 2011161009 metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.5.0
@@ -49081,7 +49043,6 @@
 2011252124 metadata/md5-cache/mail-mta/netqmail-1.06-r14
 2011252124 metadata/md5-cache/mail-mta/notqmail-1.08-r3
 2011252124 metadata/md5-cache/mail-mta/notqmail-9999
-2011252124 metadata/md5-cache/mail-mta/nullmailer-2.2-r1
 2011252124 metadata/md5-cache/mail-mta/opensmtpd-6.7.1_p1
 2011252124 metadata/md5-cache/mail-mta/postfix-3.5.6
 2011252124 metadata/md5-cache/mail-mta/postfix-3.5.7
@@ -49095,8 +49056,9 @@
 2011252124 metadata/md5-cache/mail-mta/ssmtp-2.64-r3
 2011260139 metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.5.2
 2011291139 metadata/md5-cache/mail-mta/msmtp-1.8.12
-2011301639 metadata/md5-cache/mail-mta/Manifest.gz
 2011301639 metadata/md5-cache/mail-mta/protonmail-bridge-1.5.2
+2012030239 metadata/md5-cache/mail-mta/Manifest.gz
+2012030239 metadata/md5-cache/mail-mta/nullmailer-2.2-r1
 2008070639 metadata/md5-cache/mate-base/mate-1.24
 2008070639 metadata/md5-cache/mate-base/mate-applets-meta-1.24.0
 2011061540 metadata/md5-cache/mate-base/mate-common-1.24.1
@@ -49470,16 +49432,10 @@
 2011252124 metadata/md5-cache/media-gfx/apngopt-1.4
 2011252124 metadata/md5-cache/media-gfx/argyllcms-2.1.2
 2011252124 metadata/md5-cache/media-gfx/argyllcms-2.1.2-r1
-2011252124 metadata/md5-cache/media-gfx/asymptote-2.61
-2011252124 metadata/md5-cache/media-gfx/asymptote-2.62
 2011252124 metadata/md5-cache/media-gfx/asymptote-2.65
 2011252124 metadata/md5-cache/media-gfx/asymptote-2.67
 2011252124 metadata/md5-cache/media-gfx/autopano-sift-C-2.5.1
 2011252124 metadata/md5-cache/media-gfx/aview-1.3.0_rc1-r3
-2011252124 metadata/md5-cache/media-gfx/blender-2.83.4-r1
-2011252124 metadata/md5-cache/media-gfx/blender-2.90.1-r1
-2011252124 metadata/md5-cache/media-gfx/cairosvg-2.4.2
-2011252124 metadata/md5-cache/media-gfx/cairosvg-2.5.0
 2011252124 metadata/md5-cache/media-gfx/cellwriter-1.3.5
 2011252124 metadata/md5-cache/media-gfx/clockphoto-1.2
 2011252124 metadata/md5-cache/media-gfx/colorhug-client-0.2.8
@@ -49534,7 +49490,6 @@
 2011252124 metadata/md5-cache/media-gfx/fontforge-20200314
 2011252124 metadata/md5-cache/media-gfx/fontforge-20201107
 2011252124 metadata/md5-cache/media-gfx/fotowall-1.0
-2011252124 metadata/md5-cache/media-gfx/fotoxx-15.05
 2011252124 metadata/md5-cache/media-gfx/freepv-0.3.0-r5
 2011252124 metadata/md5-cache/media-gfx/freewrl-3.0.0-r1
 2011252124 metadata/md5-cache/media-gfx/freewrl-9999
@@ -49552,8 +49507,6 @@
 2011252124 metadata/md5-cache/media-gfx/gimp-2.99.2
 2011252124 metadata/md5-cache/media-gfx/gimp-9999
 2011252124 metadata/md5-cache/media-gfx/gmic-2.9.2-r1
-2011252124 metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1
-2011252124 metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029
 2011252124 metadata/md5-cache/media-gfx/gnome-font-viewer-3.34.0
 2011252124 metadata/md5-cache/media-gfx/gnome-photos-3.34.2
 2011252124 metadata/md5-cache/media-gfx/gnome-raw-thumbnailer-3.0.0-r1
@@ -49579,7 +49532,6 @@
 2011252124 metadata/md5-cache/media-gfx/icc-examin-9999
 2011252124 metadata/md5-cache/media-gfx/icoutils-0.32.3
 2011252124 metadata/md5-cache/media-gfx/imageworsener-1.3.2
-2011252124 metadata/md5-cache/media-gfx/img2pdf-0.3.6
 2011252124 metadata/md5-cache/media-gfx/imv-4.0.1-r2
 2011252124 metadata/md5-cache/media-gfx/imv-4.1.0-r1
 2011252124 metadata/md5-cache/media-gfx/imv-9999
@@ -49618,9 +49570,7 @@
 2011252124 metadata/md5-cache/media-gfx/metapixel-1.0.2-r1
 2011252124 metadata/md5-cache/media-gfx/monica-3.7
 2011252124 metadata/md5-cache/media-gfx/mscgen-0.20
-2011252124 metadata/md5-cache/media-gfx/mypaint-2.0.1-r2
 2011252124 metadata/md5-cache/media-gfx/mypaint-brushes-2.0.2
-2011252124 metadata/md5-cache/media-gfx/netpaint-1.1.2
 2011252124 metadata/md5-cache/media-gfx/nomacs-3.16.224
 2011252124 metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r5
 2011252124 metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r4
@@ -49676,7 +49626,6 @@
 2011252124 metadata/md5-cache/media-gfx/sam2p-0.49.4_p20190718-r1
 2011252124 metadata/md5-cache/media-gfx/sane-backends-1.0.30-r2
 2011252124 metadata/md5-cache/media-gfx/scantailor-advanced-1.0.16-r1
-2011252124 metadata/md5-cache/media-gfx/scour-0.37
 2011252124 metadata/md5-cache/media-gfx/scrot-0.8_p13-r1
 2011252124 metadata/md5-cache/media-gfx/scrot-1.2
 2011252124 metadata/md5-cache/media-gfx/scrot-1.3-r1
@@ -49697,7 +49646,6 @@
 2011252124 metadata/md5-cache/media-gfx/synnefo-1.1.0
 2011252124 metadata/md5-cache/media-gfx/tachyon-0.99_beta6-r1
 2011252124 metadata/md5-cache/media-gfx/tachyon-0.99_beta6-r2
-2011252124 metadata/md5-cache/media-gfx/termtosvg-1.1.0
 2011252124 metadata/md5-cache/media-gfx/tgif-4.2.5-r2
 2011252124 metadata/md5-cache/media-gfx/tif22pnm-0.14
 2011252124 metadata/md5-cache/media-gfx/tintii-2.10.0
@@ -49711,7 +49659,6 @@
 2011252124 metadata/md5-cache/media-gfx/viewer-0.8.0-r1
 2011252124 metadata/md5-cache/media-gfx/viewnior-1.6
 2011252124 metadata/md5-cache/media-gfx/viewnior-1.7-r1
-2011252124 metadata/md5-cache/media-gfx/viewnior-1.7-r2
 2011252124 metadata/md5-cache/media-gfx/w3mimgfb-0.9.1
 2011252124 metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20200224
 2011252124 metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20200414
@@ -49721,11 +49668,6 @@
 2011252124 metadata/md5-cache/media-gfx/wings-2.1.7
 2011252124 metadata/md5-cache/media-gfx/wings-2.2.6.1
 2011252124 metadata/md5-cache/media-gfx/wkhtmltopdf-0.12.5
-2011252124 metadata/md5-cache/media-gfx/word_cloud-1.6.0
-2011252124 metadata/md5-cache/media-gfx/word_cloud-1.8.0
-2011252124 metadata/md5-cache/media-gfx/xdot-1.1
-2011252124 metadata/md5-cache/media-gfx/xdot-1.2
-2011252124 metadata/md5-cache/media-gfx/xdot-9999
 2011252124 metadata/md5-cache/media-gfx/xli-1.17.0-r5
 2011252124 metadata/md5-cache/media-gfx/xloadimage-4.1-r12
 2011252124 metadata/md5-cache/media-gfx/xpaint-2.10.2
@@ -49743,10 +49685,30 @@
 2011300509 metadata/md5-cache/media-gfx/imagemagick-7.0.10.41-r1
 2011300509 metadata/md5-cache/media-gfx/imagemagick-7.0.10.44
 2011300509 metadata/md5-cache/media-gfx/imagemagick-9999
-2011302209 metadata/md5-cache/media-gfx/Manifest.gz
 2011302209 metadata/md5-cache/media-gfx/cura-4.8.0
 2011302209 metadata/md5-cache/media-gfx/curaengine-4.8.0
 2011302209 metadata/md5-cache/media-gfx/fdm-materials-4.8.0
+2012031039 metadata/md5-cache/media-gfx/Manifest.gz
+2012011239 metadata/md5-cache/media-gfx/asymptote-2.68
+2012031039 metadata/md5-cache/media-gfx/blender-2.83.4-r1
+2012031039 metadata/md5-cache/media-gfx/blender-2.90.1-r1
+2012031039 metadata/md5-cache/media-gfx/blender-2.91.0
+2012011340 metadata/md5-cache/media-gfx/cairosvg-2.4.2
+2012011340 metadata/md5-cache/media-gfx/cairosvg-2.5.0
+2012030239 metadata/md5-cache/media-gfx/fotoxx-15.05
+2012011340 metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1
+2012011340 metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029
+2012011340 metadata/md5-cache/media-gfx/img2pdf-0.3.6
+2012011340 metadata/md5-cache/media-gfx/mypaint-2.0.1-r2
+2012011340 metadata/md5-cache/media-gfx/netpaint-1.1.2
+2012011340 metadata/md5-cache/media-gfx/scour-0.37
+2012011340 metadata/md5-cache/media-gfx/termtosvg-1.1.0
+2012030239 metadata/md5-cache/media-gfx/viewnior-1.7-r2
+2012011340 metadata/md5-cache/media-gfx/word_cloud-1.6.0
+2012011340 metadata/md5-cache/media-gfx/word_cloud-1.8.0
+2012011340 metadata/md5-cache/media-gfx/xdot-1.1
+2012011340 metadata/md5-cache/media-gfx/xdot-1.2
+2012011340 metadata/md5-cache/media-gfx/xdot-9999
 1802221208 metadata/md5-cache/media-libs/blib-1.1.7-r2
 1805290208 metadata/md5-cache/media-libs/lastfmlib-0.4.0
 1910111911 metadata/md5-cache/media-libs/libdmtx-0.7.4
@@ -49808,9 +49770,6 @@
 2011252124 metadata/md5-cache/media-libs/Field3D-1.7.2
 2011252124 metadata/md5-cache/media-libs/SoQt-1.6.0
 2011252124 metadata/md5-cache/media-libs/SoXt-1.4.0
-2011252124 metadata/md5-cache/media-libs/a52dec-0.7.4-r6
-2011252124 metadata/md5-cache/media-libs/a52dec-0.7.4-r7
-2011252124 metadata/md5-cache/media-libs/a52dec-0.7.4-r8
 2011252124 metadata/md5-cache/media-libs/aalib-1.4_rc5-r9
 2011252124 metadata/md5-cache/media-libs/aften-0.0.8-r2
 2011252124 metadata/md5-cache/media-libs/allegro-4.4.2-r2
@@ -49829,7 +49788,6 @@
 2011252124 metadata/md5-cache/media-libs/aribb24-1.0.3-r1
 2011252124 metadata/md5-cache/media-libs/aribb24-1.0.3-r2
 2011252124 metadata/md5-cache/media-libs/assimp-5.0.1
-2011252124 metadata/md5-cache/media-libs/aubio-0.4.9
 2011252124 metadata/md5-cache/media-libs/audiofile-0.3.6-r4
 2011252124 metadata/md5-cache/media-libs/avidemux-core-2.7.4-r1
 2011252124 metadata/md5-cache/media-libs/avidemux-core-2.7.6
@@ -49859,8 +49817,6 @@
 2011252124 metadata/md5-cache/media-libs/dssi-1.1.1-r1
 2011252124 metadata/md5-cache/media-libs/dumb-0.9.3-r3
 2011252124 metadata/md5-cache/media-libs/dumb-2.0.3
-2011252124 metadata/md5-cache/media-libs/elgato-streamdeck-0.8.1
-2011252124 metadata/md5-cache/media-libs/elgato-streamdeck-9999
 2011252124 metadata/md5-cache/media-libs/esdl-1.3.1
 2011252124 metadata/md5-cache/media-libs/exempi-2.4.5-r1
 2011252124 metadata/md5-cache/media-libs/faac-1.29.9.2
@@ -49879,7 +49835,6 @@
 2011252124 metadata/md5-cache/media-libs/fontconfig-2.13.0-r4
 2011252124 metadata/md5-cache/media-libs/fontconfig-2.13.1-r2
 2011252124 metadata/md5-cache/media-libs/fontconfig-infinality-20130404
-2011252124 metadata/md5-cache/media-libs/fontconfig-ultimate-2015.04
 2011252124 metadata/md5-cache/media-libs/fontconfig-ultimate-2015.08.01
 2011252124 metadata/md5-cache/media-libs/freealut-1.1.0-r4
 2011252124 metadata/md5-cache/media-libs/freeglut-3.2.1
@@ -49918,7 +49873,6 @@
 2011252124 metadata/md5-cache/media-libs/gmmlib-20.2.5
 2011252124 metadata/md5-cache/media-libs/gmmlib-20.3.2
 2011252124 metadata/md5-cache/media-libs/gmmlib-9999
-2011252124 metadata/md5-cache/media-libs/gmtk-1.0.8
 2011252124 metadata/md5-cache/media-libs/gmtk-1.0.9
 2011252124 metadata/md5-cache/media-libs/gnonlin-1.4.0-r1
 2011252124 metadata/md5-cache/media-libs/graphene-1.10.2
@@ -49940,7 +49894,6 @@
 2011252124 metadata/md5-cache/media-libs/guilib-1.2.1-r1
 2011252124 metadata/md5-cache/media-libs/gupnp-dlna-0.10.5
 2011252124 metadata/md5-cache/media-libs/hamlib-3.3
-2011252124 metadata/md5-cache/media-libs/hamlib-3.3-r1
 2011252124 metadata/md5-cache/media-libs/hamlib-4.0_rc2
 2011252124 metadata/md5-cache/media-libs/harfbuzz-2.6.7
 2011252124 metadata/md5-cache/media-libs/harfbuzz-2.7.2
@@ -49970,16 +49923,11 @@
 2011252124 metadata/md5-cache/media-libs/lensfun-0.3.2-r1
 2011252124 metadata/md5-cache/media-libs/leptonica-1.74.4
 2011252124 metadata/md5-cache/media-libs/leptonica-1.80.0
-2011252124 metadata/md5-cache/media-libs/lib3ds-1.3.0-r1
-2011252124 metadata/md5-cache/media-libs/lib3ds-2.0.0_rc1
 2011252124 metadata/md5-cache/media-libs/lib3mf-1.8.1
 2011252124 metadata/md5-cache/media-libs/libXcm-0.5.4
 2011252124 metadata/md5-cache/media-libs/libXcm-9999
-2011252124 metadata/md5-cache/media-libs/libaacplus-2.0.2-r2
 2011252124 metadata/md5-cache/media-libs/libaacplus-2.0.2-r3
-2011252124 metadata/md5-cache/media-libs/libaacs-0.10.0
 2011252124 metadata/md5-cache/media-libs/libaacs-0.11.0
-2011252124 metadata/md5-cache/media-libs/libaacs-0.9.0
 2011252124 metadata/md5-cache/media-libs/libafterimage-1.20-r2
 2011252124 metadata/md5-cache/media-libs/libafterimage-1.20-r3
 2011252124 metadata/md5-cache/media-libs/libao-1.2.2-r1
@@ -49987,7 +49935,6 @@
 2011252124 metadata/md5-cache/media-libs/libaom-2.0.0
 2011252124 metadata/md5-cache/media-libs/libaom-9999
 2011252124 metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r3
-2011252124 metadata/md5-cache/media-libs/libass-0.15.0
 2011252124 metadata/md5-cache/media-libs/libavif-0.8.1
 2011252124 metadata/md5-cache/media-libs/libavif-0.8.3
 2011252124 metadata/md5-cache/media-libs/libavif-0.8.4
@@ -50046,7 +49993,6 @@
 2011252124 metadata/md5-cache/media-libs/libgpod-0.8.3-r3
 2011252124 metadata/md5-cache/media-libs/libgroove-4.3.0-r1
 2011252124 metadata/md5-cache/media-libs/libharu-2.3.0-r2
-2011252124 metadata/md5-cache/media-libs/libhdhomerun-20150826
 2011252124 metadata/md5-cache/media-libs/libhdhomerun-20190621
 2011252124 metadata/md5-cache/media-libs/libhdhomerun-20200521
 2011252124 metadata/md5-cache/media-libs/libheif-1.9.1
@@ -50088,7 +50034,6 @@
 2011252124 metadata/md5-cache/media-libs/libmp4v2-2.0.0-r2
 2011252124 metadata/md5-cache/media-libs/libmpdclient-2.19
 2011252124 metadata/md5-cache/media-libs/libmpeg2-0.5.1-r2
-2011252124 metadata/md5-cache/media-libs/libmpeg3-1.8-r1
 2011252124 metadata/md5-cache/media-libs/libmpris2client-0.1.0-r1
 2011252124 metadata/md5-cache/media-libs/libmtp-1.1.16
 2011252124 metadata/md5-cache/media-libs/libmtp-1.1.17
@@ -50108,7 +50053,6 @@
 2011252124 metadata/md5-cache/media-libs/liboggz-1.1.1
 2011252124 metadata/md5-cache/media-libs/libopenglrecorder-0.1.0
 2011252124 metadata/md5-cache/media-libs/libopenmpt-0.5.3
-2011252124 metadata/md5-cache/media-libs/libopenraw-0.0.9
 2011252124 metadata/md5-cache/media-libs/libopenraw-0.1.2
 2011252124 metadata/md5-cache/media-libs/libopenraw-0.1.3
 2011252124 metadata/md5-cache/media-libs/libopenshot-0.2.2
@@ -50145,7 +50089,6 @@
 2011252124 metadata/md5-cache/media-libs/libsdl-1.2.15-r9
 2011252124 metadata/md5-cache/media-libs/libsdl2-2.0.12-r1
 2011252124 metadata/md5-cache/media-libs/libsdl2-2.0.12-r2
-2011252124 metadata/md5-cache/media-libs/libsfml-2.5.1
 2011252124 metadata/md5-cache/media-libs/libshout-2.4.1-r2
 2011252124 metadata/md5-cache/media-libs/libshout-2.4.2
 2011252124 metadata/md5-cache/media-libs/libshout-2.4.3
@@ -50164,7 +50107,6 @@
 2011252124 metadata/md5-cache/media-libs/libtheora-1.1.1-r2
 2011252124 metadata/md5-cache/media-libs/libtiger-0.3.4-r1
 2011252124 metadata/md5-cache/media-libs/libtimidity-0.2.6
-2011252124 metadata/md5-cache/media-libs/libuvc-0.0.6-r1
 2011252124 metadata/md5-cache/media-libs/libv4l-1.10.1
 2011252124 metadata/md5-cache/media-libs/libv4l-1.16.6
 2011252124 metadata/md5-cache/media-libs/libv4l-1.20.0
@@ -50192,13 +50134,9 @@
 2011252124 metadata/md5-cache/media-libs/mesa-20.1.10
 2011252124 metadata/md5-cache/media-libs/mesa-20.2.3
 2011252124 metadata/md5-cache/media-libs/mesa-20.3.0_rc2
-2011252124 metadata/md5-cache/media-libs/mesa-9999
 2011252124 metadata/md5-cache/media-libs/mlt-6.22.1-r1
 2011252124 metadata/md5-cache/media-libs/munt-mt32emu-2.3.0
 2011252124 metadata/md5-cache/media-libs/musicbrainz-5.1.0
-2011252124 metadata/md5-cache/media-libs/mutagen-1.43.0-r1
-2011252124 metadata/md5-cache/media-libs/mutagen-1.44.0
-2011252124 metadata/md5-cache/media-libs/mutagen-1.45.1
 2011252124 metadata/md5-cache/media-libs/nas-1.9.4-r2
 2011252124 metadata/md5-cache/media-libs/netpbm-10.70.00
 2011252124 metadata/md5-cache/media-libs/netpbm-10.76.00
@@ -50227,7 +50165,6 @@
 2011252124 metadata/md5-cache/media-libs/openglide-0.09_rc9_p20191120
 2011252124 metadata/md5-cache/media-libs/openh264-2.1.1
 2011252124 metadata/md5-cache/media-libs/openicc-0.1.0
-2011252124 metadata/md5-cache/media-libs/openimageio-2.2.8.0
 2011252124 metadata/md5-cache/media-libs/openjpeg-1.5.2-r1
 2011252124 metadata/md5-cache/media-libs/openjpeg-2.3.1-r1
 2011252124 metadata/md5-cache/media-libs/opensubdiv-3.3.3
@@ -50245,14 +50182,12 @@
 2011252124 metadata/md5-cache/media-libs/phonon-4.11.1-r1
 2011252124 metadata/md5-cache/media-libs/phonon-gstreamer-4.10.0
 2011252124 metadata/md5-cache/media-libs/phonon-vlc-0.11.1
-2011252124 metadata/md5-cache/media-libs/plib-1.8.5-r1
 2011252124 metadata/md5-cache/media-libs/plib-1.8.5-r2
 2011252124 metadata/md5-cache/media-libs/plotutils-2.6-r2
 2011252124 metadata/md5-cache/media-libs/pnglite-0.1.17
 2011252124 metadata/md5-cache/media-libs/portaudio-19.06.00-r1
 2011252124 metadata/md5-cache/media-libs/portaudio-19.06.00-r2
 2011252124 metadata/md5-cache/media-libs/portaudio-19.06.00-r3
-2011252124 metadata/md5-cache/media-libs/portmidi-217-r3
 2011252124 metadata/md5-cache/media-libs/ptex-2.3.2
 2011252124 metadata/md5-cache/media-libs/pulseaudio-qt-1.2
 2011252124 metadata/md5-cache/media-libs/qhull-2015.2
@@ -50263,7 +50198,6 @@
 2011252124 metadata/md5-cache/media-libs/quvi-0.9.5
 2011252124 metadata/md5-cache/media-libs/raptor-2.0.15-r2
 2011252124 metadata/md5-cache/media-libs/raspberrypi-userland-0_pre20160424
-2011252124 metadata/md5-cache/media-libs/raspberrypi-userland-0_pre20201022
 2011252124 metadata/md5-cache/media-libs/raspberrypi-userland-9999
 2011252124 metadata/md5-cache/media-libs/raul-1.0.0_pre20200718
 2011252124 metadata/md5-cache/media-libs/raul-9999
@@ -50272,7 +50206,6 @@
 2011252124 metadata/md5-cache/media-libs/rtaudio-5.1.0
 2011252124 metadata/md5-cache/media-libs/rubberband-1.9.0
 2011252124 metadata/md5-cache/media-libs/sbc-1.4
-2011252124 metadata/md5-cache/media-libs/sdl-gfx-2.0.25
 2011252124 metadata/md5-cache/media-libs/sdl-gfx-2.0.26
 2011252124 metadata/md5-cache/media-libs/sdl-gfx-2.0.26-r1
 2011252124 metadata/md5-cache/media-libs/sdl-image-1.2.12-r2
@@ -50315,7 +50248,6 @@
 2011252124 metadata/md5-cache/media-libs/tiff-4.1.0
 2011252124 metadata/md5-cache/media-libs/tse3-0.3.1-r1
 2011252124 metadata/md5-cache/media-libs/urt-3.1b-r1
-2011252124 metadata/md5-cache/media-libs/urt-3.1b-r3
 2011252124 metadata/md5-cache/media-libs/vamp-plugin-sdk-2.10
 2011252124 metadata/md5-cache/media-libs/vidstab-1.1.0-r2
 2011252124 metadata/md5-cache/media-libs/vidstab-9999
@@ -50341,7 +50273,6 @@
 2011252124 metadata/md5-cache/media-libs/woff2-1.0.2-r1
 2011252124 metadata/md5-cache/media-libs/woff2-1.0.2-r2
 2011252124 metadata/md5-cache/media-libs/wxsvg-1.5.11
-2011252124 metadata/md5-cache/media-libs/wxsvg-1.5.9
 2011252124 metadata/md5-cache/media-libs/x264-0.0.20190214
 2011252124 metadata/md5-cache/media-libs/x264-0.0.20190903
 2011252124 metadata/md5-cache/media-libs/x264-0.0.20190903-r1
@@ -50368,13 +50299,35 @@
 2011261339 metadata/md5-cache/media-libs/icclib-2.14
 2011270209 metadata/md5-cache/media-libs/libprojectm-3.1.8
 2011281909 metadata/md5-cache/media-libs/libjpeg-turbo-2.0.6
-2012010139 metadata/md5-cache/media-libs/Manifest.gz
 2012010039 metadata/md5-cache/media-libs/libass-0.14.0
-2012010009 metadata/md5-cache/media-libs/mesa-20.3.0_rc3
 2012010039 metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r4
 2012010039 metadata/md5-cache/media-libs/sdl2-mixer-2.0.4
 2012010139 metadata/md5-cache/media-libs/smpeg2-2.0.0-r3
 2012010139 metadata/md5-cache/media-libs/tremor-0_pre20130223-r2
+2012030839 metadata/md5-cache/media-libs/Manifest.gz
+2012030209 metadata/md5-cache/media-libs/a52dec-0.7.4-r6
+2012030209 metadata/md5-cache/media-libs/a52dec-0.7.4-r7
+2012030239 metadata/md5-cache/media-libs/a52dec-0.7.4-r8
+2012011340 metadata/md5-cache/media-libs/aubio-0.4.9
+2012011340 metadata/md5-cache/media-libs/elgato-streamdeck-0.8.1
+2012011340 metadata/md5-cache/media-libs/elgato-streamdeck-9999
+2012021739 metadata/md5-cache/media-libs/hamlib-3.3-r1
+2012030109 metadata/md5-cache/media-libs/libass-0.15.0
+2012030209 metadata/md5-cache/media-libs/libmpeg3-1.8-r1
+2012030239 metadata/md5-cache/media-libs/libsfml-2.5.1
+2012030239 metadata/md5-cache/media-libs/libuvc-0.0.6-r1
+2012020239 metadata/md5-cache/media-libs/mesa-20.3.0_rc3
+2012020239 metadata/md5-cache/media-libs/mesa-9999
+2012011340 metadata/md5-cache/media-libs/mutagen-1.43.0-r1
+2012011340 metadata/md5-cache/media-libs/mutagen-1.44.0
+2012011340 metadata/md5-cache/media-libs/mutagen-1.45.1
+2012030839 metadata/md5-cache/media-libs/openimageio-2.2.8.0-r1
+2012030839 metadata/md5-cache/media-libs/openimageio-2.2.9.0-r1
+2012011439 metadata/md5-cache/media-libs/osl-1.10.13
+2012011439 metadata/md5-cache/media-libs/osl-1.11.9.0
+2012011340 metadata/md5-cache/media-libs/portmidi-217-r3
+2012030839 metadata/md5-cache/media-libs/raspberrypi-userland-0_pre20201022
+2012030209 metadata/md5-cache/media-libs/urt-3.1b-r3
 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
@@ -50880,9 +50833,8 @@
 2011252124 metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
 2011252124 metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5
 2011252124 metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r1
-2011252124 metadata/md5-cache/media-plugins/xbmc-addon-xvdr-9999
-2011302009 metadata/md5-cache/media-plugins/Manifest.gz
 2011302009 metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.2.0
+2012030939 metadata/md5-cache/media-plugins/Manifest.gz
 1703122008 metadata/md5-cache/media-radio/adifmerg-31-r1
 1908231409 metadata/md5-cache/media-radio/dxcc-20190309
 2002201639 metadata/md5-cache/media-radio/gpredict-2.2.1
@@ -50943,7 +50895,6 @@
 1910221239 metadata/md5-cache/media-sound/asunder-2.9.5
 1906051110 metadata/md5-cache/media-sound/awesfx-0.5.1e
 1805272138 metadata/md5-cache/media-sound/bladeenc-0.94.2-r1
-1702282327 metadata/md5-cache/media-sound/dcaenc-2
 1904290139 metadata/md5-cache/media-sound/fapg-0.42
 1807010809 metadata/md5-cache/media-sound/gst123-0.3.5
 1910161509 metadata/md5-cache/media-sound/icecream-1.3
@@ -51039,7 +50990,6 @@
 2011252124 metadata/md5-cache/media-sound/abcmidi-2020.06.07
 2011252124 metadata/md5-cache/media-sound/aeolus-0.9.9
 2011252124 metadata/md5-cache/media-sound/alac_decoder-0.2.0-r1
-2011252124 metadata/md5-cache/media-sound/alsa-tools-1.2.2-r1
 2011252124 metadata/md5-cache/media-sound/alsa-utils-1.2.2
 2011252124 metadata/md5-cache/media-sound/alsa-utils-1.2.3
 2011252124 metadata/md5-cache/media-sound/alsa-utils-1.2.4
@@ -51060,12 +51010,9 @@
 2011252124 metadata/md5-cache/media-sound/audex-0.95_pre20190721
 2011252124 metadata/md5-cache/media-sound/audicle-1.0.0.7-r2
 2011252124 metadata/md5-cache/media-sound/audiocompress-2.0
-2011252124 metadata/md5-cache/media-sound/audiotools-3.1.1
 2011252124 metadata/md5-cache/media-sound/aumix-2.9.1
 2011252124 metadata/md5-cache/media-sound/aylet-0.5
 2011252124 metadata/md5-cache/media-sound/baudline-1.08-r1
-2011252124 metadata/md5-cache/media-sound/beets-1.4.9-r2
-2011252124 metadata/md5-cache/media-sound/beets-9999
 2011252124 metadata/md5-cache/media-sound/bempc-0.11_p20160207
 2011252124 metadata/md5-cache/media-sound/bitmeter-1.2-r2
 2011252124 metadata/md5-cache/media-sound/bluez-alsa-3.0.0
@@ -51125,7 +51072,6 @@
 2011252124 metadata/md5-cache/media-sound/fluidsynth-2.1.5
 2011252124 metadata/md5-cache/media-sound/fmdrv-1.0.7
 2011252124 metadata/md5-cache/media-sound/fmit-1.0.15-r3
-2011252124 metadata/md5-cache/media-sound/frescobaldi-3.1.1
 2011252124 metadata/md5-cache/media-sound/gbsplay-0.0.91-r2
 2011252124 metadata/md5-cache/media-sound/gigedit-1.1.1-r1
 2011252124 metadata/md5-cache/media-sound/gigedit-9999
@@ -51137,7 +51083,6 @@
 2011252124 metadata/md5-cache/media-sound/gnump3d-3.0-r2
 2011252124 metadata/md5-cache/media-sound/gogglesmm-1.2.1-r1
 2011252124 metadata/md5-cache/media-sound/gom-0.29.103-r1
-2011252124 metadata/md5-cache/media-sound/gpodder-3.10.16-r1
 2011252124 metadata/md5-cache/media-sound/gqradio-1.9.2
 2011252124 metadata/md5-cache/media-sound/gramofile-1.6_p9
 2011252124 metadata/md5-cache/media-sound/grip-4.2.0
@@ -51155,12 +51100,10 @@
 2011252124 metadata/md5-cache/media-sound/id3ted-1.0
 2011252124 metadata/md5-cache/media-sound/id3v2-0.1.12-r1
 2011252124 metadata/md5-cache/media-sound/jaaa-0.9.2
-2011252124 metadata/md5-cache/media-sound/jack-4.0.0_pre20200706
 2011252124 metadata/md5-cache/media-sound/jack-audio-connection-kit-0.125.0-r1
 2011252124 metadata/md5-cache/media-sound/jack-keyboard-2.7.2-r1
 2011252124 metadata/md5-cache/media-sound/jack-rack-1.4.8_rc1-r1
 2011252124 metadata/md5-cache/media-sound/jack2-1.9.14
-2011252124 metadata/md5-cache/media-sound/jack2-1.9.16
 2011252124 metadata/md5-cache/media-sound/jack2-9999
 2011252124 metadata/md5-cache/media-sound/jack_capture-0.9.73
 2011252124 metadata/md5-cache/media-sound/jack_capture-9999
@@ -51187,8 +51130,6 @@
 2011252124 metadata/md5-cache/media-sound/mac-4.11.4.5.7-r1
 2011252124 metadata/md5-cache/media-sound/madplay-0.15.2b-r1
 2011252124 metadata/md5-cache/media-sound/mangler-1.2.5-r1
-2011252124 metadata/md5-cache/media-sound/marrie-0.4
-2011252124 metadata/md5-cache/media-sound/marrie-9999
 2011252124 metadata/md5-cache/media-sound/mcdp-0.4b
 2011252124 metadata/md5-cache/media-sound/meterbridge-0.9.3
 2011252124 metadata/md5-cache/media-sound/milkytracker-1.02.00-r1
@@ -51222,19 +51163,15 @@
 2011252124 metadata/md5-cache/media-sound/mpg123-1.26.2
 2011252124 metadata/md5-cache/media-sound/mpg123-1.26.3
 2011252124 metadata/md5-cache/media-sound/mpg321-0.3.2
-2011252124 metadata/md5-cache/media-sound/mps-youtube-0.2.8-r2
-2011252124 metadata/md5-cache/media-sound/mps-youtube-9999
 2011252124 metadata/md5-cache/media-sound/mt-daapd-0.2.4.2
 2011252124 metadata/md5-cache/media-sound/multimux-0.2.5.2
 2011252124 metadata/md5-cache/media-sound/mumble-1.3.1-r1
 2011252124 metadata/md5-cache/media-sound/mumble-1.3.2
-2011252124 metadata/md5-cache/media-sound/mumble-1.3.3
 2011252124 metadata/md5-cache/media-sound/mumble-9999
 2011252124 metadata/md5-cache/media-sound/munt-mt32emu-alsadrv-2.3.0
 2011252124 metadata/md5-cache/media-sound/mup-6.6
 2011252124 metadata/md5-cache/media-sound/murmur-1.3.1
 2011252124 metadata/md5-cache/media-sound/murmur-1.3.2
-2011252124 metadata/md5-cache/media-sound/murmur-1.3.3
 2011252124 metadata/md5-cache/media-sound/murmur-9999
 2011252124 metadata/md5-cache/media-sound/muse-0.9.2_p20161002
 2011252124 metadata/md5-cache/media-sound/musepack-tools-465-r1
@@ -51264,8 +51201,6 @@
 2011252124 metadata/md5-cache/media-sound/peercast-0.1218-r2
 2011252124 metadata/md5-cache/media-sound/pianobar-2020.04.05
 2011252124 metadata/md5-cache/media-sound/pianobar-9999
-2011252124 metadata/md5-cache/media-sound/picard-2.4.2
-2011252124 metadata/md5-cache/media-sound/picard-9999
 2011252124 metadata/md5-cache/media-sound/picoxine-0.0.7
 2011252124 metadata/md5-cache/media-sound/pitchtune-0.0.4
 2011252124 metadata/md5-cache/media-sound/pithos-1.5.0
@@ -51287,8 +51222,6 @@
 2011252124 metadata/md5-cache/media-sound/pulseeffects-4.7.3
 2011252124 metadata/md5-cache/media-sound/pulseeffects-4.8.2
 2011252124 metadata/md5-cache/media-sound/pulseeffects-9999
-2011252124 metadata/md5-cache/media-sound/pulsemixer-1.5.1
-2011252124 metadata/md5-cache/media-sound/pulsemixer-9999
 2011252124 metadata/md5-cache/media-sound/pwavecat-0.4.5
 2011252124 metadata/md5-cache/media-sound/qastools-0.23.0
 2011252124 metadata/md5-cache/media-sound/qjackctl-0.6.3
@@ -51305,11 +51238,8 @@
 2011252124 metadata/md5-cache/media-sound/qtagger-1.0.1_p20150402
 2011252124 metadata/md5-cache/media-sound/qtgain-1.0.0
 2011252124 metadata/md5-cache/media-sound/qtractor-0.9.17
-2011252124 metadata/md5-cache/media-sound/qtractor-0.9.18
 2011252124 metadata/md5-cache/media-sound/qtscrobbler-0.11_pre20130123
 2011252124 metadata/md5-cache/media-sound/quimup-1.4.4
-2011252124 metadata/md5-cache/media-sound/quodlibet-4.2.1
-2011252124 metadata/md5-cache/media-sound/quodlibet-4.3.0
 2011252124 metadata/md5-cache/media-sound/rawrec-0.9.991
 2011252124 metadata/md5-cache/media-sound/rcenter-0.6.2
 2011252124 metadata/md5-cache/media-sound/rexima-1.4-r1
@@ -51328,7 +51258,6 @@
 2011252124 metadata/md5-cache/media-sound/sndfile-tools-9999
 2011252124 metadata/md5-cache/media-sound/sndpeek-1.41-r1
 2011252124 metadata/md5-cache/media-sound/solfege-3.23.4
-2011252124 metadata/md5-cache/media-sound/sonata-1.7_beta1_p20200212
 2011252124 metadata/md5-cache/media-sound/sonic-visualiser-4.2
 2011252124 metadata/md5-cache/media-sound/sooperlooper-1.7.4
 2011252124 metadata/md5-cache/media-sound/sound-juicer-3.24.0
@@ -51392,7 +51321,6 @@
 2011252124 metadata/md5-cache/media-sound/wavpack-5.3.2
 2011252124 metadata/md5-cache/media-sound/wavplay-2.0
 2011252124 metadata/md5-cache/media-sound/wavsplit-1.2.1-r2
-2011252124 metadata/md5-cache/media-sound/whipper-0.9.0
 2011252124 metadata/md5-cache/media-sound/wildmidi-0.3.13
 2011252124 metadata/md5-cache/media-sound/wildmidi-0.4.3
 2011252124 metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r8
@@ -51406,8 +51334,31 @@
 2011270039 metadata/md5-cache/media-sound/teamspeak-client-3.5.3-r1
 2011270039 metadata/md5-cache/media-sound/teamspeak-client-3.5.6-r1
 2011281309 metadata/md5-cache/media-sound/hydrogen-9999
-2011300139 metadata/md5-cache/media-sound/Manifest.gz
 2011300139 metadata/md5-cache/media-sound/teamspeak-server-3.13.2
+2012031109 metadata/md5-cache/media-sound/Manifest.gz
+2012030239 metadata/md5-cache/media-sound/alsa-tools-1.2.2-r1
+2012011340 metadata/md5-cache/media-sound/audiotools-3.1.1
+2012011340 metadata/md5-cache/media-sound/beets-1.4.9-r2
+2012011340 metadata/md5-cache/media-sound/beets-9999
+2012011340 metadata/md5-cache/media-sound/frescobaldi-3.1.1
+2012011340 metadata/md5-cache/media-sound/gpodder-3.10.16-r1
+2012011340 metadata/md5-cache/media-sound/jack-4.0.0_pre20200706
+2012031109 metadata/md5-cache/media-sound/jack2-1.9.16
+2012011340 metadata/md5-cache/media-sound/marrie-0.4
+2012011340 metadata/md5-cache/media-sound/marrie-9999
+2012011340 metadata/md5-cache/media-sound/mps-youtube-0.2.8-r2
+2012011340 metadata/md5-cache/media-sound/mps-youtube-9999
+2012030239 metadata/md5-cache/media-sound/mumble-1.3.3
+2012030239 metadata/md5-cache/media-sound/murmur-1.3.3
+2012011340 metadata/md5-cache/media-sound/picard-2.4.2
+2012011340 metadata/md5-cache/media-sound/picard-9999
+2012011340 metadata/md5-cache/media-sound/pulsemixer-1.5.1
+2012011340 metadata/md5-cache/media-sound/pulsemixer-9999
+2012030239 metadata/md5-cache/media-sound/qtractor-0.9.18
+2012011340 metadata/md5-cache/media-sound/quodlibet-4.2.1
+2012011340 metadata/md5-cache/media-sound/quodlibet-4.3.0
+2012011340 metadata/md5-cache/media-sound/sonata-1.7_beta1_p20200212
+2012011340 metadata/md5-cache/media-sound/whipper-0.9.0
 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
@@ -51433,16 +51384,16 @@
 2011252124 metadata/md5-cache/media-tv/nvtv-0.4.7-r3
 2011252124 metadata/md5-cache/media-tv/tvheadend-4.2.8-r1
 2011252124 metadata/md5-cache/media-tv/tvheadend-9999
-2011252124 metadata/md5-cache/media-tv/tvnamer-2.4
-2011252124 metadata/md5-cache/media-tv/tvnamer-2.5
 2011252124 metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r3
 2011252124 metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r4
 2011252124 metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r5
 2011252124 metadata/md5-cache/media-tv/v4l-utils-1.10.1
 2011252124 metadata/md5-cache/media-tv/v4l-utils-1.16.6
 2011252124 metadata/md5-cache/media-tv/v4l-utils-1.20.0
-2011290239 metadata/md5-cache/media-tv/Manifest.gz
-2011290239 metadata/md5-cache/media-tv/w_scan-20170107
+2012030239 metadata/md5-cache/media-tv/Manifest.gz
+2012011340 metadata/md5-cache/media-tv/tvnamer-2.4
+2012011340 metadata/md5-cache/media-tv/tvnamer-2.5
+2012030239 metadata/md5-cache/media-tv/w_scan-20170107
 1702282327 metadata/md5-cache/media-video/binkplayer-1.99w
 1810060109 metadata/md5-cache/media-video/blinkensim-2.7-r1
 1904012039 metadata/md5-cache/media-video/blinkenthemes-0.10-r1
@@ -51469,7 +51420,6 @@
 2004032241 metadata/md5-cache/media-video/xvid4conf-1.12
 2004261409 metadata/md5-cache/media-video/dv2sub-0.3-r1
 2005181938 metadata/md5-cache/media-video/dvdbackup-0.4.2
-2006041239 metadata/md5-cache/media-video/movit-1.2.0
 2006291709 metadata/md5-cache/media-video/vdrtools-genindex-0.1.3-r2
 2009071439 metadata/md5-cache/media-video/h264enc-10.4.7-r1
 2009121921 metadata/md5-cache/media-video/mjpg-streamer-0_pre20120621-r2
@@ -51507,7 +51457,6 @@
 2011252124 metadata/md5-cache/media-video/cinelerra-2.3-r1
 2011252124 metadata/md5-cache/media-video/clive-2.3.0.1
 2011252124 metadata/md5-cache/media-video/cpvts-1.2-r1
-2011252124 metadata/md5-cache/media-video/devedeng-4.16.0-r1
 2011252124 metadata/md5-cache/media-video/dirac-1.0.2-r1
 2011252124 metadata/md5-cache/media-video/dvbackup-0.0.4-r2
 2011252124 metadata/md5-cache/media-video/dvbsnoop-1.4.50-r1
@@ -51525,22 +51474,16 @@
 2011252124 metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.2
 2011252124 metadata/md5-cache/media-video/flvstreamer-2.1c
 2011252124 metadata/md5-cache/media-video/frameworks-0.3.7-r1
-2011252124 metadata/md5-cache/media-video/gaupol-1.8-r1
-2011252124 metadata/md5-cache/media-video/gaupol-1.8-r2
 2011252124 metadata/md5-cache/media-video/gnome-video-effects-0.4.3
 2011252124 metadata/md5-cache/media-video/google2srt-0.5.6-r1
 2011252124 metadata/md5-cache/media-video/gpac-0.8.1
 2011252124 metadata/md5-cache/media-video/gpac-1.0.1
 2011252124 metadata/md5-cache/media-video/gpac-9999
 2011252124 metadata/md5-cache/media-video/guvcview-2.0.6-r1
-2011252124 metadata/md5-cache/media-video/gxine-0.5.907-r1
 2011252124 metadata/md5-cache/media-video/gxine-0.5.909
 2011252124 metadata/md5-cache/media-video/handbrake-1.3.3
 2011252124 metadata/md5-cache/media-video/handbrake-1.3.3-r1
 2011252124 metadata/md5-cache/media-video/handbrake-9999
-2011252124 metadata/md5-cache/media-video/harvid-0.8.0
-2011252124 metadata/md5-cache/media-video/harvid-0.8.1
-2011252124 metadata/md5-cache/media-video/harvid-0.8.2
 2011252124 metadata/md5-cache/media-video/harvid-0.8.3-r1
 2011252124 metadata/md5-cache/media-video/imagination-3.0-r2
 2011252124 metadata/md5-cache/media-video/isight-firmware-tools-1.6-r1
@@ -51573,9 +51516,7 @@
 2011252124 metadata/md5-cache/media-video/mkvtoolnix-9999
 2011252124 metadata/md5-cache/media-video/motion-4.3.1
 2011252124 metadata/md5-cache/media-video/motiontrack-0.1.3-r2
-2011252124 metadata/md5-cache/media-video/movit-1.6.1
 2011252124 metadata/md5-cache/media-video/movit-1.6.2
-2011252124 metadata/md5-cache/media-video/mpeg-tools-1.5b-r4
 2011252124 metadata/md5-cache/media-video/mpeg-tools-1.5b-r5
 2011252124 metadata/md5-cache/media-video/mpeg2vidcodec-12-r1
 2011252124 metadata/md5-cache/media-video/mpglen-0.1
@@ -51594,10 +51535,6 @@
 2011252124 metadata/md5-cache/media-video/obs-studio-9999
 2011252124 metadata/md5-cache/media-video/obs-v4l2sink-0.1.0_p20181012-r2
 2011252124 metadata/md5-cache/media-video/ogmrip-1.0.1
-2011252124 metadata/md5-cache/media-video/openshot-2.4.0-r1
-2011252124 metadata/md5-cache/media-video/openshot-2.4.4-r1
-2011252124 metadata/md5-cache/media-video/openshot-2.5.0
-2011252124 metadata/md5-cache/media-video/openshot-2.5.1
 2011252124 metadata/md5-cache/media-video/orion-1.6.7
 2011252124 metadata/md5-cache/media-video/oxine-0.7.1-r2
 2011252124 metadata/md5-cache/media-video/peek-1.4.0-r1
@@ -51629,11 +51566,7 @@
 2011252124 metadata/md5-cache/media-video/smtube-20.1.0
 2011252124 metadata/md5-cache/media-video/snappy-1.0-r1
 2011252124 metadata/md5-cache/media-video/sonic-snap-1.7-r1
-2011252124 metadata/md5-cache/media-video/streamdeck-ui-0.0_p20200102-r1
-2011252124 metadata/md5-cache/media-video/streamdeck-ui-9999
 2011252124 metadata/md5-cache/media-video/streamdvd-0.4-r2
-2011252124 metadata/md5-cache/media-video/subliminal-2.1.0-r1
-2011252124 metadata/md5-cache/media-video/subliminal-9999
 2011252124 metadata/md5-cache/media-video/submux-dvd-0.5.2-r1
 2011252124 metadata/md5-cache/media-video/subtitlecomposer-0.7.0
 2011252124 metadata/md5-cache/media-video/subtitleeditor-0.54.0
@@ -51654,15 +51587,12 @@
 2011252124 metadata/md5-cache/media-video/v4l2loopback-9999
 2011252124 metadata/md5-cache/media-video/vamps-0.99.2-r2
 2011252124 metadata/md5-cache/media-video/vcdimager-2.0.1
-2011252124 metadata/md5-cache/media-video/vcsi-7-r1
 2011252124 metadata/md5-cache/media-video/vdr-2.2.0-r5
 2011252124 metadata/md5-cache/media-video/vdr-2.2.0-r6
 2011252124 metadata/md5-cache/media-video/vdr-2.4.1-r2
 2011252124 metadata/md5-cache/media-video/vdr-2.4.1-r3
 2011252124 metadata/md5-cache/media-video/vdr2jpeg-0.2.0
 2011252124 metadata/md5-cache/media-video/vdr2jpeg-0.2.0-r5
-2011252124 metadata/md5-cache/media-video/vidcutter-6.0.0-r1
-2011252124 metadata/md5-cache/media-video/vidcutter-9999
 2011252124 metadata/md5-cache/media-video/videotrans-1.6.1-r2
 2011252124 metadata/md5-cache/media-video/vlc-3.0.11.1
 2011252124 metadata/md5-cache/media-video/vlc-3.0.9999
@@ -51670,23 +51600,37 @@
 2011252124 metadata/md5-cache/media-video/vobcopy-1.2.0
 2011252124 metadata/md5-cache/media-video/vstrip-0.8f
 2011252124 metadata/md5-cache/media-video/webcamoid-8.1.0-r1
-2011252124 metadata/md5-cache/media-video/webcamoid-8.7.1
 2011252124 metadata/md5-cache/media-video/x264-encoder-0.0.20190214
 2011252124 metadata/md5-cache/media-video/x264-encoder-0.0.20190903
 2011252124 metadata/md5-cache/media-video/x264-encoder-9999
 2011252124 metadata/md5-cache/media-video/xine-ui-0.99.10
 2011252124 metadata/md5-cache/media-video/xine-ui-0.99.12
 2011252124 metadata/md5-cache/media-video/xvattr-1.3-r3
-2011252124 metadata/md5-cache/media-video/yle-dl-20201022
 2011281009 metadata/md5-cache/media-video/rav1e-0.3.3
 2011281009 metadata/md5-cache/media-video/rav1e-0.3.4
 2011281009 metadata/md5-cache/media-video/rav1e-9999
 2011281439 metadata/md5-cache/media-video/ffmpeg-4.3.1
 2011281239 metadata/md5-cache/media-video/mplayer-1.4-r1
 2011281709 metadata/md5-cache/media-video/pipewire-0.3.17
-2011292309 metadata/md5-cache/media-video/Manifest.gz
 2011292309 metadata/md5-cache/media-video/simplescreenrecorder-0.4.2
 2011292309 metadata/md5-cache/media-video/simplescreenrecorder-9999
+2012030239 metadata/md5-cache/media-video/Manifest.gz
+2012011340 metadata/md5-cache/media-video/devedeng-4.16.0-r1
+2012011340 metadata/md5-cache/media-video/gaupol-1.8-r1
+2012011340 metadata/md5-cache/media-video/gaupol-1.8-r2
+2012011340 metadata/md5-cache/media-video/openshot-2.4.0-r1
+2012011340 metadata/md5-cache/media-video/openshot-2.4.4-r1
+2012011340 metadata/md5-cache/media-video/openshot-2.5.0
+2012011340 metadata/md5-cache/media-video/openshot-2.5.1
+2012011340 metadata/md5-cache/media-video/streamdeck-ui-0.0_p20200102-r1
+2012011340 metadata/md5-cache/media-video/streamdeck-ui-9999
+2012011340 metadata/md5-cache/media-video/subliminal-2.1.0-r1
+2012011340 metadata/md5-cache/media-video/subliminal-9999
+2012011340 metadata/md5-cache/media-video/vcsi-7-r1
+2012011340 metadata/md5-cache/media-video/vidcutter-6.0.0-r1
+2012011340 metadata/md5-cache/media-video/vidcutter-9999
+2012030239 metadata/md5-cache/media-video/webcamoid-8.7.1
+2012011340 metadata/md5-cache/media-video/yle-dl-20201022
 1910070809 metadata/md5-cache/net-analyzer/arptools-1.0.2
 1906051110 metadata/md5-cache/net-analyzer/authforce-0.9.9-r2
 1907081539 metadata/md5-cache/net-analyzer/chaosreader-0.96
@@ -51729,7 +51673,6 @@
 2004152239 metadata/md5-cache/net-analyzer/arping-2.17
 2006111139 metadata/md5-cache/net-analyzer/nagios-4.4.6
 2006290009 metadata/md5-cache/net-analyzer/testssl-3.0.2
-2006291709 metadata/md5-cache/net-analyzer/etherape-0.9.19
 2007020939 metadata/md5-cache/net-analyzer/bwping-1.17
 2007071139 metadata/md5-cache/net-analyzer/lft-3.91-r1
 2007251409 metadata/md5-cache/net-analyzer/fping-4.4
@@ -51745,7 +51688,6 @@
 2009121921 metadata/md5-cache/net-analyzer/cacti-1.2.14
 2009140409 metadata/md5-cache/net-analyzer/ossec-hids-3.6.0
 2009281439 metadata/md5-cache/net-analyzer/nikto-2.1.6_p20200901
-2010010109 metadata/md5-cache/net-analyzer/bwping-2.1
 2010031839 metadata/md5-cache/net-analyzer/flow-tools-0.68.5.1-r11
 2010121609 metadata/md5-cache/net-analyzer/prelude-lml-rules-5.2.0
 2010242039 metadata/md5-cache/net-analyzer/nagios-check_glsa2-20120930-r1
@@ -51756,8 +51698,6 @@
 2011061444 metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0
 2011061540 metadata/md5-cache/net-analyzer/sqlninja-0.2.6_p1-r1
 2011241509 metadata/md5-cache/net-analyzer/testssl-3.0.4
-2011252124 metadata/md5-cache/net-analyzer/2ping-4.4.1
-2011252124 metadata/md5-cache/net-analyzer/2ping-4.5
 2011252124 metadata/md5-cache/net-analyzer/alive-2.0.2-r1
 2011252124 metadata/md5-cache/net-analyzer/amap-5.4
 2011252124 metadata/md5-cache/net-analyzer/amap-5.4-r1
@@ -51794,8 +51734,6 @@
 2011252124 metadata/md5-cache/net-analyzer/cacti-spine-1.2.13
 2011252124 metadata/md5-cache/net-analyzer/cacti-spine-1.2.14
 2011252124 metadata/md5-cache/net-analyzer/cacti-spine-99999
-2011252124 metadata/md5-cache/net-analyzer/carl-0.9-r3
-2011252124 metadata/md5-cache/net-analyzer/carl-0.9-r4
 2011252124 metadata/md5-cache/net-analyzer/cbm-0.2
 2011252124 metadata/md5-cache/net-analyzer/check_mk_agent-1.2.8_p27
 2011252124 metadata/md5-cache/net-analyzer/check_mk_agent-1.4.0_p31
@@ -51822,9 +51760,6 @@
 2011252124 metadata/md5-cache/net-analyzer/egressor-1.0-r2
 2011252124 metadata/md5-cache/net-analyzer/ettercap-0.8.3.1
 2011252124 metadata/md5-cache/net-analyzer/ettercap-9999
-2011252124 metadata/md5-cache/net-analyzer/fail2ban-0.11.1-r2
-2011252124 metadata/md5-cache/net-analyzer/fail2ban-99999999
-2011252124 metadata/md5-cache/net-analyzer/flent-1.3.2
 2011252124 metadata/md5-cache/net-analyzer/flow-tools-0.68.6-r1
 2011252124 metadata/md5-cache/net-analyzer/fragroute-1.2.6-r4
 2011252124 metadata/md5-cache/net-analyzer/fwlogwatch-1.4
@@ -51835,15 +51770,11 @@
 2011252124 metadata/md5-cache/net-analyzer/goaccess-9999
 2011252124 metadata/md5-cache/net-analyzer/gr-fosphor-0.0_p20200131
 2011252124 metadata/md5-cache/net-analyzer/gr-fosphor-9999
-2011252124 metadata/md5-cache/net-analyzer/graphite-web-1.1.5-r1
-2011252124 metadata/md5-cache/net-analyzer/graphite-web-1.1.7
 2011252124 metadata/md5-cache/net-analyzer/greenbone-security-assistant-8.0.1-r1
 2011252124 metadata/md5-cache/net-analyzer/greenbone-security-assistant-9.0.1
 2011252124 metadata/md5-cache/net-analyzer/gspoof-3.2-r3
 2011252124 metadata/md5-cache/net-analyzer/gvm-libs-10.0.1
 2011252124 metadata/md5-cache/net-analyzer/gvm-libs-11.0.1
-2011252124 metadata/md5-cache/net-analyzer/gvm-tools-2.0.0-r1
-2011252124 metadata/md5-cache/net-analyzer/gvm-tools-2.1.0
 2011252124 metadata/md5-cache/net-analyzer/gvmd-8.0.1
 2011252124 metadata/md5-cache/net-analyzer/gvmd-9.0.1
 2011252124 metadata/md5-cache/net-analyzer/hexinject-1.5
@@ -51886,8 +51817,6 @@
 2011252124 metadata/md5-cache/net-analyzer/kapacitor-1.5.5
 2011252124 metadata/md5-cache/net-analyzer/knocker-0.7.1-r3
 2011252124 metadata/md5-cache/net-analyzer/lilac-1.0.3
-2011252124 metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
-2011252124 metadata/md5-cache/net-analyzer/linkchecker-9999
 2011252124 metadata/md5-cache/net-analyzer/masscan-1.0.4
 2011252124 metadata/md5-cache/net-analyzer/masscan-1.0.5
 2011252124 metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r2
@@ -51910,25 +51839,19 @@
 2011252124 metadata/md5-cache/net-analyzer/nagios-check_ipmi_sensor-3.2
 2011252124 metadata/md5-cache/net-analyzer/nagios-check_ipmi_sensor-3.6
 2011252124 metadata/md5-cache/net-analyzer/nagios-check_linux_bonding-1.4
-2011252124 metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1
 2011252124 metadata/md5-cache/net-analyzer/nagios-check_pidfile-1
 2011252124 metadata/md5-cache/net-analyzer/nagios-core-4.4.6
 2011252124 metadata/md5-cache/net-analyzer/nagios-core-4.4.6-r1
-2011252124 metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r1
 2011252124 metadata/md5-cache/net-analyzer/nagios-plugin-check_raid-4.0.10
 2011252124 metadata/md5-cache/net-analyzer/nagios-plugin-check_raid-4.0.8
-2011252124 metadata/md5-cache/net-analyzer/nagios-plugins-flameeyes-9999
 2011252124 metadata/md5-cache/net-analyzer/nagios-plugins-linux-madrisan-26-r1
 2011252124 metadata/md5-cache/net-analyzer/nagios-plugins-linux-madrisan-27
 2011252124 metadata/md5-cache/net-analyzer/nagios-plugins-snmp-0.6.0-r2
 2011252124 metadata/md5-cache/net-analyzer/nagircbot-0.0.33
-2011252124 metadata/md5-cache/net-analyzer/nagstamon-3.4.1-r1
 2011252124 metadata/md5-cache/net-analyzer/nbwmon-0.5.2
 2011252124 metadata/md5-cache/net-analyzer/ndoutils-2.1.3-r2
 2011252124 metadata/md5-cache/net-analyzer/nessus-agent-bin-8.1.0
 2011252124 metadata/md5-cache/net-analyzer/nessus-bin-8.12.1
-2011252124 metadata/md5-cache/net-analyzer/net-snmp-5.9-r2
-2011252124 metadata/md5-cache/net-analyzer/net-snmp-99999999
 2011252124 metadata/md5-cache/net-analyzer/netcat-110-r9
 2011252124 metadata/md5-cache/net-analyzer/netcat-110.20180111
 2011252124 metadata/md5-cache/net-analyzer/netdata-1.23.2
@@ -51974,8 +51897,6 @@
 2011252124 metadata/md5-cache/net-analyzer/openbsd-netcat-1.195
 2011252124 metadata/md5-cache/net-analyzer/openvas-scanner-6.0.1
 2011252124 metadata/md5-cache/net-analyzer/openvas-scanner-7.0.1
-2011252124 metadata/md5-cache/net-analyzer/ospd-2.0.1
-2011252124 metadata/md5-cache/net-analyzer/ospd-openvas-1.0.1
 2011252124 metadata/md5-cache/net-analyzer/ostinato-0.9_p20180522
 2011252124 metadata/md5-cache/net-analyzer/p0f-3.09_beta
 2011252124 metadata/md5-cache/net-analyzer/packit-1.6.1
@@ -51994,46 +51915,25 @@
 2011252124 metadata/md5-cache/net-analyzer/pmacct-999999
 2011252124 metadata/md5-cache/net-analyzer/poink-2.03
 2011252124 metadata/md5-cache/net-analyzer/portsentry-1.2-r1
-2011252124 metadata/md5-cache/net-analyzer/prelude-correlator-4.0.0
-2011252124 metadata/md5-cache/net-analyzer/prelude-correlator-4.1.1
-2011252124 metadata/md5-cache/net-analyzer/prelude-correlator-5.1.0
-2011252124 metadata/md5-cache/net-analyzer/prelude-correlator-5.2.0
 2011252124 metadata/md5-cache/net-analyzer/prelude-lml-3.0.0
 2011252124 metadata/md5-cache/net-analyzer/prelude-lml-4.0.0
 2011252124 metadata/md5-cache/net-analyzer/prelude-lml-4.1.0
 2011252124 metadata/md5-cache/net-analyzer/prelude-lml-5.1.0
 2011252124 metadata/md5-cache/net-analyzer/prelude-lml-5.2.0
-2011252124 metadata/md5-cache/net-analyzer/pypacker-4.8
-2011252124 metadata/md5-cache/net-analyzer/pypacker-4.9
-2011252124 metadata/md5-cache/net-analyzer/python-gvm-1.1.0
-2011252124 metadata/md5-cache/net-analyzer/python-gvm-1.2.0
-2011252124 metadata/md5-cache/net-analyzer/python-gvm-1.5.0
-2011252124 metadata/md5-cache/net-analyzer/python-gvm-1.6.0
 2011252124 metadata/md5-cache/net-analyzer/quidscor-1.2.48-r1
 2011252124 metadata/md5-cache/net-analyzer/raddump-0.3.1
 2011252124 metadata/md5-cache/net-analyzer/rrdcollect-0.2.10
-2011252124 metadata/md5-cache/net-analyzer/rrdtool-1.7.2
-2011252124 metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r1
 2011252124 metadata/md5-cache/net-analyzer/rtpbreak-1.3a-r1
 2011252124 metadata/md5-cache/net-analyzer/sancp-1.6.1-r6
 2011252124 metadata/md5-cache/net-analyzer/sarg-2.4.0
 2011252124 metadata/md5-cache/net-analyzer/sbd-1.37-r1
 2011252124 metadata/md5-cache/net-analyzer/scanlogd-2.2.7
-2011252124 metadata/md5-cache/net-analyzer/scanssh-2.1
-2011252124 metadata/md5-cache/net-analyzer/scanssh-2.1-r2
-2011252124 metadata/md5-cache/net-analyzer/scapy-2.4.3
-2011252124 metadata/md5-cache/net-analyzer/scapy-2.4.4
-2011252124 metadata/md5-cache/net-analyzer/scapy-9999
 2011252124 metadata/md5-cache/net-analyzer/scli-0.4.0-r1
 2011252124 metadata/md5-cache/net-analyzer/sinfo-0.0.48
 2011252124 metadata/md5-cache/net-analyzer/slurm-0.3.3-r2
 2011252124 metadata/md5-cache/net-analyzer/slurm-0.4.3
-2011252124 metadata/md5-cache/net-analyzer/snallygaster-0.0.6
-2011252124 metadata/md5-cache/net-analyzer/snallygaster-0.0.8
-2011252124 metadata/md5-cache/net-analyzer/snallygaster-0.0.9
 2011252124 metadata/md5-cache/net-analyzer/sngrep-1.4.6-r3
 2011252124 metadata/md5-cache/net-analyzer/sngrep-1.4.7
-2011252124 metadata/md5-cache/net-analyzer/snmpclitools-0.6.4
 2011252124 metadata/md5-cache/net-analyzer/snort-2.9.12
 2011252124 metadata/md5-cache/net-analyzer/snort-2.9.15
 2011252124 metadata/md5-cache/net-analyzer/snort-2.9.15.1
@@ -52042,7 +51942,6 @@
 2011252124 metadata/md5-cache/net-analyzer/snortalog-2.4.3-r1
 2011252124 metadata/md5-cache/net-analyzer/snortsam-2.70
 2011252124 metadata/md5-cache/net-analyzer/softflowd-1.0.0
-2011252124 metadata/md5-cache/net-analyzer/speedtest-cli-2.1.2
 2011252124 metadata/md5-cache/net-analyzer/squid-graph-3.2-r1
 2011252124 metadata/md5-cache/net-analyzer/squidsites-1.01-r2
 2011252124 metadata/md5-cache/net-analyzer/squidview-0.86
@@ -52093,7 +51992,6 @@
 2011252124 metadata/md5-cache/net-analyzer/tracebox-0.4.4
 2011252124 metadata/md5-cache/net-analyzer/traceproto-1.1.2_beta1
 2011252124 metadata/md5-cache/net-analyzer/traceroute-2.1.0
-2011252124 metadata/md5-cache/net-analyzer/trafshow-5.2.3
 2011252124 metadata/md5-cache/net-analyzer/tsung-1.7.0
 2011252124 metadata/md5-cache/net-analyzer/ttcp-1.12-r2
 2011252124 metadata/md5-cache/net-analyzer/upnpscan-0.4-r3
@@ -52102,8 +52000,6 @@
 2011252124 metadata/md5-cache/net-analyzer/vnstat-2.5
 2011252124 metadata/md5-cache/net-analyzer/vnstat-2.6
 2011252124 metadata/md5-cache/net-analyzer/vnstat-9999
-2011252124 metadata/md5-cache/net-analyzer/wapiti-3.0.3
-2011252124 metadata/md5-cache/net-analyzer/wapiti-9999
 2011252124 metadata/md5-cache/net-analyzer/webfuzzer-0.2.0-r2
 2011252124 metadata/md5-cache/net-analyzer/wireshark-3.4.0
 2011252124 metadata/md5-cache/net-analyzer/wireshark-99999999
@@ -52152,14 +52048,61 @@
 2011270309 metadata/md5-cache/net-analyzer/xprobe-0.3-r1
 2011271109 metadata/md5-cache/net-analyzer/yersinia-0.8.2
 2011271939 metadata/md5-cache/net-analyzer/fping-5.0
-2011271939 metadata/md5-cache/net-analyzer/iptraf-ng-1.2.1
 2011271939 metadata/md5-cache/net-analyzer/ngrep-1.47
 2011271939 metadata/md5-cache/net-analyzer/tcptraceroute-1.5_beta7-r3
 2011271939 metadata/md5-cache/net-analyzer/trafshow-5.2.3-r1
 2011292109 metadata/md5-cache/net-analyzer/smokeping-2.7.3
-2012010139 metadata/md5-cache/net-analyzer/Manifest.gz
 2012010139 metadata/md5-cache/net-analyzer/iptraf-ng-1.1.4-r1
 2011301939 metadata/md5-cache/net-analyzer/nagios-plugins-2.3.1-r1
+2012011340 metadata/md5-cache/net-analyzer/2ping-4.4.1
+2012011340 metadata/md5-cache/net-analyzer/2ping-4.5
+2012031009 metadata/md5-cache/net-analyzer/Manifest.gz
+2012020639 metadata/md5-cache/net-analyzer/bwping-2.1
+2012011340 metadata/md5-cache/net-analyzer/carl-0.9-r3
+2012011340 metadata/md5-cache/net-analyzer/carl-0.9-r4
+2012030239 metadata/md5-cache/net-analyzer/etherape-0.9.19
+2012011340 metadata/md5-cache/net-analyzer/fail2ban-0.11.1-r2
+2012031009 metadata/md5-cache/net-analyzer/fail2ban-99999999
+2012011340 metadata/md5-cache/net-analyzer/flent-1.3.2
+2012011340 metadata/md5-cache/net-analyzer/graphite-web-1.1.5-r1
+2012011340 metadata/md5-cache/net-analyzer/graphite-web-1.1.7
+2012011340 metadata/md5-cache/net-analyzer/gvm-tools-2.0.0-r1
+2012011340 metadata/md5-cache/net-analyzer/gvm-tools-2.1.0
+2012030239 metadata/md5-cache/net-analyzer/iptraf-ng-1.2.1
+2012011340 metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
+2012011340 metadata/md5-cache/net-analyzer/linkchecker-9999
+2012011340 metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1
+2012011340 metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r1
+2012011340 metadata/md5-cache/net-analyzer/nagstamon-3.4.1-r1
+2012011340 metadata/md5-cache/net-analyzer/net-snmp-5.9-r2
+2012011340 metadata/md5-cache/net-analyzer/net-snmp-99999999
+2012011340 metadata/md5-cache/net-analyzer/ospd-2.0.1
+2012011340 metadata/md5-cache/net-analyzer/ospd-openvas-1.0.1
+2012011340 metadata/md5-cache/net-analyzer/prelude-correlator-4.0.0
+2012011340 metadata/md5-cache/net-analyzer/prelude-correlator-4.1.1
+2012011340 metadata/md5-cache/net-analyzer/prelude-correlator-5.1.0
+2012011340 metadata/md5-cache/net-analyzer/prelude-correlator-5.2.0
+2012011340 metadata/md5-cache/net-analyzer/pypacker-4.8
+2012011340 metadata/md5-cache/net-analyzer/pypacker-4.9
+2012011340 metadata/md5-cache/net-analyzer/python-gvm-1.1.0
+2012011340 metadata/md5-cache/net-analyzer/python-gvm-1.2.0
+2012011340 metadata/md5-cache/net-analyzer/python-gvm-1.5.0
+2012011340 metadata/md5-cache/net-analyzer/python-gvm-1.6.0
+2012011340 metadata/md5-cache/net-analyzer/rrdtool-1.7.2
+2012011340 metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r1
+2012011340 metadata/md5-cache/net-analyzer/scapy-2.4.3
+2012030239 metadata/md5-cache/net-analyzer/scapy-2.4.4
+2012011340 metadata/md5-cache/net-analyzer/scapy-9999
+2012011340 metadata/md5-cache/net-analyzer/snallygaster-0.0.6
+2012011340 metadata/md5-cache/net-analyzer/snallygaster-0.0.8
+2012011340 metadata/md5-cache/net-analyzer/snallygaster-0.0.9
+2012011340 metadata/md5-cache/net-analyzer/snmpclitools-0.6.4
+2012011340 metadata/md5-cache/net-analyzer/speedtest-cli-2.1.2
+2012011340 metadata/md5-cache/net-analyzer/wapiti-3.0.3
+2012011340 metadata/md5-cache/net-analyzer/wapiti-9999
+2012021239 metadata/md5-cache/net-analyzer/zabbix-4.0.27
+2012021239 metadata/md5-cache/net-analyzer/zabbix-5.0.6
+2012021209 metadata/md5-cache/net-analyzer/zabbix-5.2.2
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2002112051 metadata/md5-cache/net-dialup/wvdial-1.61
 2004032241 metadata/md5-cache/net-dialup/ppp-scripts-0
@@ -52251,8 +52194,6 @@
 2011252124 metadata/md5-cache/net-dns/dnssec-tools-2.2.3-r2
 2011252124 metadata/md5-cache/net-dns/dnssec-validator-2.2.3
 2011252124 metadata/md5-cache/net-dns/dnstop-20140915-r2
-2011252124 metadata/md5-cache/net-dns/dnsviz-0.8.2
-2011252124 metadata/md5-cache/net-dns/dnsviz-0.8.2-r1
 2011252124 metadata/md5-cache/net-dns/ez-ipupdate-3.0.11.13.3_beta8-r3
 2011252124 metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
 2011252124 metadata/md5-cache/net-dns/getdns-1.5.1
@@ -52272,7 +52213,6 @@
 2011252124 metadata/md5-cache/net-dns/mydns-1.2.8.31-r2
 2011252124 metadata/md5-cache/net-dns/ndu-0.4-r4
 2011252124 metadata/md5-cache/net-dns/nsd-4.2.4
-2011252124 metadata/md5-cache/net-dns/nsd-4.3.2
 2011252124 metadata/md5-cache/net-dns/nsd-4.3.3
 2011252124 metadata/md5-cache/net-dns/odsclient-1.03-r1
 2011252124 metadata/md5-cache/net-dns/opendnssec-1.3.18-r1
@@ -52294,10 +52234,13 @@
 2011252124 metadata/md5-cache/net-dns/unbound-1.12.0
 2011252124 metadata/md5-cache/net-dns/unbound-1.12.0-r1
 2011260039 metadata/md5-cache/net-dns/pdns-recursor-4.4.1
-2011291139 metadata/md5-cache/net-dns/Manifest.gz
 2011281539 metadata/md5-cache/net-dns/c-ares-1.17.1
-2011291139 metadata/md5-cache/net-dns/idnkit-2.3
-2011291139 metadata/md5-cache/net-dns/ldns-utils-1.7.1
+2012031039 metadata/md5-cache/net-dns/Manifest.gz
+2012011340 metadata/md5-cache/net-dns/dnsviz-0.8.2
+2012011340 metadata/md5-cache/net-dns/dnsviz-0.8.2-r1
+2012030109 metadata/md5-cache/net-dns/idnkit-2.3
+2012031039 metadata/md5-cache/net-dns/ldns-utils-1.7.1
+2012021709 metadata/md5-cache/net-dns/nsd-4.3.4
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2011252124 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.3
@@ -52323,8 +52266,6 @@
 2011252124 metadata/md5-cache/net-firewall/ipset-7.6-r1
 2011252124 metadata/md5-cache/net-firewall/ipset-7.7
 2011252124 metadata/md5-cache/net-firewall/ipset-7.9
-2011252124 metadata/md5-cache/net-firewall/ipt_netflow-2.4-r1
-2011252124 metadata/md5-cache/net-firewall/ipt_netflow-2.5.1-r1
 2011252124 metadata/md5-cache/net-firewall/ipt_netflow-9999
 2011252124 metadata/md5-cache/net-firewall/iptables-1.6.1-r3
 2011252124 metadata/md5-cache/net-firewall/iptables-1.6.2-r2
@@ -52344,14 +52285,15 @@
 2011252124 metadata/md5-cache/net-firewall/rtsp-conntrack-4.18-r1
 2011252124 metadata/md5-cache/net-firewall/sanewall-1.1.6-r3
 2011252124 metadata/md5-cache/net-firewall/shorewall-5.2.8
-2011252124 metadata/md5-cache/net-firewall/ufw-0.36
 2011252124 metadata/md5-cache/net-firewall/xtables-addons-2.13-r1
 2011252124 metadata/md5-cache/net-firewall/xtables-addons-3.7-r1
 2011252124 metadata/md5-cache/net-firewall/xtables-addons-3.8-r1
 2011252124 metadata/md5-cache/net-firewall/xtables-addons-3.9
 2011291139 metadata/md5-cache/net-firewall/itval-1.2_p20121104-r1
 2011291139 metadata/md5-cache/net-firewall/psad-2.4.6
-2011291309 metadata/md5-cache/net-firewall/Manifest.gz
+2012021039 metadata/md5-cache/net-firewall/Manifest.gz
+2012021039 metadata/md5-cache/net-firewall/ipt_netflow-2.5.1-r1
+2012011340 metadata/md5-cache/net-firewall/ufw-0.36
 1909212039 metadata/md5-cache/net-fs/mc-2019.07.17.22.13.42
 1909212039 metadata/md5-cache/net-fs/mc-2019.07.31.19.17.35
 1702282328 metadata/md5-cache/net-fs/openafs-legacy-0.1
@@ -52469,11 +52411,7 @@
 2011252124 metadata/md5-cache/net-im/ejabberd-20.07
 2011252124 metadata/md5-cache/net-im/ekg2-0.4_pre20190315
 2011252124 metadata/md5-cache/net-im/ekg2-9999
-2011252124 metadata/md5-cache/net-im/element-desktop-bin-1.7.9
 2011252124 metadata/md5-cache/net-im/empathy-3.12.14
-2011252124 metadata/md5-cache/net-im/err-6.1.4
-2011252124 metadata/md5-cache/net-im/gajim-1.2.1
-2011252124 metadata/md5-cache/net-im/gajim-1.2.2
 2011252124 metadata/md5-cache/net-im/gitter-bin-3.1.0
 2011252124 metadata/md5-cache/net-im/gitter-bin-4.1.0
 2011252124 metadata/md5-cache/net-im/kouchat-1.1.0
@@ -52483,10 +52421,6 @@
 2011252124 metadata/md5-cache/net-im/openmittsu-0.9.13.46
 2011252124 metadata/md5-cache/net-im/openmittsu-0.9.15.0
 2011252124 metadata/md5-cache/net-im/pidgin-2.14.1
-2011252124 metadata/md5-cache/net-im/poezio-0.12
-2011252124 metadata/md5-cache/net-im/poezio-0.13.1
-2011252124 metadata/md5-cache/net-im/poezio-0.13.1-r1
-2011252124 metadata/md5-cache/net-im/poezio-9999
 2011252124 metadata/md5-cache/net-im/prosody-0.11.5-r1
 2011252124 metadata/md5-cache/net-im/psi-1.5
 2011252124 metadata/md5-cache/net-im/psi-9999
@@ -52512,14 +52446,22 @@
 2011252124 metadata/md5-cache/net-im/telepathy-logger-0.8.2-r1
 2011252124 metadata/md5-cache/net-im/telepathy-mission-control-5.16.5
 2011252124 metadata/md5-cache/net-im/toxic-0.8.3-r1
-2011252124 metadata/md5-cache/net-im/transwhat-0.2.2_p20190426-r1
 2011252124 metadata/md5-cache/net-im/vacuum-1.3.0_pre20180105
 2011252124 metadata/md5-cache/net-im/vacuum-9999
-2011252124 metadata/md5-cache/net-im/yowsup-3.2.3_p20190905
 2011252124 metadata/md5-cache/net-im/ysm-2.9.9.1-r1
 2011261439 metadata/md5-cache/net-im/prosody-0.11.7-r2
-2011281909 metadata/md5-cache/net-im/Manifest.gz
 2011281639 metadata/md5-cache/net-im/zoom-5.4.54779.1115-r3
+2012021609 metadata/md5-cache/net-im/Manifest.gz
+2012021609 metadata/md5-cache/net-im/element-desktop-bin-1.7.14
+2012011340 metadata/md5-cache/net-im/err-6.1.4
+2012011340 metadata/md5-cache/net-im/gajim-1.2.1
+2012011340 metadata/md5-cache/net-im/gajim-1.2.2
+2012011340 metadata/md5-cache/net-im/poezio-0.12
+2012011340 metadata/md5-cache/net-im/poezio-0.13.1
+2012011340 metadata/md5-cache/net-im/poezio-0.13.1-r1
+2012011340 metadata/md5-cache/net-im/poezio-9999
+2012011340 metadata/md5-cache/net-im/transwhat-0.2.2_p20190426-r1
+2012011340 metadata/md5-cache/net-im/yowsup-3.2.3_p20190905
 1812301839 metadata/md5-cache/net-irc/eggdrop-1.8.4
 1802070108 metadata/md5-cache/net-irc/ninja-1.5.9_pre14-r1
 2002112051 metadata/md5-cache/net-irc/bnc-2.9.4-r1
@@ -52558,8 +52500,6 @@
 2011252124 metadata/md5-cache/net-irc/konversation-1.7.7-r1
 2011252124 metadata/md5-cache/net-irc/kvirc-5.2_pre20200605155236
 2011252124 metadata/md5-cache/net-irc/kvirc-9999
-2011252124 metadata/md5-cache/net-irc/limnoria-20191123
-2011252124 metadata/md5-cache/net-irc/limnoria-99999999
 2011252124 metadata/md5-cache/net-irc/ngircd-26
 2011252124 metadata/md5-cache/net-irc/onis-0.8.2-r1
 2011252124 metadata/md5-cache/net-irc/pisg-0.73-r1
@@ -52567,7 +52507,6 @@
 2011252124 metadata/md5-cache/net-irc/psybnc-2.3.2.9-r3
 2011252124 metadata/md5-cache/net-irc/quassel-0.13.1-r2
 2011252124 metadata/md5-cache/net-irc/quassel-9999
-2011252124 metadata/md5-cache/net-irc/quasselgrep-0_p20200830
 2011252124 metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r1
 2011252124 metadata/md5-cache/net-irc/rhapsody-0.28b
 2011252124 metadata/md5-cache/net-irc/scrollz-2.3
@@ -52585,7 +52524,10 @@
 2011252124 metadata/md5-cache/net-irc/znc-9999
 2011252124 metadata/md5-cache/net-irc/znc-palaver-1.2.1
 2011291139 metadata/md5-cache/net-irc/emech-3.0.99_p3
-2011291309 metadata/md5-cache/net-irc/Manifest.gz
+2012011340 metadata/md5-cache/net-irc/Manifest.gz
+2012011340 metadata/md5-cache/net-irc/limnoria-20191123
+2012011340 metadata/md5-cache/net-irc/limnoria-99999999
+2012011340 metadata/md5-cache/net-irc/quasselgrep-0_p20200830
 1903300009 metadata/md5-cache/net-libs/freaklabs-chibiarduino-1.0.8_p20190329
 1803282239 metadata/md5-cache/net-libs/libblkmaker-0.3.2
 1803282239 metadata/md5-cache/net-libs/libblkmaker-0.4.3
@@ -52719,7 +52661,6 @@
 2011252124 metadata/md5-cache/net-libs/libecap-1.0.0
 2011252124 metadata/md5-cache/net-libs/libesmtp-1.0.6-r3
 2011252124 metadata/md5-cache/net-libs/libesmtp-9999
-2011252124 metadata/md5-cache/net-libs/libetpan-1.9.4-r1
 2011252124 metadata/md5-cache/net-libs/libflowmanager-3.0.0-r1
 2011252124 metadata/md5-cache/net-libs/libgadu-1.11.4
 2011252124 metadata/md5-cache/net-libs/libgadu-1.12.2-r1
@@ -52794,10 +52735,8 @@
 2011252124 metadata/md5-cache/net-libs/libnsl-0-r1
 2011252124 metadata/md5-cache/net-libs/libnsl-1.3.0-r1
 2011252124 metadata/md5-cache/net-libs/liboping-1.10.0-r2
-2011252124 metadata/md5-cache/net-libs/libosmo-abis-9999
 2011252124 metadata/md5-cache/net-libs/libosmo-dsp-0.3
 2011252124 metadata/md5-cache/net-libs/libosmo-dsp-9999
-2011252124 metadata/md5-cache/net-libs/libosmo-netif-9999
 2011252124 metadata/md5-cache/net-libs/libosmocore-0.10.2
 2011252124 metadata/md5-cache/net-libs/libosmocore-0.8.0
 2011252124 metadata/md5-cache/net-libs/libosmocore-9999
@@ -52830,7 +52769,6 @@
 2011252124 metadata/md5-cache/net-libs/librsync-2.1.0
 2011252124 metadata/md5-cache/net-libs/librsync-2.2.1
 2011252124 metadata/md5-cache/net-libs/librsync-2.3.0
-2011252124 metadata/md5-cache/net-libs/librsync-2.3.1
 2011252124 metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
 2011252124 metadata/md5-cache/net-libs/libsignal-protocol-c-2.3.2
 2011252124 metadata/md5-cache/net-libs/libsignal-protocol-c-2.3.3
@@ -52853,10 +52791,6 @@
 2011252124 metadata/md5-cache/net-libs/libtorrent-0.13.7
 2011252124 metadata/md5-cache/net-libs/libtorrent-0.13.7-r1
 2011252124 metadata/md5-cache/net-libs/libtorrent-0.13.8
-2011252124 metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.14
-2011252124 metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.10
-2011252124 metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.6
-2011252124 metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.9
 2011252124 metadata/md5-cache/net-libs/libtrace-4.0.10_p1
 2011252124 metadata/md5-cache/net-libs/libtrace-4.0.11_p1
 2011252124 metadata/md5-cache/net-libs/libtrace-4.0.12_p1
@@ -52897,7 +52831,6 @@
 2011252124 metadata/md5-cache/net-libs/net6-1.3.14-r2
 2011252124 metadata/md5-cache/net-libs/netwib-5.39.0
 2011252124 metadata/md5-cache/net-libs/nghttp2-1.41.0
-2011252124 metadata/md5-cache/net-libs/nghttp2-9999
 2011252124 metadata/md5-cache/net-libs/nghttp3-0_pre20190912
 2011252124 metadata/md5-cache/net-libs/nghttp3-9999
 2011252124 metadata/md5-cache/net-libs/ngtcp2-0_pre20190912
@@ -52943,11 +52876,6 @@
 2011252124 metadata/md5-cache/net-libs/socket_wrapper-1.2.3
 2011252124 metadata/md5-cache/net-libs/srt-1.4.1-r1
 2011252124 metadata/md5-cache/net-libs/srt-9999
-2011252124 metadata/md5-cache/net-libs/stem-1.5.4
-2011252124 metadata/md5-cache/net-libs/stem-1.6.0
-2011252124 metadata/md5-cache/net-libs/stem-1.7.0
-2011252124 metadata/md5-cache/net-libs/stem-1.7.1
-2011252124 metadata/md5-cache/net-libs/stem-1.8.0-r1
 2011252124 metadata/md5-cache/net-libs/telepathy-accounts-signon-2.1
 2011252124 metadata/md5-cache/net-libs/telepathy-farstream-0.6.2
 2011252124 metadata/md5-cache/net-libs/telepathy-glib-0.24.1-r1
@@ -52977,18 +52905,31 @@
 2011252124 metadata/md5-cache/net-libs/zmqpp-4.2.0
 2011260009 metadata/md5-cache/net-libs/srt-1.4.2
 2011270009 metadata/md5-cache/net-libs/libslirp-4.3.1-r1
-2011271409 metadata/md5-cache/net-libs/gnutls-3.6.15
 2011281009 metadata/md5-cache/net-libs/quiche-0.5.1
 2011281009 metadata/md5-cache/net-libs/quiche-0.6.0
 2011281009 metadata/md5-cache/net-libs/quiche-9999
-2011280009 metadata/md5-cache/net-libs/webkit-gtk-2.30.3
 2011291139 metadata/md5-cache/net-libs/cppzmq-4.6.0
 2011291139 metadata/md5-cache/net-libs/libnids-1.24-r7
 2011291139 metadata/md5-cache/net-libs/libpcapnav-0.8-r1
-2011291139 metadata/md5-cache/net-libs/libsmi-0.5.0-r1
-2011291139 metadata/md5-cache/net-libs/libwebsockets-4.1.4
-2011281539 metadata/md5-cache/net-libs/nghttp2-1.42.0
-2011291309 metadata/md5-cache/net-libs/Manifest.gz
+2012030939 metadata/md5-cache/net-libs/Manifest.gz
+2012030039 metadata/md5-cache/net-libs/gnutls-3.6.15
+2012030039 metadata/md5-cache/net-libs/gnutls-3.7.0
+2012030239 metadata/md5-cache/net-libs/libetpan-1.9.4-r1
+2012030209 metadata/md5-cache/net-libs/librsync-2.3.1
+2012030739 metadata/md5-cache/net-libs/libsmi-0.5.0-r1
+2012011340 metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.14
+2012011340 metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.10
+2012011340 metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.6
+2012011340 metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.9
+2012030209 metadata/md5-cache/net-libs/libwebsockets-4.1.4
+2012012309 metadata/md5-cache/net-libs/nghttp2-1.42.0
+2012012309 metadata/md5-cache/net-libs/nghttp2-9999
+2012011340 metadata/md5-cache/net-libs/stem-1.5.4
+2012011340 metadata/md5-cache/net-libs/stem-1.6.0
+2012011340 metadata/md5-cache/net-libs/stem-1.7.0
+2012011340 metadata/md5-cache/net-libs/stem-1.7.1
+2012011340 metadata/md5-cache/net-libs/stem-1.8.0-r1
+2012012039 metadata/md5-cache/net-libs/webkit-gtk-2.30.3
 1904081739 metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r5
 1702282329 metadata/md5-cache/net-mail/imapsync-1.592-r1
 1804271339 metadata/md5-cache/net-mail/imapsync-1.836
@@ -53030,8 +52971,6 @@
 2011101309 metadata/md5-cache/net-mail/mailman-meta-3
 2011252124 metadata/md5-cache/net-mail/altermime-0.3.11
 2011252124 metadata/md5-cache/net-mail/asmail-2.1-r1
-2011252124 metadata/md5-cache/net-mail/automx2-2019.0
-2011252124 metadata/md5-cache/net-mail/automx2-2020.1-r1
 2011252124 metadata/md5-cache/net-mail/checkpassword-0.90-r4
 2011252124 metadata/md5-cache/net-mail/courier-imap-4.18.2
 2011252124 metadata/md5-cache/net-mail/courier-imap-5.0.10
@@ -53040,7 +52979,6 @@
 2011252124 metadata/md5-cache/net-mail/courierpassd-1.1.2-r1
 2011252124 metadata/md5-cache/net-mail/cyrus-imapd-3.0.13
 2011252124 metadata/md5-cache/net-mail/cyrus-imapd-3.0.14
-2011252124 metadata/md5-cache/net-mail/django-mailman3-1.3.4
 2011252124 metadata/md5-cache/net-mail/dot-forward-0.71-r4
 2011252124 metadata/md5-cache/net-mail/dovecot-2.2.36.4
 2011252124 metadata/md5-cache/net-mail/dovecot-2.3.10.1
@@ -53055,18 +52993,13 @@
 2011252124 metadata/md5-cache/net-mail/fetchmail-6.4.12-r1
 2011252124 metadata/md5-cache/net-mail/fetchmail-6.4.13
 2011252124 metadata/md5-cache/net-mail/fetchmail-6.4.8
-2011252124 metadata/md5-cache/net-mail/getmail-6.9
 2011252124 metadata/md5-cache/net-mail/gnubiff-2.2.17-r2
-2011252124 metadata/md5-cache/net-mail/hyperkitty-1.3.3
 2011252124 metadata/md5-cache/net-mail/isync-9999
 2011252124 metadata/md5-cache/net-mail/libdbx-1.0.3
 2011252124 metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r2
 2011252124 metadata/md5-cache/net-mail/mailbase-1.5-r1
 2011252124 metadata/md5-cache/net-mail/mailbox-count-0.0.5
 2011252124 metadata/md5-cache/net-mail/mailfront-2.22
-2011252124 metadata/md5-cache/net-mail/mailman-3.3.1-r1
-2011252124 metadata/md5-cache/net-mail/mailman-3.3.2
-2011252124 metadata/md5-cache/net-mail/mailmanclient-3.3.1
 2011252124 metadata/md5-cache/net-mail/mailshears-0.0.4
 2011252124 metadata/md5-cache/net-mail/mailutils-3.10
 2011252124 metadata/md5-cache/net-mail/mailutils-3.8
@@ -53078,18 +53011,9 @@
 2011252124 metadata/md5-cache/net-mail/mswatch-1.2.0-r1
 2011252124 metadata/md5-cache/net-mail/mu-1.4.10
 2011252124 metadata/md5-cache/net-mail/mu-1.4.12
-2011252124 metadata/md5-cache/net-mail/mu-1.4.13
-2011252124 metadata/md5-cache/net-mail/notmuch-0.29.3-r2
-2011252124 metadata/md5-cache/net-mail/notmuch-0.30-r1
-2011252124 metadata/md5-cache/net-mail/notmuch-0.31
-2011252124 metadata/md5-cache/net-mail/notmuch-0.31-r2
-2011252124 metadata/md5-cache/net-mail/notmuch-0.31.2
-2011252124 metadata/md5-cache/net-mail/onionrouter-0.6.1
-2011252124 metadata/md5-cache/net-mail/onionrouter-9999
 2011252124 metadata/md5-cache/net-mail/pfqueue-0.5.6
 2011252124 metadata/md5-cache/net-mail/popa3d-1.0.2-r1
 2011252124 metadata/md5-cache/net-mail/poppassd_ceti-1.8.7
-2011252124 metadata/md5-cache/net-mail/postorius-1.3.3
 2011252124 metadata/md5-cache/net-mail/qlogtools-3.1-r1
 2011252124 metadata/md5-cache/net-mail/qmail-autoresponder-0.97-r3
 2011252124 metadata/md5-cache/net-mail/qmail-autoresponder-2.0
@@ -53105,10 +53029,6 @@
 2011252124 metadata/md5-cache/net-mail/relay-ctrl-3.2
 2011252124 metadata/md5-cache/net-mail/ripmime-1.4.0.10-r1
 2011252124 metadata/md5-cache/net-mail/ripole-0.2.2
-2011252124 metadata/md5-cache/net-mail/rss2email-3.11
-2011252124 metadata/md5-cache/net-mail/rss2email-3.11-r1
-2011252124 metadata/md5-cache/net-mail/rss2email-3.12.1
-2011252124 metadata/md5-cache/net-mail/rss2email-3.12.2
 2011252124 metadata/md5-cache/net-mail/safecat-1.13
 2011252124 metadata/md5-cache/net-mail/sendEmail-1.56-r2
 2011252124 metadata/md5-cache/net-mail/serialmail-0.75-r5
@@ -53121,11 +53041,32 @@
 2011252124 metadata/md5-cache/net-mail/vpopmail-5.4.33-r7
 2011252124 metadata/md5-cache/net-mail/vqadmin-2.3.7
 2011252124 metadata/md5-cache/net-mail/ytnef-1.9.3
-2011261739 metadata/md5-cache/net-mail/b4-0.5.3
 2011281009 metadata/md5-cache/net-mail/swaks-20201014.0
 2011291139 metadata/md5-cache/net-mail/fdm-2.0
-2012010109 metadata/md5-cache/net-mail/Manifest.gz
 2012010109 metadata/md5-cache/net-mail/dbmail-3.2.3-r3
+2012011340 metadata/md5-cache/net-mail/Manifest.gz
+2012011340 metadata/md5-cache/net-mail/automx2-2019.0
+2012011340 metadata/md5-cache/net-mail/automx2-2020.1-r1
+2012011340 metadata/md5-cache/net-mail/b4-0.5.3
+2012011340 metadata/md5-cache/net-mail/django-mailman3-1.3.4
+2012011340 metadata/md5-cache/net-mail/getmail-6.9
+2012011340 metadata/md5-cache/net-mail/hyperkitty-1.3.3
+2012011340 metadata/md5-cache/net-mail/mailman-3.3.1-r1
+2012011340 metadata/md5-cache/net-mail/mailman-3.3.2
+2012011340 metadata/md5-cache/net-mail/mailmanclient-3.3.1
+2012011309 metadata/md5-cache/net-mail/mu-1.4.13
+2012011340 metadata/md5-cache/net-mail/notmuch-0.29.3-r2
+2012011340 metadata/md5-cache/net-mail/notmuch-0.30-r1
+2012011340 metadata/md5-cache/net-mail/notmuch-0.31
+2012011340 metadata/md5-cache/net-mail/notmuch-0.31-r2
+2012011340 metadata/md5-cache/net-mail/notmuch-0.31.2
+2012011340 metadata/md5-cache/net-mail/onionrouter-0.6.1
+2012011340 metadata/md5-cache/net-mail/onionrouter-9999
+2012011340 metadata/md5-cache/net-mail/postorius-1.3.3
+2012011340 metadata/md5-cache/net-mail/rss2email-3.11
+2012011340 metadata/md5-cache/net-mail/rss2email-3.11-r1
+2012011340 metadata/md5-cache/net-mail/rss2email-3.12.1
+2012011340 metadata/md5-cache/net-mail/rss2email-3.12.2
 1910170740 metadata/md5-cache/net-misc/arpsponge-3.17.11
 1910022239 metadata/md5-cache/net-misc/autossh-1.4g
 1911110039 metadata/md5-cache/net-misc/autoupnp-0.4.7
@@ -53156,7 +53097,6 @@
 1810090339 metadata/md5-cache/net-misc/s6-networking-2.3.0.3
 1906221109 metadata/md5-cache/net-misc/s6-networking-2.3.0.4
 1811071339 metadata/md5-cache/net-misc/sgopherd-18.08
-1702282329 metadata/md5-cache/net-misc/sipcalc-1.1.6
 1702282329 metadata/md5-cache/net-misc/sshrc-0.6.1
 1901031339 metadata/md5-cache/net-misc/sshrc-0.6.2
 1904290109 metadata/md5-cache/net-misc/stuntman-1.2.15
@@ -53313,10 +53253,6 @@
 2011252124 metadata/md5-cache/net-misc/dropbox-cli-2020.03.04
 2011252124 metadata/md5-cache/net-misc/econnman-1.1-r1
 2011252124 metadata/md5-cache/net-misc/efax-0.9a_p19_p1
-2011252124 metadata/md5-cache/net-misc/electron-cash-4.0.2-r2
-2011252124 metadata/md5-cache/net-misc/electrum-4.0.4
-2011252124 metadata/md5-cache/net-misc/electrum-4.0.5
-2011252124 metadata/md5-cache/net-misc/electrum-ltc-3.3.4.1-r2
 2011252124 metadata/md5-cache/net-misc/ena-driver-2.0.3-r1
 2011252124 metadata/md5-cache/net-misc/ena-driver-2.2.3-r1
 2011252124 metadata/md5-cache/net-misc/endlessh-1.1-r1
@@ -53326,16 +53262,12 @@
 2011252124 metadata/md5-cache/net-misc/etherdfs-20180203-r1
 2011252124 metadata/md5-cache/net-misc/ethflop-20191003
 2011252124 metadata/md5-cache/net-misc/eventd-0.27.0-r1
-2011252124 metadata/md5-cache/net-misc/exabgp-4.2.11-r1
 2011252124 metadata/md5-cache/net-misc/fakeidentd-2.6-r1
 2011252124 metadata/md5-cache/net-misc/fatrat-1.2.0_beta2_p20161204
 2011252124 metadata/md5-cache/net-misc/felix-3.1.3
 2011252124 metadata/md5-cache/net-misc/freerdp-2.2.0
 2011252124 metadata/md5-cache/net-misc/freerdp-2.9999
 2011252124 metadata/md5-cache/net-misc/freerdp-9999
-2011252124 metadata/md5-cache/net-misc/gallery-dl-1.15.2-r1
-2011252124 metadata/md5-cache/net-misc/gallery-dl-1.15.3
-2011252124 metadata/md5-cache/net-misc/gallery-dl-9999
 2011252124 metadata/md5-cache/net-misc/gcap-0.1.1-r1
 2011252124 metadata/md5-cache/net-misc/geomyidae-0.34
 2011252124 metadata/md5-cache/net-misc/gerbera-1.6.1-r1
@@ -53343,8 +53275,6 @@
 2011252124 metadata/md5-cache/net-misc/getdate-1.2-r2
 2011252124 metadata/md5-cache/net-misc/gnome-online-miners-3.34.0
 2011252124 metadata/md5-cache/net-misc/gnome-remote-desktop-0.1.7
-2011252124 metadata/md5-cache/net-misc/gns3-gui-2.2.11
-2011252124 metadata/md5-cache/net-misc/gns3-server-2.2.11
 2011252124 metadata/md5-cache/net-misc/grdesktop-0.23-r2
 2011252124 metadata/md5-cache/net-misc/grive-0.5.1
 2011252124 metadata/md5-cache/net-misc/grive-0.5.1-r1
@@ -53352,10 +53282,6 @@
 2011252124 metadata/md5-cache/net-misc/grive-0.5.2_pre20200205
 2011252124 metadata/md5-cache/net-misc/gsasl-1.8.0-r1
 2011252124 metadata/md5-cache/net-misc/gsasl-1.8.1
-2011252124 metadata/md5-cache/net-misc/gsutil-4.41
-2011252124 metadata/md5-cache/net-misc/gsutil-4.45
-2011252124 metadata/md5-cache/net-misc/gsutil-4.47
-2011252124 metadata/md5-cache/net-misc/gsutil-4.50
 2011252124 metadata/md5-cache/net-misc/gupnp-tools-0.10.0
 2011252124 metadata/md5-cache/net-misc/gvrpcd-1.3
 2011252124 metadata/md5-cache/net-misc/haeredes-0.5.2
@@ -53365,8 +53291,6 @@
 2011252124 metadata/md5-cache/net-misc/htpdate-1.0.7
 2011252124 metadata/md5-cache/net-misc/htpdate-1.2.0
 2011252124 metadata/md5-cache/net-misc/htpdate-1.2.2
-2011252124 metadata/md5-cache/net-misc/httpie-2.1.0
-2011252124 metadata/md5-cache/net-misc/httpie-2.2.0
 2011252124 metadata/md5-cache/net-misc/hylafaxplus-7.0.2
 2011252124 metadata/md5-cache/net-misc/iaxmodem-1.3.0-r1
 2011252124 metadata/md5-cache/net-misc/icaclient-20.10.0.6
@@ -53401,8 +53325,6 @@
 2011252124 metadata/md5-cache/net-misc/l7-protocols-2009.05.28-r1
 2011252124 metadata/md5-cache/net-misc/lambdamoo-1.8.1-r3
 2011252124 metadata/md5-cache/net-misc/lanmap-81-r2
-2011252124 metadata/md5-cache/net-misc/lcr-9999
-2011252124 metadata/md5-cache/net-misc/libteam-1.22
 2011252124 metadata/md5-cache/net-misc/libteam-9999
 2011252124 metadata/md5-cache/net-misc/linux-eoip-0.5
 2011252124 metadata/md5-cache/net-misc/linuxptp-2.0-r1
@@ -53453,7 +53375,6 @@
 2011252124 metadata/md5-cache/net-misc/netkit-routed-0.17-r5
 2011252124 metadata/md5-cache/net-misc/netkit-rsh-0.17-r10
 2011252124 metadata/md5-cache/net-misc/netkit-talk-0.17-r5
-2011252124 metadata/md5-cache/net-misc/netkit-telnetd-0.17-r12
 2011252124 metadata/md5-cache/net-misc/netkit-timed-0.17-r10
 2011252124 metadata/md5-cache/net-misc/netpipe-1.0.0_beta2-r2
 2011252124 metadata/md5-cache/net-misc/netpipes-4.2-r2
@@ -53478,8 +53399,6 @@
 2011252124 metadata/md5-cache/net-misc/nx-3.5.99.24
 2011252124 metadata/md5-cache/net-misc/nx-3.5.99.25
 2011252124 metadata/md5-cache/net-misc/nxplayer-5.1.24.1
-2011252124 metadata/md5-cache/net-misc/nyx-2.0.4
-2011252124 metadata/md5-cache/net-misc/nyx-2.1.0-r1
 2011252124 metadata/md5-cache/net-misc/ofono-1.16
 2011252124 metadata/md5-cache/net-misc/ofono-1.30
 2011252124 metadata/md5-cache/net-misc/oidc-agent-3.3.1
@@ -53514,22 +53433,9 @@
 2011252124 metadata/md5-cache/net-misc/proxytunnel-1.10.20200907
 2011252124 metadata/md5-cache/net-misc/proxytunnel-9999
 2011252124 metadata/md5-cache/net-misc/ps3mediaserver-1.90.1
-2011252124 metadata/md5-cache/net-misc/pssh-2.3.4-r1
 2011252124 metadata/md5-cache/net-misc/ptpd-2.3.1-r1
 2011252124 metadata/md5-cache/net-misc/ptpd-2.3.1-r2
-2011252124 metadata/md5-cache/net-misc/pulseaudio-dlna-0.6.0_pre20200114
-2011252124 metadata/md5-cache/net-misc/pulseaudio-dlna-9999
-2011252124 metadata/md5-cache/net-misc/putty-0.74
 2011252124 metadata/md5-cache/net-misc/putty-9999
-2011252124 metadata/md5-cache/net-misc/pyhoca-cli-0.6.0.1
-2011252124 metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.1
-2011252124 metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2
-2011252124 metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.0
-2011252124 metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1
-2011252124 metadata/md5-cache/net-misc/python-x2go-0.6.0.2
-2011252124 metadata/md5-cache/net-misc/python-x2go-0.6.1.1
-2011252124 metadata/md5-cache/net-misc/python-x2go-0.6.1.2
-2011252124 metadata/md5-cache/net-misc/python-x2go-0.6.1.3
 2011252124 metadata/md5-cache/net-misc/qtm-1.3.19
 2011252124 metadata/md5-cache/net-misc/quagga-1.2.4
 2011252124 metadata/md5-cache/net-misc/r8168-8.048.03-r1
@@ -53548,13 +53454,11 @@
 2011252124 metadata/md5-cache/net-misc/rdesktop-1.9.0
 2011252124 metadata/md5-cache/net-misc/rdesktop-1.9.0-r1
 2011252124 metadata/md5-cache/net-misc/remmina-1.4.8-r1
-2011252124 metadata/md5-cache/net-misc/remmina-1.4.9
 2011252124 metadata/md5-cache/net-misc/rinetd-0.62-r2
 2011252124 metadata/md5-cache/net-misc/rsync-3.2.3-r1
 2011252124 metadata/md5-cache/net-misc/rsync-9999
 2011252124 metadata/md5-cache/net-misc/rwhoisd-1.5.9.6
 2011252124 metadata/md5-cache/net-misc/rygel-0.38.4
-2011252124 metadata/md5-cache/net-misc/s3cmd-2.1.0
 2011252124 metadata/md5-cache/net-misc/scponly-4.8-r6
 2011252124 metadata/md5-cache/net-misc/scponly-4.8-r7
 2011252124 metadata/md5-cache/net-misc/seafile-7.0.10
@@ -53579,12 +53483,10 @@
 2011252124 metadata/md5-cache/net-misc/socat-2.0.0_beta9
 2011252124 metadata/md5-cache/net-misc/socat-9999
 2011252124 metadata/md5-cache/net-misc/socket-1.5
-2011252124 metadata/md5-cache/net-misc/socket-burst-dampener-1.2.1
 2011252124 metadata/md5-cache/net-misc/spice-gtk-0.37-r2
 2011252124 metadata/md5-cache/net-misc/spice-gtk-0.38
 2011252124 metadata/md5-cache/net-misc/spice-gtk-9999
 2011252124 metadata/md5-cache/net-misc/spiped-1.6.0-r1
-2011252124 metadata/md5-cache/net-misc/srf-ip-conn-srv-9999
 2011252124 metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.2
 2011252124 metadata/md5-cache/net-misc/sslh-1.20
 2011252124 metadata/md5-cache/net-misc/sslh-1.21
@@ -53594,9 +53496,6 @@
 2011252124 metadata/md5-cache/net-misc/sstp-client-1.0.10-r1
 2011252124 metadata/md5-cache/net-misc/sstp-client-1.0.12
 2011252124 metadata/md5-cache/net-misc/stargazer-2.408-r1
-2011252124 metadata/md5-cache/net-misc/streamlink-1.3.0-r2
-2011252124 metadata/md5-cache/net-misc/streamlink-1.3.1-r1
-2011252124 metadata/md5-cache/net-misc/streamlink-9999
 2011252124 metadata/md5-cache/net-misc/streamtuner-0.99.99-r5
 2011252124 metadata/md5-cache/net-misc/stunnel-5.50-r1
 2011252124 metadata/md5-cache/net-misc/stunnel-5.55
@@ -53642,9 +53541,6 @@
 2011252124 metadata/md5-cache/net-misc/x2goserver-4.1.0.3
 2011252124 metadata/md5-cache/net-misc/x2goserver-4.1.0.3-r1
 2011252124 metadata/md5-cache/net-misc/yandex-disk-0.1.5.1039_p1
-2011252124 metadata/md5-cache/net-misc/you-get-0.4.1355-r1
-2011252124 metadata/md5-cache/net-misc/you-get-0.4.1432
-2011252124 metadata/md5-cache/net-misc/youtube-dl-2020.09.20
 2011252124 metadata/md5-cache/net-misc/zerotier-1.2.12
 2011252124 metadata/md5-cache/net-misc/zerotier-1.4.6
 2011252124 metadata/md5-cache/net-misc/zssh-1.5c-r1
@@ -53657,36 +53553,77 @@
 2011272209 metadata/md5-cache/net-misc/memcached-1.6.8
 2011271939 metadata/md5-cache/net-misc/unison-2.51.3_p20201024
 2011290009 metadata/md5-cache/net-misc/dhcpcd-9.3.4
-2011291139 metadata/md5-cache/net-misc/ipcalc-0.42_p2
 2011290509 metadata/md5-cache/net-misc/ipmiview-2.18.0.201007
 2011291139 metadata/md5-cache/net-misc/keychain-2.8.5
-2011291139 metadata/md5-cache/net-misc/libteam-1.31
-2011291139 metadata/md5-cache/net-misc/minidlna-1.3.0
-2011291139 metadata/md5-cache/net-misc/netifrc-0.7.1-r1
-2011291139 metadata/md5-cache/net-misc/ofono-1.31
 2011291139 metadata/md5-cache/net-misc/packETH-2.1
 2011291139 metadata/md5-cache/net-misc/pipes-1.16.1-r1
 2011291139 metadata/md5-cache/net-misc/udpcast-20200328
 2011290239 metadata/md5-cache/net-misc/usbip-4.13-r1
 2011291139 metadata/md5-cache/net-misc/wakeonlan-0.41-r3
-2011281339 metadata/md5-cache/net-misc/youtube-dl-2020.11.26
-2011291139 metadata/md5-cache/net-misc/youtube-dl-2020.11.29
-2011291139 metadata/md5-cache/net-misc/youtube-dl-9999
-2012010109 metadata/md5-cache/net-misc/Manifest.gz
 2012010109 metadata/md5-cache/net-misc/ucarp-1.5.2-r6
+2012031009 metadata/md5-cache/net-misc/Manifest.gz
+2012011340 metadata/md5-cache/net-misc/electron-cash-4.0.2-r2
+2012011340 metadata/md5-cache/net-misc/electrum-4.0.4
+2012011340 metadata/md5-cache/net-misc/electrum-4.0.5
+2012011340 metadata/md5-cache/net-misc/electrum-ltc-3.3.4.1-r2
+2012011340 metadata/md5-cache/net-misc/exabgp-4.2.11-r1
+2012011340 metadata/md5-cache/net-misc/gallery-dl-1.15.2-r1
+2012011340 metadata/md5-cache/net-misc/gallery-dl-1.15.3
+2012011340 metadata/md5-cache/net-misc/gallery-dl-9999
+2012011340 metadata/md5-cache/net-misc/gns3-gui-2.2.11
+2012011340 metadata/md5-cache/net-misc/gns3-server-2.2.11
+2012011340 metadata/md5-cache/net-misc/gsutil-4.41
+2012011340 metadata/md5-cache/net-misc/gsutil-4.45
+2012011340 metadata/md5-cache/net-misc/gsutil-4.47
+2012011340 metadata/md5-cache/net-misc/gsutil-4.50
+2012011340 metadata/md5-cache/net-misc/httpie-2.1.0
+2012011340 metadata/md5-cache/net-misc/httpie-2.2.0
+2012030739 metadata/md5-cache/net-misc/ipcalc-0.42_p2
+2012021809 metadata/md5-cache/net-misc/libteam-1.31
+2012031009 metadata/md5-cache/net-misc/minidlna-1.3.0
+2012030739 metadata/md5-cache/net-misc/netifrc-0.7.1-r1
+2012011109 metadata/md5-cache/net-misc/netkit-telnetd-0.17-r12
+2012011340 metadata/md5-cache/net-misc/nyx-2.0.4
+2012011340 metadata/md5-cache/net-misc/nyx-2.1.0-r1
+2012030309 metadata/md5-cache/net-misc/ofono-1.31
+2012011340 metadata/md5-cache/net-misc/pssh-2.3.4-r1
+2012011340 metadata/md5-cache/net-misc/pulseaudio-dlna-0.6.0_pre20200114
+2012011340 metadata/md5-cache/net-misc/pulseaudio-dlna-9999
+2012030239 metadata/md5-cache/net-misc/putty-0.74
+2012011340 metadata/md5-cache/net-misc/pyhoca-cli-0.6.0.1
+2012011340 metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.1
+2012011340 metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2
+2012011340 metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.0
+2012011340 metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1
+2012011340 metadata/md5-cache/net-misc/python-x2go-0.6.0.2
+2012011340 metadata/md5-cache/net-misc/python-x2go-0.6.1.1
+2012011340 metadata/md5-cache/net-misc/python-x2go-0.6.1.2
+2012011340 metadata/md5-cache/net-misc/python-x2go-0.6.1.3
+2012030239 metadata/md5-cache/net-misc/remmina-1.4.9
+2012011340 metadata/md5-cache/net-misc/s3cmd-2.1.0
+2012030239 metadata/md5-cache/net-misc/sipcalc-1.1.6
+2012011340 metadata/md5-cache/net-misc/socket-burst-dampener-1.2.1
+2012011340 metadata/md5-cache/net-misc/streamlink-1.3.0-r2
+2012011340 metadata/md5-cache/net-misc/streamlink-1.3.1-r1
+2012011340 metadata/md5-cache/net-misc/streamlink-9999
+2012011340 metadata/md5-cache/net-misc/you-get-0.4.1355-r1
+2012011340 metadata/md5-cache/net-misc/you-get-0.4.1432
+2012011340 metadata/md5-cache/net-misc/youtube-dl-2020.09.20
+2012011340 metadata/md5-cache/net-misc/youtube-dl-2020.11.26
+2012011340 metadata/md5-cache/net-misc/youtube-dl-2020.11.29
+2012012209 metadata/md5-cache/net-misc/youtube-dl-2020.12.02
+2012011340 metadata/md5-cache/net-misc/youtube-dl-9999
 1911091712 metadata/md5-cache/net-nds/led-1.111
 1912052009 metadata/md5-cache/net-nds/phpldapadmin-1.2.5
 2004032241 metadata/md5-cache/net-nds/gssproxy-0.8.2
 2008310309 metadata/md5-cache/net-nds/gssproxy-0.8.3
 2009121921 metadata/md5-cache/net-nds/shelldap-1.5.1
 2011031239 metadata/md5-cache/net-nds/smbldap-tools-0.9.10-r1
-2011252124 metadata/md5-cache/net-nds/Manifest.gz
 2011252124 metadata/md5-cache/net-nds/adtool-1.3.3-r1
 2011252124 metadata/md5-cache/net-nds/jxplorer-3.3.1
 2011252124 metadata/md5-cache/net-nds/jxplorer-3.3.1.1
 2011252124 metadata/md5-cache/net-nds/jxplorer-3.3.1.2
 2011252124 metadata/md5-cache/net-nds/ldapvi-1.7_p20101214
-2011252124 metadata/md5-cache/net-nds/nsscache-0.39
 2011252124 metadata/md5-cache/net-nds/openldap-2.4.53-r1
 2011252124 metadata/md5-cache/net-nds/openldap-2.4.54
 2011252124 metadata/md5-cache/net-nds/openldap-2.4.56
@@ -53695,10 +53632,10 @@
 2011252124 metadata/md5-cache/net-nds/tac_plus-4.0.4.19-r4
 2011252124 metadata/md5-cache/net-nds/tac_plus-4.0.4.27a
 2011252124 metadata/md5-cache/net-nds/yp-tools-4.2.3
+2012011340 metadata/md5-cache/net-nds/Manifest.gz
+2012011340 metadata/md5-cache/net-nds/nsscache-0.39
 1702282329 metadata/md5-cache/net-news/amphetadesk-0.93.1-r1
 2002112051 metadata/md5-cache/net-news/yydecode-0.2.10-r1
-2011252124 metadata/md5-cache/net-news/canto-curses-0.9.9
-2011252124 metadata/md5-cache/net-news/canto-daemon-0.9.7
 2011252124 metadata/md5-cache/net-news/liferea-1.12.7-r1
 2011252124 metadata/md5-cache/net-news/liferea-1.12.9
 2011252124 metadata/md5-cache/net-news/quiterss-0.19.4
@@ -53710,8 +53647,10 @@
 2011252124 metadata/md5-cache/net-news/rsstool-1.0.1_rc2
 2011252124 metadata/md5-cache/net-news/snownews-1.6.10
 2011281009 metadata/md5-cache/net-news/newsboat-2.20.1
-2011291939 metadata/md5-cache/net-news/Manifest.gz
 2011291939 metadata/md5-cache/net-news/newsboat-2.21
+2012011340 metadata/md5-cache/net-news/Manifest.gz
+2012011340 metadata/md5-cache/net-news/canto-curses-0.9.9
+2012011340 metadata/md5-cache/net-news/canto-daemon-0.9.7
 1909180009 metadata/md5-cache/net-nntp/slrn-1.0.3
 2009130709 metadata/md5-cache/net-nntp/brag-1.4.3
 2011061444 metadata/md5-cache/net-nntp/leafnode-1.11.11
@@ -53756,17 +53695,10 @@
 2011252124 metadata/md5-cache/net-p2p/bitcoind-0.19.1
 2011252124 metadata/md5-cache/net-p2p/bitcoind-0.20.0
 2011252124 metadata/md5-cache/net-p2p/bitcoind-0.20.1
-2011252124 metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r2
 2011252124 metadata/md5-cache/net-p2p/classified-ads-0.13
 2011252124 metadata/md5-cache/net-p2p/cpuminer-opt-3.14.3
 2011252124 metadata/md5-cache/net-p2p/cpuminer-opt-9999
 2011252124 metadata/md5-cache/net-p2p/dbhub-0.451-r1
-2011252124 metadata/md5-cache/net-p2p/deluge-2.0.3-r4
-2011252124 metadata/md5-cache/net-p2p/deluge-2.0.3-r5
-2011252124 metadata/md5-cache/net-p2p/deluge-2.0.3-r6
-2011252124 metadata/md5-cache/net-p2p/deluge-2.0.3-r7
-2011252124 metadata/md5-cache/net-p2p/deluge-2.0.3-r8
-2011252124 metadata/md5-cache/net-p2p/deluge-9999
 2011252124 metadata/md5-cache/net-p2p/ed2k_hash-0.4.0-r2
 2011252124 metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.10
 2011252124 metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.10-r100
@@ -53788,7 +53720,6 @@
 2011252124 metadata/md5-cache/net-p2p/ncdc-1.21
 2011252124 metadata/md5-cache/net-p2p/ncdc-1.22.1
 2011252124 metadata/md5-cache/net-p2p/ncdc-9999
-2011252124 metadata/md5-cache/net-p2p/nicotine+-2.0.1-r1
 2011252124 metadata/md5-cache/net-p2p/opendchub-0.8.2
 2011252124 metadata/md5-cache/net-p2p/resilio-sync-2.6.1
 2011252124 metadata/md5-cache/net-p2p/resilio-sync-2.6.3
@@ -53800,7 +53731,6 @@
 2011252124 metadata/md5-cache/net-p2p/syncthing-1.11.1
 2011252124 metadata/md5-cache/net-p2p/syncthing-1.7.1
 2011252124 metadata/md5-cache/net-p2p/syrep-0.9
-2011252124 metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
 2011252124 metadata/md5-cache/net-p2p/transmission-3.00-r1
 2011252124 metadata/md5-cache/net-p2p/transmission-9999
 2011252124 metadata/md5-cache/net-p2p/transmission-remote-gtk-1.3.1
@@ -53825,10 +53755,20 @@
 2011252124 metadata/md5-cache/net-p2p/xmr-stak-rx-1.0.4
 2011252124 metadata/md5-cache/net-p2p/xmr-stak-rx-1.0.5
 2011252124 metadata/md5-cache/net-p2p/xmr-stak-rx-9999
-2011260139 metadata/md5-cache/net-p2p/nicotine+-2.1.2
 2011291139 metadata/md5-cache/net-p2p/mktorrent-1.1_p20180912
 2011281639 metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1
-2011291309 metadata/md5-cache/net-p2p/Manifest.gz
+2012011509 metadata/md5-cache/net-p2p/Manifest.gz
+2012011340 metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r2
+2012011340 metadata/md5-cache/net-p2p/deluge-2.0.3-r4
+2012011340 metadata/md5-cache/net-p2p/deluge-2.0.3-r5
+2012011340 metadata/md5-cache/net-p2p/deluge-2.0.3-r6
+2012011340 metadata/md5-cache/net-p2p/deluge-2.0.3-r7
+2012011340 metadata/md5-cache/net-p2p/deluge-2.0.3-r8
+2012011340 metadata/md5-cache/net-p2p/deluge-9999
+2012011340 metadata/md5-cache/net-p2p/nicotine+-2.0.1-r1
+2012011340 metadata/md5-cache/net-p2p/nicotine+-2.1.2
+2012011509 metadata/md5-cache/net-p2p/qbittorrent-4.3.1
+2012011340 metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
 1802061938 metadata/md5-cache/net-print/cups-bjnp-2.0
 1702282329 metadata/md5-cache/net-print/fax4cups-1.29-r1
 1702282329 metadata/md5-cache/net-print/ink-0.5.1
@@ -53887,13 +53827,10 @@
 2011252124 metadata/md5-cache/net-print/libinklevel-0.9.2
 2011252124 metadata/md5-cache/net-print/lm1100-1.0.2a-r1
 2011252124 metadata/md5-cache/net-print/npadmin-0.8.7-r1
-2011252124 metadata/md5-cache/net-print/poster-20060221
-2011252124 metadata/md5-cache/net-print/poster-20060221-r2
-2011252124 metadata/md5-cache/net-print/poster-20060221-r3
-2011252124 metadata/md5-cache/net-print/splix-2.0.0_p20130826
-2011252124 metadata/md5-cache/net-print/splix-2.0.0_p20130826-r1
-2011290239 metadata/md5-cache/net-print/Manifest.gz
 2011290239 metadata/md5-cache/net-print/c2esp-27
+2012021739 metadata/md5-cache/net-print/Manifest.gz
+2012020639 metadata/md5-cache/net-print/poster-20060221-r3
+2012020639 metadata/md5-cache/net-print/splix-2.0.0_p20130826-r1
 2009141809 metadata/md5-cache/net-proxy/obfs4proxy-0.0.11-r1
 2011252124 metadata/md5-cache/net-proxy/3proxy-0.8.13
 2011252124 metadata/md5-cache/net-proxy/adzapper-20110915-r2
@@ -53922,9 +53859,6 @@
 2011252124 metadata/md5-cache/net-proxy/hatop-0.8.0
 2011252124 metadata/md5-cache/net-proxy/havp-0.92a-r2
 2011252124 metadata/md5-cache/net-proxy/microsocks-1.0.1_p20200805
-2011252124 metadata/md5-cache/net-proxy/mitmproxy-5.1.1
-2011252124 metadata/md5-cache/net-proxy/mitmproxy-5.2-r1
-2011252124 metadata/md5-cache/net-proxy/mitmproxy-5.3.0
 2011252124 metadata/md5-cache/net-proxy/nutcracker-0.4.1-r1
 2011252124 metadata/md5-cache/net-proxy/pingtunnel-0.72
 2011252124 metadata/md5-cache/net-proxy/piper-1.14
@@ -53942,8 +53876,6 @@
 2011252124 metadata/md5-cache/net-proxy/squid-4.13
 2011252124 metadata/md5-cache/net-proxy/squidguard-1.6.0
 2011252124 metadata/md5-cache/net-proxy/squirm-1.26-r1
-2011252124 metadata/md5-cache/net-proxy/sshuttle-0.78.5
-2011252124 metadata/md5-cache/net-proxy/sshuttle-1.0.3
 2011252124 metadata/md5-cache/net-proxy/tayga-0.9.2-r1
 2011252124 metadata/md5-cache/net-proxy/tayga-0.9.2-r2
 2011252124 metadata/md5-cache/net-proxy/tayga-0.9.2-r3
@@ -53953,14 +53885,19 @@
 2011252124 metadata/md5-cache/net-proxy/torsocks-2.3.0
 2011252124 metadata/md5-cache/net-proxy/trojan-1.16.0-r1
 2011252124 metadata/md5-cache/net-proxy/trojan-9999
-2011252124 metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r8
 2011252124 metadata/md5-cache/net-proxy/wwwoffle-2.9i-r1
 2011291139 metadata/md5-cache/net-proxy/haproxy-2.2.5
 2011290239 metadata/md5-cache/net-proxy/ziproxy-3.3.1-r2
-2011292039 metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r9
 2012010939 metadata/md5-cache/net-proxy/3proxy-0.9.0
-2012010939 metadata/md5-cache/net-proxy/Manifest.gz
 2011301209 metadata/md5-cache/net-proxy/haproxy-2.3.2
+2012030139 metadata/md5-cache/net-proxy/Manifest.gz
+2012011340 metadata/md5-cache/net-proxy/haproxy-2.2.6
+2012011340 metadata/md5-cache/net-proxy/mitmproxy-5.1.1
+2012011340 metadata/md5-cache/net-proxy/mitmproxy-5.2-r1
+2012011340 metadata/md5-cache/net-proxy/mitmproxy-5.3.0
+2012011340 metadata/md5-cache/net-proxy/sshuttle-0.78.5
+2012011340 metadata/md5-cache/net-proxy/sshuttle-1.0.3
+2012030109 metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r9
 2011252124 metadata/md5-cache/net-voip/Manifest.gz
 2011252124 metadata/md5-cache/net-voip/telepathy-gabble-0.18.4-r2
 2011252124 metadata/md5-cache/net-voip/telepathy-rakia-0.8.0-r1
@@ -53999,7 +53936,6 @@
 2011252124 metadata/md5-cache/net-vpn/networkmanager-l2tp-1.8.2
 2011252124 metadata/md5-cache/net-vpn/networkmanager-libreswan-1.2.12
 2011252124 metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.6
-2011252124 metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12
 2011252124 metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.8-r2
 2011252124 metadata/md5-cache/net-vpn/networkmanager-strongswan-1.5.2
 2011252124 metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6-r2
@@ -54018,8 +53954,6 @@
 2011252124 metadata/md5-cache/net-vpn/openvpn-2.4.9
 2011252124 metadata/md5-cache/net-vpn/openvpn-9999
 2011252124 metadata/md5-cache/net-vpn/pptpd-1.4.0-r3
-2011252124 metadata/md5-cache/net-vpn/protonvpn-cli-2.2.0
-2011252124 metadata/md5-cache/net-vpn/protonvpn-cli-2.2.2
 2011252124 metadata/md5-cache/net-vpn/strongswan-5.9.0
 2011252124 metadata/md5-cache/net-vpn/strongswan-5.9.1
 2011252124 metadata/md5-cache/net-vpn/tailscale-0.98
@@ -54036,7 +53970,10 @@
 2011252124 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200827
 2011262039 metadata/md5-cache/net-vpn/tor-0.4.5.2_alpha
 2011272209 metadata/md5-cache/net-vpn/openvpn-2.5.0-r1
-2011282009 metadata/md5-cache/net-vpn/Manifest.gz
+2012030239 metadata/md5-cache/net-vpn/Manifest.gz
+2012030239 metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12
+2012011340 metadata/md5-cache/net-vpn/protonvpn-cli-2.2.0
+2012011340 metadata/md5-cache/net-vpn/protonvpn-cli-2.2.2
 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
@@ -54053,16 +53990,11 @@
 2008032109 metadata/md5-cache/net-wireless/kismetmobiledashboard-1.5_beta1-r2
 2008301909 metadata/md5-cache/net-wireless/tempestsdr-0.0_p20200221
 2009021410 metadata/md5-cache/net-wireless/btcrack-9999
-2009021410 metadata/md5-cache/net-wireless/dump978-9999
 2009021410 metadata/md5-cache/net-wireless/kismetmobiledashboard-9999
 2009021410 metadata/md5-cache/net-wireless/tempestsdr-9999
 2009240309 metadata/md5-cache/net-wireless/hidclient-20120728
-2011252124 metadata/md5-cache/net-wireless/aircrack-ng-1.6-r1
-2011252124 metadata/md5-cache/net-wireless/aircrack-ng-1.6_p20200722
-2011252124 metadata/md5-cache/net-wireless/aircrack-ng-9999
 2011252124 metadata/md5-cache/net-wireless/airspy-1.0.9
 2011252124 metadata/md5-cache/net-wireless/airspy-9999
-2011252124 metadata/md5-cache/net-wireless/airtraf-1.1-r3
 2011252124 metadata/md5-cache/net-wireless/b43-fwcutter-019
 2011252124 metadata/md5-cache/net-wireless/bladerf-2018.08
 2011252124 metadata/md5-cache/net-wireless/bladerf-2019.07
@@ -54125,31 +54057,18 @@
 2011252124 metadata/md5-cache/net-wireless/iwd-1.8-r3
 2011252124 metadata/md5-cache/net-wireless/iwd-1.9-r1
 2011252124 metadata/md5-cache/net-wireless/iwd-9999
-2011252124 metadata/md5-cache/net-wireless/jackit-0.0_p20170918-r1
 2011252124 metadata/md5-cache/net-wireless/kismet-2020.04.3
 2011252124 metadata/md5-cache/net-wireless/kismet-2020.09.4
 2011252124 metadata/md5-cache/net-wireless/kismet-9999
-2011252124 metadata/md5-cache/net-wireless/kismet-rest-2019.05.02
-2011252124 metadata/md5-cache/net-wireless/kismet-rest-9999
-2011252124 metadata/md5-cache/net-wireless/kismetdb-2019.05.05
-2011252124 metadata/md5-cache/net-wireless/kismetdb-9999
 2011252124 metadata/md5-cache/net-wireless/libm2k-0.0_p20201005
 2011252124 metadata/md5-cache/net-wireless/libm2k-9999
 2011252124 metadata/md5-cache/net-wireless/limesuite-19.04.0
 2011252124 metadata/md5-cache/net-wireless/linssid-3.6-r1
-2011252124 metadata/md5-cache/net-wireless/lorcon-0.0_p20200214
-2011252124 metadata/md5-cache/net-wireless/lorcon-9999
 2011252124 metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
 2011252124 metadata/md5-cache/net-wireless/mdk-3.6-r1
 2011252124 metadata/md5-cache/net-wireless/mfoc-0.10.7-r1
-2011252124 metadata/md5-cache/net-wireless/nanovna-saver-0.3.7-r1
-2011252124 metadata/md5-cache/net-wireless/nanovna-saver-9999
-2011252124 metadata/md5-cache/net-wireless/openbsc-9999
-2011252124 metadata/md5-cache/net-wireless/openggsn-9999
 2011252124 metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1
 2011252124 metadata/md5-cache/net-wireless/osmo-fl2k-9999
-2011252124 metadata/md5-cache/net-wireless/osmobts-9999
-2011252124 metadata/md5-cache/net-wireless/osmocom-bb-9999
 2011252124 metadata/md5-cache/net-wireless/qradiolink-9999
 2011252124 metadata/md5-cache/net-wireless/rfkill-0.5-r2
 2011252124 metadata/md5-cache/net-wireless/rfkill-0.5-r3
@@ -54165,8 +54084,6 @@
 2011252124 metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
 2011252124 metadata/md5-cache/net-wireless/sigdigger-0.1.0
 2011252124 metadata/md5-cache/net-wireless/sigutils-0.1.0-r1
-2011252124 metadata/md5-cache/net-wireless/soapy_power-1.6.1-r1
-2011252124 metadata/md5-cache/net-wireless/soapy_power-9999
 2011252124 metadata/md5-cache/net-wireless/soapybladerf-0.4.1
 2011252124 metadata/md5-cache/net-wireless/soapybladerf-9999
 2011252124 metadata/md5-cache/net-wireless/soapyhackrf-0.3.3-r1
@@ -54196,23 +54113,37 @@
 2011252124 metadata/md5-cache/net-wireless/uhd-3.15.0.0-r100
 2011252124 metadata/md5-cache/net-wireless/uhd-4.0.0.0
 2011252124 metadata/md5-cache/net-wireless/unifi-5.6.42-r1
-2011252124 metadata/md5-cache/net-wireless/unifi-6.0.37
 2011252124 metadata/md5-cache/net-wireless/unifi-6.1.25
 2011252124 metadata/md5-cache/net-wireless/unifi-6.1.26
-2011252124 metadata/md5-cache/net-wireless/urh-2.8.8
-2011252124 metadata/md5-cache/net-wireless/urh-9999
 2011252124 metadata/md5-cache/net-wireless/wepattack-0.1.3-r5
 2011252124 metadata/md5-cache/net-wireless/wireless-tools-30_pre9-r1
 2011252124 metadata/md5-cache/net-wireless/wpa_supplicant-2.9-r2
 2011252124 metadata/md5-cache/net-wireless/wpa_supplicant-9999
 2011252124 metadata/md5-cache/net-wireless/yatebts-6.0.0-r1
 2011252124 metadata/md5-cache/net-wireless/yatebts-9999
-2011292039 metadata/md5-cache/net-wireless/airtraf-1.1-r4
-2011292039 metadata/md5-cache/net-wireless/wavemon-0.8.0
-2012010139 metadata/md5-cache/net-wireless/Manifest.gz
 2011301639 metadata/md5-cache/net-wireless/unifi-6.0.36
 2011301639 metadata/md5-cache/net-wireless/unifi-6.0.40
-2012010139 metadata/md5-cache/net-wireless/wavemon-0.7.6
+2012030939 metadata/md5-cache/net-wireless/Manifest.gz
+2012011340 metadata/md5-cache/net-wireless/aircrack-ng-1.6-r1
+2012011340 metadata/md5-cache/net-wireless/aircrack-ng-1.6_p20200722
+2012011340 metadata/md5-cache/net-wireless/aircrack-ng-9999
+2012020639 metadata/md5-cache/net-wireless/airtraf-1.1-r4
+2012011839 metadata/md5-cache/net-wireless/iwd-1.10
+2012011340 metadata/md5-cache/net-wireless/jackit-0.0_p20170918-r1
+2012011340 metadata/md5-cache/net-wireless/kismet-rest-2019.05.02
+2012011340 metadata/md5-cache/net-wireless/kismet-rest-9999
+2012011340 metadata/md5-cache/net-wireless/kismetdb-2019.05.05
+2012011340 metadata/md5-cache/net-wireless/kismetdb-9999
+2012011340 metadata/md5-cache/net-wireless/lorcon-0.0_p20200214
+2012011340 metadata/md5-cache/net-wireless/lorcon-9999
+2012011340 metadata/md5-cache/net-wireless/nanovna-saver-0.3.7-r1
+2012011340 metadata/md5-cache/net-wireless/nanovna-saver-9999
+2012011340 metadata/md5-cache/net-wireless/soapy_power-1.6.1-r1
+2012011340 metadata/md5-cache/net-wireless/soapy_power-9999
+2012021639 metadata/md5-cache/net-wireless/unifi-6.0.41
+2012011340 metadata/md5-cache/net-wireless/urh-2.8.8
+2012011340 metadata/md5-cache/net-wireless/urh-9999
+2012030039 metadata/md5-cache/net-wireless/wavemon-0.8.0
 1910170740 metadata/md5-cache/perl-core/JSON-PP-2.273.0
 1912110241 metadata/md5-cache/perl-core/CPAN-Meta-2.150.1
 2002110109 metadata/md5-cache/perl-core/Archive-Tar-2.300.0
@@ -54435,8 +54366,6 @@
 2011252124 metadata/md5-cache/sci-astronomy/pal-0.9.7
 2011252124 metadata/md5-cache/sci-astronomy/predict-2.2.3-r2
 2011252124 metadata/md5-cache/sci-astronomy/psfex-3.17.1
-2011252124 metadata/md5-cache/sci-astronomy/pyephem-3.7.6.0-r1
-2011252124 metadata/md5-cache/sci-astronomy/pyephem-3.7.7.1
 2011252124 metadata/md5-cache/sci-astronomy/scamp-2.0.4
 2011252124 metadata/md5-cache/sci-astronomy/sextractor-2.19.5-r1
 2011252124 metadata/md5-cache/sci-astronomy/skycat-3.1.2-r2
@@ -54450,9 +54379,11 @@
 2011252124 metadata/md5-cache/sci-astronomy/wcslib-7.3
 2011252124 metadata/md5-cache/sci-astronomy/wcstools-3.9.5
 2011252124 metadata/md5-cache/sci-astronomy/xephem-3.7.7
-2011292309 metadata/md5-cache/sci-astronomy/Manifest.gz
 2011292309 metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20200316-r100
 2011292309 metadata/md5-cache/sci-astronomy/celestia-9999
+2012011340 metadata/md5-cache/sci-astronomy/Manifest.gz
+2012011340 metadata/md5-cache/sci-astronomy/pyephem-3.7.6.0-r1
+2012011340 metadata/md5-cache/sci-astronomy/pyephem-3.7.7.1
 1806091739 metadata/md5-cache/sci-biology/aaindex-9.1-r1
 1910170740 metadata/md5-cache/sci-biology/bioperl-db-1.6.9-r1
 1703082208 metadata/md5-cache/sci-biology/biosql-1.0.1-r1
@@ -54482,9 +54413,6 @@
 2011061540 metadata/md5-cache/sci-biology/update-blastdb-12.0.0
 2011252124 metadata/md5-cache/sci-biology/ApE-2.0.7-r1
 2011252124 metadata/md5-cache/sci-biology/GBrowse-2.48-r1
-2011252124 metadata/md5-cache/sci-biology/HTSeq-0.12.4
-2011252124 metadata/md5-cache/sci-biology/HTSeq-9999
-2011252124 metadata/md5-cache/sci-biology/Manifest.gz
 2011252124 metadata/md5-cache/sci-biology/STAR-2.5.3a
 2011252124 metadata/md5-cache/sci-biology/abyss-2.0.3-r2
 2011252124 metadata/md5-cache/sci-biology/amap-2.2-r3
@@ -54495,12 +54423,10 @@
 2011252124 metadata/md5-cache/sci-biology/bedtools-2.29.2
 2011252124 metadata/md5-cache/sci-biology/bfast-0.7.0a
 2011252124 metadata/md5-cache/sci-biology/biogrep-1.0-r2
-2011252124 metadata/md5-cache/sci-biology/biopandas-0.2.7
 2011252124 metadata/md5-cache/sci-biology/bioperl-1.6.9
 2011252124 metadata/md5-cache/sci-biology/bioperl-db-1.6.9
 2011252124 metadata/md5-cache/sci-biology/bioperl-network-1.6.9
 2011252124 metadata/md5-cache/sci-biology/bioperl-run-1.6.9
-2011252124 metadata/md5-cache/sci-biology/biopython-1.77
 2011252124 metadata/md5-cache/sci-biology/blat-34-r2
 2011252124 metadata/md5-cache/sci-biology/bowtie-2.2.9
 2011252124 metadata/md5-cache/sci-biology/bwa-0.7.17
@@ -54581,7 +54507,6 @@
 2011252124 metadata/md5-cache/sci-biology/prodigal-2.6.3
 2011252124 metadata/md5-cache/sci-biology/psipred-3.4
 2011252124 metadata/md5-cache/sci-biology/psipred-3.5
-2011252124 metadata/md5-cache/sci-biology/pysam-0.16.0.1
 2011252124 metadata/md5-cache/sci-biology/qrna-2.0.3c-r3
 2011252124 metadata/md5-cache/sci-biology/raxml-7.2.6
 2011252124 metadata/md5-cache/sci-biology/recon-1.08
@@ -54607,6 +54532,12 @@
 2011252124 metadata/md5-cache/sci-biology/wgs-assembler-7.0-r2
 2011252124 metadata/md5-cache/sci-biology/wise-2.4.0_alpha
 2011252124 metadata/md5-cache/sci-biology/yass-1.14-r2
+2012011340 metadata/md5-cache/sci-biology/HTSeq-0.12.4
+2012011340 metadata/md5-cache/sci-biology/HTSeq-9999
+2012011340 metadata/md5-cache/sci-biology/Manifest.gz
+2012011340 metadata/md5-cache/sci-biology/biopandas-0.2.7
+2012011340 metadata/md5-cache/sci-biology/biopython-1.77
+2012011340 metadata/md5-cache/sci-biology/pysam-0.16.0.1
 1812231809 metadata/md5-cache/sci-calculators/datamash-1.4
 1909181309 metadata/md5-cache/sci-calculators/datamash-1.5
 1702282330 metadata/md5-cache/sci-calculators/transcalc-0.14-r2
@@ -54614,7 +54545,6 @@
 2004241039 metadata/md5-cache/sci-calculators/datamash-1.7
 2008211039 metadata/md5-cache/sci-calculators/bc-gh-3.1.5
 2010131539 metadata/md5-cache/sci-calculators/bc-gh-3.1.6
-2011222039 metadata/md5-cache/sci-calculators/galculator-2.1.4-r1
 2011252124 metadata/md5-cache/sci-calculators/calcoo-1.3.18-r1
 2011252124 metadata/md5-cache/sci-calculators/galculator-2.1.4
 2011252124 metadata/md5-cache/sci-calculators/grpn-1.4.0
@@ -54626,7 +54556,6 @@
 2011252124 metadata/md5-cache/sci-calculators/qalculate-gtk-0.9.9
 2011252124 metadata/md5-cache/sci-calculators/qalculate-gtk-2.2.0
 2011252124 metadata/md5-cache/sci-calculators/qalculate-gtk-2.8.1
-2011252124 metadata/md5-cache/sci-calculators/qalculate-gtk-3.2.0-r1
 2011252124 metadata/md5-cache/sci-calculators/speedcrunch-0.12.0
 2011252124 metadata/md5-cache/sci-calculators/tiemu-3.03-r1
 2011252124 metadata/md5-cache/sci-calculators/tilp2-1.18
@@ -54635,8 +54564,10 @@
 2011252124 metadata/md5-cache/sci-calculators/units-2.19-r1
 2011252124 metadata/md5-cache/sci-calculators/units-2.20
 2011252124 metadata/md5-cache/sci-calculators/wcalc-2.5
-2011290239 metadata/md5-cache/sci-calculators/Manifest.gz
 2011290239 metadata/md5-cache/sci-calculators/hcalc-1.2-r1
+2012030239 metadata/md5-cache/sci-calculators/Manifest.gz
+2012020639 metadata/md5-cache/sci-calculators/galculator-2.1.4-r1
+2012030239 metadata/md5-cache/sci-calculators/qalculate-gtk-3.2.0-r1
 1808262139 metadata/md5-cache/sci-chemistry/xds-bin-20170930
 2002230040 metadata/md5-cache/sci-chemistry/bodr-10
 2002230040 metadata/md5-cache/sci-chemistry/bodr-9-r1
@@ -54644,15 +54575,11 @@
 2009162339 metadata/md5-cache/sci-chemistry/mars-1.2
 2009162339 metadata/md5-cache/sci-chemistry/msms-bin-2.6.1-r1
 2009162339 metadata/md5-cache/sci-chemistry/pdbcns-2.0.010504
-2011252124 metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0
-2011252124 metadata/md5-cache/sci-chemistry/MDAnalysis-0.18.0-r1
 2011252124 metadata/md5-cache/sci-chemistry/aqua-3.2-r3
 2011252124 metadata/md5-cache/sci-chemistry/autodock-4.2.6
 2011252124 metadata/md5-cache/sci-chemistry/autodock_vina-1.1.2
 2011252124 metadata/md5-cache/sci-chemistry/avogadro2-1.90.0_p20180211
 2011252124 metadata/md5-cache/sci-chemistry/avogadro2-1.93.0
-2011252124 metadata/md5-cache/sci-chemistry/chemex-2018.10.2
-2011252124 metadata/md5-cache/sci-chemistry/chemex-2018.10.3
 2011252124 metadata/md5-cache/sci-chemistry/chemical-mime-data-0.1.94-r4
 2011252124 metadata/md5-cache/sci-chemistry/chemtool-1.6.14
 2011252124 metadata/md5-cache/sci-chemistry/cluster-1.3.081231-r1
@@ -54665,14 +54592,7 @@
 2011252124 metadata/md5-cache/sci-chemistry/gromacs-2018.8
 2011252124 metadata/md5-cache/sci-chemistry/gromacs-2019.5-r1
 2011252124 metadata/md5-cache/sci-chemistry/gromacs-2019.6
-2011252124 metadata/md5-cache/sci-chemistry/gromacs-2020.4
-2011252124 metadata/md5-cache/sci-chemistry/gromacs-2020.9999
-2011252124 metadata/md5-cache/sci-chemistry/gromacs-2021.9999
-2011252124 metadata/md5-cache/sci-chemistry/gromacs-2021_beta2
-2011252124 metadata/md5-cache/sci-chemistry/gromacs-9999
 2011252124 metadata/md5-cache/sci-chemistry/ksdssp-040728-r1
-2011252124 metadata/md5-cache/sci-chemistry/mdtraj-1.9.1
-2011252124 metadata/md5-cache/sci-chemistry/mdtraj-1.9.4
 2011252124 metadata/md5-cache/sci-chemistry/mm-align-20120321
 2011252124 metadata/md5-cache/sci-chemistry/molden-5.5
 2011252124 metadata/md5-cache/sci-chemistry/moldy-2.16e-r2
@@ -54684,11 +54604,8 @@
 2011252124 metadata/md5-cache/sci-chemistry/mpqc-2.3.1-r4
 2011252124 metadata/md5-cache/sci-chemistry/mustang-3.2.2
 2011252124 metadata/md5-cache/sci-chemistry/namd-2.10
-2011252124 metadata/md5-cache/sci-chemistry/nmrglue-0.5-r1
-2011252124 metadata/md5-cache/sci-chemistry/nmrglue-0.7
 2011252124 metadata/md5-cache/sci-chemistry/numbat-0.999-r1
 2011252124 metadata/md5-cache/sci-chemistry/openbabel-2.4.1
-2011252124 metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
 2011252124 metadata/md5-cache/sci-chemistry/openbabel-perl-2.4.1
 2011252124 metadata/md5-cache/sci-chemistry/pdbcat-1.3
 2011252124 metadata/md5-cache/sci-chemistry/pdbmat-3.89
@@ -54696,7 +54613,6 @@
 2011252124 metadata/md5-cache/sci-chemistry/prekin-6.51.081122-r1
 2011252124 metadata/md5-cache/sci-chemistry/probe-2.13.110909
 2011252124 metadata/md5-cache/sci-chemistry/procheck-3.5.4-r3
-2011252124 metadata/md5-cache/sci-chemistry/propka-3.2.0
 2011252124 metadata/md5-cache/sci-chemistry/psi-3.4.0-r2
 2011252124 metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2
 2011252124 metadata/md5-cache/sci-chemistry/raster3d-3.0.6
@@ -54739,9 +54655,25 @@
 2011252124 metadata/md5-cache/sci-chemistry/wxmacmolplt-7.5-r1
 2011252124 metadata/md5-cache/sci-chemistry/xyza2pipe-20121001
 2011272109 metadata/md5-cache/sci-chemistry/elem-1.0.3-r2
-2011282309 metadata/md5-cache/sci-chemistry/pymol-2.4.0
-2011300009 metadata/md5-cache/sci-chemistry/Manifest.gz
 2011300009 metadata/md5-cache/sci-chemistry/cara-bin-1.8.4-r2
+2012011340 metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0
+2012011340 metadata/md5-cache/sci-chemistry/MDAnalysis-0.18.0-r1
+2012021539 metadata/md5-cache/sci-chemistry/Manifest.gz
+2012011340 metadata/md5-cache/sci-chemistry/chemex-2018.10.2
+2012011340 metadata/md5-cache/sci-chemistry/chemex-2018.10.3
+2012011340 metadata/md5-cache/sci-chemistry/gromacs-2020.4
+2012011340 metadata/md5-cache/sci-chemistry/gromacs-2020.9999
+2012011340 metadata/md5-cache/sci-chemistry/gromacs-2021.9999
+2012011340 metadata/md5-cache/sci-chemistry/gromacs-2021_beta2
+2012011340 metadata/md5-cache/sci-chemistry/gromacs-9999
+2012011340 metadata/md5-cache/sci-chemistry/mdtraj-1.9.1
+2012011340 metadata/md5-cache/sci-chemistry/mdtraj-1.9.4
+2012021539 metadata/md5-cache/sci-chemistry/modeller-9.25
+2012011340 metadata/md5-cache/sci-chemistry/nmrglue-0.5-r1
+2012011340 metadata/md5-cache/sci-chemistry/nmrglue-0.7
+2012020639 metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
+2012011340 metadata/md5-cache/sci-chemistry/propka-3.2.0
+2012011340 metadata/md5-cache/sci-chemistry/pymol-2.4.0
 1702282330 metadata/md5-cache/sci-electronics/espresso-ab-1.0-r1
 1702282330 metadata/md5-cache/sci-electronics/freehdl-0.0.8
 1704192008 metadata/md5-cache/sci-electronics/labone-16.12.42529
@@ -54855,8 +54787,6 @@
 2011252124 metadata/md5-cache/sci-geosciences/gpsbabel-1.5.4-r1
 2011252124 metadata/md5-cache/sci-geosciences/gpsbabel-9999
 2011252124 metadata/md5-cache/sci-geosciences/gpscorrelate-1.6.1-r1
-2011252124 metadata/md5-cache/sci-geosciences/gpsd-3.21
-2011252124 metadata/md5-cache/sci-geosciences/gpsd-9999
 2011252124 metadata/md5-cache/sci-geosciences/gpx-viewer-0.4.0-r1
 2011252124 metadata/md5-cache/sci-geosciences/gpxsee-7.29
 2011252124 metadata/md5-cache/sci-geosciences/gpxsee-7.35
@@ -54932,15 +54862,17 @@
 2011252124 metadata/md5-cache/sci-geosciences/qmapshack-1.14.0
 2011252124 metadata/md5-cache/sci-geosciences/routino-3.1.1
 2011252124 metadata/md5-cache/sci-geosciences/routino-3.2
-2011252124 metadata/md5-cache/sci-geosciences/routino-3.3.2
 2011252124 metadata/md5-cache/sci-geosciences/swmm-5.0.022
 2011252124 metadata/md5-cache/sci-geosciences/viking-1.6.2-r2
 2011252124 metadata/md5-cache/sci-geosciences/viking-1.7
 2011252124 metadata/md5-cache/sci-geosciences/viking-1.7-r1
 2011252124 metadata/md5-cache/sci-geosciences/xtide-2.15.1
-2011281739 metadata/md5-cache/sci-geosciences/Manifest.gz
 2011281739 metadata/md5-cache/sci-geosciences/gpxsee-7.37
 2011281609 metadata/md5-cache/sci-geosciences/qmapshack-1.15.1
+2012011340 metadata/md5-cache/sci-geosciences/Manifest.gz
+2012011340 metadata/md5-cache/sci-geosciences/gpsd-3.21
+2012011340 metadata/md5-cache/sci-geosciences/gpsd-9999
+2012011340 metadata/md5-cache/sci-geosciences/routino-3.3.2
 1702282330 metadata/md5-cache/sci-libs/clashscore-db-3.17
 1702282331 metadata/md5-cache/sci-libs/fetk-1.5
 1706010238 metadata/md5-cache/sci-libs/h5part-1.6.6
@@ -55012,14 +54944,11 @@
 2011252124 metadata/md5-cache/sci-libs/blis-0.6.0
 2011252124 metadata/md5-cache/sci-libs/bliss-0.73-r1
 2011252124 metadata/md5-cache/sci-libs/bliss-0.73-r2
-2011252124 metadata/md5-cache/sci-libs/bmrblib-1.0.3
-2011252124 metadata/md5-cache/sci-libs/bmrblib-1.0.4
 2011252124 metadata/md5-cache/sci-libs/brial-1.2.10
 2011252124 metadata/md5-cache/sci-libs/brial-1.2.8
 2011252124 metadata/md5-cache/sci-libs/buddy-2.4-r1
 2011252124 metadata/md5-cache/sci-libs/cantera-2.4.0-r4
 2011252124 metadata/md5-cache/sci-libs/cantera-2.4.0-r5
-2011252124 metadata/md5-cache/sci-libs/cartopy-0.18.0
 2011252124 metadata/md5-cache/sci-libs/cbflib-0.9.3.3
 2011252124 metadata/md5-cache/sci-libs/ccfits-2.4-r1
 2011252124 metadata/md5-cache/sci-libs/ccfits-2.5
@@ -55075,7 +55004,6 @@
 2011252124 metadata/md5-cache/sci-libs/dealii-9.2.0
 2011252124 metadata/md5-cache/sci-libs/dealii-9999
 2011252124 metadata/md5-cache/sci-libs/djbfft-0.76-r2
-2011252124 metadata/md5-cache/sci-libs/dlib-19.16-r1
 2011252124 metadata/md5-cache/sci-libs/dlib-19.9
 2011252124 metadata/md5-cache/sci-libs/dmlc-core-0_p20170719
 2011252124 metadata/md5-cache/sci-libs/dsdp-5.8-r3
@@ -55094,7 +55022,6 @@
 2011252124 metadata/md5-cache/sci-libs/galib-2.4.7-r1
 2011252124 metadata/md5-cache/sci-libs/gamer-1.5-r2
 2011252124 metadata/md5-cache/sci-libs/gaul-devel-0.1849-r2
-2011252124 metadata/md5-cache/sci-libs/gdal-3.0.4-r1
 2011252124 metadata/md5-cache/sci-libs/gerris-20131206-r1
 2011252124 metadata/md5-cache/sci-libs/getdata-0.9.0-r3
 2011252124 metadata/md5-cache/sci-libs/ginkgo-1.1.1-r1
@@ -55127,13 +55054,6 @@
 2011252124 metadata/md5-cache/sci-libs/ipopt-3.11.8
 2011252124 metadata/md5-cache/sci-libs/ipopt-3.12.12
 2011252124 metadata/md5-cache/sci-libs/itpp-4.3.1-r1
-2011252124 metadata/md5-cache/sci-libs/keras-applications-1.0.7
-2011252124 metadata/md5-cache/sci-libs/keras-applications-1.0.8
-2011252124 metadata/md5-cache/sci-libs/keras-applications-1.0.8-r1
-2011252124 metadata/md5-cache/sci-libs/keras-preprocessing-1.0.9
-2011252124 metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0
-2011252124 metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0-r1
-2011252124 metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2
 2011252124 metadata/md5-cache/sci-libs/kim-api-2.1.3-r1
 2011252124 metadata/md5-cache/sci-libs/lapack-3.8.0
 2011252124 metadata/md5-cache/sci-libs/lapack-3.8.0-r1
@@ -55199,7 +55119,6 @@
 2011252124 metadata/md5-cache/sci-libs/m4ri-20200115
 2011252124 metadata/md5-cache/sci-libs/m4ri-20200125
 2011252124 metadata/md5-cache/sci-libs/mc-1.5
-2011252124 metadata/md5-cache/sci-libs/med-4.0.0-r1
 2011252124 metadata/md5-cache/sci-libs/med-4.0.0-r2
 2011252124 metadata/md5-cache/sci-libs/metis-4.0.3-r1
 2011252124 metadata/md5-cache/sci-libs/metis-4.0.3-r2
@@ -55228,7 +55147,6 @@
 2011252124 metadata/md5-cache/sci-libs/netcdf-fortran-4.4.3
 2011252124 metadata/md5-cache/sci-libs/nfft-3.3.2
 2011252124 metadata/md5-cache/sci-libs/nlopt-2.6.2-r1
-2011252124 metadata/md5-cache/sci-libs/numkit-1.1.2
 2011252124 metadata/md5-cache/sci-libs/o2scl-0.920
 2011252124 metadata/md5-cache/sci-libs/oce-0.18.3-r2
 2011252124 metadata/md5-cache/sci-libs/octomap-1.9.0
@@ -55260,8 +55178,6 @@
 2011252124 metadata/md5-cache/sci-libs/profphd-utils-1.0.10
 2011252124 metadata/md5-cache/sci-libs/profphd-utils-1.0.10-r1
 2011252124 metadata/md5-cache/sci-libs/punc-1.5
-2011252124 metadata/md5-cache/sci-libs/pyshp-2.1.0
-2011252124 metadata/md5-cache/sci-libs/pyshp-2.1.2
 2011252124 metadata/md5-cache/sci-libs/qd-2.3.17
 2011252124 metadata/md5-cache/sci-libs/qd-2.3.22
 2011252124 metadata/md5-cache/sci-libs/qrupdate-1.1.2-r1
@@ -55269,22 +55185,13 @@
 2011252124 metadata/md5-cache/sci-libs/rosetta-fragments-3.1-r1
 2011252124 metadata/md5-cache/sci-libs/rtabmap-0.20.3
 2011252124 metadata/md5-cache/sci-libs/rtabmap-9999
-2011252124 metadata/md5-cache/sci-libs/rtree-0.9.4-r1
 2011252124 metadata/md5-cache/sci-libs/scalapack-2.0.2-r1
 2011252124 metadata/md5-cache/sci-libs/scalapack-2.1.0
-2011252124 metadata/md5-cache/sci-libs/scikit-image-0.13.0-r1
-2011252124 metadata/md5-cache/sci-libs/scikit-image-0.17.2
-2011252124 metadata/md5-cache/sci-libs/scikit-learn-0.22.2_p1-r1
-2011252124 metadata/md5-cache/sci-libs/scikit-optimize-0.8.1
 2011252124 metadata/md5-cache/sci-libs/scikits-0.1-r1
 2011252124 metadata/md5-cache/sci-libs/scikits-0.1-r2
-2011252124 metadata/md5-cache/sci-libs/scikits_optimization-0.3-r1
-2011252124 metadata/md5-cache/sci-libs/scikits_timeseries-0.91.3-r2
 2011252124 metadata/md5-cache/sci-libs/scotch-6.0.4-r2
 2011252124 metadata/md5-cache/sci-libs/shapelib-1.5.0
-2011252124 metadata/md5-cache/sci-libs/shapely-1.7.1
 2011252124 metadata/md5-cache/sci-libs/silo-4.10.2-r1
-2011252124 metadata/md5-cache/sci-libs/sktime-0.4.2
 2011252124 metadata/md5-cache/sci-libs/spglib-1.14.1
 2011252124 metadata/md5-cache/sci-libs/spr-3.3.2
 2011252124 metadata/md5-cache/sci-libs/suitesparseconfig-5.4.0
@@ -55302,16 +55209,6 @@
 2011252124 metadata/md5-cache/sci-libs/ta-lib-0.4.0
 2011252124 metadata/md5-cache/sci-libs/tamu_anova-0.2-r1
 2011252124 metadata/md5-cache/sci-libs/taucs-2.2
-2011252124 metadata/md5-cache/sci-libs/tensorflow-2.1.0
-2011252124 metadata/md5-cache/sci-libs/tensorflow-2.2.0-r1
-2011252124 metadata/md5-cache/sci-libs/tensorflow-2.2.0-r2
-2011252124 metadata/md5-cache/sci-libs/tensorflow-2.3.1
-2011252124 metadata/md5-cache/sci-libs/tensorflow-2.3.1-r1
-2011252124 metadata/md5-cache/sci-libs/tensorflow-estimator-2.1
-2011252124 metadata/md5-cache/sci-libs/tensorflow-estimator-2.2.0-r1
-2011252124 metadata/md5-cache/sci-libs/tensorflow-estimator-2.2.0-r2
-2011252124 metadata/md5-cache/sci-libs/tensorflow-estimator-2.3.0
-2011252124 metadata/md5-cache/sci-libs/tensorflow-estimator-2.4.0_rc0
 2011252124 metadata/md5-cache/sci-libs/trilinos-12.14.1
 2011252124 metadata/md5-cache/sci-libs/trilinos-12.18.1
 2011252124 metadata/md5-cache/sci-libs/trilinos-13.0.0
@@ -55340,15 +55237,48 @@
 2011252124 metadata/md5-cache/sci-libs/xylib-1.6
 2011261439 metadata/md5-cache/sci-libs/libaec-1.0.4
 2011271209 metadata/md5-cache/sci-libs/indilib-1.8.7
-2011270009 metadata/md5-cache/sci-libs/scikit-learn-0.23.2
-2011290209 metadata/md5-cache/sci-libs/tensorflow-2.4.0_rc3
 2011291839 metadata/md5-cache/sci-libs/mathgl-2.4.1-r2
 2011291839 metadata/md5-cache/sci-libs/mathgl-2.4.4
 2011292309 metadata/md5-cache/sci-libs/plplot-5.15.0-r100
-2012010809 metadata/md5-cache/sci-libs/Manifest.gz
 2012010139 metadata/md5-cache/sci-libs/gsl-1.16
-2012010809 metadata/md5-cache/sci-libs/shapely-1.6.4_p2-r1
-2012010809 metadata/md5-cache/sci-libs/shapely-1.7.0
+2012022009 metadata/md5-cache/sci-libs/Manifest.gz
+2012011340 metadata/md5-cache/sci-libs/bmrblib-1.0.3
+2012011340 metadata/md5-cache/sci-libs/bmrblib-1.0.4
+2012011340 metadata/md5-cache/sci-libs/cartopy-0.18.0
+2012011340 metadata/md5-cache/sci-libs/dlib-19.16-r1
+2012011340 metadata/md5-cache/sci-libs/gdal-3.0.4-r1
+2012011340 metadata/md5-cache/sci-libs/keras-applications-1.0.7
+2012022009 metadata/md5-cache/sci-libs/keras-applications-1.0.8-r1
+2012011340 metadata/md5-cache/sci-libs/keras-preprocessing-1.0.9
+2012022009 metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0-r1
+2012011340 metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2
+2012011109 metadata/md5-cache/sci-libs/med-4.1.0
+2012011340 metadata/md5-cache/sci-libs/numkit-1.1.2
+2012011340 metadata/md5-cache/sci-libs/pyshp-2.1.0
+2012011340 metadata/md5-cache/sci-libs/pyshp-2.1.2
+2012011340 metadata/md5-cache/sci-libs/rtree-0.9.4-r1
+2012011340 metadata/md5-cache/sci-libs/scikit-image-0.13.0-r1
+2012011340 metadata/md5-cache/sci-libs/scikit-image-0.17.2
+2012011340 metadata/md5-cache/sci-libs/scikit-learn-0.22.2_p1-r1
+2012011340 metadata/md5-cache/sci-libs/scikit-learn-0.23.2
+2012011340 metadata/md5-cache/sci-libs/scikit-optimize-0.8.1
+2012011340 metadata/md5-cache/sci-libs/scikits_optimization-0.3-r1
+2012011340 metadata/md5-cache/sci-libs/scikits_timeseries-0.91.3-r2
+2012011340 metadata/md5-cache/sci-libs/shapely-1.6.4_p2-r1
+2012011340 metadata/md5-cache/sci-libs/shapely-1.7.0
+2012011340 metadata/md5-cache/sci-libs/shapely-1.7.1
+2012011340 metadata/md5-cache/sci-libs/sktime-0.4.2
+2012011340 metadata/md5-cache/sci-libs/tensorflow-2.1.0
+2012011340 metadata/md5-cache/sci-libs/tensorflow-2.2.0-r1
+2012011340 metadata/md5-cache/sci-libs/tensorflow-2.2.0-r2
+2012011340 metadata/md5-cache/sci-libs/tensorflow-2.3.1
+2012011340 metadata/md5-cache/sci-libs/tensorflow-2.3.1-r1
+2012011340 metadata/md5-cache/sci-libs/tensorflow-2.4.0_rc3
+2012011340 metadata/md5-cache/sci-libs/tensorflow-estimator-2.1
+2012011340 metadata/md5-cache/sci-libs/tensorflow-estimator-2.2.0-r1
+2012011340 metadata/md5-cache/sci-libs/tensorflow-estimator-2.2.0-r2
+2012011340 metadata/md5-cache/sci-libs/tensorflow-estimator-2.3.0
+2012011340 metadata/md5-cache/sci-libs/tensorflow-estimator-2.4.0_rc0
 1909120939 metadata/md5-cache/sci-mathematics/alt-ergo-1.30
 1907310209 metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0
 1912080309 metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
@@ -55391,7 +55321,6 @@
 2011252124 metadata/md5-cache/sci-mathematics/dataplot-20090821
 2011252124 metadata/md5-cache/sci-mathematics/dataplot-20131220
 2011252124 metadata/md5-cache/sci-mathematics/diagrtb-2.64
-2011252124 metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1
 2011252124 metadata/md5-cache/sci-mathematics/ent-101202
 2011252124 metadata/md5-cache/sci-mathematics/euler-1.61.0
 2011252124 metadata/md5-cache/sci-mathematics/fann-2.2.0-r1
@@ -55491,8 +55420,9 @@
 2011252124 metadata/md5-cache/sci-mathematics/yafu-9999
 2011252124 metadata/md5-cache/sci-mathematics/z3-4.8.9
 2011270209 metadata/md5-cache/sci-mathematics/pspp-1.4.1
-2012010809 metadata/md5-cache/sci-mathematics/Manifest.gz
-2012010809 metadata/md5-cache/sci-mathematics/octave-6.1.0
+2012011939 metadata/md5-cache/sci-mathematics/Manifest.gz
+2012011340 metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1
+2012011939 metadata/md5-cache/sci-mathematics/octave-6.1.0-r1
 1908291909 metadata/md5-cache/sci-misc/ViSP-images-3.2.0
 1702282331 metadata/md5-cache/sci-misc/flashdot-1.1.4-r1
 2003311822 metadata/md5-cache/sci-misc/netlogo-bin-6.0.2
@@ -55500,7 +55430,6 @@
 2007260509 metadata/md5-cache/sci-misc/tango-9.2.5a
 2011061540 metadata/md5-cache/sci-misc/cdfplayer-11.2.0
 2011252124 metadata/md5-cache/sci-misc/apertium-3.2.0
-2011252124 metadata/md5-cache/sci-misc/boinc-7.14.2
 2011252124 metadata/md5-cache/sci-misc/boinc-7.8.6
 2011252124 metadata/md5-cache/sci-misc/boinc-7.9.3
 2011252124 metadata/md5-cache/sci-misc/boinc-9999
@@ -55517,9 +55446,10 @@
 2011252124 metadata/md5-cache/sci-misc/netlogo-bin-5.0.3-r1
 2011252124 metadata/md5-cache/sci-misc/oww-0.86.4
 2011252124 metadata/md5-cache/sci-misc/oww-0.86.5
-2011252124 metadata/md5-cache/sci-misc/vitables-3.0.0-r1
-2011252124 metadata/md5-cache/sci-misc/vitables-3.0.0-r2
-2011281639 metadata/md5-cache/sci-misc/Manifest.gz
+2012030239 metadata/md5-cache/sci-misc/Manifest.gz
+2012030239 metadata/md5-cache/sci-misc/boinc-7.14.2
+2012011340 metadata/md5-cache/sci-misc/vitables-3.0.0-r1
+2012011340 metadata/md5-cache/sci-misc/vitables-3.0.0-r2
 1702282331 metadata/md5-cache/sci-physics/siscone-3.0.3
 2011181909 metadata/md5-cache/sci-physics/geant-data-4.10.6-r1
 2011181909 metadata/md5-cache/sci-physics/geant-data-4.10.6.3
@@ -55540,7 +55470,6 @@
 2011252124 metadata/md5-cache/sci-physics/espresso-9999
 2011252124 metadata/md5-cache/sci-physics/fastjet-3.0.6-r1
 2011252124 metadata/md5-cache/sci-physics/geant-4.10.6-r1
-2011252124 metadata/md5-cache/sci-physics/geant-4.10.6.3
 2011252124 metadata/md5-cache/sci-physics/geant-4.10.6_p1-r1
 2011252124 metadata/md5-cache/sci-physics/geant-4.10.6_p2
 2011252124 metadata/md5-cache/sci-physics/geant-vmc-4.4.0
@@ -55561,7 +55490,6 @@
 2011252124 metadata/md5-cache/sci-physics/lammps-20190807
 2011252124 metadata/md5-cache/sci-physics/lammps-20190807-r1
 2011252124 metadata/md5-cache/sci-physics/lammps-20200303
-2011252124 metadata/md5-cache/sci-physics/lhapdf-6.2.3
 2011252124 metadata/md5-cache/sci-physics/looptools-2.12
 2011252124 metadata/md5-cache/sci-physics/looptools-2.13
 2011252124 metadata/md5-cache/sci-physics/looptools-2.8
@@ -55573,8 +55501,6 @@
 2011252124 metadata/md5-cache/sci-physics/pythia-8.1.86-r1
 2011252124 metadata/md5-cache/sci-physics/pythia-8.2.10
 2011252124 metadata/md5-cache/sci-physics/pythia-8.2.26
-2011252124 metadata/md5-cache/sci-physics/qmeq-1.0-r1
-2011252124 metadata/md5-cache/sci-physics/qmeq-1.0_p202004
 2011252124 metadata/md5-cache/sci-physics/reduze-2.2
 2011252124 metadata/md5-cache/sci-physics/root-6.20.08
 2011252124 metadata/md5-cache/sci-physics/root-9999
@@ -55591,8 +55517,12 @@
 2011252124 metadata/md5-cache/sci-physics/xfoil-6.97-r1
 2011252124 metadata/md5-cache/sci-physics/xfoil-6.99
 2011252124 metadata/md5-cache/sci-physics/yoda-1.7.0-r2
-2011301609 metadata/md5-cache/sci-physics/Manifest.gz
 2011301609 metadata/md5-cache/sci-physics/root-6.22.06
+2012011340 metadata/md5-cache/sci-physics/Manifest.gz
+2012011309 metadata/md5-cache/sci-physics/geant-4.10.6.3
+2012011340 metadata/md5-cache/sci-physics/lhapdf-6.2.3
+2012011340 metadata/md5-cache/sci-physics/qmeq-1.0-r1
+2012011340 metadata/md5-cache/sci-physics/qmeq-1.0_p202004
 1702282331 metadata/md5-cache/sci-visualization/circos-0.55-r1
 2011252124 metadata/md5-cache/sci-visualization/epix-1.2.11-r2
 2011252124 metadata/md5-cache/sci-visualization/fig2sxd-0.22.1
@@ -55629,8 +55559,6 @@
 2011252124 metadata/md5-cache/sci-visualization/tensorboard-2.2.1
 2011252124 metadata/md5-cache/sci-visualization/tensorboard-2.2.1-r1
 2011252124 metadata/md5-cache/sci-visualization/tensorboard-2.3.0
-2011252124 metadata/md5-cache/sci-visualization/veusz-3.1
-2011252124 metadata/md5-cache/sci-visualization/veusz-3.2
 2011252124 metadata/md5-cache/sci-visualization/xd3d-8.3.1-r1
 2011252124 metadata/md5-cache/sci-visualization/xgraph-12.1-r4
 2011252124 metadata/md5-cache/sci-visualization/xyscan-4.3.0
@@ -55639,8 +55567,10 @@
 2011291839 metadata/md5-cache/sci-visualization/fityk-1.3.1
 2011291839 metadata/md5-cache/sci-visualization/fityk-1.3.1-r100
 2011300239 metadata/md5-cache/sci-visualization/labplot-9999
-2011302139 metadata/md5-cache/sci-visualization/Manifest.gz
 2011302139 metadata/md5-cache/sci-visualization/gnuplot-5.5.9999-r1
+2012011340 metadata/md5-cache/sci-visualization/Manifest.gz
+2012011340 metadata/md5-cache/sci-visualization/veusz-3.1
+2012011340 metadata/md5-cache/sci-visualization/veusz-3.2
 2002151740 metadata/md5-cache/sec-policy/selinux-base-policy-2.20190201-r1
 2003191139 metadata/md5-cache/sec-policy/apparmor-profiles-2.13.4
 2010101309 metadata/md5-cache/sec-policy/apparmor-profiles-3.0.0
@@ -56414,519 +56344,519 @@
 2011051309 metadata/md5-cache/sec-policy/selinux-zabbix-2.20200818-r1
 2011251039 metadata/md5-cache/sec-policy/apparmor-profiles-3.0.0-r1
 2011251039 metadata/md5-cache/sec-policy/apparmor-profiles-9999
-2011300739 metadata/md5-cache/sec-policy/Manifest.gz
-2011300739 metadata/md5-cache/sec-policy/selinux-abrt-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-abrt-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-accountsd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-accountsd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-acct-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-acct-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-afs-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-afs-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-aide-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-aide-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-alsa-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-alsa-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-amanda-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-amanda-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-amavis-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-amavis-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-android-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-android-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-apache-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-apache-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-apcupsd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-apcupsd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-apm-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-apm-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-arpwatch-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-arpwatch-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-asterisk-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-asterisk-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-at-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-at-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-automount-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-automount-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-avahi-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-avahi-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-awstats-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-awstats-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-backup-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-backup-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-bacula-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-bacula-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-base-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-base-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-base-policy-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-base-policy-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-bind-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-bind-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-bitcoin-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-bitcoin-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-bitlbee-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-bitlbee-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-bluetooth-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-bluetooth-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-brctl-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-brctl-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-cachefilesd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-calamaris-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-calamaris-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-canna-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-canna-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-ccs-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-ccs-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-cdrecord-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-cdrecord-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-ceph-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-ceph-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-cgmanager-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-cgmanager-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-cgroup-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-cgroup-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-chromium-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-chromium-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-chronyd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-chronyd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-clamav-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-clamav-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-clockspeed-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-clockspeed-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-collectd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-collectd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-colord-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-colord-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-corosync-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-corosync-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-couchdb-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-couchdb-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-courier-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-courier-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-cpucontrol-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-cpufreqselector-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-cups-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-cups-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-cvs-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-cvs-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-cyphesis-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-cyphesis-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-daemontools-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-daemontools-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-dante-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-dante-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-dbadm-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-dbadm-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-dbskk-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-dbskk-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-dbus-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-dbus-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-dcc-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-dcc-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-ddclient-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-ddclient-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-ddcprobe-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-denyhosts-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-denyhosts-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-devicekit-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-devicekit-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-dhcp-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-dhcp-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-dictd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-dictd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-dirmngr-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-dirmngr-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-dirsrv-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-dirsrv-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-distcc-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-distcc-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-djbdns-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-djbdns-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-dkim-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-dkim-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-dmidecode-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-dmidecode-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-dnsmasq-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-dovecot-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-dovecot-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-dpkg-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-dpkg-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-dracut-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-dracut-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-dropbox-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-dropbox-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-entropyd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-entropyd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-evolution-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-evolution-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-exim-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-exim-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-fail2ban-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-fail2ban-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-fetchmail-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-fetchmail-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-finger-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-finger-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-flash-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-flash-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-fprintd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-fprintd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-ftp-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-ftp-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-games-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-games-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-gatekeeper-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-git-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-git-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-gitosis-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-gitosis-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-gnome-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-gnome-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-googletalk-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-googletalk-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-gorg-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-gorg-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-gpg-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-gpg-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-gpm-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-gpm-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-gpsd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-gpsd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-gssproxy-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-gssproxy-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-hddtemp-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-hddtemp-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-howl-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-howl-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-icecast-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-icecast-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-ifplugd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-ifplugd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-imaze-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-imaze-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-inetd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-inetd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-inn-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-inn-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-ipsec-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-ipsec-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-irc-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-irc-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-ircd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-ircd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-irqbalance-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-irqbalance-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-jabber-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-jabber-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-java-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-java-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-kdeconnect-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-kdump-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-kdump-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-kerberos-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-kerberos-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-kerneloops-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-kerneloops-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-kismet-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-kismet-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-ksmtuned-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-kudzu-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-kudzu-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-ldap-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-ldap-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-links-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-links-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-lircd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-lircd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-loadkeys-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-loadkeys-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-lockdev-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-lockdev-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-logrotate-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-logrotate-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-logsentry-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-logsentry-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-logwatch-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-logwatch-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-lpd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-lpd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-mailman-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-mailman-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-makewhatis-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-makewhatis-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-mandb-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-mandb-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-mcelog-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-mcelog-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-memcached-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-memcached-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-milter-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-milter-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-modemmanager-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-modemmanager-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-mono-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-mono-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-mozilla-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-mozilla-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-mpd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-mpd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-mplayer-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-mplayer-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-mrtg-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-mrtg-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-munin-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-munin-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-mutt-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-mutt-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-mysql-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-mysql-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-nagios-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-nagios-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-ncftool-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-ncftool-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-networkmanager-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-networkmanager-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-nginx-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-nginx-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-nslcd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-nslcd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-ntop-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-ntop-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-ntp-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-ntp-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-nut-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-nut-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-nx-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-nx-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-oddjob-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-oddjob-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-oident-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-oident-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-openct-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-openct-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-openrc-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-openrc-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-openvpn-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-openvpn-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-pan-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-pan-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-pcmcia-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-pcmcia-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-pcscd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-pcscd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-phpfpm-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-phpfpm-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-plymouthd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-plymouthd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-podsleuth-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-podsleuth-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-policykit-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-policykit-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-portmap-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-portmap-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-postfix-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-postfix-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-postgresql-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-postgresql-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-postgrey-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-postgrey-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-ppp-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-ppp-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-prelink-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-prelink-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-prelude-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-prelude-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-privoxy-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-privoxy-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-procmail-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-procmail-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-psad-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-psad-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-publicfile-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-publicfile-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-pulseaudio-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-puppet-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-puppet-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-pyicqt-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-pyicqt-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-pyzor-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-pyzor-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-qemu-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-qemu-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-qmail-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-qmail-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-quota-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-quota-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-radius-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-radius-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-radvd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-radvd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-razor-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-razor-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-redis-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-redis-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-remotelogin-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-remotelogin-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-resolvconf-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-resolvconf-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-rgmanager-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-rgmanager-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-rngd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-rngd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-roundup-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-roundup-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-rpc-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-rpc-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-rpcbind-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-rpcbind-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-rpm-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-rpm-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-rssh-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-rssh-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-rtkit-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-rtkit-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-rtorrent-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-rtorrent-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-salt-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-salt-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-samba-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-samba-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-sasl-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-sasl-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-screen-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-screen-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-sendmail-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-sendmail-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-sensord-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-sensord-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-shorewall-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-shorewall-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-shutdown-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-shutdown-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-skype-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-skype-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-slocate-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-slocate-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-slrnpull-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-slrnpull-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-smartmon-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-smartmon-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-smokeping-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-smokeping-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-snmp-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-snmp-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-snort-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-snort-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-soundserver-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-soundserver-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-spamassassin-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-spamassassin-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-speedtouch-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-speedtouch-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-squid-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-squid-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-sssd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-sssd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-stunnel-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-stunnel-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-subsonic-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-subsonic-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-sudo-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-sudo-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-sxid-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-sxid-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-syncthing-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-syncthing-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-sysstat-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-sysstat-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-tboot-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-tboot-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-tcpd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-tcpd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-tcsd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-tcsd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-telnet-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-telnet-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-tftp-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-tftp-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-tgtd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-tgtd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-thunderbird-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-thunderbird-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-timidity-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-timidity-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-tmpreaper-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-tor-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-tor-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-tripwire-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-tripwire-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-ucspitcp-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-ulogd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-ulogd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-uml-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-uml-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-unconfined-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-unconfined-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-uptime-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-uptime-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-usbmuxd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-uucp-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-uucp-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-uwimap-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-uwimap-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-uwsgi-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-uwsgi-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-varnishd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-varnishd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-vbetool-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-vbetool-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-vdagent-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-vdagent-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-vde-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-vde-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-virt-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-virt-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-vlock-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-vlock-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-vmware-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-vmware-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-vnstatd-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-vnstatd-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-vpn-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-vpn-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-watchdog-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-watchdog-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-webalizer-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-webalizer-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-wine-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-wine-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-wireshark-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-wireshark-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-wm-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-wm-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-xen-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-xen-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-xfs-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-xfs-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-xprint-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-xprint-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-xscreensaver-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-xserver-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-xserver-9999
-2011300739 metadata/md5-cache/sec-policy/selinux-zabbix-2.20200818-r2
 2011300739 metadata/md5-cache/sec-policy/selinux-zabbix-9999
+2012030639 metadata/md5-cache/sec-policy/Manifest.gz
+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
+2012030639 metadata/md5-cache/sec-policy/selinux-afs-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-aide-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-alsa-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-amanda-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-amavis-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-android-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-apache-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-apcupsd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-apm-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-arpwatch-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-asterisk-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-at-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-automount-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-avahi-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-awstats-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-backup-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-bacula-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-base-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-base-policy-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-bind-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-bitcoin-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-bitlbee-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-bluetooth-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-brctl-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-calamaris-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-canna-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-ccs-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-cdrecord-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-ceph-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-cgmanager-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-cgroup-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-chromium-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-chronyd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-clamav-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-clockspeed-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-collectd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-colord-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-corosync-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-couchdb-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-courier-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-cups-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-cvs-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-cyphesis-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-daemontools-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-dante-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-dbadm-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-dbskk-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-dbus-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-dcc-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-ddclient-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-denyhosts-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-devicekit-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-dhcp-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-dictd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-dirmngr-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-dirsrv-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-distcc-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-djbdns-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-dkim-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-dmidecode-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-dovecot-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-dpkg-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-dracut-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-dropbox-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-entropyd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-evolution-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-exim-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-fail2ban-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-fetchmail-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-finger-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-flash-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-fprintd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-ftp-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-games-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-git-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-gitosis-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-gnome-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-googletalk-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-gorg-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-gpg-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-gpm-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-gpsd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-gssproxy-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-hddtemp-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-howl-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-icecast-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-ifplugd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-imaze-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-inetd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-inn-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-ipsec-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-irc-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-ircd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-irqbalance-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-jabber-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-java-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-kdump-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-kerberos-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-kerneloops-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-kismet-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-kudzu-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-ldap-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-links-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-lircd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-loadkeys-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-lockdev-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-logrotate-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-logsentry-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-logwatch-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-lpd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-mailman-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-makewhatis-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-mandb-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-mcelog-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-memcached-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-milter-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-modemmanager-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-mono-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-mozilla-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-mpd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-mplayer-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-mrtg-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-munin-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-mutt-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-mysql-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-nagios-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-ncftool-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-networkmanager-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-nginx-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-nslcd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-ntop-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-ntp-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-nut-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-nx-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-oddjob-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-oident-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-openct-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-openrc-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-openvpn-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-pan-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-pcmcia-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-pcscd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-phpfpm-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-plymouthd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-podsleuth-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-policykit-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-portmap-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-postfix-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-postgresql-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-postgrey-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-ppp-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-prelink-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-prelude-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-privoxy-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-procmail-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-psad-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-publicfile-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-puppet-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-pyicqt-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-pyzor-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-qemu-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-qmail-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-quota-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-radius-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-radvd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-razor-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-redis-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-remotelogin-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-resolvconf-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-rgmanager-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-rngd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-roundup-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-rpc-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-rpcbind-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-rpm-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-rssh-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-rtkit-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-rtorrent-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-salt-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-samba-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-sasl-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-screen-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-sendmail-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-sensord-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-shorewall-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-shutdown-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-skype-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-slocate-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-slrnpull-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-smartmon-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-smokeping-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-snmp-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-snort-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-soundserver-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-spamassassin-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-speedtouch-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-squid-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-sssd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-stunnel-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-subsonic-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-sudo-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-sxid-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-syncthing-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-sysstat-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-tboot-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-tcpd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-tcsd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-telnet-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-tftp-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-tgtd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-thunderbird-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-timidity-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-tor-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-tripwire-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-ulogd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-uml-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-unconfined-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-uptime-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-uucp-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-uwimap-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-uwsgi-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-varnishd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-vbetool-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-vdagent-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-vde-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-virt-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-vlock-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-vmware-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-vnstatd-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-vpn-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-watchdog-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-webalizer-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-wine-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-wireshark-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-wm-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-xen-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-xfs-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-xprint-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-xserver-2.20200818-r2
+2012030639 metadata/md5-cache/sec-policy/selinux-zabbix-2.20200818-r2
 1910170740 metadata/md5-cache/sys-apps/ack-3.0.0
 1704141039 metadata/md5-cache/sys-apps/aix-miscutils-0.1.1671
 1910111911 metadata/md5-cache/sys-apps/baselayout-java-0.1.0-r1
@@ -56998,7 +56928,6 @@
 2006131809 metadata/md5-cache/sys-apps/usbguard-0.7.8
 2006261839 metadata/md5-cache/sys-apps/yarn-1.22.4
 2006291439 metadata/md5-cache/sys-apps/iucode_tool-2.3.1-r1
-2007080009 metadata/md5-cache/sys-apps/ack-3.4.0
 2007151539 metadata/md5-cache/sys-apps/s6-linux-init-1.0.3.1
 2007151539 metadata/md5-cache/sys-apps/s6-linux-utils-2.5.1.1
 2007151539 metadata/md5-cache/sys-apps/s6-portable-utils-2.2.2.1
@@ -57075,7 +57004,6 @@
 2011252124 metadata/md5-cache/sys-apps/baselayout-prefix-2.6-r2
 2011252124 metadata/md5-cache/sys-apps/biosdevname-0.7.2
 2011252124 metadata/md5-cache/sys-apps/biosdevname-0.7.3
-2011252124 metadata/md5-cache/sys-apps/bleachbit-4.0.0
 2011252124 metadata/md5-cache/sys-apps/bolt-0.9-r1
 2011252124 metadata/md5-cache/sys-apps/bolt-0.9-r2
 2011252124 metadata/md5-cache/sys-apps/bubblewrap-0.4.1
@@ -57085,7 +57013,6 @@
 2011252124 metadata/md5-cache/sys-apps/ccs-tools-1.8.3_p20130214
 2011252124 metadata/md5-cache/sys-apps/checkpolicy-2.9
 2011252124 metadata/md5-cache/sys-apps/checkpolicy-3.0
-2011252124 metadata/md5-cache/sys-apps/checkpolicy-3.1
 2011252124 metadata/md5-cache/sys-apps/checkpolicy-9999
 2011252124 metadata/md5-cache/sys-apps/chname-1.1
 2011252124 metadata/md5-cache/sys-apps/cinit-0.2.1
@@ -57108,7 +57035,6 @@
 2011252124 metadata/md5-cache/sys-apps/darwin-miscutils-8
 2011252124 metadata/md5-cache/sys-apps/darwin-miscutils-9
 2011252124 metadata/md5-cache/sys-apps/dbus-1.12.18
-2011252124 metadata/md5-cache/sys-apps/dbus-1.12.20
 2011252124 metadata/md5-cache/sys-apps/dbus-broker-23
 2011252124 metadata/md5-cache/sys-apps/dbus-broker-24
 2011252124 metadata/md5-cache/sys-apps/dbus-broker-9999
@@ -57157,13 +57083,8 @@
 2011252124 metadata/md5-cache/sys-apps/fakeroot-1.25.2
 2011252124 metadata/md5-cache/sys-apps/fakeroot-1.25.3
 2011252124 metadata/md5-cache/sys-apps/fbset-2.1
-2011252124 metadata/md5-cache/sys-apps/file-5.37-r1
-2011252124 metadata/md5-cache/sys-apps/file-5.38-r1
-2011252124 metadata/md5-cache/sys-apps/file-5.39-r3
-2011252124 metadata/md5-cache/sys-apps/file-9999
 2011252124 metadata/md5-cache/sys-apps/findutils-4.7.0
 2011252124 metadata/md5-cache/sys-apps/firejail-0.9.64
-2011252124 metadata/md5-cache/sys-apps/firejail-0.9.64-r1
 2011252124 metadata/md5-cache/sys-apps/firejail-9999
 2011252124 metadata/md5-cache/sys-apps/firejail-lts-0.9.56.2-r2
 2011252124 metadata/md5-cache/sys-apps/flashrom-1.2-r1
@@ -57177,12 +57098,10 @@
 2011252124 metadata/md5-cache/sys-apps/fwupd-1.3.11
 2011252124 metadata/md5-cache/sys-apps/fwupd-1.4.6
 2011252124 metadata/md5-cache/sys-apps/fwupd-1.5.1-r1
-2011252124 metadata/md5-cache/sys-apps/fwupd-1.5.2
 2011252124 metadata/md5-cache/sys-apps/fxload-20081013-r1
 2011252124 metadata/md5-cache/sys-apps/gawk-4.2.1-r1
 2011252124 metadata/md5-cache/sys-apps/gawk-5.0.1
 2011252124 metadata/md5-cache/sys-apps/gawk-5.1.0
-2011252124 metadata/md5-cache/sys-apps/gcp-0.2.1
 2011252124 metadata/md5-cache/sys-apps/gentoo-functions-0.13
 2011252124 metadata/md5-cache/sys-apps/gentoo-functions-0.14
 2011252124 metadata/md5-cache/sys-apps/gentoo-functions-9999
@@ -57229,8 +57148,6 @@
 2011252124 metadata/md5-cache/sys-apps/hwloc-2.1.0
 2011252124 metadata/md5-cache/sys-apps/hwloc-2.3.0
 2011252124 metadata/md5-cache/sys-apps/hwsetup-1.2-r3
-2011252124 metadata/md5-cache/sys-apps/i2c-tools-4.1-r1
-2011252124 metadata/md5-cache/sys-apps/i2c-tools-4.2
 2011252124 metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.3.8-r1
 2011252124 metadata/md5-cache/sys-apps/ibm-powerpc-utils-99999
 2011252124 metadata/md5-cache/sys-apps/idle3-tools-0.9.3_pre20120123-r1
@@ -57263,8 +57180,6 @@
 2011252124 metadata/md5-cache/sys-apps/kbd-2.2.0-r2
 2011252124 metadata/md5-cache/sys-apps/kbd-2.3.0-r1
 2011252124 metadata/md5-cache/sys-apps/kbd-9999
-2011252124 metadata/md5-cache/sys-apps/kcheck-0.0.2-r1
-2011252124 metadata/md5-cache/sys-apps/kcheck-9999
 2011252124 metadata/md5-cache/sys-apps/kexec-tools-2.0.20-r3
 2011252124 metadata/md5-cache/sys-apps/kexec-tools-9999
 2011252124 metadata/md5-cache/sys-apps/keyutils-1.6.1
@@ -57301,7 +57216,6 @@
 2011252124 metadata/md5-cache/sys-apps/mawk-1.3.4_p20200106-r1
 2011252124 metadata/md5-cache/sys-apps/mcstrans-2.9
 2011252124 metadata/md5-cache/sys-apps/mcstrans-3.0
-2011252124 metadata/md5-cache/sys-apps/mcstrans-3.1
 2011252124 metadata/md5-cache/sys-apps/mcstrans-9999
 2011252124 metadata/md5-cache/sys-apps/memtest86+-5.01-r4
 2011252124 metadata/md5-cache/sys-apps/memtest86+-5.01-r5
@@ -57338,9 +57252,6 @@
 2011252124 metadata/md5-cache/sys-apps/opal-utils-6.5.2
 2011252124 metadata/md5-cache/sys-apps/opal-utils-6.6.2
 2011252124 metadata/md5-cache/sys-apps/opal-utils-6.7
-2011252124 metadata/md5-cache/sys-apps/openrc-0.41.2
-2011252124 metadata/md5-cache/sys-apps/openrc-0.42.1
-2011252124 metadata/md5-cache/sys-apps/openrc-9999
 2011252124 metadata/md5-cache/sys-apps/osinfo-db-tools-1.8.0
 2011252124 metadata/md5-cache/sys-apps/paxctl-0.9
 2011252124 metadata/md5-cache/sys-apps/paxctld-1.2.3
@@ -57356,21 +57267,13 @@
 2011252124 metadata/md5-cache/sys-apps/pcsc-tools-1.5.6
 2011252124 metadata/md5-cache/sys-apps/pcsc-tools-1.5.7
 2011252124 metadata/md5-cache/sys-apps/pick-3.0.1
-2011252124 metadata/md5-cache/sys-apps/pkgcore-9999
 2011252124 metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r5
 2011252124 metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r6
 2011252124 metadata/md5-cache/sys-apps/pmount-gui-0_pre20130806
 2011252124 metadata/md5-cache/sys-apps/pnputils-0.1
 2011252124 metadata/md5-cache/sys-apps/policycoreutils-2.9
 2011252124 metadata/md5-cache/sys-apps/policycoreutils-3.0
-2011252124 metadata/md5-cache/sys-apps/policycoreutils-3.1
 2011252124 metadata/md5-cache/sys-apps/policycoreutils-9999
-2011252124 metadata/md5-cache/sys-apps/portage-2.3.99-r2
-2011252124 metadata/md5-cache/sys-apps/portage-3.0.10-r1
-2011252124 metadata/md5-cache/sys-apps/portage-3.0.4-r1
-2011252124 metadata/md5-cache/sys-apps/portage-3.0.8
-2011252124 metadata/md5-cache/sys-apps/portage-3.0.9
-2011252124 metadata/md5-cache/sys-apps/portage-9999
 2011252124 metadata/md5-cache/sys-apps/powerpc-utils-1.1.3.18-r4
 2011252124 metadata/md5-cache/sys-apps/prctl-1.6-r1
 2011252124 metadata/md5-cache/sys-apps/preload-0.6.4-r3
@@ -57388,7 +57291,6 @@
 2011252124 metadata/md5-cache/sys-apps/renameutils-0.12.0
 2011252124 metadata/md5-cache/sys-apps/restorecond-2.9
 2011252124 metadata/md5-cache/sys-apps/restorecond-3.0
-2011252124 metadata/md5-cache/sys-apps/restorecond-3.1
 2011252124 metadata/md5-cache/sys-apps/restorecond-9999
 2011252124 metadata/md5-cache/sys-apps/rkflashtool-6.1
 2011252124 metadata/md5-cache/sys-apps/rng-tools-5-r2
@@ -57410,18 +57312,15 @@
 2011252124 metadata/md5-cache/sys-apps/sandbox-2.20
 2011252124 metadata/md5-cache/sys-apps/secilc-2.9
 2011252124 metadata/md5-cache/sys-apps/secilc-3.0
-2011252124 metadata/md5-cache/sys-apps/secilc-3.1
 2011252124 metadata/md5-cache/sys-apps/secilc-9999
 2011252124 metadata/md5-cache/sys-apps/sed-4.7
 2011252124 metadata/md5-cache/sys-apps/sed-4.8
 2011252124 metadata/md5-cache/sys-apps/selinux-python-2.9
 2011252124 metadata/md5-cache/sys-apps/selinux-python-3.0
 2011252124 metadata/md5-cache/sys-apps/selinux-python-3.1
-2011252124 metadata/md5-cache/sys-apps/selinux-python-3.1-r1
 2011252124 metadata/md5-cache/sys-apps/selinux-python-9999
 2011252124 metadata/md5-cache/sys-apps/semodule-utils-2.9
 2011252124 metadata/md5-cache/sys-apps/semodule-utils-3.0
-2011252124 metadata/md5-cache/sys-apps/semodule-utils-3.1
 2011252124 metadata/md5-cache/sys-apps/semodule-utils-9999
 2011252124 metadata/md5-cache/sys-apps/sensei-raw-ctl-0.0_pre20180729
 2011252124 metadata/md5-cache/sys-apps/servicelog-1.1.15
@@ -57482,13 +57381,11 @@
 2011252124 metadata/md5-cache/sys-apps/usbredir-0.8.0
 2011252124 metadata/md5-cache/sys-apps/usbredir-9999
 2011252124 metadata/md5-cache/sys-apps/usbutils-012
-2011252124 metadata/md5-cache/sys-apps/usbutils-013
 2011252124 metadata/md5-cache/sys-apps/usermode-utilities-20070815-r3
 2011252124 metadata/md5-cache/sys-apps/usermode-utilities-20070815-r4
 2011252124 metadata/md5-cache/sys-apps/utempter-0.5.5.6
 2011252124 metadata/md5-cache/sys-apps/util-linux-2.33.2
 2011252124 metadata/md5-cache/sys-apps/util-linux-2.34-r3
-2011252124 metadata/md5-cache/sys-apps/util-linux-2.35.2
 2011252124 metadata/md5-cache/sys-apps/util-linux-2.36
 2011252124 metadata/md5-cache/sys-apps/util-linux-2.36.1-r1
 2011252124 metadata/md5-cache/sys-apps/util-linux-9999
@@ -57518,11 +57415,45 @@
 2011281009 metadata/md5-cache/sys-apps/ripgrep-12.1.1
 2011280309 metadata/md5-cache/sys-apps/texinfo-6.7
 2011281239 metadata/md5-cache/sys-apps/moreutils-0.64
-2011281109 metadata/md5-cache/sys-apps/pkgcore-0.10.13-r1
-2011290039 metadata/md5-cache/sys-apps/portage-3.0.11
-2011281439 metadata/md5-cache/sys-apps/systemd-tmpfiles-246
-2011301639 metadata/md5-cache/sys-apps/Manifest.gz
-2011301639 metadata/md5-cache/sys-apps/smcipmitool-2.24.0.201007
+2012030639 metadata/md5-cache/sys-apps/Manifest.gz
+2012030239 metadata/md5-cache/sys-apps/ack-3.4.0
+2012011340 metadata/md5-cache/sys-apps/bleachbit-4.0.0
+2012030639 metadata/md5-cache/sys-apps/checkpolicy-3.1
+2012022239 metadata/md5-cache/sys-apps/dbus-1.12.20
+2012011340 metadata/md5-cache/sys-apps/file-5.37-r1
+2012011340 metadata/md5-cache/sys-apps/file-5.38-r1
+2012011340 metadata/md5-cache/sys-apps/file-5.39-r3
+2012011340 metadata/md5-cache/sys-apps/file-9999
+2012030239 metadata/md5-cache/sys-apps/firejail-0.9.64-r1
+2012021839 metadata/md5-cache/sys-apps/fwts-20.11.00
+2012022009 metadata/md5-cache/sys-apps/fwupd-1.5.2-r1
+2012011340 metadata/md5-cache/sys-apps/gcp-0.2.1
+2012011340 metadata/md5-cache/sys-apps/i2c-tools-4.1-r1
+2012011340 metadata/md5-cache/sys-apps/i2c-tools-4.2
+2012011340 metadata/md5-cache/sys-apps/kcheck-0.0.2-r1
+2012011340 metadata/md5-cache/sys-apps/kcheck-9999
+2012030639 metadata/md5-cache/sys-apps/mcstrans-3.1
+2012011439 metadata/md5-cache/sys-apps/openrc-0.41.2
+2012011439 metadata/md5-cache/sys-apps/openrc-0.42.1
+2012011439 metadata/md5-cache/sys-apps/openrc-9999
+2012011340 metadata/md5-cache/sys-apps/pkgcore-0.10.13-r1
+2012011340 metadata/md5-cache/sys-apps/pkgcore-9999
+2012030639 metadata/md5-cache/sys-apps/policycoreutils-3.1-r1
+2012011340 metadata/md5-cache/sys-apps/portage-2.3.99-r2
+2012011340 metadata/md5-cache/sys-apps/portage-3.0.10-r1
+2012021209 metadata/md5-cache/sys-apps/portage-3.0.11-r1
+2012011340 metadata/md5-cache/sys-apps/portage-3.0.4-r1
+2012011340 metadata/md5-cache/sys-apps/portage-3.0.8
+2012011340 metadata/md5-cache/sys-apps/portage-3.0.9
+2012011340 metadata/md5-cache/sys-apps/portage-9999
+2012030639 metadata/md5-cache/sys-apps/restorecond-3.1
+2012030639 metadata/md5-cache/sys-apps/secilc-3.1
+2012030639 metadata/md5-cache/sys-apps/selinux-python-3.1-r1
+2012030639 metadata/md5-cache/sys-apps/semodule-utils-3.1
+2012020009 metadata/md5-cache/sys-apps/smcipmitool-2.24.0.201007-r1
+2012022239 metadata/md5-cache/sys-apps/systemd-tmpfiles-246
+2012030209 metadata/md5-cache/sys-apps/usbutils-013
+2012021739 metadata/md5-cache/sys-apps/util-linux-2.35.2
 1802112038 metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
 2009131039 metadata/md5-cache/sys-auth/nss-myhostname-0.3-r1
 2009141809 metadata/md5-cache/sys-auth/docker_auth-1.5.0
@@ -57533,7 +57464,6 @@
 2011172009 metadata/md5-cache/sys-auth/pam_mount-2.16-r3
 2011252124 metadata/md5-cache/sys-auth/AusweisApp2-1.20.2
 2011252124 metadata/md5-cache/sys-auth/AusweisApp2-9999
-2011252124 metadata/md5-cache/sys-auth/Manifest.gz
 2011252124 metadata/md5-cache/sys-auth/authenticator-0.2.4-r1
 2011252124 metadata/md5-cache/sys-auth/authenticator-9999
 2011252124 metadata/md5-cache/sys-auth/elogind-243.7
@@ -57547,10 +57477,6 @@
 2011252124 metadata/md5-cache/sys-auth/google-authenticator-wrappers-1
 2011252124 metadata/md5-cache/sys-auth/google-authenticator-wrappers-2
 2011252124 metadata/md5-cache/sys-auth/google-authenticator-wrappers-3
-2011252124 metadata/md5-cache/sys-auth/keystone-17.0.0
-2011252124 metadata/md5-cache/sys-auth/keystone-18.0.0
-2011252124 metadata/md5-cache/sys-auth/keystone-2020.1.9999
-2011252124 metadata/md5-cache/sys-auth/keystone-2020.2.9999
 2011252124 metadata/md5-cache/sys-auth/libfprint-0.99.0
 2011252124 metadata/md5-cache/sys-auth/libfprint-1.0
 2011252124 metadata/md5-cache/sys-auth/libfprint-1.90.0
@@ -57567,7 +57493,6 @@
 2011252124 metadata/md5-cache/sys-auth/nss-mdns-0.14.1
 2011252124 metadata/md5-cache/sys-auth/nss-mdns-9999
 2011252124 metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r2
-2011252124 metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r3
 2011252124 metadata/md5-cache/sys-auth/nss_ldap-265-r5
 2011252124 metadata/md5-cache/sys-auth/oath-toolkit-2.6.1
 2011252124 metadata/md5-cache/sys-auth/oath-toolkit-2.6.2
@@ -57604,8 +57529,6 @@
 2011252124 metadata/md5-cache/sys-auth/seatd-0.4.0
 2011252124 metadata/md5-cache/sys-auth/seatd-9999
 2011252124 metadata/md5-cache/sys-auth/skey-1.1.5-r11
-2011252124 metadata/md5-cache/sys-auth/solo-python-0.0.26
-2011252124 metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.2
 2011252124 metadata/md5-cache/sys-auth/sssd-2.2.0-r1
 2011252124 metadata/md5-cache/sys-auth/sssd-2.3.1-r2
 2011252124 metadata/md5-cache/sys-auth/sssd-2.4.0
@@ -57615,6 +57538,15 @@
 2011252124 metadata/md5-cache/sys-auth/ykpers-1.20.0
 2011252124 metadata/md5-cache/sys-auth/yubico-piv-tool-2.1.1-r2
 2011252124 metadata/md5-cache/sys-auth/yubikey-personalization-gui-3.1.25
+2012030039 metadata/md5-cache/sys-auth/AusweisApp2-1.22.0
+2012030039 metadata/md5-cache/sys-auth/Manifest.gz
+2012011340 metadata/md5-cache/sys-auth/keystone-17.0.0
+2012011340 metadata/md5-cache/sys-auth/keystone-18.0.0
+2012011340 metadata/md5-cache/sys-auth/keystone-2020.1.9999
+2012011340 metadata/md5-cache/sys-auth/keystone-2020.2.9999
+2012022009 metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r3
+2012011340 metadata/md5-cache/sys-auth/solo-python-0.0.26
+2012011340 metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.2
 1910191339 metadata/md5-cache/sys-block/devio-1.2
 1911072009 metadata/md5-cache/sys-block/endpoint-0.1.0-r1
 1702282333 metadata/md5-cache/sys-block/flashbench-20120606
@@ -57653,7 +57585,6 @@
 2010262039 metadata/md5-cache/sys-block/zram-init-10.5
 2010262039 metadata/md5-cache/sys-block/zram-init-9999
 2010272109 metadata/md5-cache/sys-block/lsiutil-1.62-r3
-2011252124 metadata/md5-cache/sys-block/Manifest.gz
 2011252124 metadata/md5-cache/sys-block/aoetools-36
 2011252124 metadata/md5-cache/sys-block/aoetools-37
 2011252124 metadata/md5-cache/sys-block/arcconf-2.01.22270-r1
@@ -57678,7 +57609,6 @@
 2011252124 metadata/md5-cache/sys-block/fio-3.7
 2011252124 metadata/md5-cache/sys-block/fwdl-1.2.3
 2011252124 metadata/md5-cache/sys-block/gpart-0.3
-2011252124 metadata/md5-cache/sys-block/gparted-1.1.0
 2011252124 metadata/md5-cache/sys-block/hpacucli-9.30.15.0
 2011252124 metadata/md5-cache/sys-block/hpacucli-9.40.12.0
 2011252124 metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1
@@ -57712,10 +57642,8 @@
 2011252124 metadata/md5-cache/sys-block/scsirastools-1.6.4
 2011252124 metadata/md5-cache/sys-block/sedutil-1.15
 2011252124 metadata/md5-cache/sys-block/sedutil-1.15.1
-2011252124 metadata/md5-cache/sys-block/seekwatcher-0.13
 2011252124 metadata/md5-cache/sys-block/smp_utils-0.99
 2011252124 metadata/md5-cache/sys-block/storcli-7.1410
-2011252124 metadata/md5-cache/sys-block/targetcli-fb-2.1.53
 2011252124 metadata/md5-cache/sys-block/tgt-1.0.78
 2011252124 metadata/md5-cache/sys-block/tgt-1.0.79
 2011252124 metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.0
@@ -57729,6 +57657,10 @@
 2011252124 metadata/md5-cache/sys-block/whdd-9999
 2011252124 metadata/md5-cache/sys-block/zram-init-8.1
 2011252124 metadata/md5-cache/sys-block/zram-init-8.1-r1
+2012030239 metadata/md5-cache/sys-block/Manifest.gz
+2012030239 metadata/md5-cache/sys-block/gparted-1.1.0
+2012011340 metadata/md5-cache/sys-block/seekwatcher-0.13
+2012011340 metadata/md5-cache/sys-block/targetcli-fb-2.1.53
 1907151840 metadata/md5-cache/sys-boot/bootcreator-1.1
 1907151840 metadata/md5-cache/sys-boot/bootcreator-1.2
 1911100139 metadata/md5-cache/sys-boot/makebootfat-1.4
@@ -57740,7 +57672,6 @@
 2010150109 metadata/md5-cache/sys-boot/yaboot-static-1.3.17-r2
 2011230809 metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20201022
 2011230809 metadata/md5-cache/sys-boot/raspberrypi-firmware-9999
-2011252124 metadata/md5-cache/sys-boot/Manifest.gz
 2011252124 metadata/md5-cache/sys-boot/aboot-1.0_pre20040408-r3
 2011252124 metadata/md5-cache/sys-boot/arcload-0.50-r3
 2011252124 metadata/md5-cache/sys-boot/colo-1.22
@@ -57779,7 +57710,6 @@
 2011252124 metadata/md5-cache/sys-boot/silo-1.4.14_p20170829
 2011252124 metadata/md5-cache/sys-boot/silo-1.4.14_p20200602
 2011252124 metadata/md5-cache/sys-boot/syslinux-6.04_pre1
-2011252124 metadata/md5-cache/sys-boot/syslinux-6.04_pre1-r2
 2011252124 metadata/md5-cache/sys-boot/systemd-boot-245
 2011252124 metadata/md5-cache/sys-boot/tboot-1.9.11
 2011252124 metadata/md5-cache/sys-boot/unetbootin-700
@@ -57787,6 +57717,8 @@
 2011252124 metadata/md5-cache/sys-boot/vboot-utils-80_p20200108
 2011252124 metadata/md5-cache/sys-boot/woeusb-3.3.1
 2011252124 metadata/md5-cache/sys-boot/yaboot-1.3.17-r4
+2012020639 metadata/md5-cache/sys-boot/Manifest.gz
+2012020639 metadata/md5-cache/sys-boot/syslinux-6.04_pre1-r2
 1905311709 metadata/md5-cache/sys-cluster/ganglia-web-3.7.3-r1
 1712240039 metadata/md5-cache/sys-cluster/native-mpi-0
 1911101439 metadata/md5-cache/sys-cluster/onesis-2.0.2
@@ -57836,21 +57768,15 @@
 2011230539 metadata/md5-cache/sys-cluster/kube-scheduler-1.18.12
 2011230539 metadata/md5-cache/sys-cluster/kube-scheduler-1.19.4
 2011252124 metadata/md5-cache/sys-cluster/ampi-0_pre20140616
-2011252124 metadata/md5-cache/sys-cluster/ceph-14.2.13
 2011252124 metadata/md5-cache/sys-cluster/charliecloud-0.19
 2011252124 metadata/md5-cache/sys-cluster/charliecloud-0.20
 2011252124 metadata/md5-cache/sys-cluster/charliecloud-9999
 2011252124 metadata/md5-cache/sys-cluster/charm-6.8.2
 2011252124 metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1
-2011252124 metadata/md5-cache/sys-cluster/cinder-16.2.0
-2011252124 metadata/md5-cache/sys-cluster/cinder-17.0.0
-2011252124 metadata/md5-cache/sys-cluster/cinder-2020.1.9999
-2011252124 metadata/md5-cache/sys-cluster/cinder-2020.2.9999
 2011252124 metadata/md5-cache/sys-cluster/classads-1.0.10
 2011252124 metadata/md5-cache/sys-cluster/cluster-glue-1.0.11
 2011252124 metadata/md5-cache/sys-cluster/cluster-glue-1.0.12
 2011252124 metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1
-2011252124 metadata/md5-cache/sys-cluster/corosync-2.3.5
 2011252124 metadata/md5-cache/sys-cluster/corosync-2.4.5
 2011252124 metadata/md5-cache/sys-cluster/corosync-3.1.0
 2011252124 metadata/md5-cache/sys-cluster/crmsh-3.0.3
@@ -57866,7 +57792,6 @@
 2011252124 metadata/md5-cache/sys-cluster/galera-26.4.3
 2011252124 metadata/md5-cache/sys-cluster/galera-26.4.4
 2011252124 metadata/md5-cache/sys-cluster/galera-26.4.5
-2011252124 metadata/md5-cache/sys-cluster/ganglia-3.7.1-r1
 2011252124 metadata/md5-cache/sys-cluster/ganglia-3.7.1-r2
 2011252124 metadata/md5-cache/sys-cluster/gasnet-1.26.4
 2011252124 metadata/md5-cache/sys-cluster/gasnet-1.26.4-r1
@@ -57876,10 +57801,6 @@
 2011252124 metadata/md5-cache/sys-cluster/glusterfs-7.7
 2011252124 metadata/md5-cache/sys-cluster/glusterfs-7.8-r1
 2011252124 metadata/md5-cache/sys-cluster/glusterfs-9999
-2011252124 metadata/md5-cache/sys-cluster/heat-14.1.0
-2011252124 metadata/md5-cache/sys-cluster/heat-15.0.0
-2011252124 metadata/md5-cache/sys-cluster/heat-2020.1.9999
-2011252124 metadata/md5-cache/sys-cluster/heat-2020.2.9999
 2011252124 metadata/md5-cache/sys-cluster/hpl-2.0-r4
 2011252124 metadata/md5-cache/sys-cluster/hpl-2.3
 2011252124 metadata/md5-cache/sys-cluster/hpx-1.5.1
@@ -57939,20 +57860,10 @@
 2011252124 metadata/md5-cache/sys-cluster/mpich-3.0.4
 2011252124 metadata/md5-cache/sys-cluster/mpich-3.3-r1
 2011252124 metadata/md5-cache/sys-cluster/mpich2-1.5
-2011252124 metadata/md5-cache/sys-cluster/neutron-16.2.0
-2011252124 metadata/md5-cache/sys-cluster/neutron-17.0.0
-2011252124 metadata/md5-cache/sys-cluster/neutron-2020.1.9999
-2011252124 metadata/md5-cache/sys-cluster/neutron-2020.2.9999
 2011252124 metadata/md5-cache/sys-cluster/nomad-0.12.3
 2011252124 metadata/md5-cache/sys-cluster/nomad-0.12.4
 2011252124 metadata/md5-cache/sys-cluster/nomad-0.12.5
 2011252124 metadata/md5-cache/sys-cluster/nomad-0.12.8
-2011252124 metadata/md5-cache/sys-cluster/nova-2020.1.9999
-2011252124 metadata/md5-cache/sys-cluster/nova-2020.2.9999
-2011252124 metadata/md5-cache/sys-cluster/nova-21.1.0
-2011252124 metadata/md5-cache/sys-cluster/nova-21.1.1
-2011252124 metadata/md5-cache/sys-cluster/nova-22.0.0
-2011252124 metadata/md5-cache/sys-cluster/nova-22.0.1
 2011252124 metadata/md5-cache/sys-cluster/nullmpi-0.7
 2011252124 metadata/md5-cache/sys-cluster/openmpi-1.10.7
 2011252124 metadata/md5-cache/sys-cluster/openmpi-1.4.5
@@ -57973,10 +57884,6 @@
 2011252124 metadata/md5-cache/sys-cluster/pacemaker-2.0.4
 2011252124 metadata/md5-cache/sys-cluster/pacemaker-2.0.5_rc3
 2011252124 metadata/md5-cache/sys-cluster/pconsole-1.0-r4
-2011252124 metadata/md5-cache/sys-cluster/placement-2020.1.9999
-2011252124 metadata/md5-cache/sys-cluster/placement-2020.2.9999
-2011252124 metadata/md5-cache/sys-cluster/placement-3.0.0
-2011252124 metadata/md5-cache/sys-cluster/placement-4.0.0
 2011252124 metadata/md5-cache/sys-cluster/ploop-1.14.1
 2011252124 metadata/md5-cache/sys-cluster/projections-6.2.1
 2011252124 metadata/md5-cache/sys-cluster/rdma-core-30.0-r2
@@ -57987,14 +57894,7 @@
 2011252124 metadata/md5-cache/sys-cluster/resource-agents-4.0.1
 2011252124 metadata/md5-cache/sys-cluster/resource-agents-4.6.1
 2011252124 metadata/md5-cache/sys-cluster/sanlock-3.6.0
-2011252124 metadata/md5-cache/sys-cluster/sanlock-3.8.2
 2011252124 metadata/md5-cache/sys-cluster/singularity-3.6.4
-2011252124 metadata/md5-cache/sys-cluster/slurm-20.02.4.1
-2011252124 metadata/md5-cache/sys-cluster/slurm-20.02.5.1
-2011252124 metadata/md5-cache/sys-cluster/swift-2.25.1
-2011252124 metadata/md5-cache/sys-cluster/swift-2.26.0
-2011252124 metadata/md5-cache/sys-cluster/swift-2020.1.9999
-2011252124 metadata/md5-cache/sys-cluster/swift-2020.2.9999
 2011252124 metadata/md5-cache/sys-cluster/teleport-4.0.10
 2011252124 metadata/md5-cache/sys-cluster/teleport-4.0.9
 2011252124 metadata/md5-cache/sys-cluster/teleport-4.1.1
@@ -58007,15 +57907,46 @@
 2011252124 metadata/md5-cache/sys-cluster/vzctl-4.9.4
 2011252124 metadata/md5-cache/sys-cluster/wulfware-2.6.0
 2011252124 metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13-r1
-2011262039 metadata/md5-cache/sys-cluster/ceph-14.2.15
 2011261909 metadata/md5-cache/sys-cluster/spark-bin-2.4.3
 2011261909 metadata/md5-cache/sys-cluster/spark-bin-2.4.7-r1
 2011261909 metadata/md5-cache/sys-cluster/spark-bin-3.0.1-r2
 2011272239 metadata/md5-cache/sys-cluster/singularity-3.7.0
 2011281239 metadata/md5-cache/sys-cluster/galera-26.4.6
-2012010639 metadata/md5-cache/sys-cluster/Manifest.gz
-2012010539 metadata/md5-cache/sys-cluster/ceph-14.2.11-r1
-2012010639 metadata/md5-cache/sys-cluster/ceph-15.2.7
+2012030739 metadata/md5-cache/sys-cluster/Manifest.gz
+2012011340 metadata/md5-cache/sys-cluster/ceph-14.2.11-r1
+2012011340 metadata/md5-cache/sys-cluster/ceph-14.2.13
+2012011340 metadata/md5-cache/sys-cluster/ceph-14.2.15
+2012011340 metadata/md5-cache/sys-cluster/ceph-15.2.7
+2012011340 metadata/md5-cache/sys-cluster/cinder-16.2.0
+2012011340 metadata/md5-cache/sys-cluster/cinder-17.0.0
+2012011340 metadata/md5-cache/sys-cluster/cinder-2020.1.9999
+2012011340 metadata/md5-cache/sys-cluster/cinder-2020.2.9999
+2012020109 metadata/md5-cache/sys-cluster/corosync-2.3.5
+2012011340 metadata/md5-cache/sys-cluster/ganglia-3.7.1-r1
+2012011340 metadata/md5-cache/sys-cluster/heat-14.1.0
+2012011340 metadata/md5-cache/sys-cluster/heat-15.0.0
+2012011340 metadata/md5-cache/sys-cluster/heat-2020.1.9999
+2012011340 metadata/md5-cache/sys-cluster/heat-2020.2.9999
+2012011340 metadata/md5-cache/sys-cluster/neutron-16.2.0
+2012011340 metadata/md5-cache/sys-cluster/neutron-17.0.0
+2012011340 metadata/md5-cache/sys-cluster/neutron-2020.1.9999
+2012011340 metadata/md5-cache/sys-cluster/neutron-2020.2.9999
+2012011340 metadata/md5-cache/sys-cluster/nova-2020.1.9999
+2012011340 metadata/md5-cache/sys-cluster/nova-2020.2.9999
+2012011340 metadata/md5-cache/sys-cluster/nova-21.1.0
+2012011340 metadata/md5-cache/sys-cluster/nova-21.1.1
+2012011340 metadata/md5-cache/sys-cluster/nova-22.0.0
+2012011340 metadata/md5-cache/sys-cluster/nova-22.0.1
+2012011340 metadata/md5-cache/sys-cluster/placement-2020.1.9999
+2012011340 metadata/md5-cache/sys-cluster/placement-2020.2.9999
+2012011340 metadata/md5-cache/sys-cluster/placement-3.0.0
+2012030239 metadata/md5-cache/sys-cluster/placement-4.0.0
+2012030739 metadata/md5-cache/sys-cluster/sanlock-3.8.2
+2012011539 metadata/md5-cache/sys-cluster/slurm-20.11.0.1
+2012011340 metadata/md5-cache/sys-cluster/swift-2.25.1
+2012011340 metadata/md5-cache/sys-cluster/swift-2.26.0
+2012011340 metadata/md5-cache/sys-cluster/swift-2020.1.9999
+2012011340 metadata/md5-cache/sys-cluster/swift-2020.2.9999
 1910071309 metadata/md5-cache/sys-devel/cons-2.3.0
 1901180209 metadata/md5-cache/sys-devel/slibtool-0.5.28
 1910271939 metadata/md5-cache/sys-devel/ucpp-1.3.4
@@ -58060,12 +57991,10 @@
 2010262009 metadata/md5-cache/sys-devel/llvm-common-10.0.1
 2010262009 metadata/md5-cache/sys-devel/llvm-common-9.0.1
 2011061444 metadata/md5-cache/sys-devel/icecream-1.0.0-r2
-2011111939 metadata/md5-cache/sys-devel/autoconf-2.70_beta3-r1
 2011172339 metadata/md5-cache/sys-devel/llvm-common-11.0.0
 2011172339 metadata/md5-cache/sys-devel/llvmgold-11
 2011230039 metadata/md5-cache/sys-devel/crossdev-20201122
 2011252124 metadata/md5-cache/sys-devel/autoconf-wrapper-13-r1
-2011252124 metadata/md5-cache/sys-devel/autoconf-wrapper-14_pre2
 2011252124 metadata/md5-cache/sys-devel/autogen-5.18.16-r1
 2011252124 metadata/md5-cache/sys-devel/automake-1.16.1-r2
 2011252124 metadata/md5-cache/sys-devel/automake-1.16.2-r1
@@ -58158,7 +58087,6 @@
 2011252124 metadata/md5-cache/sys-devel/parity-9999
 2011252124 metadata/md5-cache/sys-devel/patch-2.7.6-r4
 2011252124 metadata/md5-cache/sys-devel/pmake-1.111.3.3
-2011252124 metadata/md5-cache/sys-devel/prelink-20151030-r1
 2011252124 metadata/md5-cache/sys-devel/prelink-99999999
 2011252124 metadata/md5-cache/sys-devel/qconf-2.5
 2011252124 metadata/md5-cache/sys-devel/rust-std-1.46.0
@@ -58170,7 +58098,6 @@
 2011252124 metadata/md5-cache/sys-devel/sparse-9999
 2011262009 metadata/md5-cache/sys-devel/native-cctools-5
 2011271839 metadata/md5-cache/sys-devel/binutils-apple-11.3.1
-2011271939 metadata/md5-cache/sys-devel/bison-3.7.3
 2011271939 metadata/md5-cache/sys-devel/gdb-10.1
 2011271409 metadata/md5-cache/sys-devel/gdb-9999
 2011291209 metadata/md5-cache/sys-devel/lld-12.0.0.9999
@@ -58197,9 +58124,14 @@
 2011291239 metadata/md5-cache/sys-devel/llvm-9.0.1
 2011291409 metadata/md5-cache/sys-devel/llvm-common-11.0.1.9999
 2011291409 metadata/md5-cache/sys-devel/llvm-common-11.0.1_rc1
-2012010009 metadata/md5-cache/sys-devel/Manifest.gz
 2012010009 metadata/md5-cache/sys-devel/bmake-20201117
 2011302039 metadata/md5-cache/sys-devel/rust-std-1.48.0
+2012031009 metadata/md5-cache/sys-devel/Manifest.gz
+2012020009 metadata/md5-cache/sys-devel/autoconf-2.70_beta4
+2012012039 metadata/md5-cache/sys-devel/autoconf-wrapper-14_pre3
+2012031009 metadata/md5-cache/sys-devel/bison-3.7.3
+2012030239 metadata/md5-cache/sys-devel/prelink-20151030-r1
+2012011109 metadata/md5-cache/sys-devel/slibtool-0.5.31
 2011252124 metadata/md5-cache/sys-fabric/dapl-2.0.40
 2011252124 metadata/md5-cache/sys-fabric/ibacm-1.0.8
 2011252124 metadata/md5-cache/sys-fabric/infiniband-diags-1.6.4
@@ -58232,7 +58164,6 @@
 2011290239 metadata/md5-cache/sys-fabric/Manifest.gz
 2011290239 metadata/md5-cache/sys-fabric/infinipath-psm-3.2
 1904182339 metadata/md5-cache/sys-firmware/b43legacy-firmware-3.130.20.0
-1702282333 metadata/md5-cache/sys-firmware/bluez-firmware-1.2
 1905300009 metadata/md5-cache/sys-firmware/firmware-imx-5.4
 1702282333 metadata/md5-cache/sys-firmware/ipw2100-firmware-1.3
 1708061709 metadata/md5-cache/sys-firmware/ipw2200-firmware-3.1
@@ -58277,8 +58208,9 @@
 2011252124 metadata/md5-cache/sys-firmware/seabios-1.12.0
 2011252124 metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1
 2011252124 metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-9999
-2011260809 metadata/md5-cache/sys-firmware/Manifest.gz
 2011260809 metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20190114.1_p9
+2012030239 metadata/md5-cache/sys-firmware/Manifest.gz
+2012030239 metadata/md5-cache/sys-firmware/bluez-firmware-1.2
 1812311909 metadata/md5-cache/sys-fs/aufs-headers-4.14_p20180709
 1907071039 metadata/md5-cache/sys-fs/aufs-headers-4.14_p20190603
 1805272138 metadata/md5-cache/sys-fs/autorun-3.17
@@ -58329,7 +58261,6 @@
 2009141809 metadata/md5-cache/sys-fs/go-mtpfs-1.0.0
 2009272039 metadata/md5-cache/sys-fs/bindfs-1.14.8
 2010071009 metadata/md5-cache/sys-fs/udev-init-scripts-34
-2010280739 metadata/md5-cache/sys-fs/mtd-utils-2.1.2
 2011061540 metadata/md5-cache/sys-fs/aufs-headers-4.1_p20170130
 2011101809 metadata/md5-cache/sys-fs/bashmount-4.3.2
 2011172009 metadata/md5-cache/sys-fs/ldapfuse-1.0-r3
@@ -58379,7 +58310,6 @@
 2011252124 metadata/md5-cache/sys-fs/dmg2img-1.6.7-r1
 2011252124 metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r3
 2011252124 metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r4
-2011252124 metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
 2011252124 metadata/md5-cache/sys-fs/dosfstools-4.1
 2011252124 metadata/md5-cache/sys-fs/duperemove-0.11.1
 2011252124 metadata/md5-cache/sys-fs/duperemove-0.11.2
@@ -58423,7 +58353,6 @@
 2011252124 metadata/md5-cache/sys-fs/iprutils-2.4.18.1
 2011252124 metadata/md5-cache/sys-fs/iprutils-2.4.7
 2011252124 metadata/md5-cache/sys-fs/jdiskreport-bin-1.4.1
-2011252124 metadata/md5-cache/sys-fs/jfsutils-1.1.15-r1
 2011252124 metadata/md5-cache/sys-fs/jmtpfs-0.5-r1
 2011252124 metadata/md5-cache/sys-fs/libeatmydata-105-r2
 2011252124 metadata/md5-cache/sys-fs/loop-aes-3.7n-r1
@@ -58459,10 +58388,8 @@
 2011252124 metadata/md5-cache/sys-fs/rar2fs-1.29.1
 2011252124 metadata/md5-cache/sys-fs/reiser4progs-1.2.1
 2011252124 metadata/md5-cache/sys-fs/reiser4progs-2.0.2
-2011252124 metadata/md5-cache/sys-fs/reiser4progs-2.0.3
 2011252124 metadata/md5-cache/sys-fs/reiserfs-defrag-0.2.2
 2011252124 metadata/md5-cache/sys-fs/reiserfsprogs-3.6.25
-2011252124 metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27
 2011252124 metadata/md5-cache/sys-fs/shake-1.0
 2011252124 metadata/md5-cache/sys-fs/simple-mtpfs-0.4.0
 2011252124 metadata/md5-cache/sys-fs/snapraid-11.4
@@ -58481,10 +58408,6 @@
 2011252124 metadata/md5-cache/sys-fs/udev-246-r1
 2011252124 metadata/md5-cache/sys-fs/udev-9999
 2011252124 metadata/md5-cache/sys-fs/udftools-2.1
-2011252124 metadata/md5-cache/sys-fs/udftools-2.2
-2011252124 metadata/md5-cache/sys-fs/udiskie-2.1.0
-2011252124 metadata/md5-cache/sys-fs/udiskie-2.1.1
-2011252124 metadata/md5-cache/sys-fs/udiskie-2.2.0
 2011252124 metadata/md5-cache/sys-fs/udisks-2.9.0
 2011252124 metadata/md5-cache/sys-fs/udisks-2.9.1
 2011252124 metadata/md5-cache/sys-fs/unionfs-fuse-2.1
@@ -58499,21 +58422,28 @@
 2011252124 metadata/md5-cache/sys-fs/xfsprogs-5.8.0
 2011252124 metadata/md5-cache/sys-fs/xfsprogs-5.9.0
 2011252124 metadata/md5-cache/sys-fs/yaffs2utils-0.2.9
-2011252124 metadata/md5-cache/sys-fs/zerofree-1.1.1
-2011252124 metadata/md5-cache/sys-fs/zfs-0.8.5
-2011252124 metadata/md5-cache/sys-fs/zfs-2.0.0_rc6
-2011252212 metadata/md5-cache/sys-fs/zfs-2.0.0_rc7
-2011252212 metadata/md5-cache/sys-fs/zfs-9999
 2011252124 metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4-r1
 2011252124 metadata/md5-cache/sys-fs/zfs-auto-snapshot-9999
 2011252124 metadata/md5-cache/sys-fs/zfs-kmod-0.8.5
-2011252124 metadata/md5-cache/sys-fs/zfs-kmod-2.0.0_rc6
-2011252212 metadata/md5-cache/sys-fs/zfs-kmod-2.0.0_rc7
 2011252124 metadata/md5-cache/sys-fs/zfs-kmod-9999
 2011281009 metadata/md5-cache/sys-fs/sandboxfs-0.2.0
-2011282339 metadata/md5-cache/sys-fs/Manifest.gz
 2011282339 metadata/md5-cache/sys-fs/fuse-overlayfs-1.3.0
-2011281939 metadata/md5-cache/sys-fs/mtools-4.0.26
+2012031009 metadata/md5-cache/sys-fs/Manifest.gz
+2012030239 metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
+2012030239 metadata/md5-cache/sys-fs/jfsutils-1.1.15-r1
+2012031009 metadata/md5-cache/sys-fs/mtd-utils-2.1.2
+2012030239 metadata/md5-cache/sys-fs/mtools-4.0.26
+2012030239 metadata/md5-cache/sys-fs/reiser4progs-2.0.3
+2012030239 metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27
+2012030239 metadata/md5-cache/sys-fs/udftools-2.2
+2012011340 metadata/md5-cache/sys-fs/udiskie-2.1.0
+2012011340 metadata/md5-cache/sys-fs/udiskie-2.1.1
+2012011340 metadata/md5-cache/sys-fs/udiskie-2.2.0
+2012030239 metadata/md5-cache/sys-fs/zerofree-1.1.1
+2012011340 metadata/md5-cache/sys-fs/zfs-0.8.5
+2012012209 metadata/md5-cache/sys-fs/zfs-2.0.0
+2012011340 metadata/md5-cache/sys-fs/zfs-9999
+2012012209 metadata/md5-cache/sys-fs/zfs-kmod-2.0.0
 1912251739 metadata/md5-cache/sys-kernel/xnu-headers-3789.70.16-r5
 1912251739 metadata/md5-cache/sys-kernel/xnu-headers-4570.71.2-r5
 1912251739 metadata/md5-cache/sys-kernel/xnu-headers-4903.241.1-r5
@@ -58652,7 +58582,6 @@
 2011252124 metadata/md5-cache/sys-kernel/git-sources-5.10_rc3
 2011252124 metadata/md5-cache/sys-kernel/git-sources-5.10_rc4
 2011252124 metadata/md5-cache/sys-kernel/git-sources-5.10_rc5
-2011252124 metadata/md5-cache/sys-kernel/kergen-0.1.5
 2011252124 metadata/md5-cache/sys-kernel/kpatch-0.6.3-r1
 2011252124 metadata/md5-cache/sys-kernel/kpatch-0.7.1-r1
 2011252124 metadata/md5-cache/sys-kernel/kpatch-9999
@@ -58702,14 +58631,7 @@
 2011252124 metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.11
 2011252124 metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.8
 2011252124 metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.9
-2011252124 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.209
-2011252124 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.160
-2011252124 metadata/md5-cache/sys-kernel/vanilla-sources-4.4.246
-2011252124 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.246
-2011252124 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.80
-2011252124 metadata/md5-cache/sys-kernel/vanilla-sources-5.9.11
 2011252124 metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
-2011252124 metadata/md5-cache/sys-kernel/zen-sources-5.9.10
 2011260809 metadata/md5-cache/sys-kernel/linux-firmware-20201022-r3
 2011262309 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.80
 2011262039 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.80-r1
@@ -58721,9 +58643,30 @@
 2011281239 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.246
 2011281239 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.246
 2011281239 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.80-r1
-2011300509 metadata/md5-cache/sys-kernel/Manifest.gz
 2011300509 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.80-r3
 2011300509 metadata/md5-cache/sys-kernel/git-sources-5.10_rc6
+2012022339 metadata/md5-cache/sys-kernel/Manifest.gz
+2012022339 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.81
+2012022339 metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.12
+2012022339 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.81
+2012022339 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.12
+2012021739 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.210
+2012021739 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.161
+2012021739 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.247
+2012021739 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.247
+2012021739 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.81
+2012021739 metadata/md5-cache/sys-kernel/gentoo-sources-5.9.12
+2012011340 metadata/md5-cache/sys-kernel/kergen-0.1.5
+2012022109 metadata/md5-cache/sys-kernel/pf-sources-5.9_p6
+2012022339 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.81
+2012022339 metadata/md5-cache/sys-kernel/vanilla-kernel-5.9.12
+2012021609 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.210
+2012021609 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.161
+2012021609 metadata/md5-cache/sys-kernel/vanilla-sources-4.4.247
+2012021609 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.247
+2012021609 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.81
+2012021609 metadata/md5-cache/sys-kernel/vanilla-sources-5.9.12
+2012020409 metadata/md5-cache/sys-kernel/zen-sources-5.9.11
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.6
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.7
 1908101709 metadata/md5-cache/sys-libs/libservicelog-1.1.18
@@ -58752,8 +58695,6 @@
 2011252124 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1
 2011252124 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0
 2011252124 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9.0.1
-2011252124 metadata/md5-cache/sys-libs/cracklib-2.9.6-r2
-2011252124 metadata/md5-cache/sys-libs/cracklib-2.9.7
 2011252124 metadata/md5-cache/sys-libs/csu-85-r1
 2011252124 metadata/md5-cache/sys-libs/cygwin-crypt-1.4
 2011252124 metadata/md5-cache/sys-libs/db-1.85-r4
@@ -58801,9 +58742,6 @@
 2011252124 metadata/md5-cache/sys-libs/ldb-2.1.4-r1
 2011252124 metadata/md5-cache/sys-libs/ldb-2.2.0-r1
 2011252124 metadata/md5-cache/sys-libs/libaal-1.0.7-r1
-2011252124 metadata/md5-cache/sys-libs/libaal-1.0.7-r2
-2011252124 metadata/md5-cache/sys-libs/libapparmor-2.13.4
-2011252124 metadata/md5-cache/sys-libs/libapparmor-3.0.0
 2011252124 metadata/md5-cache/sys-libs/libavc1394-0.5.4-r2
 2011252124 metadata/md5-cache/sys-libs/libblockdev-2.24
 2011252124 metadata/md5-cache/sys-libs/libblockdev-9999
@@ -58839,20 +58777,15 @@
 2011252124 metadata/md5-cache/sys-libs/librtas-2.0.2-r1
 2011252124 metadata/md5-cache/sys-libs/libseccomp-2.4.3
 2011252124 metadata/md5-cache/sys-libs/libseccomp-2.4.4
-2011252124 metadata/md5-cache/sys-libs/libseccomp-2.5.0
-2011252124 metadata/md5-cache/sys-libs/libseccomp-9999
 2011252124 metadata/md5-cache/sys-libs/libselinux-2.9-r1
 2011252124 metadata/md5-cache/sys-libs/libselinux-3.0
-2011252124 metadata/md5-cache/sys-libs/libselinux-3.1-r1
 2011252124 metadata/md5-cache/sys-libs/libselinux-9999
 2011252124 metadata/md5-cache/sys-libs/libsemanage-2.9
 2011252124 metadata/md5-cache/sys-libs/libsemanage-3.0
 2011252124 metadata/md5-cache/sys-libs/libsemanage-3.0-r1
-2011252124 metadata/md5-cache/sys-libs/libsemanage-3.1-r1
 2011252124 metadata/md5-cache/sys-libs/libsemanage-9999
 2011252124 metadata/md5-cache/sys-libs/libsepol-2.9
 2011252124 metadata/md5-cache/sys-libs/libsepol-3.0
-2011252124 metadata/md5-cache/sys-libs/libsepol-3.1
 2011252124 metadata/md5-cache/sys-libs/libsepol-9999
 2011252124 metadata/md5-cache/sys-libs/libstatgrab-0.91
 2011252124 metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r2
@@ -58887,7 +58820,6 @@
 2011252124 metadata/md5-cache/sys-libs/newlib-3.3.0-r1
 2011252124 metadata/md5-cache/sys-libs/newlib-4.0.0
 2011252124 metadata/md5-cache/sys-libs/newlib-9999
-2011252124 metadata/md5-cache/sys-libs/nss_wrapper-1.1.10
 2011252124 metadata/md5-cache/sys-libs/nss_wrapper-1.1.6
 2011252124 metadata/md5-cache/sys-libs/obstack-standalone-1.1
 2011252124 metadata/md5-cache/sys-libs/openipmi-2.0.29
@@ -58913,7 +58845,6 @@
 2011252124 metadata/md5-cache/sys-libs/uclibc-ng-1.0.35
 2011252124 metadata/md5-cache/sys-libs/uclibc-ng-9999
 2011252124 metadata/md5-cache/sys-libs/uid_wrapper-1.2.7
-2011252124 metadata/md5-cache/sys-libs/uid_wrapper-1.2.8
 2011252124 metadata/md5-cache/sys-libs/zlib-1.2.11-r2
 2011252124 metadata/md5-cache/sys-libs/zlib-1.2.11-r3
 2011280309 metadata/md5-cache/sys-libs/ncurses-6.2-r1
@@ -58934,22 +58865,33 @@
 2011291409 metadata/md5-cache/sys-libs/libcxxabi-11.0.1_rc1
 2011291409 metadata/md5-cache/sys-libs/libomp-11.0.1.9999
 2011291409 metadata/md5-cache/sys-libs/libomp-11.0.1_rc1
-2011292339 metadata/md5-cache/sys-libs/libseccomp-2.5.1
 2011291409 metadata/md5-cache/sys-libs/llvm-libunwind-11.0.1.9999
 2011291409 metadata/md5-cache/sys-libs/llvm-libunwind-11.0.1_rc1
-2011292039 metadata/md5-cache/sys-libs/timezone-data-2020d
-2011301809 metadata/md5-cache/sys-libs/Manifest.gz
 2011301239 metadata/md5-cache/sys-libs/binutils-libs-2.35.1-r1
 2011301209 metadata/md5-cache/sys-libs/libsmbios-2.4.3
 2011301739 metadata/md5-cache/sys-libs/musl-1.2.1-r1
 2011301809 metadata/md5-cache/sys-libs/talloc-2.3.1
+2012030639 metadata/md5-cache/sys-libs/Manifest.gz
+2012011340 metadata/md5-cache/sys-libs/cracklib-2.9.6-r2
+2012011340 metadata/md5-cache/sys-libs/cracklib-2.9.7
+2012030239 metadata/md5-cache/sys-libs/libaal-1.0.7-r2
+2012011340 metadata/md5-cache/sys-libs/libapparmor-2.13.4
+2012011340 metadata/md5-cache/sys-libs/libapparmor-3.0.0
+2012011340 metadata/md5-cache/sys-libs/libseccomp-2.5.0
+2012011340 metadata/md5-cache/sys-libs/libseccomp-2.5.1
+2012011340 metadata/md5-cache/sys-libs/libseccomp-9999
+2012030639 metadata/md5-cache/sys-libs/libselinux-3.1-r1
+2012030639 metadata/md5-cache/sys-libs/libsemanage-3.1-r1
+2012030639 metadata/md5-cache/sys-libs/libsepol-3.1
+2012030039 metadata/md5-cache/sys-libs/nss_wrapper-1.1.10
+2012030039 metadata/md5-cache/sys-libs/timezone-data-2020d
+2012030039 metadata/md5-cache/sys-libs/uid_wrapper-1.2.8
 1902071639 metadata/md5-cache/sys-power/acpi-1.7-r1
 1901132309 metadata/md5-cache/sys-power/hibernate-script-2.0-r6
 1907151840 metadata/md5-cache/sys-power/uhubctl-1.8-r1
 2002130739 metadata/md5-cache/sys-power/nvram-reboot-2004.10.03-r1
 2004032241 metadata/md5-cache/sys-power/pm-quirks-20100619-r1
 2009221209 metadata/md5-cache/sys-power/dptfxtract-1.4.3
-2011252124 metadata/md5-cache/sys-power/Manifest.gz
 2011252124 metadata/md5-cache/sys-power/acpi_call-1.1.0-r5
 2011252124 metadata/md5-cache/sys-power/acpi_call-3.17-r2
 2011252124 metadata/md5-cache/sys-power/acpi_call-9999
@@ -58958,7 +58900,6 @@
 2011252124 metadata/md5-cache/sys-power/acpid-2.0.32-r1
 2011252124 metadata/md5-cache/sys-power/acpid-2.0.32-r2
 2011252124 metadata/md5-cache/sys-power/acpilight-1.2
-2011252124 metadata/md5-cache/sys-power/acpilight-1.2-r1
 2011252124 metadata/md5-cache/sys-power/acpitool-0.5.1-r1
 2011252124 metadata/md5-cache/sys-power/apcupsd-3.14.13
 2011252124 metadata/md5-cache/sys-power/apcupsd-3.14.14-r2
@@ -58994,6 +58935,8 @@
 2011252124 metadata/md5-cache/sys-power/tuxedo-cc-wmi-0.1.4-r1
 2011252124 metadata/md5-cache/sys-power/upower-0.99.11
 2011252124 metadata/md5-cache/sys-power/upower-0.99.9-r1
+2012021939 metadata/md5-cache/sys-power/Manifest.gz
+2012021939 metadata/md5-cache/sys-power/acpilight-1.2-r1
 1702282334 metadata/md5-cache/sys-process/tiptop-2.2
 2002112051 metadata/md5-cache/sys-process/supervise-scripts-4.0-r1
 2003261841 metadata/md5-cache/sys-process/psmisc-23.2-r2
@@ -59020,7 +58963,6 @@
 2011252124 metadata/md5-cache/sys-process/audit-2.8.3
 2011252124 metadata/md5-cache/sys-process/audit-2.8.4
 2011252124 metadata/md5-cache/sys-process/audit-2.8.5
-2011252124 metadata/md5-cache/sys-process/audit-2.8.5-r2
 2011252124 metadata/md5-cache/sys-process/bcron-0.11
 2011252124 metadata/md5-cache/sys-process/criu-3.14-r2
 2011252124 metadata/md5-cache/sys-process/criu-3.15
@@ -59039,14 +58981,10 @@
 2011252124 metadata/md5-cache/sys-process/fcron-3.3.0_beta-r1
 2011252124 metadata/md5-cache/sys-process/ftop-1.0
 2011252124 metadata/md5-cache/sys-process/ftop-1.0-r1
-2011252124 metadata/md5-cache/sys-process/glances-3.1.4.1-r1
-2011252124 metadata/md5-cache/sys-process/glances-3.1.5
 2011252124 metadata/md5-cache/sys-process/gnome-usage-3.32.0
 2011252124 metadata/md5-cache/sys-process/htop-2.2.0
 2011252124 metadata/md5-cache/sys-process/htop-3.0.1
-2011252124 metadata/md5-cache/sys-process/htop-3.0.2
 2011252124 metadata/md5-cache/sys-process/incron-0.5.12_p20191114
-2011252124 metadata/md5-cache/sys-process/iotop-0.6
 2011252124 metadata/md5-cache/sys-process/latencytop-0.5-r1
 2011252124 metadata/md5-cache/sys-process/lsof-4.93.2-r1
 2011252124 metadata/md5-cache/sys-process/lsof-4.94.0
@@ -59087,8 +59025,13 @@
 2011252124 metadata/md5-cache/sys-process/usbtop-1.0
 2011252124 metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r1
 2011252124 metadata/md5-cache/sys-process/watchpid-0.1-r2
-2011281209 metadata/md5-cache/sys-process/Manifest.gz
 2011281209 metadata/md5-cache/sys-process/parallel-20201122
+2012030739 metadata/md5-cache/sys-process/Manifest.gz
+2012030639 metadata/md5-cache/sys-process/audit-2.8.5-r2
+2012011340 metadata/md5-cache/sys-process/glances-3.1.4.1-r1
+2012011340 metadata/md5-cache/sys-process/glances-3.1.5
+2012030739 metadata/md5-cache/sys-process/htop-3.0.2
+2012011340 metadata/md5-cache/sys-process/iotop-0.6
 1910111911 metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
 1910111911 metadata/md5-cache/virtual/gnustep-back-0.25.0
 1910111911 metadata/md5-cache/virtual/gnustep-back-0.25.1
@@ -59389,15 +59332,15 @@
 2011252124 metadata/md5-cache/www-apache/mod_vhost_ldap-2.4.0-r1
 2011252124 metadata/md5-cache/www-apache/mod_whatkilledus-2.01
 2011252124 metadata/md5-cache/www-apache/mod_wsgi-4.7.0
-2011252124 metadata/md5-cache/www-apache/mod_wsgi-4.7.1
 2011252124 metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1
 2011252124 metadata/md5-cache/www-apache/passenger-6.0.4
 2011252124 metadata/md5-cache/www-apache/passenger-6.0.5
 2011252124 metadata/md5-cache/www-apache/passenger-6.0.6
 2011252124 metadata/md5-cache/www-apache/passenger-6.0.7
 2011252124 metadata/md5-cache/www-apache/pwauth-2.3.10
-2011271909 metadata/md5-cache/www-apache/Manifest.gz
 2011271909 metadata/md5-cache/www-apache/mod_maxminddb-1.2.0
+2012021739 metadata/md5-cache/www-apache/Manifest.gz
+2012021739 metadata/md5-cache/www-apache/mod_wsgi-4.7.1
 1902211339 metadata/md5-cache/www-apps/dokuwiki-20180422a
 1902211339 metadata/md5-cache/www-apps/dokuwiki-20180422b
 1904250439 metadata/md5-cache/www-apps/icingaweb2-module-director-1.6.2
@@ -59463,8 +59406,6 @@
 2011230039 metadata/md5-cache/www-apps/phpBB-3.3.2
 2011252124 metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
 2011252124 metadata/md5-cache/www-apps/blazeblogger-1.2.0-r1
-2011252124 metadata/md5-cache/www-apps/blohg-0.13-r4
-2011252124 metadata/md5-cache/www-apps/blohg-9999
 2011252124 metadata/md5-cache/www-apps/cgisysinfo-0.4.1
 2011252124 metadata/md5-cache/www-apps/cgit-1.2.1
 2011252124 metadata/md5-cache/www-apps/cgit-1.2.3
@@ -59491,8 +59432,6 @@
 2011252124 metadata/md5-cache/www-apps/kibana-bin-7.8.1
 2011252124 metadata/md5-cache/www-apps/kibana-bin-7.9.2
 2011252124 metadata/md5-cache/www-apps/kibana-bin-7.9.3
-2011252124 metadata/md5-cache/www-apps/klaus-1.5.1
-2011252124 metadata/md5-cache/www-apps/klaus-1.5.2
 2011252124 metadata/md5-cache/www-apps/liquid_feedback_core-2.2.6
 2011252124 metadata/md5-cache/www-apps/liquid_feedback_core-3.0.4
 2011252124 metadata/md5-cache/www-apps/liquid_feedback_frontend-2.2.7
@@ -59508,37 +59447,40 @@
 2011252124 metadata/md5-cache/www-apps/netbox-2.7.2
 2011252124 metadata/md5-cache/www-apps/netbox-2.7.6
 2011252124 metadata/md5-cache/www-apps/netbox-2.7.8
-2011252124 metadata/md5-cache/www-apps/nikola-7.8.15
-2011252124 metadata/md5-cache/www-apps/nikola-7.8.15-r1
-2011252124 metadata/md5-cache/www-apps/nikola-8.0.4
-2011252124 metadata/md5-cache/www-apps/nikola-8.1.0
-2011252124 metadata/md5-cache/www-apps/nikola-8.1.1
-2011252124 metadata/md5-cache/www-apps/nikola-8.1.1-r1
-2011252124 metadata/md5-cache/www-apps/nikola-8.1.2
-2011252124 metadata/md5-cache/www-apps/novnc-1.0.0
-2011252124 metadata/md5-cache/www-apps/novnc-1.1.0
-2011252124 metadata/md5-cache/www-apps/novnc-9999
-2011252124 metadata/md5-cache/www-apps/prewikka-5.1.1
-2011252124 metadata/md5-cache/www-apps/prewikka-5.2.0
-2011252124 metadata/md5-cache/www-apps/radicale-1.1.6
-2011252124 metadata/md5-cache/www-apps/radicale-2.1.11-r1
 2011252124 metadata/md5-cache/www-apps/redmine-4.1.1-r1
-2011252124 metadata/md5-cache/www-apps/roundup-2.0.0
 2011252124 metadata/md5-cache/www-apps/rt-4.4.4
 2011252124 metadata/md5-cache/www-apps/trickster-0.1.9
 2011252124 metadata/md5-cache/www-apps/webdavcgi-1.1.1
 2011252124 metadata/md5-cache/www-apps/webmcp-1.2.6
 2011272339 metadata/md5-cache/www-apps/cgit-1.2.3-r1
 2011272339 metadata/md5-cache/www-apps/cgit-9999
-2011300509 metadata/md5-cache/www-apps/Manifest.gz
 2011300509 metadata/md5-cache/www-apps/grafana-bin-7.3.4
+2012011340 metadata/md5-cache/www-apps/Manifest.gz
+2012011340 metadata/md5-cache/www-apps/blohg-0.13-r4
+2012011340 metadata/md5-cache/www-apps/blohg-9999
+2012011340 metadata/md5-cache/www-apps/klaus-1.5.1
+2012011340 metadata/md5-cache/www-apps/klaus-1.5.2
+2012011340 metadata/md5-cache/www-apps/nikola-7.8.15
+2012011340 metadata/md5-cache/www-apps/nikola-7.8.15-r1
+2012011340 metadata/md5-cache/www-apps/nikola-8.0.4
+2012011340 metadata/md5-cache/www-apps/nikola-8.1.0
+2012011340 metadata/md5-cache/www-apps/nikola-8.1.1
+2012011340 metadata/md5-cache/www-apps/nikola-8.1.1-r1
+2012011340 metadata/md5-cache/www-apps/nikola-8.1.2
+2012011340 metadata/md5-cache/www-apps/novnc-1.0.0
+2012011340 metadata/md5-cache/www-apps/novnc-1.1.0
+2012011340 metadata/md5-cache/www-apps/novnc-9999
+2012011340 metadata/md5-cache/www-apps/prewikka-5.1.1
+2012011340 metadata/md5-cache/www-apps/prewikka-5.2.0
+2012011340 metadata/md5-cache/www-apps/radicale-1.1.6
+2012011340 metadata/md5-cache/www-apps/radicale-2.1.11-r1
+2012011340 metadata/md5-cache/www-apps/roundup-2.0.0
 1703072138 metadata/md5-cache/www-client/fetch-1.0-r3
 2003261841 metadata/md5-cache/www-client/lynx-2.9.0_pre4
 2006150539 metadata/md5-cache/www-client/lynx-2.8.9_p1
 2007040209 metadata/md5-cache/www-client/lynx-2.9.0_pre5
 2009121921 metadata/md5-cache/www-client/httrack-3.49.2-r2
 2011252124 metadata/md5-cache/www-client/dillo-3.0.5-r3
-2011252124 metadata/md5-cache/www-client/dillo-3.1_pre20181005
 2011252124 metadata/md5-cache/www-client/dillo-9999
 2011252124 metadata/md5-cache/www-client/elinks-0.13.4-r1
 2011252124 metadata/md5-cache/www-client/elinks-0.13.5
@@ -59547,18 +59489,14 @@
 2011252124 metadata/md5-cache/www-client/epiphany-3.34.4
 2011252124 metadata/md5-cache/www-client/epiphany-3.36.4
 2011252124 metadata/md5-cache/www-client/falkon-3.1.0-r1
-2011252309 metadata/md5-cache/www-client/firefox-78.5.0
 2011252309 metadata/md5-cache/www-client/firefox-bin-78.5.0
 2011252309 metadata/md5-cache/www-client/firefox-bin-83.0
-2011252124 metadata/md5-cache/www-client/google-chrome-87.0.4280.66
 2011252124 metadata/md5-cache/www-client/google-chrome-beta-87.0.4280.66
-2011252124 metadata/md5-cache/www-client/google-chrome-unstable-88.0.4324.11
 2011252124 metadata/md5-cache/www-client/jd-2.8.5_p120826
 2011252124 metadata/md5-cache/www-client/jd-2.8.9_p150226
 2011252124 metadata/md5-cache/www-client/links-2.20.2
 2011252124 metadata/md5-cache/www-client/links-2.20.2-r1
 2011252124 metadata/md5-cache/www-client/links-2.21
-2011252124 metadata/md5-cache/www-client/microsoft-edge-dev-88.0.702.0
 2011252124 metadata/md5-cache/www-client/midori-9.0
 2011252124 metadata/md5-cache/www-client/netrik-1.16.1-r1
 2011252124 metadata/md5-cache/www-client/netsurf-3.10-r4
@@ -59572,11 +59510,6 @@
 2011252124 metadata/md5-cache/www-client/opera-developer-73.0.3841.0
 2011252124 metadata/md5-cache/www-client/otter-1.0.01-r1
 2011252124 metadata/md5-cache/www-client/otter-9999
-2011252124 metadata/md5-cache/www-client/pybugz-0.13
-2011252124 metadata/md5-cache/www-client/pybugz-9999
-2011252124 metadata/md5-cache/www-client/qutebrowser-1.13.1
-2011252124 metadata/md5-cache/www-client/qutebrowser-1.14.0
-2011252124 metadata/md5-cache/www-client/qutebrowser-9999
 2011252124 metadata/md5-cache/www-client/surf-2.0
 2011252124 metadata/md5-cache/www-client/surf-9999
 2011252124 metadata/md5-cache/www-client/surfraw-2.3.0-r1
@@ -59594,14 +59527,24 @@
 2011252124 metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r10
 2011252124 metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r12
 2011272139 metadata/md5-cache/www-client/vivaldi-snapshot-3.5.2115.31
-2011281709 metadata/md5-cache/www-client/firefox-83.0
 2011292039 metadata/md5-cache/www-client/luakit-2.2.1
 2011292039 metadata/md5-cache/www-client/luakit-2.2.1-r100
 2011292039 metadata/md5-cache/www-client/luakit-9999
-2011302139 metadata/md5-cache/www-client/Manifest.gz
 2011302139 metadata/md5-cache/www-client/chromium-87.0.4280.66
 2011302139 metadata/md5-cache/www-client/chromium-88.0.4324.11
 2011301309 metadata/md5-cache/www-client/seamonkey-2.53.5.1
+2012030539 metadata/md5-cache/www-client/Manifest.gz
+2012030239 metadata/md5-cache/www-client/dillo-3.1_pre20181005
+2012030539 metadata/md5-cache/www-client/firefox-78.5.0
+2012030539 metadata/md5-cache/www-client/firefox-83.0
+2012030039 metadata/md5-cache/www-client/google-chrome-87.0.4280.88
+2012021039 metadata/md5-cache/www-client/google-chrome-unstable-88.0.4324.27
+2012012339 metadata/md5-cache/www-client/microsoft-edge-dev-88.0.705.9
+2012011340 metadata/md5-cache/www-client/pybugz-0.13
+2012011340 metadata/md5-cache/www-client/pybugz-9999
+2012011340 metadata/md5-cache/www-client/qutebrowser-1.13.1
+2012011340 metadata/md5-cache/www-client/qutebrowser-1.14.0
+2012011340 metadata/md5-cache/www-client/qutebrowser-9999
 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
@@ -59610,8 +59553,6 @@
 2011061540 metadata/md5-cache/www-misc/profile-sync-daemon-6.31
 2011092109 metadata/md5-cache/www-misc/log-toolkit-0.9.6-r1
 2011252124 metadata/md5-cache/www-misc/bookmarksync-0.3.4-r3
-2011252124 metadata/md5-cache/www-misc/buku-4.3-r1
-2011252124 metadata/md5-cache/www-misc/buku-4.4-r1
 2011252124 metadata/md5-cache/www-misc/fcgiwrap-1.1.0-r1
 2011252124 metadata/md5-cache/www-misc/fcgiwrap-9999
 2011252124 metadata/md5-cache/www-misc/htdig-3.2.0_beta6-r5
@@ -59620,29 +59561,31 @@
 2011252124 metadata/md5-cache/www-misc/monitorix-3.12.0
 2011252124 metadata/md5-cache/www-misc/multisort-1.1-r2
 2011252124 metadata/md5-cache/www-misc/shellinabox-2.20-r4
-2011252124 metadata/md5-cache/www-misc/urlwatch-2.17
-2011252124 metadata/md5-cache/www-misc/urlwatch-2.18-r1
-2011252124 metadata/md5-cache/www-misc/urlwatch-2.21
 2011252124 metadata/md5-cache/www-misc/vdradmin-am-3.6.10
-2011252124 metadata/md5-cache/www-misc/vdradmin-am-3.6.10-r1
 2011252124 metadata/md5-cache/www-misc/vdradmin-am-3.6.9
 2011252124 metadata/md5-cache/www-misc/vdradmin-am-3.6.9-r3
 2011252124 metadata/md5-cache/www-misc/visitors-0.7-r2
 2011252124 metadata/md5-cache/www-misc/wsmake-0.6.4-r1
 2011252124 metadata/md5-cache/www-misc/xxv-1.6.1-r1
-2011261109 metadata/md5-cache/www-misc/Manifest.gz
+2012030509 metadata/md5-cache/www-misc/Manifest.gz
+2012011340 metadata/md5-cache/www-misc/buku-4.3-r1
+2012011340 metadata/md5-cache/www-misc/buku-4.4-r1
+2012011340 metadata/md5-cache/www-misc/urlwatch-2.17
+2012011340 metadata/md5-cache/www-misc/urlwatch-2.18-r1
+2012011340 metadata/md5-cache/www-misc/urlwatch-2.21
+2012030509 metadata/md5-cache/www-misc/vdradmin-am-3.6.10-r1
 2006171439 metadata/md5-cache/www-plugins/pdfjs-2.4.456
 2009141809 metadata/md5-cache/www-plugins/browserpass-3.0.7
 2011232139 metadata/md5-cache/www-plugins/pdfjs-2.5.207
-2011252124 metadata/md5-cache/www-plugins/Manifest.gz
 2011252124 metadata/md5-cache/www-plugins/adobe-flash-32.0.0.453
-2011252124 metadata/md5-cache/www-plugins/chrome-binary-plugins-87.0.4280.66
 2011252124 metadata/md5-cache/www-plugins/chrome-binary-plugins-87.0.4280.66_beta
-2011252124 metadata/md5-cache/www-plugins/chrome-binary-plugins-88.0.4324.11_alpha
 2011252124 metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0
 2011252124 metadata/md5-cache/www-plugins/google-talkplugin-9999
 2011252124 metadata/md5-cache/www-plugins/lightspark-0.8.2-r1
 2011252124 metadata/md5-cache/www-plugins/passff-host-1.2.1-r1
+2012030039 metadata/md5-cache/www-plugins/Manifest.gz
+2012030039 metadata/md5-cache/www-plugins/chrome-binary-plugins-87.0.4280.88
+2012021039 metadata/md5-cache/www-plugins/chrome-binary-plugins-88.0.4324.27_alpha
 1702282335 metadata/md5-cache/www-servers/mongrel2-1.11.0-r1
 2006041239 metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
 2009141809 metadata/md5-cache/www-servers/caddy-2.0.0
@@ -59655,8 +59598,6 @@
 2011252124 metadata/md5-cache/www-servers/civetweb-1.11
 2011252124 metadata/md5-cache/www-servers/civetweb-1.12
 2011252124 metadata/md5-cache/www-servers/fnord-1.11-r1
-2011252124 metadata/md5-cache/www-servers/gunicorn-19.8.1
-2011252124 metadata/md5-cache/www-servers/gunicorn-19.9.0
 2011252124 metadata/md5-cache/www-servers/h2o-2.2.6
 2011252124 metadata/md5-cache/www-servers/h2o-9999
 2011252124 metadata/md5-cache/www-servers/lighttpd-1.4.55-r1
@@ -59678,8 +59619,6 @@
 2011252124 metadata/md5-cache/www-servers/puma-4.3.4-r1
 2011252124 metadata/md5-cache/www-servers/puma-5.0.4
 2011252124 metadata/md5-cache/www-servers/resin-4.0.48-r1
-2011252124 metadata/md5-cache/www-servers/servefile-0.4.4_p20200211
-2011252124 metadata/md5-cache/www-servers/servefile-0.5.1
 2011252124 metadata/md5-cache/www-servers/sniproxy-0.5.0
 2011252124 metadata/md5-cache/www-servers/thttpd-2.27.1
 2011252124 metadata/md5-cache/www-servers/thttpd-9999
@@ -59689,7 +59628,6 @@
 2011252124 metadata/md5-cache/www-servers/tomcat-8.5.60
 2011252124 metadata/md5-cache/www-servers/tomcat-9.0.38-r1
 2011252124 metadata/md5-cache/www-servers/tomcat-9.0.40
-2011252124 metadata/md5-cache/www-servers/tornado-4.5.3
 2011252124 metadata/md5-cache/www-servers/uwsgi-2.0.19.1
 2011252124 metadata/md5-cache/www-servers/varnish-6.0.6
 2011252124 metadata/md5-cache/www-servers/varnish-6.3.2
@@ -59699,12 +59637,18 @@
 2011282309 metadata/md5-cache/www-servers/gatling-0.15
 2011290009 metadata/md5-cache/www-servers/gatling-0.16
 2011290239 metadata/md5-cache/www-servers/sniproxy-0.6.0-r1
-2011281509 metadata/md5-cache/www-servers/tornado-6.0.4
-2012010039 metadata/md5-cache/www-servers/Manifest.gz
 2011302239 metadata/md5-cache/www-servers/gatling-0.16-r1
-2012010039 metadata/md5-cache/www-servers/gunicorn-20.0.4
+2012030239 metadata/md5-cache/www-servers/Manifest.gz
+2012021509 metadata/md5-cache/www-servers/apache-2.4.46-r3
+2012011340 metadata/md5-cache/www-servers/gunicorn-19.8.1
+2012011340 metadata/md5-cache/www-servers/gunicorn-19.9.0
+2012011340 metadata/md5-cache/www-servers/gunicorn-20.0.4
+2012030239 metadata/md5-cache/www-servers/nginx-1.19.5-r1
+2012011340 metadata/md5-cache/www-servers/servefile-0.4.4_p20200211
+2012011340 metadata/md5-cache/www-servers/servefile-0.5.1
+2012011340 metadata/md5-cache/www-servers/tornado-4.5.3
+2012011340 metadata/md5-cache/www-servers/tornado-6.0.4
 2004032241 metadata/md5-cache/x11-apps/luit-20190106
-2011252124 metadata/md5-cache/x11-apps/Manifest.gz
 2011252124 metadata/md5-cache/x11-apps/amlc-0.5.1
 2011252124 metadata/md5-cache/x11-apps/appres-1.0.5
 2011252124 metadata/md5-cache/x11-apps/bdftopcf-1.1
@@ -59774,7 +59718,6 @@
 2011252124 metadata/md5-cache/x11-apps/xkbprint-1.0.5
 2011252124 metadata/md5-cache/x11-apps/xkbutils-1.0.4
 2011252124 metadata/md5-cache/x11-apps/xkill-1.0.5
-2011252124 metadata/md5-cache/x11-apps/xload-1.1.3
 2011252124 metadata/md5-cache/x11-apps/xlogo-1.0.5
 2011252124 metadata/md5-cache/x11-apps/xlsatoms-1.1.3
 2011252124 metadata/md5-cache/x11-apps/xlsclients-1.1.4
@@ -59801,17 +59744,19 @@
 2011252124 metadata/md5-cache/x11-apps/xwd-1.0.7
 2011252124 metadata/md5-cache/x11-apps/xwininfo-1.1.5
 2011252124 metadata/md5-cache/x11-apps/xwud-1.0.5
+2012030239 metadata/md5-cache/x11-apps/Manifest.gz
+2012030239 metadata/md5-cache/x11-apps/xload-1.1.3
 2004032241 metadata/md5-cache/x11-base/xorg-x11-7.4-r3
 2005031239 metadata/md5-cache/x11-base/xorg-drivers-1.20-r2
 2005190009 metadata/md5-cache/x11-base/xorg-drivers-9999
-2011252124 metadata/md5-cache/x11-base/Manifest.gz
 2011252124 metadata/md5-cache/x11-base/xcb-proto-1.14-r1
 2011252124 metadata/md5-cache/x11-base/xcb-proto-1.14.1
 2011252124 metadata/md5-cache/x11-base/xorg-proto-2020.1
 2011252124 metadata/md5-cache/x11-base/xorg-proto-9999
 2011252124 metadata/md5-cache/x11-base/xorg-server-1.20.8-r1
-2011252124 metadata/md5-cache/x11-base/xorg-server-1.20.9
-2011252124 metadata/md5-cache/x11-base/xorg-server-9999
+2012012109 metadata/md5-cache/x11-base/Manifest.gz
+2012012109 metadata/md5-cache/x11-base/xorg-server-1.20.10
+2012012109 metadata/md5-cache/x11-base/xorg-server-9999
 1907282239 metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.5.0
 2011252124 metadata/md5-cache/x11-drivers/Manifest.gz
 2011252124 metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r5
@@ -59896,7 +59841,6 @@
 2011252124 metadata/md5-cache/x11-libs/goffice-0.10.47
 2011252124 metadata/md5-cache/x11-libs/goffice-0.10.48
 2011252124 metadata/md5-cache/x11-libs/goocanvas-1.0.0
-2011252124 metadata/md5-cache/x11-libs/goocanvas-2.0.4-r1
 2011252124 metadata/md5-cache/x11-libs/gtk+-2.24.32-r1
 2011252124 metadata/md5-cache/x11-libs/gtk+-3.24.20
 2011252124 metadata/md5-cache/x11-libs/gtk+-3.24.22
@@ -59913,7 +59857,6 @@
 2011252124 metadata/md5-cache/x11-libs/libQGLViewer-2.7.2
 2011252124 metadata/md5-cache/x11-libs/libSM-1.2.3-r1
 2011252124 metadata/md5-cache/x11-libs/libX11-1.6.12
-2011252124 metadata/md5-cache/x11-libs/libX11-1.7.0
 2011252124 metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3
 2011252124 metadata/md5-cache/x11-libs/libXau-1.0.9
 2011252124 metadata/md5-cache/x11-libs/libXau-1.0.9-r1
@@ -60043,8 +59986,10 @@
 2011252124 metadata/md5-cache/x11-libs/xpa-2.1.18
 2011252124 metadata/md5-cache/x11-libs/xtrans-1.4.0
 2011270209 metadata/md5-cache/x11-libs/spread-sheet-widget-0.6
-2011272109 metadata/md5-cache/x11-libs/Manifest.gz
 2011272109 metadata/md5-cache/x11-libs/xforms-1.2.4-r1
+2012030239 metadata/md5-cache/x11-libs/Manifest.gz
+2012030239 metadata/md5-cache/x11-libs/goocanvas-2.0.4-r1
+2012012309 metadata/md5-cache/x11-libs/libX11-1.7.0
 1703221038 metadata/md5-cache/x11-misc/3dfm-1.0-r1
 1805220439 metadata/md5-cache/x11-misc/autocutsel-0.10.0
 1910111911 metadata/md5-cache/x11-misc/bbcd-0.3.1-r2
@@ -60066,7 +60011,6 @@
 1706300138 metadata/md5-cache/x11-misc/tinynotify-send-1.2.1-r1
 1703211738 metadata/md5-cache/x11-misc/wininfo-0.7-r1
 1907291609 metadata/md5-cache/x11-misc/wmctrl-1.07-r2
-1805220439 metadata/md5-cache/x11-misc/xautomation-1.09-r1
 1910111911 metadata/md5-cache/x11-misc/xdaliclock-2.43
 1906051110 metadata/md5-cache/x11-misc/xflux-20130927-r1
 1910022239 metadata/md5-cache/x11-misc/xflux-20170103
@@ -60114,7 +60058,6 @@
 2005270839 metadata/md5-cache/x11-misc/xbindkeys-1.8.6-r1
 2005271239 metadata/md5-cache/x11-misc/xbindkeys-1.8.7-r1
 2006051039 metadata/md5-cache/x11-misc/efax-gtk-3.2.15
-2006191509 metadata/md5-cache/x11-misc/xdiskusage-1.52
 2007201009 metadata/md5-cache/x11-misc/efax-gtk-3.2.14
 2008311739 metadata/md5-cache/x11-misc/shared-mime-info-1.15
 2009021410 metadata/md5-cache/x11-misc/tdrop-9999
@@ -60143,7 +60086,6 @@
 2011252124 metadata/md5-cache/x11-misc/alock-1.0.0
 2011252124 metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r1
 2011252124 metadata/md5-cache/x11-misc/apwal-0.4.5-r2
-2011252124 metadata/md5-cache/x11-misc/arandr-0.1.10
 2011252124 metadata/md5-cache/x11-misc/barrier-2.3.3
 2011252124 metadata/md5-cache/x11-misc/bbacpi-0.1.5-r3
 2011252124 metadata/md5-cache/x11-misc/bbdate-0.2.4-r2
@@ -60207,8 +60149,6 @@
 2011252124 metadata/md5-cache/x11-misc/gpaste-3.36.3
 2011252124 metadata/md5-cache/x11-misc/grabc-1.1-r2
 2011252124 metadata/md5-cache/x11-misc/gromit-20041213-r1
-2011252124 metadata/md5-cache/x11-misc/grub2-theme-preview-1.4.2
-2011252124 metadata/md5-cache/x11-misc/grub2-theme-preview-1.5.1
 2011252124 metadata/md5-cache/x11-misc/grun-0.9.3-r1
 2011252124 metadata/md5-cache/x11-misc/gtkdialog-0.8.3-r2
 2011252124 metadata/md5-cache/x11-misc/gtkdialog-0.8.3-r3
@@ -60257,8 +60197,6 @@
 2011252124 metadata/md5-cache/x11-misc/menumaker-0.99.12
 2011252124 metadata/md5-cache/x11-misc/mixer_app-1.8.0-r1
 2011252124 metadata/md5-cache/x11-misc/mozo-1.24.0
-2011252124 metadata/md5-cache/x11-misc/mozo-1.24.0-r1
-2011252124 metadata/md5-cache/x11-misc/mugshot-0.4.2-r1
 2011252124 metadata/md5-cache/x11-misc/netwmpager-2.05
 2011252124 metadata/md5-cache/x11-misc/nitrogen-1.6.1
 2011252124 metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1
@@ -60283,7 +60221,6 @@
 2011252124 metadata/md5-cache/x11-misc/primus-0.2
 2011252124 metadata/md5-cache/x11-misc/primus-0.2-r2
 2011252124 metadata/md5-cache/x11-misc/projecteur-0.8
-2011252124 metadata/md5-cache/x11-misc/py3status-3.31
 2011252124 metadata/md5-cache/x11-misc/qarma-1
 2011252124 metadata/md5-cache/x11-misc/qcomicbook-0.9.1
 2011252124 metadata/md5-cache/x11-misc/qlipper-5.0.0
@@ -60308,9 +60245,6 @@
 2011252124 metadata/md5-cache/x11-misc/rofi-calc-2.0.0
 2011252124 metadata/md5-cache/x11-misc/rofi-calc-9999
 2011252124 metadata/md5-cache/x11-misc/rss-glx-0.9.1-r1
-2011252124 metadata/md5-cache/x11-misc/safeeyes-2.0.8
-2011252124 metadata/md5-cache/x11-misc/safeeyes-2.0.8.1
-2011252124 metadata/md5-cache/x11-misc/safeeyes-2.0.9
 2011252124 metadata/md5-cache/x11-misc/screengrab-1.101
 2011252124 metadata/md5-cache/x11-misc/screengrab-2.0.0
 2011252124 metadata/md5-cache/x11-misc/screengrab-2.0.1
@@ -60344,7 +60278,6 @@
 2011252124 metadata/md5-cache/x11-misc/sprop-0.1-r1
 2011252124 metadata/md5-cache/x11-misc/sselp-0.2-r1
 2011252124 metadata/md5-cache/x11-misc/sselp-9999
-2011252124 metadata/md5-cache/x11-misc/sunflower-0.4_p20200716-r1
 2011252124 metadata/md5-cache/x11-misc/superswitcher-0.6-r1
 2011252124 metadata/md5-cache/x11-misc/sux-1.0-r4
 2011252124 metadata/md5-cache/x11-misc/svkbd-0.2
@@ -60419,7 +60352,6 @@
 2011252124 metadata/md5-cache/x11-misc/xfe-1.42
 2011252124 metadata/md5-cache/x11-misc/xfishtank-2.1-r2
 2011252124 metadata/md5-cache/x11-misc/xfishtank-2.5
-2011252124 metadata/md5-cache/x11-misc/xflux-gui-1.2.0-r1
 2011252124 metadata/md5-cache/x11-misc/xfractint-20.04_p14
 2011252124 metadata/md5-cache/x11-misc/xfractint-20.04_p16
 2011252124 metadata/md5-cache/x11-misc/xhkeys-2.2.1
@@ -60471,7 +60403,6 @@
 2011252124 metadata/md5-cache/x11-misc/xsnap-1.5.15-r1
 2011252124 metadata/md5-cache/x11-misc/xsnap-1.5.15-r2
 2011252124 metadata/md5-cache/x11-misc/xsnow-1.42-r2
-2011252124 metadata/md5-cache/x11-misc/xsnow-3.0.7
 2011252124 metadata/md5-cache/x11-misc/xss-lock-0.3.0_p20140302-r1
 2011252124 metadata/md5-cache/x11-misc/xssstate-1.1
 2011252124 metadata/md5-cache/x11-misc/xstroke-0.6-r1
@@ -60491,25 +60422,41 @@
 2011252124 metadata/md5-cache/x11-misc/xwit-3.4_p16
 2011252124 metadata/md5-cache/x11-misc/xxkb-1.11.1
 2011252124 metadata/md5-cache/x11-misc/xxkb-1.11.1-r1
-2011252124 metadata/md5-cache/x11-misc/zim-0.73.1
-2011252124 metadata/md5-cache/x11-misc/zim-0.73.2
-2011252124 metadata/md5-cache/x11-misc/zim-0.73.3
-2011260709 metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
-2011261239 metadata/md5-cache/x11-misc/zim-0.73.4
 2011262309 metadata/md5-cache/x11-misc/fracplanet-0.5.1
 2011270139 metadata/md5-cache/x11-misc/i3status-2.13
 2011271209 metadata/md5-cache/x11-misc/xsri-2.1.0_p17_p12
-2011291139 metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
-2011300309 metadata/md5-cache/x11-misc/cbatticon-1.6.10
 2011292309 metadata/md5-cache/x11-misc/devilspie2-0.43-r100
-2011300209 metadata/md5-cache/x11-misc/hsetroot-1.0.5
 2011291509 metadata/md5-cache/x11-misc/virtualgl-2.6.5
 2011300239 metadata/md5-cache/x11-misc/xdotool-3.20160805.1
-2011302209 metadata/md5-cache/x11-misc/Manifest.gz
 2011301509 metadata/md5-cache/x11-misc/i3lock-2.13
 2011302209 metadata/md5-cache/x11-misc/redshift-1.12-r3
 2011301309 metadata/md5-cache/x11-misc/synergy-1.12.0
-2011301209 metadata/md5-cache/x11-misc/synergy-1.9.1-r1
+2012030809 metadata/md5-cache/x11-misc/Manifest.gz
+2012011340 metadata/md5-cache/x11-misc/arandr-0.1.10
+2012020639 metadata/md5-cache/x11-misc/cbatticon-1.6.10
+2012011340 metadata/md5-cache/x11-misc/grub2-theme-preview-1.4.2
+2012011340 metadata/md5-cache/x11-misc/grub2-theme-preview-1.5.1
+2012021539 metadata/md5-cache/x11-misc/grub2-theme-preview-2.1.0
+2012020639 metadata/md5-cache/x11-misc/hsetroot-1.0.5
+2012030809 metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
+2012011340 metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
+2012030239 metadata/md5-cache/x11-misc/mozo-1.24.0-r1
+2012011340 metadata/md5-cache/x11-misc/mugshot-0.4.2-r1
+2012011340 metadata/md5-cache/x11-misc/py3status-3.31
+2012011340 metadata/md5-cache/x11-misc/safeeyes-2.0.8
+2012011340 metadata/md5-cache/x11-misc/safeeyes-2.0.8.1
+2012011340 metadata/md5-cache/x11-misc/safeeyes-2.0.9
+2012011709 metadata/md5-cache/x11-misc/spnavcfg-0.3.1
+2012011340 metadata/md5-cache/x11-misc/sunflower-0.4_p20200716-r1
+2012020639 metadata/md5-cache/x11-misc/synergy-1.9.1-r1
+2012030239 metadata/md5-cache/x11-misc/xautomation-1.09-r1
+2012030239 metadata/md5-cache/x11-misc/xdiskusage-1.52
+2012011340 metadata/md5-cache/x11-misc/xflux-gui-1.2.0-r1
+2012030239 metadata/md5-cache/x11-misc/xsnow-3.0.7
+2012011340 metadata/md5-cache/x11-misc/zim-0.73.1
+2012011340 metadata/md5-cache/x11-misc/zim-0.73.2
+2012011340 metadata/md5-cache/x11-misc/zim-0.73.3
+2012011340 metadata/md5-cache/x11-misc/zim-0.73.4
 1908180209 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 1905230009 metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
 1803190338 metadata/md5-cache/x11-plugins/pidgin-birthday-reminder-1.7-r1
@@ -60528,7 +60475,6 @@
 1712201839 metadata/md5-cache/x11-plugins/wmapmload-0.3.4-r1
 1811052139 metadata/md5-cache/x11-plugins/wmappl-0.71-r1
 1809192139 metadata/md5-cache/x11-plugins/wmbatteries-0.1.3-r1
-1911031939 metadata/md5-cache/x11-plugins/wmbattery-2.54
 1809192109 metadata/md5-cache/x11-plugins/wmcalc-0.7
 1807262339 metadata/md5-cache/x11-plugins/wmdiskmon-0.0.2-r1
 1808251109 metadata/md5-cache/x11-plugins/wmforkplop-0.9.3-r3
@@ -60539,7 +60485,6 @@
 1903140139 metadata/md5-cache/x11-plugins/wmnd-0.4.17-r1
 1809152339 metadata/md5-cache/x11-plugins/wmpager-1.2-r2
 1704032138 metadata/md5-cache/x11-plugins/wmpasman-2.0
-1812311309 metadata/md5-cache/x11-plugins/wmpasman-2.2
 1904091139 metadata/md5-cache/x11-plugins/wmstickynotes-0.2-r1
 1809231909 metadata/md5-cache/x11-plugins/wmwifi-0.6-r1
 2001252039 metadata/md5-cache/x11-plugins/pidgin-sipe-1.25.0
@@ -60708,14 +60653,16 @@
 2011261339 metadata/md5-cache/x11-plugins/gkwebmon-0.2-r2
 2011272109 metadata/md5-cache/x11-plugins/gkrellmss-2.6-r4
 2011281239 metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.7
-2011300339 metadata/md5-cache/x11-plugins/Manifest.gz
 2011300339 metadata/md5-cache/x11-plugins/pidgin-telegram-1.4.4
-2011292039 metadata/md5-cache/x11-plugins/wmbiff-0.4.36
-2011292039 metadata/md5-cache/x11-plugins/wmblob-1.0.4
-2011292039 metadata/md5-cache/x11-plugins/wmbutton-0.7.1
 2011292039 metadata/md5-cache/x11-plugins/wmcoincoin-2.6.3
-2011292039 metadata/md5-cache/x11-plugins/wmix-3.5
-2011292039 metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r1
+2012030509 metadata/md5-cache/x11-plugins/Manifest.gz
+2012030509 metadata/md5-cache/x11-plugins/wmbattery-2.54
+2012030509 metadata/md5-cache/x11-plugins/wmbiff-0.4.36
+2012030509 metadata/md5-cache/x11-plugins/wmblob-1.0.4
+2012030509 metadata/md5-cache/x11-plugins/wmbutton-0.7.1
+2012030509 metadata/md5-cache/x11-plugins/wmix-3.5
+2012030509 metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r1
+2012030509 metadata/md5-cache/x11-plugins/wmpasman-2.2
 1802161308 metadata/md5-cache/x11-terms/pangoterm-0.0_pre20171111
 2004032241 metadata/md5-cache/x11-terms/eterm-0.9.6-r2
 2005081846 metadata/md5-cache/x11-terms/xfce4-terminal-0.8.9.2
@@ -60725,8 +60672,6 @@
 2011252124 metadata/md5-cache/x11-terms/cool-retro-term-1.1.1-r2
 2011252124 metadata/md5-cache/x11-terms/eterm-9999
 2011252124 metadata/md5-cache/x11-terms/gnome-terminal-3.36.2
-2011252124 metadata/md5-cache/x11-terms/guake-3.7.0
-2011252124 metadata/md5-cache/x11-terms/guake-9999
 2011252124 metadata/md5-cache/x11-terms/kitty-0.19.1
 2011252124 metadata/md5-cache/x11-terms/kitty-0.19.2
 2011252124 metadata/md5-cache/x11-terms/kitty-9999
@@ -60752,11 +60697,9 @@
 2011252124 metadata/md5-cache/x11-terms/sakura-3.7.1
 2011252124 metadata/md5-cache/x11-terms/st-0.8.4
 2011252124 metadata/md5-cache/x11-terms/st-9999
-2011252124 metadata/md5-cache/x11-terms/terminator-2.0.1
 2011252124 metadata/md5-cache/x11-terms/terminology-1.8.1
 2011252124 metadata/md5-cache/x11-terms/tilda-1.4.1
 2011252124 metadata/md5-cache/x11-terms/tilda-1.5.0
-2011252124 metadata/md5-cache/x11-terms/tilda-1.5.2
 2011252124 metadata/md5-cache/x11-terms/xterm-337
 2011252124 metadata/md5-cache/x11-terms/xterm-351
 2011252124 metadata/md5-cache/x11-terms/xterm-360
@@ -60766,8 +60709,12 @@
 2011281009 metadata/md5-cache/x11-terms/alacritty-0.5.0
 2011281009 metadata/md5-cache/x11-terms/alacritty-0.6.0
 2011281009 metadata/md5-cache/x11-terms/alacritty-9999
-2011290239 metadata/md5-cache/x11-terms/Manifest.gz
 2011290239 metadata/md5-cache/x11-terms/mrxvt-0.5.4
+2012030239 metadata/md5-cache/x11-terms/Manifest.gz
+2012011340 metadata/md5-cache/x11-terms/guake-3.7.0
+2012011340 metadata/md5-cache/x11-terms/guake-9999
+2012011340 metadata/md5-cache/x11-terms/terminator-2.0.1
+2012030239 metadata/md5-cache/x11-terms/tilda-1.5.2
 1707301038 metadata/md5-cache/x11-themes/chameleon-xcursors-0.5-r1
 1902221239 metadata/md5-cache/x11-themes/clearlooks-phenix-7.0.1
 1702282336 metadata/md5-cache/x11-themes/comix-xcursors-0.8.2
@@ -60796,7 +60743,6 @@
 1910111911 metadata/md5-cache/x11-themes/silver-xcursors-0.4-r1
 1806031038 metadata/md5-cache/x11-themes/vanilla-dmz-aa-xcursors-0.4.5
 1806031038 metadata/md5-cache/x11-themes/vanilla-dmz-xcursors-0.4.5
-1808151104 metadata/md5-cache/x11-themes/wm-icons-0.4.0
 1909271639 metadata/md5-cache/x11-themes/yasis-icon-theme-0.4.2
 1807091839 metadata/md5-cache/x11-themes/zukini-20120817
 1805050439 metadata/md5-cache/x11-themes/zukitwo-2016.08.08
@@ -60870,7 +60816,6 @@
 2011252124 metadata/md5-cache/x11-themes/constantine-backgrounds-12.1.1.4-r1
 2011252124 metadata/md5-cache/x11-themes/echo-icon-theme-0.3.89.0_pre20081031
 2011252124 metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.15.1
-2011252124 metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1
 2011252124 metadata/md5-cache/x11-themes/fvwm-crystal-3.6.5
 2011252124 metadata/md5-cache/x11-themes/fvwm-themes-0.7.0-r1
 2011252124 metadata/md5-cache/x11-themes/gartoon-redux-1.10-r1
@@ -60891,7 +60836,6 @@
 2011252124 metadata/md5-cache/x11-themes/greybird-3.22.12
 2011252124 metadata/md5-cache/x11-themes/greybird-3.22.9
 2011252124 metadata/md5-cache/x11-themes/greybird-9999
-2011252124 metadata/md5-cache/x11-themes/gtk-chtheme-0.3.1-r3
 2011252124 metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r2
 2011252124 metadata/md5-cache/x11-themes/gtk-engines-adwaita-3.28
 2011252124 metadata/md5-cache/x11-themes/gtk-engines-candido-0.9.1
@@ -60955,8 +60899,11 @@
 2011252124 metadata/md5-cache/x11-themes/xcursor-themes-1.0.6
 2011252124 metadata/md5-cache/x11-themes/xfce-gant-icon-theme-3.9_p6-r1
 2011252124 metadata/md5-cache/x11-themes/xxv-skins-1.6.1-r1
-2011282039 metadata/md5-cache/x11-themes/Manifest.gz
 2011282039 metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1-r1
+2012030239 metadata/md5-cache/x11-themes/Manifest.gz
+2012030239 metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1
+2012030239 metadata/md5-cache/x11-themes/gtk-chtheme-0.3.1-r3
+2012030239 metadata/md5-cache/x11-themes/wm-icons-0.4.0
 2010121339 metadata/md5-cache/x11-wm/e16-1.0.21
 2011252124 metadata/md5-cache/x11-wm/2bwm-0.3
 2011252124 metadata/md5-cache/x11-wm/2bwm-9999
@@ -60991,7 +60938,6 @@
 2011252124 metadata/md5-cache/x11-wm/herbstluftwm-0.7.2-r1
 2011252124 metadata/md5-cache/x11-wm/herbstluftwm-0.8.2
 2011252124 metadata/md5-cache/x11-wm/herbstluftwm-0.8.3
-2011252124 metadata/md5-cache/x11-wm/herbstluftwm-9999
 2011252124 metadata/md5-cache/x11-wm/i3-4.18
 2011252124 metadata/md5-cache/x11-wm/i3-4.18.3
 2011252124 metadata/md5-cache/x11-wm/i3-4.19-r1
@@ -61023,8 +60969,6 @@
 2011252124 metadata/md5-cache/x11-wm/openbox-9999
 2011252124 metadata/md5-cache/x11-wm/page-1.9.8
 2011252124 metadata/md5-cache/x11-wm/page-1.9.9-r3
-2011252124 metadata/md5-cache/x11-wm/qtile-0.15.1
-2011252124 metadata/md5-cache/x11-wm/qtile-0.16.1
 2011252124 metadata/md5-cache/x11-wm/ratpoison-9999
 2011252124 metadata/md5-cache/x11-wm/selectwm-0.4.1-r1
 2011252124 metadata/md5-cache/x11-wm/sithwm-1.2.3
@@ -61050,14 +60994,18 @@
 2011252124 metadata/md5-cache/x11-wm/xmonad-0.15
 2011252124 metadata/md5-cache/x11-wm/xmonad-contrib-0.16
 2011252124 metadata/md5-cache/x11-wm/xoat-9999
-2011252124 metadata/md5-cache/x11-wm/xpra-3.0.2-r1
-2011252124 metadata/md5-cache/x11-wm/xpra-3.0.5-r2
-2011252124 metadata/md5-cache/x11-wm/xpra-4.0.4
 2011261339 metadata/md5-cache/x11-wm/oroborus-2.0.20-r1
 2011260709 metadata/md5-cache/x11-wm/sawfish-1.12.90-r1
-2011292109 metadata/md5-cache/x11-wm/Manifest.gz
 2011292039 metadata/md5-cache/x11-wm/pekwm-0.1.17-r2
 2011292039 metadata/md5-cache/x11-wm/ratpoison-1.4.9
+2012011709 metadata/md5-cache/x11-wm/Manifest.gz
+2012011709 metadata/md5-cache/x11-wm/herbstluftwm-0.9.0
+2012011709 metadata/md5-cache/x11-wm/herbstluftwm-9999
+2012011340 metadata/md5-cache/x11-wm/qtile-0.15.1
+2012011340 metadata/md5-cache/x11-wm/qtile-0.16.1
+2012011340 metadata/md5-cache/x11-wm/xpra-3.0.2-r1
+2012011340 metadata/md5-cache/x11-wm/xpra-3.0.5-r2
+2012011340 metadata/md5-cache/x11-wm/xpra-4.0.4
 2002112051 metadata/md5-cache/xfce-base/xfce4-appfinder-4.14.0
 2003191509 metadata/md5-cache/xfce-base/exo-0.12.11
 2003261841 metadata/md5-cache/xfce-base/garcon-0.6.4-r2
@@ -61116,9 +61064,7 @@
 2002112051 metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1-r4
 2002112051 metadata/md5-cache/xfce-extra/xfce4-verve-plugin-2.0.0
 2003091039 metadata/md5-cache/xfce-extra/xfce4-statusnotifier-plugin-0.2.2
-2003261841 metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.7
 2004192139 metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.10.1
-2006292139 metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.1
 2006292139 metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.3
 2007041609 metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.8.1
 2007161739 metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.3
@@ -61130,21 +61076,17 @@
 2010090009 metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.6-r1
 2010090009 metadata/md5-cache/xfce-extra/xfce4-power-manager-1.7.0-r1
 2010211109 metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.1.0
-2010211139 metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.3
 2011022209 metadata/md5-cache/xfce-extra/thunar-volman-4.15.1
-2011021309 metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.2
 2011070239 metadata/md5-cache/xfce-extra/xfce4-power-manager-1.7.1
 2011091339 metadata/md5-cache/xfce-extra/tumbler-0.3.0-r1
 2011090239 metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.3.0
 2011090239 metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.11
 2011100039 metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.10.2
-2011091139 metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.1
 2011121539 metadata/md5-cache/xfce-extra/xfce4-notifyd-0.6.2
 2011161209 metadata/md5-cache/xfce-extra/tumbler-0.3.1
 2011172239 metadata/md5-cache/xfce-extra/xfce4-dict-0.8.4
 2011171409 metadata/md5-cache/xfce-extra/xfdashboard-0.7.90
 2011201309 metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.92-r1
-2011252124 metadata/md5-cache/xfce-extra/Manifest.gz
 2011252124 metadata/md5-cache/xfce-extra/eatmonkey-0.1.4-r1
 2011252124 metadata/md5-cache/xfce-extra/multiload-nandhp-0.3-r4
 2011252124 metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.4.0
@@ -61154,7 +61096,6 @@
 2011252124 metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.6.1
 2011252124 metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.1
 2011252124 metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.8.1-r2
-2011252124 metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-2.3.4
 2011252124 metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6-r4
 2011252124 metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r6
 2011252124 metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.3
@@ -61165,4 +61106,11 @@
 2011252124 metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r7
 2011252124 metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.6
 2011252124 metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6-r3
-2012010939 metadata/md5-cache/Manifest.gz
+2012030239 metadata/md5-cache/xfce-extra/Manifest.gz
+2012030239 metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.1
+2012030239 metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.2
+2012030239 metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-2.3.4
+2012030239 metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.7
+2012030239 metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.3
+2012030239 metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.1
+2012031109 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2eb00a7e4973..b5805d81db9f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 01 Dec 2020 07:00:01 +0000
+Thu, 03 Dec 2020 08:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 4752ddf32214..4f19ad60637a 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-ce7389e89f5747c6eae2f31f465767465c0c5a78 1606804167 2020-12-01T06:29:27+00:00
+64bc4e8eb7507dc762a7726bc2a522a0f80c54da 1606982386 2020-12-03T07:59:46+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 832681b69986..d66861101bc5 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1606804501 Tue 01 Dec 2020 06:35:01 AM UTC
+1606982701 Thu 03 Dec 2020 08:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index aef36d43bd8a..d9a9c1c834ea 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 01 Dec 2020 06:38:41 +0000
+Thu, 03 Dec 2020 08:08:28 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 9cb98f86011a..0f5e3aca6868 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index 113b1d0f7d95..ec66c51686db 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -3,5 +3,5 @@ DIST bwping-2.0.tar.gz 106255 BLAKE2B f3ff631a1d9d5aed9645558c639840055bb041612e
 DIST bwping-2.1.tar.gz 110702 BLAKE2B 3bbd5f7b57e3afa29aaf7015609fe472457713651e1d1532ad1cdcbf5b39d4c556bb6d3e675ddb8fd97ef289942fe11e5334f04ef46f489fde2785cbd80f3a3e SHA512 bf2a17e7b5d073f462b5090591550347e65c2748b3460f0126bc4dc78c930237cece3e67957d4c73161ce58107856187c24d401dda3f13b40b97bc01b2cfa1df
 EBUILD bwping-1.17.ebuild 386 BLAKE2B 20093e8b15046b5fd585880c5c6cdc7d6a64a4e4f72969cfc0ca5ce5a4199a89cbc09094f6c325024fcd6ccb8ef175abbebc30dbcd3f3453129a86730eafacb0 SHA512 e45c6be1427b27a1d3e53a6fafb1e0f786b2544744ad585a479ca6909f06fb25332a6ed7e816bb73cf85941600178084e927b147053e2ee272877eeebd4cb558
 EBUILD bwping-2.0.ebuild 388 BLAKE2B d6eae0f0d7d6445e1f6b5b052bd5f6d884d58d0ae843b3c214521a52dd4ab0ce2829089f545198e74d60a097a72bd0b7f4d4eb214d251efed69334dd187d4ea2 SHA512 36203eaae072be8a73e1df310b47e9e2582de06043f1fa9d4b695abca6cfc429578cf7b1a154358bfc521c92f48bfa92a3a4da7c5848bae4c6835ff3cd1ebce3
-EBUILD bwping-2.1.ebuild 388 BLAKE2B d6eae0f0d7d6445e1f6b5b052bd5f6d884d58d0ae843b3c214521a52dd4ab0ce2829089f545198e74d60a097a72bd0b7f4d4eb214d251efed69334dd187d4ea2 SHA512 36203eaae072be8a73e1df310b47e9e2582de06043f1fa9d4b695abca6cfc429578cf7b1a154358bfc521c92f48bfa92a3a4da7c5848bae4c6835ff3cd1ebce3
+EBUILD bwping-2.1.ebuild 387 BLAKE2B 4b5a572ff68d6a4571f48462e997df90e38c165cd3e1eb7744d5d2bb02b7f17ed29ebdb1ce7626acfccc01804d6204244088fd877be7833824b57ad9d64017e1 SHA512 58e5e25d21c8268b786c7b2ff5b1c0ec3034d30fc892931910b3122ceeb81de2867c7b245e9c36d03744b86dd7bfc3d0ddf3cf5a065d3857cdac9029f2cb3a0d
 MISC metadata.xml 651 BLAKE2B 5879ca4d339fc3b541e1b7f68be857a9552c9a06efd8b1985470f5143f1e1e14edb0eccb4815b7498590718a02ddbb155a1e49556cdef76ebd9fae6dc6f306c8 SHA512 bef41fb4c3d894de7f2b39b16171fd22e6ce584d2dd2a65e2ce2c645ffc4ae1d1b38d7667765fa3e6fbfacb92cd3ef7006d141b14a5a476489ed235d2ca095e0
diff --git a/net-analyzer/bwping/bwping-2.1.ebuild b/net-analyzer/bwping/bwping-2.1.ebuild
index b22cf8d14539..d036906fb29e 100644
--- a/net-analyzer/bwping/bwping-2.1.ebuild
+++ b/net-analyzer/bwping/bwping-2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~sparc x86"
 
 src_test() {
 	[[ ${UID} = 0 ]] && default
diff --git a/net-analyzer/etherape/Manifest b/net-analyzer/etherape/Manifest
index 8b7147d2a565..00bc4689af52 100644
--- a/net-analyzer/etherape/Manifest
+++ b/net-analyzer/etherape/Manifest
@@ -1,3 +1,3 @@
 DIST etherape-0.9.19.tar.gz 1452435 BLAKE2B d80d0d0eceeff67890d6a992551a136bfdcd3de005468d7d09eccc94ddf472209738c29d06a321116c90da1a31be0349f80dbee73d3297eae3e02588afea4e94 SHA512 3819c36a6ea5b1ec6fc675563ab0264d180824343344bf4f2da834db39547b721c1565b6edb882d55ce4e0ca93e4b34e3a544996a988584aaf7fe8b8d5ca265e
-EBUILD etherape-0.9.19.ebuild 556 BLAKE2B fef4e05c52350c1d3d8f328b9cef8227e020fa72626a0ec8a3148b9da78bc11d2fabe26d1069bfc2ac88b09e02ed3dc118ce4aba108c02ca8de152c6ed8bc7c7 SHA512 e2cabf07804447bc91438f97cc5669461310b970b472607e3fe2c0779fe77d9f278391741f9b3fce2689701ab548aae4c592c078da3534517079efcc1a516f6b
+EBUILD etherape-0.9.19.ebuild 563 BLAKE2B 408aa0eddba3ddeabf7bc90662f211e7ec73552ecec7d8e09e4577e7e46a28dd25d1a8f833a01525c046cbaf0b580296f4dcf5682dda22dbe32f2d1aa268c6e8 SHA512 a60c429b91d341c11627e635856177cc5b7da7f29bdd287116edcf8e573d8be4da8d3b3a162ae12589bbbb67a444596de3f637e49990d087230e67b0b8d4cfa7
 MISC metadata.xml 820 BLAKE2B 613982514b7fe5365b2eb8344cd1e7214d71636fec65aba0f4f2d226047e33ede0a0fb0f096f87d20077d0f1907375eaefbbc04bfc81904dd044bbc567cc887a SHA512 8e7b8953034f14069d5d2aad3c0a1b180ec182c9ae8be46bf2b837629e40f0122b4402c0adfeccb1967844c38b241a122a2735df0d63ad475c2355eb4b454e9b
diff --git a/net-analyzer/etherape/etherape-0.9.19.ebuild b/net-analyzer/etherape/etherape-0.9.19.ebuild
index 115dc5bb3c88..721766aba287 100644
--- a/net-analyzer/etherape/etherape-0.9.19.ebuild
+++ b/net-analyzer/etherape/etherape-0.9.19.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 5598922002f6..7985e80e44f4 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,4 +1,4 @@
 DIST fail2ban-0.11.1.tar.gz 538660 BLAKE2B c88765ac3f49c19e0570248891814c647f2c3515290982de21c7b6c377508189fa53182fca84d62f61b231e250395992e8cf06cc61394dd41150f02d8a254f8b SHA512 019b088aa6375f98742ed101ef6f65adabca3324444d71d5b8597a8d1d22fa76b9f503660f0498643fe24a3b8e4368de916072a1ab77b8e2ea3eda41c3e0c8c6
 EBUILD fail2ban-0.11.1-r2.ebuild 3304 BLAKE2B bd423b357180362b03a602e661c348440f559af0007acaebd3b87fac825b66ed5a2f9d87f72c83a59f460d31ff88d0fab9dc58be1fdf15f2a77bb6753ad26ff8 SHA512 a0b3ac50485c7d74b0a2865ac90858fb9ddfc7b5a61902e22b21187e01e9a8f15e230983353d5998d9bb4f20cc4fd1f5dcc5986dab7d4acf8bac329e8a295ca8
-EBUILD fail2ban-99999999.ebuild 3231 BLAKE2B 3700cf6551941dd695e81145d723f6be91bf21df0ac3fe95c3245a4a954c9855e3d082e47409f9a75dbbb87fc1c4ecf51a6477b3e419987a669ce821ee47e7fa SHA512 dc518092d1b9687ffe1c2d47e5e23f3ed58cd36b7ed28fc14db9179476c99b208450ba9f8fb0e9c516320408da526ae74f18ca1efb21a0b14cff4d06b9578a7c
+EBUILD fail2ban-99999999.ebuild 3233 BLAKE2B a77d53092dfb9b49bd12e22e506ac10d6f7029fd8daeed7d698eeb7f2b3a19db50ae3d9a7e3580d4040b890d316e11c6c29c74bef1c6719538d8e2a58fe4dd12 SHA512 910dd8ec8cf67cc20514e9ee16d80f886bf0ae52ea641d5d981787af635473970caad81e029e4b9c27e5911e3c64b1401e50945918c8b4a59ab7db1fac5fb823
 MISC metadata.xml 372 BLAKE2B 7fca866187d9a128e6fb6787a4099d7a6442e0e51e558786773b91c3e2f06e67167d76f9bc96be0fe1baa1c44fc3f0e9e2105a327a10cb2720b3e3f9e4303a66 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25
diff --git a/net-analyzer/fail2ban/fail2ban-99999999.ebuild b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
index 358d12b3149a..4cfac190293f 100644
--- a/net-analyzer/fail2ban/fail2ban-99999999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 distutils-r1 git-r3 systemd
diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest
index fb3887b6a882..764e776c14ee 100644
--- a/net-analyzer/iptraf-ng/Manifest
+++ b/net-analyzer/iptraf-ng/Manifest
@@ -4,6 +4,6 @@ DIST iptraf-ng-1.2.0.tar.gz 324969 BLAKE2B 45a67fc64b5ab518339e55adfc158c8cf10ea
 DIST iptraf-ng-1.2.1.tar.gz 325177 BLAKE2B 9b8df7fa24711b401464d492993b9c27424ec7ab6230218d1b792a66e5fb60c99b5cdb92ac1b5a6da578c4b10da79333f248f14d10e74057118aadf50263a4ed SHA512 44d36fc92cdbf379f62cb63638663c3ee610225b9c28d60ee55e62e358f398a6b0db281129327b3472e45fb553ee3dd605af09c129f2233f8839ae3dbd799384
 EBUILD iptraf-ng-1.1.4-r1.ebuild 1326 BLAKE2B d5d601fda955334b542f7d16413c02bc53a74ca917b7e0dd225393cd37754e7090983ac97e71813ff3f9530d34ec4ab129f96c0041f34339470e7efa56ee2a54 SHA512 8e0bc6972a46fb21b3fa04e17236d68a07c7d4fb83bf0a850d520b2f00e7e95dc115993c2c5f207aad4749e4b58040376a2c8f003113b0b3cc171b1bbc77555f
 EBUILD iptraf-ng-1.2.0-r1.ebuild 1222 BLAKE2B bb684c951569993138a987ef80cbd561d3054f33eec02dfb3144a2fc57b0f69d2091074e53f2ca2d44823ef6b51b0106ab207050234a4267bb5f035a79376c69 SHA512 69c3a436210c8d9cef2acdc7e7b6c9d361c98a8cdef4218b8f8013bf00387397b67e7c8587ad11fcbabb45ccfa28864b67ba4ae9a6aa2485e69cc73230216be5
-EBUILD iptraf-ng-1.2.1.ebuild 1217 BLAKE2B 86b513e6512d3e50e84c137f7411aadd460263ae0f146921fced0bebba4d12f15148d802ebd692c6b6ffc4c7d6d25f8a5a2de403d8b44328b0065f7a1da8f43d SHA512 3d8b85657fa9f99eca7e2c9d7e5722d1744634aa51d1aa610471e7d8ffb4dfb016892afadc9b2334acbaa9c5d9c993f54722e19c30b743af229848352ac3b127
+EBUILD iptraf-ng-1.2.1.ebuild 1224 BLAKE2B 47eede62e4313d89728746b9e29d698d9f33fe40309af33ddb3081718519534933cf2795b621da3c8e8813b171f31f301e66463cd26c070ab83fa8060e67ae3b SHA512 88e1699865533becd04e2241cbeeb6a2c8a17222ebfc913978503a5c2c086310e5f8f3e658a0260ba026b7e6946d5961a2ac5d53fbea1f39d455ff069baa6122
 EBUILD iptraf-ng-9999.ebuild 1150 BLAKE2B 5b02da16a8fbff3bb5ef09536a69094088a7e4a1793f83272169cd9c91d8884647d643154cad17b267c1433a7e98735d7267e76e703a2bad0f49e2bba8c6bb24 SHA512 a8b3ff516d68e0dfa95c763f478dfcc66f556d93a814ee97362e54cafbb0465600459939a8d8cba58b7ffe35fd6de65b4455521867c7219ff8d0618bc9bbaf51
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild
index 643acfc262e0..55b0b0d43d97 100644
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild
+++ b/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/iptraf-ng/iptraf-ng/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2 doc? ( FDL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/net-analyzer/nagios-plugins-flameeyes/Manifest b/net-analyzer/nagios-plugins-flameeyes/Manifest
deleted file mode 100644
index 0954a95d8fd5..000000000000
--- a/net-analyzer/nagios-plugins-flameeyes/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD nagios-plugins-flameeyes-9999.ebuild 1107 BLAKE2B a20d900da62f208cd2e03e01decadfb50e26cfd10502bf6c7d72b1967809641c9b994e3a5e1ef483a8d448922aace25fdf952ff4fa2296a6ae32ee086a2c0aeb SHA512 bb60220d159725156c080fdf255856f6f40ca4064ac563f218a31cbd051108a1f3ab7d04e7b2016d80e5678602e58107047c1f595f77d620f636f470ed453336
-MISC metadata.xml 626 BLAKE2B 5656a8de553bc783b4bd81891421e89b60a5d1693ddab0a0f7cc0ff527fd5c908c872e4797688db87e89cf8e8be12c1f8e0e6e12edfca93f17fe62f8ee688e6b SHA512 f89139edf88000f6767eeb1424ead0fc9a87e9ededbdb4277e73db92a766804182540aa82a0de37b7b708d0f5094fc816be9be2485a8f1af9190cc690cd57176
diff --git a/net-analyzer/nagios-plugins-flameeyes/metadata.xml b/net-analyzer/nagios-plugins-flameeyes/metadata.xml
deleted file mode 100644
index 7bf85b98253c..000000000000
--- a/net-analyzer/nagios-plugins-flameeyes/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sysadmin@gentoo.org</email>
-    <name>Gentoo Sysadmin Project</name>
-  </maintainer>
-  <use>
-    <flag name="smart">
-      Install <pkg>sys-apps/smartmontools</pkg> required for
-      S.M.A.R.T. disk monitoring. Disabling the flag removes the
-      plugin file. This plugin also requires the sudo flag to be
-      enable.
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="github">Flameeyes/nagios-plugins-flameeyes</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild b/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild
deleted file mode 100644
index 351eac1d17cc..000000000000
--- a/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit git-r3 multilib
-
-EGIT_REPO_URI="https://github.com/Flameeyes/${PN}.git"
-SRC_URI=""
-KEYWORDS=""
-
-DESCRIPTION="Flameeyes's custom Nagios/Icinga plugins"
-HOMEPAGE="https://github.com/Flameeyes/nagios-plugins-flameeyes"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="smart samba"
-
-RDEPEND="
-	dev-perl/Monitoring-Plugin
-	sys-apps/portage
-	dev-perl/Time-Duration
-	dev-perl/TimeDate
-	smart? (
-		sys-apps/smartmontools
-		app-admin/sudo
-	)
-	samba? ( dev-perl/Filesys-SmbClient )"
-DEPEND=""
-
-src_compile() {
-	cat - > "${T}"/50${PN} <<EOF
-Cmnd_Alias NAGIOS_PLUGINS_FLAMEEYES_CMDS = /usr/sbin/smartctl
-User_Alias NAGIOS_PLUGINS_FLAMEEYES_USERS = nagios, icinga
-
-NAGIOS_PLUGINS_FLAMEEYES_USERS ALL=(root) NOPASSWD: NAGIOS_PLUGINS_FLAMEEYES_CMDS
-EOF
-}
-
-src_install() {
-	insinto /etc/sudoers.d
-	doins "${T}"/50${PN}
-
-	dodir /usr/$(get_libdir)/nagios/plugins/flameeyes
-	cp -Rp $(find . -type d -mindepth 1 -maxdepth 1 -not -name .git) \
-		"${D}/usr/$(get_libdir)/nagios/plugins/flameeyes" || die
-
-	dodoc README.md
-}
diff --git a/net-analyzer/scanssh/Manifest b/net-analyzer/scanssh/Manifest
index 23d98d94e9b0..a509c5b73df6 100644
--- a/net-analyzer/scanssh/Manifest
+++ b/net-analyzer/scanssh/Manifest
@@ -1,8 +1,5 @@
 AUX scanssh-2.0-fix-warnings.diff 1071 BLAKE2B c92997cd26cd03ec451ebf83a54f19ba86d6b33f90dd666c8637fceb222849b3d2703ca9c8c1645a95186059ccf049ae462d7a4c58486ee8c0d086cb8f73e625 SHA512 b9080dbe7551e905db0744ca36b8690d05d784ad7c4c77f4fcbe64ff603353e998cc28ae45c26e230f594278cdb6f130029aa633166e6636933be44845c27b06
 AUX scanssh-2.0-libdir.diff 4916 BLAKE2B 23fb00f8880e9a2407e919c626328430fc7c09d21bcdb535cf2411b41fc4c623ab04e2411dbdd239e62cc4f6545b9d67d29bab879f6ac268c241d1cd884b2592 SHA512 be01518f156b724439837150f9f02148d6f92c0bac2557419f2f9def9244d29006a6c84ceecf193b6f57830c697d9b650102625cf78787fc59709a2ef2b7847f
 DIST scanssh-2.1.2.tar.gz 147470 BLAKE2B 4cb31a27dd925f071bcb958fc72bef7b7f0455b7d718a15536dae40cee969739628da64a3972e2c5cc9813ef24c5634ca019571783ea20df87c7df80f32da876 SHA512 af4e705c43156b907d6864b12f5832bb4e43d0ff284e34e96b32bbe7986299954d1175880ffe7588f91a939d140b45592fc72dc2bf397f140aed929dbe44a453
-DIST scanssh-2.1.tar.gz 111481 BLAKE2B 08ba8439cd02d597647f865fed68ef9eb32d63726f8d14bebe3b58a067b56eee70e01a1a7911ce69cf4466c0863d92d5d22e0202bb1cc60426ac283855438079 SHA512 1ddff6f8e51735bab28032c8d7cbb641ff0cd19a404a27ab489589ef1e30e3721dd486854eb4fef15368cc53f10c9c2650ffaf7fa7f767dc2202fcc5540ae59c
-EBUILD scanssh-2.1-r2.ebuild 831 BLAKE2B 141448c971983f22bbace5a1888e20eef9ee99597ae44092f271689950be50e3c7f527d782e2740eac24d7c36992684f95aec8c559d93cb262b60de197bc3419 SHA512 50d6179496f1896edb14278af86ae7c9452932579073802017394442c4b8d656fd4bb41952b2bb9ceb6b4f0bd755522f94bab50b04f918468bcf48be9d7839ca
 EBUILD scanssh-2.1.2.ebuild 853 BLAKE2B f0d75a289370b7d1dca290e1865181eb758bae4a2f740f7cfd8e327ef054262306f74033e0c9bf7551cd57901e83c17bb10155d24068dd0a31dde53c05cb8cab SHA512 c0d3d279f685f27aa46e8194fe00af6b93354157deefb1ec926e38203409a7312b58b9305c96cb3bf5457adbe118f5343f969004fcdb2bedb99b006c18cdcf8d
-EBUILD scanssh-2.1.ebuild 641 BLAKE2B 8023919e0452fdaa5420cf90b59466b04070b9c4b1ff733657d5a0b22ab6c870113a9234b1442d88a02b34d91d8504a41eb101e38fd77e8c58c41bb8d61bd59e SHA512 56e016f7ff11ea334c276f011b73870079e1b40bc2baeab621a141722b1f52c9da7f1d16beedc0952b6722907fe5445d3b40b7252141abd99de10e68e3329baa
 MISC metadata.xml 436 BLAKE2B a9ebfd202e124281faf98318aafe911ae9e32201540c68b5e0bc4246d56af9695bb1f3f55b50bf04ffb13afddc8128fb15d75e7995a986577529c2c527278595 SHA512 98f0bb0894f2208336cb9e42bc4445a13c01a851d1a0f964519029c639ec37d7d476cc128e0e9acc0558ad23f2312c8189784f7e08a4cd0e80fb92823fce1da7
diff --git a/net-analyzer/scanssh/scanssh-2.1-r2.ebuild b/net-analyzer/scanssh/scanssh-2.1-r2.ebuild
deleted file mode 100644
index 954e6059dec1..000000000000
--- a/net-analyzer/scanssh/scanssh-2.1-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="network scanner that gathers info on SSH protocols and versions"
-HOMEPAGE="https://monkey.org/~provos/scanssh/"
-SRC_URI="https://monkey.org/~provos/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="
-	dev-libs/libdnet
-	dev-libs/libevent:=
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0-fix-warnings.diff
-	"${FILESDIR}"/${PN}-2.0-libdir.diff
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		DNETINC='' \
-		DNETLIB=-ldnet \
-		EVENTINC='' \
-		EVENTLIB=-levent \
-		PCAPINC='' \
-		PCAPLIB=-lpcap
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin scanssh
-	doman scanssh.1
-}
diff --git a/net-analyzer/scanssh/scanssh-2.1.ebuild b/net-analyzer/scanssh/scanssh-2.1.ebuild
deleted file mode 100644
index d154e29437a3..000000000000
--- a/net-analyzer/scanssh/scanssh-2.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="network scanner that gathers info on SSH protocols and versions"
-HOMEPAGE="https://monkey.org/~provos/scanssh/"
-SRC_URI="https://monkey.org/~provos/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ~ppc64 sparc x86"
-
-DEPEND="
-	dev-libs/libdnet
-	dev-libs/libevent
-	net-libs/libpcap
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0-fix-warnings.diff
-	touch configure
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin scanssh
-	doman scanssh.1
-}
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 9af9059a8201..3948594d5b41 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,6 +1,6 @@
 DIST scapy-2.4.3.tar.gz 2969754 BLAKE2B 83ab6500dbc0424b728253661f03391d450f77b19c0059b8a605a19f48b4ddd7344743310a5cb7c741fcf750876ba125daf883d04714981ff81ef4db97519ae0 SHA512 579e3f326f90e10b2839aee805949e14ecab9431f360ef75e60080a971653e1f48a240d812b8ace77754b01b07a2ddb8533d1e6b18ee8804280bf9b2c237cede
 DIST scapy-2.4.4.tar.gz 3240890 BLAKE2B 38b4fc0c34f229bb33f4d488ae9ba20905db572e3dd3caa15a92e8a33ba7305ba86a2b32a2664779c5085e53d44b4c55336d7afa8d65b90ffa3babcdc94bff25 SHA512 b8ad138ae2563967af07d123339ac73468fadb8f7687123aed364ad6d45198e9039314e17a155c37d01ef084e25571c587330dfd21777527110342c01821a389
 EBUILD scapy-2.4.3.ebuild 1005 BLAKE2B 43241ada322289f7fb8a7f987241dd4115aa0b5a30c575a84b990f2931ea30ede71f4bf2052403e4da4136b6a0a89bd7f1e0c05a351f2714570ede8f0bdd9255 SHA512 429aaeddb0535f18904c064bbd4e08ffba1a8d6519813cae285ab4917fbb78bafc24337eeb30384be8e4da205d5c1a041fb8b30db9075ac09921f4d5a15a7c78
-EBUILD scapy-2.4.4.ebuild 1058 BLAKE2B 261a2d8e4f1de4942b6125ab2388139fee9e0db20788c0e53cf671deb831838f91df1d91550e07268fe1d96759de2a9be04b70ee1585f6dd81a23f344c194af4 SHA512 f99effd1be3bdf062d80acc8f7d0af2c516f5f35bc9bc9d42917ea1c8032d6dbc2053d035b4805441472396886d89377ebac61ea7f6b64fe503ad527cdfead39
+EBUILD scapy-2.4.4.ebuild 1062 BLAKE2B 0c088e31a8dbbdf766a8f7ed9bb1f9520d269d5e38ceea7f63772fb0dd548ebdde1b216a1a23a27b44282a8aed5f926750e8523e370ea2f426ab30d153c396e0 SHA512 d301651cfe9323dcc232f83304174ec2434c7619f43372a2126107c9535a81bb81315f6a99c9a64dd45712cf9ca5dbe25f16bdf27e4a59b5dcdcb89e9edc7b74
 EBUILD scapy-9999.ebuild 983 BLAKE2B 3f1e5d14b6e57ba98659e724a0bab5bd427559b45f492b8f142a2d77b5d07c237754a6f3e12e5f917751972145cceb7cc8eaf0de20171f80d6b46ee75ee19a95 SHA512 63138785e892c083ee8886ff24260089d110ffc25e98d46d8c8331507d09320d44ceebb222336f11a9d8623359c2d98a11f4b594ee223978d8a816caee306079
 MISC metadata.xml 560 BLAKE2B 0031ba40f45dfbd2102459d22ee29248d02147a66124ab694cff2f8127b9eab8a57beaa3b09225851b83acbef4b54d98254bf333b5fe67e3935a8a5ae09b4cee SHA512 cf4e12f89211e5d4cab9a017ad1fa8e99115bb3b071cab99bfd7a593ca089d4902ab6a8e72b083293ac620c6bca5ef88f40db8c790765a2c0a0c7f3907c5a083
diff --git a/net-analyzer/scapy/scapy-2.4.4.ebuild b/net-analyzer/scapy/scapy-2.4.4.ebuild
index 31ea052c82e5..a439d15da991 100644
--- a/net-analyzer/scapy/scapy-2.4.4.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
diff --git a/net-analyzer/trafshow/Manifest b/net-analyzer/trafshow/Manifest
index 568e928501ac..1d5607912ad1 100644
--- a/net-analyzer/trafshow/Manifest
+++ b/net-analyzer/trafshow/Manifest
@@ -4,5 +4,4 @@ AUX trafshow-5.2.3-pcap_init.patch 841 BLAKE2B f338a21de4f75acda08b1fc1f795edca3
 AUX trafshow-5.2.3-tinfo.patch 1864 BLAKE2B c2f908bd07cc31ad5c555e7e4055fb1f3378986cf032e26fbfe33e6213f528120cd9813fa73b0723f1a4f772149e793926cc3daef93a215ae910cd2dae1816d8 SHA512 55414a2f014f046b76c678aa6801ed6d5cb1cd9215854b1e0491192b06e42b71aad88a37507a446d13571cf95796807af06a3094f9167a507b3c4e8f1d3bd056
 DIST trafshow-5.2.3.tgz 142615 BLAKE2B c13ee7c39d598dc78e58b65b49a439ecc9e5630a24f78d2bc5a8ec39fc6aa15c084a291f8e932027108176e7aeeebbf5fb7e2380a64718273e67073869b7d5e9 SHA512 9ea57c319cb177de2d29eaf2a09c06f0bd7efcfc3e50d5fa5cc18f193c6dfc0109d4388ccbaee7bf2db37b5418fc0f4b6ce47a5558b652ecf9e891a813ef8540
 EBUILD trafshow-5.2.3-r1.ebuild 910 BLAKE2B a95d8ba14ae564aa5e815a92b149aca2a80ec52d337ef08d445faaf670b9736de00d094e503116c90703dd17c4be62e09220b0ff3b5381024a5629bf0f61af1d SHA512 a7c762f521e209c3064a3d095f9231554d5900a0989b897079c743383ddd763f89c5d5c7c8d85dda815aed9f08f5ec9fad1e298792c52e811a24a27dd9b1a7ca
-EBUILD trafshow-5.2.3.ebuild 846 BLAKE2B 25e04654fe1e4df05bc428e5ef57c8df0a2c87f6b268740cc506f534149c0a09f347b74a31a812f0ad56c2618aee28c64ce7abea460d68a2b93acf9651bb2c43 SHA512 548e0a060fd84841d71720c80f09ef2b13eea314d07522b534f2de7eb30669bd21b6d47a0c9331fad1e398e922d6e1e0719435367c27b0fd68a1ff50fe3a7943
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/trafshow/trafshow-5.2.3.ebuild b/net-analyzer/trafshow/trafshow-5.2.3.ebuild
deleted file mode 100644
index 9cde85d61f47..000000000000
--- a/net-analyzer/trafshow/trafshow-5.2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Full screen visualization of the network traffic"
-HOMEPAGE="http://soft.risp.ru/trafshow/index_en.shtml"
-SRC_URI="ftp://ftp.nsk.su/pub/RinetSoftware/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="amd64 hppa ~ppc ppc64 sparc x86"
-IUSE="slang"
-
-DEPEND="
-	net-libs/libpcap
-	!slang? ( sys-libs/ncurses )
-	slang? ( >=sys-libs/slang-1.4 )
-"
-
-src_prepare() {
-	cat /usr/share/aclocal/pkg.m4 >> aclocal.m4 || die
-	epatch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-tinfo.patch
-	eautoreconf
-}
-
-src_configure() {
-	if ! use slang; then
-		# No command-line option so pre-cache instead
-		export ac_cv_have_curses=ncurses
-		export LIBS=-lncurses
-	fi
-
-	econf
-}
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 6286e812ee48..c2b467f807f2 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -16,13 +16,19 @@ AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5c
 DIST zabbix-3.0.31.tar.gz 14698394 BLAKE2B b8b5f94fe7fe08385b1b358c628b2047b437e6068dab8c3dbdab03e55e95e27f1b77ede4a1a57c4f79bf4a629d9dc5671bd144c002ace7c915f2fed382ac13b2 SHA512 35fec45667cdf217c2be21a164181f92f8f11ef9bcfb0c8dad914726e7c436bae5f8a97aebc3af82499e37125f4d1896ef74ad061a1ee3cbb674562c22a832b1
 DIST zabbix-4.0.25.tar.gz 17414403 BLAKE2B 5b84c5d61c90b4fbc94ea64994a7b4216fe1e728e3bf71afb5cfa674f3f24bd8d9ab91dbd9d869d5bef8fc83ef168a952ba45db8abeabf51402d92dd4487d8dc SHA512 741373adeab5ad4adccc8909e7adf7c8d2172b49e6c5e23cda057be3b82ea237fabcaa787557ea391861a6c2ad42efb695d36836ce8dfd1532e8a3cf394a7cfb
 DIST zabbix-4.0.26.tar.gz 17412367 BLAKE2B 7b75eeaa1146faed5e7aeeb3944eeb68df9c3e608beddb5b12ccbc8998ee6f0c3913b5f5cfe2b63dbf154a43e8393fc64b8286f805b8d3d08edbd25f21b66ce1 SHA512 7dc54176bd40cd73e2e82844caa317747df611e61b5d2d13a3516d143af9ede29ba5407bfca8aec21c9afcb77f53494ee469a2fc62cef3b91cedfce71803cac3
+DIST zabbix-4.0.27.tar.gz 17426383 BLAKE2B 33381d3705bc7cb9d451b1a536fbb4f92a9e7e321afbe9363a7879cbea3cc5977a4866a5f4d1fb70120804edaffaf869ba8c4321a67898c42c9abe2341ee118b SHA512 54690dd778d09d7309c2e2ea3f0bfc6053ef097888bfccd140484e4677766ded829757eb4dfde7da8ce19335307ddbfbb1c132feabc13cc6727a6d28c1591cfa
 DIST zabbix-5.0.4.tar.gz 19039167 BLAKE2B 82fb27076febe5ba43ff6c829ae22c5b4928d74f14e429c602442c90dfd5d1ce112b66d1782bd313b3300c66c774da4403a2150be7ed6ae56ae4b03a608dd018 SHA512 8ac6b56a221fe73982c30dc7dd2f2b036fa10a2fc38ef54e24dc0dd5d56a096f9c0779965afcaa5d26ee893a9f5fc8189ebc67d4244b325acb851cd8b5b6af73
 DIST zabbix-5.0.5.tar.gz 19153153 BLAKE2B 6f78e690b5a8325739148802a8933d6b1e45a7c08c6f384643d4f85dc8a502be73ff2873cf3ec40cc96c2d892c8866c9f07847b055bef80fda9b00f7333727c5 SHA512 5397672fa170e12120526793b48d01764013467cc259eca61991bc52251c25888dd318ccffa6ed30ac3643104e715ceb70baaeec6eeaddb115ed294c22f5e619
+DIST zabbix-5.0.6.tar.gz 19359566 BLAKE2B 375fcbed08be46c1f17c7979763dcdfb8a51a25c2523037a1992dbb7ceb798a665f5d01e97e2e6ef023d5170e3e71df933e0fc41d27fd905ba190497d6bcd28d SHA512 c136536eab3c0e3527e8db8528656776de8849554e0a85a1644000e51c66b09044b176985de1c6d1dcc1d4ec03fc2456111c4df8d896ca276eeed2744cdd48be
 DIST zabbix-5.2.1.tar.gz 19579218 BLAKE2B 32f8955af5e15dd72f660a2fe1153c8c3d582d9470a87def756516db53a512605fcb67263317ef5980d597d1124324dc15c404e31aa96201105fbd5821549bb8 SHA512 deb69250a91abe24c7988011bfaa369cc13639636b37668ec12e310d92813288adc8e3a2ea7a2a51b0f54d7e6f594277778bb37a481b8f9c3dbb02e528a0cfa0
+DIST zabbix-5.2.2.tar.gz 19745101 BLAKE2B 651184d4645ff4cfac1317326bd846b4707d8556a30c64dd0b5ac923fb2bb4439b120a4c2bf43c1f73b57a919d5f3bfba28e3d9efde6a3f48587c5b7d0b1d7db SHA512 7bb79111ff809a90a5911d7f94f86eddec3a3fa4f91fdfbf013178442de81d22dc13359679570b8d62fe41b664c764c42cbe98936fd195521951aab507933d9b
 EBUILD zabbix-3.0.31-r1.ebuild 9257 BLAKE2B 0fdd5d2a46f61939912b2ad0ebc088f4b77ee1792ee5876845f6aee190396c1418ca40f7da3ab3973f457f66bb0b94a8ac4f98e5fee18a24c35ac86491f294c4 SHA512 fe6705253dec2a4b82698cfc17963d55bee700b974ce6be5c848f0029a875a84599b3919e78915a9662cf47360154cfef60f2604dacd8414f2ca3a7dff46cb47
 EBUILD zabbix-4.0.25.ebuild 9231 BLAKE2B d51de21f9a13f9b4812eef4c3e052f4d807efeb2dfa0ad36cdcbb964e4295fd5cf6642a5f8d578fd9c84f3e43c15ea7a1e7121071cf0bdb2429327c3f627372b SHA512 f35b6ede0825eac946723baf4e5fd75a86d336c2e6df154225c549c8c3097b9c0098c10cee55ebbb39c6cee32d70891d7f131d9fb4525c36fa6e3dfce911fc12
 EBUILD zabbix-4.0.26.ebuild 9233 BLAKE2B 88c1ed41839445811f8ed60013f1d6db671f3ae1b7622fe38460ebf4e1f71594f0d567b28ea268b9859a81ba7df2a0dfaef960c0687a2ed6164699b6430493de SHA512 99f22868531dbd8f9574b5bc7ca96f0c7cfbffad22ffee95d7dba7f90cc89ec9166cfa0a8cdcec2070a49722b6c39a283f82b986dc8886532d6b06d94905bab1
+EBUILD zabbix-4.0.27.ebuild 9233 BLAKE2B 88c1ed41839445811f8ed60013f1d6db671f3ae1b7622fe38460ebf4e1f71594f0d567b28ea268b9859a81ba7df2a0dfaef960c0687a2ed6164699b6430493de SHA512 99f22868531dbd8f9574b5bc7ca96f0c7cfbffad22ffee95d7dba7f90cc89ec9166cfa0a8cdcec2070a49722b6c39a283f82b986dc8886532d6b06d94905bab1
 EBUILD zabbix-5.0.4.ebuild 9100 BLAKE2B 58767e6ebb13985bf734c2afde4c28f49ee125328934cac0e82d8ec6b6fbfd82472c007d7d8821f20e1414659356fe0f2be2b7efe4350e27405c69018b7d8a0d SHA512 afd232493c12f1f2494e31a8776b57fc22d269d2f6f7c1341757ebf3e4808ffd0de06a75e5d16fb1a904a766545c831aa65ddd2b6c1e06b83d1c9969b1525af3
 EBUILD zabbix-5.0.5.ebuild 9102 BLAKE2B 03f011a80a0b3ee224c24ab3d4cfeef0e0307a70202cb7af82b8b043fc6729fe9e1750d018422e50106f2f60b15c09e7ab1becacc271d39e8e6178de67d2fc11 SHA512 f50a8b85390edbf70fac2edd58dba016e69360a36e3485bf5633f59f4dabf6994924b134d42ab7386329e0658e3bc3979ad90b3759c905ac322870b5b97e3839
+EBUILD zabbix-5.0.6.ebuild 9102 BLAKE2B 03f011a80a0b3ee224c24ab3d4cfeef0e0307a70202cb7af82b8b043fc6729fe9e1750d018422e50106f2f60b15c09e7ab1becacc271d39e8e6178de67d2fc11 SHA512 f50a8b85390edbf70fac2edd58dba016e69360a36e3485bf5633f59f4dabf6994924b134d42ab7386329e0658e3bc3979ad90b3759c905ac322870b5b97e3839
 EBUILD zabbix-5.2.1.ebuild 9102 BLAKE2B 03f011a80a0b3ee224c24ab3d4cfeef0e0307a70202cb7af82b8b043fc6729fe9e1750d018422e50106f2f60b15c09e7ab1becacc271d39e8e6178de67d2fc11 SHA512 f50a8b85390edbf70fac2edd58dba016e69360a36e3485bf5633f59f4dabf6994924b134d42ab7386329e0658e3bc3979ad90b3759c905ac322870b5b97e3839
+EBUILD zabbix-5.2.2.ebuild 9102 BLAKE2B 03f011a80a0b3ee224c24ab3d4cfeef0e0307a70202cb7af82b8b043fc6729fe9e1750d018422e50106f2f60b15c09e7ab1becacc271d39e8e6178de67d2fc11 SHA512 f50a8b85390edbf70fac2edd58dba016e69360a36e3485bf5633f59f4dabf6994924b134d42ab7386329e0658e3bc3979ad90b3759c905ac322870b5b97e3839
 MISC metadata.xml 1518 BLAKE2B 3ec0ec6fcb2e8d92209689d685171ad4d97a81d89f60719cc1de88b88c0f91a86a5422359e84c665ed140b6dc764164a75177ac1cc2fa0d624599bcc050d057e SHA512 6a131659395d29c72126ea38648ec273c444497f592f830af6afb7791eff4063de1349059ae11917a3356c22b38f5ac954593394ab03b955183ae8011dd4b173
diff --git a/net-analyzer/zabbix/zabbix-4.0.27.ebuild b/net-analyzer/zabbix/zabbix-4.0.27.ebuild
new file mode 100644
index 000000000000..844a2e68741e
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-4.0.27.ebuild
@@ -0,0 +1,350 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+		net-nds/openldap
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  ( sys-libs/zlib )
+	server? (
+		dev-libs/libevent
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+	ssl? ( dev-libs/openssl:=[-bindist] )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? ( net-analyzer/fping[suid] )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libevent
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2) \
+		$(use_with ssl openssl) \
+		$(use_with xmpp jabber)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-5.0.6.ebuild b/net-analyzer/zabbix/zabbix-5.0.6.ebuild
new file mode 100644
index 000000000000..e393d4a24eba
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.0.6.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+		net-nds/openldap
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  ( sys-libs/zlib )
+	server? (
+		dev-libs/libevent
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+	ssl? ( dev-libs/openssl:=[-bindist] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? ( net-analyzer/fping[suid] )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libevent
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2) \
+		$(use_with ssl openssl)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-5.2.2.ebuild b/net-analyzer/zabbix/zabbix-5.2.2.ebuild
new file mode 100644
index 000000000000..e393d4a24eba
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.2.2.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+		net-nds/openldap
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  ( sys-libs/zlib )
+	server? (
+		dev-libs/libevent
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+	ssl? ( dev-libs/openssl:=[-bindist] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? ( net-analyzer/fping[suid] )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libevent
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2) \
+		$(use_with ssl openssl)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index d47080a7ea7b..a104aaaeafff 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/idnkit/Manifest b/net-dns/idnkit/Manifest
index bf458d2c5cbc..19c86f3e545a 100644
--- a/net-dns/idnkit/Manifest
+++ b/net-dns/idnkit/Manifest
@@ -3,5 +3,5 @@ AUX idnkit-1.0-test-subdirs.patch 289 BLAKE2B 6c9237cd1d17785a5d0a379d610ddc6b6e
 DIST idnkit-1.0-src.tar.gz 432823 BLAKE2B 4e96bed174ea704ec0eb5c6655cb65145ed808b2bf9582ec9b6dcb8606de7a006937a2f8d8fce386dbc328e074b95ca504464c1ed6d16acc7be82d9904f2c2b4 SHA512 74f2db007a1991610f62a7a060d534f724f08395a16a7d76fda0824e9017aa47ffe4e251c90d0481218b70534fcd2b32724a66223042f59c1e16c1ff39f3be19
 DIST idnkit-2.3.tar.bz2 1473267 BLAKE2B efc2a93527c217b32bfd0e2546944b30d39c3fa046e17c11f2084721f966dc838bfa821c88378c0604cbeafb8d4970cf3c19122182448d5e48c2d392a42225c6 SHA512 a0cbc111d4b7d5f444c9b79ae76378fd2edf18097adca27d5ebf811e12091f609ec45d2c62a95b1e295bd1fa644bd8a38d79841f7f4e85dcd1f6a1cd5ca622e4
 EBUILD idnkit-1.0-r2.ebuild 1035 BLAKE2B f1c1f0b78d45d8dd324e496211188a33be3f12e2293df7d835e5ad6ceb71b5c6393398ba046f9cce15af060ff5211658ad348e676bb8417ab3b2fb6df8115415 SHA512 183fd2b7f6330de7e79b073caf961c5388a7c46a91d9d516c8ef9c634a88089122c0c6541bc3ad64318e13eb7904cbaebc8fce58dd3a2c21276f48defc81c3a0
-EBUILD idnkit-2.3.ebuild 637 BLAKE2B 0e62a382af08f436d98bf478e1d36785e1031d146206909df275ce9a29b5aec6c112cda9cee438ab58e883908a32cd18378ea59dbe65cdb24e6212f739e77701 SHA512 8eb7e789d24d0d83078fca0b5797845dfdde498ed5a2731635ccc7360db680d45ab78aae3aca3cc02d1541d6f7fc2e428bce85138c0fbaa87fc396c645c3248f
+EBUILD idnkit-2.3.ebuild 635 BLAKE2B b510282bbfaa8d659515ec5a00393e37fc5bfc490e277d52e3ccfdaeccf5178bf440c29fb6ad5610c39d52fd4313aeea46d3eb1989f68a7657fd991f927898c4 SHA512 63ef55ddb1dd9d9e14bde80d836b9ed28201ec918b6c7b00c33d08bda6fdd71fda6c43ba8a627d49577f8f6698e31f3d50c5d7809d0ce926d15a9424d2cd887c
 MISC metadata.xml 246 BLAKE2B 053eb1eb0345156eb262d7eb10e70636fda57808641af19b715d4d323f19127491fe53e1dc7028454bc4af3f5ed282acd8d8632617b65c2003382193716510ca SHA512 02003cbc53a83f024e07311dc98a6255bcaa23c879f9b7da1263261e323c678bcb80fb0f9c3025076eafedaa0a85a52a98e963d37a692e8902bb9c6d68b54390
diff --git a/net-dns/idnkit/idnkit-2.3.ebuild b/net-dns/idnkit/idnkit-2.3.ebuild
index 4c007067072a..e80d11bc44b0 100644
--- a/net-dns/idnkit/idnkit-2.3.ebuild
+++ b/net-dns/idnkit/idnkit-2.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://jprs.co.jp/idn/${P}.tar.bz2"
 
 LICENSE="JPRS"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="liteonly static-libs"
 RDEPEND="
 	virtual/libiconv
diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index cc64cf5b3d32..8f3410d320c5 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,5 +1,5 @@
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
 EBUILD ldns-utils-1.7.0-r1.ebuild 1194 BLAKE2B bd2ee91e3a1adee034b4864ec624e15531bf27cadd9625744344c5df88a2a5adc0fc6c02045ef36bc4e88042bda9e85ad658c076709cdc413ba5f041dbd9c871 SHA512 a59e00760c948641198c9693f503244b62166cc4f628c1fe49fb6aa3a7abddeb47e616fded6d466e85d982a1d921883d51f0776f88dad3c0162f40d017561b22
-EBUILD ldns-utils-1.7.1.ebuild 1477 BLAKE2B 328eebc9351c221a61e8826ddf6afa4a095f21da009aa4dac5d03c43e60f8407cdd0b81de6e19ed3696fd9f4c11169a7b09f9f7fb9f5cf119394138cf39ce95f SHA512 3bff66b8d5bc9203e4467cc6eca2bb654d2e314aede7692752bcb167cff9f3dfc08027774dafa12388b23a4c08cabcc6d21b0c649fcc5806db1edf6566d5ea3e
+EBUILD ldns-utils-1.7.1.ebuild 1476 BLAKE2B 3394248b15bd9111b06f44836692f55bff86d5b1db7d021e2f204d5e17db9513151198e3a014bfad5528c2f41445960dea9481d891486000328e847e11861153 SHA512 a0fd24e05a4b72ef64d54204066ef87302c761e412dbab4272c6b50962af9de2b7cd41e60c2df6200f63d00025b24070037d0de8014a0712fe0275cbf51c1a37
 MISC metadata.xml 848 BLAKE2B a31c8bfb2c5a90add80c4f608cdbd02e3bf15126726ed92203425b166ae01cf8240fa040d98ba44991cd315bdb388664692eca5820fc807cf3fddefc7663ffb4 SHA512 6ce3c5421c6e739f0c15a5b7e9120638cddc78fa3d9c2f564acfccd4c98bb3034512ce1a68422ba0ef7896750c1a41e273f2960d9d1f0ffc21c9028342482366
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
index 531556705d20..969fdba5b692 100644
--- a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="+dane ecdsa ed25519 ed448 examples gost ssl"
 
 REQUIRED_USE="
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 8876726a4ddb..b45496dd79cf 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -3,9 +3,9 @@ AUX nsd.munin-conf 23 BLAKE2B 0b08804b2218d77ea925d4c9e26e73649b453b923d6d7b1e1d
 AUX nsd.service 272 BLAKE2B 66a7d4132246589f71341afd98361f6b02082be3d4e230c86ae690876a797ea0a4580b29892d91feba2785ea933a053f862e0d00f2c8a8c09ab907386c39a03c SHA512 fbca86887bfc36d61af06992cc98b3f3cb33c39274fbdc1e53d489bdcc767993911fab27a20244c3878b36bacbd1644a552364b2f7bf4d48e6eb247d0eecdf0f
 AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d79b36be3f96486eb89fdd62a42b5ed4816ad99835366864603568613e27504894340ebb64057e2b2c3 SHA512 6034086d6b6f6980468766c901e92291fea8a32df179561ede2add5918c37bfe3aabf122735d4ae2e28efece394fd3398f9a0cc4d8fdcc1e5da1ca709d2ba6ae
 DIST nsd-4.2.4.tar.gz 1148826 BLAKE2B e2508c225d0bebeb9134c6eb3f00dfaf00d2de1a545cf9719b3bf04de8cf4a173ed744ebe5ff50a7062f5fb3135f4e476b9111736442fa358eb6ce20faac8406 SHA512 5d4f546a2a4484b182c65d3337d44596e935bca074c0eda2947b9d128a56db08a00240c6ec9ce22bc9a436e009c00c3283c4a5cbd1163ca4a429eaa92ec54208
-DIST nsd-4.3.2.tar.gz 1177939 BLAKE2B 3c1eac9065c5c8aae3b0a98d43cdbc5d757712656efc7ed912b51b91f4b3b84672a15de8476eba40642d766abd9499bbdeaf71aa6e6720a67ac83a1ed0ea274c SHA512 0423aeddc7f60e04718b6ee0954fbdc274576b6ef61472324256e5db696f41e47899b645cbc4d6d8cc2a7dd00190b72f3ef0476c4640dbb80d36ec39f1c9f5c8
 DIST nsd-4.3.3.tar.gz 1181082 BLAKE2B 611027e015f89a6aef0bc9e0b74242e683a1475f5cd2a79dc16a30011989c33a4d3bd21aced24dc6040469a304414b7e775261b097beb007e06c3c025dbf2b9e SHA512 5e7e2037e0939af20af137c913943904e36cf7da517292d40dbbd4f7ebc878b0e97acd7f6cbbaaebbb525a84f6d6ae9e82c34df9c8482075653c4802777a9fa6
+DIST nsd-4.3.4.tar.gz 1182467 BLAKE2B 10c06be9df393774627a42a7cf254202fe9800e7cd5048d392fbf90a65321a4596e742165b1157b3a0ce0645a80ae5425f7d43eb0a453077e45bff06d52347d4 SHA512 fe332caecfd3c6bb8ae1a92fec26984a7953e5e462515e8622c1079b217c962728e841826cdf7899f47f9ac24af1dd383f8ba7981541b05a2338cd288c40b0a7
 EBUILD nsd-4.2.4.ebuild 3013 BLAKE2B ea358a487f8e18f40a6d5018c04994607c9f7a66e53b31ea70eb24e0386ae15d8e7ac7c0c7196980241420a5de90fd30c980b03f30914febbe725608341fde6a SHA512 52b615e9b4676a35ebf0d3b413ed703c10b65f860adbdc490f9624d31e898dcee34fd01efc8d294b83a517ac54ddd713ab010fb296ade398a1ce4257f0054d01
-EBUILD nsd-4.3.2.ebuild 3015 BLAKE2B e9be556ca875cf52a3f01887d5468388625378356d93ae3a94008d39fb0b8ae68fb06bbe5b328511ff5d633b6130a733bdec8ba6ded8c022f6cc75e8c8393499 SHA512 eda0d29c58cc70eb019767431ec3d32f6e663a0029b02bf4bbabf9b45168f6bfb1620f96e2d23c750760355a95b512afac338d705ab7c11df0b1bfab958c9139
 EBUILD nsd-4.3.3.ebuild 3015 BLAKE2B e9be556ca875cf52a3f01887d5468388625378356d93ae3a94008d39fb0b8ae68fb06bbe5b328511ff5d633b6130a733bdec8ba6ded8c022f6cc75e8c8393499 SHA512 eda0d29c58cc70eb019767431ec3d32f6e663a0029b02bf4bbabf9b45168f6bfb1620f96e2d23c750760355a95b512afac338d705ab7c11df0b1bfab958c9139
+EBUILD nsd-4.3.4.ebuild 3111 BLAKE2B bdaea274538bdf33e0a47cafaa44692ce279c984edee4103cc88c66f85ebd9f656c5d91180bf0b9cf1f6238aab64cda8cbe71d7743a57e3c7c025559317b1bac SHA512 30c31beb8f1477464048f2deb445863173ba7fcce33d5198d584c302269d2645e09840f2268c3451c28fcbe58065611eae46d786ac71666e44bf9a7bf6e0f901
 MISC metadata.xml 1082 BLAKE2B c44a5b7b9cb5ad52ebc55dd52a584cd8b0700977a19d541df1b415164250e390941ef35a0e8633a975e6cbae402719d8c5fe7d452dde5623223b01a7ec4320ac SHA512 a66e71346c6742c77ce38ca73f600dde471f3256928bab79f2015cb88c2f3237a4d69f7b9127ea90c58f584b60b8b676416b0704761ee1455479644fd2cd5a8d
diff --git a/net-dns/nsd/nsd-4.3.2.ebuild b/net-dns/nsd/nsd-4.3.4.ebuild
similarity index 96%
rename from net-dns/nsd/nsd-4.3.2.ebuild
rename to net-dns/nsd/nsd-4.3.4.ebuild
index b6ca20a489b4..46801d6b5f08 100644
--- a/net-dns/nsd/nsd-4.3.2.ebuild
+++ b/net-dns/nsd/nsd-4.3.4.ebuild
@@ -50,6 +50,8 @@ PATCHES=(
 
 src_prepare() {
 	default
+	# Required to get correct pkg-config macros with USE="systemd"
+	# see bugs #663618 and #758050
 	eautoreconf
 }
 
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 42fa8c5789ef..534e5b278988 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index feb7542d320b..e30972c52342 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -1,12 +1,8 @@
 AUX ipt_netflow-2.0-configure.patch 276 BLAKE2B a7c4d51d9c0f5d6d60200cebc74dc022cbc117fb2916792661166d04e456e6f23e8f285c0ab6b713ccfd764ccac0a3a8b41ad2d159c9270ea0480d5f2b1b2482 SHA512 cb7b1a690a69eb68ce57d1b216324de3114c01a6bc2ca7e29fece702be62a0f903e6946426c49a8fcd08295466524eb464127655a8742507f999a318319cd3d0
-AUX ipt_netflow-2.3-flags.patch 1743 BLAKE2B 5c2cf2b603aae5017e685fbfcb76bf0a5be29b0e3f1299d2e72a516d80cd5479b92c463d4bb4ab192b9cd7b59ef59eeef673c12696a79d6517ec7346dbbe3b5c SHA512 b8a74b0f9daf0e532a8015b576b59e13948684bee8d22a2a62cd8d2a11e4d8d5a2d4b257842dab4df379c3549bdb39d9814bebe24573714e3bff2d2d765021ad
-AUX ipt_netflow-2.4-bridge_netfilter.patch 1785 BLAKE2B 45b3e9124bbf17a3e38da1777951db2516abf18988426920f40d56b8c5083c369f52c36f605849590fef06884a566e1573bd6612b62da8e1333be40a7e913734 SHA512 bae60dd8fe7e50eb8e1061e007f2e603b23e04ca45ce60530b85ed626acaa4eeb44d061d48d2e90cc5409c3d7976030ec0a0683a6bd4723379315c4bf0e09730
 AUX ipt_netflow-2.5-gentoo.patch 1944 BLAKE2B 0acb66305cd7f337a271b356f65c2984b445fc245d4de5668ccdff54ef7bb5095fc27148be978f13bc84dfc92be58abda897dacf053a31b10b44caffb5cbabb7 SHA512 781c4286889b2e39f2276de02970306b76f859c87565dff5235cfb1fedd0e7f6cc2a5f1263899f7505317ce22fd73c724a4a1273114adcc6ad2c3cc84069d47d
 AUX ipt_netflow-2.5.1-vlan_dev_priv.patch 1182 BLAKE2B f5522a888133b5411cb6b3e43e2cc2d0457b521a46e26b3f3d6826a84dc016dd8b58195317601ebf49de81031faf9100f95dd547adbda81a9b4814a75c3e147b SHA512 d1d23794871237338102ed148b94a6d0f92997675f6e059fc0f1e94b54aed894dd4325721d8427edcaf6747bd063338b7f94b4ab51904bf76bd98c8380d4e5e2
 AUX ipt_netflow-9999-gentoo.patch 1956 BLAKE2B 4595118518958c379a33e0fd7b6e3769fe764a633876cb46b76517ccec9fe6430fd4441b5509019699003b07966e1b09b257d302d3a1f29c4b437f90bce1c211 SHA512 bf8a723d0cf5a57b49231d444d6e0926b2aa667a5ac8aebdedd92b8271be30e5cbfd330e03ed63969d37a5fb694038378468ae1d4b2483b087785734214d00bd
-DIST ipt_netflow-2.4.tar.gz 92580 BLAKE2B 0197e7e5cdd9c94c7b80b38cb4e2879343139592421922bf73aeaac70ac3af54ea25934bb1474ff455a9f58eab2368995591542f46be48b5c8491a3b6a192f56 SHA512 3c80d02cfda996fbde8d258875df8795000fd8390b5a6f8296771a992067e153eca48f7f4602421529948beaf3030e164adfc2ffe5b528042fbdc15ffb56aa74
 DIST ipt_netflow-2.5.1.tar.gz 94627 BLAKE2B 440daed1f0c02e4700c6d4a97da08abc7bf51c73cd824a67fd2b7b9394b47d493ca7acfea34467d93cdce6dded2c5b24b4a2600b9f717aa54561d1f88a123dbc SHA512 dd0bde358f788f2d62ace6a0b1529128f0a686f9b776deeae3502d45d06d13971e8ea249d2647d00b00e73625c515bc12a4b7bd8d34fafd5f3b32f290d48cdce
-EBUILD ipt_netflow-2.4-r1.ebuild 2427 BLAKE2B 38ee77ea29ed5c32ebd13ec4cf4dc956a05441345e97b0ba732a52f8ecc3e85a9bb87290afa9fe4047c3caa60d40138ae2780b28cfc37c153e8d8cac9a48dfd1 SHA512 5f76b3bc90706f990f6cfa86463cf72a69198a525c7ad60805b7d812611dbf3817f72318cdd07ed280ec0f7035c6d5d980148352c905d6475e0f1059424d6950
-EBUILD ipt_netflow-2.5.1-r1.ebuild 2451 BLAKE2B bb93e5dbb140612d2638e5b93c2e2b965214c5a65fc2b5e29854668dfaeb25205c76ff2c07f7b11a4598a0cab42815267249d526789e49e9fade766c42ecb568 SHA512 cad2cf3860d7fe157f5305edb55d663315066f5c7f4dca44ae97f129c7d91774933f514fadd4950b4aee530305260930b9d8052bf12ff329996e2d5216cc7f77
+EBUILD ipt_netflow-2.5.1-r1.ebuild 2449 BLAKE2B 44c5fce0bab30a9254582ecf024806625a66c8f35b1a24d097b93b99c34dd9a781b61b4449ccc5e4869beae02aa529040ae01c8ae9aceb5f9fae1244eebe69d5 SHA512 5deaca6e58577f0e5269c22cc901663ca8681957d98451cb7e1214e25b36c664bf22a2788bc8f6022ec325a0198b0314e4234a2c85c7909b80d256666b293809
 EBUILD ipt_netflow-9999.ebuild 2433 BLAKE2B 5bc455a234b42e8b53be0f100a0d826cd6092fc037132793d63a46467bed0c42f65683c0d83d1f155662fafc25ba731c3430935867e5efcc8dc2bb8e9f451fe1 SHA512 577a38067db83c0d7c67ba80178b7b6519d8342c61febf9d0bc0de288b6aa94d05bdeaf3fb3d59a20ccfff67efb15cd70bfbcf0a6f1639a19d41147d6a6c1551
 MISC metadata.xml 561 BLAKE2B 8b2d48273d5c27a1996089236e3981c7eff8546e73671136baa8a9ed0c18fb26a56be261b3162e4563878bf54487a0b26e389861a9dbc80af35783491564c7d3 SHA512 6cd4feab99315acfcf34f34fccd9ecb6b00b23efecef622cc638902a4ec62240f3d9f87d1f349a84ec7c4985a90f8632ffcfa9f403b42c26ce9d923ca9e01bc5
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.3-flags.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.3-flags.patch
deleted file mode 100644
index 0d89e5ba90a9..000000000000
--- a/net-firewall/ipt_netflow/files/ipt_netflow-2.3-flags.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -11,7 +11,7 @@
- SNMPTGSO = /usr/lib/snmp/dlmod/snmp_NETFLOW.so
- SNMPCONF = /etc/snmp/snmpd.conf
- SNMPLINE = dlmod netflow $(SNMPTGSO)
--CC = gcc
-+$(CC) ?= gcc
- 
- # https://www.kernel.org/doc/Documentation/kbuild/modules.txt
- # https://www.kernel.org/doc/Documentation/kbuild/makefiles.txt
-@@ -22,29 +22,29 @@
- 
- ipt_NETFLOW.ko: version.h ipt_NETFLOW.c ipt_NETFLOW.h compat.h Makefile
- 	@echo Compiling for kernel $(KVERSION)
--	make -C $(KDIR) M=$(CURDIR) modules CONFIG_DEBUG_INFO=y
-+	$(MAKE) -C $(KDIR) M=$(CURDIR) modules CONFIG_DEBUG_INFO=y
- 	@touch $@
- sparse: | version.h ipt_NETFLOW.c ipt_NETFLOW.h compat.h Makefile
- 	@rm -f ipt_NETFLOW.ko ipt_NETFLOW.o
- 	@echo Compiling for kernel $(KVERSION)
--	make -C $(KDIR) M=$(CURDIR) modules C=1
-+	$(MAKE) -C $(KDIR) M=$(CURDIR) modules C=1
- 	@touch ipt_NETFLOW.ko
- coverity:
- 	coverity-submit -v
- 
- minstall: | ipt_NETFLOW.ko
- 	@echo " *"
--	make -C $(KDIR) M=$(CURDIR) modules_install INSTALL_MOD_PATH=$(DESTDIR)
-+	$(MAKE) -C $(KDIR) M=$(CURDIR) modules_install INSTALL_MOD_PATH=$(DESTDIR)
- 	$(DEPMOD)
- mclean:
--	make -C $(KDIR) M=$(CURDIR) clean
-+	$(MAKE) -C $(KDIR) M=$(CURDIR) clean
- lclean:
- 	-rm -f *.so *_sh.o
- clean: mclean lclean
- 	-rm -f *.so *.o modules.order version.h
- 
- snmp_NETFLOW.so: snmp_NETFLOW.c
--	$(CC) -fPIC -shared -o $@ $< -lnetsnmp
-+	$(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $< -lnetsnmp
- 
- sinstall: | snmp_NETFLOW.so IPT-NETFLOW-MIB.my
- 	@echo " *"
-@@ -64,7 +64,7 @@
- 	fi
- 
- %_sh.o: libipt_NETFLOW.c
--	$(CC) $(CFLAGS) -O2 -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c libipt_NETFLOW.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c libipt_NETFLOW.c
- 
- %.so: %_sh.o
- 	$(CC) -shared -o $@ $<
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.4-bridge_netfilter.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.4-bridge_netfilter.patch
deleted file mode 100644
index cde23bc9fe7c..000000000000
--- a/net-firewall/ipt_netflow/files/ipt_netflow-2.4-bridge_netfilter.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 9288e30f493d252ee85b492a894f78073e4f6d41 Mon Sep 17 00:00:00 2001
-From: ABC <abc@openwall.com>
-Date: Sat, 28 Sep 2019 23:29:40 +0300
-Subject: [PATCH] Don't compile physdev-override if BRIDGE_NETFILTER is
- disabled.
-
-Fixes #120 "Compile error nf_bridge / nf_trace" reported by DocMAX.
-
-Fixes: 51bdc2b ("Use nf_bridge_info_get() instead of skb->nf_bridge").
----
- compat.h      | 2 ++
- configure     | 1 +
- ipt_NETFLOW.c | 5 +++++
- 3 files changed, 8 insertions(+)
-
-diff --git a/compat.h b/compat.h
-index 0f9896b..66e224b 100644
---- a/compat.h
-+++ b/compat.h
-@@ -680,11 +680,13 @@ static inline int is_vlan_dev(struct net_device *dev)
- #endif
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(5,0,0)
-+# ifdef CONFIG_BRIDGE_NETFILTER
- static inline struct nf_bridge_info *
- nf_bridge_info_get(const struct sk_buff *skb)
- {
- 	return skb->nf_bridge;
- }
-+# endif
- #endif
- 
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0)
-diff --git a/configure b/configure
-index 74eece5..8aae8bf 100755
---- a/configure
-+++ b/configure
-@@ -470,6 +470,7 @@ kernel_check_config() {
-   kconfig CONFIG_NF_CONNTRACK_EVENTS	"natevents"
-   kconfig CONFIG_IPV6			"IPv6"
-   kconfig CONFIG_IP6_NF_IPTABLES	"ip6tables target"
-+  kconfig CONFIG_BRIDGE_NETFILTER	"physdev override"
- }
- 
- kernel_check_include() {
-diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
-index fe25655..064de6c 100644
---- a/ipt_NETFLOW.c
-+++ b/ipt_NETFLOW.c
-@@ -83,6 +83,11 @@
- #if defined(CONFIG_NF_NAT_NEEDED) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
- # include <net/netfilter/nf_conntrack_timestamp.h>
- #endif
-+#ifdef ENABLE_PHYSDEV_OVER
-+# ifndef CONFIG_BRIDGE_NETFILTER
-+#  undef ENABLE_PHYSDEV_OVER
-+# endif
-+#endif
- 
- #define IPT_NETFLOW_VERSION "2.4"   /* Note that if you are using git, you
- 				       will see version in other format. */
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild
deleted file mode 100644
index e36de51a30c8..000000000000
--- a/net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit linux-info linux-mod toolchain-funcs
-
-DESCRIPTION="Netflow iptables module"
-HOMEPAGE="
-	https://sourceforge.net/projects/ipt-netflow
-	https://github.com/aabc/ipt-netflow
-"
-SRC_URI="https://github.com/aabc/ipt-netflow/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug natevents snmp"
-
-RDEPEND="
-	net-firewall/iptables:0=
-	snmp? ( net-analyzer/net-snmp )
-"
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984
-	"${FILESDIR}/${PN}-2.3-flags.patch"
-	"${FILESDIR}/${P}-bridge_netfilter.patch"
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q"
-	use debug && CONFIG_CHECK+=" ~DEBUG_FS"
-	if use natevents; then
-		CONFIG_CHECK+=" NF_CONNTRACK_EVENTS"
-		if kernel_is lt 5 2; then
-			CONFIG_CHECK+=" NF_NAT_NEEDED"
-		else
-			CONFIG_CHECK+=" NF_NAT"
-		fi
-	fi
-
-	BUILD_TARGETS="all"
-	MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})"
-	IPT_LIB="/usr/$(get_libdir)/xtables"
-
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	mv "${WORKDIR}"/${PN/_/-}-* "${WORKDIR}"/${P} || die
-}
-
-src_prepare() {
-	default
-
-	# Checking for directory is enough
-	sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die
-}
-
-do_conf() {
-	tc-export CC
-	echo ./configure $*
-	./configure $* ${EXTRA_ECONF} || die 'configure failed'
-}
-
-src_configure() {
-	local IPT_VERSION="$($(tc-getPKG_CONFIG) --modversion xtables)"
-	# this configure script is not based on autotools
-	# ipt-src need to be defined, see bug #455984
-	do_conf \
-		--disable-dkms \
-		--enable-aggregation \
-		--enable-direction \
-		--enable-macaddress \
-		--enable-vlan \
-		--ipt-lib="${IPT_LIB}" \
-		--ipt-src="/usr/" \
-		--ipt-ver="${IPT_VERSION}" \
-		--kdir="${KV_DIR}" \
-		--kver="${KV_FULL}" \
-		$(use debug && echo '--enable-debugfs') \
-		$(use natevents && echo '--enable-natevents') \
-		$(use snmp && echo '--enable-snmp-rules' || echo '--disable-snmp-agent')
-}
-
-src_compile() {
-	emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" LD="$(tc-getLD)" OBJDUMP="$(tc-getOBJDUMP)" all
-}
-
-src_install() {
-	linux-mod_src_install
-	exeinto "${IPT_LIB}"
-	doexe libipt_NETFLOW.so
-	use snmp && emake DESTDIR="${D}" SNMPTGSO="/usr/$(get_libdir)/snmp/dlmod/snmp_NETFLOW.so" sinstall
-	doheader ipt_NETFLOW.h
-	dodoc README*
-}
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
index 8fa83402adaa..d64a581002f0 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/aabc/ipt-netflow/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="debug natevents snmp"
 
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index e72591100ffa..10b8a8e25bb4 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index 40b065faebbc..d3e789e907ff 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST element-desktop_1.7.9_amd64.deb 67635220 BLAKE2B c339638a00562d17258d7a311f51662e2eedc548c5131103186a3af312041e324891393c9f4228fe09c7f672aaa4c73a027a571cae89192d193d9c07e4028c03 SHA512 4011b91657f8fd7c39257c1ebbe0a92ad0d58729044ef4db569c0d72fcaf42250853c4c75aec7ea7dca756add2d3e0c2bab24c5ddd2ad4c884c6546372297a72
-EBUILD element-desktop-bin-1.7.9.ebuild 1756 BLAKE2B 38263e9a6b73cb8c4137e14971a5ef4812e3122cdcb0dd6f7908824f052b1c4f198ea987d5528eba089193976ce6212f0aca498e227d6206247b9d0e95102322 SHA512 8889e14c06b17da6af08ddbb01cef5208a14d1cfcf796587aa1a78374994de7a61f1770a0b485f04db6ce839ea9052d19c318ca1b07e00ff15fa4eeeb88415f3
+DIST element-desktop_1.7.14_amd64.deb 67755832 BLAKE2B 0d67d53bf8bb6e5ee6a538c061ad5633a9be169963663ccd0acf4be257c94e855d53f765cd860d8cd5fde57e5ec7b72c838bf16413e19fe4d4046189a54e21fe SHA512 ff99e055d834dbc2f683fa2c62d3abdfc1b41f07e0feddb0909da3d95437bb0cd9767493d8acfcc0a9b82041141e57185bef803e0ed5568af0df96b7dc729dc2
+EBUILD element-desktop-bin-1.7.14.ebuild 1756 BLAKE2B 38263e9a6b73cb8c4137e14971a5ef4812e3122cdcb0dd6f7908824f052b1c4f198ea987d5528eba089193976ce6212f0aca498e227d6206247b9d0e95102322 SHA512 8889e14c06b17da6af08ddbb01cef5208a14d1cfcf796587aa1a78374994de7a61f1770a0b485f04db6ce839ea9052d19c318ca1b07e00ff15fa4eeeb88415f3
 MISC metadata.xml 349 BLAKE2B 28ef90d142ba536df4df0e57bc4b9dd3ea565b038bebefe71c2a2d9325761625922f928707a99833e3edb4cd2bb8083757b02ad81abc620571d4eb3620df72c1 SHA512 20596473ae86afc73bf80be067fdc7104ba8fcea6aa319e5fcc26397612dad2a724876a5748babff0f13f020d2bd246ae24f9805c8db9da70e86ae52ea3dc61e
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.7.9.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.7.14.ebuild
similarity index 100%
rename from net-im/element-desktop-bin/element-desktop-bin-1.7.9.ebuild
rename to net-im/element-desktop-bin/element-desktop-bin-1.7.14.ebuild
diff --git a/net-im/err/Manifest b/net-im/err/Manifest
index 06e8491f0eee..008078bef012 100644
--- a/net-im/err/Manifest
+++ b/net-im/err/Manifest
@@ -3,4 +3,4 @@ AUX errd.confd 167 BLAKE2B b55dc0ba17dfc50d6958ee7a547f1db1dfcedec6d117507b5a7b5
 AUX errd.initd.2 512 BLAKE2B 48eed9e9e2bd5c1f23c63bbae10750c8e638c4f6ce286dc7e56799a45f986dbdcd359ee9f6c06e9bc33bd249c41ea08f0e6692f47b17229b9e7eb51e52d0f6e5 SHA512 caa47f7252c3ff04c47ed6c3174e4121dd600d1f4601f8a08275d1bc072e25f3b6125ba73d6c9c90af67dcc72da3ffbe875c83f756d75208af916a5d7ef672fb
 DIST errbot-6.1.4.tar.gz 207370 BLAKE2B 187e87cc36393f85c1405a29d332d703cdd2ac9d9c6b50178ff7382bc5feb620b69a77dc21ce8144fc24045f11067865c7273118fc25ec1ad9afb93d6ccc635e SHA512 60cc8f070e2420e4ef5f0124eb6d03b3cf01c44e148ebb8b92f5b504eb6968c754fd82771da9528daab62c9e9f4d6ef97ab1063f1093163208521b26e36b2f2d
 EBUILD err-6.1.4.ebuild 2398 BLAKE2B 7473ede2525b2d21818eb4eb30b172f301f54ed72b744ea046ba9f3f60172dfbdf125d98a2650bd2001d4d86ba1b5b09279f47f405719bb359863ac600f69401 SHA512 1eca01501945beb4d87dec19657f64266335846da4d5fb8a8db63a76ec018b631fe91d462994397540ef5a8abe6b4bed44669fd47e83d44d939d8203eb334707
-MISC metadata.xml 460 BLAKE2B 8c1deeb593953a71ed352b3491fc87e138550a6f943e4892a1482175241f6050f137797ce65f4f84d7241db57c0280eb83f264bb9958f3d3f0ae5aaf72f7e9af SHA512 bf07d6c10087bd3f64d028f35874f6f3a4a0d09dbaa97a8750d577914fde1e95c583e4b22d34e7d96a75a4fa6ef98acf3983f9fb81c0d11b10fa2d40a1a5012c
+MISC metadata.xml 380 BLAKE2B f7ff1d900aeb6780d50175a0305a1d625a7d46419afdf40e51217935efeca4eaf95436a16794d51f7589a0fa7f22a51802051029ffd63db1e74727bab2169d43 SHA512 54aef259890a22f028adf553b29b1b2e96363f6c53b4986b894cbd70511b8c7c372571053f6f6e4b7bdce16b0d8e22ac48d7fd7b8916cfe29ee4e938bc42057a
diff --git a/net-im/err/metadata.xml b/net-im/err/metadata.xml
index f1f4f68229d0..abf56ae3f09c 100644
--- a/net-im/err/metadata.xml
+++ b/net-im/err/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="irc">Pull optional dependencies, needed for IRC backend</flag>
 	</use>
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index c2c60b6426e1..6c5443aabb3c 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 69607c048382..fa2eee675d59 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,4 +1,6 @@
 AUX gnutls-3.6.15-skip-dtls-seccomp-tests.patch 477 BLAKE2B 4c1add5ab8041b7847c0b579d77483b9fc0f779bb24e3ba50953c2ca2b2bfc7774861085da3d9709fdf250c450cc77aa312095f816bf67748b5d2b5bed4f43ee SHA512 6f2dc20dbdd27875a964aa806380556f4a3da1d2c0c4f7337e0845fb304319b5b9ad94ba519982a4db75486f673a717e20c294487b2d3e339bf7d144a0f33803
 DIST gnutls-3.6.15.tar.xz 6081656 BLAKE2B 6c52419037e41e817087a2577a6b73969cf065453ecf88e2f87152f544a177e4ad0ef825ae9dab243312e0223a953ab28e532bd2dbf96cb9498618415bc7f654 SHA512 f757d1532198f44bcad7b73856ce6a05bab43f6fb77fcc81c59607f146202f73023d0796d3e1e7471709cf792c8ee7d436e19407e0601bc0bda2f21512b3b01c
-EBUILD gnutls-3.6.15.ebuild 4294 BLAKE2B 3f7bd20ce57309eb02ba94c615c9e2b45c75a8568027bf85eb364045d8facfa0374487a9a9280ed7143bd69e49042cc98618865c83c2ff6518e742a4c65c0075 SHA512 67a1a1bd6da65dc47be4b4cc5580946ad85c68885c4baf19831617ca2c0f63a1c3c4872048df4e89c23844ff51a14652454c2bddc8b70e75f89a45bcc2c855f1
+DIST gnutls-3.7.0.tar.xz 6129176 BLAKE2B 3b03e7017ac1d715c740f8f09b0690dd1c983dcfd5faef0740cf66ac785c1a84e959f85808aa10a6eebd745d96ca0293681049911ea663aeff85fedfa2567aad SHA512 5cf1025f2d0a0cbf5a83dd7f3b22dafd1769f7c3349096c0272d08573bb5ff87f510e0e69b4bbb47dad1b64476aa5479804b2f4ceb2216cd747bbc53bf42d885
+EBUILD gnutls-3.6.15.ebuild 4315 BLAKE2B c451f75c65ea442bffbf56c29e161946ecf70006edec3c1496feff2eb5585eeade30fda535658a2ec17b5bb751c13c77caf285cded5eb57dcdf188076e86877b SHA512 ab68c63f942f032f093bddec410edeb12d0d553b1572f5fcab4f4205c63a6c0af2c5c65c4eb05bb686ff60dea6574cfef134598b612f25c69fa98e97c5ff5f5a
+EBUILD gnutls-3.7.0.ebuild 4251 BLAKE2B 4190cf568be96a624156a5156568c9f29479e2dc534cdc21d3b67d12a676ff417ca5feeb58678db1a1a48d40e1f9dbc1c1afa9f55d5b64bd4b8922d68ddf2f11 SHA512 edaaf1006d559fa68bec37f5312de542968c34e13950469206b5f2bb8e636abecb12897dd01f11b0ba29d4676ed573919227685718e7f519e800c89b76637709
 MISC metadata.xml 1258 BLAKE2B 4dbd1ceb49d79ae699d79471e636807b79f68d6e81f403d8c458eb5110dbf172d5839ea1550a32581bac1da039549731d397e91069570a76c8ef0c871feccad5 SHA512 749eb5f798cd04170a5dcf44c2e7fbc26e19210217791d92c0fdb1a53586a219c183686c74385bed1ff0f743b9972fa1d92fc216f53d3870127d39a6b3adb87a
diff --git a/net-libs/gnutls/gnutls-3.6.15.ebuild b/net-libs/gnutls/gnutls-3.6.15.ebuild
index b0da1cec679a..4103ba431769 100644
--- a/net-libs/gnutls/gnutls-3.6.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.15.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 inherit libtool multilib-minimal
 
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
+DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
+HOMEPAGE="https://www.gnutls.org/"
 SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1+"
diff --git a/net-libs/gnutls/gnutls-3.7.0.ebuild b/net-libs/gnutls/gnutls-3.7.0.ebuild
new file mode 100644
index 000000000000..48cc53ce4156
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.7.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
+HOMEPAGE="https://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="GPL-3 LGPL-2.1+"
+SLOT="0/30" # libgnutls.so number
+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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
+
+REQUIRED_USE="
+	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
+RESTRICT="!test? ( test )"
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
+	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
+	tools? ( sys-devel/autogen:= )
+	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-2:=[networking] )
+	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? (
+		seccomp? ( sys-libs/libseccomp )
+	)"
+BDEPEND=">=virtual/pkgconfig-0-r1
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	tools? ( sys-devel/autogen )
+	valgrind? ( dev-util/valgrind )
+	test-full? (
+		app-crypt/dieharder
+		>=app-misc/datefudge-1.22
+		dev-libs/softhsm:2[-bindist]
+		net-dialup/ppp
+		net-misc/socat
+	)"
+
+DOCS=(
+	README.md
+	doc/certtool.cfg
+)
+
+HTML_DOCS=()
+
+pkg_setup() {
+	# bug#520818
+	export TZ=UTC
+
+	use doc && HTML_DOCS+=(
+		doc/gnutls.html
+	)
+}
+
+src_prepare() {
+	default
+
+	# force regeneration of autogen-ed files
+	local file
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	# don't try to use system certificate store on macOS, it is
+	# confusingly ignoring our ca-certificates and more importantly
+	# fails to compile in certain configurations
+	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	local libconf=()
+
+	# TPM needs to be tested before being enabled
+	libconf+=( --without-tpm )
+
+	# hardware-accell is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	# Cygwin as does not understand these asm files at all
+	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	local myeconfargs=(
+		$(multilib_native_enable manpages)
+		$(multilib_native_use_enable doc gtk-doc)
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable guile)
+		$(multilib_native_use_enable seccomp seccomp-tests)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable test-full full-test-suite)
+		$(multilib_native_use_enable tools)
+		$(multilib_native_use_enable valgrind valgrind-tests)
+		$(use_enable cxx)
+		$(use_enable dane libdane)
+		$(use_enable nls)
+		$(use_enable openssl openssl-compatibility)
+		$(use_enable sslv2 ssl2-support)
+		$(use_enable sslv3 ssl3-support)
+		$(use_enable static-libs static)
+		$(use_enable tls-heartbeat heartbeat-support)
+		$(use_with idn)
+		$(use_with pkcs11 p11-kit)
+		--disable-rpath
+		--with-default-trust-store-file="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt"
+		--without-included-libtasn1
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index c02b05d473d9..ff4dff03e3f6 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -3,5 +3,5 @@ AUX libetpan-1.9.4-CVE-2020-15953.patch 2880 BLAKE2B a31fcc50b16d6644ce091aaf7f3
 AUX libetpan-1.9.4-berkdb_lookup.patch 1036 BLAKE2B 594741b66faa63de15acab4ce1f344fb22d2fa7c5c6cf75d2bd6c890d4117bda5978738d98a3ee3adf69f9ddb41922e36cd261ee71e9d8f012423cd99acc19a9 SHA512 561e0b82e080a31e668cc354be36e54101742b8d32f1067f53536afdd9e0cde2eecbd5516b93e8c304f60a1b083c6e68b4442afcca88235471f0038144202194
 AUX libetpan-1.9.4-pkgconfig_file_no_ldflags.patch 809 BLAKE2B 0b615bb488f28f468f6224362788fcdb11def5b6907c10d0bf0eee5d9d9bd6af32e9b011d4af43d3a7d8cd78086875faa4d229c96fca1895cad9576756442b45 SHA512 b830b2d2a04173bbbdb7b62f9f855eab25bbe3d970fbd69c37213ece957b4d682f36002b9694b4dcf89232ace2d809902561003b5f6fb76ec5ae0db9e6e462e0
 DIST libetpan-1.9.4.tar.gz 5000025 BLAKE2B dd98169134b7448d3dd129814d8011a3fa915b16f4763344230a89d02626b64ddea57495b4c21fd8f651164c36c95ad98ee9db073273b230e6af403b845aa681 SHA512 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f
-EBUILD libetpan-1.9.4-r1.ebuild 2241 BLAKE2B 5fae2fefb926cb18683a4d25aed22388fcec0ec1984d7e53c1aae5c23a7535ed90e6ccc6ea9f456eabdb808147bb707797bd7a46a327c9137657056665121092 SHA512 392a8ebc34536dd94530e9a63d3591e7a4528e46f0887715f206ebdc549be7e4b7919ceb9f6b3479c0ac6c254040e0c34a447404dfac7f7a15a24829fa77609a
+EBUILD libetpan-1.9.4-r1.ebuild 2248 BLAKE2B c740188ec44619a153def6f10c0391d8a763d038fe2bf58dae2131fcb0b6d6768829afa26299bf3e12aafbd8533ee19c1805df2add1503985510683fbcc7e40e SHA512 132aa5c9ea5b0961b1b803cb8d843f56aa49979832fcfd287a63bc48de6d3965d8365431ea1128b40f3db85087919ed4a8c24fa6f4655c98a21c32dad18d79c9
 MISC metadata.xml 828 BLAKE2B c33cbf260d3d2f9529101c441cf49fcce001deec2b23c22a63715ff2ecc0e105c46a37e0aaf9641449d88e57b148d5fbca534a3b81475ffe795aeb07f5c1441f SHA512 5e13ad73cf38a8e4690506fc56f3482d72675622d3882c4cae335c5146c6cd9a942eca23834d1a010d3edb7deca8325d9f4ff576b59a3879b47966489fd28a65
diff --git a/net-libs/libetpan/libetpan-1.9.4-r1.ebuild b/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
index ccf8dbd57368..bea0cf416ce8 100644
--- a/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
+++ b/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs"
 
 # BerkDB is only supported up to version 6.0
diff --git a/net-libs/libosmo-abis/Manifest b/net-libs/libosmo-abis/Manifest
deleted file mode 100644
index b609387b5a92..000000000000
--- a/net-libs/libosmo-abis/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD libosmo-abis-9999.ebuild 470 BLAKE2B f67deca8e992f0701d5d3bd34a57bb56783e3ce2e6bd52fa2a38cb210a46ea70b351c17ff525e97c447edb79a6b059f1693ed87d95a41b2ef73e3dd3fff9de8a SHA512 bf886f9acfd03e63f197a21ba83e36cbd51f40fdf7a4e5147a7e42494c2856cff9c8d863b0c77b5ee01aaf1c6100baf1a0323ffa2bf95f3e51ce8d9add8488c6
-MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-libs/libosmo-abis/libosmo-abis-9999.ebuild b/net-libs/libosmo-abis/libosmo-abis-9999.ebuild
deleted file mode 100644
index 3574747f1b9d..000000000000
--- a/net-libs/libosmo-abis/libosmo-abis-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools git-r3
-
-DESCRIPTION="Osmocom library for A-bis interface"
-HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/libosmo-abis"
-EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-
-LICENSE="GPL-2 LGPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="net-libs/ortp
-	>=net-libs/libosmocore-0.11.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/net-libs/libosmo-netif/Manifest b/net-libs/libosmo-netif/Manifest
deleted file mode 100644
index 10f5d9a6c117..000000000000
--- a/net-libs/libosmo-netif/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD libosmo-netif-9999.ebuild 469 BLAKE2B befc32dd75b81387007d294f9933cfb1022e7589191972691c0a7d92898930464ac76b59528c22840d5379aa5e5c2014d4f9b83feb9ad412e3edee143829b4a1 SHA512 12d0842931ce28a00531889f6d2e2c08b15bf4182603ce5c19c00d56b5855cfc50d2851f62105b916223d97dc32af8236d9ab7c0614bca1f215da410614b08d0
-MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-libs/libosmo-netif/libosmo-netif-9999.ebuild b/net-libs/libosmo-netif/libosmo-netif-9999.ebuild
deleted file mode 100644
index d2b2772d8afa..000000000000
--- a/net-libs/libosmo-netif/libosmo-netif-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils git-r3
-
-DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
-HOMEPAGE="http://bb.osmocom.org/trac/wiki/"
-EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-KEYWORDS=""
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="net-libs/libosmocore net-libs/libosmo-abis"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eautoreconf
-}
diff --git a/net-libs/libosmo-netif/metadata.xml b/net-libs/libosmo-netif/metadata.xml
deleted file mode 100644
index 1570f891c6a3..000000000000
--- a/net-libs/libosmo-netif/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index 3e9724fbbcb1..46fd0eaed1f7 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -17,5 +17,5 @@ EBUILD librsync-2.0.2.ebuild 608 BLAKE2B 4d452311f2727375b3e4934b6abbddf83c09a13
 EBUILD librsync-2.1.0.ebuild 611 BLAKE2B c7a769d9d594417d1218f13be7aacf42da098a22f2563f19b437d96058c742cc45aca890fc156bd1532f3f722eafae6861e0248eee4f6a96044c1f3a2647a238 SHA512 54155f0e126bea498763f15aa2dc747d1edaba0d84ce6045e386c3acde3306e6d094e16f55e2afee0e97e90330d3ac829e313db0c9ad7214194e6abd2af17347
 EBUILD librsync-2.2.1.ebuild 611 BLAKE2B 07e6107faf15ad3c3c969df45a0b5069e068f702610ff74cd941e3e2d40f02e68740606e2af4b3f975696d907867337ee423c6bdacd5d0d466495fdb8531ec58 SHA512 01131e9a9b9797220767a9000cc0cf16bfe591eda90bcdcbe30f1f9a5a4adf09717922366532ace47225ba82155dc3387935d2fcaecbea50c6f69edd0ba4a912
 EBUILD librsync-2.3.0.ebuild 611 BLAKE2B 07e6107faf15ad3c3c969df45a0b5069e068f702610ff74cd941e3e2d40f02e68740606e2af4b3f975696d907867337ee423c6bdacd5d0d466495fdb8531ec58 SHA512 01131e9a9b9797220767a9000cc0cf16bfe591eda90bcdcbe30f1f9a5a4adf09717922366532ace47225ba82155dc3387935d2fcaecbea50c6f69edd0ba4a912
-EBUILD librsync-2.3.1.ebuild 611 BLAKE2B 07e6107faf15ad3c3c969df45a0b5069e068f702610ff74cd941e3e2d40f02e68740606e2af4b3f975696d907867337ee423c6bdacd5d0d466495fdb8531ec58 SHA512 01131e9a9b9797220767a9000cc0cf16bfe591eda90bcdcbe30f1f9a5a4adf09717922366532ace47225ba82155dc3387935d2fcaecbea50c6f69edd0ba4a912
+EBUILD librsync-2.3.1.ebuild 608 BLAKE2B 8cd189ab12701d98ced183850f9d79736859ff282ca897941cf3c3c977345b5fb7b8abd2205c3c6f346b7b28a670a7112ed0929afd9a953d4f71dd793d84c128 SHA512 7e3f5eb282d39123bf0567f0bb5a2ca1770bb40ab1cfc2dfbb38cd1423b988d15e4e36c8ae637f2d25f29f17e53588058a1cad55eedd030af8da1623570c218a
 MISC metadata.xml 388 BLAKE2B e0e7f313d2baa7954ea0c1f5dcdeac08c196a55ac99e218ae4dfe0dd7ef67f8855bcbf4e63f1b00721ed9c336cc2f3a9010b05006c2b9a144e659d4a9b8b0504 SHA512 ab83505af5ac18233945e6ec0a2318be8e6ac01120d28164849ab888b1f9023305afea214338049dec008885eb492a0513a9beb2491aa363950806c651eb1525
diff --git a/net-libs/librsync/librsync-2.3.1.ebuild b/net-libs/librsync/librsync-2.3.1.ebuild
index 4a6965cbd509..33ab53ba7c2e 100644
--- a/net-libs/librsync/librsync-2.3.1.ebuild
+++ b/net-libs/librsync/librsync-2.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/2.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="
 	dev-libs/popt
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
index 08073a98ba90..0db340b79cf3 100644
--- a/net-libs/libsmi/Manifest
+++ b/net-libs/libsmi/Manifest
@@ -2,5 +2,5 @@ AUX libsmi-0.4.8-CVE-2010-2891.patch 476 BLAKE2B d93f008527b01c2f9d1fed934c88632
 DIST libsmi-0.4.8.tar.gz 4104111 BLAKE2B af7fe812d8dd6cbd538fbb9d5671f9478b6c3bf4b251eb0729142f56aacc87fd8aa38927f92ebb4f546069e81391e85be338fec92979cd462efe614e16220754 SHA512 c4f5f30c9fbf26c2e0d87e29783794014a518a7494c17112b1970b5434c698d06ffd529ea58eb7856a0f86a30f1059aaf49d4fbdf39db971d9114d427d8a1863
 DIST libsmi-0.5.0.tar.gz 4798883 BLAKE2B 37e9b0160f131db52fb68bd0b3eb0555b1cfb588aefb8e094fc50eec28b31f315907cd602f262d9f6c1ef887de148350da4747e0587b5518dac7376981fc12ae SHA512 be82e6b7054426e4634ac9d90467b89a51a9c836273c9d516f07ff3cec3a8dcc8b3bb0e0396d5facec3d9c952b17fb67f24ff2d3959e7e5cf9eced72023a0708
 EBUILD libsmi-0.4.8-r1.ebuild 989 BLAKE2B c0e313ce7f28a9f4bd7154a65ca5a595b8ecb22bd90e4c8e13661813acc257fee594fb737aabed99b1b3cf231e5172177ef4b3e6f487aa8413adcf54f2cadbc8 SHA512 dc7aa0631fb98736d7bc2e9931780584843d4739a1a45aa293ca8c9afddaa2619f46301e127133d48387b787d354fc947368d92e64f25c8d770a936beb60b66e
-EBUILD libsmi-0.5.0-r1.ebuild 900 BLAKE2B b1103f25ad9d25475945639e4e4ff477c5007f8dcfde01c478bf1e7f6d1b284b8ec80c2eedcb1606a35d33c3123e1475ddff7bd11a9e0001fc1830a48fca2e98 SHA512 bf06c0a21be543837a4c66faf85b584924d6da8fe7698f2c72ee103f6eb10ce6265c6231ad68d4ed7dd649dd640b07aaf968a8df691336bd367016a65645a62d
+EBUILD libsmi-0.5.0-r1.ebuild 899 BLAKE2B f66a0085abb97bf1f087d0ed1cd3a5253d707d2ec13393da363a6ebd82e5024afa6bc2cf8d36915228855670a028248e5a5c941467227584a33f6f36f53ab811 SHA512 8a07b75a6023c47651b16dc97dc7df80c39387e54e19052d8c608a087825f0b0ddf62edacb666c922c9f6e6714208cc48e8e68ad3649eac7c049ad4da9d85c59
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
index bb5a6d5723d8..6b0294947d29 100644
--- a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index ad7b2ee19654..fed5bc88edb4 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -5,5 +5,5 @@ DIST libwebsockets-4.0.20.tar.gz 12342036 BLAKE2B 983190f7f63eb9db09b688ae056c6f
 DIST libwebsockets-4.1.4.tar.gz 12698800 BLAKE2B 78cb9587af7a5cc368c3c4ce7b8c8cba7d25961595ae8853f52d374b73404e5fbd99ff9b552dc9d6370fd425d6bd28fc69b71be37f2f045817f2cb8f5354dcbc SHA512 4da84f612ad427465c4eea0bdd0db59c21c9e42bb21eb46b904f544dc4078af2c9a957e61430f3569b87cfc96b3addee50ac7a7c77777dcf16350fe441dd8854
 EBUILD libwebsockets-3.2.1.ebuild 2227 BLAKE2B 7af189cdcf997b5c2bff16260316e8e3e9b9d003663a08e52800afa46fe0ca8a59f72e5fdf0a193ebc9b8cedfb39329fa01735382e000c2c3eefe06e9ef40d5d SHA512 947a42364b9b48d99c4d0fc8043538561ad4deaba34a5d8e1fc5154110aff5a2948e5a6e49f66064a0e2cb541d2d436d14db8163f6fc8cdee4e9d6dc73bb389f
 EBUILD libwebsockets-4.0.20.ebuild 2519 BLAKE2B 88c178b4a7ab0704bdb0660274d59488ed14d7e365c92a991f90963789cb4ea6409f3774e710617ae254f3e1a525d255dc66d21b8c30200bf714fe67be422b4d SHA512 d1ec85cf9704f300ec40186226960fde1474a7654b93665025a4b8ee37b17147d95ff7179e276763b3d23f83b6eab7cfbe52c532475023ec8a5af2e838632f91
-EBUILD libwebsockets-4.1.4.ebuild 2366 BLAKE2B 72f10892bd09819e875043d39ac622e49e256b5ff1cdcd9282a9af08f8b77e615ee5e2aa63050f77757176fc663ff77b28775f1c00608998df265c9bc190ef89 SHA512 8d351ed9166344d4ddd23ce4270709311aae4aaba14bf4a96a3b04a95d4198110abb74b58b973fb8856297860a9c782a417233fd5315e9f4a7cde89cf56e3fbc
+EBUILD libwebsockets-4.1.4.ebuild 2364 BLAKE2B 83f7e59b15c1b435b17e59441b6caab77272eef930fdb79d068712645dcf907ce3ea229aee0f51b0332ef28fab20189b299b02036be1f5cfacf5e9ce79bd1ea7 SHA512 5c1f8122a72e2945d9fd8047534d948f6521bb9b8f0749c03d8438af7e51bb0b5081f07116ac7b818349ffc9d44335a5b607e0f10df34ea8e5e5efb1daafe52b
 MISC metadata.xml 1662 BLAKE2B ba4299d39ac10860ea908bf83ccf687af48d3e5764b9823a9d1e727390dc53c569d1e824587fb7e586e211e4366c799b1e91efb817fe6495ed0e6ea643e94147 SHA512 722b59c06d1d1810b21852cac65fd6a7a929f280cbdcdfd0ea97285e8bcbf17ad84d00c7d41308deb2d91905ce3d5f3f0cdc8f5f975a4eb7c0b7fefa431becfe
diff --git a/net-libs/libwebsockets/libwebsockets-4.1.4.ebuild b/net-libs/libwebsockets/libwebsockets-4.1.4.ebuild
index 6c9e16a747a4..3122cc0928d5 100644
--- a/net-libs/libwebsockets/libwebsockets-4.1.4.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/17" # libwebsockets.so.17
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="amd64 arm arm64 ~ppc x86"
 IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
 	+lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5
 	sqlite3 ssl static-libs threads zip"
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 7cf083006144..65d43955fa60 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,6 +1,6 @@
 DIST nghttp2-1.41.0.tar.xz 1640712 BLAKE2B 8dbd5f80bb9617d792e2eece09f6cae82907ad3a14a90084578b213191015c32ac38de87d9a39246651087b5d0e9c6c624ff806a0690973b5faa8624ee033d8f SHA512 c92e8022ccc876fa311f21bc5bf5af75feff8232efb56a4b2ab198031e974d15b67c16c046188cc76552f75a1b2e7115925d6ce1e42d6f94ae482fe69727466d
 DIST nghttp2-1.42.0.tar.xz 3973284 BLAKE2B 39431619bd3c9a66eb217065bb29ceba8f3fda376343687b4774ed5e73c634f51142b407f9515ae5ad4363af5cf57c0199f9bfddf5bc08dc587419ec03cf5b45 SHA512 1d93e6262c5538e26fbf36567230b4a239dbdfee26198b1e1d5862bf4459ae435679674c047407f5c604ddff91d7717d8515532e00bcdb2aa75f27ff97dce60c
 EBUILD nghttp2-1.41.0.ebuild 2009 BLAKE2B 4a7a37c6b445be8f5e84a5fba2a5982c33037ad04de4cca1bdd869d600f7416945277510803ad9fe657edf94bf6fee914d75ab4a5bcaa92dfcc223ac36a7ba32 SHA512 5e5dfb11026419e9dfa6101dbd5617ac77dbd3c2fd1877bbf73bf8a88b545aa29c7dbdd7551d54fdb2b07d0ea0d6c6342f0ec67be096f3fbb2766548c4aa3d94
-EBUILD nghttp2-1.42.0.ebuild 1998 BLAKE2B d5db11f1afac81618eae5d83c81bff6d9d4e2fb9006cdb6d5abd17caefbf18b6c025437ebb17dac40568fbe3b63ea5189622dbae25d0fc1331c6338c4c3b4575 SHA512 4ba3fb08741e219b646afda506ebe958248cdbddb3c7b3878182e3961078882ae8d6e231172ff3c0809c7932331aaff2d147b4195a976fae26ea9f8c1065c2fc
-EBUILD nghttp2-9999.ebuild 1987 BLAKE2B 3e5897f4756138350cadc5e72bb25b394a701ffc7ef93334231a225bb4d66b3b289982eb2218310e73c989de2193cb1c8cca73cdeb44bd1efaf8cccc927edbcb SHA512 d91a22ec19c033867f8df446da7e9d51d0bc461303b55a0c937071e2a08c54a0a33f9a5c80a9a454ea355b8e39432a2756a49801482caa5b41d6639008e4b428
+EBUILD nghttp2-1.42.0.ebuild 2026 BLAKE2B cc352b3f6dd388e068ab856bb5c2b73896280ffd0cec7ebca0c5ddace16b70dd523a6d3b0ccf33f2591892f0bead683a5fe93a791e0e261d0c90cf21b904d74c SHA512 08c4e2fe89773653770902ec6700b8436329ca8625c2264f33965194cda541885be14fad6458b1062c7891097b6851aab5892aa7cb2e02352763f601e58da8da
+EBUILD nghttp2-9999.ebuild 2026 BLAKE2B cc352b3f6dd388e068ab856bb5c2b73896280ffd0cec7ebca0c5ddace16b70dd523a6d3b0ccf33f2591892f0bead683a5fe93a791e0e261d0c90cf21b904d74c SHA512 08c4e2fe89773653770902ec6700b8436329ca8625c2264f33965194cda541885be14fad6458b1062c7891097b6851aab5892aa7cb2e02352763f601e58da8da
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.42.0.ebuild b/net-libs/nghttp2/nghttp2-1.42.0.ebuild
index ee4707056e7a..b26f2f341e23 100644
--- a/net-libs/nghttp2/nghttp2-1.42.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.42.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~x64-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index b43a0d325068..b26f2f341e23 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~x64-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 7e026f4f880e..b5e9ecfe4caa 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -7,5 +7,5 @@ AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e7
 DIST webkitgtk-2.28.4.tar.xz 21424908 BLAKE2B 5ca9206c3c7d0a00bc76487ae8fe79e6c5b94a86f23300f196b3edbd5e3f1ea68768ef4465b32fa694a7b6a4a2b274dfb9dba4a20b8329f9138970f1a82eb7e6 SHA512 227cd4066235180521a32a83d3a906212adf4f234f15a1fff4ac86b48e39c431f1e0cb4a56f62924015099a0c8909a73a21a56f8dc71a16c53ac65de4a5773a1
 DIST webkitgtk-2.30.3.tar.xz 22311704 BLAKE2B d5a8ba1fe7fbbcd3d8504ad98650ec685a41ddaa43e1392172cf7840100157a283e4ccf4cf62f2f581deffd8d860cf61b43fe59178b02306efb88c8e1a803520 SHA512 cbb8298bdb791eb60a214c36ec9ced398fc5c07f580d60d001483ca3f616a309394013239affd16f6eefd8c2fb178bbf5b566ab4480fe3349e1856c80ec78ddf
 EBUILD webkit-gtk-2.28.4.ebuild 8914 BLAKE2B 63f6e796093c76450cef123857e6e65205bd66e5161d380d7ac577322eccf280066484be31c47196762065c5285911e678b1d5a39ae5eec7e839a13cc19208b2 SHA512 ad5521cbb22a5efe8cb055d5e966bc155d290cc1c8a0edf66e569025d0c1c4ad04c5b88f33b54662bfd587e3e6c412ca955f0c4d09fe1d6e0f66fe545892f76f
-EBUILD webkit-gtk-2.30.3.ebuild 9211 BLAKE2B 4f124fd6a434aa644fef3b6ee27b261e43630fc051f4e5f809f1b434cda9584ced3ea7cc808460beffbfe3d730beb62689c812912ac10c6dc3ddd16d4da08c18 SHA512 e8d324a49fe5ff6d71f43429fdf3490e754d4fdafed872d027617b3456862e82ac0a7ac904a86f7d0576522dd97ff2074966c9936e532779ff09930808f7e515
+EBUILD webkit-gtk-2.30.3.ebuild 9209 BLAKE2B b0f0599328d3439b927994de93d5e5d1de2aa63bad6a3dc5cc87a70139a1e522af1097ab45bcd132094bd0939a9da091feafce447b68ed62fb45175167b56d9a SHA512 2ea03a450cb4d9023f9976bd051940c4508e3b1b1b99307eb33e6e68efdf342e2ebfca636edb491298068ed457d0fa42abfcaaada9948b09072ec4964ba28aca
 MISC metadata.xml 575 BLAKE2B cfd9e50e79d0627b50f7eb968d0590a88afe55ee5ebccbd81bd5337fd2ea06355a34db909c18f53a388bd3c1d09d82c805284f7db43b71549f29124a5e0cfe39 SHA512 d7b45d4ac89607bfda20a30070194ebffce990784ad376739687680a08e203f570d5636224c37807bfbdca03ab9a3c745c7c41f4e632678acfa2cf60b4eecd30
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
index 42baa21fdab9..b1951231dbb2 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua +egl gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index c2fead448980..25f5ce3f0cda 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 9fe1f93e7b12..07e033bc42b2 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -4,5 +4,5 @@ DIST mu-1.4.12.tar.gz 2309385 BLAKE2B 4f1b7c520a38e5f17471c2a9dc814decc019a4afce
 DIST mu-1.4.13.tar.gz 2309545 BLAKE2B 9a83e86ab73e325617694f01877a11a93a5bd701cedc776640563f0a5e61946064e201d3f5da2110e1f9583dde9a73e401dd2f018161380435f48f132b2df103 SHA512 0f8e7f75332257e8cfdecf2c27bc23c83420387e40ecf92089232af6c545700a6c4925665b39fc236cacf8b26fa4b81df71775cdbe04c340fe3455c54c0d1bbc
 EBUILD mu-1.4.10.ebuild 1784 BLAKE2B 27466207a50c1f175b56d6ff17f775fa644b884074d9914e32ae81c7f1887a1e140225a5f2d8875dc5cd18db7563ce58577082d00ad039c54d25207e76499e17 SHA512 e1aad3af510eb9be475b0e983048d63fd0ad007cfe178265daada05be7bd32edc70c9be8a4b097a5a26bf5a2ad0c970565cd33350cd77534ba4320750cfa8018
 EBUILD mu-1.4.12.ebuild 1786 BLAKE2B 36766ba266400ab63b36a986f121de47802f9fb46f7fafaab41af1b40ae2cb2c0bfb34edb3cb0f75bbe1926dbdb4f0309afd64c92cb18553711c35b44b96d8aa SHA512 9e89d8989a8c90d2ab14ad99ece718fa78118cbf53563f580be9b67b50700400fb2c96b0e1995390446c5a1f62af28ad926c716a80f5beaf380311c91b123453
-EBUILD mu-1.4.13.ebuild 1763 BLAKE2B f15857a2ce4f44f3eb48b9b29255c7b5d67887355700cf62dd6610897dbe097c2b947ca417c1d62df4d0b88d6cee3124716316e602011dcf78df3f6347112eb1 SHA512 da1e8d73bdb564da83abb29fbdb77ae7264f9e71c33b069fe33e3b4d8f578dbd91fdbaf9129e8e67925e87e7619830adefab1f686cd4355f2275567f1251afb9
+EBUILD mu-1.4.13.ebuild 1774 BLAKE2B d4f32fe1efff5bec341b413caadc6841f85a1892fae4d428ece9cac413ddca7c4b3d05bb68dec532f328b4c0a16fc12ca6f6c0cf430b8a351be64dcef16ed361 SHA512 2c6a3d5ae29ff7d46954b32b30d0d7f0760e6f648e80b5ca1c1f8eaa16be54e92105ceeb8ccaac1169b54b8e9e2225b67dded9a7e39829257277d95f2696b24a
 MISC metadata.xml 895 BLAKE2B 2a8d3f5aa6673c03df5bcf495aded3bb07316b4833ed84ec3e2d7030f5cbab8333865da6a4bd67bc8ee69e39bc6540d4a77bd7ddf3b1b9fdd7b5a6dfb7278fe6 SHA512 e5e1e9f3084189fbdbc8fb55127b8b3eec4acd7685b0d4c9ab564644f21fcc53520b89f7ced7bb3972c13d577a030175a9665d30ba513112125409082a7ad7c0
diff --git a/net-mail/mu/mu-1.4.13.ebuild b/net-mail/mu/mu-1.4.13.ebuild
index dfabecbea9d1..6f3c1afeebe6 100644
--- a/net-mail/mu/mu-1.4.13.ebuild
+++ b/net-mail/mu/mu-1.4.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE="emacs guile mug"
 
 DEPEND="
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index a976c89930ca..43a370a82051 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -8,6 +8,6 @@ DIST notmuch-0.31.tar.xz 713144 BLAKE2B 91b0a01543e438e6ccb40a01ad0a100a5c6ae15f
 EBUILD notmuch-0.29.3-r2.ebuild 5062 BLAKE2B cdf68691f7dbc729d6c95dc974a3fb3b747a33d0b80338fc9b0474a970b78674628c242ce14af83b4d57eee1cba1f3c3d343dfcfffe2d8d0ee628f78b94f8767 SHA512 d76b455c44244eb1775604b0510f96c30aea175492ea4982d9a5b93d8601834a120286f29b8e41c6e694209a09be72727848e24bf5b8b3723729c2458095cc08
 EBUILD notmuch-0.30-r1.ebuild 4343 BLAKE2B f53eff50b205bffdb6016118997a5b5176a88ca704999e2b4f3bef4f107a79e7e89e68010fc35bd756aa8cbbe168f73700eba9b33ec8f1ce32a676b1b592e5da SHA512 bde0d770ca18d3c55c79be0b4e6fb360f61bf0f404397448fb311c1cf107b07b5f9633643a04a0e6615acd61934635845d1a2a47283795e3fd69c050939858b1
 EBUILD notmuch-0.31-r2.ebuild 6375 BLAKE2B 936a7e27bc21361d9692a36dd029d4ccbc28997dd4fda3c72c5ba5b79021be102a39efd6b5d95b4aa59fd008b2d07b5cbfaaef72b4ae31e08febc6b1c396a061 SHA512 6fd4ef53415e8c24b8fdc5ff8bffb548960f12c4b4cbdb001da1bb322604f05d059fd05ed7a90787f9209f1d9e61101ee7af5405b3be133b9efb29efc2ec14e0
-EBUILD notmuch-0.31.2.ebuild 6338 BLAKE2B c46bab536f2feefeb2c2f0baa5305f36b5d24314fb648fdbfa0cc4af6a0f19eab9cf9819c0657a9a48dc00fcbe754313b0f9cb52171e6ac4c13b56fda892117c SHA512 dd3a224b075d0403c693753289113e5f854efa7538095d5c24371c90083fda17efce7c96b6b8358d599c91478da3b61bf9c3456421c42c029280b9031b890d4a
+EBUILD notmuch-0.31.2.ebuild 6349 BLAKE2B fbb52800618b2f5771224803ae2bec343550aa0117ad6fb208e8805a7e605383eabf1229db8807fa26042214a7e82ad15a33aa001898a2dcb58bc013856fd39b SHA512 2365a6466da920adeed601a70c745dd9cc3562472a85768be50caf9d5f087f572d1e4ad0e659432a5e72af8fdf86d22ae9c28c03337e9341a4651d1fb5bf72ae
 EBUILD notmuch-0.31.ebuild 4460 BLAKE2B 21bea26e7e287937cd45a553abb14cb40420b2bb93886165533f6808d4734e594bd0184fb4b8dd6230b2264dc09f80dd89eeea70f678e7a56981e11f743c1121 SHA512 e12a5c8403c7f7e0ce32a1f002a4e6153b01df9436a517f692b18860a919aac83787a59ae6a00820b2d6fae7661a14a4f822d16b79c2e037f539afddfba04f62
 MISC metadata.xml 1288 BLAKE2B cc1d703a011971c9d6c89237847c84caeb83d1a6b62d95ee9cb1b0138919ea24cce578d7f55cdb749b448d6f2c9c77895285127d9c509532b5b58c66db2528a1 SHA512 68066c76c92534adb837ade1aa93a6e58f2d1b288e9cb75753af2c9dc1feac145be1976163b535f4bd5671f73f0dc93f204fe74ede74c10f081bba1d3be3d1dd
diff --git a/net-mail/notmuch/notmuch-0.31.2.ebuild b/net-mail/notmuch/notmuch-0.31.2.ebuild
index 750021265833..26c459bf4d05 100644
--- a/net-mail/notmuch/notmuch-0.31.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.2.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
 REQUIRED_USE="
 	apidoc? ( doc )
 	nmbug? ( python )
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e6b3e6af36f3..52b72c11425b 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/ipcalc/Manifest b/net-misc/ipcalc/Manifest
index 2f7da745d4ac..cbe45f84df36 100644
--- a/net-misc/ipcalc/Manifest
+++ b/net-misc/ipcalc/Manifest
@@ -2,5 +2,5 @@ DIST ipcalc-0.41.tar.gz 21599 BLAKE2B 3b54df9bb38fa42c9b11d1192a8e23e6cd7c9cdadc
 DIST ipcalc_0.42-2.debian.tar.xz 6144 BLAKE2B 7fa1e32f9c713b4f3dfa8636f9bb4b0bd70e09e3d02e71f1f2186e8e2ab381638eb33e63c24f41dfa948db11b7e877a147d22363d105ac26e98ff509d1cd0aa2 SHA512 6b7049bc5e27e22dbbca12913716757cb3f5b91d0a8f729d35a67971c763b0bea8ab65c24fe31ad43755aedb68650c1d8b3f3e770228ed6517b43e83735086ec
 DIST ipcalc_0.42.orig.tar.gz 25903 BLAKE2B 5abff0f234829ef84345645634f1b12287456c26a42cb65856f26ac12699d5f100a2ef432a6d19627f72d800e65257d46bc0edd8ec1bf4054dcdf843d2ee158f SHA512 4e67ccdbb7e42ced39ee8ac83e47585d400c1b0a26e74a909c2e29e7f2256e37b06855cc29f0272b71c5ff6bdd8252e2563ad89562cd8d04ce0fa032f6f3fb34
 EBUILD ipcalc-0.41.ebuild 527 BLAKE2B 667a37107ed4f346d4a4f7b9f9c2b909a38dd90855ed336ffe7766668bba206229a856c2aba26f6edb36e474ecb00a509fc04185f238d72cdb788d6d5f0c75f4 SHA512 10133935b6510c91944acd7ff5b43e5dfce8eda29fc7ebd46aad529537da2d2d9414ddacb0b86d7451e9bfebbc8b8eeb577dbfe7a8631d79e3cc07a7f97101d2
-EBUILD ipcalc-0.42_p2.ebuild 755 BLAKE2B 2a354d1126461382cf8b272916421bb42bf512d9ac4e17e0ca5c35400cf9b83eb893133c098f527bbf21ae33a84e1b66f1cf22241352585b387b193eb476bca1 SHA512 8e04f5d9a221130445eec2076f29d76bfe891fe3a2fb4329e79805c6573074dd092bdcf49f93085e66c780c68e4a5d98db593fb0d9a1f3abc0f68823cb30cdc8
+EBUILD ipcalc-0.42_p2.ebuild 754 BLAKE2B 3ba400a53b367a06d49798569d2d4068bff0771455ba76eae8731e57f6f850e6bf3f8687d5d4659cfcfb549de54fa011390c8271025e41e7b02331993ceb42b5 SHA512 60e6ce31e70e00f45cc9b57114b0ccfd3ffe0d84961ef1743fbfd04623e051e0b9dbec0de921609c8c374a408d1fbc76c9ac704b193d6d277f7184f3b8bb1130
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
index 6cfc31ac5bea..cbd9575e36f9 100644
--- a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
+++ b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
 "
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 SLOT="0"
 
 RDEPEND=">=dev-lang/perl-5.6.0"
diff --git a/net-misc/lcr/Manifest b/net-misc/lcr/Manifest
deleted file mode 100644
index 5aee612567fc..000000000000
--- a/net-misc/lcr/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD lcr-9999.ebuild 1236 BLAKE2B 5d6c662fbdf4e1b65e506717056b7b8ae1da3b74a4fd9565e5cf249997cddf6b408ff13540db52c5ed2763bbe5a6e6c56cb22c16788c5cbc0806370e811980a4 SHA512 25870cb4aff0fd585e32ca746f7a2c3f13f2a2f4b81af110cce50bb12169a67fdd33887d6a9036702a724db40c3cd05701402051d5e16d04eb6579065376024d
-MISC metadata.xml 650 BLAKE2B 3677cdb22a18b446b167eb122d2a81efd44505977a23e72a87d52ec813e6efe100d9a88ce04ec8205cac80bdf0076569275346ae723ca8a8f68148f1ca449a86 SHA512 12497b4e4d2b11a3f2fe6aba4ee440419fb217a7df6a56da837384e7a4a16db7a2b62b2f88e5aef462305676081e94475fab15b43581e08136a63eb8439f7a70
diff --git a/net-misc/lcr/lcr-9999.ebuild b/net-misc/lcr/lcr-9999.ebuild
deleted file mode 100644
index 8330ca2effc7..000000000000
--- a/net-misc/lcr/lcr-9999.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools git-r3
-
-DESCRIPTION="Linux Call Router"
-HOMEPAGE="http://isdn.eversberg.eu/"
-EGIT_REPO_URI="git://git.misdn.eu/lcr.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="asterisk +ssl +gsm-bs +gsm-ms ss5 +sip gsmhr misdn"
-
-DEPEND="
-	media-libs/opencore-amr
-	asterisk? ( net-misc/asterisk )
-	ssl? ( dev-libs/openssl )
-	gsm-bs? ( net-wireless/openbsc )
-	sip? ( net-libs/sofia-sip )
-	gsm-ms? ( net-wireless/osmocom-bb )
-"
-	#mdisn? ( net-misc/misdn )
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i 's:#!/usr/bin/env python:#!/usr/bin/env python2:' "${S}"/libgsmhr/fetch_sources.py
-	eautoreconf
-}
-
-src_configure() {
-	CXXFLAGS="$CXXFLAGS -I./include" CFLAGS="$CFLAGS -I./include" econf \
-		$(use_with asterisk) \
-		$(use_with ssl) \
-		$(use_with gsm-bs) \
-		$(use_with gsm-ms) \
-		$(use_with ss5) \
-		$(use_with sip) \
-		$(use_with misdn) \
-		$(use_enable gsmhr)
-}
-
-src_compile() {
-	emake -j1
-}
-
-pkg_postinst() {
-	use gsmhr || return
-	ewarn "You have enabled the gsmhr use flag, for the GSM half-rate"
-	ewarn "codec. This is strongly discouraged, except for testing,"
-	ewarn "because of extremely high CPU usage."
-}
diff --git a/net-misc/lcr/metadata.xml b/net-misc/lcr/metadata.xml
deleted file mode 100644
index b1d1e33aef3d..000000000000
--- a/net-misc/lcr/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-	<use>
-		<flag name="asterisk">net-misc/asterisk channel driver</flag>
-		<flag name="misdn">net-misc/misdn driver</flag>
-		<flag name="gsm-bs">net-wireless/openbsc driver</flag>
-		<flag name="gsm-ms">net-wireless/osmobb driver</flag>
-		<flag name="ss5">CCITT No. 5 support</flag>
-		<flag name="sip">SIP support</flag>
-		<flag name="gsmhr">Support for GSM HR codec using reference code (very slow)</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-misc/libteam/Manifest b/net-misc/libteam/Manifest
index 0671b1d164e5..2ac7989e5336 100644
--- a/net-misc/libteam/Manifest
+++ b/net-misc/libteam/Manifest
@@ -1,6 +1,4 @@
-DIST libteam-1.22.tar.gz 544302 BLAKE2B 8c20471506546de6f45989513ed22fe79f694febacbf1a0caeda872e6e8b815f9813cff682eb11060c3bb1b2ef12149f34d15c201a6b50fe438bf9776abda987 SHA512 7f54b7e87c1d3a5150e598052126e1c2f5396096450a68a923c9cfb7bcc48b724cddc61f55e34d1b5df103f5473367eb268877100f10c58d53fc3eaf24749d5b
 DIST libteam-1.31.tar.gz 176331 BLAKE2B 77aae059b37a018e5503642138aa469f0769d305ec2043642fb1d84ff1d05f6eb90083946ca113cf3f9c21a09a17b3fbda327b714eb96743a10e99b89d5d5c83 SHA512 1382cc3b0a2d0211f33e506e8a6fd8a1847398fa5bba56abfc959da70bcc8417cf1dba9e26a777da5729eb237f51a66b3f9cfa33fb830ed684aa076f4c8cec9e
-EBUILD libteam-1.22.ebuild 1278 BLAKE2B 760afca7072e722f981b8a492accd81ca33907389f601a6baa8b74c025c8011c69d5f2ad67d7db1682a6cc9f52edc6158d79743df2090bdd972c2563198e3420 SHA512 b041b9a44a39c69947febd1747d238cc38ebddd4ca55e2032523875d388edbf0d41744d9dab2b6c3a78d76e6c3d286e28ed98fcc325889f770f147224e0f676a
-EBUILD libteam-1.31.ebuild 1370 BLAKE2B 8f8f109b30bfbaafb5a7b0b6119d1ea9c42288ca3b05346f15d93cd117845f641d0d01e23ef764b01e6b26eeb1f38e185c8b55e1241e2cf3b3f4094c65e530e8 SHA512 3a7f68c7e6434c337e385acca223b28321b18708404008aab11897513304f023cdd9c71d3ad98ab73c446bdcd4b0b7b2e6a3be8554c85949cd551036c0756b0b
+EBUILD libteam-1.31.ebuild 1369 BLAKE2B ef5a6fdd4cebde91bd1fa689e5f77f5de7c91330238e39da9d0e838bbad9be729e2cf224ae2c3b06c290f9048e14e95928e11264799efa1d571bce844b7e857e SHA512 81ec2bc440cc88c3f8a6f6968e3674ff7f0df39c676982048a471bb7d009fe221d3cffd8c818e9578f0386b42f087563985beab79a1906f08f8c0987c5814f11
 EBUILD libteam-9999.ebuild 1374 BLAKE2B cb8c50775142338159d2c2082c749b850d4774b9ed7d6f4f6369ef07e9f82b5290720f1a8aafd8228ff5f13b0abfd76371f724f207583a032237c97258c21948 SHA512 334bc0f0733dba9b08967426aa8f1d6c3509d3a0dd27195290258a3db5a23c2225f3d8719d5b8f4ebf74429c616ce9daedda804d4c35bbc844425e14d9067653
 MISC metadata.xml 334 BLAKE2B c4d7a143b2617bc5896b42db67b45115231eef0177c1bd6d4878fcce85b1db00085153aff0a51b7e4b877b2bc68aeeb7769f8360042a6e6e21d5c9371bcc2e03 SHA512 0cdfae73365dfd53d676ae7ab8e9a0689f0a117542d5fb99e1c5987ae41388f8f8c54b37829915035f417b7e9ac30b6f2abccf95b8a3202c7a6731530201d2d4
diff --git a/net-misc/libteam/libteam-1.22.ebuild b/net-misc/libteam/libteam-1.22.ebuild
deleted file mode 100644
index 67f37cc9413f..000000000000
--- a/net-misc/libteam/libteam-1.22.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils linux-info
-
-DESCRIPTION="Library and tools set for controlling team network device"
-HOMEPAGE="http://libteam.org"
-SRC_URI="http://libteam.org/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
-IUSE="dbus debug examples static-libs +syslog zmq"
-
-DEPEND=">=dev-libs/jansson-2.4
-	dev-libs/libdaemon
-	>=dev-libs/libnl-3.2.19[utils]
-	dbus? ( sys-apps/dbus )
-	zmq? ( >=net-libs/zeromq-3.2.0 )
-	"
-
-RDEPEND="${DEPEND}
-	syslog? ( virtual/logger )"
-
-CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE"
-ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel!
-Only >=3.3.0 kernel version support in team mode"
-
-DOCS=( README )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable syslog logging)
-		$(use_enable dbus)
-		$(use_enable zmq)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	insinto /etc/dbus-1/system.d
-	doins teamd/dbus/teamd.conf
-
-	if use examples; then
-		docinto examples
-		dodoc teamd/example_configs/*
-	fi
-}
diff --git a/net-misc/libteam/libteam-1.31.ebuild b/net-misc/libteam/libteam-1.31.ebuild
index 9d1256a90821..a009a1c3b29e 100644
--- a/net-misc/libteam/libteam-1.31.ebuild
+++ b/net-misc/libteam/libteam-1.31.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Library and tools set for controlling team network device"
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index 259808cb4cc7..5a474d23b59c 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -7,5 +7,5 @@ DIST minidlna-1.2.1.tar.gz 459549 BLAKE2B db757b31945cb6cdb8449847f845777cc4a396
 DIST minidlna-1.3.0.tar.gz 509576 BLAKE2B 3574d48ee63f8c391d1beac653587b87460522178d9f100fe4b0e49f33398b8e527ee74af02d5ea36b23338f7ac73ef3c177edae6be8eed24e94f9db5c8323b0 SHA512 92a5ec0e59244c65dad5360ca68856ecc66fd32ec2aaddb9e49c142b866d2642726c7c62898059e5fa56431d2bbb644bbe60c7ae5eb0aba4fe2255c8e69dd2d6
 DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e
 EBUILD minidlna-1.2.1-r1.ebuild 2785 BLAKE2B 313911fc6b289e4912d7d431ff14ed26ccc657d298241df4229c6fb462ea7aa848e72bbfcdfaf1bd2a7c20e5617c8b6f07476c5535f65796bae430a32170b7e9 SHA512 ae59f442bac0748275b767239be6ccc216ce33bfdde623b3daadb09dce08a7825f9ad1747195cd21ae8b44c205398c2d968f7ee3074a0275f7abda3f95aa3347
-EBUILD minidlna-1.3.0.ebuild 2095 BLAKE2B b7ecd152523b43cb0be7f7a7649c6334f9e960116782195a282cd7a9ca8edfe9f6673f4ce07f0112253f4ba485c56e94f39e1d6ba636b5a80c25626d74631fb7 SHA512 da253842e68f63d683c2ab940ef1f415ca1cc877ae0334cc87bc009dbef7475f6052ad1ac2473711fb2ac90b70164cfab107ee7f9e0036d8c6a80d7197c4c1e7
+EBUILD minidlna-1.3.0.ebuild 2094 BLAKE2B ba308dfb550d7dc3ec8a12caf956d2588f8dc4a132860c5d14aeeba81b45d1dbb51bb1f0101a57786f93c6d0d32e3d75b69177efa273a1a66b592b7544d3e54d SHA512 9ad2a164f5f0734c19952ca78b68ccce5b8e32026132003d2ed2277d864ee927def4e9cd8d64ae8704ada88ff88e54ab410a8d3fb072fdc5d9be2554f414a19f
 MISC metadata.xml 512 BLAKE2B 4f4f646b79a65b8563381b6534b8cc51d3731f529b3eb2352ed19032123a9e3801c23fde576dab0467e04f9eef4ffa8bf89171ed3929fc808c9a4b08122bfaad SHA512 571087e06e7d8d32ea6923043738b5f36eadd60880a49260ada78416bb8b2c56a3756408bea161d0292ccfa92acad6322a1f5c960afd0930fc2187f941d9dfc4
diff --git a/net-misc/minidlna/minidlna-1.3.0.ebuild b/net-misc/minidlna/minidlna-1.3.0.ebuild
index ead293b1b92c..06bcef995db2 100644
--- a/net-misc/minidlna/minidlna-1.3.0.ebuild
+++ b/net-misc/minidlna/minidlna-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="elibc_musl netgear readynas zeroconf"
 
 RDEPEND="
diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
index 8f2c3778c210..e82483724d6f 100644
--- a/net-misc/netifrc/Manifest
+++ b/net-misc/netifrc/Manifest
@@ -3,7 +3,7 @@ AUX netifrc-0.7.1-dhcpcd_pidfile_location.patch 1580 BLAKE2B c1fa6aeedf5964b41a0
 DIST netifrc-0.5.1.tar.bz2 78749 BLAKE2B cecbf4b64cc8e93483326ef0646d2abfdb837c0351cc210ea0134e654cd44f90cba0390014412f6b45ff4d337d3aaeb5e739553231305846351452aebac870e1 SHA512 277d10f58f694c734c9dec52896f847a58e40b61567573dd634d0a0604c27550d4baec461df46dac4e535753f6594afd30344696229f4f4cf4f5e04dba659710
 DIST netifrc-0.7.1.tar.gz 82393 BLAKE2B a1d147db2a4e4ff7d360bf5140ccf060283dbcbfde7100f1d193c783f1da540574e1342b4d7f3f9ee011628f9f113fc751416805f35678a1093e0cc0014f5eb9 SHA512 407071f8f58b7788703a62193677673ddd18114b69142894674337410473e620cf3895bb014cff133f719ac1a7191ac3bedfd969c9a11bf2f1c4b04d39683057
 EBUILD netifrc-0.5.1.ebuild 2101 BLAKE2B fa748e43c948521df151189006cb9a45db49e1904074dcf71941aeb98aa878155dc5a0a341800c6bb27155caf4342b3fefe9a18edecd9b397244e7b293a5842a SHA512 bf1e0d20256138853b3508f2c88c67c33c14301325492542c3c7497d343c02b2a8ae0095bb0d0e4c0e33199b350429147349f231bdc2d1f1a3ad106e5fbf6a7e
-EBUILD netifrc-0.7.1-r1.ebuild 2165 BLAKE2B e5d9b5792051c9527e326f3d383ee1156242bfccf6eec652c25884f1a789bc18f822a00e24a6bff202feb3385130b0c8094a6b26b8cd70bb6e2433b460ae6d3c SHA512 d06897f168b84e3bc9d318f3e87d0b2c3e7882529621693cf0fef25127bc4b7e204e882cbc3227c1884ff303d911a44cd650eff00e09f8d6cec5155837030f86
+EBUILD netifrc-0.7.1-r1.ebuild 2163 BLAKE2B 6d7e0fee18b3217f50b3159712c5c8b6cb8e32551fa30300aa6681be570512549f23bc1bd5bfe37e5d35b03b642676a8113fead137888a4af64da8820aa13998 SHA512 e3b48e1f9efee10ca81b986945570aec1a8bedebe9aaa4910abd6cc3c47b1ef0beb77eb43e1157499dcec6da8973125c78c0a7db74ca84201f38bf39aea92035
 EBUILD netifrc-0.7.1.ebuild 2099 BLAKE2B a8469f41f1feb23313425d4f4224fe4c93a73d226667bfb2965940491b71bb9d7272a0feaf76eaf820a56b4e69c2d2975833d55aa715e5f8e9365e38c641d4d0 SHA512 4d344118f4d6878a3e6b2461ce013457b211103248b8d8945e76559300e29544012c28d087a0f2f855a8f6bff960b9cc1b99fd0216d945e228770c2c7b6196ba
 EBUILD netifrc-9999.ebuild 2047 BLAKE2B decbe78b5ac86f957ee27f203b0af14d8e4e022bc326891b5f990849c5817e9fec3a07ad0409fd3619b07a3a3683fbf6c9aef8f0c39f378a7e7276a7a5c6e80a SHA512 0b3d9ea722a45d91a9edc38616ee239910df1c8bf8c5ada1e75f78842c07e89756da519e46132cabd18b705b51c52a3dabfa3ed8ef196e156e34364ec8733a23
 MISC metadata.xml 377 BLAKE2B 2940bdfd1253901092fff2f0d4d162011372a9b6bbfa26d3ad07d5a7b19038624517e593f7884bf98e00018f1346d2f06e7f407c4a2419b9fba6b3d53d646aae SHA512 711a957e6bfa852039b3588a4636f0e4e747c685cbfcbb537bcd6eb12c6bd19a9ed8b49608be38f855d70df03d09ec0632a9be9db4c4cc64783b5b0311f0cdc5
diff --git a/net-misc/netifrc/netifrc-0.7.1-r1.ebuild b/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
index 16953a946589..e7cd11a3ac1a 100644
--- a/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
+++ b/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index 4d9d33619a4e..82d47ecaa6d8 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -3,5 +3,5 @@ AUX netkit-telnetd-0.17-cflags-gnu_source.patch 828 BLAKE2B 947bb4a47a9e032ab896
 AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d4580d8511f0549190cdccd565f2c43dcc893a0c0c62409eb66fff0f3429c1c52b00c7c1a09417444f SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c
 DIST netkit-telnet-0.17.tar.gz 133749 BLAKE2B 0eef225adeb0dd332ffd9cce0285213e6aa89f04263fb37e3dac35462492732265b2c29bd2a86277e39e0ad55267ff1a150f1140823c91d44c29cf6a20df8e7e SHA512 e2cfabed12326af5e288def1821353eacffb4586008263dcd1bed1a9dd9d8548e51e68d7ede58ea75927783ba534ea8807ec722271843a77146f064f3d826dd3
 DIST netkit-telnet_0.17-41.debian.tar.xz 36592 BLAKE2B 6db35c25e14b219c15c4dd180f0dab064e5b101b42f29e7b71d99f797d22a51b376e6de148cf83fa479039f0ecbc811ecc36953dd89ae11f079b4ed42690d18f SHA512 4de0d51c6cc3c9113b38c9ab76553d22294a02a86d2e02a0481bdad77887782902d41f99eb5dd268bee175ebee5489b3e9871012234a7480a431ef47015cdf5c
-EBUILD netkit-telnetd-0.17-r12.ebuild 2502 BLAKE2B df7618f701486383af55a3185cc71ec2e7118ee542e9131db8db61b35a1368c409c74c7ed8a667efb78ac50a0ec9718e637d63a848350ecfb326ce367b9b05e8 SHA512 a01e0cf2f2a84eb0462e5ea082e426a1f9fa9b969eeb308325a3ae149ad2fcf1dd042e4913e0a1242b5416457f1c78f015c06341649417a5d20964a2727a9889
+EBUILD netkit-telnetd-0.17-r12.ebuild 2502 BLAKE2B 86e28c97d5f03e336d993aee1d3a52ca82eec6621e57c2166ff70296bf558ea27083b4334053b5a8fb89f2ce67c49af53b3d2f52938c484d66cfadd126d893a7 SHA512 a695301316abb0bbead010be0df8ee4e1078e0cb5cb66a9cdc192adace3cfd2a64273e740f1bdcbd897330e4ab049291505915e5a7832e058f6917cdff8f5410
 MISC metadata.xml 462 BLAKE2B 430d6a3e7d34a5dd9a1601da947199fbd2c5b7baed723525064ae6335e02b59e6cbd8309a82f864cf9a8bb245f49ae01155f7effa8412ea91dd792585decd296 SHA512 f607e0ea0ea03ae7f941c5e27672b8b46bd14164460a8b2c86e4d57df68b549668f9298413f7293dd96dab53d18bd19c46f55e7e77a88ed581553c4502a8f3c2
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
index c2f66be105d3..defc1918c5c0 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
@@ -36,17 +36,17 @@ src_prepare() {
 	# better to just stay in sync with debian's own netkit-telnet
 	# package. Lots of bug fixes by them over time which were not in
 	# our telnetd.
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="diff" eapply "${WORKDIR}"/debian/patches
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="diff" eapply "${WORKDIR}/debian/patches"
 
 	# Patch: [1]
 	# after the deb patch we need to add a small patch that defines
 	# gnu source. This is needed for gcc-3.4.x (needs to be pushed
 	# back to the deb folk?)
-	eapply "${FILESDIR}"/netkit-telnetd-0.17-cflags-gnu_source.patch
+	eapply "${FILESDIR}/netkit-telnetd-0.17-cflags-gnu_source.patch"
 
 	# Fix portability issues.
 	sed -i \
-		-e 's/echo -n/printf %s/' \
+		-e 's@echo -n@printf %s@' \
 		configure || die
 	default
 }
@@ -58,9 +58,9 @@ src_configure() {
 	./configure --prefix=/usr || die
 
 	sed -i \
-		-e "s/-pipe -O2/${CFLAGS}/" \
-		-e "s/^\(LDFLAGS=\).*/\1${LDFLAGS}/" \
-		-e "s/-Wpointer-arith//" \
+		-e "s@-pipe -O2@${CFLAGS}@" \
+		-e "s@^\(LDFLAGS=\).*@\1${LDFLAGS}@" \
+		-e "s@-Wpointer-arith@@" \
 		MCONFIG || die
 }
 
@@ -81,9 +81,9 @@ src_install() {
 	dosym telnetd.8 /usr/share/man/man8/in.telnetd.8
 	doman telnetlogin/telnetlogin.8
 	dodoc BUGS ChangeLog README
-	dodoc "${FILESDIR}"/net.issue.sample
+	dodoc "${FILESDIR}/net.issue.sample"
 	newdoc telnet/README README.telnet
 	newdoc telnet/TODO TODO.telnet
 	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/telnetd.xinetd telnetd
+	newins "${FILESDIR}/telnetd.xinetd" telnetd
 }
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index 08acdfe856f1..85e39b1e10b3 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -4,5 +4,5 @@ DIST ofono-1.30.tar.xz 1030428 BLAKE2B 94248b7eb7b48000333fdee38eaecf13c259adf2c
 DIST ofono-1.31.tar.xz 1049252 BLAKE2B f7b40d3aa7854369a7886a4b64bb66044e8f016682665935f7727bf219c084d266d8fd7f80c97e58234d845f7db3dc52133298697274745d115cf14c62769d82 SHA512 377cda34dcc92d1f339a4b3271de5a14afaf309061c4467e5af18089cd821e65c0d8ad29d07e96d0f0480bb51554b284afb6bc2b9da586cc30dc0c1440612b20
 EBUILD ofono-1.16.ebuild 1624 BLAKE2B 1948438d3150f5cdc848ce72c10fcd70105d1854bec2f0e941d5eb24aaf869826e6e7de8b7b46c92d4f9a5a56a537baacaecce29d406abf1302964b4ab46a2e7 SHA512 fafe6075e7c1abb6b513c0a09620c61ce8e1472b6972d69ec23bfc652b7b63d2e983affe67bad31a5160e885e40576d3c67230e4f67ab0c989714ece954457bd
 EBUILD ofono-1.30.ebuild 1642 BLAKE2B 4588c877b0dbeb2eb46d65b6e0eaee6bbe2d55f6d9bebe272346fd925bcda89909fd18db0e641962b4de28a1b5e319a8bf17adc2ac07033d94cee43fa4221bec SHA512 f5eeb1ec9a0df58193fc1cf260155af8ea5cc4a1a69451051df31cb9d8ecd68ab64e66dcc949831c0d99173e62bf18cc1f50f5f705254d2fa803a19d1e462784
-EBUILD ofono-1.31.ebuild 1637 BLAKE2B 8bf01a379c38748a958fb34e385e81b61935c416aa360a7401fe21c4048693c86eb617f9113a46fbb525e5ac4ab44873f66b50c77bfc74cd84221dd82fe099a9 SHA512 c4a36ff45fd2cb2e4fb7d18f21a0d954e074e792f7ff3eab25f1407af9ca3337c7266a4fb949a651112002096cc2023c8fdea3b559d6d8197638924dc41b1476
+EBUILD ofono-1.31.ebuild 1635 BLAKE2B 76c8b68bd663de2e0ef75eb111fd931a709c638dcd759c826dd3ecbc911873dc0efd9e6fc8845bf600ca83b7897764db938d3abab27c4036cac54b775f17bcbe SHA512 8618347d9b2609698ed832dd8428c14c498e66a747a0987a087044d8bee3b407113e381639ebf62d6f3828bb91f47d0a9c70bf773b91c1c2e9d7231f66256e93
 MISC metadata.xml 951 BLAKE2B fd63ccff3b96dea1e770b7ec50c1a9e5e583fe81bcb2ca9c1915386a4fbd85a30c806f9ac3e163b1110e93b44f6714c555cee9273ecf90d5a9f9e209f0774897 SHA512 26f8b8b3ac43991d14534b4b1257a5c4dc1dd0eaca83c9f30aab74bbc721d9573e93e8f245a4ac2d0805ea9325aa759ca144951fef1b158b0b68f54df4df3e7e
diff --git a/net-misc/ofono/ofono-1.31.ebuild b/net-misc/ofono/ofono-1.31.ebuild
index 57a3f703bb57..444df24a6f59 100644
--- a/net-misc/ofono/ofono-1.31.ebuild
+++ b/net-misc/ofono/ofono-1.31.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower"
 
 REQUIRED_USE="dundee? ( bluetooth )"
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 3772b1900e3c..0617a6a11de2 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,5 +1,5 @@
 DIST putty-0.74.tar.gz 2476513 BLAKE2B 3b3acd8ce1deb5d1659dd2ce77c9e7316e2c639c5f0e962c472b109afc1a54854d30123c4732f9b9e8ba28d9324508894faaa78f3b484c99c0063d1ea2f499b7 SHA512 0da86849ea764cd88643bd2c1984ac7211ae72dd7c41232307b1960a29ca9518044b022d87c60272d6db71a3357026862a112bedb90ee732b41494fca3acde9b
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
-EBUILD putty-0.74.ebuild 1683 BLAKE2B f2e694377eaa8ae5dad4c136ce82ea3a1f8707bef3b9a7527228a2b49c382e2ade8e2215ea1d93a0bafd74fff4360369578a8eb85af94157cb90bc3352b67bb0 SHA512 2fde3aaa7af3b725e5d61deb410f26e32dc7230b11ec524e8ed768543bb69691d623a7e10ba97f2df59cabf4c26bd823c7800ee9c705a5fd5312454d311c7243
+EBUILD putty-0.74.ebuild 1690 BLAKE2B 977b5a33f2e5e855fd52602002ca5e540ff18cb95d73e264887e354621982dc49bf1d9b9d0d43da2c92a68a4223a4ca370ab8322552e31f435d1247f64c07cb2 SHA512 e2887b4c2fb1b36e5687a290d0adec2670f09e4bae6545964e953697a1fc297c8d61f0cdff91fb0f9871b139be65af7178ba139d6b803a9328082f65a52f9172
 EBUILD putty-9999.ebuild 1737 BLAKE2B 7e09d4cbf3e219f2452f535ef15a1733c77b72fedf8336968b88cb4adbc6e7ab13fb4dd3bfea9150a23198d1e5d649a1a099d65da0263e8942f39ea02001e1ad SHA512 30577a60f28a9ef6fcb6e763a93d4ce624d4ba23708181eef42d8c20afc303f1c42af598808957caa80759a40d02c294eb19b16eea369ff801ef57b74d00fbe4
 MISC metadata.xml 1010 BLAKE2B a21ec4ee14bf1b61343ad8f504ee9ccfcf090ad6212c5ffe570b44e3443baeacb1fc3dc3080ce8611f730edf54e8a459d4669fc1bb7ca0c52b35567facab075d SHA512 1649e0d50d4f8318c2869a7e6ebb697f05c16f5e4e9bbe1b35ba38c1513c4bb14f2d4283fd3fd91fe30ab9bcf318f619d7c39ee1bcc3c476b95555e2939b2c8b
diff --git a/net-misc/putty/putty-0.74.ebuild b/net-misc/putty/putty-0.74.ebuild
index 518c228a1d8c..359b634424a6 100644
--- a/net-misc/putty/putty-0.74.ebuild
+++ b/net-misc/putty/putty-0.74.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 hppa ppc ppc64 sparc x86"
 SRC_URI="
 	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
 	https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index e456983afcd0..88ff71e775e3 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -2,5 +2,5 @@ AUX remmina-1.4.5-with-examples.patch 1845 BLAKE2B 0da938e4f9c6ce8f0dc094449477d
 DIST Remmina-v1.4.8.tar.gz 1998851 BLAKE2B 80427d06c041d6315fa8fabe90aa8a52ebd2cd1a76ab0e74672f54328d5fa9d0d287e551a5027e5ef60471ce4d934cfe745742058f26e7b93a95e2a1f85dbfd9 SHA512 cf8ea93904a1643f480d7de72bc4154570bcf184150ffc4b3b06699c95f354bc2f4f595c3b00c6c87e9797dc60bcb9993913647b2073f1e85977026f290d81bf
 DIST Remmina-v1.4.9.tar.gz 2033555 BLAKE2B 901e0118f8231a6bf021a0389a1db9462f19527b21954f3deba24e92e3c04d0d323efa3aeb475f0ec915e8cdc4b55cf331ba2010598e8a58567cba0f353b5177 SHA512 21c5141619874a3d90fd1e2ee9ae87dd4ca4b7dc14c0e16f06bca01b38f84db6e7ab178b0f6e9db703bf5d1ddcb17db45553786bb047cf814b1ff67f4aa6139f
 EBUILD remmina-1.4.8-r1.ebuild 2493 BLAKE2B 444297b0607ae73a1a8868ddb5c5af4c58484adc944ad29d2c983b70c5ca482e20a7782d4681b59330183c074acc4d138517eb6e5bf702d5e2daa361ca96d2fa SHA512 95a1c2cf34f5039268cc58afbc36e6bc872f740a1ec2465ef95aa4c703b1592fd89ff86d7b1ef817ac184ac0b6202585f96bfab5e7a53c35b3018cc6f8a72b82
-EBUILD remmina-1.4.9.ebuild 2495 BLAKE2B eb98f41f1abc9e1ad47cd576a60b68b97f43dfbb57a3cf5d10354cf4cbfbf0e720b7d9eeca14bf22182461f63b2fbae185c85a96ebfd35f86ae51ff721729668 SHA512 0b860aaaf18815fcfd10293f14810c9948fea66636b1360bafce7a5335a239527b84a70aa70339fe54b46391a0fdf06a1e61b2284b141b667e5b733ab84f325f
+EBUILD remmina-1.4.9.ebuild 2502 BLAKE2B 66c4daec9382a3a677d37da07e8fe95e97295176549cb0033a22ce478525055534db4d8975ddd63b53c8c15b3b45503800791c9a1e2fd215e3c2c86bfa2f4901 SHA512 46f68da358de3e4a8887f5cbfb4dd9ac8aa1feac3ef00f0895abe7452967c2b4829d80a36c67fce5c814dab17a54efb1d66602b713dd1e90a8b5f1ee1b538346
 MISC metadata.xml 1084 BLAKE2B e4bb4c696f1ef71959b779ccad19d3ee380a6e846e42b1e02caf2a772df07d168bb9623b8f29cfdcc7fb37f60523e6c1fc471f016ea3437c18b3e7512a4bcad4 SHA512 c0b50eca7d4cdd6dfa201aabec7c195b7dca44938ee627919a000bdc47fc95acd4107936a61399fab2c78dfcd3b97ce06753e97fc6bb21015758afe91337a346
diff --git a/net-misc/remmina/remmina-1.4.9.ebuild b/net-misc/remmina/remmina-1.4.9.ebuild
index 518563f4af8c..9a2ee2547ae8 100644
--- a/net-misc/remmina/remmina-1.4.9.ebuild
+++ b/net-misc/remmina/remmina-1.4.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
 
 DEPEND="
diff --git a/net-misc/sipcalc/Manifest b/net-misc/sipcalc/Manifest
index 139c836a78cd..56d935f58a69 100644
--- a/net-misc/sipcalc/Manifest
+++ b/net-misc/sipcalc/Manifest
@@ -1,3 +1,3 @@
 DIST sipcalc-1.1.6.tar.gz 117628 BLAKE2B 6da2a64f63ac9a4a53a588f8d82cfca230ba0f97893d89310ea0d83a8d6cc6b6a4c53fa1dc7ed9ac20b6bd8cc39e479c3b5d35658c58069e561b55d841e3a3ee SHA512 9d2047a6fb6ef177d455f44abea19bab7d0131b16eb2444b2b074e94e776854fa74084ab625d2be9b64d136979ede71722c2e24dca12ff54e4a5bb02f947570e
-EBUILD sipcalc-1.1.6.ebuild 398 BLAKE2B 03f71fe5971a25ea4f8c44f7241df229b79bfd964796ff92918318b48219720e36619a8ca7be2fef6930f8251ac42ff817404ae3a46baa79e95d5707399dc40f SHA512 9783c1ccf449eec4bfda253c0576184a1965f15e036dc0ac3621ec6537aea35adde6eb274cdfc1aeebdb1d529789cc7fce09dde5e63b714d80bfd63d8d8a0a00
+EBUILD sipcalc-1.1.6.ebuild 402 BLAKE2B 272048d2c85f633f5dbc0fb312ccd0f9f7ef0849e481037645b442a1fb2abb65197291bc369c9e49f23d95de5731dea30c647216741db71804072ff15b7c36c4 SHA512 3e414711f989835aad58ab3b50ff2be2fdeeba926e6ea7821d9b31efbede7dc64bc26e6936f7581a2fe6ef01cdfe1d48ef9db982123e415f6effbae751cadcec
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/sipcalc/sipcalc-1.1.6.ebuild b/net-misc/sipcalc/sipcalc-1.1.6.ebuild
index d9861b9af859..25bc9b8a9cd2 100644
--- a/net-misc/sipcalc/sipcalc-1.1.6.ebuild
+++ b/net-misc/sipcalc/sipcalc-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ HOMEPAGE="http://www.routemeister.net/projects/sipcalc/"
 SRC_URI="http://www.routemeister.net/projects/${PN}/files/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/net-misc/srf-ip-conn-srv/Manifest b/net-misc/srf-ip-conn-srv/Manifest
deleted file mode 100644
index d85ef1ca5d85..000000000000
--- a/net-misc/srf-ip-conn-srv/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX srf-ip-conn-srv 162 BLAKE2B 88d3a39843f4d0fea05c5d37a6e23c17e001b833e47f7a3aa5b51616d65f812e92e39b2f67ac73c09308835f36ef1f96ebf23cc27f21adaf6ca338600268cb64 SHA512 7a5d2fe94f89c06ae54e01a532bc57735d39a0a620d11a536a5f27ae0912a017661b4e5928ceb3f4a63e49d155592cb763043a6a53f270810b15bc0f22074e41
-DIST jsmn-35086597a72d.tar.gz 11056 BLAKE2B 12db2b739b910602ecef6b2417443275b10eae7baf746d77e017a5c568417e8a013531af1666d5ec7a26bb25a45d78505afea1681508964b82c8c08c5101d4da SHA512 0cec27867f3ffd39ae1040e5236b7710a0e1b31fd184da6b56aed3995379da64907dc00aa01692f244ed5ea59ec995d62bacfd3a130bd1dd59724405f24560bd
-DIST srf-ip-conn-140c9b8a8619.tar.gz 112882 BLAKE2B fd368385d5a2e54ee7d7f7aed1149120ad9249702fc0b9db9eb415adcb5da65191b23776e23d337764baad1bbdb500993f8c5590da77f33900a549cf291c3219 SHA512 6f6e6fbc1b3d17fb36ef48c530756d2c4b2bee0a0e9016355ca57ac7124ca2b18c845110d40818673b200a3700b92f6b40664d157a158979705146aad579186b
-EBUILD srf-ip-conn-srv-9999.ebuild 1703 BLAKE2B 721ad8f7d682fc7a44b58a31eeeef59c8b553aebad2d4fb428d0bbe8ca6d52895b232a51b7f0d8ae05c9099f632f9b2a29652c5b6e73da91a561b21afdd6a3af SHA512 557704ae6a2831103de64197fc63d1e45cb532501b84e95261129855f09cf3fe6bad57b85fa7a4b33ce3f1456c6737a9123c2697929632a1600dc4850519ca87
-MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-misc/srf-ip-conn-srv/files/srf-ip-conn-srv b/net-misc/srf-ip-conn-srv/files/srf-ip-conn-srv
deleted file mode 100644
index 4bc3f9d30f33..000000000000
--- a/net-misc/srf-ip-conn-srv/files/srf-ip-conn-srv
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-if [[ "$*" == *-c* ]]; then
-  /usr/bin/srf-ip-conn-srv-target "$@"
-else
-  /usr/bin/srf-ip-conn-srv-target -c /etc/srf-ip-conn-srv/config.json "$@"
-fi
diff --git a/net-misc/srf-ip-conn-srv/metadata.xml b/net-misc/srf-ip-conn-srv/metadata.xml
deleted file mode 100644
index 1570f891c6a3..000000000000
--- a/net-misc/srf-ip-conn-srv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-misc/srf-ip-conn-srv/srf-ip-conn-srv-9999.ebuild b/net-misc/srf-ip-conn-srv/srf-ip-conn-srv-9999.ebuild
deleted file mode 100644
index f92e83711ca8..000000000000
--- a/net-misc/srf-ip-conn-srv/srf-ip-conn-srv-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vcs-snapshot git-r3 cmake-utils
-
-DESCRIPTION="SharkRF IP Connector Protocol server"
-HOMEPAGE="https://github.com/sharkrf/srf-ip-conn-srv"
-srfipcon="srf-ip-conn-140c9b8a8619"
-jsmn="jsmn-35086597a72d"
-SRC_URI="https://github.com/sharkrf/srf-ip-conn/archive/140c9b8a86193b8f345c9e113691113310859ff8.tar.gz -> ${srfipcon}.tar.gz
-		https://github.com/zserge/jsmn/archive/35086597a72d94d8393e6a90b96e553d714085bd.tar.gz -> ${jsmn}.tar.gz"
-EGIT_REPO_URI="https://github.com/sharkrf/srf-ip-conn-srv.git"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/build"
-
-CMAKE_IN_SOURCE_BUILD=true
-
-src_unpack() {
-	vcs-snapshot_src_unpack ${A}
-	git-r3_src_unpack
-}
-
-src_prepare() {
-	#set needed paths
-	sed -i "s#\$ENV{JSMN_PATH}#${WORKDIR}/${jsmn}#" CMakeLists.txt
-	sed -i "s#\$ENV{SRF_IP_CONN_PATH}#${WORKDIR}/${srfipcon}#" CMakeLists.txt
-
-	#set cflags/ldflags
-	sed -i "s#-O4#${CFLAGS}#" CMakeLists.txt
-	sed -i "s#CMAKE_EXE_LINKER_FLAGS_RELEASE \"\"#CMAKE_EXE_LINKER_FLAGS_RELEASE \"${LDFLAGS}\"#" CMakeLists.txt
-
-	#be in a sane directory for eapply_user
-	cd "${WORKDIR}/${P}"
-	eapply_user
-}
-
-src_install() {
-	#add a default banned list to edit
-	sed -i 's#"banlist-file": ""#"banlist-file":"/etc/srf-ip-conn-srv/banlist.json"#' "${WORKDIR}/${P}/config-example.json"
-	echo "{}" > "${ED}/etc/srf-ip-conn-srv/banlist.json"
-
-	insinto /etc/srf-ip-conn-srv
-	doins "${WORKDIR}/${P}/banlist-example.json"
-	newins "${WORKDIR}/${P}/config-example.json" config.json
-	newbin Release/srf-ip-conn-srv srf-ip-conn-srv-target
-
-	dobin "${FILESDIR}/srf-ip-conn-srv"
-}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index c1969ea508e5..3515c02030ca 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -2,8 +2,10 @@ AUX youtube-dl-2020.11.26-fix_spreakershowie_test_url.patch 854 BLAKE2B 31c948c2
 DIST youtube-dl-2020.09.20.tar.gz 3188480 BLAKE2B c12ee589d112155207b59da9f710b2c776c07464d5c64a5d8355b963a81765b0dbc65df4f9564504fb963f30d5a11dc7e662c14d58ddf9fe6347352363cf70a5 SHA512 ed511016d0cfcbbee0cd651f793cb31cdb46d80243f86186de1cc54cb2a2055fae2f5cc3e16f838fc2ba47f3ff6f3b484219c8a707904fbc30193a2b28a1e30c
 DIST youtube-dl-2020.11.26.tar.gz 3218922 BLAKE2B 4e8ac926a7cef9d8a9f53de1002464e4d3a632d09c6564e1451a7bc49fe4cdf72e206f98df58a4025d55718f46d84fe4f1f6e23268ef19ad3ebd11725d5a0fcc SHA512 126c299c3db654ad3c88ced44bfc1a34bd73a439d8d3fd64720bb5d06fe84df817182a9e0b38d1def2eb4f1de26c7e2b8b6d3d6b4282f973db548c9868938a41
 DIST youtube-dl-2020.11.29.tar.gz 3222467 BLAKE2B 6b699689f55fb5b24d9a3fa9b500461076d9cac58a111fde5f07f4df45113d40cb2cfbec2b86777b92277fbe16467c1516fdd5bb49e30f8361dd7fe3479eca57 SHA512 e3b4e7e7a776a608d2ee34c5395108445ea43fc999b0364a686eddb5d5977591d2c625b2a97955fd565631da070921f3196cd98ce58cf9aebf4e504636645a3d
+DIST youtube-dl-2020.12.02.tar.gz 3225560 BLAKE2B 953de14c6801a853091625753c0f918e7c6f88b1631ed2d41427fc36cc615830161f860e043ca784b31b1845ecfd0f5a88afcaeca40dc797cd89d36d4762d637 SHA512 5e48e272d957be391cb18960e0b1864b0f2202e26a53491f5c15f6c40bc36e720d80e95955a5a2f889e05f11a999fd311d095b18e5082bb951739c63ffe7565a
 EBUILD youtube-dl-2020.09.20.ebuild 2165 BLAKE2B 287a55e622f3c36b8722de2b531a6c7779f17b996183eb535460bdc1ee10b175f0576e37cb4ada2522504a16e98d806546162e62d84499902de7af41136092a3 SHA512 2eb1b1917b312cd33615e159dc3a53df4bfd053bafac8dcc1f7562691e3491de10a84d166b4bd597576d7344e30cfd16fc1e3a86665ce3c410ba905403df511c
 EBUILD youtube-dl-2020.11.26.ebuild 2234 BLAKE2B b77ce7a214ccaf5b4512402f406cecf6f770832cb1ac99fb9ad3f7d087b985a0c9d4db1de7e661e9a0bc583d2548286221c6402911d190f8ac77d0ea8065136c SHA512 e7416bca93ff11567f98bf293a1adc66bfcc9dbd6c9be39c6e292b46cdadc96e68ae03710cb42cd521e0893793e19db86e4e90e5376c37ef5172be464226e3cc
 EBUILD youtube-dl-2020.11.29.ebuild 2092 BLAKE2B 2c69d94533f26f1b54012ffceb3f23ff8c7bb120887bccf7a752198130aae7da87d532e4bd782d15388eb69985dfc37ada6bce314a891285f36dec185873433d SHA512 1648a6832708d2a641a76d1bde23380624967a689264b0a57b16d2b131600791eeac5e0faf3a7f958a0b95f346f8785a3b11d7933608a5dc384204ef8fe2185f
+EBUILD youtube-dl-2020.12.02.ebuild 2092 BLAKE2B 2c69d94533f26f1b54012ffceb3f23ff8c7bb120887bccf7a752198130aae7da87d532e4bd782d15388eb69985dfc37ada6bce314a891285f36dec185873433d SHA512 1648a6832708d2a641a76d1bde23380624967a689264b0a57b16d2b131600791eeac5e0faf3a7f958a0b95f346f8785a3b11d7933608a5dc384204ef8fe2185f
 EBUILD youtube-dl-9999.ebuild 2074 BLAKE2B 7eb91fceeba248ff2a1b40ab97139da9a33211b2fe79c66ae6aa29a2b6fe1f2b4e400f4dcc655573d46b6fa9a7f3cb7baddc75a32739b89507db9d4f4f96eba3 SHA512 f9768251f05033b9df5a0ea82d9e62f6d8fcf651dbbcf72a300bba4caf22ca5b99af73b830eba2d5483ae9b227d99f02bfa015319303f7f7300e6106f1e0b342
 MISC metadata.xml 353 BLAKE2B 53a5a71088d6c6ba1785f245c36c8c7551eb800b308313a053cfb5f292df1adce321383522528a06742aabee8f5d7fe8d2d9805c28632fce1d50f6a938b163a0 SHA512 01570d01232abde7a0d3983e307197cd07ad010f57f5df49048405b45fe2e1f2aeb0594260014bd4d95a6f234885e29ac802111402df3707d41b4b0f75b7457b
diff --git a/net-misc/youtube-dl/youtube-dl-2020.12.02.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.02.ebuild
new file mode 100644
index 000000000000..47f8343b521a
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2020.12.02.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..9})
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+S=${WORKDIR}/${PN}
+
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+SLOT="0"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	sed -i -e '/flake8/d' Makefile || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	emake offlinetest
+}
+
+python_install_all() {
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
+	elog "On some sites - most notably YouTube - videos can be retrieved in"
+	elog "a higher quality format without sound. ${PN} will detect whether"
+	elog "ffmpeg is present and automatically pick the best option."
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+	elog
+	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index ff705a30a772..042e92b952d6 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index ddfc58ccf75d..20ed38c82f31 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,6 +1,8 @@
 DIST qbittorrent-4.2.5.tar.gz 7961612 BLAKE2B 61d2f2154a291a6d1ddab7d4775d4ac4d19f471dceb783cb7933015ed9159afdca4075f429891dbbd7249f09d910ef643d27da4c4b7307adbf29354222265027 SHA512 8808029bdb3a1638fcf792e92c36bd39889dbc2ceb26c8d45ff17b086bd076f0b3a8ed78dd6a1e3debd32e5b0ce212eea194ec601210ae29093cfb567eb4ca0f
 DIST qbittorrent-4.3.0.1.tar.gz 7752986 BLAKE2B c4541a5e93a9674dcaee02ef8f7d0335644e5530116070a4fac74952ab8a4ebaec2ae03b95f001c15c491d5f6963e6d305cef2392bd61bd615278a34a0ebb121 SHA512 b49ddafe8c01fa4dae4ee30130237456aee3eba2cdb666c4939d84f44d6b523c5ed7aba1174fad6d168db4de11210d2b97c0d304f5ee653cbf1c8ca2dd96afe3
+DIST qbittorrent-4.3.1.tar.gz 7836727 BLAKE2B aca72922c2fef567eaa8ecc54774f6ec7417d3b15fc9ef1aef87a5b5f0a96ec332e3ab59c49b1c62e85e73c8a8e61cd1da2e172290df8581b909ee3ad336b34e SHA512 078efb45ec65d7e1342624e71d11fc93516925b08084907266cb6154623bc8b817ecae0ce99489c48b294f8c94f5f6c5ea3f24a9a6ad005fe3249e2a67d0b815
 EBUILD qbittorrent-4.2.5-r2.ebuild 1373 BLAKE2B f86d98fbe0308c890231bb88b9016388718b651ac65c2447e6d622841e24e5d86e9d0f8fd74aed3b30c32b97595b324ee656c032cf85ca32f2b965ee42f6c894 SHA512 8620cbe83d0bfe5f5adc58f8417dfc2e7d00a914e427fa763430d9ce8a03e2f06be7a6bd9f049022b1cf3c9673f20d0a6b138cc6c52d26ba95e745ee8df43a94
 EBUILD qbittorrent-4.3.0.1.ebuild 1375 BLAKE2B b4d94d84237fe95c359508fbd9c903bf295bf3657cf9c62c22bcf929d6ea65d023cf552c8ffafbbde6b32088e19a77fe17601b863f416b95b253af3059bfc7d3 SHA512 6306571d1508d1550f91fe8793032b9de8248e900c9ea7daf9fdfdeb1750d0e53ac1042bec201890aa59d0d6b0aaf1f4e3d1f29df14493910a595c4f4451c070
+EBUILD qbittorrent-4.3.1.ebuild 1375 BLAKE2B b4d94d84237fe95c359508fbd9c903bf295bf3657cf9c62c22bcf929d6ea65d023cf552c8ffafbbde6b32088e19a77fe17601b863f416b95b253af3059bfc7d3 SHA512 6306571d1508d1550f91fe8793032b9de8248e900c9ea7daf9fdfdeb1750d0e53ac1042bec201890aa59d0d6b0aaf1f4e3d1f29df14493910a595c4f4451c070
 EBUILD qbittorrent-9999.ebuild 1373 BLAKE2B f86d98fbe0308c890231bb88b9016388718b651ac65c2447e6d622841e24e5d86e9d0f8fd74aed3b30c32b97595b324ee656c032cf85ca32f2b965ee42f6c894 SHA512 8620cbe83d0bfe5f5adc58f8417dfc2e7d00a914e427fa763430d9ce8a03e2f06be7a6bd9f049022b1cf3c9673f20d0a6b138cc6c52d26ba95e745ee8df43a94
 MISC metadata.xml 452 BLAKE2B 80b94ef467eaad04be0f17b8d15d1af20a2d09f27825a2c315445fb82c33bbcb35ca5c81e40b7ff21a0496b03f030a2d30b92fd2b39caafce47b7295d4daf98d SHA512 bce9d619f6c591237e412393678d54db4fe55fbd3ab52d191860bc97c7245e199c9630c8b76ea885fe195b486231b65906dc099361ccff59fe0adca08059c85e
diff --git a/net-p2p/qbittorrent/qbittorrent-4.3.1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.3.1.ebuild
new file mode 100644
index 000000000000..15913a17fc03
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-4.3.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="https://www.qbittorrent.org
+	  https://github.com/qbittorrent"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
+else
+	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	S="${WORKDIR}/qBittorrent-release-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+dbus debug webui +X"
+REQUIRED_USE="dbus? ( X )"
+
+RDEPEND="
+	>=dev-libs/boost-1.62.0-r1:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtxml:5
+	>=net-libs/libtorrent-rasterbar-1.2.0:0=
+	sys-libs/zlib
+	dbus? ( dev-qt/qtdbus:5 )
+	X? (
+		dev-libs/geoip
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
+
+src_configure() {
+	econf \
+	$(use_enable dbus qt-dbus) \
+	$(use_enable debug) \
+	$(use_enable webui) \
+	$(use_enable X gui)
+}
+
+src_install() {
+	emake STRIP="/bin/false" INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index c3a16af40a3d..f3eb8bb04c29 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/poster/Manifest b/net-print/poster/Manifest
index b75ee647bff9..da4f6e681dad 100644
--- a/net-print/poster/Manifest
+++ b/net-print/poster/Manifest
@@ -2,7 +2,5 @@ AUX poster-20060221-fix_cutmarks.patch 454 BLAKE2B a7494550de7a41bfbf87ff4b9a3fd
 AUX poster-20060221-fix_duplicate_DocumentMedia.patch 513 BLAKE2B 36cd30563d847a1e7946f14cff999a69d29f8cc37eea27ba003917643f5ef8b3cc507c76093ce972df98a2026c585f481c96cd9bdf2b2b01c09802abe2f4ef94 SHA512 b13c4cf46075922a6933be7b6adbf6c4f58d63c79208c9b63f04c3d21de47416019fd4257a3c8b36237a271b499fa61e06aaa80283203e61cc980c82004d8e43
 AUX poster-20060221-fix_gs_crash.patch 1370 BLAKE2B 7921cee78c95dad3660bc7e9c793a0fd4f6266eaf3f36caf85b30ed3fce701dd397db8a426974a186ea8e3fa958d849a34129478bcb42b08631579a976d2f7dc SHA512 3b2cf207c6ada9cf23a014f768b45a957b348b9ac9c2a151e951131cd845691dc91c40c8f77083066ffd2d97c21fe57f21f64b869c67458e0dcf29f6408e64ee
 DIST poster-20060221.tar.bz2 33770 BLAKE2B 96fc7202b737a6752d26428d5f5b301d84743ced74d8f1f971d61ddb24c32261ac708fe89aae8ee6a42c13a80ef1409086c3fab4cf6f83cb9c4df6e3ee0c1c6c SHA512 530d846ace93a182a4c232d7e30df47af653f354c8138f52d385b62b677ac51e6ca777c93ff5b3d4e983d8c16f3efa43d122f48826c80a08be0232331232c471
-EBUILD poster-20060221-r2.ebuild 640 BLAKE2B daa3bc104538e811227c1e39b1166120288042f9fcf331c1b2a4920bb0e1eae59cbcccf6df17a5a192080f1d7777662225c401e1d905808a4bee657f024f4bc1 SHA512 dc54b74bf6ed49fc66a0318d5954e4650f77240401ab4d86fb27de7b37861af691db96bfb9b5fc50ccc2d64aa64283107914999f501d626bcfa6971624454a86
-EBUILD poster-20060221-r3.ebuild 679 BLAKE2B 57aa2b68a8d1abd86eaec0f39068c15001584d5250edf91b5a634cca0d1f63fa7c9f54b48d530cc01d77fb03fe789ff8e554dbe4640403d666939fdda3465364 SHA512 fa39b4c45ed68d0325108c22d7ce4e338c27ed8b91b0374cfb322f3e18964e404b952e2b7cbb7bbc8c6b53c16db8b66f0ae3ee098437b98791c2af0538a20aac
-EBUILD poster-20060221.ebuild 532 BLAKE2B e694ac16a44265b8e4d08ee561d9f80e7cd2236d72976efec3cde9a70c0da788ab2156c7cedf701842213d458ae44330fa66ceaa07108748cdb5c47658d0a180 SHA512 786e62f1735ce5ed2900ed30cd290d1d2012a0c8ca90c95239144e6fb385235f95214dd361e31a61ab6585ee1020c56ebbff06ffd822d98437f29fb645bb5daf
+EBUILD poster-20060221-r3.ebuild 677 BLAKE2B f52bd90ef4b4c4363fa9e1c6a767d74655c866590cd15caad6aea022942a8b5a7e3c685dcb279a2579e6fd71d4c0d7430057fd9998049ce4d90c9b02a7654f7a SHA512 88c18f723ff4843b4e7839aa30502bb469b29eba514b7358ca31650d3f1b7e9c4841f7dbf2e94448f6e77e937e660caf0975c338d7d590943ab9f580af478ec2
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/net-print/poster/poster-20060221-r2.ebuild b/net-print/poster/poster-20060221-r2.ebuild
deleted file mode 100644
index 294fbc285b51..000000000000
--- a/net-print/poster/poster-20060221-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Small utility for making a poster from an EPS file or a one-page PS document"
-SRC_URI="mirror://kde/printing/${P}.tar.bz2"
-HOMEPAGE="https://printing.kde.org/downloads"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix_gs_crash.patch"
-	"${FILESDIR}/${P}-fix_duplicate_DocumentMedia.patch"
-)
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} ${PN}.c -lm -o ${PN} || die
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc README ChangeLog
-}
diff --git a/net-print/poster/poster-20060221-r3.ebuild b/net-print/poster/poster-20060221-r3.ebuild
index b912c89acd95..f278b477bd42 100644
--- a/net-print/poster/poster-20060221-r3.ebuild
+++ b/net-print/poster/poster-20060221-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://printing.kde.org/downloads"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 PATCHES=(
diff --git a/net-print/poster/poster-20060221.ebuild b/net-print/poster/poster-20060221.ebuild
deleted file mode 100644
index 34c1a6bc4d55..000000000000
--- a/net-print/poster/poster-20060221.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="small utility for making a poster from an EPS file or a one-page PS document"
-SRC_URI="mirror://kde/printing/${P}.tar.bz2"
-HOMEPAGE="https://printing.kde.org/downloads"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} ${PN}.c -lm -o ${PN} || die
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc README ChangeLog
-}
diff --git a/net-print/splix/Manifest b/net-print/splix/Manifest
index 0fb52817243c..38e554d3cbfd 100644
--- a/net-print/splix/Manifest
+++ b/net-print/splix/Manifest
@@ -1,6 +1,5 @@
 AUX splix-2.0.0_p20130826-algo0x11_le.patch 1231 BLAKE2B 8fe043f615bae54bf24635817696d2c38bf5250c77a4f52061b3cd7a82cc6c46a705ceed9ae4d46e47d5e8af64f8932a83acc718dabc614f6b03156274a34119 SHA512 9c96805deedc819cf4e663de63d35c4016b36a04ab56f5d3cee503e64dcd7a25d6ede2cd2ae3facf51d4e673476295a551e5659e9b91de6c30d1c21dc294be4a
 DIST samsung-cms-20120312.tar.xz 3354884 BLAKE2B ebff80c7e4ddebb87c46b0d282c64037d7584170ed224931e5b17fc93a76b162bd1b33ed00c59371464dcaef345cf6c33d428aa42c7b67c82958a23384ed0bac SHA512 448f111493540dc93b88d59fa50857bdca2aa9eb772e53c1d227402235d878ad599683d74bc4d815b4789527b5e7ebe207bb0c8fa9194eaf61ca95b78a1444db
 DIST splix-2.0.0_p20130826.tar.bz2 127278 BLAKE2B 6a8eb6b15e5208dd4173d50bf2b41d0e0f136057fbb46f36fb68ab1302c0c8a6b735311bc03f15e7afce0de802b3fa62df04ad5cd016532216b67a74e39835c3 SHA512 dda07e24b4321e6c1e3d4fbdd03fcc2b5931465db36ed9d8676a62313c4c64b7cbd58bf41996ddd1ab02086438f225439db0506aca7f0269f6c84e80eff72cb0
-EBUILD splix-2.0.0_p20130826-r1.ebuild 2187 BLAKE2B c2ffaa6080752032849d34eba2d0d8db0195cbcd4ccd6fd1e04d73056cc9f90bb59b0940dd90e3d99b11fe371db1f3c24740070a94c370d4bb50db36c342346a SHA512 99e8c29f6d0e5390386395d36374cfeeac39914a49c4ec511a68e8b3e2a54cc2947010a1a45fc8984e3b4d9ee6aeba19ce9895bc8f30f88ec2f10591031dff47
-EBUILD splix-2.0.0_p20130826.ebuild 2222 BLAKE2B 5954d062804e255f70a3cb11e2cbd79c2cecc1ca85565bcaee31a4925fb13cae61369ea4d20f03748ddb206109287112afd2dbd3da211f1199d297568c9a388b SHA512 2e124078fdde449972d150db2416d177841ec4088b0749a0406ef661f9d56959ea93ec28dfa0903c98f35866a34e72af31f8a764675864c485995e6d85aee327
+EBUILD splix-2.0.0_p20130826-r1.ebuild 2185 BLAKE2B 397a6da1a164cffa6e57b5db4938e80cad4ae2eb5e43c195c9a847dc9831e3859996135fcae4efaaaa689a7a0780273aaae8e55edf21ca3d6e438d5cb19277af SHA512 ff981508fd1641eca3344318846dbe55caca28f7a640c91a11c3b5da4c236ba3262ebfa40fa4782654bac026341bee2492f18d8e979e8da00b0059d5d0858127
 MISC metadata.xml 448 BLAKE2B 90ff61ffb785842747851b72263a3be4dc4fe3327450458d670bf2e4f0eea69a1ad3fc65ced40b0cea04542cc72cedeb071796b677af69d9dee7f9408a60fcdd SHA512 0ff863e6a4c76cfd3d027903a438b455a647c840250cd5d317600ea7c1df2b941f9cc61b096dade6f64c7b7ad0b3a1e28e9d3fd5d8c930f15b642e9c2fecdb9d
diff --git a/net-print/splix/splix-2.0.0_p20130826-r1.ebuild b/net-print/splix/splix-2.0.0_p20130826-r1.ebuild
index f8278234dc38..fd915aa6e56c 100644
--- a/net-print/splix/splix-2.0.0_p20130826-r1.ebuild
+++ b/net-print/splix/splix-2.0.0_p20130826-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+jbig"
 
 DEPEND=">=app-text/ghostscript-gpl-9.02
diff --git a/net-print/splix/splix-2.0.0_p20130826.ebuild b/net-print/splix/splix-2.0.0_p20130826.ebuild
deleted file mode 100644
index 3ca2d9b6afb6..000000000000
--- a/net-print/splix/splix-2.0.0_p20130826.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A set of CUPS printer drivers for SPL (Samsung Printer Language) printers"
-HOMEPAGE="http://splix.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2
-	https://dev.gentoo.org/~voyageur/distfiles/samsung-cms-20120312.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+jbig"
-
-DEPEND=">=app-text/ghostscript-gpl-9.02
-	>=net-print/cups-1.4.0
-	jbig? ( media-libs/jbigkit )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Move to correct place
-	mv *.ppd ppd/ || die "ppd files move failed"
-	# Honor LDFLAGS
-	sed -e "/[a-z]_LDFLAGS/s/:=.*/:= $\{LDFLAGS\}/" -i module.mk \
-		|| die "module.mk sed failed"
-	# Correct link comand
-	sed -e "s/g++/$\{LINKER\}/" -i rules.mk \
-		|| die "rules.mk sed failed"
-}
-
-src_compile() {
-	local options="MODE=optimized"
-	use jbig || options="${options} DISABLE_JBIG=1"
-	emake ${options} PSTORASTER=gstoraster CXX="$(tc-getCXX)" \
-		OPTIM_CFLAGS="${CFLAGS}" OPTIM_CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	gzip "${ED}"/$(cups-config --datadir)/model/*/*.ppd || die "ppd gzip failed"
-
-	emake DESTDIR="${D}" CMSDIR="${WORKDIR}"/cms MANUFACTURER=samsung installcms
-	# Add symlinks for xerox and dell models (installed in samsung)
-	dosym $(cups-config --datadir)/profiles/samsung $(cups-config --datadir)/profiles/xerox
-	dosym $(cups-config --datadir)/profiles/samsung $(cups-config --datadir)/profiles/dell
-}
-
-pkg_postinst() {
-	ewarn "You *MUST* make sure that the PPD files that CUPS is using"
-	ewarn "for actually installed printers are updated if you upgraded"
-	ewarn "from a previous version of splix!"
-	ewarn "Otherwise you will be unable to print (your printer might"
-	ewarn "spit out blank pages etc.)."
-	ewarn "To do that, simply delete the corresponding PPD file in"
-	ewarn "/etc/cups/ppd/, click on 'Modify Printer' belonging to the"
-	ewarn "corresponding printer in the CUPS webinterface (usually"
-	ewarn "reachable via http://localhost:631/) and choose the correct"
-	ewarn "printer make and model, for example:"
-	ewarn "'Samsung' -> 'Samsung ML-1610, 1.0 (en)'"
-}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 28607f098410..dd64831d5370 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index c68a2cc6a0cf..fa51e17d44b2 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -15,6 +15,7 @@ DIST haproxy-2.2.0.tar.gz 2866916 BLAKE2B 176234efefee72beb1b46e7e8bb2455edc4135
 DIST haproxy-2.2.3.tar.gz 2872195 BLAKE2B 266375aeca17ea0053956d3fd8a4077da70e308501042b67433722f0ed2efbc85438d8cd7a6d7c7a3184349ff6cf6ed5ae90d05a150b6fda1077400f0769d75a SHA512 db99a5069537b6a3f161ad0a32ed884e81e27ed471d7c5f74b0655580c3eb1248376c5b252a9b998bead4fc5c05f28fda9e2280b8b05447bc5bc2d3c8fb55825
 DIST haproxy-2.2.4.tar.gz 2874180 BLAKE2B c53da911f09a5b35ae97709691754aceed09b01dffa27ee69368d26f552c1b87d149477ad8ab0410564e5ef1d520c91e069b36a9f3a5588a8cf9feb3139f9181 SHA512 762b51fdb9609654155ea2feebeb640bdd817481f633f012d767e1481bf888b90790455f0305ea9bbd0aec8363561d183bd510029f1bcce95102328ffbaf8afd
 DIST haproxy-2.2.5.tar.gz 2876429 BLAKE2B 1da993769302186ab0d7e1b0c8651c7e9a151295176da44bc854461f6b27831cadaa01a71b153046a23b43de91b2ba17b11ee52ecea12f744ae7af5b9f66ee98 SHA512 74e3c8b2b786f1fb5fcb8b8071751450f45a58ff847b336a8e4413727dea87b7d5a140853e3a445603ae5c4079f371ce9aa31a9f06c18ff4eea7462661775dca
+DIST haproxy-2.2.6.tar.gz 2890554 BLAKE2B c1a8f2611f373a80d3a246e5daac9ce7f69cbb7c7104057e9afbcb83b373ed97a5ae8d35d0152f4739b112693b312cd3535ef9b3c6c22b3e92f5ec6fbd5321ae SHA512 b9afa4a4112dccaf192fce07b1cdbb1547060d998801595147a41674042741b62852f65a65aa9b2d033db8808697fd3a522494097710a19071fbb0c604544de5
 DIST haproxy-2.3.2.tar.gz 2903983 BLAKE2B f4acc499e9210f1f520d1cc0913511986c1ecc74d5b9cc492e398cbeb29824d28c6983646d21a6c1eaf1f04010815778e582d1de464d39cd2660c63d5aa2b043 SHA512 ffabf499781220f71fd99d7f66f3a77f310ef69735e5c7e714f976052122788c917593d5e665d3a60d687a3ff63579331fdc5816414a8b75c7c8573e0b286ed5
 EBUILD haproxy-1.8.26.ebuild 4806 BLAKE2B af3c97529af6f1f5e13344ef66c8cddca311cf0c52d9a02dccf5031ef51f090cb7ab356002d78161f1182e84d1da381b08ff2b678e455b27c82f0a6efc414c24 SHA512 07beb412bb20437d94ff8e829741845400ed58f32e5ecc358cbd13ea777b802bf8ce188d7b9b6a9db43bad7bcc1b6136055ed23677ce6b57c8097f03ca607fdc
 EBUILD haproxy-1.8.27.ebuild 4806 BLAKE2B af3c97529af6f1f5e13344ef66c8cddca311cf0c52d9a02dccf5031ef51f090cb7ab356002d78161f1182e84d1da381b08ff2b678e455b27c82f0a6efc414c24 SHA512 07beb412bb20437d94ff8e829741845400ed58f32e5ecc358cbd13ea777b802bf8ce188d7b9b6a9db43bad7bcc1b6136055ed23677ce6b57c8097f03ca607fdc
@@ -34,6 +35,7 @@ EBUILD haproxy-2.2.0.ebuild 5346 BLAKE2B 4447cc7757537aa0d8dec607a2cadb8e0ca177e
 EBUILD haproxy-2.2.3.ebuild 5346 BLAKE2B 4447cc7757537aa0d8dec607a2cadb8e0ca177eb5d2304ddfeece9af1f7e36463f535f8c00341aa604f6ef2bcdbf0772b5b19a0eb87d247244428e15b0c41f17 SHA512 f07a595c679fe8db7a6f8cf63cf30c95851430e50f1289ca3a6589ef52ad817bd6d2f9d6a44f6e382c2e3a7c6c122e7cb76a79b95dd4dbc0206c0c33afabc0cd
 EBUILD haproxy-2.2.4.ebuild 5346 BLAKE2B 4447cc7757537aa0d8dec607a2cadb8e0ca177eb5d2304ddfeece9af1f7e36463f535f8c00341aa604f6ef2bcdbf0772b5b19a0eb87d247244428e15b0c41f17 SHA512 f07a595c679fe8db7a6f8cf63cf30c95851430e50f1289ca3a6589ef52ad817bd6d2f9d6a44f6e382c2e3a7c6c122e7cb76a79b95dd4dbc0206c0c33afabc0cd
 EBUILD haproxy-2.2.5.ebuild 5403 BLAKE2B d86c9e266cd9c93a101df63c3ee315fdc5338819f735a7bdb515a9d080b0c72d5775020735a1ad5a565d8fc45b8dd405d479aee87c3b94e5443c704b019d8703 SHA512 94c58695fe9da7f64c3c7abf319c01cc74033aad667c975f026b74e7c1a2102722c26eac68584759b241af9fc59d36f17edf2a418328b04bee36c23cb288a09c
+EBUILD haproxy-2.2.6.ebuild 5406 BLAKE2B aec5adad758895d5c7fa69504dd3510d9ed222eb98b39f992eb15fdf550ceeb0ded004e11a3fc6728a272eedc22f36fd379838ee1f55a533404bedb641c9b779 SHA512 98a0f30ecc835bacbb4d22a4e0cb1d80fc7e0b7340aadef317079cbd612cba2c23763a3273f397443c20440989b1d355e243c77ff66960f1d07f4f496b793a30
 EBUILD haproxy-2.2.9999.ebuild 5346 BLAKE2B 4447cc7757537aa0d8dec607a2cadb8e0ca177eb5d2304ddfeece9af1f7e36463f535f8c00341aa604f6ef2bcdbf0772b5b19a0eb87d247244428e15b0c41f17 SHA512 f07a595c679fe8db7a6f8cf63cf30c95851430e50f1289ca3a6589ef52ad817bd6d2f9d6a44f6e382c2e3a7c6c122e7cb76a79b95dd4dbc0206c0c33afabc0cd
 EBUILD haproxy-2.3.2.ebuild 5308 BLAKE2B 7ae680f08d10550ba8b8411b900ee9868e9c84655673c6717f5219680f007759cccd6b5c26093b41767aa0c112d3a2b294d94e69119b7f70598e4ff4096e806e SHA512 a734b8dc6e6843922dfb620e1ce73b80f25cedde8b594ae9a6fcb7c0371cf8500614985cf18fe0e3413837752d8922076fb3791319a96c021470b9b6f1678efd
 EBUILD haproxy-2.3.9999.ebuild 5346 BLAKE2B 4447cc7757537aa0d8dec607a2cadb8e0ca177eb5d2304ddfeece9af1f7e36463f535f8c00341aa604f6ef2bcdbf0772b5b19a0eb87d247244428e15b0c41f17 SHA512 f07a595c679fe8db7a6f8cf63cf30c95851430e50f1289ca3a6589ef52ad817bd6d2f9d6a44f6e382c2e3a7c6c122e7cb76a79b95dd4dbc0206c0c33afabc0cd
diff --git a/net-proxy/haproxy/haproxy-2.2.6.ebuild b/net-proxy/haproxy/haproxy-2.2.6.ebuild
new file mode 100644
index 000000000000..1518b1d4e9ff
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.2.6.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	device-atlas? ( pcre )
+	?? ( slz zlib )"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre
+		pcre2-jit? ( dev-libs/libpcre2[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	slz? ( dev-libs/libslz:= )
+	zlib? ( sys-libs/zlib )
+	lua? ( dev-lang/lua:5.3 )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.3.0-hpack-VAR_ARRAY.patch" )
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux-glibc
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/syntax-highlight/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/tsocks/Manifest b/net-proxy/tsocks/Manifest
index f7c712bf4eb4..3b6603ab76df 100644
--- a/net-proxy/tsocks/Manifest
+++ b/net-proxy/tsocks/Manifest
@@ -4,9 +4,7 @@ AUX tsocks-1.8_beta5-ld_preload.patch 1127 BLAKE2B d5781ae260b66aed97193d6ef73d7
 AUX tsocks-1.8_beta5-options.patch 1468 BLAKE2B b6eae3f2d0a51b2de68b47623c6c527e895e6637d30e1dccdc16adf53e8caaac029a944812810f0aa094a1ddf700ef3ceaa8ace663911ed2f208d4571dc524bb SHA512 9ffbe5cfdce9fb87cec739cd6de611c5acd2f79b73396355f7302366fa178ddbf92499c7c2801245cbe2f2a3448df27c67d57753c645f5c2622535cd8b1ea08f
 AUX tsocks-1.8_beta5-poll.patch 617 BLAKE2B 974277a260d0947e16b096eb38a0234d0fd40bbf9a4e0f212a4741994e5bee859080d455328979373c290ca9d5856db4fe4af116595a84a6fa6f70582045f10f SHA512 931a50b2c62c6fead52073dbe8287bfeda807f1c2e6ef3f9a3798cd79754e2fcd06e4d88c49bc0d748ee7a42eca3727503b2c1f261bd994b1a63e5eefac73956
 AUX tsocks-1.8_beta5-rename.patch 3104 BLAKE2B 6eec6173d8bd4cbb2e4b78096521abbfc5a57b37c6a492ef6de2de7d55d99a621e2641764038c0fe0a4ec3166c268b8eaa652ae25d86085655756471af5cf23b SHA512 d9c4b015c9408a455b357718fd40cf07f40430aef45acb1680a939b414e75ccdef43bac6e3d046268990c228aa402e9917dcf08a13d605264925c5766e9f0758
-DIST tsocks-1.8b5-tordns1-gentoo-r3.patch.xz 18468 BLAKE2B 6e786a2a5cbf37bce743aa2f934884fd7ba3abcb0c675d9cb61a0c8ab078cde1eb96a11bf8b2acf102a9637c78654e519e186a7558a3af496eaf86c0d65bd51c SHA512 86cbc7a8733e9f9e19e0924d2a2b8481a66eb67a8d548b90c7bd02cc6ae42064a295ee6a002cf19a7b3d7d811388db2a34b641d9dbe239f4c0bc8a1f78c90682
 DIST tsocks-1.8b5-tordns1-gentoo-r4.patch.xz 18464 BLAKE2B 99bd4c210c2fa4c797c4d827df4ae53d13198b91083975b9f6d327bd762193663c1a0c8530ea5e65e82d54ccf6900a11aba50e19a2fb6209e0e8f1131985374b SHA512 711b2e3f5ac9b1a4fd63e32b6cb8090066ece8882e2ec0048bee6cba868712c80ca7f601f79405be40404af625c2ff6fefa8cba98b8a6ced95abe6becf34954f
 DIST tsocks-1.8beta5.tar.gz 83928 BLAKE2B a58b4866154deb72b551961578f90b270a7cc1fd2c5b4c08a5ddf99472e3c8e338cc9116c0c9d2d2e1e1c350a077b46cd08fb24390156eb1e60c4d7a10510e6d SHA512 b41636ea6b77abf0d1e3cda7bbca4e7ee96f3cdb1843f3a2c530650931e5567f67921de67b28ba9bab0f51df39770a3f7fb458cf7ac78aad7aa861923df2c4a9
-EBUILD tsocks-1.8_beta5-r8.ebuild 2219 BLAKE2B 13038a3737ad8ebb9559058899c2b6e0fa01f8d496b1e9d853a52c495c9b432db1bbec98f1e4302e0854549bc2c60ce480a66c629a6a94876982b4aa511cf1c1 SHA512 255917c0895636dd5c77a6e6cc4b9eb5adef82051a5d1d74d64d01d08bbfb4d68e696e7bf9d81ecf71ffd2dc60668583a29fd9d5e2dfe5acc7955e51d912abf8
-EBUILD tsocks-1.8_beta5-r9.ebuild 2272 BLAKE2B 6fcfc76c849d607015c079772314d103f7d9f50d6094c2f81bd61786c49825c8b09bad4af8e7e2f04d765924b102a0203bc52f5b6533a8caf053749bf566c792 SHA512 1922c186b90091f7eb0181a75ea67169442c35c68e0c99be785e82b2098e0e4d7b3fa673b44f31c1eef0fd6f28725be5b770325a269651271eebb7b11562464f
+EBUILD tsocks-1.8_beta5-r9.ebuild 2269 BLAKE2B 542e91919c6c5039d2764311a924dddd508abd3fabd94bb5ec1ca93a9c1a873d1fd5e0998f2a238b02bab8aad0021918e3a29e7e22f9ad84b432ae608c8a3610 SHA512 bdb3e7585a3a63cce41de6dc6b4e729d47f6d26651f8ac69e6f9fe5ab19f72e179c816fd08d22a11e6bccfa32edf2328597cc4a67b9bc84eb15aa815b682d181
 MISC metadata.xml 981 BLAKE2B 9fbeb51e30b15ddc223aa7d239f9e5d9a51fed44b5ea905dfe07c7f996410cfb09c0019730cf4d26cf7ec26aac1bd63ac5eca1025efaff4ad20dfdce90435fd9 SHA512 483a93183cdedf77df2dbefff201c35d36f755969e28c6fefc6a44cfb56b0464ed78dfa7100ccbb3519a8ae30322c1346fb0d4cf2b1cbfa79dded237aff22d73
diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r8.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r8.ebuild
deleted file mode 100644
index 21be4c7f00d7..000000000000
--- a/net-proxy/tsocks/tsocks-1.8_beta5-r8.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils multilib multilib-minimal toolchain-funcs
-
-DESCRIPTION="Transparent SOCKS v4 proxying library"
-HOMEPAGE="http://tsocks.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tsocks/${PN}-${PV/_}.tar.gz
-	tordns? ( https://dev.gentoo.org/~bircoph/patches/${PN}-${PV/_beta/b}-tordns1-gentoo-r3.patch.xz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
-IUSE="dns envconf tordns server-lookups"
-
-REQUIRED_USE="
-	dns? ( !tordns !server-lookups )
-	tordns? ( !dns !server-lookups )
-"
-
-S="${WORKDIR}/${P%%_*}"
-
-src_prepare() {
-	epatch \
-	"${FILESDIR}/${P}-flags.patch" \
-	"${FILESDIR}/${P}-ld_preload.patch" \
-	"${FILESDIR}/${P}-rename.patch" \
-	"${FILESDIR}/${P}-bsd.patch" \
-	"${FILESDIR}/${P}-poll.patch"
-	use tordns && epatch "../${PN}-${PV/_beta/b}-tordns1-gentoo-r3.patch"
-
-	sed -i 's/TSOCKS_CONFFILE/TSOCKS_CONF_FILE/' tsocks.8 || die "sed tsocks.8 failed"
-
-	mv configure.in configure.ac || die
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	tc-export CC
-
-	# NOTE: the docs say to install it into /lib. If you put it into
-	# /usr/lib and add it to /etc/ld.so.preload on many systems /usr isn't
-	# mounted in time :-( (Ben Lutgens) <lamer@gentoo.org>
-	econf \
-		$(use_enable dns socksdns) \
-		$(use_enable envconf) \
-		$(use_enable server-lookups hostnames) \
-		--with-conf="${EPREFIX}"/etc/socks/tsocks.conf \
-		--libdir="${EPREFIX}"/$(get_libdir)
-}
-
-multilib_src_compile() {
-	# Fix QA notice lack of SONAME
-	emake DYNLIB_FLAGS=-Wl,--soname,libtsocks.so.${PV/_beta*}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	if multilib_is_native_abi; then
-		newbin validateconf tsocks-validateconf
-		newbin saveme tsocks-saveme
-		dobin inspectsocks
-		insinto /etc/socks
-		doins tsocks.conf.*.example
-		dodoc FAQ
-		use tordns && dodoc README*
-	fi
-}
-
-pkg_postinst() {
-	einfo "Make sure you create /etc/socks/tsocks.conf from one of the examples in that directory"
-	einfo "The following executables have been renamed:"
-	einfo "    /usr/bin/saveme renamed to tsocks-saveme"
-	einfo "    /usr/bin/validateconf renamed to tsocks-validateconf"
-}
diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild
index 0cbebcf7d45d..d2a536487035 100644
--- a/net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild
+++ b/net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/tsocks/${PN}-${PV/_}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
 IUSE="debug dns envconf tordns server-lookups"
 
 REQUIRED_USE="
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 3985ae49cf27..e930df6e2b94 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/networkmanager-openvpn/Manifest b/net-vpn/networkmanager-openvpn/Manifest
index 2ce1ef00b064..b208d1831272 100644
--- a/net-vpn/networkmanager-openvpn/Manifest
+++ b/net-vpn/networkmanager-openvpn/Manifest
@@ -1,3 +1,3 @@
 DIST NetworkManager-openvpn-1.8.12.tar.xz 597216 BLAKE2B 55ccb3139b1be9d1894d3651d60ce0f2167a24efbb24a9870eb4bb683a91603ae5f5149ed9aca8307cf608140c075a7b19bdfef68b1dbfe0729c117f084bb904 SHA512 1b8adf926426f866f7509a07c24203d6b584627aba4f8e2b1b00fa897bf0d7155009d566c3440565d1ee0e938694dd8d6746f37f62d493864d16eae007590b22
-EBUILD networkmanager-openvpn-1.8.12.ebuild 1302 BLAKE2B 451a9e8e1e8a1de6a943927529fe439b36fd7048115db948b7fe90698c4730470dc6a73735106c0b7c4b90e892b2ee07a1b993c0397ac1b620062c585a2f7558 SHA512 6f8f1aea4ff54490b07a2d72777d6a5eec0e36de17014703ed0000a4d516966a7f8b4ad8635c988aa9a4b18ae6c8c844b79a85a9fa76d19e9ce89c04c75ed284
+EBUILD networkmanager-openvpn-1.8.12.ebuild 1309 BLAKE2B 4f43d1a63291d1ee63608ac24fcf196e008acbc42bac665be4cd8e33854ec806b5aa5e1b8cf9fc1ca405a30b6dc9135b14d2030756f1e821dde49f2acdf7823d SHA512 07a4fdca208573de39314aef0cd7e1b1afc8e69ffe522b630acfa036c38d8d52ef35caf95f21881f96037e44b760099ef5963d0bce87d0da3949b2324c43615c
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild
index 98147f688619..61b13e607235 100644
--- a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild
+++ b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="gtk test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-vpn/vtun/Manifest b/net-vpn/vtun/Manifest
index 367459d3ac46..c94c820ba0e3 100644
--- a/net-vpn/vtun/Manifest
+++ b/net-vpn/vtun/Manifest
@@ -6,4 +6,4 @@ AUX vtun.rc 669 BLAKE2B beb4f78d4a4c8a83ea7d102a9c508125cf0942081aebeb0d6196fa8a
 AUX vtund-start.conf 1174 BLAKE2B 3bce3aa808286c554accb71876314bbe8ecbd5e02b16b804f911201a0fbfd8fae25f9f6a702d2de4ef5254d50661d9d1c578f5d6b7e9dcec5b92ebe8b4724007 SHA512 7ec2a8f64380483b8e311bbefb78675a457e27088888e654f8c5fee5f14a77a72f1319b9c7e2dd38763c86728e4f44d6eb87c286103e547e19f329f1550e6710
 DIST vtun-3.0.3.tar.gz 130051 BLAKE2B 9bbc11724fb75acd024fda8b4e84af425c5377b3d8a938f7e789ecb1c2cdb95f109a1edc59f3fcbd2c5898bd17be76054060e8e36a1fb4355b40b61cc64adaad SHA512 5fa789d08b556f97492b89515a89c2322c4b0a8fa95bd1035f5ed19061b3654a6a36a9911792096ac872ae9ae5451848cab87d0343dc0ffc064affea1f7d0d54
 EBUILD vtun-3.0.3-r1.ebuild 1533 BLAKE2B 0b6c7af0263cff3121b6cd14eba8c6da85adc352b6c388d9502177bd09e1ec3b35e22a74215b4f8283ba4fe3b7d99786d2f5378279a8fec82dc93e126f88b021 SHA512 b1d101ca8513f18e2fc114657518f6e866eaec6934f689593116c0941ac6e94daf373e880a6666b05b9720dcb9ec387504bd836f27e9de4a33c8c2b912363df7
-MISC metadata.xml 321 BLAKE2B bc9b56ffe1106a5ba954a206111d3814e33cca82f2431c888f7c5da8c7b8314e3fcda78c6f96791cc33b6710ff8eb07ba38c14582e2f5a070ae10442d0ea03d0 SHA512 c5983cd105c9b0534371fae20648dc22d4d73440d2f1df3fdab3c84dc76d58fc951c31421cf9ac597fdef0067a53fcb54817a4a0c40b6cbf8c4dcfae8543c731
+MISC metadata.xml 241 BLAKE2B 448a095dffb575ffc7fabf1cbbf041e542798eb1d297b9d142d73dbb0a1721536f796f8267ef06c771d9eb15ef1fbeff9951206466593050205fcb9a054031f2 SHA512 c98033edf3b8c0eb56360dc2960533b517a1a724c036d60ea99831c9bb9dfe0e098a5b9fc8b0b5f5df5b00b73224b282f8079ce2d3f2c74b9df068e903ecd648
diff --git a/net-vpn/vtun/metadata.xml b/net-vpn/vtun/metadata.xml
index 6c796b6d02c5..8a832320c0ca 100644
--- a/net-vpn/vtun/metadata.xml
+++ b/net-vpn/vtun/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">vtun</remote-id>
 	</upstream>
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 66e32986dff1..79d8019cbb4f 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/airtraf/Manifest b/net-wireless/airtraf/Manifest
index a2b86bacdb4d..8bc09aee8d70 100644
--- a/net-wireless/airtraf/Manifest
+++ b/net-wireless/airtraf/Manifest
@@ -3,6 +3,5 @@ AUX airtraf-1.1-fprintf-format.patch 421 BLAKE2B 8acd7417ded374a9973f52be45ee171
 AUX airtraf-1.1-off-by-one.patch 744 BLAKE2B c2000cc9014cfb02cb65fa6a51e3803c54dc813ef0268ec35fdf3119033438ab5b24e9caa5c0104435deeeedb46c545ada16683ccb638628385aef13647aafb5 SHA512 c19194498b2169a4ac20f20e51ea197bc9c96f5150a730a299375ea8d6babb4e498246fd8faf93d7dc285ca8a21d300a33102b2860868c7b9b02c89bd818c1fb
 AUX airtraf-1.1-sniffd.patch 1699 BLAKE2B b175d5d6b82beb519d4a74c4faabd9967d030a08b0fe18c779ca6cccb34a277e740a861034e0e567278ba2485c842bd2be05f4e64dfc38a3a1af3e14fa2a57a5 SHA512 6906700e625d8c9b78b248d281b19e158610c1d58d1ab23de3526bf3d060b3bdc259ae768b587ff52fdbaf4dd343ccda30517578825b75e65ff11d7fda515a1f
 DIST airtraf-1.1.tar.gz 136241 BLAKE2B 682516c6441efac8699fb15d40b99b50882d1c2d9e3acd344a979df080ca4f5532b0aa3247f37360f78ad2902018f907d6fe3e912b1d7b0df383c3bfe16f61a9 SHA512 7f341abb25e15dbdf510805230ee2f186a7a66d5c1e486bfdb978d3d8534d8b8c2cc1b5e0e323357c65af1eedbcb1da3e3e5f3ac8299db5f203f54b4a868f90b
-EBUILD airtraf-1.1-r3.ebuild 1080 BLAKE2B ccd4cb0a770fcb178d95c1a78c0713606219489f33b45aa8735aad8a3fc2488a1f5632bd4c874c2a109c462b1f7517be00436d14fcdca4fd95907537d643f243 SHA512 f771cdbbce371e35a8aeb945eb3c580018de5ed01c263358a488fb1a8ed933ea9dac83dcb1a04e4f91cdaf0dd790f5749410e8759c10bfe5cdbc0df68c023429
-EBUILD airtraf-1.1-r4.ebuild 1115 BLAKE2B f4c1992733b2775ed01a3f20d51bbd5ce5d23f84f64bb8b3863c1125ea4b5083d08a2a6fbed915a8ce276cbbb6407dbb61556c427615832e2aa3cc1a63c88633 SHA512 99b86cfaa2730f952e3318df7c99dcf5c86223f7de52fd98ee86f40234abd4f8dd525b602e70d4a089002e3dbfd7aee1db21ac9ace16d9085163b899ba3ed4b7
+EBUILD airtraf-1.1-r4.ebuild 1113 BLAKE2B 222dd45e37a9ebd42741e28e3eb11c6db5e25df54d304cc880e0bc7687fabc050237a3a70b87653a87631818fac5801d1acec21ce23c481b6780df7d0f347715 SHA512 76a8b630ea2b44d63053cbf70a96eddb5a9eec2550d67713ee2a563eeaa4c68bb1cdeb966748c9c73a2f02fd42c2d33fc339bff5c362d77eb81834d1fab1978b
 MISC metadata.xml 684 BLAKE2B 58863082b9d07f5798333fd9ab8e1a7777fe7ce8e0a63a4bbb5f6905b4125547c1248fcfa95027668fba537399330ef4464a3a2681733bb0ba68ede152ac7db7 SHA512 51cdb73af9ffdaba0fb7a8778dd573885fa446def0baa3932925e89357d43fe33af62095d01f1cc51f5135c2cfb09f7044381b080e077c7bae0a3276a231ae33
diff --git a/net-wireless/airtraf/airtraf-1.1-r3.ebuild b/net-wireless/airtraf/airtraf-1.1-r3.ebuild
deleted file mode 100644
index aa46a6756035..000000000000
--- a/net-wireless/airtraf/airtraf-1.1-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="AirTraf 802.11b Wireless traffic sniffer"
-LICENSE="GPL-2"
-HOMEPAGE="http://www.elixar.com/"
-SRC_URI="http://www.elixar.com/${P}.tar.gz"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="
-	net-libs/libpcap
-	sys-libs/ncurses:=
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-sniffd.patch \
-		"${FILESDIR}"/${P}-off-by-one.patch \
-		"${FILESDIR}"/${P}-fprintf-format.patch
-
-	sed -i \
-		-e '/^LIBS/s|=.*|= $(shell $(PKG_CONFIG) --libs panel)|' \
-		src/libncurses/Makefile || die
-	sed -i \
-		-e 's|-lpanel -lncurses|$(shell $(PKG_CONFIG) --libs ncurses panel)|' \
-		src/sniffd/Makefile || die
-	tc-export PKG_CONFIG
-}
-
-src_compile() {
-	# parallel make (bug #297331)
-	emake -C src -j1 \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin src/airtraf
-	dodoc Authors COMPATIBILITY docs/airtraf_doc.html
-}
diff --git a/net-wireless/airtraf/airtraf-1.1-r4.ebuild b/net-wireless/airtraf/airtraf-1.1-r4.ebuild
index 50ae7747fabb..267ec5084789 100644
--- a/net-wireless/airtraf/airtraf-1.1-r4.ebuild
+++ b/net-wireless/airtraf/airtraf-1.1-r4.ebuild
@@ -9,7 +9,7 @@ LICENSE="GPL-2"
 HOMEPAGE="http://www.elixar.com/"
 SRC_URI="http://www.elixar.com/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	net-libs/libpcap
diff --git a/net-wireless/dump978/Manifest b/net-wireless/dump978/Manifest
deleted file mode 100644
index d46ec37e1fd0..000000000000
--- a/net-wireless/dump978/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD dump978-9999.ebuild 996 BLAKE2B 3cc0f475cd238942058830d5209d14c722c33f3fb0049778863c970633b48393f3f6271f8d0695984d5093a10ef72ea0255abc8ca206964e7b889f7087e39750 SHA512 f5ef87438d9351bcb910a5873d31c701c8c9a720feeb6c8f40ea7a96baadbb6e57dc85d215ed003a94fe74f4c5c41ea789fbca569046dede7d25271ad51e21bc
-MISC metadata.xml 322 BLAKE2B 268566da9bf8b705f49287f5579d0bf9d647658459e86d3a168454765387c51226246b50e8a1ee78c62a926cd4eceaafe75518929d0e7ffc3ab27ec6f839df3b SHA512 03b9e040e61bae4ce0b020f7b8d6f2e134c1c8d60de4826e43def2181a632244f982a5f2a1d9e67a542545f8703c8f885fd89dbe2c04008992a040f98035c72c
diff --git a/net-wireless/dump978/dump978-9999.ebuild b/net-wireless/dump978/dump978-9999.ebuild
deleted file mode 100644
index f84f6b174121..000000000000
--- a/net-wireless/dump978/dump978-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="simple Mode S decoder for soapysdr supported devices"
-HOMEPAGE="https://github.com/flightaware/dump978"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-	#COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9"
-	#SRC_URI="https://github.com/flightaware/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	#S="${WORKDIR}/${PN}-${COMMIT}"
-	SRC_URI="https://github.com/flightaware/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/boost:=
-		net-wireless/soapysdr:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e 's#-Wall -Wno-psabi -Werror -O2 -g##' Makefile
-}
-
-src_install() {
-	newbin ${PN}-fa ${PN}
-	dobin skyaware978
-	dodoc README.md
-
-	insinto /usr/share/${PN}
-	newins debian/lighttpd/89-skyaware978.conf lighttpd.conf
-}
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 047b5f4a7ea0..b37cec92c149 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -2,8 +2,10 @@ AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060
 AUX iwd-1.8-eapol-prevent-key-reinstallation.patch 2575 BLAKE2B 1e9683e551178ff54f31f9c8e861afb4b1cbe6d2f11188043d2bc6075fb21fe2637db4b13a4b93c900b9450034d28088e525e42ff0cfea08341fb056c7c74fc2 SHA512 e39965ae121e42ff17c1cc05539af1d9005748d05c0fe2ff4ef7884c3b224973a30875961476ecaad7f6f7567e79dd33bc854be05a71b37c4c05a19e2b60fced
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
+DIST iwd-1.10.tar.xz 897928 BLAKE2B 1589300201c835b2b14c34a9adefb525173cc2f9c8154f0a5f12da64a1da3d383acf328c5138bb8d4903ff08f339b7d55f02e215896af90aa75d244f61c3de1f SHA512 c128ec764e9d727b4ae1157717826b3219c5d368746f7709a01cb816f077afaa32083052ee2a4ecd09a7fbd36c03ea9ba6bd1a84c2a33210398dd060e9020db5
 DIST iwd-1.8.tar.xz 865668 BLAKE2B ba1be5c1658df950fe28deca6b8c3c9482eda260fbd05f721cb34cadcb2852768086e65e7c74940bc6ddd345d1438624b59bdfe4b6a5323dd122a0cd397008d7 SHA512 f1caa330b3ff18b4598efec596a4b9a22887833218a90d19d59717503679eff71fdb990cb63bd74b8f1523197a366cd803d799259e8002e5cde2745b03d51d8e
 DIST iwd-1.9.tar.xz 883616 BLAKE2B 57dd4a6e00d73bcfb752e1bd3661e97251d1dab4c05638d148ae7031bff35d606063f79e575ed4d3d3a60ff5514eb3fc340e1eec4c2e7074bf8d6d4b79832f6d SHA512 d8762495f7f5a342476653c0cf64c31b3b41a3064a05c4fcf49b9faf4394b0d7a5db6aae6324896bdc8f7b104697fb4c4315f7073a4fde4fc87f8f55d932538b
+EBUILD iwd-1.10.ebuild 4890 BLAKE2B 7113e611b7868ad83ea9921cc1c41a6f0afad8458a327309f75fee0ac91acbd650e6e46c078612aea81b953d6589b5e809fb32ac735a0bb7b0f59f3fa6fc933f SHA512 c5e2504b92a43e1da4f9ebc13eba2e734121b0de595d81d51478884855ea6ff5c85cc3d56f33cba7b682cc135a647763bfdb05d5496c80b3235d3ce28d2329e6
 EBUILD iwd-1.8-r3.ebuild 4477 BLAKE2B d80632f00a31b5f1f751373701f80602d34e8fb8cec14316f5405a76af1df1cbed79f0b786d3f9e3e2bce2d54f7ee72ffcb0595455e9095c87c55b68b9f4b50f SHA512 d9b44088c2a4ddc0b42831ffca847daa1570d72583526a669c2178fff2a8d2c0cbf5415dc6f4d3edc2991fc588951e546de4b67449f721fa4e2ad71d2fd52e1e
 EBUILD iwd-1.9-r1.ebuild 4885 BLAKE2B b648703ecd98f049847a6d9e68e67556648269405db9eee067258ae2cc4a34c493dd9842864226c5184e1512329b65eb1f6b95b561a8f64d28fd2e8c6478db37 SHA512 8e3ab57f8ec33631b4ddb7d0972dfcdef909b3cb382f5ad197b0b5248d2bbb6e38a061968b6603a7182e0a87618a1d3e95ecd75239dddcfbc2d3ea700fe0ab0f
 EBUILD iwd-9999.ebuild 4866 BLAKE2B 56604e640edcc195e7590b17e5b390d2301cf99f222c7046393e50312decd6b162c9d204e33bb5984db3fcf109270ddac0445bf87da4cb7317722584709bdda9 SHA512 c0188ce813cc775f17fd9dfbfb2e0abd8de904a9d4f872750e3342cbe6559f06d8d0c50007e8b48c31a3066c26c3a3773ea4c4a3ee863151250cd58cf2e11b4d
diff --git a/net-wireless/iwd/iwd-1.10.ebuild b/net-wireless/iwd/iwd-1.10.ebuild
new file mode 100644
index 000000000000..68624a7cdd36
--- /dev/null
+++ b/net-wireless/iwd/iwd-1.10.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic linux-info systemd
+
+#Set this variable to the required external ell version
+ELL_REQ="0.35"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Wireless daemon for linux"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3
+standalone systemd"
+
+COMMON_DEPEND="
+	sys-apps/dbus
+	client? ( sys-libs/readline:0= )
+"
+
+[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	net-wireless/wireless-regdb
+	crda? ( net-wireless/crda )
+	standalone? (
+		systemd? ( sys-apps/systemd )
+		!systemd? ( virtual/resolvconf )
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
+
+pkg_setup() {
+	CONFIG_CHECK="
+		~ASYMMETRIC_KEY_TYPE
+		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+		~CFG80211
+		~CRYPTO_AES
+		~CRYPTO_ARC4
+		~CRYPTO_CBC
+		~CRYPTO_CMAC
+		~CRYPTO_DES
+		~CRYPTO_ECB
+		~CRYPTO_HMAC
+		~CRYPTO_MD4
+		~CRYPTO_MD5
+		~CRYPTO_RSA
+		~CRYPTO_SHA1
+		~CRYPTO_SHA256
+		~CRYPTO_SHA512
+		~CRYPTO_USER_API_HASH
+		~CRYPTO_USER_API_SKCIPHER
+		~KEY_DH_OPERATIONS
+		~PKCS7_MESSAGE_PARSER
+		~RFKILL
+		~X509_CERTIFICATE_PARSER
+	"
+	if use crda;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
+		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
+	fi
+
+	if use amd64;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
+		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_aes;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
+		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_ssse3 && use amd64; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
+		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
+	fi
+
+	if use kernel_linux && kernel_is -ge 4 20; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
+	fi
+
+	check_extra_config
+
+	if ! use crda; then
+		if use kernel_linux && kernel_is -lt 4 15; then
+			ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:"
+			ewarn "Regulatory domain support for kernels older than 4.15 requires crda."
+		fi
+		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
+			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
+		then
+			ewarn ""
+			ewarn "REGULATORY DOMAIN PROBLEM:"
+			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
+			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
+			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
+			ewarn ""
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]] ; then
+		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
+		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == *9999* ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	append-cflags "-fsigned-char"
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
+		$(use_enable client)
+		$(use_enable monitor)
+		$(use_enable ofono)
+		$(use_enable wired)
+		--enable-systemd-service
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
+		--with-systemd-networkdir="$(systemd_get_utildir)/network"
+	)
+	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/iwd.initd-r1" iwd
+
+	if use wired;then
+		newinitd "${FILESDIR}/ead.initd" ead
+	fi
+
+	if [[ ${PV} == *9999* ]] ; then
+		exeinto /usr/share/iwd/scripts/
+		doexe test/*
+	fi
+
+	if use standalone ; then
+		local iwdconf="${ED}/etc/iwd/main.conf"
+		dodir /etc/iwd
+		echo "[General]" > "${iwdconf}"
+		echo "EnableNetworkConfiguration=true" >> "${iwdconf}"
+		echo "[Network]" >> "${iwdconf}"
+		echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}"
+		dodir /etc/conf.d
+		echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd
+	fi
+}
diff --git a/net-wireless/openbsc/Manifest b/net-wireless/openbsc/Manifest
deleted file mode 100644
index f56ba046eb52..000000000000
--- a/net-wireless/openbsc/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD openbsc-9999.ebuild 632 BLAKE2B 460c96c1ca460d4854c51847cdbfbccf9d81b89d9b28d170d99e7525ef65b7069824bfdda45ce524654049055e82b4825eb75b81facc18c50aef9975a61ae03d SHA512 ff18ee81695dbf4874b13c100571fa4defa159ea6c216d0302910f155ea60fc3997f2d760b5887cc5c15d00941ba880d1885b280a85bcf01bed37dd5682a007c
-MISC metadata.xml 306 BLAKE2B c430f924b1f5811fab4efa2f4a3a42529e8a37744783e8adb2ee48f10ca1aa2030f544a89bd554fb53ea746a48a69710e586d47d007100762cd34a81534c6b13 SHA512 b2cba4799307872808b4d932c487c1344e2251f0da3186ab7ccf6bd8e76bca2c7d31661d7ef4cd5982c97483a53d8197aaf49ff88e1aa172ed179dcf75505f28
diff --git a/net-wireless/openbsc/metadata.xml b/net-wireless/openbsc/metadata.xml
deleted file mode 100644
index 7e81667e2456..000000000000
--- a/net-wireless/openbsc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-	<use>
-		<flag name="gprs">Support GPRS via OpenGGSN</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-wireless/openbsc/openbsc-9999.ebuild b/net-wireless/openbsc/openbsc-9999.ebuild
deleted file mode 100644
index c8175a0f58f9..000000000000
--- a/net-wireless/openbsc/openbsc-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils git-r3
-
-DESCRIPTION="OpenBSC, OsmoSGSN, OsmoBSC and other programs"
-HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/OpenBSC"
-EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+gprs"
-
-DEPEND="
-	gprs? ( net-wireless/openggsn )
-	net-libs/libosmocore
-	net-libs/libosmo-abis
-	net-libs/libosmo-netif
-	dev-db/libdbi"
-RDEPEND="${DEPEND}
-	dev-db/libdbi-drivers[sqlite]
-	dev-db/sqlite:3"
-
-S="${WORKDIR}/${P}/${PN}"
-
-src_prepare() {
-	epatch_user
-	eautoreconf
-}
diff --git a/net-wireless/openggsn/Manifest b/net-wireless/openggsn/Manifest
deleted file mode 100644
index aae191092e82..000000000000
--- a/net-wireless/openggsn/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD openggsn-9999.ebuild 399 BLAKE2B 602d12169c5d8d8f248be49b5fe956139412ad996c5bbc9103fcfb6076dd779f8288681366ed2c0e0679ad4e6d5a4e6bb3e472dd91497c514ccbadc91a872571 SHA512 a55b6ab3dce424f90bf9f3194c8a919af37050a52c96e30528cc97e05c3e385da0c37dc0ca79d420e69f41ac1b0e3c5c61dd08e520abf7705c24d4f221acbb82
-MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-wireless/openggsn/openggsn-9999.ebuild b/net-wireless/openggsn/openggsn-9999.ebuild
deleted file mode 100644
index eb2dc537ed83..000000000000
--- a/net-wireless/openggsn/openggsn-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools git-r3
-
-DESCRIPTION="Gateway GPRS Support Node"
-HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/OpenBSC_GPRS"
-EGIT_REPO_URI="git://git.osmocom.org/openggsn"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoreconf
-}
diff --git a/net-wireless/osmobts/Manifest b/net-wireless/osmobts/Manifest
deleted file mode 100644
index cc8a6a6925bf..000000000000
--- a/net-wireless/osmobts/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD osmobts-9999.ebuild 842 BLAKE2B 6dcd29c3ea81884543b600d1f8d81af17ebac8cf42dcc0b63187e933863031239d1266c6e42ab392b331bd57a793511848e3c8940ac3cf576e849bedcc973fb1 SHA512 99d1cbdab522e38632da3af1ceae22214b76501749cb2778ed6c0dd68c7dce3889f2ec72cb4353415aa98165bf753c7784a263d717f5b28b881dec963aac8842
-MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-wireless/osmobts/metadata.xml b/net-wireless/osmobts/metadata.xml
deleted file mode 100644
index 1570f891c6a3..000000000000
--- a/net-wireless/osmobts/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-wireless/osmobts/osmobts-9999.ebuild b/net-wireless/osmobts/osmobts-9999.ebuild
deleted file mode 100644
index c88880d41de7..000000000000
--- a/net-wireless/osmobts/osmobts-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools git-r3
-
-DESCRIPTION="Osmocom BTS-Side code (Abis, scheduling)"
-HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/OsmoBTS"
-EGIT_REPO_URI="git://git.osmocom.org/osmo-bts.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="net-libs/libosmocore net-libs/libosmo-abis"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoreconf
-	mkdir -p "${S}"/include/openbsc || die
-	wget -O "${S}"/include/openbsc/gsm_data_shared.h http://cgit.osmocom.org/openbsc/plain/openbsc/include/openbsc/gsm_data_shared.h || die
-	wget -O "${S}"/src/common/gsm_data_shared.c http://cgit.osmocom.org/openbsc/plain/openbsc/src/libcommon/gsm_data_shared.c || die
-
-}
-
-src_configure() {
-	econf --enable-trx --with-openbsc="${S}"/include/openbsc
-}
diff --git a/net-wireless/osmocom-bb/Manifest b/net-wireless/osmocom-bb/Manifest
deleted file mode 100644
index 528be7067240..000000000000
--- a/net-wireless/osmocom-bb/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD osmocom-bb-9999.ebuild 1269 BLAKE2B 573ddf5a8436ea3b701a9b0312a90f2dff7543c4cbf0413f6d42c2aea8f60d5161001a7fa3f11fe2f4dda39ad2535f1b8a4640ced410f8d2570be74f97f5b267 SHA512 14d85cf119bed653c84707943b655f7892a50524bef096cc3eafa2ef1dbc09488dd9001d52c6bd39de0b552efc994fa8e443a19a0bcb3a90e245d3629ef5619c
-MISC metadata.xml 318 BLAKE2B a84cbe76b571c704e7ccb8f8a62d6966a891c27276e238947360beba3105bc8e7d714cf43765d87b3549652e4bccf99554b50d56e1b36017625dbd287c045229 SHA512 e4f59e33a6c647e67c1ac74f8d9b8cf1be9283162e838bea486c59ba312c9ce44c81103ce05d90592a831c03516aa0a6532c83a4c71761db32c68def4c20a301
diff --git a/net-wireless/osmocom-bb/metadata.xml b/net-wireless/osmocom-bb/metadata.xml
deleted file mode 100644
index ca60be1c4b8d..000000000000
--- a/net-wireless/osmocom-bb/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-	<use>
-		<flag name="transmit">Enable transmission capabilities.</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-wireless/osmocom-bb/osmocom-bb-9999.ebuild b/net-wireless/osmocom-bb/osmocom-bb-9999.ebuild
deleted file mode 100644
index be88f95016e4..000000000000
--- a/net-wireless/osmocom-bb/osmocom-bb-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools flag-o-matic git-r3
-
-DESCRIPTION="OsmocomBB MS-side GSM Protocol stack (L1, L2, L3) excluding firmware"
-HOMEPAGE="http://bb.osmocom.org"
-EGIT_REPO_URI="git://git.osmocom.org/osmocom-bb.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+transmit"
-
-DEPEND="net-libs/libosmocore"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	use transmit && append-cflags "-DCONFIG_TX_ENABLE"
-
-	cd src/host/osmocon && eautoreconf && cd ../../.. || die
-	cd src/host/gsmmap && eautoreconf && cd ../../.. || die
-	cd src/host/layer23 && eautoreconf && cd ../../.. || die
-}
-
-src_configure() {
-	cd src/host/osmocon && econf && cd ../../.. || die
-	cd src/host/gsmmap && econf && cd ../../.. || die
-	cd src/host/layer23 && econf && cd ../../.. || die
-}
-
-src_compile() {
-	cd src/host/osmocon && emake && cd ../../.. || die
-	cd src/host/gsmmap && emake && cd ../../.. || die
-	cd src/host/layer23 && emake && cd ../../.. || die
-
-}
-
-src_install() {
-	cd src/host/osmocon && emake install DESTDIR="${D}" && cd ../../.. || die
-	cd src/host/gsmmap && emake install DESTDIR="${D}" && cd ../../.. || die
-	cd src/host/layer23 && emake install DESTDIR="${D}" && cd ../../.. || die
-}
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index ba7c56657db8..c52bab3d713e 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -4,14 +4,14 @@ AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
 DIST unifi-6.0.36.zip 232051560 BLAKE2B 94a2780c40588c2afb64993d839dedb6064f437cdf29cd6dd9124ef3944ae25d1942f3eed0ea080007800575b37d9063b3f007b91d02bc30d35179cb4263d873 SHA512 bab68b649c84cf62e4e646c62a8adf8006ab6d434907352f3970e7c81c779b4dcbaf8d1b5558cf69e7daede9c96fe0b02216700cb62de5659cf496dc899ec2ee
-DIST unifi-6.0.37.zip 236439236 BLAKE2B 764c6406c3ac4a51617f6236280d63af3b6bd9c23a065f56bf8302ca72535b9cad8c2a78bac3ba07bc07f0997b635dea4d4fb71c395d46cf45fdbb05cb8d5b9b SHA512 07b452d84d8cd5d5d67db8d274a710bfbf3d3d19529b8692073ca5ec8108267694cdf85e8a101926599acc8aba9ac5f774dd78f2d5868da5b57c3d462748a2b4
 DIST unifi-6.0.40.zip 237494905 BLAKE2B 29cb9161c958cc414f3a0eb47fbac045e02ab3856961f62013bd6f0edc24f2483beb701cc3eb91bf0316829508894e035a6555f16865688ac8e94ebe92c7d5ed SHA512 7b5d8eb36af190bce4e85515d14a2ecab665dba70cd0fabc3f7de23870ecb557858433bba6ee6e101c3e6e5ba3da66a7dc807d3bf72fd4d2f5798991a78839c8
+DIST unifi-6.0.41.zip 216846940 BLAKE2B 14aaabc6c33fc312ca26cae03eec7bc1a80c26d381735223753eb073baa4141e1791651e724fa6a75d16274abc2299b791d08f1032256ddfd2c6518fc2b3d30f SHA512 9264a322bf78efa38f009e81a7e7fd37534600d859a46221bc8237db159049510279c939fb2294907a94e59c841989b890693fdc800cde05d9f4e7cd6c50c7ab
 DIST unifi-6.1.25.zip 235499342 BLAKE2B 77de866d2c04136b32e06698f3c20563dc68cf1bf5d260a23cad46ee208c5d4012d788c67dc3324578d2c944e8eceecf6b5473f4d77304e10ee15a3b14286fc7 SHA512 0eb916f06546a5b33da664ada77391a69d21c9ec4545244a1a6f55ceeb7546fe77a07a121df03ba606e98ddbd23429207f86bb5b2c24ddfb3174eb2d00c5daaf
 DIST unifi-6.1.26.zip 243498936 BLAKE2B 72a17f02279ecedd8f876df85167824a03abebb2816e68fcbfff11923b00c1e0b80b7357e48a4e044f0835e3e0054bd0ab034bd8fb3d67289bf61b4804ce9a87 SHA512 9ea5a7307ad507f08e4d39805bdf776eaa50895513e4c086d94527e28ae93b1f97e3d1b23ff314ed03ea560638b8cb44fc16bf4ff8f7746035e8b5de9b31321b
 EBUILD unifi-5.6.42-r1.ebuild 1667 BLAKE2B daea907c2b41f461f707411f8a68dba6cc9ec8dcd7577641d7554539fd5f191eb2684478fd9801bcbaec855e83b765ab4a429cc3bf876e7a42176fdac1eb26ff SHA512 a7001e6fb490e6ad20ea00a080bb76877c85741dd2142f54041afd71d2822684836ed8803bd74b6a8821da7b7e85e0cfb6d10b5294838ae49f08326b6e1141f7
 EBUILD unifi-6.0.36.ebuild 1555 BLAKE2B 5f3543b5277702096491cf675426b37bac3b61be35a35b0ca99173607c8a52d6a52858de5cc0df16b92db279702c13470d1d187328cf2240e95556ea264928ac SHA512 ce15e1c66db6e5ad03c0ba7ec455ca49772dfee5430923e5c0f7442b1a680e5aae6c76e35fa3df15f692a87ccff02fc621df40307c626a69368cd9ef5134ef39
-EBUILD unifi-6.0.37.ebuild 1566 BLAKE2B 06315a7418702776055d5c6e1ff2f7557e1b10cc5b26ba15904880d54992414ee16071803bbf8d7a3b15f952f7b9970b04ff170c7636c7780e5e10606d290997 SHA512 3233d5449c71fa4bb585afc5f838553a23582b3c18fe5676b79e0ba55fd62c803d6c1d4ab6880da045fe2795f2ed4c315bbcc9947dd54777be8719f871dae9d4
 EBUILD unifi-6.0.40.ebuild 1566 BLAKE2B 9cde2089b6f81623e105e299169a0015e9ae797fb4960b107932acf13cffa546428e8bcb9f339943989f5f29a58d6b8f03b0f4825bbc4bee943d67bda8f9155b SHA512 412e4d41483b615a3d9fdbb9fca30db4d176c6126231f7ffe7109616e3d0fb2172a3b59742155fea1e5c3d3d320607b91e34d77179d9d9dee07b5a5b30fdb6f0
+EBUILD unifi-6.0.41.ebuild 1566 BLAKE2B b89532de844956827273952b23604707c237b982736c8526f6eddabbaef512ffda9d5c11c78981931313357f51134280b1c66afe18cac196a537a8806d102735 SHA512 f10524445e2484ee86443a17df9ccca3d80f87e6e4deb625fff1a0945fc012834a303327a400a415912e7e6384106928e1f7d988c1903fe67c75fddf29c7532f
 EBUILD unifi-6.1.25.ebuild 1566 BLAKE2B e59fb68b8f475fe749a31cf89adcc03d52a9de40348f4f62a84a761afa8a883c787f6f4b8254da00ba712fa3adcfb76e901f94525b294b364f47ccfa31ead4f2 SHA512 d1563a980e956e414e414ec1ff544c7a952bbe9bfb8e433be52ea81cf45124ddc75f10d67973b1a940bff593aa0c43b3149215a2b8bc2d1bed5709bc7ee9d497
 EBUILD unifi-6.1.26.ebuild 1566 BLAKE2B 1e7c0b6b4dffc76041f23daa3d6523a7e4b088f4cf3be529bf1acc7bf48c94049d51e351c425bf6a488bb253708bcb62983c2918364ac8f0792231e67c486023 SHA512 f1b22181098927c83c0cefd7359c112ea38f1b4c096edbb4eaee97cbc0ef56261292ddc19e5208319bdfa85908d5203dfaf91f4dc9b893052fc6047f6ff73a9a
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-6.0.37.ebuild b/net-wireless/unifi/unifi-6.0.41.ebuild
similarity index 98%
rename from net-wireless/unifi/unifi-6.0.37.ebuild
rename to net-wireless/unifi/unifi-6.0.41.ebuild
index 02e3fe060f99..cbcf8fc9de4a 100644
--- a/net-wireless/unifi/unifi-6.0.37.ebuild
+++ b/net-wireless/unifi/unifi-6.0.41.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # Set this var for any releases except stable
-RC_SUFFIX="-db4f549ad2"
+RC_SUFFIX="-5353824aa0"
 
 inherit systemd
 
diff --git a/net-wireless/wavemon/Manifest b/net-wireless/wavemon/Manifest
index 36eff64edd3a..59007efb4940 100644
--- a/net-wireless/wavemon/Manifest
+++ b/net-wireless/wavemon/Manifest
@@ -1,8 +1,6 @@
 AUX wavemon-0.6.7-dont-override-CFLAGS.patch 295 BLAKE2B 367667b2d8db179c198f2bf02183f3e65afb5e32fdf0d0bc5229b1fda1e68280a2c8b4caa24204e13fae91d05e4b3c38c08f5eff5eeb81d9d458637305d1748f SHA512 1837707455d1718e3a067f5799e8c627f536d91ed75a9ab3c1cf432337776a41680214093be8863b158be5ddff305281fabac0b38d657bb9c3a1a9a72060c32e
 AUX wavemon-0.7.6-ncurses-tinfo.patch 669 BLAKE2B 78d027ef6ca14fda651cb6fa06563f9f60c339af8567b0e743dff2975b812198b4ad2166fa59fd28219dfd51c0983eb4890719718412459d733c78ae6154e0d9 SHA512 46e43f1eef87a4a81cf812f7e576f0c7d8e867fcda6494a81aaf5c45609ae0b4ef4f21f671cfc4d763700ae2eb198c7c8d3d52de95ec0416f9b1e675077de2a1
 AUX wavemon-0.8.0-build.patch 945 BLAKE2B 149355ed7a956d230014e8957efc71bff787d1c6890bd277fc64bfe83c8acdd8cb844d071cdabd0c470465443404b279a600d0dd02b9e8d136ed68d088a58015 SHA512 0c1463974431f51fea24ceb14de785012b89c7d8901d91a50979fdc07d2b11bf7980312b6006ec6f1d2bdaca768d2a947820b5fc6429d361dd6ad957b3798ac2
-DIST wavemon-0.7.6.tar.bz2 116194 BLAKE2B 3295214bbddb3dcc3b530691854d2b10797fcc2ede49edc810dec34779a25fbfe27db14b0bae05732d372389732f679c3bee9b308cff7e403188ba2aca8aa3a3 SHA512 95f47204e50c1a44a2230e2d8cbed90d76e53f5e674f6f54f64ba6c99590c90213d9422e62951d55bcf4c8e2325e63e6a7c0c7d1b14a4120d5f0d291dc36cd68
 DIST wavemon-0.8.0.tar.gz 196353 BLAKE2B 90d358d325b62ba9379ea525c4399e38c38043e67460b20188c4d81261d290e8e3f154a33240882f8b2611e4db1862d7bd33c87e168569be9d751d431602da81 SHA512 2df48eb300e9b30e0cb7a0ab41ba5e10b2a6e8170dbd11a4c978462c8cd6dc1171f79ceadfdb7344c495420a4e87b7dd723efea4f1af59a6d0312d93049ee798
-EBUILD wavemon-0.7.6.ebuild 1221 BLAKE2B c6d11037f6dca0c0e65c40f25be7bdaef5fec2f6bb27392a7acf2b239b6f4c5bca2f0cf0ccb7db4b760037a04e19d20b199d58389e7fb5e28d017877369c4cb6 SHA512 c03f50d1ae39b35792af44ba4e6b6812c700340180b8224f8014007f40519dde48b51e3fefb0aa78d562e34c95eeaaa905b6b65d43647f469eaf584727881327
-EBUILD wavemon-0.8.0.ebuild 1120 BLAKE2B 3a1f76d49cfd4aa007d05d093132c6bb7b91bc81a0405d0c97eea5de3d6890292c2e3f894b670f7aaa34319e3494375c581429a0a9647cc096075a83d0ee2cb0 SHA512 010206fe1cff33f7fd07c9214def71496b703bda30798d0b1634d9e48dded46e9659620dc4950e6a904c1892e700bcf6b2be22c2c6d4f061411ee13128ccc62a
-MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
+EBUILD wavemon-0.8.0.ebuild 1117 BLAKE2B d5579023a508f8439a2b39447214191a580ef50c8213d3d71ebd90d21f7264e5c94f8ce0c1aba9afa66f12d8ea205adf7189fb20d1343d85f026431d5e92527f SHA512 6780e4604e73619ff09aaa2902d84b51d137c476a70dee744bd14ccf2063e4e235b166065e4dda5fc178db949d2fbe8693bb5c326f4824c3c43a56f19d7a9d4b
+MISC metadata.xml 246 BLAKE2B 6b36879c1dda3cbeeb9739e74ae4b65762ff154b171e5ccb1b5d93c20354b76788800ca1d05555b0a9de1d17442b4b5749690f601552a68d8ae6f318ca1ac4ec SHA512 631e500130ae0b7f8026cc0bad8f6e8f94e0373bb1f589250e56cfef5a1510ed7a4a6697b968abf557513fc2d37b014fae2c8a19fee6e1d71cc39aa5e5cf6a18
diff --git a/net-wireless/wavemon/metadata.xml b/net-wireless/wavemon/metadata.xml
index 5b159fbcadd1..99d1b069a795 100644
--- a/net-wireless/wavemon/metadata.xml
+++ b/net-wireless/wavemon/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">uoaerg/wavemon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/wavemon/wavemon-0.7.6.ebuild b/net-wireless/wavemon/wavemon-0.7.6.ebuild
deleted file mode 100644
index b89b64f494d7..000000000000
--- a/net-wireless/wavemon/wavemon-0.7.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Ncurses based monitor for IEEE 802.11 wireless LAN cards"
-HOMEPAGE="http://eden-feed.erg.abdn.ac.uk/wavemon/"
-SRC_URI="http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc sparc x86"
-
-IUSE="caps"
-RDEPEND="sys-libs/ncurses
-	caps? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.7-dont-override-CFLAGS.patch"
-	"${FILESDIR}/${P}-ncurses-tinfo.patch"
-)
-
-src_prepare() {
-	# Do not install docs to /usr/share
-	sed -i -e '/^install:/s/install-docs//' Makefile.in || die 'sed on Makefile.in failed'
-
-	# automagic on libcap, discovered in bug #448406
-	use caps || export ac_cv_lib_cap_cap_get_flag=false
-
-	# Respect CC, fix linking
-	tc-export CC
-	append-ldflags -pthread
-
-	autotools-utils_src_prepare
-}
-
-src_install() {
-	autotools-utils_src_install
-	# Install man files manually(bug #397807)
-	doman wavemon.1
-	doman wavemonrc.5
-}
diff --git a/net-wireless/wavemon/wavemon-0.8.0.ebuild b/net-wireless/wavemon/wavemon-0.8.0.ebuild
index fdcb0b104a2f..4bdefdd7cf5c 100644
--- a/net-wireless/wavemon/wavemon-0.8.0.ebuild
+++ b/net-wireless/wavemon/wavemon-0.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/uoaerg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ppc sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ppc sparc x86"
 
 IUSE="caps"
 RDEPEND="dev-libs/libnl:3
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 99c16f4649bf..a5a43ccfed73 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 807bc489f0bb..3a62ea655f85 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Roy Bamford <neddyseagoon@gentoo.org< (2020-12-01)
+# hfs xfs fail build and/or tests on arm64 
+# See bugs #757924 and #747181 respctively
+sys-block/gparted hfs xfs
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-11-08)
 # dev-util/kdevelop-php is not keyworded, bug #751337
 >=kde-apps/umbrello-20.08.3 php
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index b1b7cd48bc62..3ce88c284ed8 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -417,7 +417,6 @@ www-client/elinks javascript
 
 # Raúl Porcel <armin76@gentoo.org> (2010-06-26)
 # custom-optimization doesn't work on ia64
-www-client/firefox custom-optimization
 www-client/seamonkey custom-optimization
 
 # Raúl Porcel <armin76@gentoo.org>
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 4dcbeb8f33a4..1116a517ef12 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -127,10 +127,10 @@ BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr python_targets_python3
 
 # Mike Gilbert <floppym@gentoo.org> (2012-05-15)
 # Default target(s) for python-r1.eclass
-# Mikle Kolyada <zlogene@gentoo.org> (2020-05-06)
-# Updated to python3_7
-PYTHON_TARGETS="python2_7 python3_7"
-PYTHON_SINGLE_TARGET="python3_7"
+# Mikle Kolyada <zlogene@gentoo.org> (2020-12-02)
+# Updated to python3_8
+PYTHON_TARGETS="python2_7 python3_8"
+PYTHON_SINGLE_TARGET="python3_8"
 
 # Michał Górny <mgorny@gentoo.org> (2013-08-10)
 # Moved from portage's make.globals.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 53e5badc9c37..1a6df6d45e45 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Joonas Niilola <juippis@gentoo.org> (2020-12-03)
+# Doc building seem to be very random without any predictability, 
+# bug #734104
+media-gfx/blender doc
 
 # Marek Szuba <marecki@gentoo.org> (2020-11-30)
 # Vendored therecipe/qt violates network sandbox + uses external binary
@@ -31,6 +35,10 @@ kde-apps/kipi-plugins vkontakte
 # waiting for lua to be slotted
 media-gfx/exact-image lua
 
+# Haelwenn (lanodan) Monnier <contact@hacktivis.me> (2020-11-03)
+# Requires >=dev-lang/lua-5.2, which is still masked.
+app-editors/vis lua
+
 # Marek Szuba <marecki@gentoo.org> (2020-10-12)
 # Requires slotted Lua, which is still masked.
 media-gfx/darktable system-lua
diff --git a/profiles/package.mask b/profiles/package.mask
index bbaafb49b598..6d9556611681 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,21 @@
 
 #--- END OF EXAMPLES ---
 
+# Aaron Bauman <bman@gentoo.org> (2020-12-02)
+# Deprecated. Functionality is native to dev-python/pytest now
+# Removal in 14 days
+dev-python/pytest-catchlog
+
+# Joonas Niilola <juippis@gentoo.org> (2020-12-01)
+# Not maintained in Gentoo, multiple versions behind, unsafe, EAPI-5,
+# Use other kernel source / binary packages instead,
+# https://packages.gentoo.org/categories/sys-kernel
+# Removal in ~30 days.
+# Bugs: #716490 (aufs), #739782 (-ck), #757843 (-xbox)
+sys-kernel/aufs-sources
+sys-kernel/ck-sources
+sys-kernel/xbox-sources
+
 # Aaron Bauman <bman@gentoo.org> (2020-11-30)
 # EAPI=5. Multiple open bugs #603866 #713620
 # Dead upstream. Removal in 30 days.
@@ -423,23 +438,6 @@ www-apps/webmcp
 dev-lang/helium
 dev-haskell/lvmlib
 
-# Joonas Niilola <juippis@gentoo.org> (2020-11-03)
-# Dead upstream, or broken for a long time, not maintained in Gentoo.
-# Removal in 30 days. Bug #752462
-app-emulation/rex-client
-app-i18n/kde-l10n-scripts
-media-plugins/xbmc-addon-xvdr
-net-analyzer/nagios-plugins-flameeyes
-net-libs/libosmo-abis
-net-libs/libosmo-netif
-net-misc/lcr
-net-misc/srf-ip-conn-srv
-net-wireless/dump978
-net-wireless/openbsc
-net-wireless/openggsn
-net-wireless/osmobts
-net-wireless/osmocom-bb
-
 # Lars Wendler <polynomial-c@gentoo.org> (2020-10-30)
 # Removed public macro definitions for TRUE and FALSE which breaks lots of
 # revdeps. See tacker bug at https://bugs.gentoo.org/751919
@@ -489,11 +487,6 @@ gnome-base/libbonobo
 gnome-base/libgnome-keyring
 gnome-base/orbit
 
-# Michał Górny <mgorny@gentoo.org> (2020-10-23)
-# Fails to build.  Needs a dedicated maintainer and a version bump.
-# Removal in 30 days.  Bug #635592.
-games-strategy/asc
-
 # David Seifert <soap@gentoo.org> (2020-10-21)
 # No releases in over 3 years, no more revdeps in tree
 # upstream mostly unresponsive to requests for proper
@@ -531,18 +524,23 @@ dev-lua/luacrypto
 >=dev-lua/lpeg-1.0.2-r100
 >=dev-lua/lua-argparse-0.6.0-r100
 >=dev-lua/lua-bit32-5.3.5-r100
+>=dev-lua/lua-cjson-2.1.0.8-r100
 >=dev-lua/lua-term-0.7-r100
 >=dev-lua/lua-utf8-0.1.3-r100
 >=dev-lua/lua-zlib-1.2-r100
 >=dev-lua/lua_cliargs-3.0_p2-r100
 >=dev-lua/LuaBitOp-1.0.2-r100
 >=dev-lua/luacheck-0.23.0-r100
+>=dev-lua/luacov-0.14.0-r100
 >=dev-lua/luadbi-0.7.2-r100
 >=dev-lua/luaevent-0.4.6-r100
 =dev-lua/luaexpat-1.3.0-r101
 =dev-lua/luaexpat-1.3.3-r101
 >=dev-lua/luafilesystem-1.8.0-r100
+>=dev-lua/lualdap-1.2.5-r100
 >=dev-lua/luajson-1.3.4
+>=dev-lua/luaossl-20200709-r100
+>=dev-lua/luaposix-35.0-r100
 >=dev-lua/luarocks-3.4.0-r100
 >=dev-lua/luasec-0.9-r100
 >=dev-lua/luasocket-3.0_rc1_p20200328-r100
@@ -570,6 +568,12 @@ dev-lua/luacrypto
 >=games-rpg/kqlives-0.99-r100
 >=games-rpg/sumwars-0.5.8-r100
 >=games-simulation/corsix-th-0.64-r100
+>=games-sports/xmoto-0.6.1-r100
+>=games-strategy/hedgewars-1.0.0-r100
+>=games-strategy/naev-0.7.0-r100
+>=games-strategy/openra-20190314-r100
+>=games-strategy/s25rttr-0.9.0_pre20200723-r100
+>=games-util/slade-3.1.12a-r100
 >=mail-filter/imapfilter-2.6.16-r100
 >=media-gfx/geeqie-1.5.1-r1
 >=media-sound/aqualung-1.1-r100
@@ -630,10 +634,6 @@ games-strategy/0ad
 ~app-i18n/scim-sunpinyin-3.0.0_rc1
 ~app-i18n/xsunpinyin-3.0.0_rc1
 
-# Piotr Karbowski <slashbeast@gentoo.org> (2020-08-28)
-# Temporary mask due to multiple reports of segfaults at startup, bug #739056
-=x11-base/xorg-server-1.20.9
-
 # Alfredo Tupone <tupone@gentoo.org> (2020-08-23)
 # Ported to py3 but not yet released
 # Masked to allow py2.7 removal
diff --git a/profiles/prefix/darwin/package.use.mask b/profiles/prefix/darwin/package.use.mask
index 8cf6f41b0078..4b41e3402a55 100644
--- a/profiles/prefix/darwin/package.use.mask
+++ b/profiles/prefix/darwin/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2020-12-01)
+# Needs more work to make bindings build
+dev-db/qdbm java perl ruby
+
 # Fabian Groffen <grobian@gentoo.org> (2016-04-06)
 # dev-libs/re2 needs love, bug #563932
 app-misc/sphinx re2
diff --git a/profiles/prefix/linux/ppc64le/eapi b/profiles/prefix/linux/ppc64le/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/linux/ppc64le/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/linux/ppc64le/make.defaults b/profiles/prefix/linux/ppc64le/make.defaults
new file mode 100644
index 000000000000..477b3c262767
--- /dev/null
+++ b/profiles/prefix/linux/ppc64le/make.defaults
@@ -0,0 +1,12 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+ARCH="ppc64"
+CHOST="powerpc64le-pc-linux-gnu"
+# The base profile sets ACCEPT_KEYWORDS=ppc64 and we don't have that in prefix.
+# Eventually, ~* should be removed once someone is motivated for this arch
+ACCEPT_KEYWORDS="-ppc64 ~ppc64-linux ~*"
+
+# We don't have lib64 in prefix so, remove it here.
+SYMLINK_LIB=""
+LIBDIR_ppc64="lib"
diff --git a/profiles/prefix/linux/ppc64le/packages b/profiles/prefix/linux/ppc64le/packages
new file mode 100644
index 000000000000..13fe69af5f81
--- /dev/null
+++ b/profiles/prefix/linux/ppc64le/packages
@@ -0,0 +1,7 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Those are part of the base powerpc profile's @system set, but having them as
+# part of @system makes no sense for Gentoo Prefix.
+-*sys-fs/hfsutils
+-*sys-fs/hfsplusutils
diff --git a/profiles/prefix/linux/ppc64le/parent b/profiles/prefix/linux/ppc64le/parent
new file mode 100644
index 000000000000..ba569be12a9a
--- /dev/null
+++ b/profiles/prefix/linux/ppc64le/parent
@@ -0,0 +1,2 @@
+../../../default/linux/powerpc/ppc64/17.0/64bit-userland
+..
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 5a308b58244a..4bdfb871bfbe 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -266,6 +266,7 @@ x86		default/linux/x86/17.0/uclibc/hardened			exp
 amd64-linux		prefix/linux/amd64				exp
 arm-linux		prefix/linux/arm				exp
 ppc64-linux		prefix/linux/ppc64				exp
+ppc64-linux		prefix/linux/ppc64le				exp
 x86-linux		prefix/linux/x86				exp
 
 # Linux Standalone Profiles
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index eed276c2e63d..baa89fd2fc45 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2307,9 +2307,6 @@ dev-ml/lablgtk:sourceview - Enable GtkSourceView support
 dev-ml/logs:cli - Enables the Logs_cli library that provides command line support for controlling Logs.
 dev-ml/logs:fmt - Enables the Logs_fmt reporter.
 dev-ml/logs:lwt - Enables the Logs_lwt library that provides Lwt logging functions.
-dev-ml/lwt:camlp4 - Enable camlp4 syntax extension
-dev-ml/lwt:libev - Enable the dev-libs/libev-based backend.
-dev-ml/lwt:ppx - Enables the ppx syntax extension
 dev-ml/ocaml-cohttp:async - Enables support for the dev-ml/async asynchronous execution library.
 dev-ml/ocaml-cohttp:lwt - Enables support for the dev-ml/lwt cooperative light-weight thread library.
 dev-ml/ocaml-cstruct:async - Support for asynchronous execution
@@ -3921,7 +3918,6 @@ media-gfx/blender:color-management - Enable color management via media-libs/open
 media-gfx/blender:cuda - Build cycles renderer with nVidia CUDA support.
 media-gfx/blender:cycles - Build cycles renderer (requires media-libs/openimageio and dev-libs/boost).
 media-gfx/blender:dds - Adds DDS textures support to Blender.
-media-gfx/blender:doc - Build C and Python API documentation directly from the source code.
 media-gfx/blender:elbeem - Adds surface fluid simulation to Blender using El'Beem library.
 media-gfx/blender:headless - Build without graphical support (renderfarm, server mode only).
 media-gfx/blender:llvm - Enable features depending on llvm.
@@ -3936,7 +3932,6 @@ media-gfx/blender:standalone - Build the standalone version of Cycles.
 media-gfx/blender:system-numpy - Use the system numpy implementation rather than a local copy.
 media-gfx/blender:system-python - Use the system python implementation rather than a local copy.
 media-gfx/blender:tbb - Use threading building blocks library from dev-cpp/tbb.
-media-gfx/blender:test - Build the provided unit tests.
 media-gfx/blender:valgrind - Add support for memory debugging using dev-util/valgrind
 media-gfx/chafa:tools - Build command-line tools
 media-gfx/cura:usb - Access 3D printers via USB
@@ -5251,7 +5246,6 @@ net-analyzer/nagios-plugins:nagios-game - Install games-util/qstat required for
 net-analyzer/nagios-plugins:nagios-ping - Install net-analyzer/fping required for fancy ping monitoring. Disabling the flag does not remove any plugin file.
 net-analyzer/nagios-plugins:snmp - Install dev-perl/Net-SNMP required for monitoring SNMP values. Disabling the flag does not remove any plugin file.
 net-analyzer/nagios-plugins:ssh - Install net-misc/openssh required for monitoring SSH servers. Disabling the flag does not remove any plugin file.
-net-analyzer/nagios-plugins-flameeyes:smart - Install sys-apps/smartmontools required for S.M.A.R.T. disk monitoring. Disabling the flag removes the plugin file. This plugin also requires the sudo flag to be enable.
 net-analyzer/nagios-plugins-linux-madrisan:curl - Build check_docker which requires net-misc/curl
 net-analyzer/nagios-plugins-linux-madrisan:varlink - Build check_podman which requires dev-libs/libvarlink
 net-analyzer/net-snmp:elf - Enable the use of elf utils to check uptime on some systems
@@ -6408,13 +6402,6 @@ net-misc/kafkacat:json - Enable json support
 net-misc/kea:openssl - Use dev-libs/openssl instead of Botan
 net-misc/kea:samples - Install sample configuration files
 net-misc/knock:server - Installs the knockd server daemon.
-net-misc/lcr:asterisk - net-misc/asterisk channel driver
-net-misc/lcr:gsm-bs - net-wireless/openbsc driver
-net-misc/lcr:gsm-ms - net-wireless/osmobb driver
-net-misc/lcr:gsmhr - Support for GSM HR codec using reference code (very slow)
-net-misc/lcr:misdn - net-misc/misdn driver
-net-misc/lcr:sip - SIP support
-net-misc/lcr:ss5 - CCITT No. 5 support
 net-misc/libteam:zmq - Build witch net-libs/zeromq support
 net-misc/lldpd:cdp - Enable Cisco Discovery Protocol
 net-misc/lldpd:dot1 - Enable Dot1 extension (VLAN stuff)
@@ -6963,8 +6950,6 @@ net-wireless/kismet:rtlsdr - Enable rtlsdr based kismet capture sources
 net-wireless/kismet:suid - Install a setuid root helper binary with limited functionality; this allows running kismet as a normal user, significantly reducing security risks
 net-wireless/kismet:ubertooth - Enable capture source for ubertooth to sniff bluetooth low energy
 net-wireless/neard:tools - build and install extra helper utilities
-net-wireless/openbsc:gprs - Support GPRS via OpenGGSN
-net-wireless/osmocom-bb:transmit - Enable transmission capabilities.
 net-wireless/rtl-sdr:zerocopy - may cause a bus error on some ARM systems
 net-wireless/rtl_433:rtlsdr - Build with Realtek RTL2832U (rtlsdr) support
 net-wireless/rtl_433:soapysdr - Build with SoapySDR support
@@ -7300,7 +7285,6 @@ sci-libs/lis:saamg - Build the Smoothed Aggregation Algebraic MultiGrid precondi
 sci-libs/mathgl:hdf - Add support for the Hierarchical Data Format v.4 sci-libs/hdf
 sci-libs/mathgl:octave - Add bindings for sci-mathematics/octave
 sci-libs/matio:sparse - Extend formats for sparse matrix (not matlab)
-sci-libs/med:hdf5-16-api - Use -DH5_USE_16_API to build the package against old 1.6 API of HDF5
 sci-libs/mkl-rt:eselect-ldso - Enable runtime library switching by eselect and ld.so.
 sci-libs/mpir:cpudetection - Enables runtime cpudetection (useful for bindist, compatability on other CPUs)
 sci-libs/mumps:metis - Enable matrix ordering with METIS (sci-libs/metis, sci-libs/parmetis)
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 1acad8ce6ce6..4d23ce2ac7a7 100644
Binary files a/sci-calculators/Manifest.gz and b/sci-calculators/Manifest.gz differ
diff --git a/sci-calculators/galculator/Manifest b/sci-calculators/galculator/Manifest
index ea34c85ca473..ba1f7deadbde 100644
--- a/sci-calculators/galculator/Manifest
+++ b/sci-calculators/galculator/Manifest
@@ -1,5 +1,5 @@
 AUX galculator-2.1.4-fno-common.patch 2030 BLAKE2B 288c04e137cb93da6a7b49e074998621d1f40153ba6b2dfa4cb94f1f6244920a66913d866e5939f84c8a1469576ba3c5138604badcac495d6411a186b0d1e155 SHA512 9cdddad238c0b4c4ee57934cdcd742ee24efb6df80452462f447d0deed6039a6238e48d25933a8c69fe031e1fb5a57d464b7f0913010a3feda275b1ebde85378
 DIST galculator-2.1.4.tar.bz2 472989 BLAKE2B 2fa40aa0d04880e46aad89c79ebb221a13fca815af3540c159205690a65dae6c5ec9e52e48c110ecadc4a18b86d5bd5d363f9d77c162717c8bfd2a60b71d0896 SHA512 ca5f373649d9bf26184e94ba6a501610efbb13e92a8723cda78b83aa495519e82e5b4fcd17f00f615eb702ed186598aecc70ae63a8238c32384b7f608cba4cfa
-EBUILD galculator-2.1.4-r1.ebuild 741 BLAKE2B 549abc4c4b4d5b88035dffad18963a7736029dd232722a6b804e9b9377819e3c5169ee292bae5bbc8f09726b6895fbc0b82e1a2440bdea2ddb534c7b6978c94f SHA512 2d67628a5bee70d0f8eb4ad9985672efa263c75598fd7ff74e7cf530a2217568415b8c3baaecd9998dbe0ad637118f9c0df8603d6a5a2f7d9602a57bff9fb37e
+EBUILD galculator-2.1.4-r1.ebuild 740 BLAKE2B 3f9ba4480d8a20a5d2640ee6910ad11521d65b2ff6364fcdf7006e2cfbeb0f324a35a0f5a82779e2fd0cb1b2c05f9e82df2dcd078b4ebb8c5d936e7c6af51c7b SHA512 6245fea08f276417d5f1ad1c725afb6dc6c4cfd35ec041c45d74b25c4c636f988fd0109d93c94d1a528ac823b263e43e995ee7e864539eebaee898a258ddae66
 EBUILD galculator-2.1.4.ebuild 624 BLAKE2B dcc01eb2f31ef7e8e2d1d1ba879bd9a2ed62cdf30d02aba755ad89322ac0a6b6caf22e07e71d6259cfcb958baedccb4b2fa8bd1370dff1249ef85981a45f2bcc SHA512 d7dd39dbfd73edbe497d5e3e4dfc335d329d5ca8007211d1be175fb3da93e91d39f2285add768a820d53b09100ef9fc50aa46f23eb3569e5b4fcb9998bc86fc6
 MISC metadata.xml 394 BLAKE2B 4fa1374c3ac91ea4c4212455d7ff63a35705444c3df485c6f327d6b5ebae90afcc345030c69e7a256759277f18253a20c3b7ff11036e0cd8ababa918212d9ce5 SHA512 fc850474030836be72c5a81983052b0af11312a3b3ef815b6b5eaf7a95a1b7bdbf5b1f25b5e0b2c32786b6fc5958993ff859bd2c9c818dc7df68dbecb4b61800
diff --git a/sci-calculators/galculator/galculator-2.1.4-r1.ebuild b/sci-calculators/galculator/galculator-2.1.4-r1.ebuild
index 6a7c796d3cfa..fc934979bf70 100644
--- a/sci-calculators/galculator/galculator-2.1.4-r1.ebuild
+++ b/sci-calculators/galculator/galculator-2.1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://galculator.mnim.org/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index 53e88a48b000..cdad26d582cb 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -8,5 +8,5 @@ DIST qalculate-gtk-3.2.0.tar.gz 2987908 BLAKE2B 038203fab563bb0b74c2c23fd2f4077f
 EBUILD qalculate-gtk-0.9.9.ebuild 747 BLAKE2B 04175d6536ee0b5ba2bc729676f6f8d1924c61ddbc17897a56527f85efb4b25e2816649d63b568046c6cdfcc90f6b60f64882c7621e637bf23fcdcca6ad85707 SHA512 f77e07a90a217ec22500050043d3d14f254465014eab50a4394630f51c180c1fa438c84ebdc4e2513bd50f66950608822e5236484b1b23ac6d84dbaefd48a746
 EBUILD qalculate-gtk-2.2.0.ebuild 754 BLAKE2B a7b2fef7909b3d5a72a43938d0c235eaca8a1c635b3a6c05b613c60d1d00f0eab3a62a3a8146a083fd50eae999bdf6f585477effea023686985291c53812612b SHA512 d4361e3e16d2ac608295aa8844bd6e9b76c37aba2a88a9a8541705e2190f100ffba95ef103993e4f36a41e39198244cb5379779ba63c9a7fdc6afc55777173eb
 EBUILD qalculate-gtk-2.8.1.ebuild 873 BLAKE2B e7404c64aa6c0085780e58c2b117aa70992561322434158f9d9662a72bac797d0351aa9b50961377b5f28e41ca2648220af7cd51855842c93977caf3b7440ec7 SHA512 5b184da0445241ba308e5210e416139148f81f078d03656db2f61ab208095be77d8fdf5ffc6eb7b70adc956b261778e1cbb6951e1eee53efec86c0f8d5d6e9bb
-EBUILD qalculate-gtk-3.2.0-r1.ebuild 876 BLAKE2B e5953c21231321472b0511d6deaab12538ec84cb9b8ad660388f3edca12031a6d62fec5e68b7ce144cde0efab6e447c668be0788927052ce3be0665357b7c0e5 SHA512 cfff3fbb0bef254fc4d494f55b2bf6dfad72aa5202bcf507aa36c229974f14c936e778466cea8ce4a0be7f5e754907569e706cf6398ca20b10979f6dfe931b98
+EBUILD qalculate-gtk-3.2.0-r1.ebuild 883 BLAKE2B f6dec6c83d27b0035e91f153397ac85fe280e0047f537996d62b2ca15b00925a8e58a0e72c53e40ffcf8a79c59c4dcd39e567bd64c6198ea191a74a049e5a6cf SHA512 26e4e4fee5cfc0e1e7383544cbe17d99a37f95935ebe9627c2e4be000b5788cc50949edf6cd5ce7521630aa2712b0f424448b330dd9675a80283d65d896ce5cf
 MISC metadata.xml 606 BLAKE2B 0d52327ba35512f67f66d9c98323e941e177b2d7f9479e1ed94aea588427b8979624fe5e62f33e8f7b2071ec79f10b1546fbc83437572d0f5ea9da387f9e6b10 SHA512 596bbb4219292b494c2b1c367190ccdd09045fe4c00d1a935ef6180cc1bfedd1d0b233ce98855cb4162766a6bf4c1fe5be3e7e2d582d321c94848c9a4921eaca
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-3.2.0-r1.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-3.2.0-r1.ebuild
index 788b51e00b10..6afd4c58b74b 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-3.2.0-r1.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-3.2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 09c4cca1d7c3..21e7288a6654 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/modeller/Manifest b/sci-chemistry/modeller/Manifest
new file mode 100644
index 000000000000..916b23db6e7c
--- /dev/null
+++ b/sci-chemistry/modeller/Manifest
@@ -0,0 +1,3 @@
+DIST modeller-9.25.tar.gz 44820658 BLAKE2B b3e8a3cc8cc70689a25bc5ed2eee294d67bef8eea9ed4b64d41aba3a27c0bc428ae58e74d734da0eaab7e4fabb213d098b9ba66b9569557159ac7d4a58244b0a SHA512 93f273aba0ec0f884cde5bbcc24769a09386bfc6bf1744d80001e41924b1a682225ba3c554fb9898ef3bfd1fd8451f9458bb92431b20f2f51b01781e79686c91
+EBUILD modeller-9.25.ebuild 3853 BLAKE2B f31103dbdd31165fc0ba51c751cfe965a6534ea5b626cd8a6e78a4a5882254d4d20741f75f278a8c5b23ac7fa1ad05261b03d6e8370b11a441efd89d8ee13390 SHA512 6e9da5dd875a221430c49f981fadc0e1f777ea5f33e5eca877b8de085ee1e4fd846a2dcfc38c0bcc541945b62338c4ba028840fcca39d98c408ef437d6e17f93
+MISC metadata.xml 374 BLAKE2B d93e2ad2f09971909382ad65fc5f5033487979b0694f9dc656439573973f55ce1865e5a30584e55e1c48fdd93898601ac2b11e269fb2b1c5adc3ff8dde66f35d SHA512 1c61c58e1cfbbb42342f7a87625e0044e51523f7a2f7270ecfea537c622965e64195fc88eb8f70fac648a0154a19f4a852b88383de1dcd6e17ff0ac0dc6e22d8
diff --git a/sci-chemistry/modeller/metadata.xml b/sci-chemistry/modeller/metadata.xml
new file mode 100644
index 000000000000..7daa2ce7e5f8
--- /dev/null
+++ b/sci-chemistry/modeller/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alexxy@gentoo.org</email>
+		<name>Alexey Shvetsov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sci-chemistry/modeller/modeller-9.25.ebuild b/sci-chemistry/modeller/modeller-9.25.ebuild
new file mode 100644
index 000000000000..c07e63480561
--- /dev/null
+++ b/sci-chemistry/modeller/modeller-9.25.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 eutils multilib
+
+DESCRIPTION="Homology or comparative modeling of protein three-dimensional structures"
+HOMEPAGE="https://salilab.org/modeller/"
+SRC_URI="https://salilab.org/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="modeller"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+SLOT="0"
+
+RESTRICT="mirror"
+
+DEPEND=">=dev-lang/swig-1.3"
+RDEPEND=""
+
+INPATH="${EPREFIX}"/opt/modeller${ver}
+
+QA_PREBUILT="/opt/*"
+
+pkg_setup() {
+	case ${ARCH} in
+		x86)
+			EXECTYPE="i386-intel8";;
+		amd64)
+			EXECTYPE="x86_64-intel8";;
+		*)
+			die "Your arch "${ARCH}" does not appear supported at this time.";;
+	esac
+}
+
+python_prepare_all(){
+	sed "s:i386-intel8:${EXECTYPE}:g" -i src/swig/setup.py || die
+	rm -rf modlib/modeller/python_library || die
+	sed -i '1 i\#!/usr/bin/python' bin/modslave.py || die
+	2to3 -w -n modlib/modeller || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile(){
+	cd src/swig || die
+	swig -python -keyword -nodefaultctor -nodefaultdtor -noproxy modeller.i || die
+	distutils-r1_python_compile
+}
+
+python_install() {
+	cd src/swig || die
+	distutils-r1_python_install
+}
+
+python_install_all(){
+	cd "${S}" || die
+	sed \
+		-e "/^EXECUTABLE_TYPE/s:xxx:${EXECTYPE}:g" \
+		-e "/MODINSTALL/s:xxx:\"${INPATH}\":g" \
+		-i bin/modscript || die
+
+	sed -e "s;@TOPDIR\@;\"${INPATH}\";" \
+		-e "s;@EXETYPE\@;${EXECTYPE};" \
+		bin/modpy.sh.in > "${T}/modpy.sh"
+
+	insinto ${INPATH}
+	doins -r modlib
+	python_foreach_impl python_domodule modlib/modeller
+
+	insinto ${INPATH}/bin
+	doins -r bin/{lib,*top}
+
+	exeinto ${INPATH}/bin
+	doexe bin/{modscript,mod${PV}_${EXECTYPE}} "${T}"/modpy.sh
+
+	python_foreach_impl python_doscript bin/modslave.py
+	dosym ${INPATH}/bin/modscript /opt/bin/mod${PV}
+	dosym ${INPATH}/bin/modpy.sh /opt/bin/modpy.sh
+
+	exeinto ${INPATH}/lib/${EXECTYPE}/
+	doexe lib/${EXECTYPE}/lib*
+	dosym libmodeller.so.12 ${INPATH}/lib/${EXECTYPE}/libmodeller.so
+	dosym ../../${INPATH}/lib/${EXECTYPE}/libmodeller.so.12 /usr/$(get_libdir)/libmodeller.so.12
+
+	use doc && HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/${PN}/
+		doins -r examples
+	fi
+
+	insinto /etc/revdep-rebuild
+	cat >> "${T}"/40-${PN} <<- EOF
+	SEARCH_DIRS_MASK="${EPREFIX}/opt/modeller/lib/"
+	EOF
+	doins "${T}"/40-${PN}
+}
+
+pkg_postinst() {
+	if [[ ! -e "${INPATH}/modlib/modeller/config.py" ]]; then
+		echo install_dir = \"${INPATH}/\"> ${INPATH}/modlib/modeller/config.py
+	fi
+
+	if grep -q license ${INPATH}/modlib/modeller/config.py; then
+		einfo "A license key file is already present in ${INPATH}/modlib/modeller/config.py"
+	else
+		ewarn "Obtain a license Key from"
+		ewarn "http://salilab.org/modeller/registration.html"
+		ewarn "And run this before using modeller:"
+		ewarn "emerge --config =${CATEGORY}/${PF}"
+		ewarn "That way you can [re]enter your license key."
+	fi
+}
+
+pkg_postrm() {
+	ewarn "This package leaves a license Key file in ${INPATH}/modlib/modeller/config.py"
+	ewarn "that you need to remove to completely get rid of modeller."
+}
+
+pkg_config() {
+	ewarn "Your license key is NOT checked for validity here."
+	ewarn "  Make sure you type it in correctly."
+	eerror "If you CTRL+C out of this, modeller will not run!"
+	while true
+	do
+		einfo "Please enter your license key:"
+		read license_key1
+		einfo "Please re-enter your license key:"
+		read license_key2
+		if [[ "$license_key1" == "" ]]
+		then
+			echo "You entered a blank license key.  Try again."
+		else
+			if [[ "$license_key1" == "$license_key2" ]]
+			then
+				echo license = '"'$license_key1'"' >> "${INPATH}/modlib/modeller/config.py"
+				einfo "Thank you!"
+				break
+			else
+				eerror "Your license key entries do not match.  Try again."
+			fi
+		fi
+	done
+}
diff --git a/sci-chemistry/openbabel/Manifest b/sci-chemistry/openbabel/Manifest
index ea30c1bac1ac..1bc2a5d30284 100644
--- a/sci-chemistry/openbabel/Manifest
+++ b/sci-chemistry/openbabel/Manifest
@@ -2,6 +2,6 @@ AUX openbabel-2.3.2-gcc-6_and_7-backport.patch 635 BLAKE2B 4e98dedd149b14d5bb02f
 AUX openbabel-2.4.1-gcc-8.patch 707 BLAKE2B 2b40d3e573664d036ef961e0298d34e093370485a07790ec2bb9628b02928f3977c70381ba1337e1394601300c2b7b1f05306476302ef0b894ebfadcd01322d9 SHA512 c23fc09ea9cc72c84782a95cfcc59cba5270bbeb24bc50e8aa5349bb22d691c59684c9ca8fdc870733432429e3d9e0a5c660317ee19fa7e8f3fb62c9ebc2dbbd
 DIST openbabel-2.4.1.tar.gz 11618304 BLAKE2B 8fc051e83add9be6456e281a109bd6bbec282a64ffc83309819f0decbf167b4914fbb7f1966e95e103f268754045b804317f51c79a952ace707c6af2bd320125 SHA512 427e678f0a911bd27b9a8a05e60b6e09f113be4e5dd180daaf80c28d06368e52b57501261755ab3817a8d31f2754db24471fd0ceee706d029386d6f70800e9c6
 DIST openbabel.png 29060 BLAKE2B 8d217d92125cc73462437411dd4e0cc05179cb0934f5ed15a307acc6b549b8ebab250a48a05ef7657f48c6df394f37da9b659de61efb1477b79b573a5b393ad3 SHA512 bbcaaa37663b526c9038ccb9edaf05ccc3ad1a861739a737f05f363098d8402a10b36e341fcc0aca636e809c6c32db99bf987b41719a0c756bf5e31444d3eb70
-EBUILD openbabel-2.4.1-r1.ebuild 2228 BLAKE2B 7a96aeaf595bb4f948d572537611d4be2b2785637388dcb83e1ec004e9ef5b5f9641d285c52e1fe93e7c6ef176d7c8e3185f57d93c5521e6ec59192a868d496e SHA512 9b4c4c0c8439f8bb0619a22a40fd5bf17de262649c3af22874fb25d104451edfc90eed60dc41fb21cb06a779cc274c53ac8f7ce42534b1e29ed5bfbf7ba0314e
+EBUILD openbabel-2.4.1-r1.ebuild 2227 BLAKE2B aafac15a98d53f80fc3e9e256ff9621d049a4fdbafdc4bb1c8fc1fe83fbb1e97f95ae65706c82536afdf63f022a3e4f9ccdebf6745d14f28c5bc8ce3f1a7298b SHA512 6857dce88ba3c350ddf4b41b639512d9ba19422cee654cf477484198ce66a98685ebc1001fe4e55a4426c149094dec961790a61a14f27dea068b2ec7cbe445b4
 EBUILD openbabel-2.4.1.ebuild 2057 BLAKE2B 265cc20a061747321c4a15b25cb98dbaed80fcca5be79af17fc7a5e391082f4c9df665d0aba15083d70f2511359e88bf119f960bed39d720f3f8d23df0130545 SHA512 f2a276d04439bc9b195c32e528f9ced7d4be7127f8088c45963e91d6220020dfc918b14dc76238e1e10a9fdfeec043dd45460af6766514d3fc5e954f5f85ff05
 MISC metadata.xml 665 BLAKE2B 4657b85c826c006b6d69e06240dd908a72397a32cb0c0512810e22d1b02478eaa3ab460535b300eba653a334a79c81a102007da1a901d6d1dbd04fc5e795df73 SHA512 0555e7c7401dfd5fbeee339302f8eb7a104ad6538db2839d8e89c20ac5ad2184070335677671a58eb91be2780ae485467d33302f3a14d0caab4ae8c0148f03bb
diff --git a/sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild b/sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild
index 02f4b074850b..e894bd98ef3d 100644
--- a/sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild
+++ b/sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 # See src/CMakeLists.txt for LIBRARY_VERSION
 SLOT="0/5.0.0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc openmp test wxwidgets"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index faae9429f51f..6e2729c4b541 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/keras-applications/Manifest b/sci-libs/keras-applications/Manifest
index cb3cd2055565..44dbf63dc6ca 100644
--- a/sci-libs/keras-applications/Manifest
+++ b/sci-libs/keras-applications/Manifest
@@ -1,6 +1,5 @@
 DIST keras-applications-1.0.7.tar.gz 289570 BLAKE2B 5f6fe2419b2de41f718e6beae56c8c4910efe0e6c282ad32b792f50a8b9ebc88c866eed84fb8c7dcbbd1680de605036a0012458af6d14250b1f8624ead5013b7 SHA512 5f2c5fb7b7f644a881f8cc9040633a69d3a72562206dd0601c8b31bf4fd3bb2aeee07a0d7040311f0fd42f16330bc249d306cdfa01c7b60717b05726040a0b78
 DIST keras-applications-1.0.8.tar.gz 288909 BLAKE2B 41d70552f5dfdd0c1385a7ca0b527ce0e0c3441c1ee3f72c90569f3e43e6a82485d0d4affee83afc645f3b99a519facb41d11a3fc1384c98f44182dddbea02bb SHA512 58af0d8e0289d97b416559bf235deeb9a5405d50f2a2c93612cdbde36e4d6d006db5c570acb814c209414a4b61c2310a99257aa0e2feaf24e5260d549b8b94f6
 EBUILD keras-applications-1.0.7.ebuild 545 BLAKE2B 3c15aa73da882251f52cf1003966d6d7c696fcbe90573512340ddd81cfc3f5f5f7e983f9b5f79980dcdad10e57886d8695230ac6b4e1163e152480ae2a61c127 SHA512 3eb8da437ec1b8dfe8db19a6498c35315e7a10de07cc8fd7add6901ab50f37663b77c1863dfceb8364395505e9470a5b6f0280bcb6813045a4798110adbb739e
-EBUILD keras-applications-1.0.8-r1.ebuild 547 BLAKE2B 6e9686b376dda74e5fbd306f92dbf573103c61a858dc68b5172b42167878c1c5e43d107aae4f1b203c5e625d238ca0b6156357afc3d5fd92cc54ecb7c381e177 SHA512 3d4d1c3f4f9b2d2b0508a6f008ffb3e0710a6624a9c4179a5bc93596c3860de28eee7a668b51fc343dc7e8592ff69843c4df07485f0d6e75c5c47a23c14fea65
-EBUILD keras-applications-1.0.8.ebuild 545 BLAKE2B 3c15aa73da882251f52cf1003966d6d7c696fcbe90573512340ddd81cfc3f5f5f7e983f9b5f79980dcdad10e57886d8695230ac6b4e1163e152480ae2a61c127 SHA512 3eb8da437ec1b8dfe8db19a6498c35315e7a10de07cc8fd7add6901ab50f37663b77c1863dfceb8364395505e9470a5b6f0280bcb6813045a4798110adbb739e
+EBUILD keras-applications-1.0.8-r1.ebuild 545 BLAKE2B 3eda62b09fa5c14c38d97b7be5be04d0558c3c661457a244f3a111636c1ab82a9758ecfefab9349e27a54e7ae7f2cf292a5d13675a890e4f99713ca01dc3efcf SHA512 dd8983c6bb870b80a059c583b0b433d05c3dfc1b45ba9dec1bbfc617aebe416aab9417656c7a93b3236ded73f091219f4b2289e705c48583bcf66d7dcbe42698
 MISC metadata.xml 621 BLAKE2B 4f375ddfcfed6172df186350f7bd3dbfbcacea34f555b14719af43f58b140d73e378cd0a5efd8438ed2a0006f3552febc684b4fce85aeb88fb2c9bf819c06c4b SHA512 9dbb366d483843279cc7532b56a877313a7c39de25c93c313a2957092f9766ce5715a83dd87ef116d1733a7cc399319025ce1eb0e7ad174e2b7441360a9f5560
diff --git a/sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild b/sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild
index 78bc7b1dc8d1..87b7bb7e2bc7 100644
--- a/sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild
+++ b/sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/sci-libs/keras-applications/keras-applications-1.0.8.ebuild b/sci-libs/keras-applications/keras-applications-1.0.8.ebuild
deleted file mode 100644
index 97ad5b054868..000000000000
--- a/sci-libs/keras-applications/keras-applications-1.0.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="Keras deep learning library reference implementations of deep learning models"
-HOMEPAGE="https://keras.io/applications/"
-SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sci-libs/keras-preprocessing/Manifest b/sci-libs/keras-preprocessing/Manifest
index e92a77d1e59e..5bb5bfd37f26 100644
--- a/sci-libs/keras-preprocessing/Manifest
+++ b/sci-libs/keras-preprocessing/Manifest
@@ -2,7 +2,6 @@ DIST Keras_Preprocessing-1.1.2.tar.gz 163598 BLAKE2B 94d0bac41ac140015a5d46453c9
 DIST keras-preprocessing-1.0.9.tar.gz 46476 BLAKE2B af80a6647bb56f8c4dba93120bc2b70db36d2c6a0e36c3be9a4843e5c36c9ffe50db1cd9396eecd47f6c0595c110825d70d2e6b28a29a0a199b5cfcc499e4440 SHA512 93ef9b294638bfeaea82170b323f08b261a2519f5ee8b9aac7d88e5b32c6486646d91075cea71bfbc27780c8af55125319873361f0431d48b451e574d1e7a400
 DIST keras-preprocessing-1.1.0.tar.gz 50631 BLAKE2B 235a1a7d296684e5405c6472026a53b1930923e74065529ba6921e91bf8849d35c02378f8eeabc4f532a4e25937e8fd8f712a59067c5b358afe10b88e1531fcb SHA512 68c71e82ea2139d3db4142c86a2c404e4d65a9a881f72b07b4ccf28733b93a9e4837f91534a20c3ca5128600d8b885cc8723181d96c9045d5280ad7f84091cbb
 EBUILD keras-preprocessing-1.0.9.ebuild 595 BLAKE2B bc5f3052d03249c8210460d2b15a3252b4f4818fe8924f885a0cdad36ee429fd22c2f5e31c93306e6014ef42bc8a0c18cc92c4aed579f0c2791570fef63a4765 SHA512 8cb56546d094f03c846d5cf32fb4c38266cc8029e6caca76005f07b3afc5f2a77a28aa571742f77fb640a06e14aa2909d9b319061484e76f08d9230d3552d821
-EBUILD keras-preprocessing-1.1.0-r1.ebuild 597 BLAKE2B 226f15626ef1ffdebcb5bba1235ea3bf514f42eaa0579acd44d98c4a9cb5ce6ed7e4e7adc6fe27ef9085053acfb274804640640bd960b20acd85db8b63aafefd SHA512 d0d663f7697d9a76d0c4ee8bd32736a21da91ed12c13f33719ead1d685f6ffced6bc9042a6ea075ffa47f72552bb475ff9d7652b48b446b9cdd43661a095b35f
-EBUILD keras-preprocessing-1.1.0.ebuild 595 BLAKE2B bc5f3052d03249c8210460d2b15a3252b4f4818fe8924f885a0cdad36ee429fd22c2f5e31c93306e6014ef42bc8a0c18cc92c4aed579f0c2791570fef63a4765 SHA512 8cb56546d094f03c846d5cf32fb4c38266cc8029e6caca76005f07b3afc5f2a77a28aa571742f77fb640a06e14aa2909d9b319061484e76f08d9230d3552d821
+EBUILD keras-preprocessing-1.1.0-r1.ebuild 595 BLAKE2B 255aa42beacfe93ab35503576281c262840d62c197f897d3ce1343cb24c20baa1da6082c588f53269093d70a6673f61698d03fd690bda655f3aec80e2fea5c3d SHA512 3882c7b38a81de131d1d60d83491eebdfbbe25718447cd20000a657194e106e99647d2d99c570fd28cee7a24813d25a99bf465155768d6cfc1806e6df0281444
 EBUILD keras-preprocessing-1.1.2.ebuild 673 BLAKE2B 0d0247ab25cc2cbd606f9d2141980aca0d7e5580ac713762c3b6f029d2f3d6eb809c68bd254e869d4a44af30aafef071398e43bd231918149dcbed2abd755607 SHA512 4ddaea181fb81d51cb8e05d5d9b8d7254ebd6e3654161866ad72a16f815d8c8da72ed558ec7e75032f2997263cdf8579c3a2e9918adca71cd2b5e3b4287ea6a8
 MISC metadata.xml 585 BLAKE2B a2f92ac4e2b9af055313a13de9bcbaee7ab7ca2efa4790c82027aece4b629bfa7a73c5ed0286b0f24f1853330057527009afe6ab1722f19d9c504a9d0737e827 SHA512 371cc3f5897bd28c62642a8857a22e775e24aa917bc0e58bb4de4e0a2a6580174ba35cfda2e8dd83599e2180fdfb3f11a953e7076c6d87073e1465b145b115e9
diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0-r1.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0-r1.ebuild
index 3a96094ba07c..86399f1a3de3 100644
--- a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0-r1.ebuild
+++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild
deleted file mode 100644
index c0bf90c60e2e..000000000000
--- a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="Easy data preprocessing and data augmentation for deep learning models"
-HOMEPAGE="https://keras.io/"
-SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest
index 21baf8a82db3..b214a11c1a08 100644
--- a/sci-libs/med/Manifest
+++ b/sci-libs/med/Manifest
@@ -1,9 +1,11 @@
 AUX med-3.3.1-cmake-fortran.patch 588 BLAKE2B 7fbd1619692702edb395402d30ee5ae7b44a801be010547a89ac777db7e86a11975f170eb1713e190b367bf5c5c3bf156dbf3522d263fe480387a7b40af572c3 SHA512 5c23d7afc8aad0c91b96d10953fe4c39cd079e798f0cbc5efdd9f5beb3967af1582f1c47f53d8be8a291222194f05205f06d19b1a3c3192fd4cce778052846b1
 AUX med-3.3.1-disable-python-compile.patch 1242 BLAKE2B 5c0a500376665cea4429820b3c41eac1d8bf25b1a172a236327e74768891ca1ec7ed143e0d7c803eac5194a6b762538731c068aca53cc5f2b8071d9b0ce08b57 SHA512 29dd13933412b19a4bb003d2337cfd3d35bedff430325809947d41b276690a3413976b39487e4577ad74a6c6ca1c611e63ee09873f0ea2acae1a21475a6bb2e5
-AUX med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch 1683 BLAKE2B 7b5c58e14c36d08e534139df2deba0cd3dd14bc3b66ed3472f89c8693aad73b7215806b4a4a6e3696e5e54855e4deea428309cea48519c85bf99f94f6355f5ba SHA512 4175e0c4b89e541cf27932392333e08960849ebd8e2897a340bce09c7500782064afadfaa51ff8dea89d420636e8bbb28a60fa8fe23432531b233da4462f568a
 AUX med-4.0.0-cmakelist.patch 2421 BLAKE2B 38991513aabbb8237a8b0d9456d9bb76f38cffecff9b1b4c906c0f9d17abd6c02ec150420403d8c1b36310b871f5354e100d1038d5620f6ba8719074e0ccd665 SHA512 405669dedc95b3776a2f4f6d64f8a608c914adb7d0666690f1f8b4a0598d6d85c7398622f50c50ead0295ee965fa993c36eb9e4217985079b528714682ea8b5d
 AUX med-4.0.0-installdoc.patch 1045 BLAKE2B ddc44d986743a4bf1fa59ab20d34835117f2213283ad13ce1e8e16358b87fe64888facb2f32da76a025cc283a5d942554700cc8816c25cb6f0eeaa54970f1f9a SHA512 486eb41af086d2dc92463aa8f64f074f70a39920b4954e4c272bc6b92c960efe198255975b7c594ff801be43e9eb6a31d007f55451901107db90ed6b3389eee6
+AUX med-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch 1412 BLAKE2B 50602ca4a76ba4d15072d6bb96f9ce8576ac819c36b2a2a30268b506e1f453966e2846ea81ab8919d59c47e5f2ca41bc433b9fddee13797834f3a0c11a8fbb0f SHA512 cf810b8f8f2466d0b2bbf6fae1167faf57ce0b01812630ab165401432fee474b6ce80b50e122c36c61f0c347f89a1975cb91ac7ea3939eee2c15bf9e1a1dcdbe
+AUX med-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch 1061 BLAKE2B 1856be8c2189e5d7541f041182e48315d686cadfeb409872eee25a90ff657cf1b6a5c76a4632a6d3d12af29b2f7ee67201d67c40cbc98927702ce1c905aa2509 SHA512 c40235bed175f84615115c899fad9f78a03205a7192bdf68f1b79a1711a7a15c58145102fce9850898f463d6d7ad16bbb89416f689d4013364955036628e7263
 DIST med-4.0.0.tar.gz 47849098 BLAKE2B 0bc6710f7b5156e09962e3125349573989429e614a203f649843f00dea06217040ebee70e481eed9c0dd304cb7d167efcd216c3600f6954a74f262cc845fff63 SHA512 2840437010481fc5f12a56e3282f8ca5e94df541899e2b511756702f86d0f87dbf2f6e086d8e591e2bd370d8f4bab8089e7f7f939fea16354a23e2b5a4d96cd7
-EBUILD med-4.0.0-r1.ebuild 2903 BLAKE2B b8c986a2d5bbbc666005d8780c6dea1cf1210fb059b36b6d2a737b35ac8bed4c7b9cbece442c93e48df952aab32c5233bb1137e143a6d99cbadbcdf6505897e5 SHA512 7b4e2142c3c2a581f0aa0a37ea9d44ed244c464d4379599af4b7881707c2d106558e034beed100dd984700eb89bbac727636fe61b281d5962c5675c1ef2724bd
+DIST med-4.1.0.tar.gz 50375039 BLAKE2B 514ca19baf15e349ecbce870b318b37c51bfb57ac9b03c2b2c1b28836fec7fcf2dce573b9ea155f358d5e0bcee120c12a31598cd4f1e44837eca787553bb70d4 SHA512 94d07663c2f6a3cd497f54b480c3d742476d2a25172feb567980c9e75d49f4661aa2c6aaf570470938265997154e348bc1608065b86d42afda52d4e6361fedf8
 EBUILD med-4.0.0-r2.ebuild 3493 BLAKE2B 119f7121365e2467dd99d77aa39eefe69356b78a09a4d7926d5386520d0150612ad0cdc1c6e462f41bd3b4eb8367169262c4d5d15e901f1b6c041b8b435a0fc5 SHA512 b613150305bd7b95312b05addfbb140d61f5d19a860798379f26e5690fa624fcdc5186f6f9493835dd8b32a694712a3d6a12c55e2fb8816ada8850078408a706
-MISC metadata.xml 743 BLAKE2B 26b8d89344c704c98c0819d9c10818667619f77ac704086ee645cbae2d15a59c36533edfe13e787da7e20f0611ddedbc2d761e33277d5a0b1f3328f2704971f9 SHA512 65a7ccf699c82ba6830d0172c87e83651f7d02182f3974fbd725e027046e4a2496fbdab9be852d1796f254622a73f697a3677fbb771a30a06a0b8d9c0a54c4bf
+EBUILD med-4.1.0.ebuild 3231 BLAKE2B 336bfbfba073d30dd9ef1efb0b00ef5cdc90f53ab3de07002219f3750d433c8aabccdd02c439ef262058cfc3ce9676562e808863ce09af741671b2a107953c73 SHA512 d45cc92458137499e6f735fb4f440d5f823710dd0167c71302dbdea59e0d1938e009fe25d23d60f0aef9eb5df785f9288ea6faedcf30f65c31cda71aa65294c1
+MISC metadata.xml 618 BLAKE2B ab2f432dd6d02b0a02c8963cf9895ed800b94a30814e761363ff85d4e07801cb187a7f6ecb45084d6cb61683afc0b2e00bc0b2418a33b8d4ab25c974e7f67407 SHA512 f1553fb2e6269fc0b6db2dd5b08765987ac9e80da53aa40445ef7b80d3e2ccc11b6266984544476dc6ba5e1817bf9f06b7e9d16553e1e24e6e7b9c3ba04c506b
diff --git a/sci-libs/med/files/med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch b/sci-libs/med/files/med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch
deleted file mode 100644
index e9dad6d5febe..000000000000
--- a/sci-libs/med/files/med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 73a776f76043d122438d716d0958489fc67bab8e Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sun, 1 Sep 2019 22:02:42 +0200
-Subject: [PATCH] doc/html.doc/Makefile.am: install into $htmldir
-
-Patches the install-data-local target to use $htmldir instead of $docdir
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- doc/html.dox/Makefile.am | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/doc/html.dox/Makefile.am b/doc/html.dox/Makefile.am
-index 9dc5b08..3946777 100644
---- a/doc/html.dox/Makefile.am
-+++ b/doc/html.dox/Makefile.am
-@@ -36,25 +36,25 @@ html-local: $(builddir)/../dox/Doxyfile.cfg
- 	diff $(builddir)/htmllistfile2.am.tmp $(srcdir)/htmllistfile2.am || @CP@ $(builddir)/htmllistfile2.am.tmp $(srcdir)/htmllistfile2.am
- 
- install-data-local: $(htmllistfile1) $(htmllistfile2) $(htmllistfile3)
--	test -z "$(DESTDIR)$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
-+	test -z "$(DESTDIR)$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
- 	for i in $(htmllistfile1) ; do \
- 	  $(INSTALL_DATA) \
- 	     `test -f $$i || echo $(srcdir)/`$$i \
--	     $(DESTDIR)$(docdir) ; \
-+	     $(DESTDIR)$(htmldir) ; \
- 	done 
- 	for i in $(htmllistfile2) ; do \
- 	  $(INSTALL_DATA) \
- 	     `test -f $$i || echo $(srcdir)/`$$i \
--	     $(DESTDIR)$(docdir) ; \
-+	     $(DESTDIR)$(htmldir) ; \
- 	done
- 	for i in $(htmllistfile3) ; do \
- 	  $(INSTALL_DATA) \
- 	     `test -f $$i || echo $(srcdir)/`$$i \
--	     $(DESTDIR)$(docdir) ; \
-+	     $(DESTDIR)$(htmldir) ; \
- 	done
- 
- uninstall-local: $(htmllistfile1) $(htmllistfile2) $(htmllistfile3)
--	rm -rf $(DESTDIR)$(docdir); 
-+	rm -rf $(DESTDIR)$(htmldir); 
- 
- .PHONY: htmlclean
- 
--- 
-2.22.0
-
diff --git a/sci-libs/med/files/med-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch b/sci-libs/med/files/med-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch
new file mode 100644
index 000000000000..e066385def8f
--- /dev/null
+++ b/sci-libs/med/files/med-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch
@@ -0,0 +1,26 @@
+From ccc372d4fa95ea2e083505ec5c536a48c49dd151 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Wed, 25 Nov 2020 21:08:46 +0100
+Subject: [PATCH] [Gentoo-specific] Adjust install path for build dir
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ tools/mdump/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/mdump/CMakeLists.txt b/tools/mdump/CMakeLists.txt
+index 991b5af..dd2018a 100644
+--- a/tools/mdump/CMakeLists.txt
++++ b/tools/mdump/CMakeLists.txt
+@@ -44,6 +44,6 @@ CONFIGURE_FILE(xmdump3.in ${PROJECT_BINARY_DIR}/xmdump3 @ONLY)
+ CONFIGURE_FILE(xmdump4.in ${PROJECT_BINARY_DIR}/xmdump4 @ONLY)
+ 
+ INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/xmdump2 ${PROJECT_BINARY_DIR}/xmdump3 ${PROJECT_BINARY_DIR}/xmdump4 DESTINATION bin)
+-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump4 mdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)")
+-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump4 xmdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)")
++INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump4 mdump WORKING_DIRECTORY \"\$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/bin\")")
++INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump4 xmdump WORKING_DIRECTORY \"\$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/bin\")")
+ 
+-- 
+2.29.2
+
diff --git a/sci-libs/med/files/med-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch b/sci-libs/med/files/med-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch
new file mode 100644
index 000000000000..b5c3364b799e
--- /dev/null
+++ b/sci-libs/med/files/med-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch
@@ -0,0 +1,39 @@
+From 3c8eb1ca6be13f185f20ee726f91f31d717947d2 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Sat, 28 Nov 2020 21:52:29 +0100
+Subject: [PATCH] Re-add option for building Fortran library
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ CMakeLists.txt | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2262275..7cb014c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,12 +6,15 @@ PROJECT(MEDFile C CXX)
+ ## See http://www.cmake.org/Bug/view.php?id=10227
+ #ENABLE_LANGUAGE(Fortran OPTIONAL)
+ 
+-INCLUDE(CheckLanguage)
+-CHECK_LANGUAGE(Fortran)
+-IF(CMAKE_Fortran_COMPILER)
+-  ENABLE_LANGUAGE(Fortran)
+-ELSE()
+-  MESSAGE(STATUS "No Fortran support")
++OPTION (MEDFILE_BUILD_FORTRAN "Build MED-file fortran library" ON)
++IF (MEDFILE_BUILD_FORTRAN)
++  INCLUDE(CheckLanguage)
++  CHECK_LANGUAGE(Fortran)
++  IF(CMAKE_Fortran_COMPILER)
++    ENABLE_LANGUAGE(Fortran)
++  ELSE()
++    MESSAGE(STATUS "No Fortran support")
++  ENDIF()
+ ENDIF()
+ 
+ ## Version number 
+-- 
+2.29.2
+
diff --git a/sci-libs/med/med-4.0.0-r1.ebuild b/sci-libs/med/med-4.0.0-r1.ebuild
deleted file mode 100644
index 267105d848af..000000000000
--- a/sci-libs/med/med-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools flag-o-matic fortran-2 python-single-r1
-
-#DESCRIPTION="A library to store and exchange meshed data or computation results"
-DESCRIPTION="Modeling and Exchange of Data library"
-HOMEPAGE="https://www.salome-platform.org/user-section/about/med"
-SRC_URI="https://files.salome-platform.org/Salome/other/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fortran hdf5-16-api python test"
-
-# fails to run parallel tests
-RESTRICT="test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-# dev-lang/tk is needed for wish-based xmdump utility
-RDEPEND="
-	!sci-libs/libmed
-	dev-lang/tk:0=
-	>=sci-libs/hdf5-1.10.2:=[fortran=,mpi(+)]
-	virtual/mpi[fortran=]
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="python? ( >=dev-lang/swig-3.0.8 )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch"
-)
-
-DOCS=( AUTHORS ChangeLog README )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	if use hdf5-16-api; then
-		append-cppflags -DH5_USE_16_API
-	fi
-
-	# add flag to produce python 3 code
-	sed -e 's|SWIG_PYTHON_OPT += -c++|SWIG_PYTHON_OPT += -c++ -relativeimport -py3|' \
-		-i ./python/Makefile.am || die "failed to change swig options"
-
-	# don't use version information when linking python libraries
-	sed -e 's|= -module|= -avoid-version -module|' \
-		-i ./python/Makefile.am || die "failed to change python link flags"
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-api23
-		--disable-installtest
-		--disable-static
-		--with-hdf5="${EPREFIX}"/usr
-		--with-hdf5-lib="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable fortran)
-		$(use_enable python)
-	)
-
-	if ! use fortran; then
-		myconf+=(
-			--with-f90=no
-		)
-	fi
-
-	if use python; then
-		myconf+=(
-			--with-swig="${EPREFIX}/usr"
-		)
-	fi
-
-	export MPICC=mpicc
-	export MPICXX=mpicxx
-	export MPIFC=mpif90
-	export MPIF77=mpif77
-	export FC=mpif90
-	export F77=mpif77
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	use python && python_optimize
-
-	default
-
-	find "${ED}/usr/$(get_libdir)" -type f -name '*.la' -delete || die "failed to delete *.la files"
-
-	# remove unnecessary doc subdirs
-	rm -r "${ED}"/usr/share/doc/${PF}/{gif,jpg,odt,png} || die "failed to remove unneeded doc subdirs"
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/doc/${PF}/html || die "failed to remove html documentation"
-	fi
-
-	# Prevent test executables being installed
-	if use test; then
-		rm -r "${ED}"/usr/bin/{testc,testf,testpy} || die "failed to delete test executables"
-	fi
-
-	# we don't need old 2.3.6 include files
-	rm -r "${ED}"/usr/include/2.3.6 || die "failed to delete obsolete include dir"
-
-	rm "${ED}"/usr/$(get_libdir)/libmed3.settings || die "failed to remove libmed3.settings"
-}
diff --git a/sci-libs/med/med-4.1.0.ebuild b/sci-libs/med/med-4.1.0.ebuild
new file mode 100644
index 000000000000..ab5056e4a4d7
--- /dev/null
+++ b/sci-libs/med/med-4.1.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake fortran-2 python-single-r1
+
+DESCRIPTION="A library to store and exchange meshed data or computation results"
+HOMEPAGE="https://www.salome-platform.org/user-section/about/med"
+SRC_URI="https://files.salome-platform.org/Salome/other/${P}.tar.gz"
+LICENSE="LGPL-3"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fortran mpi python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test ) python? ( test )"
+
+RDEPEND="
+	!sci-libs/libmed
+	dev-lang/tk:0=
+	>=sci-libs/hdf5-1.10.2:=[fortran?,mpi?]
+	mpi? ( virtual/mpi[fortran?] )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="python? ( >=dev-lang/swig-3.0.8 )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch"
+	"${FILESDIR}/${P}-0002-Re-add-option-for-building-Fortran-library.patch"
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README README.CMAKE TODO )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	if use python; then
+		# fixes for correct libdir name
+		local pysite=$(python_get_sitedir)
+		pysite="${pysite##/usr/}"
+		sed \
+			-e 's@SET(_install_dir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/med)@SET(_install_dir '${pysite}'/med)@' \
+			-i ./python/CMakeLists.txt || die "sed on ./python/CMakeLists.txt failed"
+	fi
+	for cm in ./src/CMakeLists.txt ./tools/medimport/CMakeLists.txt
+	do
+		sed -i -e "s@INSTALL(TARGETS \(.*\) DESTINATION lib)@INSTALL(TARGETS \1 DESTINATION $(get_libdir))@" \
+			"${cm}" || die "sed on ${cm} failed"
+	done
+	sed -e 's/med-fichier/med/' -i CMakeLists.txt || die "fix paths failed"
+	sed -e 's|doc/med-${MED_STR_VERSION}|doc/med-${MED_STR_VERSION}/html|' \
+		-i CMakeLists.txt || die "fix doc path failed"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# as indicated in the CMakeLists.txt, the shipped documentation is generated by a custom doxygen,
+		# so let's avoid rebuilding it because it will be different
+		-DMEDFILE_BUILD_DOC=OFF
+		-DMEDFILE_BUILD_FORTRAN=$(usex fortran)
+		-DMEDFILE_BUILD_PYTHON=$(usex python)
+		-DMEDFILE_BUILD_SHARED_LIBS=ON
+		-DMEDFILE_BUILD_STATIC_LIBS=OFF
+		-DMEDFILE_BUILD_TESTS=$(usex test)
+		-DMEDFILE_INSTALL_DOC=$(usex doc)
+		-DMEDFILE_USE_MPI=$(usex mpi)
+		-DMEDFILE_USE_UNICODE=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# we don't need old 2.3.6 include files
+	rm -r "${ED}"/usr/include/2.3.6 || die "failed to delete obsolete include dir"
+
+	# the optimization done in CMakeLists.txt has been disabled so
+	# we need to do it manually
+	use python && python_optimize
+
+	# Prevent test executables being installed
+	if use test; then
+		rm -r "${ED}"/usr/bin/testc || die "failed to delete C test executables"
+		if use fortran; then
+			rm -r "${ED}"/usr/bin/testf || die "failed to delete fortran test executables"
+		fi
+		if use python; then
+			rm -r "${ED}"/usr/bin/testpy || die "failed to delete python test executables"
+		fi
+	fi
+}
+
+src_test() {
+	# override parallel mode only for tests
+	local myctestargs=( "-j 1" )
+	cmake_src_test
+}
diff --git a/sci-libs/med/metadata.xml b/sci-libs/med/metadata.xml
index 508afc5ef9c1..9f49ce730ae1 100644
--- a/sci-libs/med/metadata.xml
+++ b/sci-libs/med/metadata.xml
@@ -17,9 +17,4 @@
 		<email>proxy-maint@gentoo.org</email>
 		<description>Gentoo Proxy Maintainers</description>
 	</maintainer>
-	<use>
-		<flag name="hdf5-16-api">
-			Use -DH5_USE_16_API to build the package against old 1.6 API of HDF5
-		</flag>
-	</use>
 </pkgmetadata>
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 7bce50eed600..45e5d47eb846 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index d58d988b8416..b3e26d04c52c 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -5,5 +5,5 @@ AUX octave-5.1.0-pkgbuilddir.patch 1565 BLAKE2B 7b2968139e080aaa20b5372b400ac84c
 DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae SHA512 fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
 DIST octave-6.1.0.tar.gz 32592405 BLAKE2B e39d7e8726b1aad8e378c8578e3d019b735ee82aa00230c9c35b36238848aa4c557da11707203c1ff845c26a117852c40ad9a42138812dcb5eba9b77a583a117 SHA512 34abe6fa489aea94bfeb08027653cd83a73611c6032c8b3ddc4b59223f316ee275f74490048a45aebf178858494f6920593565e612f6e77351102494cb9f49f7
 EBUILD octave-5.2.0.ebuild 5465 BLAKE2B 4334c91112a379067fb32b5e0a3ceb78400752711d32c9bcd1c7367f14663d26303f2102890596fbb000b0e9167c2a8d2e63fae9d57d2392991cab4221748dd1 SHA512 afd895fc8d2cad63ad70a637ecc3d68acf2c12627b2f50fe33713ad6286a023e09acdeaa6689477dbe8e58817619bbacc9714fa857d8115daf1366c7b3537cec
-EBUILD octave-6.1.0.ebuild 5231 BLAKE2B fbf9d202cff6adb38050153fd347b526eb0add7a8d7ea20b211f5238706b2e4406a03f20bacdb00011b5fcc13c39b0d44e0c77c3ee1be3a008e104512480548c SHA512 e18b8c8f82735077f9a7c2d0ddd93ee89573d63b5691ffd25335f0e86a998731e22fb999b446b48421bd6648b3ee5d8a0de30a792e6db5fb2aba5b05346462f7
+EBUILD octave-6.1.0-r1.ebuild 5422 BLAKE2B 9269a82337ccca46be5d0ce2a70901392ada90168fd15327b24db82b161672c6c899866e8ccbb65f2d29443533146c67e7379c14219bae11c27196ed25dbfb18 SHA512 a0698ce5e59b70be32e5ab22e371c2be8ac70cffa146895303e51259c87e82941965139bb20fc7e938898503f6ed9f3cc3f769aa708b33978593d933ab1537ce
 MISC metadata.xml 1153 BLAKE2B 66d7908c8b90f850ac9c83075ffde66d32235e43cb6a23ae16aad8227f02733d8db8e37e8d23ebf7fd0af92c1af0de6fe47b65713dda94d6000e43d02e168733 SHA512 0131cf603beefbc01be92a7b2cfdebc7bc8e68419aa8432ac5aaedf1ac18581f3b50b4f98f543585dba4d830ccb394f9e288aaac2e36c763e8ed800775c459a1
diff --git a/sci-mathematics/octave/octave-6.1.0.ebuild b/sci-mathematics/octave/octave-6.1.0-r1.ebuild
similarity index 96%
rename from sci-mathematics/octave/octave-6.1.0.ebuild
rename to sci-mathematics/octave/octave-6.1.0-r1.ebuild
index ff79efc69a41..cbd2dd72530a 100644
--- a/sci-mathematics/octave/octave-6.1.0.ebuild
+++ b/sci-mathematics/octave/octave-6.1.0-r1.ebuild
@@ -16,9 +16,13 @@ IUSE="curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl
 	ssl static-libs sundials X zlib"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
+# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
+# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
+# documentation to text (see scripts/help/help.m).
 RDEPEND="
 	app-arch/bzip2
 	app-text/ghostscript-gpl
+	sys-apps/texinfo
 	dev-libs/libpcre:3=
 	sys-libs/ncurses:0=
 	sys-libs/zlib
@@ -74,7 +78,6 @@ RDEPEND="
 	X? ( x11-libs/libX11:0= )"
 DEPEND="${RDEPEND}
 	dev-util/gperf
-	sys-apps/texinfo
 	virtual/pkgconfig
 	doc? (
 		dev-texlive/texlive-fontsrecommended
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 562c8619b4df..60997ec7008e 100644
Binary files a/sci-misc/Manifest.gz and b/sci-misc/Manifest.gz differ
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index fb62a6809e82..26de4aa36ce3 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -8,7 +8,7 @@ DIST boinc-7.14.2.tar.gz 52236336 BLAKE2B fa97d3af9e9a650db409b24386e7950369ab22
 DIST boinc-7.8.6.tar.gz 52037690 BLAKE2B 21d356488d8ea7e665f1b47e8ef0a0055d8b1a11e6e2aeea0b0ee7839fc7c0498b97ff9bc0183cd7391b5c86590ffc8234d823a743688a833ffcbe83797fd679 SHA512 e565fff30bc7214ae48548ae726544be3c8b09455a8c78a9e30410fd6cffe3b04b2e5c7f54381fa4190aa8adb259243b7d6443b6760c038ed8347edfed1ba997
 DIST boinc-7.9.3.tar.gz 49628586 BLAKE2B a053645f5e5c41610863c19be028963fb2e92fc0015b9df5377e734af968f1a70e4913cdc2052fd4a396dd1a9a782464e3ffc96a4b59a166f25c387de4c30d6d SHA512 d85880ec8e58d53af2cc5c9e357a29fbefe149450f33dea6fed5847b8e8c8bd9c9c5a309180c801c77fbedd740ebef83c1b410e8bc514e35fe210af57552bad5
 DIST boinc.tif 288208 BLAKE2B 156a99f08dcabc62a46874830600b9d237e64b650b8edf35db67b82006a67039a3965707194e8f0b25cfd65138b8700c0bfb877507418393b9cd3df32e94d260 SHA512 548e19b87fd70dbeb05687320b86aad39981c161b5b5b7e02fc3ce886d4c464c9bb763d5652d9895dd505ce247c7ff4490caa3d407e28f54ce889ffbab22d046
-EBUILD boinc-7.14.2.ebuild 5775 BLAKE2B efcbe217af056adecd6eb57babcddf0d293dd1f4840f9e5ebd5d9a19be1be70062e018970eedcd80dbe1061f12470e7cccbd6a9fc9489a328d23655a428c4b14 SHA512 bad0b54ec38d8a93e5e6335697b432c0343118076036678c6d9fece70d0030030b20f50260b3059406292af69c35fea065f559d1aa221b095976376f74a08b8b
+EBUILD boinc-7.14.2.ebuild 5782 BLAKE2B 8ce02661efe8bf9abce4b42e913a954d1eeacddf34ba4460c58a901d9d44e4a33312abf4cf722ed515724b4642637e880d4feec3e407369b669500722c8c0df3 SHA512 d758601742d515275a972e0098bfc145ab86754230d5765e465f0bff83f1b28321c88f61964deeb0d6bf54183be5019f78b80aaf3bf0b63497e78bbd1afafb50
 EBUILD boinc-7.8.6.ebuild 5899 BLAKE2B ee3c8221383a367c2cb603dd149212071c9face092786f8384e0df4b4f26856313e05a6f09ea667b4c983c1170ba6beb6dafd2ca92afe4e89b56e6270c01b006 SHA512 9c3af948037412f3acc7ebbb56796f9016534edb1c5cab0b70d2c07a2efeb82ac3ced6d3be789e8152417d76e9260394caf08392c9237cd9fc7fa5a8c526f3be
 EBUILD boinc-7.9.3.ebuild 5853 BLAKE2B c4b5a5ffc46018771a0e4f271d15e37441649b34d17a7ebce5fb96f88fb1d4abaa531c16716e30cf08c58b041b2c9b81c0fba2243ccf788f4f44f575476227ad SHA512 556641e862bcd4a856e4e6049bdee40e8aff827d9331abacd14254dfa454d840305a0437b6527ac258f594a01b0d151568759b182f143c701e83ace0685772ab
 EBUILD boinc-9999.ebuild 5775 BLAKE2B efcbe217af056adecd6eb57babcddf0d293dd1f4840f9e5ebd5d9a19be1be70062e018970eedcd80dbe1061f12470e7cccbd6a9fc9489a328d23655a428c4b14 SHA512 bad0b54ec38d8a93e5e6335697b432c0343118076036678c6d9fece70d0030030b20f50260b3059406292af69c35fea065f559d1aa221b095976376f74a08b8b
diff --git a/sci-misc/boinc/boinc-7.14.2.ebuild b/sci-misc/boinc/boinc-7.14.2.ebuild
index 0d45457bf43c..9377eb9ee4ed 100644
--- a/sci-misc/boinc/boinc-7.14.2.ebuild
+++ b/sci-misc/boinc/boinc-7.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	MY_PV="7.14"
 	SRC_URI+=" https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
 fi
 
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 40b55d803cb1..53106b0f72c1 100644
Binary files a/sci-physics/Manifest.gz and b/sci-physics/Manifest.gz differ
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 4116026b89e8..8affdabd461d 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -4,7 +4,7 @@ DIST geant4.10.06.p02.tar.gz 34833550 BLAKE2B c1a3b51cf5fc135edd8f547e5a88c80f8f
 DIST geant4.10.06.p03.tar.gz 35099426 BLAKE2B 75668b87eb3f1d8be00c46dc3e6e2131707ad89f4d077d2c55b7c985803709da565dbddd2ebd6ee7b6a3f4d58dc84a41bcded3b1db926127b480fb8e9fab2765 SHA512 844769991e20f4397a336a8e94bb82434b4ce44c84c956935659d2407ebf29b388b672650466f9683d3c99f9c7fa4f2c81e3f27075427f1613d825f38a74df69
 DIST geant4.10.06.tar.gz 34834510 BLAKE2B 48f50c734186e444f5ef2fd02b013565db7f404b7fbaeb3127d7dd67ede76196fd5fa4512a5482cceb7696305eb72dbe819fe43fa26ac63ded49259d804f5ccf SHA512 e03d69cb66947ddc71d20b9065fd5db384dfc8b2b8e905ddab9ebb992c642dc33f369d7eba5f2338487da5d9d28f20f3078917f222d187c65e5af1a0112ee044
 EBUILD geant-4.10.6-r1.ebuild 3074 BLAKE2B 510a8c15faa1ad4140823c3c9551a69e10ce13a4305dabb066dfde64b701dde40be609942e7dadeacd7e4b5f586888c05c5705cfb423b752109b6421a3aba9a6 SHA512 38c2a9759e0a510eae076acd0ac11abc093ae2ecefb91333302a62fb8940efc9094af02ea2acfe316b835b00f3511f7fe62805e4c67c631337d19fdcec1823f8
-EBUILD geant-4.10.6.3.ebuild 3085 BLAKE2B ced700560b67afd9ca9c0e2f88b436282757f6cc565a6f5106cef83ee1592761773270c965c19c46d3a2bf3f97772f4e2c9d43a627e9dae362e749f0b10f8a4b SHA512 346ab86748e49ecc20dede19768b399ad645eb8dc264d198e75c069c538b5d353e79f12f1f16df7428d17a2a6ae7ed76ca53749917063683b04a0e611ebfa5c3
+EBUILD geant-4.10.6.3.ebuild 3146 BLAKE2B c2b84128498597479c046f17fa4d06b871601a54cb6188525779a67c0268a38804ce7cf65e9e22d967b07b5bbe018842e2cd3af216092849f06871f498e0a14c SHA512 dfcfe5f15b66028903b640ef31d9970d0f4d3da02eb4fbde1cc2bf416c9b20c34ddc9931a99de2222044af4ea3f80e5d58feb812460b1bcab3dabd41c2451d44
 EBUILD geant-4.10.6_p1-r1.ebuild 3074 BLAKE2B 510a8c15faa1ad4140823c3c9551a69e10ce13a4305dabb066dfde64b701dde40be609942e7dadeacd7e4b5f586888c05c5705cfb423b752109b6421a3aba9a6 SHA512 38c2a9759e0a510eae076acd0ac11abc093ae2ecefb91333302a62fb8940efc9094af02ea2acfe316b835b00f3511f7fe62805e4c67c631337d19fdcec1823f8
 EBUILD geant-4.10.6_p2.ebuild 3024 BLAKE2B 1716d3eeb1092286b0d166488c38bd44206790e5a9b5937b542019960001f5d954de57c7bff709f8359b7cedbdfb4af76121cff22c8bbf8bb331105ad035809e SHA512 713ac726c201f589d1c4b42b1bafe2c8144e3eba46d12dd53b413f48bcecba9c5789ce10a0bd0384d40c1f7854bdd057253a47d2df0f66b0e90f15e66cef5785
 MISC metadata.xml 1683 BLAKE2B a0eb481dd6e784064dce6265b9361b51c24fa845f7af7ec238a1ffef215ef16dba7c02b795d8ea50dddb255c513c1a3941761bb99f813664d3ef012377aca174 SHA512 7631f3f6fbc0a5a730fb260476c9d514b05c71c4967c5f0059523cbae99415e5e48a416a8a4b481de5c2c484484489b4260f8ceacdeca4b0ee0e670dc7293985
diff --git a/sci-physics/geant/geant-4.10.6.3.ebuild b/sci-physics/geant/geant-4.10.6.3.ebuild
index 2f580bb7015f..2339a156d897 100644
--- a/sci-physics/geant/geant-4.10.6.3.ebuild
+++ b/sci-physics/geant/geant-4.10.6.3.ebuild
@@ -31,7 +31,12 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+c++11 c++14 c++17 +data dawn doc examples freetype gdml geant3 hdf5
 	inventor motif opengl qt5 raytracerx static-libs threads vrml"
 
-REQUIRED_USE="^^ ( c++11 c++14 c++17 )"
+REQUIRED_USE="
+	^^ ( c++11 c++14 c++17 )
+	inventor? ( opengl )
+	motif? ( opengl )
+	qt5? ( opengl )
+"
 
 RDEPEND="
 	dev-libs/expat
diff --git a/sec-policy/Manifest.gz b/sec-policy/Manifest.gz
index 577cb40ac778..5bc9274b0db0 100644
Binary files a/sec-policy/Manifest.gz and b/sec-policy/Manifest.gz differ
diff --git a/sec-policy/selinux-abrt/Manifest b/sec-policy/selinux-abrt/Manifest
index 14b6829faab4..d3922d78a356 100644
--- a/sec-policy/selinux-abrt/Manifest
+++ b/sec-policy/selinux-abrt/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-abrt-2.20190201-r1.ebuild 275 BLAKE2B 279a8b2a8cdf4f39d019365d3d2035a85412cc0e600018e8bb5ccd3995c9800425f553b1adcbadb21a274c36a7491fd66df12c4cb0ceaf82df538b5b97339408 SHA512 7a4531e7ccb024afcd44222003a6c19631189861fc97668e73f9bd19b2e24ee85f19b2e24b20844014431f51abfe1d822252fed36a799fcbc8c47a11a7cc8b35
 EBUILD selinux-abrt-2.20190609-r1.ebuild 275 BLAKE2B 279a8b2a8cdf4f39d019365d3d2035a85412cc0e600018e8bb5ccd3995c9800425f553b1adcbadb21a274c36a7491fd66df12c4cb0ceaf82df538b5b97339408 SHA512 7a4531e7ccb024afcd44222003a6c19631189861fc97668e73f9bd19b2e24ee85f19b2e24b20844014431f51abfe1d822252fed36a799fcbc8c47a11a7cc8b35
 EBUILD selinux-abrt-2.20200818-r1.ebuild 277 BLAKE2B 1a2d4ada5533118943b068668e044246952da92e87fa7a7bafb6453f457ced24da7134264673eaefb69075afb75ffce92b819c97c4bacec5848a55fecf12d7ac SHA512 7c54ea55f4b52becbb536c47e4a9fadc9c969d3b9838cf158e8dfb5acd7f6c0d5231b68691a8b6796593082749f630ac969776236e64b3cf7a5751894270856a
-EBUILD selinux-abrt-2.20200818-r2.ebuild 277 BLAKE2B d53d4367204947dbfa68315090b915754928a2c6f2f96552df58d04006e463d6368ddacf48bcb402753ea26a943fd9f00839aac80d99b2370fd6aad073585d05 SHA512 ae6112adf7383317c6136c55e4241fcca7ef9ddca079725ab1212fc6f5fe8d34b4db3c4e5da07ecdd7385e641e5a484c7a206f786f18b765428f94b2199dde31
+EBUILD selinux-abrt-2.20200818-r2.ebuild 275 BLAKE2B ecca54fcfe343f7df5d85b87a803abc91b9d38ace8a92288ead7516fda34e49fc421a9d8dc134a46c679549306752d112b20a619d01cd415ead5eaea0ac17b07 SHA512 b2d0b4945f1d36ab8697ad4c69ac529807d150d7eef6a54062ec35e73c8c2e42a29281bd6637073b640420edae15a668accb98db8c178d33910db5cf7b57c76e
 EBUILD selinux-abrt-9999.ebuild 277 BLAKE2B d53d4367204947dbfa68315090b915754928a2c6f2f96552df58d04006e463d6368ddacf48bcb402753ea26a943fd9f00839aac80d99b2370fd6aad073585d05 SHA512 ae6112adf7383317c6136c55e4241fcca7ef9ddca079725ab1212fc6f5fe8d34b4db3c4e5da07ecdd7385e641e5a484c7a206f786f18b765428f94b2199dde31
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20200818-r2.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20200818-r2.ebuild
index 0d01ad1be86f..1d0d83a6a96c 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for abrt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-accountsd/Manifest b/sec-policy/selinux-accountsd/Manifest
index c11a7e1ed792..39dbd5fcc0d6 100644
--- a/sec-policy/selinux-accountsd/Manifest
+++ b/sec-policy/selinux-accountsd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-accountsd-2.20190201-r1.ebuild 378 BLAKE2B 9c2c18d19f10542d4b621f7b1e7ae5f1472136bc239c85c3d785ce6d39ac1b2cf29355e752fa6b9cf7463bbe709742c966e646038879b3263de722684c90a4f7 SHA512 35d15bd8bd44c087f2354ca4bb7afeec6b4faa6fd883eca82217298f1210a3fc77de56f536f5f4b30f531d40b44d2f7f9f2ed9f8e6c81fd50467e28982733ba8
 EBUILD selinux-accountsd-2.20190609-r1.ebuild 378 BLAKE2B 9c2c18d19f10542d4b621f7b1e7ae5f1472136bc239c85c3d785ce6d39ac1b2cf29355e752fa6b9cf7463bbe709742c966e646038879b3263de722684c90a4f7 SHA512 35d15bd8bd44c087f2354ca4bb7afeec6b4faa6fd883eca82217298f1210a3fc77de56f536f5f4b30f531d40b44d2f7f9f2ed9f8e6c81fd50467e28982733ba8
 EBUILD selinux-accountsd-2.20200818-r1.ebuild 380 BLAKE2B 92bff1dfbad7ff1d3232103703f0714d22b3883f7a2c87e615707186b5b0ac0f79ba28bdf0380bcce8d3bab7be625de05fe2781c7f46be4242aaa58779a8bd3b SHA512 4f69c987c6a936cdcb2037e14fe2895bf6b4c2d147583d0f2861b11f9d050d88402891a61aa9fea739a9f8c0e32f2268e3c57736182ad2e16c176d1c72e8641a
-EBUILD selinux-accountsd-2.20200818-r2.ebuild 380 BLAKE2B db5f57a459fa52196bf12e320a6588f443ae25f4e88442d178adc3db2a1e20d4500d98337e488c4383dab51b3abbdba6b064fbf7cfe0d0bb396de71bf489dfc2 SHA512 7b4157f345f3c9a952f79fc02b49de9826eaaed61c1abe969d73493c2df9a733e154b81c9e787c9c310f7c2b74775def433efef244670a38918b6136b8e328e7
+EBUILD selinux-accountsd-2.20200818-r2.ebuild 378 BLAKE2B 2741600103c709b984c1a8e8c142752142a0394f2fe1b8481e24e24b1476e27af74c439754c533a60638e573c840a2543b2d656ec0071cea601d0ab407ce8d12 SHA512 b0c47b52c34ec8989647dac6123ba42bc89eca6e4bb1c335094b2b3ccea259bd194490cf32ca3f2df2c6141b7007320ffde20eee73f705995de2c1526623fbd8
 EBUILD selinux-accountsd-9999.ebuild 380 BLAKE2B db5f57a459fa52196bf12e320a6588f443ae25f4e88442d178adc3db2a1e20d4500d98337e488c4383dab51b3abbdba6b064fbf7cfe0d0bb396de71bf489dfc2 SHA512 7b4157f345f3c9a952f79fc02b49de9826eaaed61c1abe969d73493c2df9a733e154b81c9e787c9c310f7c2b74775def433efef244670a38918b6136b8e328e7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20200818-r2.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20200818-r2.ebuild
index 9d68efff7ac7..6c97ce06c74b 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for accountsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-acct/Manifest b/sec-policy/selinux-acct/Manifest
index b7cb2d325848..e5ee09e5b636 100644
--- a/sec-policy/selinux-acct/Manifest
+++ b/sec-policy/selinux-acct/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-acct-2.20190201-r1.ebuild 275 BLAKE2B 1667ff8303ec2d730db653ca8eef4a961d3fbb1643e4f22965ededcfe342271adad7f6b20aec854c1d44f3894bb1752c901972f58f701647277712ab812946ae SHA512 311af8eb1bb9082d8f593c0ba170ba0e1f9c0561bd9e4341b43ce0caa9f5f651c56e3f6c97a13dfc95d5fec7fbfd1eb1f952b6c2cbeac4bf349e1dd233fbbfa3
 EBUILD selinux-acct-2.20190609-r1.ebuild 275 BLAKE2B 1667ff8303ec2d730db653ca8eef4a961d3fbb1643e4f22965ededcfe342271adad7f6b20aec854c1d44f3894bb1752c901972f58f701647277712ab812946ae SHA512 311af8eb1bb9082d8f593c0ba170ba0e1f9c0561bd9e4341b43ce0caa9f5f651c56e3f6c97a13dfc95d5fec7fbfd1eb1f952b6c2cbeac4bf349e1dd233fbbfa3
 EBUILD selinux-acct-2.20200818-r1.ebuild 277 BLAKE2B b6b1a7d7ed8d4eb273d474f1aef64c6b38c3ceba5a9de02083565de290d50125e7c438f0703548d6fabcbfb706883cad75de303ed065ced5ddd4ef4ec4d6fc05 SHA512 f08d9232d3187b816335058e1638c8e87f3ca9026f4adbe5374c17f4afd1436287123f50e70201242465f1343a2c98cea752f580143edbeb79b95c94aa997c21
-EBUILD selinux-acct-2.20200818-r2.ebuild 277 BLAKE2B cf252f68f808d252cca59396729e59eb068106d9fe7f90263a75ab8023769a3a8a491cb8b18e89c6ed8fcdb12cb2cf49a1570d17ee319f53bd878ad0ce6ce747 SHA512 64791bb0f70d3290e4b378557ed1f3635cb8ebd6a7e1448184f858a69493a3e83c82fadb3c71523ebdcb1ab2d4355b15257ef55aabc1c8ea95b8f5817505c8ef
+EBUILD selinux-acct-2.20200818-r2.ebuild 275 BLAKE2B de49d9f46c2a553b2325990207c82a4a238040a85535a1ef83489c0d4e8dfc4314da11326c6fc65cda74c1e2480fe44997d6df82b4438284b183f94f5bfa67e7 SHA512 56970240a89e9632a4661ecacaa88a8c96dd5ae727c53af8c836c8d80f2ba3e94f2fa0b15eed2d98402e972336577c189ff862fa0abc30a5b2be09ed047eb2d3
 EBUILD selinux-acct-9999.ebuild 277 BLAKE2B cf252f68f808d252cca59396729e59eb068106d9fe7f90263a75ab8023769a3a8a491cb8b18e89c6ed8fcdb12cb2cf49a1570d17ee319f53bd878ad0ce6ce747 SHA512 64791bb0f70d3290e4b378557ed1f3635cb8ebd6a7e1448184f858a69493a3e83c82fadb3c71523ebdcb1ab2d4355b15257ef55aabc1c8ea95b8f5817505c8ef
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20200818-r2.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20200818-r2.ebuild
index b25f752244d8..9fc45888c0cc 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for acct"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-afs/Manifest b/sec-policy/selinux-afs/Manifest
index 20df0ba2228e..b95ee32b086d 100644
--- a/sec-policy/selinux-afs/Manifest
+++ b/sec-policy/selinux-afs/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-afs-2.20190201-r1.ebuild 273 BLAKE2B b2976f6d44994e4e966c2ae217c38cdcb04896c9fa722459e8aee81998b89944b4cce8ca4dc1780aa515a72b8a864f3b8f962b0b11d3a9e7fcdee6a1e440c42a SHA512 31e95ddd20ee766f3cb387a3aabc65f2849295ebbedaea917f48ea63292d84f9ba74c5b0549f958f92cd46b8b0cd76d207b0876bba4e4ede19c4c5d3a6011afa
 EBUILD selinux-afs-2.20190609-r1.ebuild 273 BLAKE2B b2976f6d44994e4e966c2ae217c38cdcb04896c9fa722459e8aee81998b89944b4cce8ca4dc1780aa515a72b8a864f3b8f962b0b11d3a9e7fcdee6a1e440c42a SHA512 31e95ddd20ee766f3cb387a3aabc65f2849295ebbedaea917f48ea63292d84f9ba74c5b0549f958f92cd46b8b0cd76d207b0876bba4e4ede19c4c5d3a6011afa
 EBUILD selinux-afs-2.20200818-r1.ebuild 275 BLAKE2B 5b9b945530583af71323e24dfaf70c997c750f45c4906d048f82b8eb68a264bf0579727d260f4749288be1502e183b9a92fada1b3550211333fdcf4e8e8c51d7 SHA512 4b76a1c601cc79bdc017d99c90f0c875dcae461de60ee862d3c2188c1c20cd9b1c3b86be5f3a30eda4c609642d73b8cfefd138aaf496f5f4490c915e66b4f48f
-EBUILD selinux-afs-2.20200818-r2.ebuild 275 BLAKE2B c4f0f2e55724d947f70686511f999c0931f8460b5fa3926c7640d032d118bb7585e97b5df32d7332df9a7ac3ca8fe1ecba0572f9332dfcee5b277f18c0d9ce5a SHA512 7f55335811a2dfa36121d4f6efdb2bf5cb9be4d7250c3f7e95b066993dae09000bcc7a25d631054f1f84ecf33e11934405aff5037323033d15680fb810419e1a
+EBUILD selinux-afs-2.20200818-r2.ebuild 273 BLAKE2B 5c34d13f0c9fa5b46758c5d8baec2ecc9bea8b9601344088d684025be5fe66a02425fe5f05d03660e477e5bc0d1bd7e15489c57a7890aac9a3e6b13f02e4eb68 SHA512 3d8403ad7467f02a2e14f5505c3c3d5974f0dc93851de204e096e1c560c79374d27f37d798855c21ceee35338d2d7a6dd86404d283b1ad3e14338d239ffb7e93
 EBUILD selinux-afs-9999.ebuild 275 BLAKE2B c4f0f2e55724d947f70686511f999c0931f8460b5fa3926c7640d032d118bb7585e97b5df32d7332df9a7ac3ca8fe1ecba0572f9332dfcee5b277f18c0d9ce5a SHA512 7f55335811a2dfa36121d4f6efdb2bf5cb9be4d7250c3f7e95b066993dae09000bcc7a25d631054f1f84ecf33e11934405aff5037323033d15680fb810419e1a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20200818-r2.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20200818-r2.ebuild
index 4514ed2b102c..690e6c0a3715 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for afs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-aide/Manifest b/sec-policy/selinux-aide/Manifest
index 408fc105264e..88a3aa8a5ab5 100644
--- a/sec-policy/selinux-aide/Manifest
+++ b/sec-policy/selinux-aide/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-aide-2.20190201-r1.ebuild 275 BLAKE2B a431b8374584ac5b5c737db254514e1bd0471f5f292785a5a14b3d9dafd32e1f0a83c3f46e5bee81e36ad3c553f99c4952d943e5f5e136167f35285a124d65ef SHA512 61fe18029a8e0f2c9897b83b4fa512bd47d7d03d85847a38aa25d7995d1df518c4d47957fe97b0a51a4c0d9574bd4898eb14ab3a41564abc5075f80330de12bb
 EBUILD selinux-aide-2.20190609-r1.ebuild 275 BLAKE2B a431b8374584ac5b5c737db254514e1bd0471f5f292785a5a14b3d9dafd32e1f0a83c3f46e5bee81e36ad3c553f99c4952d943e5f5e136167f35285a124d65ef SHA512 61fe18029a8e0f2c9897b83b4fa512bd47d7d03d85847a38aa25d7995d1df518c4d47957fe97b0a51a4c0d9574bd4898eb14ab3a41564abc5075f80330de12bb
 EBUILD selinux-aide-2.20200818-r1.ebuild 277 BLAKE2B ccc168bb2427749bd419cf7ea29add0f72f13ac28c3fd4050d8583aa2c859d8316667804e3c395a09e70393fd2373071d4e23137ecc2836815b0f91349b22500 SHA512 84a3d894d69afd49f551e8c75bc84236a0285e6a3d08c88bfd63c8ea60ddf4385866b0724e878eb75f10c82ba8533c69a2339eae816352438a74637dba30408d
-EBUILD selinux-aide-2.20200818-r2.ebuild 277 BLAKE2B aaafe4d33b54442f7f4ee2b084c42fab45231a52d36833a71ff8662968612709780ca6e3fa5a0d280e74b5a7b4ef18474d060033e370b9f2464a13b9b5e3b3a1 SHA512 c8928c7c2f00126bc52b0cd7118a6e7176533eaf9b7529b55e4681a544945eb6d2b4e8aea5d67f0ec7acb9f837bb47edddf1d7a7cb36b42e0c3ed4af4017ca3d
+EBUILD selinux-aide-2.20200818-r2.ebuild 275 BLAKE2B 7ffeedf7f5604a1333d720c7422ca7fabcc5be9a638c4b75708d87e9e2fcfdca38aa21cc2a6f22a6ed33ccc2dcdfbd4e08167000a5f0c26dd28a05a289c93252 SHA512 35c4e5ec6358ce90404baadee2a0fb2b59a29096b1ed08c25303048d3f21efd17b770fc84f76b0d41bd54f6b24336af0bbb14f4d5c8ac397609a0c298417754e
 EBUILD selinux-aide-9999.ebuild 277 BLAKE2B aaafe4d33b54442f7f4ee2b084c42fab45231a52d36833a71ff8662968612709780ca6e3fa5a0d280e74b5a7b4ef18474d060033e370b9f2464a13b9b5e3b3a1 SHA512 c8928c7c2f00126bc52b0cd7118a6e7176533eaf9b7529b55e4681a544945eb6d2b4e8aea5d67f0ec7acb9f837bb47edddf1d7a7cb36b42e0c3ed4af4017ca3d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20200818-r2.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20200818-r2.ebuild
index ec70256edddc..3088ec0406a1 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for aide"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-alsa/Manifest b/sec-policy/selinux-alsa/Manifest
index 6e4e3eba0830..c47f8cd95a13 100644
--- a/sec-policy/selinux-alsa/Manifest
+++ b/sec-policy/selinux-alsa/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-alsa-2.20190201-r1.ebuild 275 BLAKE2B 18c33ac526bde40d7da8ed8789c612b249f15a35b1853659f1a0e4049c6b2a22cae42fad68ae28cdc9f8fed7dc8fdd6bf778e25941992b3cd921c5348114bbd5 SHA512 d5f4a317053176310c435486b3365cc8a0aee56c5c62180d7583f0e4d6b14a6c8cbc15dcd2db6ac6d7163aaa11e8d7dabc5ba74f8a5657a9544ade61678b8fdf
 EBUILD selinux-alsa-2.20190609-r1.ebuild 275 BLAKE2B 18c33ac526bde40d7da8ed8789c612b249f15a35b1853659f1a0e4049c6b2a22cae42fad68ae28cdc9f8fed7dc8fdd6bf778e25941992b3cd921c5348114bbd5 SHA512 d5f4a317053176310c435486b3365cc8a0aee56c5c62180d7583f0e4d6b14a6c8cbc15dcd2db6ac6d7163aaa11e8d7dabc5ba74f8a5657a9544ade61678b8fdf
 EBUILD selinux-alsa-2.20200818-r1.ebuild 277 BLAKE2B 4f1309baa35fdfa53160b37238da3560f8a748f0fd8baa9c2b72ee54fb36ec49b2774388ff2b450d29724a88b05ef79f83b3f24031a911a439d764979e9a3230 SHA512 d7a878e241163b6d478b6a50430479662382730814c8b51898809ddacd84b7761214403d106eab9fb6c1f16c43c0849dbd532ef66ca1a378434739d84e9a98a1
-EBUILD selinux-alsa-2.20200818-r2.ebuild 277 BLAKE2B fa92c680cacf56ba48d67c2cc59dfac520bfc29a27c2d63995bff3dd82fda7767fc12c8c40814ad71dd61f83a7269aa881007531724133b1614b6dcad0a49b0e SHA512 ce1bb457e2963e0c1327adbcce6811972ef691b0b87f33c1c7a6c663ea9aed186119d96d9e08fc42f9798ee8457ec11b3fed3234f0ce84e3d84cad6f463e11cb
+EBUILD selinux-alsa-2.20200818-r2.ebuild 275 BLAKE2B 3aefcc369408d476263b609015a0f4fdf64908db3896be1593e092ca376631db5dbe8da4d30b02f2d316a00fd5c686b2437ea92d7930d90f8db75320beaad317 SHA512 2d1940cdbdb6da6367242b281f2cc1db995df2524c73818e2cf76998b16fecd48e0a2a220db8ccd40e468a0f22c938d84c301ce1ddb38bc0bd04e56d90108dbc
 EBUILD selinux-alsa-9999.ebuild 277 BLAKE2B fa92c680cacf56ba48d67c2cc59dfac520bfc29a27c2d63995bff3dd82fda7767fc12c8c40814ad71dd61f83a7269aa881007531724133b1614b6dcad0a49b0e SHA512 ce1bb457e2963e0c1327adbcce6811972ef691b0b87f33c1c7a6c663ea9aed186119d96d9e08fc42f9798ee8457ec11b3fed3234f0ce84e3d84cad6f463e11cb
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20200818-r2.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20200818-r2.ebuild
index 53ad2c56fdef..511b5ed98a3e 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for alsa"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-amanda/Manifest b/sec-policy/selinux-amanda/Manifest
index 1a462e6b30ba..01daed3196f8 100644
--- a/sec-policy/selinux-amanda/Manifest
+++ b/sec-policy/selinux-amanda/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-amanda-2.20190201-r1.ebuild 373 BLAKE2B 8c4925318ab8e00a4130eca1a18024e94f79f830dfbb387f9733e0b51b6a155cd7c8b888dc580d61457128a1846d177684acfcc09b46595295e46227d18c5f1d SHA512 f99979c7a58c93d45951b9eb669c87256e0ba471377b2d7f2dc225084e4718368a84e2fbf0805482252342591c2933ad6daa1198cc64e676468a097fe737e743
 EBUILD selinux-amanda-2.20190609-r1.ebuild 373 BLAKE2B 8c4925318ab8e00a4130eca1a18024e94f79f830dfbb387f9733e0b51b6a155cd7c8b888dc580d61457128a1846d177684acfcc09b46595295e46227d18c5f1d SHA512 f99979c7a58c93d45951b9eb669c87256e0ba471377b2d7f2dc225084e4718368a84e2fbf0805482252342591c2933ad6daa1198cc64e676468a097fe737e743
 EBUILD selinux-amanda-2.20200818-r1.ebuild 375 BLAKE2B 5e8d232c92be185dcf5c6626dedb52ba087bf5befcf98fd523cce2d6edab4e8c80b4c7e64448c58ade50bf1c803281f9e75dcbae22a4d8aae81efe228b0a76fb SHA512 70b53c5de35c693fd7ea28e57239676d7b5b9f6f7d9b8ec4806df6fcf865010f89ea3fcf0cef1eb4f78b0ee4d8f36397d6a0b8d0727dfd30b76a0dfcb59e7e68
-EBUILD selinux-amanda-2.20200818-r2.ebuild 375 BLAKE2B b21fd970b1c6f41928f6827041a89b79459e0fad907b8411e28dece589a985802534545cdaef006d19882a2099fbf4b0db2f8abff79a2505d8e28eb0806cad16 SHA512 4ecc380cc4bc90d87115bcb993d3e64041cf540a4be2f2667b66e2811cf1c32fd295bdaa92620c56cafc60cc7d4ec35d17d672968b36c3866fb6d058b3e01788
+EBUILD selinux-amanda-2.20200818-r2.ebuild 373 BLAKE2B 56076b1f8cbbbac6f25fa7ace34a9664836c56dc3226a0fc7321efe44cd87fbd783c635fd36923200eee9a5e5e1889ca445d9da7fbdcfd9fdb83f1a2223bf8d3 SHA512 e1a5f132d1baf60ddfedafa3311cc8e54e40ad0521a516f7e8f86a64d14ff8ee5eeca816a7e6b18252dce1aa07f33a32192fe9fd47a93e97548a9116ba384de2
 EBUILD selinux-amanda-9999.ebuild 375 BLAKE2B b21fd970b1c6f41928f6827041a89b79459e0fad907b8411e28dece589a985802534545cdaef006d19882a2099fbf4b0db2f8abff79a2505d8e28eb0806cad16 SHA512 4ecc380cc4bc90d87115bcb993d3e64041cf540a4be2f2667b66e2811cf1c32fd295bdaa92620c56cafc60cc7d4ec35d17d672968b36c3866fb6d058b3e01788
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20200818-r2.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20200818-r2.ebuild
index ea4d87c07053..774f3831b93e 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for amanda"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-amavis/Manifest b/sec-policy/selinux-amavis/Manifest
index 1f8a90bfb941..db294b124b5e 100644
--- a/sec-policy/selinux-amavis/Manifest
+++ b/sec-policy/selinux-amavis/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-amavis-2.20190201-r1.ebuild 279 BLAKE2B 500e6bddef3eebba2fbe8687c0350aaca692a52c957a2d89e9dbc15cfed620fcb23be402bcb9221c071f02217af069e3b2c3c3138372fe0e7be39d035d1d7b72 SHA512 e1377d9002f4f497dd2c56abd36001e422ed94d9909e4d7983a2604dbd4687eab055bc9b4a503061c1b867ba7bb7288114a8565b8d85bef9554685e99daba27d
 EBUILD selinux-amavis-2.20190609-r1.ebuild 279 BLAKE2B 500e6bddef3eebba2fbe8687c0350aaca692a52c957a2d89e9dbc15cfed620fcb23be402bcb9221c071f02217af069e3b2c3c3138372fe0e7be39d035d1d7b72 SHA512 e1377d9002f4f497dd2c56abd36001e422ed94d9909e4d7983a2604dbd4687eab055bc9b4a503061c1b867ba7bb7288114a8565b8d85bef9554685e99daba27d
 EBUILD selinux-amavis-2.20200818-r1.ebuild 281 BLAKE2B ac8d1b34e968c0fbbee8739f5ce248cc6cac74ffcb73ab696f1be971fe0524009d83edf7d6eb33825b700de02fe9c93b0f6a7c7d9874b2fa19f1f2400d43126b SHA512 d54e2ccfa9c89a60716e5cc983c133de734db74a7dc786f8b63f4aeca6c7f42589c5eeaacda2e12e19382b36ad88a049f9daa0877de1bddcf9c613d3b12149b5
-EBUILD selinux-amavis-2.20200818-r2.ebuild 281 BLAKE2B 22395ca61e614a11514954b4d0465d61db35bf5e866630d70e8b59b57b756d970e213ee908301abf0bace55b28da073a4d5a2da3d5fd9db642c8d727d800b380 SHA512 27727ee6fd18fbb3345bca7927ef31c92a7d816cf7fcca80a96f9f678b51e37b2adee5efa057b821d51c5ea98314bed7ebe72e2e776fbb6f16c44b338589de74
+EBUILD selinux-amavis-2.20200818-r2.ebuild 279 BLAKE2B d60e67f3f5b8fc5712a7bcaf3e3ff17f641f3bb7062c990ca9d85285f69cfa9378f4943bdb2fab87f9a6af8095156638aaa33ab3527782c7bdaaa19db9ba51a0 SHA512 391acf6f13def9e462c9a56e405e565d2fb88a72fa47ec97e98b2821f20affb9f9c2c0a8d25d3480071180fe2363ce701911d58f2b2181a53083b76595d8cd4b
 EBUILD selinux-amavis-9999.ebuild 281 BLAKE2B 22395ca61e614a11514954b4d0465d61db35bf5e866630d70e8b59b57b756d970e213ee908301abf0bace55b28da073a4d5a2da3d5fd9db642c8d727d800b380 SHA512 27727ee6fd18fbb3345bca7927ef31c92a7d816cf7fcca80a96f9f678b51e37b2adee5efa057b821d51c5ea98314bed7ebe72e2e776fbb6f16c44b338589de74
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20200818-r2.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20200818-r2.ebuild
index d342ccef3c44..20d01fe7ace7 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for amavis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-android/Manifest b/sec-policy/selinux-android/Manifest
index 5b809110f9d8..61d19dff1e9c 100644
--- a/sec-policy/selinux-android/Manifest
+++ b/sec-policy/selinux-android/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-android-2.20190201-r1.ebuild 430 BLAKE2B 39a1aab1387201c32d9892ab93ff2d887e3afaf85420e66014879e824fc05d53b2f37257c31137a3d358a4de560b35db616d22c991d574dce4abed48579ada74 SHA512 3106f5a1a336e2dc1e455e5f6c0456678bb3ac398072f0f118684db3a87958bd56736309866b2d3e7ebd8f752dc9923990249b1568d816477a6932632cbddbe5
 EBUILD selinux-android-2.20190609-r1.ebuild 430 BLAKE2B 39a1aab1387201c32d9892ab93ff2d887e3afaf85420e66014879e824fc05d53b2f37257c31137a3d358a4de560b35db616d22c991d574dce4abed48579ada74 SHA512 3106f5a1a336e2dc1e455e5f6c0456678bb3ac398072f0f118684db3a87958bd56736309866b2d3e7ebd8f752dc9923990249b1568d816477a6932632cbddbe5
 EBUILD selinux-android-2.20200818-r1.ebuild 432 BLAKE2B efdc02a739dd8dc2a7ae232709e4b816a1858ce74ad00630049f6eec6c94e2d64939f1f1f83f51b338e44defdaa766e0dadd6b9ec01c0b4a013a815299905789 SHA512 7518408c5591ced1e373795062897d27e1dbc514216cf8ef342b6d29e91418966b9f9ddbc6afe08aad4f2369d588f0e7df62fca27c5a85be7faf75a8e587b458
-EBUILD selinux-android-2.20200818-r2.ebuild 432 BLAKE2B e1b099932bc1d71eef4c677ba6af8436605e75c67a799dfb25aeb34f6e77566a2fee4feb282787b66743900a16d772dffe7ffbd3bb3b5359a528d2f01ec47ecd SHA512 a32133a02bcbb16dc6ae42f929f76575b8bedfc00ac744e8aa97ad2b8f85c5f8a603d94a4b84c34a2f17081851b4fda61cee92dd6f635ce422f1a9772ad11f59
+EBUILD selinux-android-2.20200818-r2.ebuild 430 BLAKE2B c04643209e2ae91a0cccd5a355c3b81620803424d8ff25ecc64132a5a45463d772919f2c83cbf3174704a1ed50b2e86e9cf68ea0093050d8ea5e8fcf6353c671 SHA512 09c3d1bd151db3ee1751d5c1f66aca1a026f855d71749c2e3566511a4c1db881a709c69cc7e53a02fbea38ad93e2ea17c6fcde7e42ac474580fdecd419a175e4
 EBUILD selinux-android-9999.ebuild 432 BLAKE2B e1b099932bc1d71eef4c677ba6af8436605e75c67a799dfb25aeb34f6e77566a2fee4feb282787b66743900a16d772dffe7ffbd3bb3b5359a528d2f01ec47ecd SHA512 a32133a02bcbb16dc6ae42f929f76575b8bedfc00ac744e8aa97ad2b8f85c5f8a603d94a4b84c34a2f17081851b4fda61cee92dd6f635ce422f1a9772ad11f59
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-android/selinux-android-2.20200818-r2.ebuild b/sec-policy/selinux-android/selinux-android-2.20200818-r2.ebuild
index 6b9ea4faa9bd..3af7cf700e70 100644
--- a/sec-policy/selinux-android/selinux-android-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for android"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-apache/Manifest b/sec-policy/selinux-apache/Manifest
index 5c65664d8a4d..92a693fb6de9 100644
--- a/sec-policy/selinux-apache/Manifest
+++ b/sec-policy/selinux-apache/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-apache-2.20190201-r1.ebuild 379 BLAKE2B 36558ca470930505a64bcfa6c6235bf17d6cf438f359ca5ddd4a08722348dcb27850f124d25192a6038c06c4944b1de14994a744119bc07ed30318f0b7ab0cca SHA512 eb33fac406e22f4c5849b6c87562d8f6e30ad45c3a33c7f878f5df229510912d388dfa79342182764660fb4b7b3acf911c04887330a6cad4f0c97431db16d97f
 EBUILD selinux-apache-2.20190609-r1.ebuild 379 BLAKE2B 36558ca470930505a64bcfa6c6235bf17d6cf438f359ca5ddd4a08722348dcb27850f124d25192a6038c06c4944b1de14994a744119bc07ed30318f0b7ab0cca SHA512 eb33fac406e22f4c5849b6c87562d8f6e30ad45c3a33c7f878f5df229510912d388dfa79342182764660fb4b7b3acf911c04887330a6cad4f0c97431db16d97f
 EBUILD selinux-apache-2.20200818-r1.ebuild 381 BLAKE2B f183cfb7d7edc44c9e8f08acea7a03b40c2bb838bf9013893f98cc86daba955fae6b0feb460c7aecdf011cec2e7bab852538d20b42bf8c241edfe383eccd1f76 SHA512 134f153c2d30c23e4a03c2e74cf314f10d8041e9cb8a2dbf43d3a9cffcda7671a866a944a092a464617f4f22f5b9f80c7b34269a3798ab9799f68a66ab04f927
-EBUILD selinux-apache-2.20200818-r2.ebuild 381 BLAKE2B b1f40c075a62fcf2b6eb92a77e2c8d749d6f75b3a91d2fcadc9b57d01c6ccfb3fecd23118eb6bd6ca190afda35e66d9c32c8c15cdffd260101ead19b8accc4a9 SHA512 943b54e0d61676c7651d8ec078370350e0542d1cf08231961ee80cd6d98798cb27820317085c16173b925facca4e52f77f90c88126a0a03ade35583fa0770130
+EBUILD selinux-apache-2.20200818-r2.ebuild 379 BLAKE2B c9f778b694267fcb8afb58887c85fd6a7f0bab23b8cb1736b21012ee4d8b8fb960305b5b0856523c2f853e86523e6ecdaa4117065f3838639df8a6a882b5608f SHA512 55ec492705bd99a54d0bf100422e406d077a06f894877f83e7767880fe146cb6346c5d5d94f77aef64cc307e820523303996be5c69cb118820523af61dcbc7b4
 EBUILD selinux-apache-9999.ebuild 381 BLAKE2B b1f40c075a62fcf2b6eb92a77e2c8d749d6f75b3a91d2fcadc9b57d01c6ccfb3fecd23118eb6bd6ca190afda35e66d9c32c8c15cdffd260101ead19b8accc4a9 SHA512 943b54e0d61676c7651d8ec078370350e0542d1cf08231961ee80cd6d98798cb27820317085c16173b925facca4e52f77f90c88126a0a03ade35583fa0770130
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20200818-r2.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20200818-r2.ebuild
index b3a15415745e..72dceb47052f 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for apache"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-kerberos
diff --git a/sec-policy/selinux-apcupsd/Manifest b/sec-policy/selinux-apcupsd/Manifest
index 3952a0c51976..c7e612881262 100644
--- a/sec-policy/selinux-apcupsd/Manifest
+++ b/sec-policy/selinux-apcupsd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-apcupsd-2.20190201-r1.ebuild 377 BLAKE2B bb5075b0fc2e5aded13dcb5b9dd1c514acf49e6213fd66ef184290daad54bc1100c9dfba4674c55b09338bed71a4e4d3c515ee5916fc09e224812fa5ff5fdb0e SHA512 2d7ce7bef91f9fe9db6a623127ac003e84de5c530dede9df7b70805fcde2e20f25be0d11be0fbf1ce180e6f0443d56b6dbda38f322099cdfcaf090916d751194
 EBUILD selinux-apcupsd-2.20190609-r1.ebuild 377 BLAKE2B bb5075b0fc2e5aded13dcb5b9dd1c514acf49e6213fd66ef184290daad54bc1100c9dfba4674c55b09338bed71a4e4d3c515ee5916fc09e224812fa5ff5fdb0e SHA512 2d7ce7bef91f9fe9db6a623127ac003e84de5c530dede9df7b70805fcde2e20f25be0d11be0fbf1ce180e6f0443d56b6dbda38f322099cdfcaf090916d751194
 EBUILD selinux-apcupsd-2.20200818-r1.ebuild 379 BLAKE2B a65f3a50738e296932dda5faf14cc4d4d5ab08f1a1d5dbf3df479a9a0d711c8d6def04a8de59fbfd859f901bb3cab9277fef9d76c1879270b8f0075f816c3584 SHA512 129b0d912e2db5050b138fe60c60b8d1331ba8ea6c06717f6ee0aa365a2332d5dc2ac6fb87372098c4dcfa975aad38ffa47397841df6141c019116b171be0d6c
-EBUILD selinux-apcupsd-2.20200818-r2.ebuild 379 BLAKE2B 8bb56c2c58d4d96b6a1a632825c4478f37f670e3a0c9cfb62cd923b2e2ebfc1338c7b5fd7569d836661f0c6af92c698eabe0c32ff66f5d22a42caa393716686f SHA512 bea6eb0da3d989975fe20a9c597f2adc0baeb32cda837b0e4fc09f0c8e4291c3ce16cebd473a1c1bbb0bab7e939abb37acdf9cefe756f6f893a7177a7f55becd
+EBUILD selinux-apcupsd-2.20200818-r2.ebuild 377 BLAKE2B 68673f24583f685febe0813d91642f2de7a6a1582279fce451f3bc1b6ee64457990883dffab8d39ac68b35851e83ca05c451f3824d0240ddca9633a41ec4487c SHA512 9c3986c8afa01b8f01c23502121347820954bc9a1eae56004022fa9bc886b64e4372a66a02d57ec64492d149cc2fb257a0bd43dc9f2bd1a52896b64a97f4b0cb
 EBUILD selinux-apcupsd-9999.ebuild 379 BLAKE2B 8bb56c2c58d4d96b6a1a632825c4478f37f670e3a0c9cfb62cd923b2e2ebfc1338c7b5fd7569d836661f0c6af92c698eabe0c32ff66f5d22a42caa393716686f SHA512 bea6eb0da3d989975fe20a9c597f2adc0baeb32cda837b0e4fc09f0c8e4291c3ce16cebd473a1c1bbb0bab7e939abb37acdf9cefe756f6f893a7177a7f55becd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20200818-r2.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20200818-r2.ebuild
index 0fa672fcf499..8317d28cc7f1 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for apcupsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-apm/Manifest b/sec-policy/selinux-apm/Manifest
index 1f2752190d20..c50b23020a8e 100644
--- a/sec-policy/selinux-apm/Manifest
+++ b/sec-policy/selinux-apm/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-apm-2.20190201-r1.ebuild 808 BLAKE2B c4f9ba1fc2f34b80cb11dc45f21239016573322eac5df244686a4e5ea6d015bdeab1946e31ff99ee16dd615fbf3db8ca6ac387b8d3e2f8c73e7c10cccff2e4ed SHA512 01209694444ee9adea602122901a37e90b93ada6c40e254a8e68de45ab12c410baca2eacbcbf84c8effa3329897aff765624b2df59807882042d96625168756a
 EBUILD selinux-apm-2.20190609-r1.ebuild 808 BLAKE2B c4f9ba1fc2f34b80cb11dc45f21239016573322eac5df244686a4e5ea6d015bdeab1946e31ff99ee16dd615fbf3db8ca6ac387b8d3e2f8c73e7c10cccff2e4ed SHA512 01209694444ee9adea602122901a37e90b93ada6c40e254a8e68de45ab12c410baca2eacbcbf84c8effa3329897aff765624b2df59807882042d96625168756a
 EBUILD selinux-apm-2.20200818-r1.ebuild 810 BLAKE2B 513b44fba06a110537e6637be7d8f629978c5b582690fb3dd558c78e42035ca52bb6ed7a81eecff4953695277c35ca68250e50363311f92087ec63d0033b9f0f SHA512 7c3fc20ad544e4eb4429c1bc8617499d6c641added7b5855fcc747bdb89172d54ecafe54669f9db8baf4f1ae3fcc2f35fd4a53442bf20eadcef82d9f25516cb4
-EBUILD selinux-apm-2.20200818-r2.ebuild 810 BLAKE2B 00591e2f451478142765ffb7400dc3ae015fa223dd6db5b6d7377e143fc1c4ba4850d55460ca5d581fd8eb9fa54b282062db5055500ad8ffd551494b106a2eef SHA512 04c3288366f1c924b620c4e57117d906aebfce299484d9e94e30b1bd034a4523eef27c80961bf14bc6a261fac64fdaa2599f67e14b5faf3edb17b9dc756365f8
+EBUILD selinux-apm-2.20200818-r2.ebuild 808 BLAKE2B cbfe1c2fd10351378b1b47d1aa0e6d8cd448114c057458cad7e50095d898196a00caf759ca8747eb14b5b1c89febb30265e2585cc05b60ae6bd5ce9c5d337db9 SHA512 2a939b633f11a84a803a1783b8f03e142474ff91bc588ca46f8cc42f1865f1f11f14ed771312962812e299ee17f4e9b7edc78ee8086d43cd30e9d9077f75cf31
 EBUILD selinux-apm-9999.ebuild 810 BLAKE2B 00591e2f451478142765ffb7400dc3ae015fa223dd6db5b6d7377e143fc1c4ba4850d55460ca5d581fd8eb9fa54b282062db5055500ad8ffd551494b106a2eef SHA512 04c3288366f1c924b620c4e57117d906aebfce299484d9e94e30b1bd034a4523eef27c80961bf14bc6a261fac64fdaa2599f67e14b5faf3edb17b9dc756365f8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20200818-r2.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20200818-r2.ebuild
index 76cb4cab5a51..4061ca02c087 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for acpi"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 pkg_postinst() {
diff --git a/sec-policy/selinux-arpwatch/Manifest b/sec-policy/selinux-arpwatch/Manifest
index 73d2afd2c151..4b6a1565eb0b 100644
--- a/sec-policy/selinux-arpwatch/Manifest
+++ b/sec-policy/selinux-arpwatch/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-arpwatch-2.20190201-r1.ebuild 283 BLAKE2B 9d19ad02c822a4d6e5d85cb2023731f782765325731d0afa634878b807aa57b5dfeefe2181502c30b5ae71e79a1cf5214acfb8f444a2024ac240c54630a9f93b SHA512 6b2af7001ee854372e4cdd4896067141568584b7649caca6094e79a65967465c6cb231c80b5c3dfe415f900613a18aeeac4d82cceea9490451f2c7878c7822ec
 EBUILD selinux-arpwatch-2.20190609-r1.ebuild 283 BLAKE2B 9d19ad02c822a4d6e5d85cb2023731f782765325731d0afa634878b807aa57b5dfeefe2181502c30b5ae71e79a1cf5214acfb8f444a2024ac240c54630a9f93b SHA512 6b2af7001ee854372e4cdd4896067141568584b7649caca6094e79a65967465c6cb231c80b5c3dfe415f900613a18aeeac4d82cceea9490451f2c7878c7822ec
 EBUILD selinux-arpwatch-2.20200818-r1.ebuild 285 BLAKE2B 5a436d2367e816acac8f1f9759354e6f8714b35d6684b17bc78568a89a7076c33aea14aaf7282d90da85e2f8ff89ff903f717a65e9890b8dd597a564fdd5d61c SHA512 8ef8a511399f9613471768f7c9143954e012f949dd977a1e2a0863ac02e94e98b007c7ad97fc0e90b334d5596fad8dd7ed024328a72f074ede4706da10640d31
-EBUILD selinux-arpwatch-2.20200818-r2.ebuild 285 BLAKE2B aaac5ec5f69cd33c00484e93b52f43a191cb641ed66f7e02897fc8a8185e7c11ffc07dce09cd3d20e9230cdad1cccffd1ad95e086fdc4aaa4b5fd8cbb9b55071 SHA512 2d7ebaf6fb3bc7c90ca19188454d07ee61b0124ad361606e5b4dd11542f8dc70e00746af60b2a1c048cd35d2305472f3892053c3bb073008bc317fb73d80ba76
+EBUILD selinux-arpwatch-2.20200818-r2.ebuild 283 BLAKE2B a288be50ebd324afe768fd297b9629d73583296f6dbf0de65328e8a23f5a31838cfb9e4129141c007e7655d7a85784942ab5d5d220a6ff7797e9ed450e91bb88 SHA512 ee2f05c48c74643b2f1b6967f2f8c4e7ab0a792befeed98208f40c1e7258c7fb255773c9c311d748495dc4d1c8f00d94120f855eb71778c03ff3ffc70ce6df80
 EBUILD selinux-arpwatch-9999.ebuild 285 BLAKE2B aaac5ec5f69cd33c00484e93b52f43a191cb641ed66f7e02897fc8a8185e7c11ffc07dce09cd3d20e9230cdad1cccffd1ad95e086fdc4aaa4b5fd8cbb9b55071 SHA512 2d7ebaf6fb3bc7c90ca19188454d07ee61b0124ad361606e5b4dd11542f8dc70e00746af60b2a1c048cd35d2305472f3892053c3bb073008bc317fb73d80ba76
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20200818-r2.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20200818-r2.ebuild
index c48b8c459bdd..d075481a7429 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for arpwatch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-asterisk/Manifest b/sec-policy/selinux-asterisk/Manifest
index 896ceb899059..42051a70a996 100644
--- a/sec-policy/selinux-asterisk/Manifest
+++ b/sec-policy/selinux-asterisk/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-asterisk-2.20190201-r1.ebuild 283 BLAKE2B 93b625c04e045d6b0e5abb4936ec00dcc712ecfa744cf08c98b4212a0d0076a1af05525d7aea7c98da6f51372e5f8475f92b91b45a6e9e9ff6da8b9b5acac819 SHA512 b4b7915b3b0061b73c0a7873502a9ba7157473073a4efe98e74314f17fe28d5a623a31ecafa2bac7affdf0ea178518e5583f93bb62a743c2ce065e42f810fd16
 EBUILD selinux-asterisk-2.20190609-r1.ebuild 283 BLAKE2B 93b625c04e045d6b0e5abb4936ec00dcc712ecfa744cf08c98b4212a0d0076a1af05525d7aea7c98da6f51372e5f8475f92b91b45a6e9e9ff6da8b9b5acac819 SHA512 b4b7915b3b0061b73c0a7873502a9ba7157473073a4efe98e74314f17fe28d5a623a31ecafa2bac7affdf0ea178518e5583f93bb62a743c2ce065e42f810fd16
 EBUILD selinux-asterisk-2.20200818-r1.ebuild 285 BLAKE2B 11e4887af431c55b4d50378eba5fb3e1655483c317b5bb83839b985f7040cfc8d729db5b06db223518327e47dd3cea745b1dc52866ed57c8def03813db41f1e5 SHA512 1a8913b206060f0e01d128d9d697f93ee27aed8756a026c58c61784702d3e59c8e0b8edde82d5ba3e16a145a05e44308c9924aac23f4c770ff4cef63d11ae693
-EBUILD selinux-asterisk-2.20200818-r2.ebuild 285 BLAKE2B 226f209fd69a2ef47636a3d7b434ad8960e1cafc91c85b86007ceb8cefb77dba48924cbba0212c4ebb0e8d03314c61398e93ea230e6d246d2ccd69287ce650c5 SHA512 f32e0a30c6046939a2292ea5d49f17cdc31d937c0f17aff73c53cacfb6e99dcf75106a2dcf9c8e1e620c1b1f18d9d9ff246e05efc7588f489b9605e55a67b3cd
+EBUILD selinux-asterisk-2.20200818-r2.ebuild 283 BLAKE2B 1f2cf709407b8285455dfe11ad16b9a8dee6c56568e85ef81e34ed90b17ea4a8822d94ce62079e0852f4f21ce78c9af0c30b3287c2d600e973c1f3206c7316bd SHA512 6704ac87620d1a49fe287c73e9ed8c53f8a4ac6e0e8ba33028343c6b6d7b51e8dadd17a54541580bc8c50014957b221bf4e42facd9346106ddfc81c56cf8b423
 EBUILD selinux-asterisk-9999.ebuild 285 BLAKE2B 226f209fd69a2ef47636a3d7b434ad8960e1cafc91c85b86007ceb8cefb77dba48924cbba0212c4ebb0e8d03314c61398e93ea230e6d246d2ccd69287ce650c5 SHA512 f32e0a30c6046939a2292ea5d49f17cdc31d937c0f17aff73c53cacfb6e99dcf75106a2dcf9c8e1e620c1b1f18d9d9ff246e05efc7588f489b9605e55a67b3cd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20200818-r2.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20200818-r2.ebuild
index ce10eada2117..fc00e375615a 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for asterisk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-at/Manifest b/sec-policy/selinux-at/Manifest
index 25b0b9ffe868..e0efe11e194e 100644
--- a/sec-policy/selinux-at/Manifest
+++ b/sec-policy/selinux-at/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-at-2.20190201-r1.ebuild 271 BLAKE2B f3661f959b87fa726519c25fdc8c65e34d731256d31f73d7b623dacdee32a8ff5a17f781d63ed185d8ae9a152ec7edad2cd4ac00dc6d53e19af08f34e711a5b5 SHA512 1cf3770b458decb3117d041cc3515cc247d904523e6800c39bd978226129e2de43505e467c310338c5c053d2d781ef7a06ae843887d1d4d3c23b0fb6d5253fbf
 EBUILD selinux-at-2.20190609-r1.ebuild 271 BLAKE2B f3661f959b87fa726519c25fdc8c65e34d731256d31f73d7b623dacdee32a8ff5a17f781d63ed185d8ae9a152ec7edad2cd4ac00dc6d53e19af08f34e711a5b5 SHA512 1cf3770b458decb3117d041cc3515cc247d904523e6800c39bd978226129e2de43505e467c310338c5c053d2d781ef7a06ae843887d1d4d3c23b0fb6d5253fbf
 EBUILD selinux-at-2.20200818-r1.ebuild 273 BLAKE2B 199981d2d3e468c06c9a29c00871ce22bc8208842688966640bdec7d4f1fde113cbdbaf4d4300b23182bdf8f78ef38ed3cff6afb46941c0ce0640addc96d8f00 SHA512 3005ab546f0ed220323274302ee1d13be79f38e0d926bf4265e40517279669a96bc104345653c17ebb83927fd85d5a190a4d3357116f2281025be4a0eb98338c
-EBUILD selinux-at-2.20200818-r2.ebuild 273 BLAKE2B 875c97c5823d88f2c8499e7abfbdbb91df694d9efb82349721cf9d184c63c584108eb0c36fbe21fa0988b7d19743b21d420b00fa60772bb3a55ef45222dc62c6 SHA512 d6815744dc4f38e2bc32b456ce6c2319b828ccc2e32ea48c0e09e02822ce18934bee422b39a705b87c368083387ca2f431653e9e72cf61bf81ccf1dda34d6be9
+EBUILD selinux-at-2.20200818-r2.ebuild 271 BLAKE2B cf16080c3891d92e386146b19975da418885b5ba6b5e7f2afae95aeb09d0cd14b5fb8731e9d03e6d980f70f9bb5430b19b5e308a86cf7467bec032e0d1b8c2b1 SHA512 e90e1a6f8b1f426e416ab8df722cdbec42e2de1d6960d4bc8ecf15f2c533f7263d1bd400f8f7de1e3029d2d7c2423474f65ddc9e1485a8b8a204f3ffd2090dc5
 EBUILD selinux-at-9999.ebuild 273 BLAKE2B 875c97c5823d88f2c8499e7abfbdbb91df694d9efb82349721cf9d184c63c584108eb0c36fbe21fa0988b7d19743b21d420b00fa60772bb3a55ef45222dc62c6 SHA512 d6815744dc4f38e2bc32b456ce6c2319b828ccc2e32ea48c0e09e02822ce18934bee422b39a705b87c368083387ca2f431653e9e72cf61bf81ccf1dda34d6be9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-at/selinux-at-2.20200818-r2.ebuild b/sec-policy/selinux-at/selinux-at-2.20200818-r2.ebuild
index 499b6e8a59cf..9a9eea882df5 100644
--- a/sec-policy/selinux-at/selinux-at-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for at"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-automount/Manifest b/sec-policy/selinux-automount/Manifest
index 54a8b4065a22..6a02c562b927 100644
--- a/sec-policy/selinux-automount/Manifest
+++ b/sec-policy/selinux-automount/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-automount-2.20190201-r1.ebuild 285 BLAKE2B 3d1c9921d4bedd2489f52b85588ed5d8767eec537c194c1cff37e4b2ae6e601024108d6871f6f844a2920cc15626f76532c67ac4a8122f876cc3db4ea3efc1cf SHA512 2c3e5576601740933d185f51c4fb12e06666412ef86c1f9b453b4e9d62bce18e193b1b851214b2cdf949d558bfdc60b89c098268140758b4ad68456c3d447021
 EBUILD selinux-automount-2.20190609-r1.ebuild 285 BLAKE2B 3d1c9921d4bedd2489f52b85588ed5d8767eec537c194c1cff37e4b2ae6e601024108d6871f6f844a2920cc15626f76532c67ac4a8122f876cc3db4ea3efc1cf SHA512 2c3e5576601740933d185f51c4fb12e06666412ef86c1f9b453b4e9d62bce18e193b1b851214b2cdf949d558bfdc60b89c098268140758b4ad68456c3d447021
 EBUILD selinux-automount-2.20200818-r1.ebuild 287 BLAKE2B 55c1a4bfcff3009adc170b000b38dcf32bc0c300b419495134bf7ebc0ebf2f7388d59eaa18f208a1cd4117fa9844be78cec1e7f53d12f60852c66851d9a2f811 SHA512 19a3c301506685196794930314ce7cd5bb3fd148079fe938f3797105e87adf1328d69464ec3a332536a4c112503c8ec38cd8e6c1cdc264479b7ccd31082263d5
-EBUILD selinux-automount-2.20200818-r2.ebuild 287 BLAKE2B 9ccd6ec738f97fd66c8a81e0ea10ec86b96644b3cc189371f65b12e9c999bf43f1888ec505649c73ccf819233006aee8e1d56a6e767f6666aa87ce92d42a2dad SHA512 f50413591613a691a69b3f6ae644f736885baee72466985281c62533039f59bc2aa44efec32035b5f748fa502cee373ff7e9c00dfdeda9ca9a63882b4d39e32c
+EBUILD selinux-automount-2.20200818-r2.ebuild 285 BLAKE2B 38815054c843a7022636ab33752d2f246e818f4c05f96f33ffe4fa4002bd1c5786294295c0f08fa82e3b12b5eac3fac9c74f865610ce36272116e009c673de3a SHA512 75c82e3eb48abc3ace7a3b73c95a8713c6e3bd9eb980ce3314e7aa487db3b633c6414745cec478cce63dd885aecbd73599b8c77c65b4dcc7debd57a402c27f9e
 EBUILD selinux-automount-9999.ebuild 287 BLAKE2B 9ccd6ec738f97fd66c8a81e0ea10ec86b96644b3cc189371f65b12e9c999bf43f1888ec505649c73ccf819233006aee8e1d56a6e767f6666aa87ce92d42a2dad SHA512 f50413591613a691a69b3f6ae644f736885baee72466985281c62533039f59bc2aa44efec32035b5f748fa502cee373ff7e9c00dfdeda9ca9a63882b4d39e32c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20200818-r2.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20200818-r2.ebuild
index 85956635625d..a58e42de1d95 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for automount"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-avahi/Manifest b/sec-policy/selinux-avahi/Manifest
index 5902c4469dad..c936efebab13 100644
--- a/sec-policy/selinux-avahi/Manifest
+++ b/sec-policy/selinux-avahi/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-avahi-2.20190201-r1.ebuild 277 BLAKE2B d48491fb1fd3ada5a956c422de2f2ee96356c771da92dc7ff1b2c3b26b5761a6bea25b558c5dc6714a265f17fd5551429421480cd7bb38ecb19a08d931ef5380 SHA512 2c36ce70351544e3ec3b411d165240004425a1d1415607208091558fbb5ec0a9ab3e9292f5c6d173c7c33059a29b14433f3d1f6ffcddab7a2ff178068f1a5fa8
 EBUILD selinux-avahi-2.20190609-r1.ebuild 277 BLAKE2B d48491fb1fd3ada5a956c422de2f2ee96356c771da92dc7ff1b2c3b26b5761a6bea25b558c5dc6714a265f17fd5551429421480cd7bb38ecb19a08d931ef5380 SHA512 2c36ce70351544e3ec3b411d165240004425a1d1415607208091558fbb5ec0a9ab3e9292f5c6d173c7c33059a29b14433f3d1f6ffcddab7a2ff178068f1a5fa8
 EBUILD selinux-avahi-2.20200818-r1.ebuild 279 BLAKE2B e9bfbb8642a5d051af7cf64d66fc027e9e1cfbb84212f2fb1cf2d4e65ee47285c5b4b983c81bd1fb1273cde2f4df3af62c47c8d1c5609d06a6a0b83c0f1438a5 SHA512 986b5846239b1ed30f35e1c30a01ff8be2b0a5fa35d837be2f6275aa931e5edc98d76f3f0e390ba8a156f79c59f82eeebd7241eff5754d01df1e199dd88f529d
-EBUILD selinux-avahi-2.20200818-r2.ebuild 279 BLAKE2B 9bb8d85cdb5baa325e0ad95d840fcd7d3643de64e3e9fab70dfe6c9fbfc6c36b74e72a818cddea73f4c62098b187039ab3bab28daabae87c7eed1b924fb026bd SHA512 c05291fc289f1737abcca32b4437947c689a7440b68b34ca9a64aab6c6b0133241166fda950bbf0327c762d06631ea1279f3c559fc295c28fcb49e41a540d0f6
+EBUILD selinux-avahi-2.20200818-r2.ebuild 277 BLAKE2B 9f72d37eabac0a5fec451dfbadeb81a51454e2d61afbc5783378eccbd79d1ff9f6d866d34e79220bfd451301395d9244b99003dbe73423d8fa4a2ee27ae37c94 SHA512 a3812a4b01f800254bb609e8cc0aebe4e38a88cf1cf161a906d71713cd3a3e6b230f7b3b55f168f0bf01b28ef2793dca51371ad9b5ac0623a516b4a093b02ac5
 EBUILD selinux-avahi-9999.ebuild 279 BLAKE2B 9bb8d85cdb5baa325e0ad95d840fcd7d3643de64e3e9fab70dfe6c9fbfc6c36b74e72a818cddea73f4c62098b187039ab3bab28daabae87c7eed1b924fb026bd SHA512 c05291fc289f1737abcca32b4437947c689a7440b68b34ca9a64aab6c6b0133241166fda950bbf0327c762d06631ea1279f3c559fc295c28fcb49e41a540d0f6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20200818-r2.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20200818-r2.ebuild
index c0da7c305098..ce350361b2e5 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for avahi"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-awstats/Manifest b/sec-policy/selinux-awstats/Manifest
index 10d5c0ad864a..044422c85861 100644
--- a/sec-policy/selinux-awstats/Manifest
+++ b/sec-policy/selinux-awstats/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-awstats-2.20190201-r1.ebuild 377 BLAKE2B 3d4a5f5d6e48db884a4d596405b1abfd01faea79004468d33999d896a63d89ef375b10abd7f5e0620f87120e5c158667c1f0e819cc53fb90b6b95dc2f19aad7b SHA512 126be7bf7977438ad5f73bba0863eb20eff1196efe80ced56c0ecd80c6da9bfd65fcc23425d17a6dba2d87b126b15853440cd0a608c099557bb90a5b6a8f5a36
 EBUILD selinux-awstats-2.20190609-r1.ebuild 377 BLAKE2B 3d4a5f5d6e48db884a4d596405b1abfd01faea79004468d33999d896a63d89ef375b10abd7f5e0620f87120e5c158667c1f0e819cc53fb90b6b95dc2f19aad7b SHA512 126be7bf7977438ad5f73bba0863eb20eff1196efe80ced56c0ecd80c6da9bfd65fcc23425d17a6dba2d87b126b15853440cd0a608c099557bb90a5b6a8f5a36
 EBUILD selinux-awstats-2.20200818-r1.ebuild 379 BLAKE2B 3caef8ead01db411c45171f0c864ae53805dd0380d4485b3b9467e54e4453b840726182873248663f2a27d944e2c55b73a863e9606231a459d3c54e18714fbd6 SHA512 1d33c442e16cdd30a03d1ca7622725b316c95f59e5000415385197e7932c481b6db9f176456870682bb7f162d3d5d6dc523889a06bcaa64f0f8f6187cb0bb14b
-EBUILD selinux-awstats-2.20200818-r2.ebuild 379 BLAKE2B 1429f6cf4b44107c83a8e4f2d15976cdd56562dde1565e00e22dcc21997e55f77a041e3284c646d13b52f443bb18cbc1a52a9e0fa8fa002fba39b89a1de8d9e0 SHA512 8e05a9209b04f7b6b3d84aa55c8fff978bb73828919d1b7e0a4f6170eaa77977f0738b2122d1eeb04afe435ad801e089ad86c042e5ac49ddcea54dca8a5324b1
+EBUILD selinux-awstats-2.20200818-r2.ebuild 377 BLAKE2B 75da0e49dded471a7ae60a85a0d9f02745cbbde72f85cfd1ef60013d7415f522cdceb3c53ecbbf37f148d0986d5d266219dda1950e827c790a0285049c2acbe1 SHA512 211f7619085777329aca12c6723cb4731c814acd5f8a39f9bfe4de294d7ab32265c50f08dccc58026bfb8968306d4e93f49fb76d3296e87ad088dd5a998ac7c1
 EBUILD selinux-awstats-9999.ebuild 379 BLAKE2B 1429f6cf4b44107c83a8e4f2d15976cdd56562dde1565e00e22dcc21997e55f77a041e3284c646d13b52f443bb18cbc1a52a9e0fa8fa002fba39b89a1de8d9e0 SHA512 8e05a9209b04f7b6b3d84aa55c8fff978bb73828919d1b7e0a4f6170eaa77977f0738b2122d1eeb04afe435ad801e089ad86c042e5ac49ddcea54dca8a5324b1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20200818-r2.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20200818-r2.ebuild
index 8dc833df16bd..d5f65803a5b9 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for awstats"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-backup/Manifest b/sec-policy/selinux-backup/Manifest
index 3a38dc09ff1d..f8924aae97e4 100644
--- a/sec-policy/selinux-backup/Manifest
+++ b/sec-policy/selinux-backup/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-backup-2.20190201-r1.ebuild 292 BLAKE2B 42e280b68026e2adc49ca0a8636a001c5255cdd7be6528ae03985a58a1ae5263ded8949ac004170b12ea4ba427bbc3f67aca8b8e246227ba604337e4de355c33 SHA512 a11da8d59f5b21bb7aa276dae15aaf8c36788ab08a2829755ed81b861f789f42098390ab8314829f8ef6ce6ab64ba82734d3c310a6396ed672f2fec6bbda4552
 EBUILD selinux-backup-2.20190609-r1.ebuild 292 BLAKE2B 42e280b68026e2adc49ca0a8636a001c5255cdd7be6528ae03985a58a1ae5263ded8949ac004170b12ea4ba427bbc3f67aca8b8e246227ba604337e4de355c33 SHA512 a11da8d59f5b21bb7aa276dae15aaf8c36788ab08a2829755ed81b861f789f42098390ab8314829f8ef6ce6ab64ba82734d3c310a6396ed672f2fec6bbda4552
 EBUILD selinux-backup-2.20200818-r1.ebuild 294 BLAKE2B 4e02c0c82bfc9062eb486c9c61e2374911734d8d4b796dd49e98e46f0f53bdcfed5d03468ec2ef3aec4090f27b6582eeaf85c3578ea7311976daa2abfce541ac SHA512 a70ee8947bddf4296fc88f2b71b0239b1fbd67c1a1c4b32dec613ea3e6140712f7f4b1c877cd17efd18f685554da7ef5c05df234ae0dbf093ed1608974b5c041
-EBUILD selinux-backup-2.20200818-r2.ebuild 294 BLAKE2B f0a0927469c938140f5feed6ffb551585a7a74668dc1b27ef2274fc8de1657b9a3a36484d9f81ef7c34b9ce574ae77e3f964e0f0ac2fd96861d26014536df89b SHA512 9fbf3452b61e662cf20a79915333eb79920471c5de356335f75a4a933435d3647c0bbcd032783b5f010bfe50f9403719fce3b214be6044a32cbe216102abfff4
+EBUILD selinux-backup-2.20200818-r2.ebuild 292 BLAKE2B f4f2f6de75e9d5aca90c9ea268389cebbefd2fdb39d5e1ed458ecb298f0a42ca606661a4b1933c3e999be557d15cd1e101728cb81de5878a1f039b30d1d294ee SHA512 07e8360897fbba80d66081f384d30b2ab3897f7626ba118faa06f9bf7e21d62c9ede69ca2dfe1fb74a3060a049f7cf7d39d275cb14533cf39c5769d325c2edac
 EBUILD selinux-backup-9999.ebuild 294 BLAKE2B f0a0927469c938140f5feed6ffb551585a7a74668dc1b27ef2274fc8de1657b9a3a36484d9f81ef7c34b9ce574ae77e3f964e0f0ac2fd96861d26014536df89b SHA512 9fbf3452b61e662cf20a79915333eb79920471c5de356335f75a4a933435d3647c0bbcd032783b5f010bfe50f9403719fce3b214be6044a32cbe216102abfff4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20200818-r2.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20200818-r2.ebuild
index 05ab5475cc20..4edac21a9ec3 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for generic backup apps"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-bacula/Manifest b/sec-policy/selinux-bacula/Manifest
index b37fd89a64ea..467783c641a6 100644
--- a/sec-policy/selinux-bacula/Manifest
+++ b/sec-policy/selinux-bacula/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-bacula-2.20190201-r1.ebuild 279 BLAKE2B ccf7096c37cd959aed23da04f857a165f4aac8ce0c7c680ce026fac8c099d74f6572c586caebcdb7453d62f7ea036e0ce136596133f85f287650a6c15fb33d55 SHA512 fcdb5421f3500eb3bdd46ceef56b0745e104e09e7c5306d12828f3cbb2a218fcbb315c7acab6a7703326f37c3b2b43018bbd8902fb488bac360ea4c79f7ed0b2
 EBUILD selinux-bacula-2.20190609-r1.ebuild 279 BLAKE2B ccf7096c37cd959aed23da04f857a165f4aac8ce0c7c680ce026fac8c099d74f6572c586caebcdb7453d62f7ea036e0ce136596133f85f287650a6c15fb33d55 SHA512 fcdb5421f3500eb3bdd46ceef56b0745e104e09e7c5306d12828f3cbb2a218fcbb315c7acab6a7703326f37c3b2b43018bbd8902fb488bac360ea4c79f7ed0b2
 EBUILD selinux-bacula-2.20200818-r1.ebuild 281 BLAKE2B d68f56a2e3865c99f2c2f4eda0efc0ae9161efa33a50305a56a9bfae0cbbbeb02356a227b38c0b204b6f09d46984701dfaa99be11cd8de36828dabb0ea41d695 SHA512 13f56ef4725b7bb5b3548e4866e70e47578457badb388c4f373cb30baa804211256ff104559ebe5a3272a715831d8ac7e0f5765f9249de43e79be6e805e170a2
-EBUILD selinux-bacula-2.20200818-r2.ebuild 281 BLAKE2B 6152370488d966d0beda01604f3cabdb058cb93c677529faded7ae9e7a545566b02599cb8b7f6bd8bf127df68a8b015f28d82adf3d812786e208a190cc18f9b7 SHA512 1c9269692abe12ff3b03a91ccb1273bec81f24cb98873d36c7f5566eab6333e212b5017387d1b7a4720e2210d8e0c97e093dbc6c23bd4ac02cec7683c220378f
+EBUILD selinux-bacula-2.20200818-r2.ebuild 279 BLAKE2B 9621e9d2dd16db339ed439d4a32a30bf780db06b824ad53687589452b34c541331bcb3a4ca8c44f361a6aeb3d848a3ea83b3be9546c86ae29231c41927c796b0 SHA512 82087747307b270b60fb5e2a03aa8f8acadd60157296bbd5495c0db9ba7e0d01cb483718182b1454b4ab5822e22fa1448bace218a91be1c4526c7d56279c4c1f
 EBUILD selinux-bacula-9999.ebuild 281 BLAKE2B 6152370488d966d0beda01604f3cabdb058cb93c677529faded7ae9e7a545566b02599cb8b7f6bd8bf127df68a8b015f28d82adf3d812786e208a190cc18f9b7 SHA512 1c9269692abe12ff3b03a91ccb1273bec81f24cb98873d36c7f5566eab6333e212b5017387d1b7a4720e2210d8e0c97e093dbc6c23bd4ac02cec7683c220378f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20200818-r2.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20200818-r2.ebuild
index c248629a129c..f25d8f3b0dea 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bacula"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index bc7baa485982..e1ecd50f9e0b 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-base-policy-2.20190201-r1.ebuild 3876 BLAKE2B 3fdf86914afa4ea4851b7a61011589e4f1fb2c20775ee260bdce26c3197ab9b1ad97c871a58c1ff7704f9ca23609def48f802167f1238773f9a2c4daab0e2b07 SHA512 03f531f3ce9d7646b9101a159cb96a091011a5a9215491ecc7fcadf7412814e30abb285de3939c7f0584232b540f61b9a1e3ebefbf228f5713da5de9ed9a553f
 EBUILD selinux-base-policy-2.20190609-r1.ebuild 3816 BLAKE2B a52fb08dc3d36042f251afe98c7894b955c3160890eb4eb84f0b69428a90b05d764b7b1ef12315cea44d5b00617b5747303872e906f67e68c28945cf48197d48 SHA512 cf062f6526826c9b7225ef3c8fe0a3b74da3905b35ba0a174328de422cfc383fbb6831dcbded65f876a956d66523bab39c89f5e23c7a5f80eebc5067ce72a550
 EBUILD selinux-base-policy-2.20200818-r1.ebuild 3818 BLAKE2B 78071157fd3f922bbd200d84027dfaefa39b66a0b294753027694183fec9adb45fa5faab31784432255cf12d767a01e2217a2e04950105e7a60d0a01d200f75f SHA512 a76925a23a78c805f3b21263dd80d3569deb10b82d8d86a67a617d83090984300447249bbf313999657bea180c58d833474b20b3e57c650abb4fd8365d9fde5a
-EBUILD selinux-base-policy-2.20200818-r2.ebuild 3855 BLAKE2B a73f84895229a688ae90c06f08f281ddb0ca8d947024468ad485a7ee3f75dd58f4547a80f9c02f5bbd78442a33bfa5bf192aa94e20b0829db5675fa4bffbb7df SHA512 dbe686f2132878b7e85255f9ee8c296ca625b8d77be0ddc5018be4ef49c2240ebedbf789157c96a3c74f94afb24cf0304353c23dc3480c0d4e64793f39ddcc56
+EBUILD selinux-base-policy-2.20200818-r2.ebuild 3853 BLAKE2B 2f2ea84e89392c4804f9b58091bbf507defbcd0c9b4fbfbfd90ef5e3210e623d7223477bb3321ed0f489ca555e2ace214db8d265d4f64b0d6140046bc2b85b2f SHA512 f97a595e9fce3c3d0e70502abcb62d602b0b67f91fe4400231aa9cf08edaad463203abe1a6505d1ca442d42232dac68520dfccd0f29a8b5f474c5977e251f99d
 EBUILD selinux-base-policy-9999.ebuild 3855 BLAKE2B a73f84895229a688ae90c06f08f281ddb0ca8d947024468ad485a7ee3f75dd58f4547a80f9c02f5bbd78442a33bfa5bf192aa94e20b0829db5675fa4bffbb7df SHA512 dbe686f2132878b7e85255f9ee8c296ca625b8d77be0ddc5018be4ef49c2240ebedbf789157c96a3c74f94afb24cf0304353c23dc3480c0d4e64793f39ddcc56
 MISC metadata.xml 534 BLAKE2B 1bb289204431150ae974c9fd677926faf72e75def3294b9df405a048e398ac3b6147de8483512487edaeea378e1dbd32df0675acb7fa50326c48382603c5dbfe SHA512 d8340bec9d0ec0feb396b17b53a6d53e3caa7ddd1efdc5e5de07baf86592ad0526d08fc08908295cf18a915eef1c7429c72970d56967162b2390eed6f28c822a
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild
index 5de9dfd5ff41..33b6548c3a23 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux"
diff --git a/sec-policy/selinux-base/Manifest b/sec-policy/selinux-base/Manifest
index 6b893ea0faf3..2b5aa40cb610 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -10,6 +10,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-base-2.20190201-r1.ebuild 4115 BLAKE2B e8aae442032d9bf13d7b731429a7509787ce473a624877e70cc533522e0f4e2f296a546280f0d3f1fd882186e57e990be5c74ae6fc2548b20f533f5cf39aacef SHA512 583881aeedce6e61f83678f64eb99e5779291436651bd4d8b74f16e7a4741915da48bf5e71eee34fab0aca3124864ff3dc763b9938acb64b4022c0ca0807301b
 EBUILD selinux-base-2.20190609-r1.ebuild 4148 BLAKE2B 4612b1f194d7635b8bf29c60f177ae4bec921b6ba5648d4d7ec0bdd322f3179cd4037d56d4f75857f80bfc9ae2f2362ab5b15ea300d015cc73c30834eb505bf9 SHA512 7c23345cb1dfb2b4206f05e5ce443fcd3ffba033ce14f9c176262b9f2a771cfab6a2c5bbb22a88809b650017f21fb6b858bd9709220320df0d2adf25c0a1a673
 EBUILD selinux-base-2.20200818-r1.ebuild 4150 BLAKE2B c557086ca49ab14a940f5b5e13b18cbbb827b3a914efe9959084d813acf8a3724f7f70a04f88b363f4a803e2886a8274b1cb0f380124565b34dff523d5a0a56a SHA512 ee0235f92adcf10fd5451d13df6be53174dbc7e84140e566e1ab9df2fec5c6f4bd1c712505e4fa4e7c374443aeb3a28f2fc3c55cd4b49ecc20626e4635ce25d3
-EBUILD selinux-base-2.20200818-r2.ebuild 4084 BLAKE2B e2529612cf08b38594ea10fdbe0cdb25f9189aeee6d56c3372a64d5a9de8f3662fc16640d285e64e646f9f8dcd730c6e86161a8da7a72658f209e09346b34991 SHA512 20d5668e233332f6e96a2e5d7bbb0a63cb0bdf943e253cdbc06fc17d4a2aa149d2abecf36efbd0e847386b7bfa669adca7d5d33dbe67d2fe36c7c584d755cbca
+EBUILD selinux-base-2.20200818-r2.ebuild 4082 BLAKE2B f6eab54aec21a2a93ee8b2301ab57e1fb5daa90c2169a5e3231adf63fdde0cfaf1ce1c046b74c019c75d4d23eab7f3df4aab65012a0b77b1fb0cb0049886c47e SHA512 ef6ab4e99691a71a3a63b64bfea2002b72b67101cc3e018d311c0cc5979ea2f47d5fe6182e0b99ea9a75330652244b2441d0d0e0492614fe2f0bc6c37823ee9f
 EBUILD selinux-base-9999.ebuild 4084 BLAKE2B e2529612cf08b38594ea10fdbe0cdb25f9189aeee6d56c3372a64d5a9de8f3662fc16640d285e64e646f9f8dcd730c6e86161a8da7a72658f209e09346b34991 SHA512 20d5668e233332f6e96a2e5d7bbb0a63cb0bdf943e253cdbc06fc17d4a2aa149d2abecf36efbd0e847386b7bfa669adca7d5d33dbe67d2fe36c7c584d755cbca
 MISC metadata.xml 967 BLAKE2B 1d3313048964e8b84c6386c24682735ba255897021b5d9df9739a4852864e092c6c8a42c86b91962274c22764661ff5f4f8c0c34edfbf52abe6ae8583f15fcdd SHA512 fc513a530a30b8114a5b9c02862939a4cdd2e123f370292bdc0399b161afdf4843f53c2a15b4bd505d2111496fc6354a54c408c9022137086a33385e5fa99541
diff --git a/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild
index 3be921e88deb..9eaddb863d20 100644
--- a/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild
@@ -13,7 +13,7 @@ else
 	SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
 
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 IUSE="doc +unknown-perms systemd +ubac +unconfined"
diff --git a/sec-policy/selinux-bind/Manifest b/sec-policy/selinux-bind/Manifest
index 7020e8d79755..3beb18f2f818 100644
--- a/sec-policy/selinux-bind/Manifest
+++ b/sec-policy/selinux-bind/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-bind-2.20190201-r1.ebuild 275 BLAKE2B a1d2e9d70e3118b2967086bd85035977cc4435fd172721313f104a4bc62b02512deb68bc3d746b78203264a733299904afb69be08f0a0f90cd1496eece7e7310 SHA512 21d9acda1af4769eaea00bc7c7947a20218b6f4183777cff937176ad607a1179519b0f23fad2b14572fc75dcdcebba07020ef1d5b1578216b05d9e016d9875da
 EBUILD selinux-bind-2.20190609-r1.ebuild 275 BLAKE2B a1d2e9d70e3118b2967086bd85035977cc4435fd172721313f104a4bc62b02512deb68bc3d746b78203264a733299904afb69be08f0a0f90cd1496eece7e7310 SHA512 21d9acda1af4769eaea00bc7c7947a20218b6f4183777cff937176ad607a1179519b0f23fad2b14572fc75dcdcebba07020ef1d5b1578216b05d9e016d9875da
 EBUILD selinux-bind-2.20200818-r1.ebuild 277 BLAKE2B af7405592f7afb739e095c5c5e3b184e7b70f367b0c56a08181724b4e44cc555b34d8abb5e5d180690f8f2170acf3d36637fccb0f878bae099eeb7c2a0e72bae SHA512 0c59d837e18f87ad3fbe406322116826f32e10c5bacf78b218431ca96091189701241a5090b645d51e28ad9c05b3ca052be7f548bdd8a95626a44b1bc01db91a
-EBUILD selinux-bind-2.20200818-r2.ebuild 277 BLAKE2B 9445c535f94a563e097ccdb32d017e3dbe413868d94debf11c9c8d16ea862e6528f2896cf21ae8cc9ee0862c8817488bd70ecd3d037bdac03f1e2a28110d124c SHA512 df526b178db329ccf4d0edae1f121986671fd332bdb29a52541ffeb7e8ab73e4a0dc515eedc5b39e5ab33fd66d25ad936deb64e08ef00c7e23fde093bc2a1365
+EBUILD selinux-bind-2.20200818-r2.ebuild 275 BLAKE2B be853a4b7388fc62e1fbb3548367deeb187f401e7ca19034b6cb9826ea2ac2750de1a4adaa27417b91e77b3bda6c0be27dd941b7b5d08d547d3e75edecc986c3 SHA512 cb722fbfda05bc0785b2a176931ea94577e7ae4a5a0926cf0eaef4fbd116b1f06c9717f1c8933e3d1aad4f674271d0b3be323eadde373ff3b0b7137fc2dc6fea
 EBUILD selinux-bind-9999.ebuild 277 BLAKE2B 9445c535f94a563e097ccdb32d017e3dbe413868d94debf11c9c8d16ea862e6528f2896cf21ae8cc9ee0862c8817488bd70ecd3d037bdac03f1e2a28110d124c SHA512 df526b178db329ccf4d0edae1f121986671fd332bdb29a52541ffeb7e8ab73e4a0dc515eedc5b39e5ab33fd66d25ad936deb64e08ef00c7e23fde093bc2a1365
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20200818-r2.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20200818-r2.ebuild
index 48dd4580040f..924bfd939b37 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bind"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-bitcoin/Manifest b/sec-policy/selinux-bitcoin/Manifest
index b1a66d6e1dec..6842ad4fb88c 100644
--- a/sec-policy/selinux-bitcoin/Manifest
+++ b/sec-policy/selinux-bitcoin/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-bitcoin-2.20190201-r1.ebuild 281 BLAKE2B 1610f1382644bda0a76c7f8fe8f2e3acdfdcc55c127b63a25acad490af2ab85a066445d57b0c249e001e5564fedbea8123ade422a3073018e4f41bad33739acf SHA512 96bdf2cfa511de8be12854e567dd9fd0380b1b259630f0c73ed6f43e5944e6cae645ccf3a2a62910415d185b7e4eb8e968583e563d0713284a2ace954c1a8675
 EBUILD selinux-bitcoin-2.20190609-r1.ebuild 281 BLAKE2B 1610f1382644bda0a76c7f8fe8f2e3acdfdcc55c127b63a25acad490af2ab85a066445d57b0c249e001e5564fedbea8123ade422a3073018e4f41bad33739acf SHA512 96bdf2cfa511de8be12854e567dd9fd0380b1b259630f0c73ed6f43e5944e6cae645ccf3a2a62910415d185b7e4eb8e968583e563d0713284a2ace954c1a8675
 EBUILD selinux-bitcoin-2.20200818-r1.ebuild 283 BLAKE2B 2a06bffa3ac5df4715d60dba0c061c2d77d0cbc6f415099c328c22ed30bac26695357b0d1245e25735171ae7823f18f12ed0d64ffcd8e2f18c38bb42cabd663a SHA512 c950ec7cb91e070797600734a6234ae4342cea43dc80191945bdb30e1736078885d4faa0bfa5851609cf05b68691f838bd215a0160e329958f0d3b61d5879705
-EBUILD selinux-bitcoin-2.20200818-r2.ebuild 283 BLAKE2B a26cee0e61b67ebdd2d39e05ffad4b8527df2c19453065be7dbb243a3a090f38da3c757b2125d5ae91b2e5f941ef158f31a2a1487c1571692b262d2849684e7c SHA512 90a9c01235003cf7df65b576067c634452b73c9c12307044ac9ff9d6bff66ca242eaaa19f4cf2e9bc76f43161d8f1c503f8b2baf5bfe67efc6f526bb26a74db7
+EBUILD selinux-bitcoin-2.20200818-r2.ebuild 281 BLAKE2B e79b487b794e163ebd17225c8e4bb2919cb830d18cee55de822288e82fb5df07b95b411c34ee703907eff3aa69c01bad97fbb2346ad41993ed71be7ff04e6322 SHA512 c6440a06cf2b7778308df8486cfcdf037516aae24311d95779b99559e515373e99e73a4191cc6ef1a3ceddc28a8a1c4109a2af2ecfbf77a46c45f8f24bb8f706
 EBUILD selinux-bitcoin-9999.ebuild 283 BLAKE2B a26cee0e61b67ebdd2d39e05ffad4b8527df2c19453065be7dbb243a3a090f38da3c757b2125d5ae91b2e5f941ef158f31a2a1487c1571692b262d2849684e7c SHA512 90a9c01235003cf7df65b576067c634452b73c9c12307044ac9ff9d6bff66ca242eaaa19f4cf2e9bc76f43161d8f1c503f8b2baf5bfe67efc6f526bb26a74db7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20200818-r2.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20200818-r2.ebuild
index 162168905ab8..d7e057b38a4b 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bitcoin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-bitlbee/Manifest b/sec-policy/selinux-bitlbee/Manifest
index 5a9fd8f6b821..5909303deb1c 100644
--- a/sec-policy/selinux-bitlbee/Manifest
+++ b/sec-policy/selinux-bitlbee/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-bitlbee-2.20190201-r1.ebuild 376 BLAKE2B 8c59951e90900de40c14efecc42ddd49702e5034b82d90f2f88cc8f7af331c93c688062d169910f90bcd2dc9d9a04efc3508ebdcb02e7efcd0079a1bfd3f1d41 SHA512 2600abbdbd16bdfa016cea289c51f6ae856cc9290d74543555fbff9b970fe0d205d24c7b81774f24cedc308827e7d7f6351906295b3c441bee1f6ac6f7e1d5de
 EBUILD selinux-bitlbee-2.20190609-r1.ebuild 376 BLAKE2B 8c59951e90900de40c14efecc42ddd49702e5034b82d90f2f88cc8f7af331c93c688062d169910f90bcd2dc9d9a04efc3508ebdcb02e7efcd0079a1bfd3f1d41 SHA512 2600abbdbd16bdfa016cea289c51f6ae856cc9290d74543555fbff9b970fe0d205d24c7b81774f24cedc308827e7d7f6351906295b3c441bee1f6ac6f7e1d5de
 EBUILD selinux-bitlbee-2.20200818-r1.ebuild 378 BLAKE2B 4093a2fd18be05891d96f624bc072958e4d1de87c26e0a7ed9e9fa423559631c0deae70f7a942f8c9e0e43aa509ed5a4c0ef5ca86a97e7586e881cbf765f6b34 SHA512 605fa89d0b2691277f33d8612042e2eee9a150f73d5c914782d44393e1444f304fd606e4c1e69044e017ff8636c198f654bb7cc02a7129cbb56b17519b311427
-EBUILD selinux-bitlbee-2.20200818-r2.ebuild 378 BLAKE2B 853ade1796d2b42ab79bf17fea059d6b76f9845c0e323e5efc44da3ee582edad3fa1e7ffc8234e520f3a25be498ca073780ed06f235f8b9bbd838b7670220280 SHA512 8d9632380dfdd744007f0b33fdb8fab0add94e23b44734cc4fbae4025166eacc822ea95e3ac9ae6a16af4002c5d21c014d058a79dd91aad76738064ca7dd00ed
+EBUILD selinux-bitlbee-2.20200818-r2.ebuild 376 BLAKE2B 7581dfd903a2a031358c2abc9e237593f521801a90f5d006040d5188f88929b0606624244951a5082c4cbc26b5608f773b7cc52e88920b109101a973ccc1e0b0 SHA512 cf790e2aa01c66cf3c4255c2861142585c0622fe779cc4f7239b700c14d21f5ece63b7e18823850b06fc2ecfa94693e2d2f4e0e6d84ccc260c73498613ef615d
 EBUILD selinux-bitlbee-9999.ebuild 378 BLAKE2B 853ade1796d2b42ab79bf17fea059d6b76f9845c0e323e5efc44da3ee582edad3fa1e7ffc8234e520f3a25be498ca073780ed06f235f8b9bbd838b7670220280 SHA512 8d9632380dfdd744007f0b33fdb8fab0add94e23b44734cc4fbae4025166eacc822ea95e3ac9ae6a16af4002c5d21c014d058a79dd91aad76738064ca7dd00ed
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20200818-r2.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20200818-r2.ebuild
index 45e4e3fb6dde..16b4baa88105 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bitlbee"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-bluetooth/Manifest b/sec-policy/selinux-bluetooth/Manifest
index 251d8ae75b3a..f1b7b91ef613 100644
--- a/sec-policy/selinux-bluetooth/Manifest
+++ b/sec-policy/selinux-bluetooth/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-bluetooth-2.20190201-r1.ebuild 285 BLAKE2B d12bab4cebff0abd177ceb9bb9221f6f53bee86fa1c98ef51457b8531c56d9cd0328557eddca61d9209e7e4749c827ee9aab6a03e257a5ce4d2cec0336bb1bec SHA512 7c3ada0b09c470fe52c0f295b7cf91c3ab23d4a02936c70bfa45d60119abbe6167ce467866bbc5ce291c7980acb8e80f47049c8d3e9585ed00d8ebc88633efd9
 EBUILD selinux-bluetooth-2.20190609-r1.ebuild 285 BLAKE2B d12bab4cebff0abd177ceb9bb9221f6f53bee86fa1c98ef51457b8531c56d9cd0328557eddca61d9209e7e4749c827ee9aab6a03e257a5ce4d2cec0336bb1bec SHA512 7c3ada0b09c470fe52c0f295b7cf91c3ab23d4a02936c70bfa45d60119abbe6167ce467866bbc5ce291c7980acb8e80f47049c8d3e9585ed00d8ebc88633efd9
 EBUILD selinux-bluetooth-2.20200818-r1.ebuild 287 BLAKE2B 4c187950d7d8f4aa55c092d34a90d078dff3de66d24b4f1a8b45589dda71f3a409780e5c470fe7078b8a0fb063467ad6623df1b2cdf907c1aca6fcfeb22eb0ef SHA512 423a75eaaf5a74f0878f76464110b433cdd3cb1e3d312d0b02f919588f090fdf25b6659f3ecc131de83f1be917b21a71b830df81015f51920ddcd29695e8fbd1
-EBUILD selinux-bluetooth-2.20200818-r2.ebuild 287 BLAKE2B 75dbb035f8f1217c5bdf03a8e154936fced89a06624a031dc8c662d01fea188e7e8ab95a5d6b5eed15d99fe18f01c7a5113ea74114bc538726d4da0384614773 SHA512 5a004dbbc84ad33e4bd73c32a12234c35fcc4ce329af6d306420cd8332ff391ad3c7e533bb2ce53b8210eaed296b4997a6f7d8cd70d770adcf28091389f26fb1
+EBUILD selinux-bluetooth-2.20200818-r2.ebuild 285 BLAKE2B c87e4c089abd27605b627a59340dac486a315edd39cfc47c6a7192fec3c93ed3d8fb393099a49ef472dee5cd37070c8e33f4cf60900e96374f92864cbfa326f5 SHA512 1a7c34b457b87be0d396cf562514b764b34804f88a9bf935e1c76e8edc34af28a332ac4566741754225fa7d9e4615a4d2bda7b9b0c489c1a26a48ff0c87e4bfc
 EBUILD selinux-bluetooth-9999.ebuild 287 BLAKE2B 75dbb035f8f1217c5bdf03a8e154936fced89a06624a031dc8c662d01fea188e7e8ab95a5d6b5eed15d99fe18f01c7a5113ea74114bc538726d4da0384614773 SHA512 5a004dbbc84ad33e4bd73c32a12234c35fcc4ce329af6d306420cd8332ff391ad3c7e533bb2ce53b8210eaed296b4997a6f7d8cd70d770adcf28091389f26fb1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20200818-r2.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20200818-r2.ebuild
index e3877d89b55a..d568b3e35f8f 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for bluetooth"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-brctl/Manifest b/sec-policy/selinux-brctl/Manifest
index b0bf9ab85a23..82c9155af28f 100644
--- a/sec-policy/selinux-brctl/Manifest
+++ b/sec-policy/selinux-brctl/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-brctl-2.20190201-r1.ebuild 277 BLAKE2B 9f5e14caade3681e3b0ffb8984d05f3dd59cff90ab1af66ae9f4a73ccf63833cbcccddc671864d22ea9e14f003ec300ad1654b3199aecb14760453e477d79b09 SHA512 94b230780355b21d7842fd486709011e6ce9e19b552f6d462e23c09aac51fe44db0609bee4046d46bb2bf2c5c8b0c7583dbb0dc47bdcb96bdbfb2515babb3e52
 EBUILD selinux-brctl-2.20190609-r1.ebuild 277 BLAKE2B 9f5e14caade3681e3b0ffb8984d05f3dd59cff90ab1af66ae9f4a73ccf63833cbcccddc671864d22ea9e14f003ec300ad1654b3199aecb14760453e477d79b09 SHA512 94b230780355b21d7842fd486709011e6ce9e19b552f6d462e23c09aac51fe44db0609bee4046d46bb2bf2c5c8b0c7583dbb0dc47bdcb96bdbfb2515babb3e52
 EBUILD selinux-brctl-2.20200818-r1.ebuild 279 BLAKE2B 18f0cdb4122ce10ae1bd676dfedf7395d9e8b7ab7fc239f2386e6d4b6a5555ccf2fa71a84d82945ce8aafde845e65095a9977d2304dd231bdd593376287a08f9 SHA512 36c3385c5455fd9677bdc0a7e839d49ad86240c563a646feaeb53bd7eebce4a729ef0281cc31c04bb8b7954a48818e2b044310a44a12b7ea093ad61dd47a7f25
-EBUILD selinux-brctl-2.20200818-r2.ebuild 279 BLAKE2B 47e4466396b13d5c41d375256c0b6cd347f8eb3802218758a7b29a7a5279ff7b8a6e6244dbf6ded0e5bd9f64307bd20f387371303af91407e7a68e06941c2655 SHA512 a51d46bcff1067a68488b7781ffb8f46040a78bd98b0571bbd9780151aad3a8a467bbacee610eb8ca2f8ce6fa8f2c1477e0d871a04708967828f9b0c7ec0613d
+EBUILD selinux-brctl-2.20200818-r2.ebuild 277 BLAKE2B e4b86ecc5f464fa1bef12fc78595a6cb78e2adbf0e12d3727726ea18a8469ac2e282912659d61128228cf416ac978d381522c5e788243bc7e7d715f69b1340a4 SHA512 d4f1d665181d569339bfa48dd5be62452b8c92602936ef8f43fd99cdf968ae5b8e50f7ef086f0268a62bda478c0dba3d16b1d09d3eb42a2b0c5278c8bc904042
 EBUILD selinux-brctl-9999.ebuild 279 BLAKE2B 47e4466396b13d5c41d375256c0b6cd347f8eb3802218758a7b29a7a5279ff7b8a6e6244dbf6ded0e5bd9f64307bd20f387371303af91407e7a68e06941c2655 SHA512 a51d46bcff1067a68488b7781ffb8f46040a78bd98b0571bbd9780151aad3a8a467bbacee610eb8ca2f8ce6fa8f2c1477e0d871a04708967828f9b0c7ec0613d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20200818-r2.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20200818-r2.ebuild
index 634ca5785b99..275bbdeba921 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for brctl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/Manifest b/sec-policy/selinux-cachefilesd/Manifest
index 0df308262907..6c587268a92b 100644
--- a/sec-policy/selinux-cachefilesd/Manifest
+++ b/sec-policy/selinux-cachefilesd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-cachefilesd-2.20190201-r1.ebuild 289 BLAKE2B 62621fd6a3ee25a2aacb47976964a1e2f23daf17c5419293b90591cf163c8b0bd5f55ca3b9c60b84dd2163ecddf1c9dd804d8b67e03a489d1ffd0cd6cf2d4961 SHA512 800d39ea338e8bff886be89b14ab48e2dd664295ef4c71779d67b04b512845fa851ff7c1e321abac6f002b8e371476b63c3e89cac8618a173623a61f945e2cc0
 EBUILD selinux-cachefilesd-2.20190609-r1.ebuild 289 BLAKE2B 62621fd6a3ee25a2aacb47976964a1e2f23daf17c5419293b90591cf163c8b0bd5f55ca3b9c60b84dd2163ecddf1c9dd804d8b67e03a489d1ffd0cd6cf2d4961 SHA512 800d39ea338e8bff886be89b14ab48e2dd664295ef4c71779d67b04b512845fa851ff7c1e321abac6f002b8e371476b63c3e89cac8618a173623a61f945e2cc0
 EBUILD selinux-cachefilesd-2.20200818-r1.ebuild 291 BLAKE2B 66141d1187d4e917de6a4ff0b90640325f7034cb5ee1917c5ddfade77af5c056f6535fbd955d19a3720208055b3e0cd94d563df1712820fd95a6f8eeae30a03d SHA512 f2799708f332be2fcf380523c8b3e9a5f13428a64160311bb370f8d92e6cb82409358f75430cc6331f1ff4067b43f7917879473d8877b3c496896f2b38b36e5a
-EBUILD selinux-cachefilesd-2.20200818-r2.ebuild 291 BLAKE2B ff5708a9b1b96d5ddd4a68f3ff82f74d1c6ccdd9f91e84cc7835e342bbeb9eecf00ec7125002e6ff0ee62143effda857a5ff2ec9d655c992c5b537637e85579b SHA512 dfa8843bcbdd1502b2633a070f8a45a0db4a2e3d52033bec0910809b3f8f8cea9943f635cb27fb8f00de1875dcefa01edd2df8deb3548008e1a89a3e445581ef
+EBUILD selinux-cachefilesd-2.20200818-r2.ebuild 289 BLAKE2B e9ee84069f400e3c78ee09d51034f255a37ec1d32a61c09d218ee971afc6760ed010342e9ed05e01723dc0d50b400323db404e303fdb36644528addddf6658cb SHA512 a04c33ceff046d0b13d58299c1615e0479cadcf2f0f6f07fb728c14d08abbdf01de631ac5f789502cfec6d7bd3310ea6f35189307aa11171d5e8dc571042d5df
 EBUILD selinux-cachefilesd-9999.ebuild 291 BLAKE2B ff5708a9b1b96d5ddd4a68f3ff82f74d1c6ccdd9f91e84cc7835e342bbeb9eecf00ec7125002e6ff0ee62143effda857a5ff2ec9d655c992c5b537637e85579b SHA512 dfa8843bcbdd1502b2633a070f8a45a0db4a2e3d52033bec0910809b3f8f8cea9943f635cb27fb8f00de1875dcefa01edd2df8deb3548008e1a89a3e445581ef
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20200818-r2.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20200818-r2.ebuild
index 90371e1b5975..eb0ef7cbc67e 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cachefilesd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-calamaris/Manifest b/sec-policy/selinux-calamaris/Manifest
index 1ebfcd467342..2f7e40ddaab6 100644
--- a/sec-policy/selinux-calamaris/Manifest
+++ b/sec-policy/selinux-calamaris/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-calamaris-2.20190201-r1.ebuild 285 BLAKE2B 5e6c54b0d6145ec011631a4ffda705b9c474bd0a366e76a0b3d5e27edffab213520dab273d8b4f2470c68fa8fba6f08202ed1f8751058fafc6ed8a50b76cdab0 SHA512 97270bc3bba2dcb4601f79480a91933b633ee0b66cec0f710a3c50f8468c7a464e7413b9718c43b8673f26363f524a4b9c74131972182ab8d7b25e0343c63070
 EBUILD selinux-calamaris-2.20190609-r1.ebuild 285 BLAKE2B 5e6c54b0d6145ec011631a4ffda705b9c474bd0a366e76a0b3d5e27edffab213520dab273d8b4f2470c68fa8fba6f08202ed1f8751058fafc6ed8a50b76cdab0 SHA512 97270bc3bba2dcb4601f79480a91933b633ee0b66cec0f710a3c50f8468c7a464e7413b9718c43b8673f26363f524a4b9c74131972182ab8d7b25e0343c63070
 EBUILD selinux-calamaris-2.20200818-r1.ebuild 287 BLAKE2B 66748c9e73924f7c60c4047d341d351ec098aa5b33cfb4bf8a96174115c57726ca6156abe954caa2bbd5d0823b592f7cab8449c02ef9d5fe6b4f60f060b2822c SHA512 b5e44527b6ebfc65f63187a4653f7f6735a75f3571280f12826b08c3a489d8a9d5a993059bd4f4cfc8e9326f7a830ef3316ba4a9fa1780b9faf70d2ea8b57b6d
-EBUILD selinux-calamaris-2.20200818-r2.ebuild 287 BLAKE2B b19c283d62ec662fb737225ac4822bd4913138514747610cc4a93be51a61a028223477685510b484c419c33885158a795fe7a3aeb3ea16f54ff4a3b36a9a566b SHA512 fd44e10c183d284f6f461f0ed2892e8094a5371bb30582376853f280efea0420179f4669d0117061d41b7730f853fc2406ef2c5dcc2e8327876bed531e3b3668
+EBUILD selinux-calamaris-2.20200818-r2.ebuild 285 BLAKE2B db492d396413670b71704faa140099f55902ad204c4f5ade9ce8b589d4e87c2134338cd1f043b70b63917336cc3cc77db3ed7b420c5b82d8e6d9859d62ce104f SHA512 3d1409e5854656c71b8c550142517665c99e8802c77af6bddbadfd76e4f23dd802a3231888a0207aa34d9719e2a2fb149b4f8286dde28ae6a7d8ccc2344ee201
 EBUILD selinux-calamaris-9999.ebuild 287 BLAKE2B b19c283d62ec662fb737225ac4822bd4913138514747610cc4a93be51a61a028223477685510b484c419c33885158a795fe7a3aeb3ea16f54ff4a3b36a9a566b SHA512 fd44e10c183d284f6f461f0ed2892e8094a5371bb30582376853f280efea0420179f4669d0117061d41b7730f853fc2406ef2c5dcc2e8327876bed531e3b3668
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20200818-r2.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20200818-r2.ebuild
index 02a25d34262f..a09ec0f17dec 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for calamaris"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-canna/Manifest b/sec-policy/selinux-canna/Manifest
index 701dfd1f921d..1750883cdbdd 100644
--- a/sec-policy/selinux-canna/Manifest
+++ b/sec-policy/selinux-canna/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-canna-2.20190201-r1.ebuild 277 BLAKE2B ba4a0f5feca81ff65396644d0768a2a1570f82d4b5efe266b730ac55b3638576cfe82578795a523731f624f844d99a8e474e1760aee8a63854fda6a240d88db7 SHA512 f6d5540280fae2b93df3ca211b4e540adadaea14e9ba100c6e35cd67bc8e1d85cfbc0e18ec60c84bf1f550740a2db514c8a0183185f26133ce3b51e53c09704b
 EBUILD selinux-canna-2.20190609-r1.ebuild 277 BLAKE2B ba4a0f5feca81ff65396644d0768a2a1570f82d4b5efe266b730ac55b3638576cfe82578795a523731f624f844d99a8e474e1760aee8a63854fda6a240d88db7 SHA512 f6d5540280fae2b93df3ca211b4e540adadaea14e9ba100c6e35cd67bc8e1d85cfbc0e18ec60c84bf1f550740a2db514c8a0183185f26133ce3b51e53c09704b
 EBUILD selinux-canna-2.20200818-r1.ebuild 279 BLAKE2B ab9709d1b40b37490866e5944cb4c2cea7854d2176268ef6f2376546a8c98159f33492879badf5cc1f6e3630ba6ac0c4791f7041f78011bad6c439ab0d5f2224 SHA512 de3e4dcb62ea8f81862e2333a9f9c7af8e2a43051e813d459969818c9390a5e2c87e133d881ee2f139a265f927166893988994f725b2a30d253dadcc0bfb5928
-EBUILD selinux-canna-2.20200818-r2.ebuild 279 BLAKE2B c0edd018de1cf7554e6b9d3718fb2770559fa1208525f661d9de4a8a7b2a1301e900d80dc10b238a6d813b4528fe039d99f4aa4ca5d5b076d3081c84d717b10b SHA512 29a69d5b7daae0d35c2271cdfedf402b7d2da5731689acf57db031ba17f7c7ff1f5e571bb15cf7ded6a45c520d468791b2fc2c378e7a50f9fafb0456d2ae47c6
+EBUILD selinux-canna-2.20200818-r2.ebuild 277 BLAKE2B 0047b94d9a6f864af1b369bc89f65f231a3082c2c9271510f84036f403669f589aa82a83ad6943e32841537f8b411d3467b47902b1fb89ceb3043685d35b5e9c SHA512 3ecac05039e83fdf95dee58f266d86749fcfded69b2e8abecd48477140f66d65e10a95b4498b09e79751718c9ca339ca5529f0f9fcd15fd0ed7feae7c363c6f2
 EBUILD selinux-canna-9999.ebuild 279 BLAKE2B c0edd018de1cf7554e6b9d3718fb2770559fa1208525f661d9de4a8a7b2a1301e900d80dc10b238a6d813b4528fe039d99f4aa4ca5d5b076d3081c84d717b10b SHA512 29a69d5b7daae0d35c2271cdfedf402b7d2da5731689acf57db031ba17f7c7ff1f5e571bb15cf7ded6a45c520d468791b2fc2c378e7a50f9fafb0456d2ae47c6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20200818-r2.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20200818-r2.ebuild
index 24bbb521f96a..979e0754ce93 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for canna"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ccs/Manifest b/sec-policy/selinux-ccs/Manifest
index d0474066d2ad..98a57a483502 100644
--- a/sec-policy/selinux-ccs/Manifest
+++ b/sec-policy/selinux-ccs/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-ccs-2.20190201-r1.ebuild 273 BLAKE2B a55c9ad8324741067e4b2574fd61d13cbb19aa9ba61e4fff3791ffb4270d681c71db8e752a309249569d8d19db60d733c2574202f1b6d42eafce628c86c3182c SHA512 4d39feb8672c23987c3c4d1a0f3c27a08b3f20d2b4832d7ff6abd4fc54acbd6cfd9b9e105bb4d87b62037db6ab418d5a3cb0c29502988f7efdaba1bc340f1185
 EBUILD selinux-ccs-2.20190609-r1.ebuild 273 BLAKE2B a55c9ad8324741067e4b2574fd61d13cbb19aa9ba61e4fff3791ffb4270d681c71db8e752a309249569d8d19db60d733c2574202f1b6d42eafce628c86c3182c SHA512 4d39feb8672c23987c3c4d1a0f3c27a08b3f20d2b4832d7ff6abd4fc54acbd6cfd9b9e105bb4d87b62037db6ab418d5a3cb0c29502988f7efdaba1bc340f1185
 EBUILD selinux-ccs-2.20200818-r1.ebuild 275 BLAKE2B d7d7d7ff57bd3ed82e5590459a2c344d03ccea24b94588975a1ef859b70ad750c6aa22132a9b7ec64a871f6867e39f3827a17de04fc27e87ca1a121344339438 SHA512 8c90e170580bc97f9a1a4076f545596051937babeb129e149c757cd53f36ee1312010e6234f5438949d014da5ac78b5699ce11d00903033c471e2c9ee5cd88fa
-EBUILD selinux-ccs-2.20200818-r2.ebuild 275 BLAKE2B 40716b2856bf5983421d3f1738f8b78a2e854f435336e2a2b1121b0b99c003df28779374a01db603156ada085207a896ec4372f27efec653b7ebf6d0184071f5 SHA512 5c612374ca4d51ce3a4486c2b17878331bd76d733dd7e568cfa77697e8f6d806f374af72a3c8289b0eee4efd4a49d67c47a800a3d80fa9ef77d9d1e197f70374
+EBUILD selinux-ccs-2.20200818-r2.ebuild 273 BLAKE2B 81227ffc0a19b82ce1dd3a7674e9d116da38d9fd643ca67e56631d06b425288ea8752fe32ecc47fae84a4e956a7d7c44b97487c9e5aaf04ced29c50d8bf53a3f SHA512 4d22b19ab31ee6035f5959f406ec720ed82328d4b5ee43b9cd2b4d3ff4f15f0c20247742d75f9f925f5d388ab4e0b82fb3c28ac44ec01dd5423278effafd2371
 EBUILD selinux-ccs-9999.ebuild 275 BLAKE2B 40716b2856bf5983421d3f1738f8b78a2e854f435336e2a2b1121b0b99c003df28779374a01db603156ada085207a896ec4372f27efec653b7ebf6d0184071f5 SHA512 5c612374ca4d51ce3a4486c2b17878331bd76d733dd7e568cfa77697e8f6d806f374af72a3c8289b0eee4efd4a49d67c47a800a3d80fa9ef77d9d1e197f70374
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20200818-r2.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20200818-r2.ebuild
index 233335cef010..ae81960b1034 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ccs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/Manifest b/sec-policy/selinux-cdrecord/Manifest
index 51dd2f8eab32..e9ccb0269a3a 100644
--- a/sec-policy/selinux-cdrecord/Manifest
+++ b/sec-policy/selinux-cdrecord/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-cdrecord-2.20190201-r1.ebuild 283 BLAKE2B f9d7718a8b590cf95afe074e784779306c5c7e0852179cefee1bc62e541cba8a6f1bf5402b94fbd80af949008bee1f8a61aa33978d43b61399255945e3a76acf SHA512 a285156aa3cabf03e7fa33b37cc0ac2b6bfe41c5b08fae0be9d9e0dc1b7cb1866539ade936fd2123743a32f9f8c1178ed53da842a5f40594ece7ec91fd40bdbc
 EBUILD selinux-cdrecord-2.20190609-r1.ebuild 283 BLAKE2B f9d7718a8b590cf95afe074e784779306c5c7e0852179cefee1bc62e541cba8a6f1bf5402b94fbd80af949008bee1f8a61aa33978d43b61399255945e3a76acf SHA512 a285156aa3cabf03e7fa33b37cc0ac2b6bfe41c5b08fae0be9d9e0dc1b7cb1866539ade936fd2123743a32f9f8c1178ed53da842a5f40594ece7ec91fd40bdbc
 EBUILD selinux-cdrecord-2.20200818-r1.ebuild 285 BLAKE2B b260002a0f858eb8c33b2e650015c1eacb7aba7a40a83501d36b151ae1837ba288d456cdb7b60d212406d611fb36c79b08305df57babf05c8e4f87145237c1a5 SHA512 b6c517242a4a3ea65af5c3e004ec855f094aaacf5a41fa391ee750da89418043983814f771a02beb33e074de8677db67fcbf2560a7db385a86aed015b6eb04ae
-EBUILD selinux-cdrecord-2.20200818-r2.ebuild 285 BLAKE2B 65f7cb5ba866f088949afacf41b9474ff04b86b84055074d1eef78725b5e530ec69d0ad2cff118612a55a1d1095e2628894d9333570732de1a800cd5f216f153 SHA512 53f9b2827ea4e5f2719265f033029b857e28b6c30ce1661337f50e980afc025e6196fe0f6e74c9af492a3f28616cabef7781070a4657d8a4086993bf2820b5f9
+EBUILD selinux-cdrecord-2.20200818-r2.ebuild 283 BLAKE2B 78231e44fe1e0b731959f9e646a3828374afa6a3a7531bcf828afb0cb01f9d2b9277b68c4883f574a157b0dbaae8e852e181d9024912c8fbc59ac7ced5dc7568 SHA512 f14faf5efa3836c89787571cab9523d9a504a4c1de1f66ae366f6f125b70ac06bfacd4e20191fe1a3622f10410afeaa3cb0d959e0509149c63e2c43ebf6dba05
 EBUILD selinux-cdrecord-9999.ebuild 285 BLAKE2B 65f7cb5ba866f088949afacf41b9474ff04b86b84055074d1eef78725b5e530ec69d0ad2cff118612a55a1d1095e2628894d9333570732de1a800cd5f216f153 SHA512 53f9b2827ea4e5f2719265f033029b857e28b6c30ce1661337f50e980afc025e6196fe0f6e74c9af492a3f28616cabef7781070a4657d8a4086993bf2820b5f9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20200818-r2.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20200818-r2.ebuild
index 92147575b99c..80303ed4ebdf 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cdrecord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ceph/Manifest b/sec-policy/selinux-ceph/Manifest
index 2c3ef7eae32b..12d6b923a297 100644
--- a/sec-policy/selinux-ceph/Manifest
+++ b/sec-policy/selinux-ceph/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-ceph-2.20190201-r1.ebuild 275 BLAKE2B 3f1cf2e8ecf307e7d7b34c75e685b7c780b1f2f6d71a399bd5d916576c10865709606de0c1320d462be1a32297b0257aab2b89532c3dc405d5770001721cf489 SHA512 991350d9f335fec7f97ea971bac7355686be9ecb46a3a3342faf4195f994cc3d700f20f2a45dd2bbde7ba5fa3d17c96d6e8ee10f40e145b9d435e4fcbe71d961
 EBUILD selinux-ceph-2.20190609-r1.ebuild 275 BLAKE2B 3f1cf2e8ecf307e7d7b34c75e685b7c780b1f2f6d71a399bd5d916576c10865709606de0c1320d462be1a32297b0257aab2b89532c3dc405d5770001721cf489 SHA512 991350d9f335fec7f97ea971bac7355686be9ecb46a3a3342faf4195f994cc3d700f20f2a45dd2bbde7ba5fa3d17c96d6e8ee10f40e145b9d435e4fcbe71d961
 EBUILD selinux-ceph-2.20200818-r1.ebuild 277 BLAKE2B 85f6e9181852648879f05f80ecd28c8e4496ed9f4babf77714dbeee5d5c446656fe3e46dffe8ee65333340d2f929e42c5e9b4d147fd9c9214f0f62915e884d54 SHA512 6fe45acfbf22cf06a5648831b1bc30e73905f20fb3e5c177ab5c96169e569b88e39bd3ff9871597fa3924b95796b49a883e3fbf3f9667606639c30a00ca21dbf
-EBUILD selinux-ceph-2.20200818-r2.ebuild 277 BLAKE2B e465276852ca438eb198cd579fd0da78e0071c8f268bf8b86608151714de326d43fe6167ce24f78bec23569d86ef9b876266a67411cbf6ed8bd3aef2dbb17908 SHA512 adbb04c92564f463673d9b0425149729734855139a6db47580b322e4a823b8ea0d713949b967aa91b3628b674570be48f8cf3fbab1f99d0683b6d304c54141ab
+EBUILD selinux-ceph-2.20200818-r2.ebuild 275 BLAKE2B 9905ec5272d2bdb860c03c54dbd538089d053aaa6a97e78b1a8e99b7d383445afc0bf64d74cc2df41f305ac17c528625b81254905c9eed505543104aad55d5c5 SHA512 759043b042a889523c728436614263b4d87cc7bd33fb960873c5fc65213d24a8ce8852d6712c979519b0714bddcf48012fd9d16bfcaedea4d6f43c6f1bcf65a1
 EBUILD selinux-ceph-9999.ebuild 277 BLAKE2B e465276852ca438eb198cd579fd0da78e0071c8f268bf8b86608151714de326d43fe6167ce24f78bec23569d86ef9b876266a67411cbf6ed8bd3aef2dbb17908 SHA512 adbb04c92564f463673d9b0425149729734855139a6db47580b322e4a823b8ea0d713949b967aa91b3628b674570be48f8cf3fbab1f99d0683b6d304c54141ab
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20200818-r2.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20200818-r2.ebuild
index 28ae2a8f4617..853d6baa0517 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ceph"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cgmanager/Manifest b/sec-policy/selinux-cgmanager/Manifest
index 2d73ab6962a5..aaddb48b5acb 100644
--- a/sec-policy/selinux-cgmanager/Manifest
+++ b/sec-policy/selinux-cgmanager/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-cgmanager-2.20190201-r1.ebuild 285 BLAKE2B a691290b4e6548fc1fee3d57d82e15b6295e1e9e14217f4d4828e4dec9d5b71ea883391d4323ea0a315e46baede6334046aab997efa1b896adfe74e4ca281db3 SHA512 b76a762d06b121ba557cfabb5eba4de052705e145671e64abc231918a33e9f054709e0e1912e6c4967f905f48858580877356d0ccc4136ba3a8b8c290722dc18
 EBUILD selinux-cgmanager-2.20190609-r1.ebuild 285 BLAKE2B a691290b4e6548fc1fee3d57d82e15b6295e1e9e14217f4d4828e4dec9d5b71ea883391d4323ea0a315e46baede6334046aab997efa1b896adfe74e4ca281db3 SHA512 b76a762d06b121ba557cfabb5eba4de052705e145671e64abc231918a33e9f054709e0e1912e6c4967f905f48858580877356d0ccc4136ba3a8b8c290722dc18
 EBUILD selinux-cgmanager-2.20200818-r1.ebuild 287 BLAKE2B 1d848aa9b6032dae9e84d8e17368b7c5a6015bff355b115c705f59f937b8414a0225a7c2a02fe6b790aca9b7ec6a759fa98542fa15201cb7d4b16aa20f83dd9d SHA512 48d9fb60ead5266af1ffd8f2568eac81f756adc0657a8361cc018045bc90fda7855f55344302fe26acc00fd9e1781a7b3ac8f3c59da8c4d7198c6f02c6af0389
-EBUILD selinux-cgmanager-2.20200818-r2.ebuild 287 BLAKE2B 649cf3c4648d52bec6725b4175a91016ac6749fab436f7c72f780f2d679c993891724f34b665a7b24c7744267a8a25dc0c5e6c66c0151844214be894000e3bbe SHA512 0569a483abc07df2251f4466bceae35dd5f002a2a157f9a7ba08c835b5b03380e235d51e600240c07bad2606788365dcc45d5676d97a175e143cc9803564a602
+EBUILD selinux-cgmanager-2.20200818-r2.ebuild 285 BLAKE2B 7f7cdd7b431f34d9d2565a14b8ae242ae5f8e6f4bb5a09acb7e617d9cee52f4e78d641870f9c586c44d98eb61893fe8ab9d2ff8474f9ef41861ced120b549e35 SHA512 860b13ce9d1abe284f12063a33ea3ea1a0bdb6a27438099e3dbfb673b1ed2cec1826eaac7b80c41c5e2b97fda43222c167e4355d6635075b4db0f3d6c3c47720
 EBUILD selinux-cgmanager-9999.ebuild 287 BLAKE2B 649cf3c4648d52bec6725b4175a91016ac6749fab436f7c72f780f2d679c993891724f34b665a7b24c7744267a8a25dc0c5e6c66c0151844214be894000e3bbe SHA512 0569a483abc07df2251f4466bceae35dd5f002a2a157f9a7ba08c835b5b03380e235d51e600240c07bad2606788365dcc45d5676d97a175e143cc9803564a602
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20200818-r2.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20200818-r2.ebuild
index 8ccd276656c5..4240d28d49d9 100644
--- a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cgmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cgroup/Manifest b/sec-policy/selinux-cgroup/Manifest
index 2d17e19d70fa..4e8c9c576e8b 100644
--- a/sec-policy/selinux-cgroup/Manifest
+++ b/sec-policy/selinux-cgroup/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-cgroup-2.20190201-r1.ebuild 279 BLAKE2B 847883a8a9d4b4ba7ca3430fe1c38783e530bc93e8dcb1f14ad7825023455636b517658713855e402e631b8f7714e591b6b37ceab845a06cd5bb41e1947b32f4 SHA512 778b0ac980766fca9b34436636ed0089a9219bbeb075ea36829d769e816e30c84922c0896ab8e39ee756d10ed2a371b7fa405106ea8fc7d763a892d873b8b9c9
 EBUILD selinux-cgroup-2.20190609-r1.ebuild 279 BLAKE2B 847883a8a9d4b4ba7ca3430fe1c38783e530bc93e8dcb1f14ad7825023455636b517658713855e402e631b8f7714e591b6b37ceab845a06cd5bb41e1947b32f4 SHA512 778b0ac980766fca9b34436636ed0089a9219bbeb075ea36829d769e816e30c84922c0896ab8e39ee756d10ed2a371b7fa405106ea8fc7d763a892d873b8b9c9
 EBUILD selinux-cgroup-2.20200818-r1.ebuild 281 BLAKE2B 3280567cd4d2e616489f66c588ed7e1847dd163701359e5642cb16126e40738b1b70aca5630f69103356358c0306b9223af34437476f6bf51adea760078fdc7e SHA512 095f07271dde77ecd0c06c194fe431f1db37256d3802104d9c96fa9698cafb58521c85496699e756749540a7c6f97c9713c7a579e51bdab9dd7d5424227c1b15
-EBUILD selinux-cgroup-2.20200818-r2.ebuild 281 BLAKE2B e3f1c496f04fb1a809227ae6e91c4cf7816626bf953f04f34d24fb3d7616b35b7d7b1c5c40e61f04e1e7e220a5c95df909eea49f5051ee9cd43f774c9b1f17e4 SHA512 4d22e492730eff7872a069f1fba1d4f873d2287ae4362986da0373f16734c5edf5ff727484b117a1dde190c33742fc13db3b9ff534780b2a34df47a4707320f6
+EBUILD selinux-cgroup-2.20200818-r2.ebuild 279 BLAKE2B 5fbbbb1704d9e67dc020ddf3b6ea0259f90e61c1becced331d95518c2d1449da1ffa4bd0194237ea4756d33a89117282b4cfdad131908ca9420f062dd10a8693 SHA512 f0352eab7daba63c38e2b8d6780be513d1a6d852b90696b4b967955ad1e90e0c4e69f992f62f5d4092506d3111453b3d53283355d7485b25d13e751f029922a3
 EBUILD selinux-cgroup-9999.ebuild 281 BLAKE2B e3f1c496f04fb1a809227ae6e91c4cf7816626bf953f04f34d24fb3d7616b35b7d7b1c5c40e61f04e1e7e220a5c95df909eea49f5051ee9cd43f774c9b1f17e4 SHA512 4d22e492730eff7872a069f1fba1d4f873d2287ae4362986da0373f16734c5edf5ff727484b117a1dde190c33742fc13db3b9ff534780b2a34df47a4707320f6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20200818-r2.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20200818-r2.ebuild
index dc21235f2914..af488063c5ad 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cgroup"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-chromium/Manifest b/sec-policy/selinux-chromium/Manifest
index 904f99321450..4dbaa956c27b 100644
--- a/sec-policy/selinux-chromium/Manifest
+++ b/sec-policy/selinux-chromium/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-chromium-2.20190201-r1.ebuild 386 BLAKE2B b3957f297ac5d60e3e083db26ece2855399cfdb8cc6fad5dd5f31657cd586c847ff94638b64dc7c517ed70005611ceab6a3995c12f0ab4c2c34c5f6a588a09e4 SHA512 95b9cda33b49a59ee3c6239ace9d7780452297aa4d2a23f8f64f9de91866b17f0f4dd146ab7531521625e39be4d079138812e64fa038087d0cf3b4da682289fd
 EBUILD selinux-chromium-2.20190609-r1.ebuild 386 BLAKE2B b3957f297ac5d60e3e083db26ece2855399cfdb8cc6fad5dd5f31657cd586c847ff94638b64dc7c517ed70005611ceab6a3995c12f0ab4c2c34c5f6a588a09e4 SHA512 95b9cda33b49a59ee3c6239ace9d7780452297aa4d2a23f8f64f9de91866b17f0f4dd146ab7531521625e39be4d079138812e64fa038087d0cf3b4da682289fd
 EBUILD selinux-chromium-2.20200818-r1.ebuild 388 BLAKE2B cd1912e64231ccb223b76daa02e91d9d0ddd62554f25d0129536d1efdf3a4236820eb98ab325f34fa003bdae976a9a82ffb1c8e3a4e432c099b7c8352222a193 SHA512 7fd15a1ba1709cdf93a709ca2f1018042f270cdee39f82005fa03933f965a78471509a406c3a6b1094ca231c236955f7671b213aeb39d28817bebac9cb0e37c0
-EBUILD selinux-chromium-2.20200818-r2.ebuild 388 BLAKE2B a0095f40c421e3b77809829c2b23982db9789ccfb69f7ef83030bf7aa5e2eb90c1056de6e8c756c66772286002da50ec66a3684c68a96036b20fd2e69f0d4b53 SHA512 339361cf715e84d05658886d89acce26fa1b93dfabe417f29ff8a5b5df77789114ee097b9f25c27296022894475e5ca9300926f2f8256d252fb19a23900bc48d
+EBUILD selinux-chromium-2.20200818-r2.ebuild 386 BLAKE2B a8e7ebc68fd74e6ac98d7fee9c5427d024437e5020591ba2780c3f891b6ce66d73e805a6b4e1527498ca54e53112eb9422ecb168275dcf1f0fe48641cd032a72 SHA512 4575d3982d25f6194b1dded3614659a191dee705c3ea1f4cb6ad858a3a1ea8b36b6abea9bc47c8399200c3d154ca4753b8261422219d5d5d2db9624f2c674f19
 EBUILD selinux-chromium-9999.ebuild 388 BLAKE2B a0095f40c421e3b77809829c2b23982db9789ccfb69f7ef83030bf7aa5e2eb90c1056de6e8c756c66772286002da50ec66a3684c68a96036b20fd2e69f0d4b53 SHA512 339361cf715e84d05658886d89acce26fa1b93dfabe417f29ff8a5b5df77789114ee097b9f25c27296022894475e5ca9300926f2f8256d252fb19a23900bc48d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20200818-r2.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20200818-r2.ebuild
index 2e577fb8bc54..aae0c243ed2e 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for chromium"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-chronyd/Manifest b/sec-policy/selinux-chronyd/Manifest
index 2d9421455315..e9e2732c214a 100644
--- a/sec-policy/selinux-chronyd/Manifest
+++ b/sec-policy/selinux-chronyd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-chronyd-2.20190201-r1.ebuild 281 BLAKE2B 8ef09c64df1676cac54fc381ce8624e777dc80f247a174c0b6937a015a0e80ae47b5107bf5046490536a334e890fbf72a4ac302066db9dd5c018ff44afd8c1f8 SHA512 506f03977777021a02c46d62132ab52e7b8b8ff145f335600b7300f4c87b851b1e267023bbb0af3d4862405561116a48131caa3d856eca4c85862a6ddd16ef25
 EBUILD selinux-chronyd-2.20190609-r1.ebuild 281 BLAKE2B 8ef09c64df1676cac54fc381ce8624e777dc80f247a174c0b6937a015a0e80ae47b5107bf5046490536a334e890fbf72a4ac302066db9dd5c018ff44afd8c1f8 SHA512 506f03977777021a02c46d62132ab52e7b8b8ff145f335600b7300f4c87b851b1e267023bbb0af3d4862405561116a48131caa3d856eca4c85862a6ddd16ef25
 EBUILD selinux-chronyd-2.20200818-r1.ebuild 283 BLAKE2B f6ad4c84163b4b409aa7b7cba776be42f95389a2f81933b79512439c8eb578927391876c04f32af685c7d488280f9e468d29c0f2c104029bd7a608915091871d SHA512 50c79774064ed8cce63a47b96d45c60d65672444b93cbed58e9fa9ecd686dbc46e29fa155889392f39062764b284a126e03d035141f2cb2c1078b9b6e3c3fef6
-EBUILD selinux-chronyd-2.20200818-r2.ebuild 283 BLAKE2B 4cdceabd7b44b7dbcd36b325e97ea292e71e1e34c29616e9ef53049ac7014813165cb45f6463782ced7d2aa3e1d8f8a4363571aa0b2908873c84821e5f801a44 SHA512 07330fe4994990b51f0b54b0c0a25adee58a826facb9a39268618379007d5db4cff76cb52fe54c1b3904c40ec4f14d1ed18eb97c833b619529a9b24c2aa9874c
+EBUILD selinux-chronyd-2.20200818-r2.ebuild 281 BLAKE2B 5e7dfdfa8fd62ef4e0895daaf32bfd5050c1f7f8beef4cd8bee67d9e11cad3d9d58cae4855520c677bc0d80b96ed34d6cbfc161a40d92430c8d0fb64c80423c8 SHA512 882f33afe0902a66b50b1273b6d23fe5915d972636eff7c7a10528f5ca57ddc98cf81941fcd2ba954d5c1df229e5b5056a7cb9b3e2fabe25941e3d4cccc175c4
 EBUILD selinux-chronyd-9999.ebuild 283 BLAKE2B 4cdceabd7b44b7dbcd36b325e97ea292e71e1e34c29616e9ef53049ac7014813165cb45f6463782ced7d2aa3e1d8f8a4363571aa0b2908873c84821e5f801a44 SHA512 07330fe4994990b51f0b54b0c0a25adee58a826facb9a39268618379007d5db4cff76cb52fe54c1b3904c40ec4f14d1ed18eb97c833b619529a9b24c2aa9874c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20200818-r2.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20200818-r2.ebuild
index 10998bb9122a..046caff75fa4 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for chronyd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-clamav/Manifest b/sec-policy/selinux-clamav/Manifest
index 1d4c4f35d9e9..2885e6bbe261 100644
--- a/sec-policy/selinux-clamav/Manifest
+++ b/sec-policy/selinux-clamav/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-clamav-2.20190201-r1.ebuild 279 BLAKE2B 8d64ee8ebabdc8f9c0550c5690bf7682b767f333d4fe31afdf0dce72c5731913edd93cc58d9afecbf1cac4f0cd2c6fb80b11adba49d342f9ee3d17d92fd44902 SHA512 0496b2c936ead928811be52e336ae54310b55e0f695f02294da9fe1c0a9f3ba66f474ad14275ed35794fb43c67aadaee6a214e1df2e9a22f16286b1d81cb1c6f
 EBUILD selinux-clamav-2.20190609-r1.ebuild 279 BLAKE2B 8d64ee8ebabdc8f9c0550c5690bf7682b767f333d4fe31afdf0dce72c5731913edd93cc58d9afecbf1cac4f0cd2c6fb80b11adba49d342f9ee3d17d92fd44902 SHA512 0496b2c936ead928811be52e336ae54310b55e0f695f02294da9fe1c0a9f3ba66f474ad14275ed35794fb43c67aadaee6a214e1df2e9a22f16286b1d81cb1c6f
 EBUILD selinux-clamav-2.20200818-r1.ebuild 281 BLAKE2B 5bdd3dd93efaf626935b279937ae417e67070ac6dbf9a6ecd2a608754448a72001a900156b32878408f65dcb499150d8d3d9719c27f075bc212d4108bd7dc105 SHA512 661764612b196192143ce54820e819e5eab3636d5ea8901aa743f258c0d753cb06ac98b077560b85e6213fdbd6d9e3653e2b10d917628d1350af601180eb5e20
-EBUILD selinux-clamav-2.20200818-r2.ebuild 281 BLAKE2B a7029834b43a8d6e3ebddfbe4f959cb2134a51deb3c1af8da39d0e7e065b912a0deb3fef2019c9db636131f615e7581a8104ba0bf23669e101de94910ea3cf80 SHA512 b292e5f6e6bafee380cd48d1e707b787c333248838b27511b08a058217724d9c10f8b47534b769ad970901aac21140b681acaabf9c507ba91d46b4e5cfab312c
+EBUILD selinux-clamav-2.20200818-r2.ebuild 279 BLAKE2B 93a6904f9caabc2b156e1bc07a73d9786914817855a52f8a781da3c8b1585a1b67adeab6bc0ff9a8be12eb11d540b5e53e4aca0035113b2d82cd81d16d0329e9 SHA512 b45e2a118953277e2bddc2d5fd12b129e340b9e318c015a5ca4aff09ca406e0e142b04b3f07fbb4222f79a648163014395fc05b07e7d67db98fdb6777bf4cbb2
 EBUILD selinux-clamav-9999.ebuild 281 BLAKE2B a7029834b43a8d6e3ebddfbe4f959cb2134a51deb3c1af8da39d0e7e065b912a0deb3fef2019c9db636131f615e7581a8104ba0bf23669e101de94910ea3cf80 SHA512 b292e5f6e6bafee380cd48d1e707b787c333248838b27511b08a058217724d9c10f8b47534b769ad970901aac21140b681acaabf9c507ba91d46b4e5cfab312c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20200818-r2.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20200818-r2.ebuild
index 175653a24370..c52e7ea22a9f 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for clamav"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-clockspeed/Manifest b/sec-policy/selinux-clockspeed/Manifest
index 50ec29d684e9..7d0f50c036e3 100644
--- a/sec-policy/selinux-clockspeed/Manifest
+++ b/sec-policy/selinux-clockspeed/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-clockspeed-2.20190201-r1.ebuild 287 BLAKE2B eabcb38709b528c5100be262fcdaab88e27d9f9e6a65564fdf47bb10c286cb7d25b462d5e2c6684483e64fe39a1a58acf13198374678f501bf92c2c83626d202 SHA512 7bae6f665b0fccba1b7a9ca4498634c33373b07e2dd919f34372d4b5ff2fbf75e81f069d8c2ade91732f5b4a559e6c094716a8f9621d8d2b86e44a0a9f9f2a7d
 EBUILD selinux-clockspeed-2.20190609-r1.ebuild 287 BLAKE2B eabcb38709b528c5100be262fcdaab88e27d9f9e6a65564fdf47bb10c286cb7d25b462d5e2c6684483e64fe39a1a58acf13198374678f501bf92c2c83626d202 SHA512 7bae6f665b0fccba1b7a9ca4498634c33373b07e2dd919f34372d4b5ff2fbf75e81f069d8c2ade91732f5b4a559e6c094716a8f9621d8d2b86e44a0a9f9f2a7d
 EBUILD selinux-clockspeed-2.20200818-r1.ebuild 289 BLAKE2B 2de40f79c1e5877c222d6ab922512fb8532aaaab5db3c229ec1b196b5c81ae16f82e40b1d351eeea05bde17a5bd49283d1a5884a3c275cf69ed9260c799fd035 SHA512 d8ad69ef8f90ea693e9587790dfbc07e2fd5c97bb466b42b896acce1ac99206a75d7d10709b0f037d98278f868c6a4f10c4f2d59d7edd7809839aed7a9b55d0a
-EBUILD selinux-clockspeed-2.20200818-r2.ebuild 289 BLAKE2B c9a47354758121edb5e74495a546493465379c52c9123030627d9176117570d0f025c850adc08a3f784aeda4a319048e6064aea10a9f963314927d01fa9937e9 SHA512 3ae6a6f1bb08af4ff123c1f47f010301b64435820a3ddde9aae8341ca85af84ed78e6235318cff62c633eeb50a70135df5a9a64ea0cc040b0d7e90ae404ef1dd
+EBUILD selinux-clockspeed-2.20200818-r2.ebuild 287 BLAKE2B 95979196fad8d03f868fc77fba10e6a19c42f1c7196c55c0482887444cf9c32a1e5c236e983d7204ded7ae738f4c93a153a1ffbfd57a186da1c0883b42886e75 SHA512 23e374f60c4123bd58ad36f2573617b5482a983f52f91ed8f7235e893cc85a2ba5dc86bf73817bb85381f3ef0f54e94d604024414c438a8fbe16089dc26eda05
 EBUILD selinux-clockspeed-9999.ebuild 289 BLAKE2B c9a47354758121edb5e74495a546493465379c52c9123030627d9176117570d0f025c850adc08a3f784aeda4a319048e6064aea10a9f963314927d01fa9937e9 SHA512 3ae6a6f1bb08af4ff123c1f47f010301b64435820a3ddde9aae8341ca85af84ed78e6235318cff62c633eeb50a70135df5a9a64ea0cc040b0d7e90ae404ef1dd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20200818-r2.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20200818-r2.ebuild
index 17fbadc39bb7..a258f8e30685 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for clockspeed"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-collectd/Manifest b/sec-policy/selinux-collectd/Manifest
index 12272eb3798f..406d06a390a0 100644
--- a/sec-policy/selinux-collectd/Manifest
+++ b/sec-policy/selinux-collectd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-collectd-2.20190201-r1.ebuild 381 BLAKE2B 17a959cd1db858ee52adaf8020211354cd5c91145a07ff7c4bba7c333c7428a08b098ce1eaa98a5bbc66b33ab740dd76f9dbaed419b54199c696f4f31bd44c2b SHA512 32002c22388a3b6e79a2a39380f1270d73b3e91e47872b72bcb69cfc7ca8a9f2ce0e408b35c2b8446f2afb3c69dbc4821f22148ce778e2c708ebe4f742853cde
 EBUILD selinux-collectd-2.20190609-r1.ebuild 381 BLAKE2B 17a959cd1db858ee52adaf8020211354cd5c91145a07ff7c4bba7c333c7428a08b098ce1eaa98a5bbc66b33ab740dd76f9dbaed419b54199c696f4f31bd44c2b SHA512 32002c22388a3b6e79a2a39380f1270d73b3e91e47872b72bcb69cfc7ca8a9f2ce0e408b35c2b8446f2afb3c69dbc4821f22148ce778e2c708ebe4f742853cde
 EBUILD selinux-collectd-2.20200818-r1.ebuild 383 BLAKE2B cd94dc9ec044608768fb740cff2583d0232a6ca167719aab9caa374b9b503d9f86e33a72292f94509bcfaa3ef56fac0b453a9b8073336197685fed0e3b8a523e SHA512 6a79b8ccca6badafb7ea278f82fe5985d2290ae28e42b1aea4ae6ebdcb6d6fb0d19ec649794349ec0fc794320e311af5a7f2f2b4fefbff7e53aef9d9382b7fb6
-EBUILD selinux-collectd-2.20200818-r2.ebuild 383 BLAKE2B bf81c5e7184410d5b7dc8e376de4ef80c74e873481b9f1d5c255f37a24ebb94b76d8377623f6d38251f1eceb4c107f01b22ac2c26fb32a9f665744cdb2ca8aac SHA512 eef8aa0773fb031810b8133a4fcbbd6d4a3b0cffda563b1a31cc11fc9ce3fed1bae9ec4f71fb376aae3770e8e198ebc027f9e52d5259715e4976fdc3871bce87
+EBUILD selinux-collectd-2.20200818-r2.ebuild 381 BLAKE2B 00a9c737194e1dfbd8f5e37da296e0c84ac96aad65b71bfe6eff7b9ef9d6252b6c7df141e873e5d9dda8c331f15b9a707747e782692ad07d887eed8d4293d32a SHA512 8bc799f08781661d03d4cb3e55472388860f0a8062ba77d0ad914b1aa580476dd8a67a425d40d93b6ea30bf22722e7249fd2dbe29c00993c3b446bf369094fae
 EBUILD selinux-collectd-9999.ebuild 383 BLAKE2B bf81c5e7184410d5b7dc8e376de4ef80c74e873481b9f1d5c255f37a24ebb94b76d8377623f6d38251f1eceb4c107f01b22ac2c26fb32a9f665744cdb2ca8aac SHA512 eef8aa0773fb031810b8133a4fcbbd6d4a3b0cffda563b1a31cc11fc9ce3fed1bae9ec4f71fb376aae3770e8e198ebc027f9e52d5259715e4976fdc3871bce87
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20200818-r2.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20200818-r2.ebuild
index 3ee063a846b7..cbdd0ffe4c23 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for collectd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-colord/Manifest b/sec-policy/selinux-colord/Manifest
index 40b8d246eb0b..567a9e139418 100644
--- a/sec-policy/selinux-colord/Manifest
+++ b/sec-policy/selinux-colord/Manifest
@@ -5,6 +5,6 @@ DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f
 DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623f8b3fbdeac19f9f01126722a368b7d4f70427d6e4a574754c4f2fa551e4bc75c912dbc515c004f0dcd5eb28ab416498f6 SHA512 e4b527bb7a87b9359fc42eb111d5008103f57c37128998ea0e21ec7b0b8607ffe3f67697450e4c51a0db172ece69083335b279bacef4b1bd0b7748b58caa99a7
 EBUILD selinux-colord-2.20190609-r1.ebuild 279 BLAKE2B 7533377ec675c3836471a1082a6cb8aa30612eba93f36bea096333d3f1f278f3709334a8e20ec3230a930adaa0484b843f4d18fe169d781acaf2608b6604f181 SHA512 337bb2a2c3cbf549c948bab5335046b550821614dd637cd3f7edb99b6efde16d4a1b4fdaa67e709108233695efc6fcea725b30095799ea9903ce3422a6bf23a6
 EBUILD selinux-colord-2.20200818-r1.ebuild 281 BLAKE2B 2c79abc44e75d49233d2084ee6a0af4d942bfddf0c510c5acb397148e89e4a82fd70a5d1a6dff743c58268ceb2c7c1a36a4ccd7cd117102e3da50cb22455cab0 SHA512 e8a0b181fb4bc3884379ed93b4bcd49c5f2c523eb75b12b05956ba715056a08b725417e905188e8d1905545a3a35edfef7d45c5f00e122b4b3402248b01b1ffd
-EBUILD selinux-colord-2.20200818-r2.ebuild 281 BLAKE2B 2bf92942362699080cc8031431650a844ddc595d6374388e9430ab1e54d9d2f8c7deec81ed5b6c8a5de7f64b05d53498cc6f3415b93241b730bc8ae44730ccf5 SHA512 030068cb88957b1accda47b266f516fadd0f48a6dc35ecec71d67907baafa8c5304057a5be849bab03b2d9f0c6f673cec7e214ed5351dde54b07852dedf512df
+EBUILD selinux-colord-2.20200818-r2.ebuild 279 BLAKE2B 1bef57f05145832f9e01b57cc289713a38e2c6f6b5cf2941cc206395dd6a7d92bd688f975704294602be01cbfcc4d5b03f13d6d8b188b9063e5a5461ab6025d0 SHA512 8644851dd1d2e818ce71fae22517f623fc89a3ba73369b08f7a305d4b69a386579f03edb754298bc1ded53bb6c9225d567ebe001fbbbc57c1b4c2cfa78846cb3
 EBUILD selinux-colord-9999.ebuild 281 BLAKE2B 2bf92942362699080cc8031431650a844ddc595d6374388e9430ab1e54d9d2f8c7deec81ed5b6c8a5de7f64b05d53498cc6f3415b93241b730bc8ae44730ccf5 SHA512 030068cb88957b1accda47b266f516fadd0f48a6dc35ecec71d67907baafa8c5304057a5be849bab03b2d9f0c6f673cec7e214ed5351dde54b07852dedf512df
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-colord/selinux-colord-2.20200818-r2.ebuild b/sec-policy/selinux-colord/selinux-colord-2.20200818-r2.ebuild
index 23a3190bf232..ec5a931130c4 100644
--- a/sec-policy/selinux-colord/selinux-colord-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-colord/selinux-colord-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for colord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-corosync/Manifest b/sec-policy/selinux-corosync/Manifest
index 9519a6ae46b4..aa3a1588baf4 100644
--- a/sec-policy/selinux-corosync/Manifest
+++ b/sec-policy/selinux-corosync/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-corosync-2.20190201-r1.ebuild 283 BLAKE2B 2198e3f80286408935d77bf920acb978cbec53833d094019bb1a7bc9b798730211ee1b877bed9d0a303d80ddafdc8969a892981ea1640367ef595408c7c28891 SHA512 52d07533b627a57f879c20b400190c3c7640b690050fa67f7e0522a03deb79453fcfc2d0146a741cd6bc48aadb981ce2353e3cf593e41fe2a235d40941f7fd49
 EBUILD selinux-corosync-2.20190609-r1.ebuild 283 BLAKE2B 2198e3f80286408935d77bf920acb978cbec53833d094019bb1a7bc9b798730211ee1b877bed9d0a303d80ddafdc8969a892981ea1640367ef595408c7c28891 SHA512 52d07533b627a57f879c20b400190c3c7640b690050fa67f7e0522a03deb79453fcfc2d0146a741cd6bc48aadb981ce2353e3cf593e41fe2a235d40941f7fd49
 EBUILD selinux-corosync-2.20200818-r1.ebuild 285 BLAKE2B d9d892f294b0326a63ed38599e4d497063ff0a89038911c6b0621acf44051c464798536333b11277785ecd2bc8d98f52a628707f10635020c0a4af1287c96629 SHA512 c469ec40bc04d4ea0e4bc542821bad0744e84134088aa65ea23b5c5eca7bc44e3cf04c6e3a9cb9106cb049197074cbe429493d1b91aa156998c7994ee310189c
-EBUILD selinux-corosync-2.20200818-r2.ebuild 285 BLAKE2B ed892cb2e317e241d491714492ac9bc6155def0ca88e1ddb93b547e7b90b80fc06d88a5d91216ecd307ca58827b6dc090106ca6fa450a92f5772980e051aaded SHA512 b011076dedc8f5106f0cac8999e698cd68e2b69dfe2892690521c40932b219623dee2b2a3a2c061fe97f2c461a1bdb97d2b82039f36be26e718c0c68e2960126
+EBUILD selinux-corosync-2.20200818-r2.ebuild 283 BLAKE2B 006d42cf2a5d760e04d75a074124af106dd778d34f8cae5e2381da3dae4267eedd8dcb7566c56fe593f3b5eb28689d5ba2ee4a18b67c720939bdd7dd6c5c14fd SHA512 bcfdb9ff7e80d71528a39ac4a1acfdd8d7e3081d22edff4f7fbea960b38c1f8656f5fbc7c06d35c4e8378825965d0db3c1714888b5be55d91644258fdd982916
 EBUILD selinux-corosync-9999.ebuild 285 BLAKE2B ed892cb2e317e241d491714492ac9bc6155def0ca88e1ddb93b547e7b90b80fc06d88a5d91216ecd307ca58827b6dc090106ca6fa450a92f5772980e051aaded SHA512 b011076dedc8f5106f0cac8999e698cd68e2b69dfe2892690521c40932b219623dee2b2a3a2c061fe97f2c461a1bdb97d2b82039f36be26e718c0c68e2960126
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20200818-r2.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20200818-r2.ebuild
index 01ef9b5e47de..c2948d783e0d 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for corosync"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-couchdb/Manifest b/sec-policy/selinux-couchdb/Manifest
index b3efd0a06c66..6c478be5accf 100644
--- a/sec-policy/selinux-couchdb/Manifest
+++ b/sec-policy/selinux-couchdb/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-couchdb-2.20190201-r1.ebuild 281 BLAKE2B d513c992867bc074159e5527a9283d624c33515c95e2a45941ae2141f6c0cedd24499dd656bbf5d8fd7af5c09d683d092ab8abc7a9834583200ba3ca28670c4a SHA512 3dcb4fe88cd1dc914e3825353dc86deefbfdcbd2910e539587c7facfc665f54395d98ac6a2432ad24bab092bff1044533da6608b78e85d59b708e9e5260037e8
 EBUILD selinux-couchdb-2.20190609-r1.ebuild 281 BLAKE2B d513c992867bc074159e5527a9283d624c33515c95e2a45941ae2141f6c0cedd24499dd656bbf5d8fd7af5c09d683d092ab8abc7a9834583200ba3ca28670c4a SHA512 3dcb4fe88cd1dc914e3825353dc86deefbfdcbd2910e539587c7facfc665f54395d98ac6a2432ad24bab092bff1044533da6608b78e85d59b708e9e5260037e8
 EBUILD selinux-couchdb-2.20200818-r1.ebuild 283 BLAKE2B f37dfb9039e9ca48ce9c02429ffd26e5ce4af6256363b8d12d6caa3fcb20bdbf8e006586bb8fc69e50d6f9f8d5e50ecc0dff46ad7efebc015f3633cc5d42d68d SHA512 df1942c430e90e5d523d2c273e5439080bbf1cc9f5d8b5e42155bb7717f54f966384d766ad7d0bdb7c9a8c77679d4116903970dd9a3dd1afe9aced15add75f68
-EBUILD selinux-couchdb-2.20200818-r2.ebuild 283 BLAKE2B 9ed40c6db3bd6a174dbcb3d8ef1e6b6972572e366556336119cfc353c33bdc6f6d904336cb6710854467401a19d61ca63635a55a0119534dc94b0795385c3c17 SHA512 c5ec6c2f70e89e65c67902cf1961a35f447e51957a396ce4bb402f1c7331651cb4520bbd8dc131f2e050cd628499e2c192521387b1ce3ce94331fb74d687317d
+EBUILD selinux-couchdb-2.20200818-r2.ebuild 281 BLAKE2B dfdb882db42a455a5cb89fc9f5951328bf66f2f17ba9324d775fbc9f16df2532597cb54d994cdbdb170621936bc0acbc4b4ca0b5dce3003cb226a1f3d12439a2 SHA512 bfd204f33b2a12f16b561aa1b1446b25a05e240040388450c497198315c3a94f8b101b6d72bc1cdf6d121a0cc3e30a33d91b10abd223decd4c20a6e94e5466cf
 EBUILD selinux-couchdb-9999.ebuild 283 BLAKE2B 9ed40c6db3bd6a174dbcb3d8ef1e6b6972572e366556336119cfc353c33bdc6f6d904336cb6710854467401a19d61ca63635a55a0119534dc94b0795385c3c17 SHA512 c5ec6c2f70e89e65c67902cf1961a35f447e51957a396ce4bb402f1c7331651cb4520bbd8dc131f2e050cd628499e2c192521387b1ce3ce94331fb74d687317d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20200818-r2.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20200818-r2.ebuild
index 836da67be746..e848fe36fa0a 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for couchdb"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-courier/Manifest b/sec-policy/selinux-courier/Manifest
index 3e25576aab23..e9d59ff950ea 100644
--- a/sec-policy/selinux-courier/Manifest
+++ b/sec-policy/selinux-courier/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-courier-2.20190201-r1.ebuild 281 BLAKE2B e6e04cb26645e913102a74a20379a539c635ea04a589112a9bad7558b1cb31fe1fdca03874e06803357ef49757ec0ee430649313f5c18073e84c21d87d586788 SHA512 ddaf17f887197b7fc9ec29327bce47692ed76509f948cc139fa909025236f8623473bcb788fbfe1f49441917d4187354ba938580796ab55318c5109b7dd8d8ab
 EBUILD selinux-courier-2.20190609-r1.ebuild 281 BLAKE2B e6e04cb26645e913102a74a20379a539c635ea04a589112a9bad7558b1cb31fe1fdca03874e06803357ef49757ec0ee430649313f5c18073e84c21d87d586788 SHA512 ddaf17f887197b7fc9ec29327bce47692ed76509f948cc139fa909025236f8623473bcb788fbfe1f49441917d4187354ba938580796ab55318c5109b7dd8d8ab
 EBUILD selinux-courier-2.20200818-r1.ebuild 283 BLAKE2B 578e5cac584f4519bba456aa412db2be023c1c11fb81a8aec72f9a70af2bbf46e0b0363b6bdd8a739fbf143482e3a1f07892664948298c799d923a3d2725ff9d SHA512 795133130f9a9eb0b01d2394e2e59871cd2839588b71d848bc17787f957b57f29fa79b6baa96ef6a807dd3a1b635b44773b33ba954946a542d43e4124adf6192
-EBUILD selinux-courier-2.20200818-r2.ebuild 283 BLAKE2B cbfd0e460d66f711cc4c4cf1d5254fe9628014bb581b654f88e7611cd7dcc7b49b1d3a67679e8efad5b2f4aba5ec3767cc2029206af13937c5afd7a4be876c0f SHA512 d96822e50b97db25b3a3deccea24dcbe1833dc21fe6b7bebfab96dfa5d9cfcf8688c1946bd193b7e569eac239d7b56f1dd46f64570cd4e063fa9e7180c3654c1
+EBUILD selinux-courier-2.20200818-r2.ebuild 281 BLAKE2B 1686068808885492f8cb337e1f0869ad28ff6fec977b794aa2e27a9f102cf4f9f3e87d003671e59d43048bb9265962dd6d9637f2957bb61b4eb20c0707e85dff SHA512 2654a3d6c20c3dc1847228865209fe44029d94ba187d333170cb1c32442042ecd35c1018169987eb48d40bbc5358bab95e0e4ee6a7dfa5f9bac9561032889774
 EBUILD selinux-courier-9999.ebuild 283 BLAKE2B cbfd0e460d66f711cc4c4cf1d5254fe9628014bb581b654f88e7611cd7dcc7b49b1d3a67679e8efad5b2f4aba5ec3767cc2029206af13937c5afd7a4be876c0f SHA512 d96822e50b97db25b3a3deccea24dcbe1833dc21fe6b7bebfab96dfa5d9cfcf8688c1946bd193b7e569eac239d7b56f1dd46f64570cd4e063fa9e7180c3654c1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20200818-r2.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20200818-r2.ebuild
index b339fb697bab..7503f7727ce4 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for courier"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/Manifest b/sec-policy/selinux-cpucontrol/Manifest
index f40da28c0e72..61fea011981d 100644
--- a/sec-policy/selinux-cpucontrol/Manifest
+++ b/sec-policy/selinux-cpucontrol/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-cpucontrol-2.20190201-r1.ebuild 287 BLAKE2B 0a8439d581fd71bfadcb0796bf8b9f5cf77e8c0bd90cd2ac43d03d4c82916f27229d57c31b4acc6febd9873a8c2770515e3356441f7e485e5ad5873709f8d2f9 SHA512 c6be951c5208174d18a425e9fecd53e2cb0fccdf69cc88a395933e16e8fcb5bf0d80af7d55807856e140ac38641689e8ed7c47dae4f9779238df7ed29d635c9a
 EBUILD selinux-cpucontrol-2.20190609-r1.ebuild 287 BLAKE2B 0a8439d581fd71bfadcb0796bf8b9f5cf77e8c0bd90cd2ac43d03d4c82916f27229d57c31b4acc6febd9873a8c2770515e3356441f7e485e5ad5873709f8d2f9 SHA512 c6be951c5208174d18a425e9fecd53e2cb0fccdf69cc88a395933e16e8fcb5bf0d80af7d55807856e140ac38641689e8ed7c47dae4f9779238df7ed29d635c9a
 EBUILD selinux-cpucontrol-2.20200818-r1.ebuild 289 BLAKE2B fbd731b00268b790bc980e24fda334ce4fe147ecc235af9ed105d3ae4bbcc26171bb957c97f98c3d045637c8e28bf7945c6e968b06bcdbf5896176d5fe611d40 SHA512 0307bcec416da26b2e82e069405cdfb76ccad9eca9e5cc29c191d1637e019629c80d90565816201ca607a82e91ece8e00689fa1a31c7562c4389e2b404e34501
-EBUILD selinux-cpucontrol-2.20200818-r2.ebuild 289 BLAKE2B a5369450443129fbb1e163637e1012fecc8f96636fe278143797ab2482be3d3a58cffa9651d7822e5941be33412af1367dd8f878aefa8ce46b64b3b19fccfc60 SHA512 3dde3f0252e44e83ffc206cbcd1d6bed489b0ff37634b563e177582dd116073ed9a5bff68e260f0007b2a42a0b1e96f40c6cb986f5f2ee1a5a3badffbae91b49
+EBUILD selinux-cpucontrol-2.20200818-r2.ebuild 287 BLAKE2B fe0a5f84c50242dd35aaa9ef8316e110323fbf2bdbff2f9a5168856ab31deeafb0f06055d93f2657d2ebd59d6a8fa4bf0cde233bc244c44167e2d35bd30636d3 SHA512 9b45a08a551668be2717ee1878c05e7b2b32c1e22361aed06ee1275ac460abfe9a0d8b662502acb2983044589c63a98a4861ece9e168225c9feae44b3976b1de
 EBUILD selinux-cpucontrol-9999.ebuild 289 BLAKE2B a5369450443129fbb1e163637e1012fecc8f96636fe278143797ab2482be3d3a58cffa9651d7822e5941be33412af1367dd8f878aefa8ce46b64b3b19fccfc60 SHA512 3dde3f0252e44e83ffc206cbcd1d6bed489b0ff37634b563e177582dd116073ed9a5bff68e260f0007b2a42a0b1e96f40c6cb986f5f2ee1a5a3badffbae91b49
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20200818-r2.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20200818-r2.ebuild
index 5631964e6187..6c5b9f7ef11f 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cpucontrol"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/Manifest b/sec-policy/selinux-cpufreqselector/Manifest
index 8a6c06b89db1..747e576f392e 100644
--- a/sec-policy/selinux-cpufreqselector/Manifest
+++ b/sec-policy/selinux-cpufreqselector/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-cpufreqselector-2.20190201-r1.ebuild 297 BLAKE2B be345972d93d700482d355cdee230c9ed9d1c1a41b14dcad74009a741d38cd036600889feb68701f87485aa2e8ef751efad82e8b0eb183f1046cde5efb2f2c8f SHA512 50ab8d4b3c8f2ee4eb2de411f1d514e7aaaef0497957da1b9e928d9925f29400d8ad2f79092efc6064a0b1b45ea5a1b7cf15e6fbd1dc8c901191178bbc7721d8
 EBUILD selinux-cpufreqselector-2.20190609-r1.ebuild 297 BLAKE2B be345972d93d700482d355cdee230c9ed9d1c1a41b14dcad74009a741d38cd036600889feb68701f87485aa2e8ef751efad82e8b0eb183f1046cde5efb2f2c8f SHA512 50ab8d4b3c8f2ee4eb2de411f1d514e7aaaef0497957da1b9e928d9925f29400d8ad2f79092efc6064a0b1b45ea5a1b7cf15e6fbd1dc8c901191178bbc7721d8
 EBUILD selinux-cpufreqselector-2.20200818-r1.ebuild 299 BLAKE2B e3ab8851a8d0ab7e24d81328e6821936ff6e1ca9ec71c8f58d5182d3c5387e22b3904f58d24a3591ac8ff687c42d5049cecdcb2b4332b86e6a8dc850399d1bbc SHA512 9228ffc15c708ee3eb34b4ade9c2deac281cf0c9c5ab5ca5de6c553cc121829f136101902427676ca0a524d5558ca90571815f08e3363a6ac3dc32679a2c30d8
-EBUILD selinux-cpufreqselector-2.20200818-r2.ebuild 299 BLAKE2B cf1e149e285aeb80d7beb21f592c30f4828275c720c60d4dcfd7c360cefc2fca9f20eef035610a0e1a539906663bac9b3742ead4623df6c8afde4cf662d807c4 SHA512 9cd369f287da50033d8b424046b53c89d4725aa4acc156c14ada8035347966a2d595037adcfb8b1ed899d02178f8cff326b5490b1c00acba35a4272770e47547
+EBUILD selinux-cpufreqselector-2.20200818-r2.ebuild 297 BLAKE2B adbed823b16bbe82d6d37c70a08e94eebe100d962c43feafea6cc20af19572ac9000ae91012a6531aa883376191136b558448e6eee97e3bce3d460a63eaaed71 SHA512 ef14f2ec10a112f485f9148b2ab92ee0e37805ed3a9ef43a152cc24f1d9bfd8ac285d138541510a8dc744e238d4c58d09a329c987f129d5b5162417651dfc634
 EBUILD selinux-cpufreqselector-9999.ebuild 299 BLAKE2B cf1e149e285aeb80d7beb21f592c30f4828275c720c60d4dcfd7c360cefc2fca9f20eef035610a0e1a539906663bac9b3742ead4623df6c8afde4cf662d807c4 SHA512 9cd369f287da50033d8b424046b53c89d4725aa4acc156c14ada8035347966a2d595037adcfb8b1ed899d02178f8cff326b5490b1c00acba35a4272770e47547
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20200818-r2.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20200818-r2.ebuild
index dd01543ba1ff..45d811704442 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cpufreqselector"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-cups/Manifest b/sec-policy/selinux-cups/Manifest
index 40bc2c77073c..3d3644727097 100644
--- a/sec-policy/selinux-cups/Manifest
+++ b/sec-policy/selinux-cups/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-cups-2.20190201-r1.ebuild 365 BLAKE2B 4f29ef848b343bd3c6e68c8ecd4193ff17cd3614820431aedf25f48997a1604e2635ba94dc5bc58bf8c567ae4e478b294932ac20f314a0285ffcb7a102b87f0b SHA512 201adc81cb9346b8642da2fa3e5df8504d68fb4a42514ccd0f1537c43c4f8543cb9ac891aabd687e6e2e3bea47b8ad37feddb763228581397fa0e0aff6757471
 EBUILD selinux-cups-2.20190609-r1.ebuild 365 BLAKE2B 4f29ef848b343bd3c6e68c8ecd4193ff17cd3614820431aedf25f48997a1604e2635ba94dc5bc58bf8c567ae4e478b294932ac20f314a0285ffcb7a102b87f0b SHA512 201adc81cb9346b8642da2fa3e5df8504d68fb4a42514ccd0f1537c43c4f8543cb9ac891aabd687e6e2e3bea47b8ad37feddb763228581397fa0e0aff6757471
 EBUILD selinux-cups-2.20200818-r1.ebuild 367 BLAKE2B 1a809a243e9af7132a53388d58480299fbc3e4b7484726867e74aa3d9470f25b823c944e61538f2f7851e49d755b2f0fbb47df06a2a24c0d6e0b987408eada4d SHA512 9abbe9c488f09c657a3fe9b28c9c678992e77ea829fe621a44f2fc9b18aee44f49f54b4d5915eab6e71bdfa496fcb529e3d06e3a79829e45aeacbfc9e69de801
-EBUILD selinux-cups-2.20200818-r2.ebuild 367 BLAKE2B 5b06649b8e59b11f3e42f0eb1ca7ab62719e89b34381006898d0cc1765edcb7744c0931b8ce961ab378b041d21aa05e91380d67a804862cd826c60644540c01d SHA512 7d49edb167010339c717725bd4758c3a1a87f6a9dbe63e9b83204f40bb62e55e797df6852e26c8baacff2b5c79af407ce6b0aa03b4c2fec6d848cc02d6812161
+EBUILD selinux-cups-2.20200818-r2.ebuild 365 BLAKE2B a0b453cf2bcd2b963a839e4f4fa8926347efc12603d19192b50d18883cf47807dcedb214876e64a8fdff70bf962e6cab94a8a747d2bcc37c687e5d326973a313 SHA512 ec8f5ca272f6fde1a0819886e2c4411af851bc60183371209c750e0fc8cb397cf1c000b940ffd7f0d1228f0c6cace2337284ad3beeff12cbdda389604d636bdc
 EBUILD selinux-cups-9999.ebuild 367 BLAKE2B 5b06649b8e59b11f3e42f0eb1ca7ab62719e89b34381006898d0cc1765edcb7744c0931b8ce961ab378b041d21aa05e91380d67a804862cd826c60644540c01d SHA512 7d49edb167010339c717725bd4758c3a1a87f6a9dbe63e9b83204f40bb62e55e797df6852e26c8baacff2b5c79af407ce6b0aa03b4c2fec6d848cc02d6812161
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20200818-r2.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20200818-r2.ebuild
index 6a824d4c173d..e940e669fe9c 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cups"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-lpd
diff --git a/sec-policy/selinux-cvs/Manifest b/sec-policy/selinux-cvs/Manifest
index b3d8286e556e..8ef071653448 100644
--- a/sec-policy/selinux-cvs/Manifest
+++ b/sec-policy/selinux-cvs/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-cvs-2.20190201-r1.ebuild 421 BLAKE2B 7b1d4e66a76a2f87b2215685199026603b2a4e78cba080e73684fb9cc5dc864ba90ea35510d97c316c9a8d2477ef58c748f4ada85dd5d7d323580185fd722226 SHA512 c8e1c4975eed2c29214bcc2a915b37d1acd06b258210d99784a0418d49770d9546453d978122ee55b03c783965dc15f4a75b861bcfc4f280c18c040998219b3a
 EBUILD selinux-cvs-2.20190609-r1.ebuild 421 BLAKE2B 7b1d4e66a76a2f87b2215685199026603b2a4e78cba080e73684fb9cc5dc864ba90ea35510d97c316c9a8d2477ef58c748f4ada85dd5d7d323580185fd722226 SHA512 c8e1c4975eed2c29214bcc2a915b37d1acd06b258210d99784a0418d49770d9546453d978122ee55b03c783965dc15f4a75b861bcfc4f280c18c040998219b3a
 EBUILD selinux-cvs-2.20200818-r1.ebuild 423 BLAKE2B cb8d7d9e35dab2656a932fc98eda248d0ee09623053a8813d7fc25d8414085f77256baa76d63974d0d089ecad11bbdc7e8bed600bcdb590134e9027d0eb19b3c SHA512 b0a8cebfa2209b098b68b81588468ea237bf5fb40dcfa004ee32dc1ad913b2b1982cbd854e6f97da481ab494408a46b6a271cd8f6da8e4b116afa1a3e1c46d4e
-EBUILD selinux-cvs-2.20200818-r2.ebuild 423 BLAKE2B 468983328fa1a148f2243386a9128cc8f0acb230bba0c7637d97db07cc8d40f74c3dcb1b5a5dbd3b52043ff7722ec9126a13aee19d0c4fd146c9a347222a37c3 SHA512 7b9ed6a0545ff606cdd383f55f596d7e373dd11e3e170488102e5ad7b5cf1f374f14177431843c552b8e252fae4049a076d153e19aeb768a3d76f8fa10d851ba
+EBUILD selinux-cvs-2.20200818-r2.ebuild 421 BLAKE2B b76bfdc3aec9ac9612da2bda87c4d353784fd7767d04e8ca2f477ebb51faf51eeaaa3b7d4c2f8c57a77bb23ae9d54a98500b2dfec54cb67b10d8de3dfabd70ae SHA512 f26cea9a6e4fe926793d7057cd1a4caecb64ce0243d2c7f9570cc38336dc33db0e949df1594c10ae264bd5df860c7bbf4319172e8c74834e8a931b4ea94fc41c
 EBUILD selinux-cvs-9999.ebuild 423 BLAKE2B 468983328fa1a148f2243386a9128cc8f0acb230bba0c7637d97db07cc8d40f74c3dcb1b5a5dbd3b52043ff7722ec9126a13aee19d0c4fd146c9a347222a37c3 SHA512 7b9ed6a0545ff606cdd383f55f596d7e373dd11e3e170488102e5ad7b5cf1f374f14177431843c552b8e252fae4049a076d153e19aeb768a3d76f8fa10d851ba
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20200818-r2.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20200818-r2.ebuild
index c502223cdfdd..1000730d9f6d 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cvs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-cyphesis/Manifest b/sec-policy/selinux-cyphesis/Manifest
index ab01f3ab2c16..1d9211d5c472 100644
--- a/sec-policy/selinux-cyphesis/Manifest
+++ b/sec-policy/selinux-cyphesis/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-cyphesis-2.20190201-r1.ebuild 283 BLAKE2B 14ba4a4d0ece648f0a550a0941472fd4d2d9a29d1293b6b510f264a4113881242353920f5aa95555487650043e52cdc32ff31f42e4f41dc583c7fa1bcf927782 SHA512 92a586f376ab93f8f8ab0c6893eeafedcf6ccb5ef3609ca4bd5a63dadd143dd8315453cc19371c4e69edeb9e1daab2955231dc93ba353d1f9552426b5e5065c2
 EBUILD selinux-cyphesis-2.20190609-r1.ebuild 283 BLAKE2B 14ba4a4d0ece648f0a550a0941472fd4d2d9a29d1293b6b510f264a4113881242353920f5aa95555487650043e52cdc32ff31f42e4f41dc583c7fa1bcf927782 SHA512 92a586f376ab93f8f8ab0c6893eeafedcf6ccb5ef3609ca4bd5a63dadd143dd8315453cc19371c4e69edeb9e1daab2955231dc93ba353d1f9552426b5e5065c2
 EBUILD selinux-cyphesis-2.20200818-r1.ebuild 285 BLAKE2B 2baba8f35087be47a337145d10d4159b5d448fac503f732952bd6ff9221c296db92a10f0835e979a2e17a1c3359b427fe9b02a2448c0440b4b77b3c69d71fc2d SHA512 22caaa32cc1579b9e63dcb2808511a8022b841827d47ad754899799503218e52da1b0939fabdfc4d130690970d66ab59db02f298efaa8f5901180a27bb63ee80
-EBUILD selinux-cyphesis-2.20200818-r2.ebuild 285 BLAKE2B b163dcd35b595a2ede86277d9e8394bcac5dc45203d06636fb06f0e2dc831c6fdad7a9cfc18036a5a58f919ea01b480b61439858bf46e7b86a3662e792539f2e SHA512 8bb8132cf9b0eb7c211eef3c3d9f6d03ddbeade6294da2d4740a021b401864c2900415432f1f6579dfc54804f9121e59f76fd015b54ce59c230828519e1c5a99
+EBUILD selinux-cyphesis-2.20200818-r2.ebuild 283 BLAKE2B 113ea5abe5f44d27382ca93067066dfbdcb4453b0ac12d0c83c4d7726aef4bb0b14f77f92b88ef57e4fee05467ef7119a3972e7316260ee3cabd716141a3649f SHA512 a7095e195de2eab48683c4b53170af1989f2d8938557f8df4ef70e332411e479bb9464ade216cb0e74e43c3217bd73050b6b90ed7541545d394469fd0b5e9f3f
 EBUILD selinux-cyphesis-9999.ebuild 285 BLAKE2B b163dcd35b595a2ede86277d9e8394bcac5dc45203d06636fb06f0e2dc831c6fdad7a9cfc18036a5a58f919ea01b480b61439858bf46e7b86a3662e792539f2e SHA512 8bb8132cf9b0eb7c211eef3c3d9f6d03ddbeade6294da2d4740a021b401864c2900415432f1f6579dfc54804f9121e59f76fd015b54ce59c230828519e1c5a99
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20200818-r2.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20200818-r2.ebuild
index f2de782a24bf..a469b664393e 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cyphesis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-daemontools/Manifest b/sec-policy/selinux-daemontools/Manifest
index 9b70cea773f1..fbf800b34feb 100644
--- a/sec-policy/selinux-daemontools/Manifest
+++ b/sec-policy/selinux-daemontools/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-daemontools-2.20190201-r1.ebuild 289 BLAKE2B 78cce0f411f28593b77ab3ae118d9d2c36f831b872999addc9538e9bf0cec07905b23a8efd0eb5106d23cbb22db6173f8c2e67783d1e2d628e8c4892e2c664ce SHA512 09034e7453c7238104df33817bb83db38c7feed14a245ee01f28a11eac6ba746c3fe8ee48c862761e78d951c13ebd407b84d0f8dd4383263d1cd38f01dcf2b90
 EBUILD selinux-daemontools-2.20190609-r1.ebuild 289 BLAKE2B 78cce0f411f28593b77ab3ae118d9d2c36f831b872999addc9538e9bf0cec07905b23a8efd0eb5106d23cbb22db6173f8c2e67783d1e2d628e8c4892e2c664ce SHA512 09034e7453c7238104df33817bb83db38c7feed14a245ee01f28a11eac6ba746c3fe8ee48c862761e78d951c13ebd407b84d0f8dd4383263d1cd38f01dcf2b90
 EBUILD selinux-daemontools-2.20200818-r1.ebuild 291 BLAKE2B 5e9313a463fa23b8214ddbc98b43fbda39f674438c199902668a981bc4ce6f0ae7b92e2b7bf0ef2e5b7d6dd0c7e1b44a18303e1077fe4a7c76f578bd63b7a89d SHA512 0f5d66788ae64a780244a060ba63d68b22c7ff3cc572889153d942243ae45b3741ac806eb3014fdd79f8592cae88f0b639a5ca4a43fd2e7a9b52d5b19ca1d785
-EBUILD selinux-daemontools-2.20200818-r2.ebuild 291 BLAKE2B 77d3fafcecc1feb818596907209ce8fbadc2cf4dfc0df515c90bf7f50a64cff838015f1e6116b60ad3a585071b7147048a9fc6e2dbbeefb83595340c50a7c697 SHA512 3bd6cd6c606588f9236bc6b0ba65243612052848a9dc55b705371d0e0b2f798b7177aae293c92bf090ff7fa55f5d3a647bdfffeb07a0f19d1e9ee752c2dedbb4
+EBUILD selinux-daemontools-2.20200818-r2.ebuild 289 BLAKE2B 0e0a4bd7a6a1f9ed5c253fb7dae4982a358507d3b6662a9d603dec1ec0f63eb9366e160df96efa9707a4cd312952468651c995e1066b18c6cc835112ab1f5999 SHA512 318f7f8818f644a4d2c914d8ba835a147e7d6320ebcab675695c919a65ebbcd27dc0bae5be3b0fac6eac1fc771f074b8ce5cd9174e7b5be0ed933bd7564d04a1
 EBUILD selinux-daemontools-9999.ebuild 291 BLAKE2B 77d3fafcecc1feb818596907209ce8fbadc2cf4dfc0df515c90bf7f50a64cff838015f1e6116b60ad3a585071b7147048a9fc6e2dbbeefb83595340c50a7c697 SHA512 3bd6cd6c606588f9236bc6b0ba65243612052848a9dc55b705371d0e0b2f798b7177aae293c92bf090ff7fa55f5d3a647bdfffeb07a0f19d1e9ee752c2dedbb4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20200818-r2.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20200818-r2.ebuild
index ee67b6561bc4..2f9b88fd90ac 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for daemontools"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dante/Manifest b/sec-policy/selinux-dante/Manifest
index a04dfdbd6e4f..61009c5f3e2f 100644
--- a/sec-policy/selinux-dante/Manifest
+++ b/sec-policy/selinux-dante/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-dante-2.20190201-r1.ebuild 277 BLAKE2B 71889654b43a1be75dc76719fdf465862e176d1c9a65c713cfa7f77fc30b15f59b278555ad4434cb108ee7dce58549a78f79da17d948ec176078a836f8294584 SHA512 b1a63f75afd135c8cffca782335e4bafa2f10260cc128370d6c6b5038cccc19f038ce4c3022bed3c5595a359f8915c378cfe4604378004f43f4251cf4b9a11ee
 EBUILD selinux-dante-2.20190609-r1.ebuild 277 BLAKE2B 71889654b43a1be75dc76719fdf465862e176d1c9a65c713cfa7f77fc30b15f59b278555ad4434cb108ee7dce58549a78f79da17d948ec176078a836f8294584 SHA512 b1a63f75afd135c8cffca782335e4bafa2f10260cc128370d6c6b5038cccc19f038ce4c3022bed3c5595a359f8915c378cfe4604378004f43f4251cf4b9a11ee
 EBUILD selinux-dante-2.20200818-r1.ebuild 279 BLAKE2B e800aeca3aa5708886d53df2532f6f866637d03777a9df287be3a9dfbb6314b9a9f04e4edfef9249fecb83f76d7e809c6ec4e54f303f654720f04d3a2b7e93e2 SHA512 adef5115da5434286905ee759d05e20819237f8f0b9adf6683b7a661b4e36f664a7d5abbac8d00be5aad6b78653307b71c4a2c86358951fb788257a94abce9be
-EBUILD selinux-dante-2.20200818-r2.ebuild 279 BLAKE2B 548731742d7433243dedc4c2f75bafe8903cf329a703384d3a9dc47e2f7f98aca791f8ce6253b208977474a41d2dbeedf0303857da938958761c308c08f14db2 SHA512 fa406df18d93050b8ad60860396d76cd9cd6232f547305ef802eb6e26069e4c1fd621638f654753e7e72cb0cc75041b4695132c634a6318ab37c311fecef79ba
+EBUILD selinux-dante-2.20200818-r2.ebuild 277 BLAKE2B 2458369e135f79caa8bff48df99f14df53827e13114df950d9b4e9a5c256cf6e558655c0926fdefd5fa2bece07124ecbf3dee113691b1293d5404c79c8704861 SHA512 42a91d28a4ba8ad0469da2135b1ed27c2a736800da2d92219d249c9ae30a6ba4f3eb9cfd19f60e5176cf4b54c1b78df43818f34180828a8614da0a0ea62b5fd1
 EBUILD selinux-dante-9999.ebuild 279 BLAKE2B 548731742d7433243dedc4c2f75bafe8903cf329a703384d3a9dc47e2f7f98aca791f8ce6253b208977474a41d2dbeedf0303857da938958761c308c08f14db2 SHA512 fa406df18d93050b8ad60860396d76cd9cd6232f547305ef802eb6e26069e4c1fd621638f654753e7e72cb0cc75041b4695132c634a6318ab37c311fecef79ba
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20200818-r2.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20200818-r2.ebuild
index e577dc1a324f..dfc128c71e5a 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dante"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dbadm/Manifest b/sec-policy/selinux-dbadm/Manifest
index 440d65e35716..27ed9f5c8ca2 100644
--- a/sec-policy/selinux-dbadm/Manifest
+++ b/sec-policy/selinux-dbadm/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-dbadm-2.20190201-r1.ebuild 277 BLAKE2B 28efaf20a5fe99779bfc16a567341d45397e38af17c83b8082ecdb61de147174654eab7bf697e247b8d619a49e6c8686e7435f2e1bf63c635c08fbd64c19f1bd SHA512 c9ae2b7254898735eddff20c3ac01e50c5f7949ac9d994e693750d85826a7c33068ed0923c860262e31d79e323a21cf0175dd9b92de990629c4fbd486187c14a
 EBUILD selinux-dbadm-2.20190609-r1.ebuild 277 BLAKE2B 28efaf20a5fe99779bfc16a567341d45397e38af17c83b8082ecdb61de147174654eab7bf697e247b8d619a49e6c8686e7435f2e1bf63c635c08fbd64c19f1bd SHA512 c9ae2b7254898735eddff20c3ac01e50c5f7949ac9d994e693750d85826a7c33068ed0923c860262e31d79e323a21cf0175dd9b92de990629c4fbd486187c14a
 EBUILD selinux-dbadm-2.20200818-r1.ebuild 279 BLAKE2B 4f3dc879bad0836bbb5e8322722c19969b987109b68da4d611b51004f4c21cb6df913218808a5209e30b6bd44fd40782dcb7c8ef7675f00ad15f6f65d73e290f SHA512 3a81e4d391d4e44ae80d27963719fb194966c8e164b3c2edc7c2fc41c7a667bba3c31082aa0c44b1e2536bfa7117e2ec76abd2e19b6c32c882b781bafde277c6
-EBUILD selinux-dbadm-2.20200818-r2.ebuild 279 BLAKE2B a532807f5648977633940382bb385e6689313b1b148a24e69b638809af030851b26e74dadb8638836e5f6186ba62749de80015b37e0021b66f03a43caeee819d SHA512 5a1e0b8931bc8fb1e7b23450dc45565d5ee5bfaf10fd1e2ff5a87f75e1d0cda1baefaefcc9a7e5ac74e7266a7d7a4cdc0c1056fb571ef26fba487b692fad104f
+EBUILD selinux-dbadm-2.20200818-r2.ebuild 277 BLAKE2B 9d5f09dad886e6834b0a1fc6d0fd9b52b129f258f1af89935a6413ce02c640d242c2d557a2ae3ced049005727c449a3becf3b32c86792bf4d8826bbf434494a2 SHA512 860c14aaf12eef786651e007ee0fb8ea6744b0dae35e75a6fe78d9a8f8fcb41bdc4ddf623c8850d4a4dc1fc5d1e1c79979bbc819a1467c13fedd753e9627f0ef
 EBUILD selinux-dbadm-9999.ebuild 279 BLAKE2B a532807f5648977633940382bb385e6689313b1b148a24e69b638809af030851b26e74dadb8638836e5f6186ba62749de80015b37e0021b66f03a43caeee819d SHA512 5a1e0b8931bc8fb1e7b23450dc45565d5ee5bfaf10fd1e2ff5a87f75e1d0cda1baefaefcc9a7e5ac74e7266a7d7a4cdc0c1056fb571ef26fba487b692fad104f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20200818-r2.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20200818-r2.ebuild
index 5f7bc28c1996..fb315ee15270 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbadm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dbskk/Manifest b/sec-policy/selinux-dbskk/Manifest
index 038f99db7c48..ca6f11ec95bc 100644
--- a/sec-policy/selinux-dbskk/Manifest
+++ b/sec-policy/selinux-dbskk/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-dbskk-2.20190201-r1.ebuild 371 BLAKE2B 05414c7737864d5243bfd3a947a295a616dc8fb9a8b0f48c8aff39820bcd017f00bdb59c0d9354dd3a03aff953211bfd7f82030f51e72469940a03ad0089ded6 SHA512 9103eeb2c44996e914631b4492c7d2f1bd289f701609ca2571b48c8ecea59f5de848f851e90803156e16ff7d8c8faa55db6e5cbc778157b30d58a9b3c41c3b64
 EBUILD selinux-dbskk-2.20190609-r1.ebuild 371 BLAKE2B 05414c7737864d5243bfd3a947a295a616dc8fb9a8b0f48c8aff39820bcd017f00bdb59c0d9354dd3a03aff953211bfd7f82030f51e72469940a03ad0089ded6 SHA512 9103eeb2c44996e914631b4492c7d2f1bd289f701609ca2571b48c8ecea59f5de848f851e90803156e16ff7d8c8faa55db6e5cbc778157b30d58a9b3c41c3b64
 EBUILD selinux-dbskk-2.20200818-r1.ebuild 373 BLAKE2B 899eae84aec5c514484159e7995b11b87c9bdd73b08f95a439950b9012190746eec508faa2189c0bfe5a6c64478ab28d87003e6b734b87d7ee12db9809034561 SHA512 c83a8ea4c6f06f91148f803966b4c47404c8e6dc79c46e814ac16a6ef1da375390ed05132da84832bfd22383afaf7e3392ee179219d1e7fb347005bf0008d167
-EBUILD selinux-dbskk-2.20200818-r2.ebuild 373 BLAKE2B 942a4c05a8326dd7d02a774f255352d50305562f7d33e969568f5ede2b92895b3cb4622c015e4135644d35c90f819cd4f1cd0c41d4c43843c025a18598a3fb68 SHA512 5d4f20ef145d3031115fdb53bf56e12649a035f74436ef0767106b5ba7367d27d71ad735213f9dbdf37db3d21db66e700bc3890d35a6523ee8b09440b3fa9a9f
+EBUILD selinux-dbskk-2.20200818-r2.ebuild 371 BLAKE2B 801389975cc469adb672a29bc62016f1a2377541349758f7dfa15262b9d56766078cc87e9ae118e5a1afc88dc7bb961e3bae3625e95d9854fc4596d96d3b61ca SHA512 2a93dfd129d9b19268a206cc3b103c9b664b892d1a02dd54fce17cc21c2984923e4f7fec6014297c87812876c76971b4939f4cf16e0da67455cbf57037ad912d
 EBUILD selinux-dbskk-9999.ebuild 373 BLAKE2B 942a4c05a8326dd7d02a774f255352d50305562f7d33e969568f5ede2b92895b3cb4622c015e4135644d35c90f819cd4f1cd0c41d4c43843c025a18598a3fb68 SHA512 5d4f20ef145d3031115fdb53bf56e12649a035f74436ef0767106b5ba7367d27d71ad735213f9dbdf37db3d21db66e700bc3890d35a6523ee8b09440b3fa9a9f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20200818-r2.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20200818-r2.ebuild
index 13f97537369b..14b78c1ee9a9 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbskk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-dbus/Manifest b/sec-policy/selinux-dbus/Manifest
index 84cdedb04b40..5d35c1ccbc5a 100644
--- a/sec-policy/selinux-dbus/Manifest
+++ b/sec-policy/selinux-dbus/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-dbus-2.20190201-r1.ebuild 275 BLAKE2B a9491738dc9183b7e38952a32181baf2f227501a12ed5fe652c2db9aa914b92fbe6676275cfcd74371e77ea79bbef76f1e5b10aa045b9433b4955d20cdf0e719 SHA512 f0e6630aa8f2e260b4e947be9dcb1c3af816566971f9e3ef1f509e451eb93eb02a88249f8198e4a74aa9a448b12f86bb9f912b917bffd345e35565d69484ab0b
 EBUILD selinux-dbus-2.20190609-r1.ebuild 275 BLAKE2B a9491738dc9183b7e38952a32181baf2f227501a12ed5fe652c2db9aa914b92fbe6676275cfcd74371e77ea79bbef76f1e5b10aa045b9433b4955d20cdf0e719 SHA512 f0e6630aa8f2e260b4e947be9dcb1c3af816566971f9e3ef1f509e451eb93eb02a88249f8198e4a74aa9a448b12f86bb9f912b917bffd345e35565d69484ab0b
 EBUILD selinux-dbus-2.20200818-r1.ebuild 277 BLAKE2B 0702f90738fbcd435da37793a22e09211089a236be27c24bc36361caf5f5756a41b528c22c4dc325065fed3ff835f34577c6ebbbcb4fc518fb2225757825bec1 SHA512 7225fe881ad5a2b8443be6a06cf81b4006d3d37a84bf465d9497d9ad1372afe27960fb9f4c8e0a40355f0335d0173f2fbda54f512821294fa355628721d58f6a
-EBUILD selinux-dbus-2.20200818-r2.ebuild 277 BLAKE2B 215400c7ef06bec2cbf63980159dcd915b3b5c5e80e1cd3cf0d840a81f0b3901fde0c16b4e445fd47df72767d00560a6cce02696e0f67eeccc74d4669aa3e46a SHA512 950897573cbd040b6d61c4efbf757cbc75bf770a8d17bf15e430331cd0df9076ffa2191742e14387e5811e7a666dbce75724a801f547bb7c4b1df9540805df49
+EBUILD selinux-dbus-2.20200818-r2.ebuild 275 BLAKE2B b0e7fbf32c2a0c38c5bcdacf5c9c1cb40072261f7e9d66f787ec5f6fbe01b08a63a7d36b8a4086fd211855e0a3fcb0da122635d7054b6212433c00179bdf6daf SHA512 6b07d73021353aa81743fb0be17b0853507df4b0e7ee442d8e218d7bb4a90b782b31f6ee04cde4c7ea5aead501408659cee0b630f249b3bb07d168db407efc16
 EBUILD selinux-dbus-9999.ebuild 277 BLAKE2B 215400c7ef06bec2cbf63980159dcd915b3b5c5e80e1cd3cf0d840a81f0b3901fde0c16b4e445fd47df72767d00560a6cce02696e0f67eeccc74d4669aa3e46a SHA512 950897573cbd040b6d61c4efbf757cbc75bf770a8d17bf15e430331cd0df9076ffa2191742e14387e5811e7a666dbce75724a801f547bb7c4b1df9540805df49
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20200818-r2.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20200818-r2.ebuild
index c3e2690ab61e..f7b6338d3ed9 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dbus"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dcc/Manifest b/sec-policy/selinux-dcc/Manifest
index bf704744e666..18861b5598c1 100644
--- a/sec-policy/selinux-dcc/Manifest
+++ b/sec-policy/selinux-dcc/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-dcc-2.20190201-r1.ebuild 273 BLAKE2B c094d9a9b14f1cdf111fea9c86cf30b2c127a65895f8703b2c3bd1af026ecdd1380d9ab590fbd44611490f13741708fc4a3515fa5870669042b23893eb965578 SHA512 87a8edce662ed6b3a78d629cf0c6cc95af85c75d53d1ce9b369e758b24ff113094db2678872b52eec4aff6fdad486de95666c2aea8b8b2e3b582d51fe9968e03
 EBUILD selinux-dcc-2.20190609-r1.ebuild 273 BLAKE2B c094d9a9b14f1cdf111fea9c86cf30b2c127a65895f8703b2c3bd1af026ecdd1380d9ab590fbd44611490f13741708fc4a3515fa5870669042b23893eb965578 SHA512 87a8edce662ed6b3a78d629cf0c6cc95af85c75d53d1ce9b369e758b24ff113094db2678872b52eec4aff6fdad486de95666c2aea8b8b2e3b582d51fe9968e03
 EBUILD selinux-dcc-2.20200818-r1.ebuild 275 BLAKE2B a475d80371d0fce04fe6ec143a224c330e1aa6a93da1e8ce5bbfbb21aa81dfc3761f0f1fc94b5de83190805c55718acf9c9306a1c151287de8c455fb297cd8f7 SHA512 ac60072844dde0d2020864a0d752702d3fc6b0b489302d2b0c2db0a3ca24f303513964944616511582d8af5bab6a55042bf818e79287c1f3188bf53bceb080f6
-EBUILD selinux-dcc-2.20200818-r2.ebuild 275 BLAKE2B 8d295914364996448b9d6e59c92d9723d000b529f9e266641b36378e9af6618f137e279110f112b341726b96b756184280bb4fdddce03fd74cfa039c6a6e7072 SHA512 49f4037b8cf29ab8fc43210551487dca989fd6def18462062509b01e8b739f280b056b8351175bc05ba54d2f4d6d3713546c51552f74e8a2e7b0f2981fc313a0
+EBUILD selinux-dcc-2.20200818-r2.ebuild 273 BLAKE2B c8b3b46266b9045582394990c7f02a32bfc644d6bb0c639c757623183c8b08779a8826f2fd93c557784ac507fba373d43c5ed9f4b0561aaa1ac3fe4bc0e0c0a9 SHA512 3c08f772516d411bc23e97187ae988755de669b3556ffdcd17302f6d1140231a39d7272db525a20203c4b069073e96fdb78da8ae8569495fd957483de75f5c61
 EBUILD selinux-dcc-9999.ebuild 275 BLAKE2B 8d295914364996448b9d6e59c92d9723d000b529f9e266641b36378e9af6618f137e279110f112b341726b96b756184280bb4fdddce03fd74cfa039c6a6e7072 SHA512 49f4037b8cf29ab8fc43210551487dca989fd6def18462062509b01e8b739f280b056b8351175bc05ba54d2f4d6d3713546c51552f74e8a2e7b0f2981fc313a0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20200818-r2.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20200818-r2.ebuild
index c5affb5d2127..828fe5695379 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dcc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ddclient/Manifest b/sec-policy/selinux-ddclient/Manifest
index 6e658a787c36..476458c52611 100644
--- a/sec-policy/selinux-ddclient/Manifest
+++ b/sec-policy/selinux-ddclient/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-ddclient-2.20190201-r1.ebuild 283 BLAKE2B 35ad75e94be50514e92b4daece3d1932d6f196f6dadc4b908e06979bff0608d6ad8bdcb00a5659b4227e2f0c97d9c4cf7217c54c9f316cdc43dfdee99bb67cd3 SHA512 b99e4ceda0d97c068bf300798b6d935e15219d03e3d928bf1910aecd5c233e2636ba893fe26072920bb509662fe090af5eb5e373ab6e73122031da150deebd10
 EBUILD selinux-ddclient-2.20190609-r1.ebuild 283 BLAKE2B 35ad75e94be50514e92b4daece3d1932d6f196f6dadc4b908e06979bff0608d6ad8bdcb00a5659b4227e2f0c97d9c4cf7217c54c9f316cdc43dfdee99bb67cd3 SHA512 b99e4ceda0d97c068bf300798b6d935e15219d03e3d928bf1910aecd5c233e2636ba893fe26072920bb509662fe090af5eb5e373ab6e73122031da150deebd10
 EBUILD selinux-ddclient-2.20200818-r1.ebuild 285 BLAKE2B 4c55d7e4d536804e9b9aa37fb03429ee08f02953297551677ae5df04585db00d566d033eca4b476658704c3ac9c1e49ac3cc32085c6af90bb62deb79e7f77754 SHA512 3d808c0805f35da19365b54aeb810778002e19f5427700858b668fdb6883e99f4ba25302081221cc285293f1e8e92e53ada2340184dd25d50619bf8197265b5a
-EBUILD selinux-ddclient-2.20200818-r2.ebuild 285 BLAKE2B 04c7ab1a16b24cf0dba930c550e08db81a3a4645f4e5b14234f4eb2aad9809938f123bce9c9bece32d2907baa497ece8c71248e77c1a0e899a0b1de81bdc9d9c SHA512 9470c2f5a31cbdd4adf0f961863eee8f9c2ddcaaa1e148a11e974dc1354df26e420e75b06c0d2c8ecec9da8f4618edb38210131aac5f14a3fb4703425fa2d5b4
+EBUILD selinux-ddclient-2.20200818-r2.ebuild 283 BLAKE2B e845693b722b2efa901395d81ebc662d043e48de962ba2dd9dc2ce34cfe6c4333f547bd38c246dc3b911678e6ca2fb18db1a7f31ad100fa05bb1dadea6fba8a7 SHA512 24d7b1322f6e63e90a4268de585f550963975e7762d34cd5c69643c595b6bcb97a0318501251c34283fb9ebd29b829b980595c4ddc0c2c149efb06978688cbf9
 EBUILD selinux-ddclient-9999.ebuild 285 BLAKE2B 04c7ab1a16b24cf0dba930c550e08db81a3a4645f4e5b14234f4eb2aad9809938f123bce9c9bece32d2907baa497ece8c71248e77c1a0e899a0b1de81bdc9d9c SHA512 9470c2f5a31cbdd4adf0f961863eee8f9c2ddcaaa1e148a11e974dc1354df26e420e75b06c0d2c8ecec9da8f4618edb38210131aac5f14a3fb4703425fa2d5b4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20200818-r2.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20200818-r2.ebuild
index b32ee0fd6455..d31291821767 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ddclient"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ddcprobe/Manifest b/sec-policy/selinux-ddcprobe/Manifest
index 44118c388faa..0c3523c7b862 100644
--- a/sec-policy/selinux-ddcprobe/Manifest
+++ b/sec-policy/selinux-ddcprobe/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-ddcprobe-2.20190201-r1.ebuild 283 BLAKE2B ed08627d0f9f1a380f615d95231e3f2c390549ac23c93aaa3215bdd177175301823ec5dba780b428f6bae3eeecb51d6fbc8112ae08e4df63bdf0362351c78e6c SHA512 aff334bef287179e655a4a65b874f2a83f90a44bd3e5868136f712ae6984bdccfde6db7b00e07afc4a8c2f6df30163046abc3f53b5856bab309250809dc295a5
 EBUILD selinux-ddcprobe-2.20190609-r1.ebuild 283 BLAKE2B ed08627d0f9f1a380f615d95231e3f2c390549ac23c93aaa3215bdd177175301823ec5dba780b428f6bae3eeecb51d6fbc8112ae08e4df63bdf0362351c78e6c SHA512 aff334bef287179e655a4a65b874f2a83f90a44bd3e5868136f712ae6984bdccfde6db7b00e07afc4a8c2f6df30163046abc3f53b5856bab309250809dc295a5
 EBUILD selinux-ddcprobe-2.20200818-r1.ebuild 285 BLAKE2B 715f996133f6669c63f804ed64111f6972415023d5946e5a659f12267b68711142b61c8fe886199e12a8326173f73d15fbfd5b131c2362e2057246781682dcfe SHA512 dfa85085b10cbca3726971810eb94bd306a9cbc7ac3a16a6b41d4a18beb9b893a6ab512bfb512f8c75ce1146beda4e604c7c3151fc3640a516e7695bc6777e5e
-EBUILD selinux-ddcprobe-2.20200818-r2.ebuild 285 BLAKE2B 9490909dc1f98304a19a1b568cbb420e1174a30a9fcf713e0bc4254896b5e4491f447cddb358a39656c70cd93453bd13a74c2592048dea2f5af115eb9d4f2b67 SHA512 94dad3e9b00ca89eceafd6627b317253793ba95178a1325584024acf1c92fb52dc1f859b86ee9162486ec5f4aba6cfdf3624f9a67ee064a0c00e990db20e9de0
+EBUILD selinux-ddcprobe-2.20200818-r2.ebuild 283 BLAKE2B c56f2d077af8163504ad293aa6cbc26f5c79814b2598c75dfb2d0f0a33088e66b5bd6235cca586c241c0452fed53d9ff229802b68b26ee00626bc71aa3efcef0 SHA512 8c9b779f4c92e9185323cf2b20e903117f565265fbb41a0222c3eacdc821d0421f5b945b2a505a6c554c3605b411c92a6e0877fc4595bb55e5077201d26b8757
 EBUILD selinux-ddcprobe-9999.ebuild 285 BLAKE2B 9490909dc1f98304a19a1b568cbb420e1174a30a9fcf713e0bc4254896b5e4491f447cddb358a39656c70cd93453bd13a74c2592048dea2f5af115eb9d4f2b67 SHA512 94dad3e9b00ca89eceafd6627b317253793ba95178a1325584024acf1c92fb52dc1f859b86ee9162486ec5f4aba6cfdf3624f9a67ee064a0c00e990db20e9de0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20200818-r2.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20200818-r2.ebuild
index 387625e49c2f..5741e809db46 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ddcprobe"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-denyhosts/Manifest b/sec-policy/selinux-denyhosts/Manifest
index fa5298dec1c9..221753cc1b59 100644
--- a/sec-policy/selinux-denyhosts/Manifest
+++ b/sec-policy/selinux-denyhosts/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-denyhosts-2.20190201-r1.ebuild 285 BLAKE2B 6b4f1595a8327dc73c9d4222da545d68848cd7ebeb51962babafc86135a5b4b6070d1d73a5e1d383cb26acdecf3c0a3254bd2768691abe783d26c9d940d24eae SHA512 5653388a0fd7e8527b3b6ce127c784fa353601228db1a1528970249fc65c0a816d77aa72a0b3ab74f453fe5f10818e2159af20ccf0075485be9aa45ca5858578
 EBUILD selinux-denyhosts-2.20190609-r1.ebuild 285 BLAKE2B 6b4f1595a8327dc73c9d4222da545d68848cd7ebeb51962babafc86135a5b4b6070d1d73a5e1d383cb26acdecf3c0a3254bd2768691abe783d26c9d940d24eae SHA512 5653388a0fd7e8527b3b6ce127c784fa353601228db1a1528970249fc65c0a816d77aa72a0b3ab74f453fe5f10818e2159af20ccf0075485be9aa45ca5858578
 EBUILD selinux-denyhosts-2.20200818-r1.ebuild 287 BLAKE2B 123bcc73e0f2618d348175665874932b607cd75e4bd9a8ec52fcb4a4cefa15c22f8e3e4aede1aa522ecdb2e84add2e9c9af497703464a1b6c44d52e3a01cb1f9 SHA512 3453cbf14fc80ae36e56f40bbc65b97c56bcd6c0fbace909378910b8ea1587d3a3fe33be6471752a2776d7237f15fd9076d79616a0a32f919204cde0e34a70bb
-EBUILD selinux-denyhosts-2.20200818-r2.ebuild 287 BLAKE2B a963c7e0a720cf07036ef41f787b2e7e79ad81c0a22ad4e3bb7a505f07d7bb7ac025aa0bb75f2d764889474f4b270980145aeb422835c9c8aaf2cc7165a36e81 SHA512 a260ad6ba02f56c8b6aa57e15626f9b17742ac868f16f3168994702eee9ef432d1b2c7b93f2dc16214936a976b9557406b8901a6177a1a53221609915e06ccbd
+EBUILD selinux-denyhosts-2.20200818-r2.ebuild 285 BLAKE2B 33770359220113be7ba3b93e7a57a5ed9933c7f9e4ae04dd9431f3ac4d7485bad1e7b9ec6114d072cd6182a804f1a2e9dfc3314064050fe82294766ae4d203e4 SHA512 f588f82b6e2ac932dbc61f0363c2a443ea395823465e9c0b60d80cae90e62fc11e448547e0291f3708f504659d46dfaa40edc2a0533eca08ca6291d40b96e489
 EBUILD selinux-denyhosts-9999.ebuild 287 BLAKE2B a963c7e0a720cf07036ef41f787b2e7e79ad81c0a22ad4e3bb7a505f07d7bb7ac025aa0bb75f2d764889474f4b270980145aeb422835c9c8aaf2cc7165a36e81 SHA512 a260ad6ba02f56c8b6aa57e15626f9b17742ac868f16f3168994702eee9ef432d1b2c7b93f2dc16214936a976b9557406b8901a6177a1a53221609915e06ccbd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20200818-r2.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20200818-r2.ebuild
index c861e2ec4fad..df94e9b7c5b2 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for denyhosts"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-devicekit/Manifest b/sec-policy/selinux-devicekit/Manifest
index c2288597f797..30e33e6f5f84 100644
--- a/sec-policy/selinux-devicekit/Manifest
+++ b/sec-policy/selinux-devicekit/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-devicekit-2.20190201-r1.ebuild 378 BLAKE2B 392c872538fc605ad613f424e9cd9577a89511764b7c29f6c1b5369d72c98320ecc274abb7b9dfacd6756b5554753e0e3bb2bc7a18597e49cde457dc8b5126dc SHA512 6c5b0cca97b084d82f4f17a43a9598d70da5bd92f9545348ad13cdbca136243c04652e233f5e50d5a1f9f838640e345a80efcf556ae2733c6fb3ea69f193324d
 EBUILD selinux-devicekit-2.20190609-r1.ebuild 378 BLAKE2B 392c872538fc605ad613f424e9cd9577a89511764b7c29f6c1b5369d72c98320ecc274abb7b9dfacd6756b5554753e0e3bb2bc7a18597e49cde457dc8b5126dc SHA512 6c5b0cca97b084d82f4f17a43a9598d70da5bd92f9545348ad13cdbca136243c04652e233f5e50d5a1f9f838640e345a80efcf556ae2733c6fb3ea69f193324d
 EBUILD selinux-devicekit-2.20200818-r1.ebuild 380 BLAKE2B fafa0f31b7638e0d05b5151bf26c4802eaf430a4a299d473e4f89c8dbfd4f0c9b02039616a315a295039535cfa2f137842a5bc2add545e7af9b3c4ac3ef38d3b SHA512 5dcbaaf4bc24894cd3514ed4ef7fd9a14a854de656572d468650f57578888c6db038fb1e3514718d8bb25b45d00e68cf0ef2fe9be5fbcdb0efddba257c4ee010
-EBUILD selinux-devicekit-2.20200818-r2.ebuild 380 BLAKE2B 26041390419ee905df3c32874f34a9782398ee38b025f694d245dde8fa91b4e006fee4d5b95423fc71b0f4cbade424e17e7ec86bfeaf1a1e1f048f8c314edb49 SHA512 af77ba4613fbbd287e76e37d9a92bb5f700208d1035f484043878f1a7d0cc46c0d3228e8d2c67a920eacabb96258866a712b8a20d8cec21269485c55a5514bee
+EBUILD selinux-devicekit-2.20200818-r2.ebuild 378 BLAKE2B f04f3e05c50667cdc5127fc8d86510cd84b6b4443d06b36b7080196e5874eb3c54095869b34ded07547502aafdaade079d53a60d2ba5cc52aa916411dc183499 SHA512 8208e3d931bc655ce9c9bdc72bccf747b77b57e77425e9ca3c3a77aa6ec67e1b873fe228ab33e57f6e7e35a54a05fc6b2ba2e00b9811c9bb31176fad22bf25b7
 EBUILD selinux-devicekit-9999.ebuild 380 BLAKE2B 26041390419ee905df3c32874f34a9782398ee38b025f694d245dde8fa91b4e006fee4d5b95423fc71b0f4cbade424e17e7ec86bfeaf1a1e1f048f8c314edb49 SHA512 af77ba4613fbbd287e76e37d9a92bb5f700208d1035f484043878f1a7d0cc46c0d3228e8d2c67a920eacabb96258866a712b8a20d8cec21269485c55a5514bee
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20200818-r2.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20200818-r2.ebuild
index 77f1cc072a64..55ea8443ad1e 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for devicekit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dhcp/Manifest b/sec-policy/selinux-dhcp/Manifest
index 606584bfb926..2c3a1dd78b6c 100644
--- a/sec-policy/selinux-dhcp/Manifest
+++ b/sec-policy/selinux-dhcp/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-dhcp-2.20190201-r1.ebuild 275 BLAKE2B ee6de3772a5a3c3562616c5832f893f523ed8cf331a71c7aba0fc3958464dfe622f5be865f6bb01dbc75accad5081c2308393622e785c4806059b261129dd72a SHA512 6631b5fb35066e379f28431493dfd8e863090c73a39ab1aff118190ffca7481b4660d5b2de1c3f6bc3f97676529accb286ddde7dcc6748e5921604725d1bbbb1
 EBUILD selinux-dhcp-2.20190609-r1.ebuild 275 BLAKE2B ee6de3772a5a3c3562616c5832f893f523ed8cf331a71c7aba0fc3958464dfe622f5be865f6bb01dbc75accad5081c2308393622e785c4806059b261129dd72a SHA512 6631b5fb35066e379f28431493dfd8e863090c73a39ab1aff118190ffca7481b4660d5b2de1c3f6bc3f97676529accb286ddde7dcc6748e5921604725d1bbbb1
 EBUILD selinux-dhcp-2.20200818-r1.ebuild 277 BLAKE2B e1efa6ce25d0bd4d85389b265b28202b6f4232aad484573be5cbc2c47b55dbbe3f313ac5c310f2db36bf91240bb903fcbeca245da4e6120b7b767ae00ceb38ce SHA512 068de50017ab132aef5968407a5fe23a2850374e4c0bee8a18b32e1288b6f64994686eadf1b3ee35366ffd97712ffdeb7b1921e0f7364a5cd219cb1c284451ed
-EBUILD selinux-dhcp-2.20200818-r2.ebuild 277 BLAKE2B 34e4a0e80b0acd1ee31b961d282ec2bd2bf5d9e559623059390bfa499edf33baa60cc12ee4fe6c9652961df7813b5a81517a8347f35d926ec1989e8403365f7b SHA512 c4da179b20fac5197d3b30a5ba917e5dcd3ba15e5f53443ae26c573f3ad70bf536b5e488e23884ca5ecaa7f999d210effcce856ebfb07c5b5ac9256d17d413f1
+EBUILD selinux-dhcp-2.20200818-r2.ebuild 275 BLAKE2B c4a4c4e83b270e0f656b5c06e8edbf0f5af7b1d5bddc748bf0204b882754b6ef609b02a6220b4d3a68656527eed17441e46cb3df92233dd0e8719b7e55db2e5a SHA512 5583ab2e90324a7cf84f568c3d33d1b887768fa539100975e1e1a0eaa26437f7be073f90411d4043c08b0d656961820111636e1cfe64581d47957f64e2921e91
 EBUILD selinux-dhcp-9999.ebuild 277 BLAKE2B 34e4a0e80b0acd1ee31b961d282ec2bd2bf5d9e559623059390bfa499edf33baa60cc12ee4fe6c9652961df7813b5a81517a8347f35d926ec1989e8403365f7b SHA512 c4da179b20fac5197d3b30a5ba917e5dcd3ba15e5f53443ae26c573f3ad70bf536b5e488e23884ca5ecaa7f999d210effcce856ebfb07c5b5ac9256d17d413f1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20200818-r2.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20200818-r2.ebuild
index 68e45b6897e0..2bd5a9271d99 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dhcp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dictd/Manifest b/sec-policy/selinux-dictd/Manifest
index 3b18e94cef5d..48352bd1271d 100644
--- a/sec-policy/selinux-dictd/Manifest
+++ b/sec-policy/selinux-dictd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-dictd-2.20190201-r1.ebuild 277 BLAKE2B 6d05f59324304a0fe2680248e96bb65dac409e32b7cb947f4b96cd6aebf17ade49af3dad168c640785dcfd3b935dde765075f4e37fe6995410b6626869db9431 SHA512 4d434d0b8183ca31d196af84004456982239b7cbcc83e063cd795063df16c8f12ccc00d294b4819ded45dc41a084568b0a534ad09e61ca5c7b9f71db98483508
 EBUILD selinux-dictd-2.20190609-r1.ebuild 277 BLAKE2B 6d05f59324304a0fe2680248e96bb65dac409e32b7cb947f4b96cd6aebf17ade49af3dad168c640785dcfd3b935dde765075f4e37fe6995410b6626869db9431 SHA512 4d434d0b8183ca31d196af84004456982239b7cbcc83e063cd795063df16c8f12ccc00d294b4819ded45dc41a084568b0a534ad09e61ca5c7b9f71db98483508
 EBUILD selinux-dictd-2.20200818-r1.ebuild 279 BLAKE2B 543629e668bbb2bb7456b45a0de28c6c79cf4a299e7df36084974be385e475afbc29fb6f8d5f71c10635c7ac51c4bffb23c30f648ede1f5a90b0919454d9226b SHA512 cf9464b64fb80d0da64f109793f0dda08cd0f13872d68a27dc7bd8910cf1fc596ead753771af0d579797f79e3aca0c9de574012e05289f930e4dfb51f0ae5d85
-EBUILD selinux-dictd-2.20200818-r2.ebuild 279 BLAKE2B 8f976a2000d06edb7b42f7c98920c88e2bf4c3244282ebfcf5b71b4b46aa461cab9e8b0f41879f51605ab792f8bd3dc1632f99ba122395655b9882d9deb5006b SHA512 641288fdcff6a02969bee98cd5d770812d21f879fcb76fd21085df5c3726cbb3fe45956391a57878cbb6b57b98344342847c9f95a835da9558e7fb85128ccfd7
+EBUILD selinux-dictd-2.20200818-r2.ebuild 277 BLAKE2B caa8ac60c1497e018c11e7c0a994e99397e71835946430137403fb8ded55b380435e2aba3bc9e2b905938fd0f248215bb6b12a407c393729b860ff23665c64d7 SHA512 7988e9fb7fa59beeb19a2df97d8c0013b7c747392db47fe4da8c67ad888e7625b32833b5f251efb55b4b057d69e67e3584d3fec87e6533aef19a2b85989cf4c8
 EBUILD selinux-dictd-9999.ebuild 279 BLAKE2B 8f976a2000d06edb7b42f7c98920c88e2bf4c3244282ebfcf5b71b4b46aa461cab9e8b0f41879f51605ab792f8bd3dc1632f99ba122395655b9882d9deb5006b SHA512 641288fdcff6a02969bee98cd5d770812d21f879fcb76fd21085df5c3726cbb3fe45956391a57878cbb6b57b98344342847c9f95a835da9558e7fb85128ccfd7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20200818-r2.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20200818-r2.ebuild
index 0b22262f2e41..b894b18c671e 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dictd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dirmngr/Manifest b/sec-policy/selinux-dirmngr/Manifest
index 9614f8d9114e..20739476b4d8 100644
--- a/sec-policy/selinux-dirmngr/Manifest
+++ b/sec-policy/selinux-dirmngr/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-dirmngr-2.20190201-r1.ebuild 281 BLAKE2B 77cd7f47e0d077c7bfa1888b1e2783c6d6e413894bcc2ea87e780077b169967760370b18f0a2fb1c6810dba68d2b4aca159027a5b49aac68be982ca3fe6005f7 SHA512 13e6fddc9ac34e53d82458523b181db4e25d50be9772dddb7f26c283ea3ccbdb028d214e376bcca3a6c28065d2a633439b804540d04b73431e18b29bf74ef46c
 EBUILD selinux-dirmngr-2.20190609-r1.ebuild 281 BLAKE2B 77cd7f47e0d077c7bfa1888b1e2783c6d6e413894bcc2ea87e780077b169967760370b18f0a2fb1c6810dba68d2b4aca159027a5b49aac68be982ca3fe6005f7 SHA512 13e6fddc9ac34e53d82458523b181db4e25d50be9772dddb7f26c283ea3ccbdb028d214e376bcca3a6c28065d2a633439b804540d04b73431e18b29bf74ef46c
 EBUILD selinux-dirmngr-2.20200818-r1.ebuild 283 BLAKE2B e5db1ada7f7798252c1fd1268cb1eb46ee6257d8a2094b91f6fef99e1326c48f43f599a8c905e515e526042e3f2c4ec4f6033d918369572ba77be8ebd85dece1 SHA512 b45d40e8df694e910448f3a8ae3cf6bb2ef94498b8a2dd6858f6a2727c051236406ad03ff2fbc16e9696e265c0f96c60cdd7628ef05bdca99dd91ba1e453d76b
-EBUILD selinux-dirmngr-2.20200818-r2.ebuild 283 BLAKE2B 89229eeae441a1f355305f427940110346553733f8ffed575c8fcab716811d09ebd4f0ba59e875bb1c5fc6e507f23988aff1fc921e6bf1a9a8ea208fe6de0926 SHA512 d86f3b3150b66a555d7e0918fbffa8ccefa1ef89b9c870955bf51d8dee34788af1f92ebb091e978dcffc3bb94a2b908a0cce755d6b0cf2ab0b0d1e149029e6ef
+EBUILD selinux-dirmngr-2.20200818-r2.ebuild 281 BLAKE2B d32934c7ce3ac4e784c012e2a52ffff136beaed37b1bc514c83ccb7eb0db6a2e07235566adcc1ec0fd5ee8677f0356844a1493773363e8ac00b11aa44641a47e SHA512 bbd70bc8d09cff197c9002a0ac7ca02f70b9e161f64477155d67ab8921acf6553e161db9d831c0e17266b27356bd5c27a8b60fd3113dc760e350174c28ecf7b7
 EBUILD selinux-dirmngr-9999.ebuild 283 BLAKE2B 89229eeae441a1f355305f427940110346553733f8ffed575c8fcab716811d09ebd4f0ba59e875bb1c5fc6e507f23988aff1fc921e6bf1a9a8ea208fe6de0926 SHA512 d86f3b3150b66a555d7e0918fbffa8ccefa1ef89b9c870955bf51d8dee34788af1f92ebb091e978dcffc3bb94a2b908a0cce755d6b0cf2ab0b0d1e149029e6ef
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20200818-r2.ebuild b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20200818-r2.ebuild
index 82dce6d3a01f..376869680687 100644
--- a/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dirmngr/selinux-dirmngr-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dirmngr"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/Manifest b/sec-policy/selinux-dirsrv/Manifest
index 24bc72cd5258..c80fd6b5fe6c 100644
--- a/sec-policy/selinux-dirsrv/Manifest
+++ b/sec-policy/selinux-dirsrv/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-dirsrv-2.20190201-r1.ebuild 279 BLAKE2B 501751b7a507e21f4145bee3233227a1c877ae6b513e17a75eddbddf771ee3cd95547acc7070fa98e92032060de2fb56c7c603130ad5bef55e6a621ccfe0526b SHA512 8d9c9d2e079e937ff02860e903c35144a8cbd513197bcec928ccd2b9cb937c4c2764e863d247823abbac21be6193a6170b38fd434bf9206544d13e41c585139f
 EBUILD selinux-dirsrv-2.20190609-r1.ebuild 279 BLAKE2B 501751b7a507e21f4145bee3233227a1c877ae6b513e17a75eddbddf771ee3cd95547acc7070fa98e92032060de2fb56c7c603130ad5bef55e6a621ccfe0526b SHA512 8d9c9d2e079e937ff02860e903c35144a8cbd513197bcec928ccd2b9cb937c4c2764e863d247823abbac21be6193a6170b38fd434bf9206544d13e41c585139f
 EBUILD selinux-dirsrv-2.20200818-r1.ebuild 281 BLAKE2B 134c83e69b87b07ad967227f5e167f5b822aabc0789c9879bee69c566fcabce99223ee94131b81c22bd06193358b5cd21606eb7aa7580314860089ca49318a2a SHA512 17756e428274177749d19e21558349c4d8b4b4f523b01e807445946262cf23a93cffa8b16cb7e9a44a62baa753514692275bf24ddda6d257fb4e4084f217a914
-EBUILD selinux-dirsrv-2.20200818-r2.ebuild 281 BLAKE2B 23fb811f3759a0c9014898441607c706dce6ea6669dba3e1fa8261e75581c646a705f4317f7ef228f10934e5a5ac68dfc62ca495f6bf328d92b763cee8000b2f SHA512 ecbc11eeff50575ba2167c35db9701a7ebceb848d8af26727a2f7a904b1dae8032510c973e83f7a944a02de561ea940124e42ec73ecbcc84708bc8f12f473c55
+EBUILD selinux-dirsrv-2.20200818-r2.ebuild 279 BLAKE2B e5d936d84f8964ff4fc0faa7be3dd7ab6dbcc629585779b09597ed74638e3a5af75b34b9c8ef5a9fc739b6a4fc676694ac2fdabcfb887dd89fc51f80bda2d6a8 SHA512 b0c787a1791048c02789188d671fa693fb4f1cb130aaae86330852c3e64707b404da49f4e451a2ad19cc9ba26ff21600fc561fe27e1e35d65c8b3f2f1a917bd0
 EBUILD selinux-dirsrv-9999.ebuild 281 BLAKE2B 23fb811f3759a0c9014898441607c706dce6ea6669dba3e1fa8261e75581c646a705f4317f7ef228f10934e5a5ac68dfc62ca495f6bf328d92b763cee8000b2f SHA512 ecbc11eeff50575ba2167c35db9701a7ebceb848d8af26727a2f7a904b1dae8032510c973e83f7a944a02de561ea940124e42ec73ecbcc84708bc8f12f473c55
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20200818-r2.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20200818-r2.ebuild
index 63035ba53e28..a063f81a0b36 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dirsrv"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-distcc/Manifest b/sec-policy/selinux-distcc/Manifest
index 5039ba13e1f0..be1b504b4d94 100644
--- a/sec-policy/selinux-distcc/Manifest
+++ b/sec-policy/selinux-distcc/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-distcc-2.20190201-r1.ebuild 279 BLAKE2B 3244bda2af3fcb1e29779cecd0f1fea9afc018741eec4f05ab95bde12a585c3dd2ca0902455b931da1a6d82d73bdea96755430032de4304232b12158481ab421 SHA512 469b08e9846b838887f856b5a07bbe8244f6902c6d673d08e0258e5d7d46ce861ee0f21dba7645efcc37a75859b37119197496dbabad8a2ddb85773c57ef2ec7
 EBUILD selinux-distcc-2.20190609-r1.ebuild 279 BLAKE2B 3244bda2af3fcb1e29779cecd0f1fea9afc018741eec4f05ab95bde12a585c3dd2ca0902455b931da1a6d82d73bdea96755430032de4304232b12158481ab421 SHA512 469b08e9846b838887f856b5a07bbe8244f6902c6d673d08e0258e5d7d46ce861ee0f21dba7645efcc37a75859b37119197496dbabad8a2ddb85773c57ef2ec7
 EBUILD selinux-distcc-2.20200818-r1.ebuild 281 BLAKE2B 2e440408363ef7e6dbf7911eee497baebb3d8594633b157eaa7cee504992131eea86253cbea844e59ed03ae513c201de130c229b341e570c5e49bf72c24614e0 SHA512 b8107d5d448bf08509747810c1358a85d31d19b1cd1d1c9c5395fbbcb56a948ed2ba5dfb55c721e8a436a2ef7eb28f40c08423818260212fc36bfab54f0e2620
-EBUILD selinux-distcc-2.20200818-r2.ebuild 281 BLAKE2B e032ae6c7013160ceab0504fac8a83a5b032fafd12307ed46564cf5e7c1a2768c3d2a4534c84c5deaba52cde93069231b91a8d872b46a21de5cbb2a7b5b50851 SHA512 c9ed79dfaf01f01ba45a73ca7e849b6dc6b52b95070d54e3694e687ad9fa932aee901ec7af1666420073077288434d16feaca5635965389ecb251d6666412b4d
+EBUILD selinux-distcc-2.20200818-r2.ebuild 279 BLAKE2B 0717fab809ccb1a5ce3dfe9446ff180b5551696b92fd8958f7bf342cb19c29e7c2b8713ef1d403cd98922af9a99fbe59e57b7802603567772141fa18ac7fa34b SHA512 c0d0f15b2ea7964d76d96482454318d860289c199b8decb95f95e6e8b626ad2225b074d908566b08013fde9e738d9baf573e9b8e57d0568230feabd5584f97c7
 EBUILD selinux-distcc-9999.ebuild 281 BLAKE2B e032ae6c7013160ceab0504fac8a83a5b032fafd12307ed46564cf5e7c1a2768c3d2a4534c84c5deaba52cde93069231b91a8d872b46a21de5cbb2a7b5b50851 SHA512 c9ed79dfaf01f01ba45a73ca7e849b6dc6b52b95070d54e3694e687ad9fa932aee901ec7af1666420073077288434d16feaca5635965389ecb251d6666412b4d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20200818-r2.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20200818-r2.ebuild
index 87c609b78490..bcd4c26dabd0 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for distcc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-djbdns/Manifest b/sec-policy/selinux-djbdns/Manifest
index d4d3cc2f2869..60361fd15030 100644
--- a/sec-policy/selinux-djbdns/Manifest
+++ b/sec-policy/selinux-djbdns/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-djbdns-2.20190201-r1.ebuild 443 BLAKE2B d518ce7c5f327ad18b9e9b6a2b9b8ae4d2aabefc1c2fc85fd1568dd64ddfdfc9cda3cc37b0f3bf443ddab275fd11adcbf3a5bb2720450ca6e21ab3e3617555cd SHA512 96c710ba8fff53d7052b61d4419c59b89892edca136604590eb3ecd1cf50dfc1ff71fbd11df5b92a89b5beec097bc78f282c7b6bc1509d0370edf889178b5b2d
 EBUILD selinux-djbdns-2.20190609-r1.ebuild 443 BLAKE2B d518ce7c5f327ad18b9e9b6a2b9b8ae4d2aabefc1c2fc85fd1568dd64ddfdfc9cda3cc37b0f3bf443ddab275fd11adcbf3a5bb2720450ca6e21ab3e3617555cd SHA512 96c710ba8fff53d7052b61d4419c59b89892edca136604590eb3ecd1cf50dfc1ff71fbd11df5b92a89b5beec097bc78f282c7b6bc1509d0370edf889178b5b2d
 EBUILD selinux-djbdns-2.20200818-r1.ebuild 445 BLAKE2B 4cb1611aaede38b7634dbb1e8f87df264eb570dc30db3b7ce230b0326ee9116ec20703788748bcc59d18a548aab0fd21ffdc6cb6214e719ebabe57c123ea3d36 SHA512 ad73f4171327e794aed1887fc41deabf89cdbd53eda5dcd65e518f243ba957ab59bdb8b9b19a12d5353e8a2e6d544506c39ddb8fcac7498dd5a33612548875db
-EBUILD selinux-djbdns-2.20200818-r2.ebuild 445 BLAKE2B b94961d2e6424a1d1aec5ae1b6dbbc2cc8576cd97884d8cfe2d69b7d3cf3cefa9dbfa064f3a1741b2372cb5e0f20e665f0aa01ea7d6f9215af245539ea000160 SHA512 ab060097001ac7bc34650c0a9229726312fba18e4584c19d6870425bf0bdd7514c771ad02277676e27149a22e54e8482d26254bc7a113529424a2a6be1404d02
+EBUILD selinux-djbdns-2.20200818-r2.ebuild 443 BLAKE2B c2222e8210f5d4c8859fcad81d2bcc1011e7cd7d6a53f639a726bd682816274a8cad6d04f09310c7c7c70f5fdf3448bd5d454e16a972882169a6300f50d0d0fb SHA512 e75f6f87ba6f4dc30aa6d0217edbaa494e0e59297fcda6d7d4f9a7bde038e71162e494e26e04001baa3f4c451996be76e04f28fbe75721cce700bbfcc7e0ab69
 EBUILD selinux-djbdns-9999.ebuild 445 BLAKE2B b94961d2e6424a1d1aec5ae1b6dbbc2cc8576cd97884d8cfe2d69b7d3cf3cefa9dbfa064f3a1741b2372cb5e0f20e665f0aa01ea7d6f9215af245539ea000160 SHA512 ab060097001ac7bc34650c0a9229726312fba18e4584c19d6870425bf0bdd7514c771ad02277676e27149a22e54e8482d26254bc7a113529424a2a6be1404d02
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20200818-r2.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20200818-r2.ebuild
index 35e9afc97a35..8b44739905d7 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for djbdns"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-daemontools
diff --git a/sec-policy/selinux-dkim/Manifest b/sec-policy/selinux-dkim/Manifest
index 6efe0cf8da48..0376515dc423 100644
--- a/sec-policy/selinux-dkim/Manifest
+++ b/sec-policy/selinux-dkim/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-dkim-2.20190201-r1.ebuild 372 BLAKE2B 881502b798ffc5bdc49ea1f43e8cca320c00fc9930f1f3f612bfc7dcf25356a926b43e87c79777a2f0ddaf8b073596afbc37d461eaa49ca1936ccc7371c95d5e SHA512 9ceccdaef3cbdb02c998b4ff0d8a7839bd1e07dbcbefc51fbad98d04ef4af57dd61df6b00d52bde819f517264058d5943d8d03d35141324d7dc9389541579133
 EBUILD selinux-dkim-2.20190609-r1.ebuild 372 BLAKE2B 881502b798ffc5bdc49ea1f43e8cca320c00fc9930f1f3f612bfc7dcf25356a926b43e87c79777a2f0ddaf8b073596afbc37d461eaa49ca1936ccc7371c95d5e SHA512 9ceccdaef3cbdb02c998b4ff0d8a7839bd1e07dbcbefc51fbad98d04ef4af57dd61df6b00d52bde819f517264058d5943d8d03d35141324d7dc9389541579133
 EBUILD selinux-dkim-2.20200818-r1.ebuild 374 BLAKE2B 26512997ca8763a050f262801d79f59a0f9f99b21e22eb048850e785fab4cf4c52b661b525e96558683e855109a60b3f8f579794c735e3bf96b07a66467739c5 SHA512 1d0920dc3a3718288b8ebc5b035faa82a78e7420e1d31f9d4d043d33e8fbfc7a999976f1d6e216efc4e0397a62d7a37c9c38d26256cbc8772d9ca3aecab9547a
-EBUILD selinux-dkim-2.20200818-r2.ebuild 374 BLAKE2B e7b242e7894a64e08d2fff592053402e3b59a51282f633c80bd82b8c936ba526592b8ace22a1164ef142ea9d239198d9f51611717715cacf9c63a20e6601da8d SHA512 fb8167cd5d55673140f0c6b11e0e3949d94e5d52c388b2b51b30c72ee5fc241a9a4e4791538e358c559e93c51bb4ca437d21946623b4386216e18c48a059b37f
+EBUILD selinux-dkim-2.20200818-r2.ebuild 372 BLAKE2B 1ceba7b0b4e5b28f9be3360aeb1d03d4c2d90d1f99f4b4867386168a4e151d7116d9a7ca1d49f9159f0d1f9bec3308a80df3fd142a78f03aed133f5a3a2affdb SHA512 1fc786c8cc03393b62ab810cdf101ea1fcc6350aed2a65bfbea1053dfee8a442b46de76d8defc8f01486758300b79d6cce3e23ecef6c41c0b420ad369d3cb421
 EBUILD selinux-dkim-9999.ebuild 374 BLAKE2B e7b242e7894a64e08d2fff592053402e3b59a51282f633c80bd82b8c936ba526592b8ace22a1164ef142ea9d239198d9f51611717715cacf9c63a20e6601da8d SHA512 fb8167cd5d55673140f0c6b11e0e3949d94e5d52c388b2b51b30c72ee5fc241a9a4e4791538e358c559e93c51bb4ca437d21946623b4386216e18c48a059b37f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20200818-r2.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20200818-r2.ebuild
index 9834d916afa5..0a761ff2d40c 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dkim"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dmidecode/Manifest b/sec-policy/selinux-dmidecode/Manifest
index 9ad4a390e131..f34b0d9587b9 100644
--- a/sec-policy/selinux-dmidecode/Manifest
+++ b/sec-policy/selinux-dmidecode/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-dmidecode-2.20190201-r1.ebuild 285 BLAKE2B 0183609eca2dc0e65f761e7bea2a1e5f398b4177fbc3aeb588ac71d1170c0a5fd49a4d9e222bf35626278e3e5564852492e1f4b0ce73970c67a120d26eeae0c3 SHA512 a587e1552c2d3adb1cabc31bf9759bf43a6ba5c67e8cc69fc6840afe32d3f807825a49490e59fcda7f08b705990e151900b8312a8549f079cdd1d082c24d2026
 EBUILD selinux-dmidecode-2.20190609-r1.ebuild 285 BLAKE2B 0183609eca2dc0e65f761e7bea2a1e5f398b4177fbc3aeb588ac71d1170c0a5fd49a4d9e222bf35626278e3e5564852492e1f4b0ce73970c67a120d26eeae0c3 SHA512 a587e1552c2d3adb1cabc31bf9759bf43a6ba5c67e8cc69fc6840afe32d3f807825a49490e59fcda7f08b705990e151900b8312a8549f079cdd1d082c24d2026
 EBUILD selinux-dmidecode-2.20200818-r1.ebuild 287 BLAKE2B ae8bbd78975d43697124182829c374faefd2426df022bd8519c5916c32b0c87e2d992414be46366804bd6caf124b34c03ca8be410dae4d2b7fb4603f4380ee50 SHA512 d7f4f1600c67c4a99a6ce34355d38148729fb4fc7cc15e86ec56370c7dd7fe4c99b2d2208c48c0a9ca34622713a289a639f79b4d988e22d45882b8a60f789452
-EBUILD selinux-dmidecode-2.20200818-r2.ebuild 287 BLAKE2B d9b54401e667a19a0a3a7b6769919a2aaa9771dd47f8b8106ef15385c813d43e2dc623b92dba34ee2f21f64628b594cfec1fa78b214c568d225aa1056bd84698 SHA512 21696406d4eb24aed6e861dff45da872f4006865c5dcc2f20e5dc0463ee33420b6fa6b8ec44b3f96a2e965624bca5f928923c8c205794a2ff59031b917bc08dd
+EBUILD selinux-dmidecode-2.20200818-r2.ebuild 285 BLAKE2B 5e189921cdd7ec1e53e2fe1410a1111e43c896368254735ffec2fd64c744f92ce1170dab6668d67ce30928cd3677feb6bb5a2da3e054f7a25284dd8935ede781 SHA512 87c0675c21521eecea58e60850e9b97d8480511225a0fb2c082ee7e844e308841f51375a18356f2e2f0f345293491cfe1f0947c01ec173f67722f66eea175423
 EBUILD selinux-dmidecode-9999.ebuild 287 BLAKE2B d9b54401e667a19a0a3a7b6769919a2aaa9771dd47f8b8106ef15385c813d43e2dc623b92dba34ee2f21f64628b594cfec1fa78b214c568d225aa1056bd84698 SHA512 21696406d4eb24aed6e861dff45da872f4006865c5dcc2f20e5dc0463ee33420b6fa6b8ec44b3f96a2e965624bca5f928923c8c205794a2ff59031b917bc08dd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20200818-r2.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20200818-r2.ebuild
index b49f3d2e2c75..e38ba18ee926 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dmidecode"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/Manifest b/sec-policy/selinux-dnsmasq/Manifest
index 6865b2c01b38..b3bc9c01d145 100644
--- a/sec-policy/selinux-dnsmasq/Manifest
+++ b/sec-policy/selinux-dnsmasq/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-dnsmasq-2.20190201-r1.ebuild 281 BLAKE2B b541cc440e79c453ea154c11c5ec5797714391a114a86c2c1080d852c1bf3d16819dc51d4d72369fcfea222dff2745b448915bda85f7028cf9faea58ea37e00f SHA512 280606f4918965e8c0402b3bdcae1e5862ac6a01d0f683ab6c7bc86d2b4015ffaa4c5105f831975a75e70b5c71b2dd7c06f465a50074d10883d6214d3b5c537f
 EBUILD selinux-dnsmasq-2.20190609-r1.ebuild 281 BLAKE2B b541cc440e79c453ea154c11c5ec5797714391a114a86c2c1080d852c1bf3d16819dc51d4d72369fcfea222dff2745b448915bda85f7028cf9faea58ea37e00f SHA512 280606f4918965e8c0402b3bdcae1e5862ac6a01d0f683ab6c7bc86d2b4015ffaa4c5105f831975a75e70b5c71b2dd7c06f465a50074d10883d6214d3b5c537f
 EBUILD selinux-dnsmasq-2.20200818-r1.ebuild 283 BLAKE2B fd19da6cb147d0d8157b70eeb3f437fd95c8beaa5bd66323eb705ba93f60a3e3ea3ffbb911c4c61be653924016761dabb27a96a28fce884f4cc36c373306106e SHA512 aea442bb958ac44322e471d2af1097ddec8e3616d15fa393e83f219c37c25fa9a957e44c92b796a030faf84bbdb7aabbc4410cefbe7e655f6a43bf45e28f59d3
-EBUILD selinux-dnsmasq-2.20200818-r2.ebuild 283 BLAKE2B 893f136d8cee4609679d3e4a3cd6402ce8fd761c96be00097ba440802bfdb2599c3593798a0fecd4ac4ddd471887f1bba09400d91d2e152df568718167347df8 SHA512 3c6a3221537975b12a31b0bf3c83370d0f599116ef7bbb11140090c5d0ce30f5db2130352036bbb1833d10b183afef80fc2bb902649b87bcf096957fe1e3db80
+EBUILD selinux-dnsmasq-2.20200818-r2.ebuild 281 BLAKE2B ea04c251ed8af78e78fd079770a1a257730f352697336dd50d2025b3380ca4e7db6e53776b7b0269689d1214375deabcfa8d241aa51542d5d03f604d8d331b71 SHA512 c65ed7754d2d400757b52c2321e2698a6ed271c23ff5aad9c8814ec62ac04aff4949a0d9f319e8e88d21d91958c13e0bdf4f84cce77556ce603153cc1725e55a
 EBUILD selinux-dnsmasq-9999.ebuild 283 BLAKE2B 893f136d8cee4609679d3e4a3cd6402ce8fd761c96be00097ba440802bfdb2599c3593798a0fecd4ac4ddd471887f1bba09400d91d2e152df568718167347df8 SHA512 3c6a3221537975b12a31b0bf3c83370d0f599116ef7bbb11140090c5d0ce30f5db2130352036bbb1833d10b183afef80fc2bb902649b87bcf096957fe1e3db80
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20200818-r2.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20200818-r2.ebuild
index 58809fb86734..6ae05da3d978 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dnsmasq"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dovecot/Manifest b/sec-policy/selinux-dovecot/Manifest
index d9697623e325..ae41d602c341 100644
--- a/sec-policy/selinux-dovecot/Manifest
+++ b/sec-policy/selinux-dovecot/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-dovecot-2.20190201-r1.ebuild 281 BLAKE2B 5539d2b762b8e6f24beee1e50511116e7e3abf0b0f1921f6f56aa1eefbc188f081e4a2c18dfae391163aca9b8349785e0d1d50afedf37fe91d984a59d629caac SHA512 aee040f922df93eb224e3109bd0d80ab7c839660750fa805e539050f2808cbbfb32f14a938010f59249413a79d60883ef5cfb8b48ea5b7ba18c7ef14132f227e
 EBUILD selinux-dovecot-2.20190609-r1.ebuild 281 BLAKE2B 5539d2b762b8e6f24beee1e50511116e7e3abf0b0f1921f6f56aa1eefbc188f081e4a2c18dfae391163aca9b8349785e0d1d50afedf37fe91d984a59d629caac SHA512 aee040f922df93eb224e3109bd0d80ab7c839660750fa805e539050f2808cbbfb32f14a938010f59249413a79d60883ef5cfb8b48ea5b7ba18c7ef14132f227e
 EBUILD selinux-dovecot-2.20200818-r1.ebuild 283 BLAKE2B 3cb429c403f9d0e66e9753547de834fe092f7c241d9174fcdcfbef430f9f7b9132419cb7f7b6637799892e28211a407d60e20fca164a994ad31c3ddeda4463fc SHA512 37a8e20feda7427bd98c42d901e520f5b610398ac664916d3597b05c14e068ed8ebf9e40937059c20cc7d5784031fb546f0f9466ad57eb0345bb7f5b79e7a25c
-EBUILD selinux-dovecot-2.20200818-r2.ebuild 283 BLAKE2B 9a33f1342985c987c69c3bf49dc7ec52f0c73040525544eabe101aeac69f1d445268877e2d353bb41322529ae51372810b36224e81ae10d17514bbb1ade13fee SHA512 016373573d3804053bcc65b449f739b0feaef959ec88f9d4168c6d8166f5dc803641e9218589ff37b84327726ad2a19719682fe2b25d42cc917dbf3c775e33b0
+EBUILD selinux-dovecot-2.20200818-r2.ebuild 281 BLAKE2B 013b716949ad97c713c212061dce44f8d7a6b3d297b4556a0b687830f867489f6ce0be14fdb572d7ed6aaba99ea033bab3c1db8c8cb1609d03a6d6ec2494cc9b SHA512 a770bd1f37a178185cb905b884ae2c22bceee8395240b46ded681b22d263d30988368d820aac672763cd926c8b1a8db237bb66514ff3f6cb812b77ee200c059e
 EBUILD selinux-dovecot-9999.ebuild 283 BLAKE2B 9a33f1342985c987c69c3bf49dc7ec52f0c73040525544eabe101aeac69f1d445268877e2d353bb41322529ae51372810b36224e81ae10d17514bbb1ade13fee SHA512 016373573d3804053bcc65b449f739b0feaef959ec88f9d4168c6d8166f5dc803641e9218589ff37b84327726ad2a19719682fe2b25d42cc917dbf3c775e33b0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20200818-r2.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20200818-r2.ebuild
index 30c60afa37c9..3266dd36cb39 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dovecot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dpkg/Manifest b/sec-policy/selinux-dpkg/Manifest
index 561b8b8b31cf..e01257b37d62 100644
--- a/sec-policy/selinux-dpkg/Manifest
+++ b/sec-policy/selinux-dpkg/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-dpkg-2.20190201-r1.ebuild 275 BLAKE2B c496001b4e478aa7a500d8269b7d2567a0742ffdeb38d24c7bb13fc18a70563a79cfeaaab9d251e4f2fda59bf66ef2a9a7e3b5d597bcec92f10d9f1296213a72 SHA512 7a8a1f242aa525cf8e79c66124172638a3a174d2fbd0d7c9703986f636eeef1313804c6ac82f2b9dbb20b71db4cc7753860039e146390df2e8408b324a3e02ec
 EBUILD selinux-dpkg-2.20190609-r1.ebuild 275 BLAKE2B c496001b4e478aa7a500d8269b7d2567a0742ffdeb38d24c7bb13fc18a70563a79cfeaaab9d251e4f2fda59bf66ef2a9a7e3b5d597bcec92f10d9f1296213a72 SHA512 7a8a1f242aa525cf8e79c66124172638a3a174d2fbd0d7c9703986f636eeef1313804c6ac82f2b9dbb20b71db4cc7753860039e146390df2e8408b324a3e02ec
 EBUILD selinux-dpkg-2.20200818-r1.ebuild 277 BLAKE2B 263b606cbd53cfc2fcfa3fbe1bcb2b37bbaa71496c1af475905ae4471a64b997b07e522c60457b301b1b56d5a10aec438c83dfbc6dc4e80c724bb6869e499c41 SHA512 9020799f26851ec094dd33daaab15ca77c05f6ffcc4c4e7462cd2cd08839c5da82b11c2fc148fb46ef4e0ac2660a42a050fcb8655cfe31dbf438e85b75d17a99
-EBUILD selinux-dpkg-2.20200818-r2.ebuild 277 BLAKE2B 5ff7042831fbdbb3d2ad6790dd55ea6b87682baa2faa5b06de0561676d840e0fe3599f46524992dc96846eec0db50b437700abe4889dac7475e832543b5af2e6 SHA512 5475fcb4c6ded8919a67d85078bcd5c706d5c8a0d007ad701cf926659743aca2a9eae518a9ffc4437a145d9e0d66b10bda83cad89f606b70b9e31585bd292fd0
+EBUILD selinux-dpkg-2.20200818-r2.ebuild 275 BLAKE2B 10ae1de00f3ea0c464bc95df582306b7c7ae34e15f99288c952a526cf72c1d5de5af6734efa4b554cda4b026723a974e24437416b646c87e48cd9199d75a8b7b SHA512 05a12bdf136b34c173742b79c07a15242d45d66c4608e02c9d7b516edb75359b3e56c6ea72db0d1bbf292e5b625e65596f07232a0d92f9fd2cb867751b24672e
 EBUILD selinux-dpkg-9999.ebuild 277 BLAKE2B 5ff7042831fbdbb3d2ad6790dd55ea6b87682baa2faa5b06de0561676d840e0fe3599f46524992dc96846eec0db50b437700abe4889dac7475e832543b5af2e6 SHA512 5475fcb4c6ded8919a67d85078bcd5c706d5c8a0d007ad701cf926659743aca2a9eae518a9ffc4437a145d9e0d66b10bda83cad89f606b70b9e31585bd292fd0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20200818-r2.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20200818-r2.ebuild
index 0b7e42ea07c4..a7f4d12e8487 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dpkg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dracut/Manifest b/sec-policy/selinux-dracut/Manifest
index b16a2726651a..7eeb19efb4b3 100644
--- a/sec-policy/selinux-dracut/Manifest
+++ b/sec-policy/selinux-dracut/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-dracut-2.20190201-r1.ebuild 279 BLAKE2B 46bf21cc75f942e0acec2f72b5d60baccdabedc0173ef374e9f47b42eb250f8b62a149caad2b76b3f6281899ce70bb113f5a2003d52759abacc4e77ef2f66897 SHA512 bbf24738d0df351060ca6d50d4ae1ffd6f645b9275ce3e71965c113d2bc699ad3b0963f2b1699641fb40862c8034d47039a686989be253e18d7621b18b75ca98
 EBUILD selinux-dracut-2.20190609-r1.ebuild 279 BLAKE2B 46bf21cc75f942e0acec2f72b5d60baccdabedc0173ef374e9f47b42eb250f8b62a149caad2b76b3f6281899ce70bb113f5a2003d52759abacc4e77ef2f66897 SHA512 bbf24738d0df351060ca6d50d4ae1ffd6f645b9275ce3e71965c113d2bc699ad3b0963f2b1699641fb40862c8034d47039a686989be253e18d7621b18b75ca98
 EBUILD selinux-dracut-2.20200818-r1.ebuild 281 BLAKE2B 00caf5e7b61265d8633e3298c5e90ab02a1629915dc1dcd88db0f9039ab6c1a462afdb0b2acbbf13318bacb98d1db449241e59c3c3594e61edec1c0218d57216 SHA512 e3d448804819238ac29c3b7b4f81c3d141d8bd6d4f0a483f91877bda69915808d7c246ddfe852c3b8605b2f79b29271e85c52f089c764052e61ad60a4c860f02
-EBUILD selinux-dracut-2.20200818-r2.ebuild 281 BLAKE2B 2103969db21cab145b9adda357c884cb70e1173f0dfe1e441abdb24b55cc117ce420efa6d71168af70a961f0db3e89298ee6301b76aa1d904946fe7a9a4c2ad9 SHA512 358a3f63e9ad4a2776e346840766374eed605194f0273088f66b86e513df267095ce9ed546200de68cc1944d7167da662ccc8f8291d7c01e9b76af0840011eb0
+EBUILD selinux-dracut-2.20200818-r2.ebuild 279 BLAKE2B a320bdf170902f4f40082f1cb6b9623fcf5f7235904364b222a8266d020087a4bd041b9ac1243d76c9804d8d01a6f8a146725ce0aabc0ff70d752c93be461bc5 SHA512 8ad2e43a20c93e239fe819f8f01b049590da08d7200b7a3a211a71a03ea0e2d73c0828f257626ab159b3d3770d571b7235eb6dadec3e6feb45c8f8786f9076ff
 EBUILD selinux-dracut-9999.ebuild 281 BLAKE2B 2103969db21cab145b9adda357c884cb70e1173f0dfe1e441abdb24b55cc117ce420efa6d71168af70a961f0db3e89298ee6301b76aa1d904946fe7a9a4c2ad9 SHA512 358a3f63e9ad4a2776e346840766374eed605194f0273088f66b86e513df267095ce9ed546200de68cc1944d7167da662ccc8f8291d7c01e9b76af0840011eb0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20200818-r2.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20200818-r2.ebuild
index 7962b90aa08b..fae51c555237 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dracut"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-dropbox/Manifest b/sec-policy/selinux-dropbox/Manifest
index 87d46254017d..07050a8c1920 100644
--- a/sec-policy/selinux-dropbox/Manifest
+++ b/sec-policy/selinux-dropbox/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-dropbox-2.20190201-r1.ebuild 429 BLAKE2B 59e515efb38914a1c85766d381ec4e5d99edf3a98cd74117562504b509a558e38abd79d023f871bc066bef72cb0bb2e9a0dddc557469634b15d5c6375b7bbfae SHA512 b5eba1054c0c2036988c002f3dc959dda7ffb9a95f38ca5ee774858e1e7034761c84ab5075b2653802d4868ddc977e58fa8fb0e41aa92f484cc0d3eda9e0515b
 EBUILD selinux-dropbox-2.20190609-r1.ebuild 429 BLAKE2B 59e515efb38914a1c85766d381ec4e5d99edf3a98cd74117562504b509a558e38abd79d023f871bc066bef72cb0bb2e9a0dddc557469634b15d5c6375b7bbfae SHA512 b5eba1054c0c2036988c002f3dc959dda7ffb9a95f38ca5ee774858e1e7034761c84ab5075b2653802d4868ddc977e58fa8fb0e41aa92f484cc0d3eda9e0515b
 EBUILD selinux-dropbox-2.20200818-r1.ebuild 431 BLAKE2B 858c0e3d771c589dd056e287759dd58170751e9af8d2df4b8abf2d1198ba8fbc41bd5b5af678101e77d32fae28cb0ca857f17c502769bb53ae32c82e079f4581 SHA512 aba919083e2524ce70bdafd139e3a24c2e86ebc4190ef942b3a173dc2faaf9eb1633caf1dc41cd88eb4fba063b90aff20baa50e6a2871588d8f7ba9c8d6ef29f
-EBUILD selinux-dropbox-2.20200818-r2.ebuild 431 BLAKE2B adf030fa61db09b66d01f018e316362ac888f574cd8b1f3dce2db5b8f83063871199e9a601448587ead6061cc887e4e6ba9065c3be32c1c1b0a59e95ca28b6c1 SHA512 85745e032f8ffca8391d066a80d2a74a3663b70f06495a05b745b7e754700d57b7c07e3abffb3cad1286c3e053d8e961daed50ed83ed24f1d839ab289b7e3e53
+EBUILD selinux-dropbox-2.20200818-r2.ebuild 429 BLAKE2B 74e0368f68a4811c0fe0bb6868b2eaea52fa7e8ab4c16a12f53f139325c5d9ee106fd5bc05a430d9511c153e5a8c31c1cc0b72c1f7d46ece76b32075af695142 SHA512 00ef100623571799eda64f26d1cdfaf36dfa243c0f1e172d0887c2841df62ae37dff86a0fd926dc693ee4608f6f0b6f5978f1a5b831a6ebb1b382fdf19266419
 EBUILD selinux-dropbox-9999.ebuild 431 BLAKE2B adf030fa61db09b66d01f018e316362ac888f574cd8b1f3dce2db5b8f83063871199e9a601448587ead6061cc887e4e6ba9065c3be32c1c1b0a59e95ca28b6c1 SHA512 85745e032f8ffca8391d066a80d2a74a3663b70f06495a05b745b7e754700d57b7c07e3abffb3cad1286c3e053d8e961daed50ed83ed24f1d839ab289b7e3e53
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20200818-r2.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20200818-r2.ebuild
index 195a29a9c760..877381e6787a 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for dropbox"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-entropyd/Manifest b/sec-policy/selinux-entropyd/Manifest
index 03fd404d5ef3..85fc2a861d48 100644
--- a/sec-policy/selinux-entropyd/Manifest
+++ b/sec-policy/selinux-entropyd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-entropyd-2.20190201-r1.ebuild 283 BLAKE2B ddfaa596e04a2d4ec80e33a85f0be70f6b9fb52ff815769b80c67a09d18a85fbab4be9968d0e35194c05dc7cda86d217141c60552e9f31f52c60cf7c13db79f5 SHA512 9efe15f325bdec93833e2c532bb4fade3026c62e4121c46ee1a13014c565614fd8c459c56493734bcc05e456cb4fa81c5e1b9955c9be1f9eeb9b8d9ca0e3540f
 EBUILD selinux-entropyd-2.20190609-r1.ebuild 283 BLAKE2B ddfaa596e04a2d4ec80e33a85f0be70f6b9fb52ff815769b80c67a09d18a85fbab4be9968d0e35194c05dc7cda86d217141c60552e9f31f52c60cf7c13db79f5 SHA512 9efe15f325bdec93833e2c532bb4fade3026c62e4121c46ee1a13014c565614fd8c459c56493734bcc05e456cb4fa81c5e1b9955c9be1f9eeb9b8d9ca0e3540f
 EBUILD selinux-entropyd-2.20200818-r1.ebuild 285 BLAKE2B e580a645c4b19a136da6021f8fddc6b9b58957ed3fb9753f85897fa3b3bad6989434baa02ce6dd0a6cdffaf45cb8fab8f4c9c03f606052a8d584b2af2001e1dd SHA512 91c136cbd6bf39a1b4b8f580df811349d38a1a1124b30a759e8c455ccf3f630ba17f3cd5ddd4882878d291d99b04633384b6eeabe080ea2ab4f9cb9b69d75706
-EBUILD selinux-entropyd-2.20200818-r2.ebuild 285 BLAKE2B 3f2bd1d69506dfb81df025523a6903239054c918879aac9ba6e16c639c387427d907e9309e8d8eb2968f8e2110cbdedf74eaaac062dc495729cbf5e4dcf5edca SHA512 18a3fd4af537620cb87a637dae97e9e030fec8073158f4e54d69216ace3ab68c301e4f8908b6697b59b29e67510b40b00248d11ec09819aa1754ef2d682f6508
+EBUILD selinux-entropyd-2.20200818-r2.ebuild 283 BLAKE2B dac68ea949ab1730e381dc1f1bb9c9b2f284f43aceec34e000700f03170247caf4efcec288f6c620c61f499249acdf5e0b5579f7faa62a978bcf5e4b70da85c3 SHA512 041308a4afc83c5184e050fb8559aa74fdcadb9b63fae09aa1d6b787e270c38e66d31a2261c3bd6d7c44b4e51fe854880d18609e455f13ee4a16f027ed726f65
 EBUILD selinux-entropyd-9999.ebuild 285 BLAKE2B 3f2bd1d69506dfb81df025523a6903239054c918879aac9ba6e16c639c387427d907e9309e8d8eb2968f8e2110cbdedf74eaaac062dc495729cbf5e4dcf5edca SHA512 18a3fd4af537620cb87a637dae97e9e030fec8073158f4e54d69216ace3ab68c301e4f8908b6697b59b29e67510b40b00248d11ec09819aa1754ef2d682f6508
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20200818-r2.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20200818-r2.ebuild
index 0b8195c4c22b..08769b5f480a 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for entropyd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-evolution/Manifest b/sec-policy/selinux-evolution/Manifest
index 696acffe3043..4499bbc64979 100644
--- a/sec-policy/selinux-evolution/Manifest
+++ b/sec-policy/selinux-evolution/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-evolution-2.20190201-r1.ebuild 383 BLAKE2B 829b083dada4a82761531fc0cea1fe0934c66e6020d601628ec5f68a29825deadd878afc30b5deb3f4d019b08797d115f6e1fe766afc144c888364f7570bb597 SHA512 d6873e858632652adc46c7fd50a88be093eb39c021d30972b1c9847932bdf58fa057a6861d9c5b87a41fab0b6c836006178db5db879fb8d47268efefdda1922c
 EBUILD selinux-evolution-2.20190609-r1.ebuild 383 BLAKE2B 829b083dada4a82761531fc0cea1fe0934c66e6020d601628ec5f68a29825deadd878afc30b5deb3f4d019b08797d115f6e1fe766afc144c888364f7570bb597 SHA512 d6873e858632652adc46c7fd50a88be093eb39c021d30972b1c9847932bdf58fa057a6861d9c5b87a41fab0b6c836006178db5db879fb8d47268efefdda1922c
 EBUILD selinux-evolution-2.20200818-r1.ebuild 385 BLAKE2B 8d137075737b95a34fbf31a0a387d31f252ae64a1540677dcf475a319e0b0bf2fb405d908efccc25bb6ca2ec41cb9389a645b422fd2ca992f8d8030651393848 SHA512 c36400d09f530b0aad8786ac41a6c126a37b02c5aec44e5d806c7606e16ab5ac9ccfad0744a82a0dd37f9de24f1ea30bf3c55f4cf5661cc9f1ae487af21ac1ae
-EBUILD selinux-evolution-2.20200818-r2.ebuild 385 BLAKE2B 8546c328c81c42bd774c95ca7b844e8db70bd489d5535969deab8f401514c0adc3f4dcf7059eb2b305fd32fb19ad66f45a197fccc05795e32bd4cbcb21fc02c0 SHA512 12a19aca10ba54a0d035a4bf38583760ba2f301657253a51f8d65cc4708d5402344ba0a0da978bccf23d52700f209f8db21fdb8834831ea1a71fccd8bd872a4a
+EBUILD selinux-evolution-2.20200818-r2.ebuild 383 BLAKE2B 7734ed7ab138e67da6fe240d2ecf97e6087bddea562393664b504f18f4336a3883ef8d3ccd19acbf71564918410dc60ea68c4e47950d69d441d4b61052985ee3 SHA512 81d371b4d9f973df672cb6aa7c308a7d2d2a08dda99ceac44036cc963fbe48068ec7bf2f20d489073a7c8d3a68488fdaa768566abc75a94d60fbec7073dedc6b
 EBUILD selinux-evolution-9999.ebuild 385 BLAKE2B 8546c328c81c42bd774c95ca7b844e8db70bd489d5535969deab8f401514c0adc3f4dcf7059eb2b305fd32fb19ad66f45a197fccc05795e32bd4cbcb21fc02c0 SHA512 12a19aca10ba54a0d035a4bf38583760ba2f301657253a51f8d65cc4708d5402344ba0a0da978bccf23d52700f209f8db21fdb8834831ea1a71fccd8bd872a4a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20200818-r2.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20200818-r2.ebuild
index ded4f996ac87..4c345e8da097 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for evolution"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-exim/Manifest b/sec-policy/selinux-exim/Manifest
index 41ee265bc232..664107d2796d 100644
--- a/sec-policy/selinux-exim/Manifest
+++ b/sec-policy/selinux-exim/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-exim-2.20190201-r1.ebuild 275 BLAKE2B e271f3fece459bb5f79e6e9ca7b36f834c252fc54edc0a60540e58b7c58fcb11a9521295a023be23ca21bb2d3f141531a752c649b9da5f1ee26a4fb8602b45c2 SHA512 748ead7aa541ef6fbe1a337d9b98a1bbb9d1f3698d4624c2b210376d7dbae6ff6cb44c51ce2782353ae9eefc11f09d8b64ec56d355a0972918557115c07bcc75
 EBUILD selinux-exim-2.20190609-r1.ebuild 275 BLAKE2B e271f3fece459bb5f79e6e9ca7b36f834c252fc54edc0a60540e58b7c58fcb11a9521295a023be23ca21bb2d3f141531a752c649b9da5f1ee26a4fb8602b45c2 SHA512 748ead7aa541ef6fbe1a337d9b98a1bbb9d1f3698d4624c2b210376d7dbae6ff6cb44c51ce2782353ae9eefc11f09d8b64ec56d355a0972918557115c07bcc75
 EBUILD selinux-exim-2.20200818-r1.ebuild 277 BLAKE2B d3e00ee4abfe2b082b7038aa4099209979a6133cb19d832ddcf3051b9f6accb7922cfb94a5c5cd94d14e5626b2f0b5c50b424b8d15c5d1e14f99d92c360facbc SHA512 27cbc12b0e0dd8451c0d6635db490a68852a65b9d2a76fd1cf2c4e70ca1190e99c510c7b88efde3925165d4732fd72bcb4da79fc0b4abeb84404a6b464bd225b
-EBUILD selinux-exim-2.20200818-r2.ebuild 277 BLAKE2B fd68b3bd92c7a74c202d68211b8ba898d7ec6fecfc699b82c325d7109e1a717c96b901eb36cd2bcc49f0bd70516c8639b60bde62761c4eb67586e5c46fac8088 SHA512 7e7f304f70a631cded7e8e7f3e7e654c38dd506d53dd058b3678242d63a00e0109556be20d6e0c6b9ce0bb1357f7eca704234b2372ac63ff29a95d7a8e6cc59e
+EBUILD selinux-exim-2.20200818-r2.ebuild 275 BLAKE2B 710bbaf8e5334ee5e559d925012a002f2185ba02c6e736d0f8804c16aec9c0e75a745b3950c41c9abaf09f007c8f270ce7d5d8125a50a433a79cd8f59f2e191f SHA512 2f7b66fae34ed18baee7f07553e7f65f512c99c01b3dafe0a028966eca45b2f1d88adc70aec68aa5e5396966305809e45fc0e659801b5d8031ba3b6d38bd7628
 EBUILD selinux-exim-9999.ebuild 277 BLAKE2B fd68b3bd92c7a74c202d68211b8ba898d7ec6fecfc699b82c325d7109e1a717c96b901eb36cd2bcc49f0bd70516c8639b60bde62761c4eb67586e5c46fac8088 SHA512 7e7f304f70a631cded7e8e7f3e7e654c38dd506d53dd058b3678242d63a00e0109556be20d6e0c6b9ce0bb1357f7eca704234b2372ac63ff29a95d7a8e6cc59e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20200818-r2.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20200818-r2.ebuild
index b938d4d3e485..295cdd96cfe4 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for exim"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/Manifest b/sec-policy/selinux-fail2ban/Manifest
index 0f6bed1f6544..4ced7c9f32d6 100644
--- a/sec-policy/selinux-fail2ban/Manifest
+++ b/sec-policy/selinux-fail2ban/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-fail2ban-2.20190201-r1.ebuild 283 BLAKE2B b3f146efbb8ec4cd7188ff049ae7140a63f18b864e54fb3850828a8db24170265fd7334a898d68e1bf9f2030b8fb12f55b9d4ee2d33effd01dbd092220d3b69e SHA512 fb679bc7b119482300060cc87ed69875bca8c3c27f0236818a4dbbb373860337a52fdf1399758bfd068bb0b30a27f281288e6fcbb743d351b287a484e8e93900
 EBUILD selinux-fail2ban-2.20190609-r1.ebuild 283 BLAKE2B b3f146efbb8ec4cd7188ff049ae7140a63f18b864e54fb3850828a8db24170265fd7334a898d68e1bf9f2030b8fb12f55b9d4ee2d33effd01dbd092220d3b69e SHA512 fb679bc7b119482300060cc87ed69875bca8c3c27f0236818a4dbbb373860337a52fdf1399758bfd068bb0b30a27f281288e6fcbb743d351b287a484e8e93900
 EBUILD selinux-fail2ban-2.20200818-r1.ebuild 285 BLAKE2B 3601e0a1139039e9cc89e49033c8cde93106649412f7b585e5a60378608b62d99913ccaa9821ffdb67e7a9299a43ef7c89fed6026da6019ca089b06a0c3e44ea SHA512 c113d4fd157b94926a1640b48b9812a07768ef328eca5e1ccb9f2fe63d8e9873ba18486a81cdc3c4e5b82bb92aa5c10b77bc3a15446a1523fa27c9fc89b0bd66
-EBUILD selinux-fail2ban-2.20200818-r2.ebuild 285 BLAKE2B ef64e435440567c13a61cd18f44357ea89f92e1ca231cf3b82f137ed2cf03cc5d8497675031fe3e3603b80ca63a1e57ea0c6ed07eca075354e75806952298b26 SHA512 7bbe6bba9042ee499653324a9d2cb55aa62e7b266606140a06ecf3bf91a07ca212d9c8d9af890aea7cafc6f481210a082466e49481727a9d500be5c7134632be
+EBUILD selinux-fail2ban-2.20200818-r2.ebuild 283 BLAKE2B 2a3b8cd434185244dc1bf53271838024b5a09d44082b5471c9098a04cb3d0db8e903fefb8464c057333f049b53531d09e9a19cd94bbd602447b9bac2eb82e473 SHA512 949cfa5d59a390023f65c1bc1c6a8dd5ed6940c006bcfdd8ca9998490e819b7c3d5b10f9e3c3cc0c76e21612e78c730f15f56731f05fdf732a09a2553731c879
 EBUILD selinux-fail2ban-9999.ebuild 285 BLAKE2B ef64e435440567c13a61cd18f44357ea89f92e1ca231cf3b82f137ed2cf03cc5d8497675031fe3e3603b80ca63a1e57ea0c6ed07eca075354e75806952298b26 SHA512 7bbe6bba9042ee499653324a9d2cb55aa62e7b266606140a06ecf3bf91a07ca212d9c8d9af890aea7cafc6f481210a082466e49481727a9d500be5c7134632be
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20200818-r2.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20200818-r2.ebuild
index c9183e4769b9..19e6bd0817bb 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fail2ban"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/Manifest b/sec-policy/selinux-fetchmail/Manifest
index a9916e38d886..7d43b774e09d 100644
--- a/sec-policy/selinux-fetchmail/Manifest
+++ b/sec-policy/selinux-fetchmail/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-fetchmail-2.20190201-r1.ebuild 285 BLAKE2B 355d28801287926acb880fc96af9ce43f38acdfd5ef0c9a3ca2e24b6c7fdea476a7aef0a503098367743d4338f5ac16f367556871fd3fbf8eb40f02d77819004 SHA512 baab271254c6be609ddb755b626cb6e6840dcb10ef3281442fb1b3dc5e2400d6bb66831cadfbd5a6a6aba27c0b910c3b2aa05dbd14e167c17932baa5c62b4d59
 EBUILD selinux-fetchmail-2.20190609-r1.ebuild 285 BLAKE2B 355d28801287926acb880fc96af9ce43f38acdfd5ef0c9a3ca2e24b6c7fdea476a7aef0a503098367743d4338f5ac16f367556871fd3fbf8eb40f02d77819004 SHA512 baab271254c6be609ddb755b626cb6e6840dcb10ef3281442fb1b3dc5e2400d6bb66831cadfbd5a6a6aba27c0b910c3b2aa05dbd14e167c17932baa5c62b4d59
 EBUILD selinux-fetchmail-2.20200818-r1.ebuild 287 BLAKE2B e2fb3b93b8a2fa0b0334f77d2df63a5c6cde00fcdb2850619bc171f66146942b8694746c90acfaa59d3b18d8e305df473a8696869487a15d510ab8d42696fd81 SHA512 ea869094b99945cfa9b32bf46f45a676a7dc5125dd8dc64bb84ae3043b462d86313da767d32c19aaac0ca9a9636c026459291031271b0273a4090cb5c0332fe7
-EBUILD selinux-fetchmail-2.20200818-r2.ebuild 287 BLAKE2B 76df777b04a09e08da72e3df2dad58fa5fd4a4d443ebd9eaa007b7591c763ca0cfc618c8b433d92d7c611a8b458f81b75d19ca8b0af006f3727b49e3183087e7 SHA512 4cb856b071c23c5da74e901b8aaa56d95873ee469442de4b225773f1c8135f6d8d1e9951eb95a9d68b976ec5637e40928902e9f0b18fdb2feaef78345e6f9b97
+EBUILD selinux-fetchmail-2.20200818-r2.ebuild 285 BLAKE2B bc5c08567862dcc547fb8f9cde86dbe1132ce5e801e851440ddf4236e4e89a97af15b6e68e3851483a9fedd9a3239f44a4c41b342f373448c7fc876d9551ec12 SHA512 02ad975b53d5530301727817e7fb4abeafb66833cba5c77d5d391e4c577cae0484f29730456fc810682a8d51d7bf5ab63256cd6d353ac4ff810e6e68335232dc
 EBUILD selinux-fetchmail-9999.ebuild 287 BLAKE2B 76df777b04a09e08da72e3df2dad58fa5fd4a4d443ebd9eaa007b7591c763ca0cfc618c8b433d92d7c611a8b458f81b75d19ca8b0af006f3727b49e3183087e7 SHA512 4cb856b071c23c5da74e901b8aaa56d95873ee469442de4b225773f1c8135f6d8d1e9951eb95a9d68b976ec5637e40928902e9f0b18fdb2feaef78345e6f9b97
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20200818-r2.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20200818-r2.ebuild
index ee285e8c7477..73b2a041d4bc 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fetchmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-finger/Manifest b/sec-policy/selinux-finger/Manifest
index 8e1a1b9b2807..c050fd395de0 100644
--- a/sec-policy/selinux-finger/Manifest
+++ b/sec-policy/selinux-finger/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-finger-2.20190201-r1.ebuild 374 BLAKE2B b8f8ffc14fbb19d2a259ff1f7bc634b35b31a9dc70b618a3732c19a8c8aaf5287f377021bcc8cc7f1d04faf52210fa3c74f87704706b4836e53aa8f139f8cf79 SHA512 ebb3f837bb8ee1cbaf0ccd8083866bed9ee70af5b881178b93eb679f206f6d36a0e4bc0e5bf015e530ca0d1bd55c2fdfcf7e03d3b3e0501083c3ee8ec7f4288f
 EBUILD selinux-finger-2.20190609-r1.ebuild 374 BLAKE2B b8f8ffc14fbb19d2a259ff1f7bc634b35b31a9dc70b618a3732c19a8c8aaf5287f377021bcc8cc7f1d04faf52210fa3c74f87704706b4836e53aa8f139f8cf79 SHA512 ebb3f837bb8ee1cbaf0ccd8083866bed9ee70af5b881178b93eb679f206f6d36a0e4bc0e5bf015e530ca0d1bd55c2fdfcf7e03d3b3e0501083c3ee8ec7f4288f
 EBUILD selinux-finger-2.20200818-r1.ebuild 376 BLAKE2B 1556c8bb077f0b483d9d0c53a02eb073a1f3d4760d6c2e585995f730d73c8345e4906d13e69174113a4c90b3c350d82a79c58e20c15c0c5024e81e28d57ed199 SHA512 3974481f38f7b9aeb7c6ecc3d196579cfe7f2445e773917439a445dc20e96bb7580add8395a3702ea969b2654c44f7e9162fa6fe85135a97cd4b836a0fc193fe
-EBUILD selinux-finger-2.20200818-r2.ebuild 376 BLAKE2B 3a5814d814519d5211a9aa96a30d7ade30d0598c9230dc1b5c8b5b0fb9ef80961070509f338eff0c6ccbf89c221481d8389fc345ed3afacd19863a1cd204cf40 SHA512 a9fbb39ca84da544d48d41a57c760e4daa94e9350e44b4c83bb5e9b75a9faeebf97de88b3b43be1caf08ff6b12365d5fc2039d40f00bae5aa2e37c6233a0e1fc
+EBUILD selinux-finger-2.20200818-r2.ebuild 374 BLAKE2B 822b81f06350fac590b4b6ed25b3142ae63de7514d1e32920fdb26fb1820bb0bb160a3b85eb2ab45e3a104f7a2957007bcb1afa3a6986938e92fb73a58ad4041 SHA512 019bb83e3474929f409a62dce2ed95a3966d760a2afe168653dc1090d4dde72974257de48809a4606ec7d49297227edf0e05769bdff5b0408cad8c740539cce7
 EBUILD selinux-finger-9999.ebuild 376 BLAKE2B 3a5814d814519d5211a9aa96a30d7ade30d0598c9230dc1b5c8b5b0fb9ef80961070509f338eff0c6ccbf89c221481d8389fc345ed3afacd19863a1cd204cf40 SHA512 a9fbb39ca84da544d48d41a57c760e4daa94e9350e44b4c83bb5e9b75a9faeebf97de88b3b43be1caf08ff6b12365d5fc2039d40f00bae5aa2e37c6233a0e1fc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20200818-r2.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20200818-r2.ebuild
index afd41d995d2a..c8662b59e886 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for finger"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-flash/Manifest b/sec-policy/selinux-flash/Manifest
index 3627b5303aba..36f6e5c05e3a 100644
--- a/sec-policy/selinux-flash/Manifest
+++ b/sec-policy/selinux-flash/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-flash-2.20190201-r1.ebuild 277 BLAKE2B 398723a3a2564761a10a3cc7b9d967563794da966d3c2ed6bef8bc45af8af80a95e954b65c9034fcd502cba22192a153e510035b69ec2168193839519c538fe0 SHA512 a3ede68add9f474d9c544f5b00848595a382a6b3e2369730402e601d2494400ebf623b856f1c66222128c3afb141dfa867cf4c98aba4911d175df51be23d948c
 EBUILD selinux-flash-2.20190609-r1.ebuild 277 BLAKE2B 398723a3a2564761a10a3cc7b9d967563794da966d3c2ed6bef8bc45af8af80a95e954b65c9034fcd502cba22192a153e510035b69ec2168193839519c538fe0 SHA512 a3ede68add9f474d9c544f5b00848595a382a6b3e2369730402e601d2494400ebf623b856f1c66222128c3afb141dfa867cf4c98aba4911d175df51be23d948c
 EBUILD selinux-flash-2.20200818-r1.ebuild 279 BLAKE2B 21924c513eaabe4206bed0bfec29afeb36a2192f52db1b8d9c7487bee958fc3933b96a7f452045d27ec98550ca184aebe9f7a4ee9db4d7fa1f59f0366ea1f547 SHA512 213379f976e9e4a1d865ec0fd8f21d9e42b975960d653e3aad405e31a27c9461e861d4aa7d5cff32be7ea74a03f0ce921d4b6fa9e05f1414b9ad3cb3fc875256
-EBUILD selinux-flash-2.20200818-r2.ebuild 279 BLAKE2B 0dd9f2d745f66c18e4adf8c7c8184444a89c00c5965f0584a5412f7cfa0f21efc55164c76c7b4384d297ae420f357ac1ea9bc5f903e5110b0b39a14840411dcd SHA512 3a7cbefdd5d02a6363fb5fd8cbacb5dded9b7a5649d6ed6613c57c6a91deaabe71442b8ea29117d86496ff10309300796e541350d4df15383223d786dac2bce6
+EBUILD selinux-flash-2.20200818-r2.ebuild 277 BLAKE2B 5026237b0f7a59c27540b1f72789798f21c669421ba82b6ca35b37d4098200b975c7a32d53674d412249402e55f21aed8799db1597efd84b53beb3ebaaf874dd SHA512 69e9243742129f5dc15c49c98517f2f9a6e2114042886bc38dbb548cff29da1aad1e6337309f594ddeb6211bec25e3f5683db942d6149b43a9c8a7f1261869e7
 EBUILD selinux-flash-9999.ebuild 279 BLAKE2B 0dd9f2d745f66c18e4adf8c7c8184444a89c00c5965f0584a5412f7cfa0f21efc55164c76c7b4384d297ae420f357ac1ea9bc5f903e5110b0b39a14840411dcd SHA512 3a7cbefdd5d02a6363fb5fd8cbacb5dded9b7a5649d6ed6613c57c6a91deaabe71442b8ea29117d86496ff10309300796e541350d4df15383223d786dac2bce6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20200818-r2.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20200818-r2.ebuild
index ea5aa15888d6..ce78bc5d7a89 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for flash"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-fprintd/Manifest b/sec-policy/selinux-fprintd/Manifest
index c756c04d2cfe..8f821c90eb1f 100644
--- a/sec-policy/selinux-fprintd/Manifest
+++ b/sec-policy/selinux-fprintd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-fprintd-2.20190201-r1.ebuild 373 BLAKE2B f2a3cc566ea3ec93c5ea8a7f1432715c02dd66e04082a77a85bac709541e92463b7d82e59d545a9c632f6d28c50e1c220badf38f283d7a3b41b97fd49d4b7869 SHA512 40a8ed7717d128ebde3a0f8324c5bcd0b96fa7030c3853bc89ca4ab6f392bdf683acfb1cade3ac458caf9cc58454e0244ad3bec2eed994bd8eb9a3f208477234
 EBUILD selinux-fprintd-2.20190609-r1.ebuild 373 BLAKE2B f2a3cc566ea3ec93c5ea8a7f1432715c02dd66e04082a77a85bac709541e92463b7d82e59d545a9c632f6d28c50e1c220badf38f283d7a3b41b97fd49d4b7869 SHA512 40a8ed7717d128ebde3a0f8324c5bcd0b96fa7030c3853bc89ca4ab6f392bdf683acfb1cade3ac458caf9cc58454e0244ad3bec2eed994bd8eb9a3f208477234
 EBUILD selinux-fprintd-2.20200818-r1.ebuild 375 BLAKE2B 945698bc3936da3ee9ce067dbb8e3eaf04dcefd62ba9df72d20e59e27dbeb23a168ed6c748b058838f4f14b85c2b5528ac8800c063e01c6b06a9f689d287fe1b SHA512 d7c8bb1794ebe14c0424d2806ddb81e4c3d257345fd720768d982ad07b96c553a0fc0a833fbda9d11c9ccf04e0bfd5971ec86bb95f68d1bfbd79b065890d0eca
-EBUILD selinux-fprintd-2.20200818-r2.ebuild 375 BLAKE2B 3880334598b73beb46d9fd7062b8d9a29d0e7493a5e64962c23d4b9c251a8fad1b31d291ed16aa2928c1ba50811075af8edff7cf74c7c1a243661a61e38009ff SHA512 dd20a90fcea2d196560192fb958476a8fcbdc7ce603576b08a3007630feddd75c3eaeb01d9823b9e48f2f171a24d7e09c003c4f634a17b6d0d4bf5d92b3fa3fe
+EBUILD selinux-fprintd-2.20200818-r2.ebuild 373 BLAKE2B d67b4c5e79aaf26c0dff186a083b13b3e413dd543df984cdd7c211731fb34eabc2b6b7faeae20a4ccf272994b87fe3c432483eda907ee460b1f304293f0bd188 SHA512 985742a6de449b8b07b393f15a822303c71bbf1d3c992f728d12b19dc8e5a521d38976548a745c0c43aae5381e607905326f5eab5f8452df3afdd27c120dd0b1
 EBUILD selinux-fprintd-9999.ebuild 375 BLAKE2B 3880334598b73beb46d9fd7062b8d9a29d0e7493a5e64962c23d4b9c251a8fad1b31d291ed16aa2928c1ba50811075af8edff7cf74c7c1a243661a61e38009ff SHA512 dd20a90fcea2d196560192fb958476a8fcbdc7ce603576b08a3007630feddd75c3eaeb01d9823b9e48f2f171a24d7e09c003c4f634a17b6d0d4bf5d92b3fa3fe
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20200818-r2.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20200818-r2.ebuild
index 85d84b0d9f3b..e0b6dc48f2b3 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for fprintd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-ftp/Manifest b/sec-policy/selinux-ftp/Manifest
index 0202cb66e8cd..b3cca9ecfe3e 100644
--- a/sec-policy/selinux-ftp/Manifest
+++ b/sec-policy/selinux-ftp/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-ftp-2.20190201-r1.ebuild 273 BLAKE2B 826b23798472f2efcfbe99266a38d7bb3edf45bc30a1a5c4bd5959c9e799e81b36bee4a7e69f4a2faf0dbc1c68a78212a9d9c28834d9a85f5b7371ddc5bc864f SHA512 910f4a77bfaa486ebf1fed76899c1f03e32f201f9ec661fe20db379aaca33095db198e8001bb1e0d82750c6de764ef3918d2203ac921249653631d728155cd50
 EBUILD selinux-ftp-2.20190609-r1.ebuild 273 BLAKE2B 826b23798472f2efcfbe99266a38d7bb3edf45bc30a1a5c4bd5959c9e799e81b36bee4a7e69f4a2faf0dbc1c68a78212a9d9c28834d9a85f5b7371ddc5bc864f SHA512 910f4a77bfaa486ebf1fed76899c1f03e32f201f9ec661fe20db379aaca33095db198e8001bb1e0d82750c6de764ef3918d2203ac921249653631d728155cd50
 EBUILD selinux-ftp-2.20200818-r1.ebuild 275 BLAKE2B 5e4b3e37d98aa40ecbbd50eab8e1754350a95bda0da1ec30af2cd21e5b91954ebebdae2c482bfc03ff0e1cea04bc66cebfe91ae522a2030a55a78d88db7746f5 SHA512 907a169884ea875123666ef65e9e00417dd5e44b5256c734653045312b1b8b5622062633f09fb2cfc9b1fdc7390cd1ef0a73b2fa3b81f6e2e3f15b973a03a237
-EBUILD selinux-ftp-2.20200818-r2.ebuild 275 BLAKE2B b2c39d6e70283e63a3b2accbf4c0dfbc4a6f14c532e3aefd52a8df202b96cf91222be035d3b62b690e18717c1d4f03f02171285995ae8f49e598aa50c963605c SHA512 37ea6dfc95376d18205b0303e11bbdf4eef6c6e0882ddacb25eed77c74d84d0fdd65f871bd25613773c2b0dca046d28976be5d259bf49292cf2c6451e9357caf
+EBUILD selinux-ftp-2.20200818-r2.ebuild 273 BLAKE2B 664ddd6934fb0f5696939caa4987d27cb07e26d6c985c7ad14bed05ab8e22c3dd0c82c48dac8e841d06d7906520b4c6d71c6b0cfd13bcb1632070ec9009d88c8 SHA512 0f63c28cf0b13991c13fba3661432824637548def881ad5a99dfec5d34ac568e8838c82f03d6763e25ac6e7c3a3ea4a1aaa46d51bf6964737fe1d7f18e6176ec
 EBUILD selinux-ftp-9999.ebuild 275 BLAKE2B b2c39d6e70283e63a3b2accbf4c0dfbc4a6f14c532e3aefd52a8df202b96cf91222be035d3b62b690e18717c1d4f03f02171285995ae8f49e598aa50c963605c SHA512 37ea6dfc95376d18205b0303e11bbdf4eef6c6e0882ddacb25eed77c74d84d0fdd65f871bd25613773c2b0dca046d28976be5d259bf49292cf2c6451e9357caf
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20200818-r2.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20200818-r2.ebuild
index 2a2a1715659e..bb2c9dfe4536 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ftp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-games/Manifest b/sec-policy/selinux-games/Manifest
index 109e02a2d6b7..4e482b55d9b3 100644
--- a/sec-policy/selinux-games/Manifest
+++ b/sec-policy/selinux-games/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-games-2.20190201-r1.ebuild 277 BLAKE2B 7906999affc93ad5fe27b79c10c47a0cfe52d59462129e2a43431e4ca136cdcc1a86f8ee89d796be022103de37e7322dbb11861aff18d7c7dbc2120fb96806cc SHA512 71eb1299bdcd58d596b8b1f502b3f97c8c1727793480664b6cddbc35551953ed4651e716595bd392ad4353bcfa6734131e1ad34c290a177a008f9ee35be84821
 EBUILD selinux-games-2.20190609-r1.ebuild 277 BLAKE2B 7906999affc93ad5fe27b79c10c47a0cfe52d59462129e2a43431e4ca136cdcc1a86f8ee89d796be022103de37e7322dbb11861aff18d7c7dbc2120fb96806cc SHA512 71eb1299bdcd58d596b8b1f502b3f97c8c1727793480664b6cddbc35551953ed4651e716595bd392ad4353bcfa6734131e1ad34c290a177a008f9ee35be84821
 EBUILD selinux-games-2.20200818-r1.ebuild 279 BLAKE2B 68d38a2f649d463915c31d2e30a9804d7c62c4ab7a81c5071cabdac2fccd41d063a171529e877511933b0530efa695f05d3296e5333c04166260aa4207dd2234 SHA512 fa4bc673dd291063da4de9c028c5e7a1367e3e9f39b1d64939cabe01198f5326e5c38d01fdd9aeb0d383b417d62ba204aa1277e7718bd5f8d513d7a5c2d2295d
-EBUILD selinux-games-2.20200818-r2.ebuild 279 BLAKE2B 6853b1010c82b6a0a9f89a4ebd68e3dfd4c8865a313a8669d4f8b8a14936fc59f46b7c9e7ee79c1dfc85ce83a20d612cbc68b1aae393e19a5674c7b117f61066 SHA512 e9f579eb3c3194eb9476e17a54b2fc11f9dcf2807fba0c6af79a3c23886de3b0da0c662602a3a124535f89164ca869684da925bda136cdb009c842490e2bbe6f
+EBUILD selinux-games-2.20200818-r2.ebuild 277 BLAKE2B a1f45cc1a30420dbb5aca602f927b77ed05391dae1920c6500d8639fbc4904803c67aa7cd522058624575adf8757b8740d376b5c2815e78b7d1361be58b34a62 SHA512 dd8bafb716fd73303ee2df0217a7fea287c96c816c0483e229d45a3749b191044ac101db4a97b63724f8792705fc1e24100f8fa80ffc5496d75224da9a90e606
 EBUILD selinux-games-9999.ebuild 279 BLAKE2B 6853b1010c82b6a0a9f89a4ebd68e3dfd4c8865a313a8669d4f8b8a14936fc59f46b7c9e7ee79c1dfc85ce83a20d612cbc68b1aae393e19a5674c7b117f61066 SHA512 e9f579eb3c3194eb9476e17a54b2fc11f9dcf2807fba0c6af79a3c23886de3b0da0c662602a3a124535f89164ca869684da925bda136cdb009c842490e2bbe6f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-games/selinux-games-2.20200818-r2.ebuild b/sec-policy/selinux-games/selinux-games-2.20200818-r2.ebuild
index d7c42b1131eb..943ae43bf68e 100644
--- a/sec-policy/selinux-games/selinux-games-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for games"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/Manifest b/sec-policy/selinux-gatekeeper/Manifest
index 2567a66591d2..19549349d13e 100644
--- a/sec-policy/selinux-gatekeeper/Manifest
+++ b/sec-policy/selinux-gatekeeper/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-gatekeeper-2.20190201-r1.ebuild 287 BLAKE2B c70f817144df2e3e90948829f373a0921a20ff9154d495c1cdec4eebdd44391a654e4223098d66abb92d600d5e7498f6d5e33f9b58f443e91004904c24c92560 SHA512 db6b5481d8c4777a77c5e76d4d9e928211c8f2c236aa636d2b58020ed1ead5f00561b0140849f28ffb254d9dfaf3f54710e1c8ca4a7eae50906e3c803276ef79
 EBUILD selinux-gatekeeper-2.20190609-r1.ebuild 287 BLAKE2B c70f817144df2e3e90948829f373a0921a20ff9154d495c1cdec4eebdd44391a654e4223098d66abb92d600d5e7498f6d5e33f9b58f443e91004904c24c92560 SHA512 db6b5481d8c4777a77c5e76d4d9e928211c8f2c236aa636d2b58020ed1ead5f00561b0140849f28ffb254d9dfaf3f54710e1c8ca4a7eae50906e3c803276ef79
 EBUILD selinux-gatekeeper-2.20200818-r1.ebuild 289 BLAKE2B 43c4baed0f5c4a1e25c0351010634c7e01c438d55c727ff58778392f5e818e265c55aefbd405afb20694c4518b8645e6019eba8ccd44882e6841825a43d014c3 SHA512 0454cb030222291bf701a7edf4d0eefa4fa79c0c1a5b21d2259042a7b366c2db1b3acff51189de7d16778fae26abc9bfc0a698abc738a1a35b90b928c29820c6
-EBUILD selinux-gatekeeper-2.20200818-r2.ebuild 289 BLAKE2B 5dcc93a32eaeed9594c0d0307226c666ab6f1eef0b0e015c1b8770e5680cedfd1aad8f02be96fd552566d70d995f7d285150f0dde3039f482a152f9a11dc89f9 SHA512 886e5b056c3a8b5e8feba76970f8c928765377f80e5d5c4fd5cf9bbc61542281a4e562e34326dbbdc7ecf4de19f83eeb7022160454727c8dc082b3d1bf94436d
+EBUILD selinux-gatekeeper-2.20200818-r2.ebuild 287 BLAKE2B 6dbbae60e95bcea30093b4d4700244c7daefb78be6779eebe365e1b8a2fe2da4cf8a7b5a2e5e60f53871ca75cc9444d9d090140f8afa06c80b02f1b9d7a2331e SHA512 58d1f2a8e849f0fa1b1bd9a5f463e65d56ac988af77089dfafe8a68013220a84467d975b450cf83c1622820164b473bb1e9e6569687833e0372ede18ab55939c
 EBUILD selinux-gatekeeper-9999.ebuild 289 BLAKE2B 5dcc93a32eaeed9594c0d0307226c666ab6f1eef0b0e015c1b8770e5680cedfd1aad8f02be96fd552566d70d995f7d285150f0dde3039f482a152f9a11dc89f9 SHA512 886e5b056c3a8b5e8feba76970f8c928765377f80e5d5c4fd5cf9bbc61542281a4e562e34326dbbdc7ecf4de19f83eeb7022160454727c8dc082b3d1bf94436d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20200818-r2.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20200818-r2.ebuild
index c47c93e57ff6..ae5e55556395 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gatekeeper"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-git/Manifest b/sec-policy/selinux-git/Manifest
index f329a4166659..3ca067b68bb6 100644
--- a/sec-policy/selinux-git/Manifest
+++ b/sec-policy/selinux-git/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-git-2.20190201-r1.ebuild 369 BLAKE2B 524434e90ff83c64449ccf81ea4dc883ece5dea437a634cc85157558e289a3a797508591031b1d191acf3ec2380fd2eb457eff2420e0aa6ce13514778d0acc6f SHA512 1989357dc9416f20954653f1ab9ceb214711cb540c6f8001a6acb07fbbf473a566f410df9c826546014df7d13c66a7f839b1370d5483eeba20f699b742531668
 EBUILD selinux-git-2.20190609-r1.ebuild 369 BLAKE2B 524434e90ff83c64449ccf81ea4dc883ece5dea437a634cc85157558e289a3a797508591031b1d191acf3ec2380fd2eb457eff2420e0aa6ce13514778d0acc6f SHA512 1989357dc9416f20954653f1ab9ceb214711cb540c6f8001a6acb07fbbf473a566f410df9c826546014df7d13c66a7f839b1370d5483eeba20f699b742531668
 EBUILD selinux-git-2.20200818-r1.ebuild 371 BLAKE2B 8c6822d747fbf85b4333c3992d17f9ce8474b8d36186c68721931ec69b6d4425ed3885b60bf3be4aebef5b621764c0a02b0c384fc9e7059c0a9aae2e3dbfacb4 SHA512 406da45f6753926e6397dba4e5a7a71d8efc3b78695aabf464db833be687be821d100a5d8292880439d69e7f6351a0358a8bc3ffc428680e5df4d93ea1ba8e94
-EBUILD selinux-git-2.20200818-r2.ebuild 371 BLAKE2B bf7af1252420416e175dc7a7b2b16d19fc16b3b6b675adbbdccac9019b708860bb3250297bddd2a82107e1582c89b968b9544e0960db5c44365e1df57050731b SHA512 4a21087d35057ff1e8f3b5e358ae1d08f14d4b9b65eec5d6da0e03881207cd91724dad6cc5a9e7e2a9e6c7f5ea14c4b4c1ff95b8ee9fb7de31b8c834f1d35dcd
+EBUILD selinux-git-2.20200818-r2.ebuild 369 BLAKE2B 7da532e3c96e46f3a060d75710cf18c622e64eeded4ad20e332a593f1ece3599074615ceb7886f53fff300514675f7df9450bb669e3310522547f2a37133a7c3 SHA512 f7af2d130e8669631c79dd14813d22b3134f99ad5391eceffa3b15768cb2723cdce324649bd063d5b8b5fd1b703122ace007dec79da41d5f03ef5534d7329d5e
 EBUILD selinux-git-9999.ebuild 371 BLAKE2B bf7af1252420416e175dc7a7b2b16d19fc16b3b6b675adbbdccac9019b708860bb3250297bddd2a82107e1582c89b968b9544e0960db5c44365e1df57050731b SHA512 4a21087d35057ff1e8f3b5e358ae1d08f14d4b9b65eec5d6da0e03881207cd91724dad6cc5a9e7e2a9e6c7f5ea14c4b4c1ff95b8ee9fb7de31b8c834f1d35dcd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-git/selinux-git-2.20200818-r2.ebuild b/sec-policy/selinux-git/selinux-git-2.20200818-r2.ebuild
index 7c3849f49b4d..132d1e45faeb 100644
--- a/sec-policy/selinux-git/selinux-git-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for git"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-gitosis/Manifest b/sec-policy/selinux-gitosis/Manifest
index ebbffdd7a066..3ae86b4ba575 100644
--- a/sec-policy/selinux-gitosis/Manifest
+++ b/sec-policy/selinux-gitosis/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-gitosis-2.20190201-r1.ebuild 281 BLAKE2B 057decd4c858bbb378d875d8eab5448457e48b7c7d3118ced6e40038301c85e1440cbbbf38211e2f3a22a9d0a6e65de991f5bdc5e4a00cced56d8fc0aaa4f949 SHA512 6bd6d0a498b3505c1cc5ee22bf2fe0d86aa9e2f44287fc689ecb5658e88ac1b66026599379bfb7431af058d206e2daec9e7d14a84725091fe7829110be301dc4
 EBUILD selinux-gitosis-2.20190609-r1.ebuild 281 BLAKE2B 057decd4c858bbb378d875d8eab5448457e48b7c7d3118ced6e40038301c85e1440cbbbf38211e2f3a22a9d0a6e65de991f5bdc5e4a00cced56d8fc0aaa4f949 SHA512 6bd6d0a498b3505c1cc5ee22bf2fe0d86aa9e2f44287fc689ecb5658e88ac1b66026599379bfb7431af058d206e2daec9e7d14a84725091fe7829110be301dc4
 EBUILD selinux-gitosis-2.20200818-r1.ebuild 283 BLAKE2B 2ebffb45292df78772d900333a7d8c0f8447878e58ae2f7917ee16715c1f80d397c9ef8a40f96df3d52f91e55a989e9b09f06ed4f9f15ad81e3e93b11fac624d SHA512 83c12fcbceefa831c96c59fa5260e4b63018314488f877acc6938b818435b23d01cc95fe1663d76b506a2c09e8f49fe366322d242f0861e4b86caa95781866ab
-EBUILD selinux-gitosis-2.20200818-r2.ebuild 283 BLAKE2B 53ced8f9cfabdef650099faf52e4d21466e8fb0c6e21778b9ed338cd079d14d417e41f0e0d64fa56f9279e094d0797dadcac4eb3cd9f70cefaa2dad63aabafb5 SHA512 0939e10d082d17e289993090c4665059461235beba401f7a620ae08eeca46b7adf22670b99427f4deb560c13e19a8830efd9455a32bb4c7130461adbf1418570
+EBUILD selinux-gitosis-2.20200818-r2.ebuild 281 BLAKE2B 14772488ad558ed32f7c9099a1b5821188c9377095dbbfd0462b4d46cc75d1689c8f6e3e39cd2a7cf1a33617182c3a05e8d1e9690397ce62adf849bcdbd11f98 SHA512 50ecea1d34b2e0949d5ecb5fb543e2aef882f45470547e36cc299db3791ac1838474a0c0f6cb6cbfc10bbeb579d8604e382ed6745c8a7efb3c99dd7e50f13ce7
 EBUILD selinux-gitosis-9999.ebuild 283 BLAKE2B 53ced8f9cfabdef650099faf52e4d21466e8fb0c6e21778b9ed338cd079d14d417e41f0e0d64fa56f9279e094d0797dadcac4eb3cd9f70cefaa2dad63aabafb5 SHA512 0939e10d082d17e289993090c4665059461235beba401f7a620ae08eeca46b7adf22670b99427f4deb560c13e19a8830efd9455a32bb4c7130461adbf1418570
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20200818-r2.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20200818-r2.ebuild
index 3164d02d2c99..a6d12409641b 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gitosis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gnome/Manifest b/sec-policy/selinux-gnome/Manifest
index 9379f08fedae..f632fb2b935e 100644
--- a/sec-policy/selinux-gnome/Manifest
+++ b/sec-policy/selinux-gnome/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-gnome-2.20190201-r1.ebuild 277 BLAKE2B 7886bed92648c63171c5e6d2fa7a75934ec7ed7a1de235b347b8f9edc89850b7a6efa7440a6a466ee8c7cf33e69971067ccfa9cd7116e5d8d124545f215bb273 SHA512 ae60415fade2035f6b74690d51bc59dc72b8fcfe0b07a2271d6f07f21fb8da637776db5bece03a7c845065561bf1538e33eea208ecb9eddd38e0d668f7f5aba6
 EBUILD selinux-gnome-2.20190609-r1.ebuild 277 BLAKE2B 7886bed92648c63171c5e6d2fa7a75934ec7ed7a1de235b347b8f9edc89850b7a6efa7440a6a466ee8c7cf33e69971067ccfa9cd7116e5d8d124545f215bb273 SHA512 ae60415fade2035f6b74690d51bc59dc72b8fcfe0b07a2271d6f07f21fb8da637776db5bece03a7c845065561bf1538e33eea208ecb9eddd38e0d668f7f5aba6
 EBUILD selinux-gnome-2.20200818-r1.ebuild 279 BLAKE2B 0a6948dc46db1727182f7eb88467e136447da3be1980660817bd0bc0732d9ba19918d18d18b258d6ca2ea6c945701c77ad23b182bda8cb5e69a0c54563eb88bd SHA512 6dbdae9cef60b628d58afae6645d51dc1b40f803f2561919266ca6194aaee3bf51b7a14327705af843e7ed62a5d124a32cf324f8db6f9672565bf8ec333ffd00
-EBUILD selinux-gnome-2.20200818-r2.ebuild 279 BLAKE2B b4edbc5fcce0068a7cd83478234afe00b8c9a5696b1292b7c1ad5af56b97264f3a929e410753f06353015ae97a8be3f63cb828515a741f75a65a3455ee96ef70 SHA512 e727a8868da1de82a4a03fef36131d6568008ee29025ffceee12d6d68d5b99d317c25f993b220d3c641ff117774fc3c9de170e8308c06763afa3411deebf08b8
+EBUILD selinux-gnome-2.20200818-r2.ebuild 277 BLAKE2B 27cc74e1c8afdb45cfd356af8e72497a7291857e2c620d6056d9cebd0a6845ceca03391372fe14cae574695af42683ca238227e575dd61bcb2fe4ba775dabf73 SHA512 5bb1ac906b385978f3e690d0a8b71261f2c43cccca65b8e711f2927bb7b706d85b3165fd8ec8031a80b5b53152ab86078a964650d416a5c209f5c61274c29315
 EBUILD selinux-gnome-9999.ebuild 279 BLAKE2B b4edbc5fcce0068a7cd83478234afe00b8c9a5696b1292b7c1ad5af56b97264f3a929e410753f06353015ae97a8be3f63cb828515a741f75a65a3455ee96ef70 SHA512 e727a8868da1de82a4a03fef36131d6568008ee29025ffceee12d6d68d5b99d317c25f993b220d3c641ff117774fc3c9de170e8308c06763afa3411deebf08b8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20200818-r2.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20200818-r2.ebuild
index 2539659d7acd..11ce641c4a15 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gnome"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-googletalk/Manifest b/sec-policy/selinux-googletalk/Manifest
index 9065c2e63f26..ee03aeaaab41 100644
--- a/sec-policy/selinux-googletalk/Manifest
+++ b/sec-policy/selinux-googletalk/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-googletalk-2.20190201-r1.ebuild 291 BLAKE2B 04be59ecdb1be83e5c365d0099dbfb719fc06054aa9bdc609ed4c34b24ff2e5bf4228000f43e8da166765135ab76f3511fd4d685eb7e161bcbb520bdd67e933b SHA512 e92a0f797bed9b05768d6598aacdd73bc023a2d729947a5790e27f61a879ea3735dafcd06ea07e9808b8cf65e7188c86f4841207ec8f727af467262980a69269
 EBUILD selinux-googletalk-2.20190609-r1.ebuild 291 BLAKE2B 04be59ecdb1be83e5c365d0099dbfb719fc06054aa9bdc609ed4c34b24ff2e5bf4228000f43e8da166765135ab76f3511fd4d685eb7e161bcbb520bdd67e933b SHA512 e92a0f797bed9b05768d6598aacdd73bc023a2d729947a5790e27f61a879ea3735dafcd06ea07e9808b8cf65e7188c86f4841207ec8f727af467262980a69269
 EBUILD selinux-googletalk-2.20200818-r1.ebuild 293 BLAKE2B c8a3910b677e6121ed02b7788cccd3ab4038e01b08aaf8d9d95273e691ad081016cfd4633122985d0ab91ef7b19233c92e2a260c2e99316d6f8588678b574119 SHA512 a5342a9510964647f3858cd58261f25c9b48c06e6b1f7421f3c67ba53a9d47a3b15fcf110c7bef825fc6f2fd56c2deddadf18df8bda6d1a2ff030d5a1ad0c776
-EBUILD selinux-googletalk-2.20200818-r2.ebuild 293 BLAKE2B be045cb884fbe4d007ba3d970cfaaeb0134a0083f32e9143e4fbc3e146bee6300852e9320529511dc74d485202153b4ecb40b7a8945eaf7b6a885af69e3ba410 SHA512 da0daa41ea6159c03bb6afd0f73a18eb07736c5b734cc40343a562d0e977cd316aa67b432b27fa7fb60388b301f28dde530128ba241a96ab2ed1903f65eaa3b0
+EBUILD selinux-googletalk-2.20200818-r2.ebuild 291 BLAKE2B bd1fbd815572bf8b06d2a7edfa2560f926f51480f026cf3f743ef1cb6bcbe1d1f45174f73f9cfd11fbf317a7fc6516c063a6ab4c986404c97398407892486329 SHA512 1e145031c1abbb6b201652e693379999607eb369e2a5736c4db7290f4d1161dd5a86ffbc6fe075860c14a734bc356434b9c0f49dedacaf03ce6fa1682aa656fa
 EBUILD selinux-googletalk-9999.ebuild 293 BLAKE2B be045cb884fbe4d007ba3d970cfaaeb0134a0083f32e9143e4fbc3e146bee6300852e9320529511dc74d485202153b4ecb40b7a8945eaf7b6a885af69e3ba410 SHA512 da0daa41ea6159c03bb6afd0f73a18eb07736c5b734cc40343a562d0e977cd316aa67b432b27fa7fb60388b301f28dde530128ba241a96ab2ed1903f65eaa3b0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20200818-r2.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20200818-r2.ebuild
index 871788fa8d46..67268cd270ba 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for googletalk"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gorg/Manifest b/sec-policy/selinux-gorg/Manifest
index ce0a9c0ae207..739cb9140635 100644
--- a/sec-policy/selinux-gorg/Manifest
+++ b/sec-policy/selinux-gorg/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-gorg-2.20190201-r1.ebuild 275 BLAKE2B 1a47374168c8a45998cbc32b163b7e1c9b0b8ba110c22cdbb5779413feaa6f69a9b32a3ed229ef183f3d1405899b9b0d522c97421df9b23256ddf5c71ad76ee4 SHA512 ca026bb6bc4e9bcb9ab927550fed30f0c05915a097fa0e1a35c9755770f0588db984be507e0d8ce4f4bb053cb0fa8f8c7f37cdfb7726ac28b6246f4ad3bbeeb7
 EBUILD selinux-gorg-2.20190609-r1.ebuild 275 BLAKE2B 1a47374168c8a45998cbc32b163b7e1c9b0b8ba110c22cdbb5779413feaa6f69a9b32a3ed229ef183f3d1405899b9b0d522c97421df9b23256ddf5c71ad76ee4 SHA512 ca026bb6bc4e9bcb9ab927550fed30f0c05915a097fa0e1a35c9755770f0588db984be507e0d8ce4f4bb053cb0fa8f8c7f37cdfb7726ac28b6246f4ad3bbeeb7
 EBUILD selinux-gorg-2.20200818-r1.ebuild 277 BLAKE2B 06863a8f96ad85534166a0b006ed5dd355bec08db6760ad55c3eb6ea8da8def49135e292f4b98a714b6f9f76a6b4fdaafa328931c021b34e1fd1654578a4bfa8 SHA512 ba57dcdf6d0511757740df8d5df8f99b5689ecb1463ea6dc562a4092e45b3e713444e6979420b0e9766b46ce67e1ca72cfbfa165dc7c8cad187f3c6760bd2ef8
-EBUILD selinux-gorg-2.20200818-r2.ebuild 277 BLAKE2B fede218c3b93cc8c8fcaef69687578152e9c51c611a277cc37c5fa0d11990bd8c55192e0cda4425456ed709fb3e01a86973e818bbbb353e66c73088d69cee808 SHA512 41cb9bc219aa639ad29a8ab80b7b7bed3f808671d4216e06939e4ec70679630221cc96a7af87eb7e47feb14f83503302ec25119678006257c420d247586e3128
+EBUILD selinux-gorg-2.20200818-r2.ebuild 275 BLAKE2B 6ae80b5efca52d6a1a59feebd36dbeb7e4465dee34b2327edcd42a7067259caad61fe755e5ad0884bde72feb42cd2f8268921d8400d25c2aa93a983bf8af7010 SHA512 7556b2603a029637958fc86e78c76a35171cfd594f90128522b8f547936c005a34fd14ca386bdbe4528bd6da24067cf13b7e8bb34aa29d4152b077dd72d5f446
 EBUILD selinux-gorg-9999.ebuild 277 BLAKE2B fede218c3b93cc8c8fcaef69687578152e9c51c611a277cc37c5fa0d11990bd8c55192e0cda4425456ed709fb3e01a86973e818bbbb353e66c73088d69cee808 SHA512 41cb9bc219aa639ad29a8ab80b7b7bed3f808671d4216e06939e4ec70679630221cc96a7af87eb7e47feb14f83503302ec25119678006257c420d247586e3128
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20200818-r2.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20200818-r2.ebuild
index e5a824ce336b..e5854bfdb416 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gorg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gpg/Manifest b/sec-policy/selinux-gpg/Manifest
index 941377aed20c..66e07ac6c2a3 100644
--- a/sec-policy/selinux-gpg/Manifest
+++ b/sec-policy/selinux-gpg/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-gpg-2.20190201-r1.ebuild 372 BLAKE2B d0312cb72123770bb0d864418d00048b8d2e5cd3b900912872d39f35052c320dca941949c1b8b4d1d61d044e65499ac4ca4d286a83762ef151cc0a197b9d4391 SHA512 5195867c53a06a1f8077047b1bcb587c85efed7103fc12ea8cb724ada7c812182dc0cf1456cb847989d3c62834a48d0d5d5a113a1fc482336e98a6dae1b259b9
 EBUILD selinux-gpg-2.20190609-r1.ebuild 372 BLAKE2B d0312cb72123770bb0d864418d00048b8d2e5cd3b900912872d39f35052c320dca941949c1b8b4d1d61d044e65499ac4ca4d286a83762ef151cc0a197b9d4391 SHA512 5195867c53a06a1f8077047b1bcb587c85efed7103fc12ea8cb724ada7c812182dc0cf1456cb847989d3c62834a48d0d5d5a113a1fc482336e98a6dae1b259b9
 EBUILD selinux-gpg-2.20200818-r1.ebuild 374 BLAKE2B cd6319f3a4fab473fe1a34443e16d7d6b39dafe11f518ceb71985ac2f12f138c1fc144358ef0ad2d25d8a5dadbb514c1dbb2c35ccf79d3ed4f603dd8c20f31f3 SHA512 512a4431a59699884e91ec9fb2f6fdd453770d1009c50f29a2bce7a66e8f370be93c85e6f115dc686248aefbce5f36367a15d2d7aeca5193326b85cbf11f19b3
-EBUILD selinux-gpg-2.20200818-r2.ebuild 374 BLAKE2B aa729b5fcfef9c83e0e35e7cbd5a99593af9639f29d84c3fadea7c844a14d80f53198535939f305c7ecbfb0d94ed74a00a1010803b0c9b904124729f6e132d6f SHA512 c96114bb0718ea7860a784e8034e13f7e67fa3913dfa1d47335c08d7dcdc169065387e16e2777067d3895bd50676dd55a2e0363f324083e473258427d52c99ab
+EBUILD selinux-gpg-2.20200818-r2.ebuild 372 BLAKE2B 95bf8eeab73e9d157e5523192d52469cbf1401e44bf538886f545abf4bf86f0a564a9e7b3cb416c0db52b73e58e98bb463250e5566982030394d25005ac0edf7 SHA512 c255e78d1ce82f397800b9e4f41029fdfbf8cc9b504b2976d0853de9e990e38ca33ee8859fa8257e2e028246b64c334bd87e980948208e05b207f3863e87e7d1
 EBUILD selinux-gpg-9999.ebuild 374 BLAKE2B aa729b5fcfef9c83e0e35e7cbd5a99593af9639f29d84c3fadea7c844a14d80f53198535939f305c7ecbfb0d94ed74a00a1010803b0c9b904124729f6e132d6f SHA512 c96114bb0718ea7860a784e8034e13f7e67fa3913dfa1d47335c08d7dcdc169065387e16e2777067d3895bd50676dd55a2e0363f324083e473258427d52c99ab
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20200818-r2.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20200818-r2.ebuild
index dce59ec9209d..14498abb9999 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-gpm/Manifest b/sec-policy/selinux-gpm/Manifest
index 706fab2e7b23..602213867054 100644
--- a/sec-policy/selinux-gpm/Manifest
+++ b/sec-policy/selinux-gpm/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-gpm-2.20190201-r1.ebuild 273 BLAKE2B 338f9cfc3837d08458325f9ff421b27f8a4a42a6c858307931ce9a80353cb82c3d014ec2ce70e02c5faf52f26fbdc1a28b9637fb735f4bd421a33411c5135042 SHA512 a1e689564dc7b660e9a371f22d28207bbc29b4d9c6e60d74dd0564cc2a6ff982e2e77e53265b50ec87c0f8b6ba53e60b6d3cb15a22b524e808c664cfcfd08a8f
 EBUILD selinux-gpm-2.20190609-r1.ebuild 273 BLAKE2B 338f9cfc3837d08458325f9ff421b27f8a4a42a6c858307931ce9a80353cb82c3d014ec2ce70e02c5faf52f26fbdc1a28b9637fb735f4bd421a33411c5135042 SHA512 a1e689564dc7b660e9a371f22d28207bbc29b4d9c6e60d74dd0564cc2a6ff982e2e77e53265b50ec87c0f8b6ba53e60b6d3cb15a22b524e808c664cfcfd08a8f
 EBUILD selinux-gpm-2.20200818-r1.ebuild 275 BLAKE2B 80b53a1cd1a80e5358be33d2239b345b215517002fbf53ade3c6795c1a1a4988d73bb48a9fe7167d0b39be132c388499b30dc436e5408cab8ae30748097b2394 SHA512 9c30bc070e456cc7e08677fc4a51488bc56cd87e79815089112f5cabb5b23897c71a890df6752a35355dba3871390fad25289d7f5351a6be8a91dc7d0f912074
-EBUILD selinux-gpm-2.20200818-r2.ebuild 275 BLAKE2B 1caadfee9a0d5bb0340a2fe264ac19fb5f7b7125184d04d7a8b7b1824b51a2f30144be52dc174e9fad0c893e6f7484fee8b4ac7eab05ab69a8bc7f379ec3e341 SHA512 aa0885f04ca0d2f75e3f1191f6f29bc85b4c63c97fa97ac41823b2f920fee48f1b6edb04715aa90b9c1037ee546a869d7b612abd3222fea168f2c13c00757787
+EBUILD selinux-gpm-2.20200818-r2.ebuild 273 BLAKE2B 3aa4bf00e090cb9550659585f4c8ef2e3d44a97994f6863559370c89c62b1c6c83d5e01f36e181201cda274c7082b6b55032f659ac870449a0fd24df079daedd SHA512 ebb9f152fb521c40b0d2a4397dc70ee8547cf0b3ed7739880b24cc4d52ae0a03790daf4d7ad221a48228bbd707c49861d58a61d1720f28568312862e117f7508
 EBUILD selinux-gpm-9999.ebuild 275 BLAKE2B 1caadfee9a0d5bb0340a2fe264ac19fb5f7b7125184d04d7a8b7b1824b51a2f30144be52dc174e9fad0c893e6f7484fee8b4ac7eab05ab69a8bc7f379ec3e341 SHA512 aa0885f04ca0d2f75e3f1191f6f29bc85b4c63c97fa97ac41823b2f920fee48f1b6edb04715aa90b9c1037ee546a869d7b612abd3222fea168f2c13c00757787
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20200818-r2.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20200818-r2.ebuild
index 527fec066fb0..2a2119206f88 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gpsd/Manifest b/sec-policy/selinux-gpsd/Manifest
index 401875be679b..fa10c72513f2 100644
--- a/sec-policy/selinux-gpsd/Manifest
+++ b/sec-policy/selinux-gpsd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-gpsd-2.20190201-r1.ebuild 275 BLAKE2B 7a5c57b700ae04c4bb85103a976b2e5c3b240e3315bb91e9be6d34ae9cf134664b371fd66b5553f554b840915409b14237ad1e722e9b70c3f972d45a03c39856 SHA512 0fc92187b92f58e05575d766f0da2a35ce37b0b165611fe80a338b52a716714aa5213704f7cd2ce8f3742209165d8dc5b6954af5f0d819568171242cdd8033fb
 EBUILD selinux-gpsd-2.20190609-r1.ebuild 275 BLAKE2B 7a5c57b700ae04c4bb85103a976b2e5c3b240e3315bb91e9be6d34ae9cf134664b371fd66b5553f554b840915409b14237ad1e722e9b70c3f972d45a03c39856 SHA512 0fc92187b92f58e05575d766f0da2a35ce37b0b165611fe80a338b52a716714aa5213704f7cd2ce8f3742209165d8dc5b6954af5f0d819568171242cdd8033fb
 EBUILD selinux-gpsd-2.20200818-r1.ebuild 277 BLAKE2B 33d1922c06d9016414ecc73ceeebeaef4d5a80d897c68d74186ea379bce3b5fd390e2b7e2f11d61c22af135b0d4074fc771462403fff249a67643c2a72dc26b1 SHA512 acd8e795f9851e93945d49ba9b62eec229ffe3c5d9cd68224ddc013a5e862006b4f4d8771e8837fb92fb079d70ebe8fb9c2efc3fd691c288f01422bf6e3236d0
-EBUILD selinux-gpsd-2.20200818-r2.ebuild 277 BLAKE2B f8d27b1bd8e121e580a662d7d92f19ccf8c31bca2a0076fa0178c7705f1a3355fdcdf96747af3796b53d0996b23dce828dcf44d67fb7f81141f8d0c34bae98b0 SHA512 9d55f8fb6b4f3bb29f1f5f3f5c525d9a11b577a840d9e12fe630124ec4bc3656736bea246deec294b33f43a47a1f600824fa394664f5b3f9d0d410211e264cde
+EBUILD selinux-gpsd-2.20200818-r2.ebuild 275 BLAKE2B 59f1b8c6f3462b57f257e781e803208b1995101490ee592b17268cba175c1eeaefd27dd217e40c363ca284ac1f6e39f2564f72eacc9c7095db561290bfa7b133 SHA512 7044d200a1e115cb11b86afef7e371093eb4e0d604ecaba00042f00da29b263c5eb2ff58fe9cdbf5e4c87b6700e1c3187920d711f6b0fc1e8259a29ea1a1b44d
 EBUILD selinux-gpsd-9999.ebuild 277 BLAKE2B f8d27b1bd8e121e580a662d7d92f19ccf8c31bca2a0076fa0178c7705f1a3355fdcdf96747af3796b53d0996b23dce828dcf44d67fb7f81141f8d0c34bae98b0 SHA512 9d55f8fb6b4f3bb29f1f5f3f5c525d9a11b577a840d9e12fe630124ec4bc3656736bea246deec294b33f43a47a1f600824fa394664f5b3f9d0d410211e264cde
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20200818-r2.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20200818-r2.ebuild
index a189109b8be8..fb9cb666cfc2 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gpsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-gssproxy/Manifest b/sec-policy/selinux-gssproxy/Manifest
index 3bf26dd76638..7e1bd28fdb45 100644
--- a/sec-policy/selinux-gssproxy/Manifest
+++ b/sec-policy/selinux-gssproxy/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-gssproxy-2.20190201-r1.ebuild 283 BLAKE2B e6ddb0546236ada8a9ed49710bc5260895741953b0715d473f0671921c33f1e533af31aa65603efa090ca5008408cbb01b51465ebb3d8a5c4991c21d348e916c SHA512 3c5dc03935df9d277ead996185ca780a6297f9c940881ea678cb017f4ba67ee2b2b129b0a68dcf6a4309e26e9ab1e3ef1a9fee40388a1656ee2301151ec6bae8
 EBUILD selinux-gssproxy-2.20190609-r1.ebuild 283 BLAKE2B e6ddb0546236ada8a9ed49710bc5260895741953b0715d473f0671921c33f1e533af31aa65603efa090ca5008408cbb01b51465ebb3d8a5c4991c21d348e916c SHA512 3c5dc03935df9d277ead996185ca780a6297f9c940881ea678cb017f4ba67ee2b2b129b0a68dcf6a4309e26e9ab1e3ef1a9fee40388a1656ee2301151ec6bae8
 EBUILD selinux-gssproxy-2.20200818-r1.ebuild 285 BLAKE2B b90a82a601d042c2794d8a3bcc7b8d06c6d38564458fdd17ba71acfb0c04bbc30374be4bb0fea6778f1797b23a9636853ecc9b97b1fa6e602d9ae19f218f64c1 SHA512 08d91fa344d892d3064f4399613ba0c1dd2a88df9f3ffd92639b6b06f6986ece8970acb13b945ccdc93d5d6aee719c86dd3ae8bc58aa856aba3e447ec2075608
-EBUILD selinux-gssproxy-2.20200818-r2.ebuild 285 BLAKE2B 669622fb89f3922cdb5935f29ee90d4583d42584b58dd86a4f21b31ecbb652ec2b00fb27e1c6f483e4634b0e065275e83347c45dd24adb4baa441fb0c8ccc331 SHA512 1c4df54892022d51385689eab8ece46671c43ab608a1667ad0323a502a78c7c528b0cec68077cd3b548af16e6d756982931282c0342b919ad50e2b8ca0e337af
+EBUILD selinux-gssproxy-2.20200818-r2.ebuild 283 BLAKE2B dd94ae39f4e9e117ad864d097299bd13d7fdd6c34209b9718c1c4e91bec91fe23d8a6e4835d0f836b9eb10ca87758c07f3ef22712dd729d27ad315ff2743ef9c SHA512 787caba48d173335018b094efd46d3ba17daaf55dace27c94d6ecc2f875b6a9939d96d5f4ab7085c5874d51ca7301e05bdc5190b38aecc5f58043f4fc9ed2626
 EBUILD selinux-gssproxy-9999.ebuild 285 BLAKE2B 669622fb89f3922cdb5935f29ee90d4583d42584b58dd86a4f21b31ecbb652ec2b00fb27e1c6f483e4634b0e065275e83347c45dd24adb4baa441fb0c8ccc331 SHA512 1c4df54892022d51385689eab8ece46671c43ab608a1667ad0323a502a78c7c528b0cec68077cd3b548af16e6d756982931282c0342b919ad50e2b8ca0e337af
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20200818-r2.ebuild b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20200818-r2.ebuild
index 0ceb300fc876..7a8396561eb9 100644
--- a/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-gssproxy/selinux-gssproxy-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for gssproxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/Manifest b/sec-policy/selinux-hddtemp/Manifest
index 389ec1e3c754..1f4bb502fcfc 100644
--- a/sec-policy/selinux-hddtemp/Manifest
+++ b/sec-policy/selinux-hddtemp/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-hddtemp-2.20190201-r1.ebuild 281 BLAKE2B a8d481dd3dfbc365f485b2019b62574184b914f1672e2c76a7a085a75074ee62a45bb1bc0d134ae41c2fd955fb095df558525fe93b8528d8d19ff429ae416271 SHA512 5dc9b72547cf47c8d5c2b7f1ecdfcafd3097a07954d103fc2f7a79901b93979c0d65786b44b387ef9607c2cd91413b8018a647e85e9d1b5e21f95d013d3736eb
 EBUILD selinux-hddtemp-2.20190609-r1.ebuild 281 BLAKE2B a8d481dd3dfbc365f485b2019b62574184b914f1672e2c76a7a085a75074ee62a45bb1bc0d134ae41c2fd955fb095df558525fe93b8528d8d19ff429ae416271 SHA512 5dc9b72547cf47c8d5c2b7f1ecdfcafd3097a07954d103fc2f7a79901b93979c0d65786b44b387ef9607c2cd91413b8018a647e85e9d1b5e21f95d013d3736eb
 EBUILD selinux-hddtemp-2.20200818-r1.ebuild 283 BLAKE2B 8e432f21cf62aec8989cbd32128e51ab54651915e994a807e6b5b7f4fc045ad875807ebe3166473d313a9dc4d8c457172a1f33a19f962a05ce27b1b0895f7f7b SHA512 dcc44f2090f01b38188e54e34f519bafb961499efb2771255113cdde931f202c1a9c651b8d628af7490be159a65331110927ef4ef5fdc70d0c0e4f6f2a02d93f
-EBUILD selinux-hddtemp-2.20200818-r2.ebuild 283 BLAKE2B 307d0d4b1871f968d08eae1cd7df7c66974ef27a1108d05b09c2c30959cabd3049af598481c19d921e7da3033766c6b0ff825a45d629e9f2ede807e3db2a064a SHA512 0893a590a6d5bf524213d2714761eb4eff05acdfafc90a70844b11c4c0b6c4b1e928bb00c233725ad6d2281f1b355440d0d6e5951dfdd397df4f5e2dba07944e
+EBUILD selinux-hddtemp-2.20200818-r2.ebuild 281 BLAKE2B bb718bee7ab9eb495066aeca5ad3b9aea9c0f2b807272a9a140d4d7287f0852be4e2a087824c6266b91dd5144bca6b893f5427032464d50192fe5eb1feb1133c SHA512 3f4335852ad4ad8797978d18a00e74f17cb57ace7d6f7c15d7a6a1b21b575493cec95da68b774744ffec4f335eca6ff9e663f2ea0ad4b18bff822a04974ea049
 EBUILD selinux-hddtemp-9999.ebuild 283 BLAKE2B 307d0d4b1871f968d08eae1cd7df7c66974ef27a1108d05b09c2c30959cabd3049af598481c19d921e7da3033766c6b0ff825a45d629e9f2ede807e3db2a064a SHA512 0893a590a6d5bf524213d2714761eb4eff05acdfafc90a70844b11c4c0b6c4b1e928bb00c233725ad6d2281f1b355440d0d6e5951dfdd397df4f5e2dba07944e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20200818-r2.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20200818-r2.ebuild
index 354d73492c0e..9e5345aeaf67 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for hddtemp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-howl/Manifest b/sec-policy/selinux-howl/Manifest
index ae522813ab6b..abd775628fd6 100644
--- a/sec-policy/selinux-howl/Manifest
+++ b/sec-policy/selinux-howl/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-howl-2.20190201-r1.ebuild 275 BLAKE2B b51b0e281eed5865c99cca3147b187986715cb11c5c3aeaf6d2a33301476e0d852949b753892eb1a5a01b57907cdd439c20b1ab24d8e9daf1272146b30bb846b SHA512 3a426bcb86ba48bceda2d1c9a52fbd13fff946ada7a4e4b7aed0db67a9f9cbef0a9cc2efccce40b6c301e68bc154acd04d6626313176b20e9b0b408bac7ef04d
 EBUILD selinux-howl-2.20190609-r1.ebuild 275 BLAKE2B b51b0e281eed5865c99cca3147b187986715cb11c5c3aeaf6d2a33301476e0d852949b753892eb1a5a01b57907cdd439c20b1ab24d8e9daf1272146b30bb846b SHA512 3a426bcb86ba48bceda2d1c9a52fbd13fff946ada7a4e4b7aed0db67a9f9cbef0a9cc2efccce40b6c301e68bc154acd04d6626313176b20e9b0b408bac7ef04d
 EBUILD selinux-howl-2.20200818-r1.ebuild 277 BLAKE2B 46526b35b8527f2235a2336af40e7a747afb15b9688011423995dff614db1071a7e1a7e4bacc7c81e4bf518c3a8385ddd69d39b5795626465f13631cae66c6c6 SHA512 585281918188bc6b475ce7d3a1b5fcd6bfe57ff8f95a60dc3f0c46a4eb9470952c64abc2dcb0d4ce271c46b65177b50229b71fed5d86f9d30288917441edfc62
-EBUILD selinux-howl-2.20200818-r2.ebuild 277 BLAKE2B 3c61fb29455e41b641b6d96e66dc12c85bd043cc132eae6a3b97bc7b99cdf958c4814bfa9fef6457fadecd9eb4d8e4f9970d8906aa69266e2db3b877a47cfff0 SHA512 04c17bbe2c04c29387159ccd830511c4fc530d09aacaaf29c3bd58df19642253b768dfd0eabad298ac2aaef112d0f625983ad214786e664cee2070b0d93b6699
+EBUILD selinux-howl-2.20200818-r2.ebuild 275 BLAKE2B 06add2ada7f82aa7d5b8f16dc9c192b70b9282cceb770d76e6f5257af1e38e664000d6af09e643bd8242a6f728d73c8c83b992b050f6826a29e030d05c98606a SHA512 3847073a0d5f7d099f415537ff9a2cf5946c3d3e3289ead1be9bfcc0035e23a1e6d3ec85a5f4a6cd86217e408cca137a191be9cf1fd2a685d3a173d7a0b31b1f
 EBUILD selinux-howl-9999.ebuild 277 BLAKE2B 3c61fb29455e41b641b6d96e66dc12c85bd043cc132eae6a3b97bc7b99cdf958c4814bfa9fef6457fadecd9eb4d8e4f9970d8906aa69266e2db3b877a47cfff0 SHA512 04c17bbe2c04c29387159ccd830511c4fc530d09aacaaf29c3bd58df19642253b768dfd0eabad298ac2aaef112d0f625983ad214786e664cee2070b0d93b6699
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20200818-r2.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20200818-r2.ebuild
index 6d53593342b5..1d306bbc676a 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for howl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-icecast/Manifest b/sec-policy/selinux-icecast/Manifest
index 5c867b0fc726..cc184ce93589 100644
--- a/sec-policy/selinux-icecast/Manifest
+++ b/sec-policy/selinux-icecast/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-icecast-2.20190201-r1.ebuild 281 BLAKE2B e9d6d793cde170b088756472e7ed2c756fbb6fe5746c07912dab5713df22ab36627801c386eba994b50a166706c1959ebd71c610b5cad590483037e980b2ff57 SHA512 c62cd484aefa2259a32f7442d7aaf4b62415086cfd60e25f901ae44f17791d0d7aca9d9e95918d2d496342ef0c68a13a938939e2daf32554cc5505365cc48874
 EBUILD selinux-icecast-2.20190609-r1.ebuild 281 BLAKE2B e9d6d793cde170b088756472e7ed2c756fbb6fe5746c07912dab5713df22ab36627801c386eba994b50a166706c1959ebd71c610b5cad590483037e980b2ff57 SHA512 c62cd484aefa2259a32f7442d7aaf4b62415086cfd60e25f901ae44f17791d0d7aca9d9e95918d2d496342ef0c68a13a938939e2daf32554cc5505365cc48874
 EBUILD selinux-icecast-2.20200818-r1.ebuild 283 BLAKE2B 9dc6a232516c0d8d028fe8ffceed56c5f62c2d463450add7cfeebed5189fd1afa09aaadc35d652a1188c6f7df55c8dc2b580bc854f64ced92372259c5188d109 SHA512 ab379577efc81439303a6defe5659728212142695d7c559bf07dfbb46b81a819c6054c96b9a74a4fe2f74934a1c31bb1aff282db8e91df6c234a3170b632b2eb
-EBUILD selinux-icecast-2.20200818-r2.ebuild 283 BLAKE2B 3f01a03da9f8715ea8376eb503fb1514d2fbf8752fda151574de177400ef86dbdfdb188db1648602b483aed93b39073e4504f6b4d865d7b16f2bae3bf0f9b4c2 SHA512 c5b4c015b6be7176b978f72c4f461c563d37a32ecadda81da78f6320b71eb0834ece52651e42e8df97e55dae9f791d46f9d9b0a5e89df9bfaa1100a92f9b45fc
+EBUILD selinux-icecast-2.20200818-r2.ebuild 281 BLAKE2B b86af76842212d7ea20abbb3d283171fcb2ac804508d69363212ee51184a14c2ec894633ba665c3f9d601abd4dca95a0a25e7b5563885db7d862f2caaaee2d72 SHA512 331f90149c305c29d4dedca1fbaa5236a88d4fffb833a2611ff07027441afe690ea3db5ae4456b9232cbec577f884b384ba486be96169ffe8314fe0509aaa329
 EBUILD selinux-icecast-9999.ebuild 283 BLAKE2B 3f01a03da9f8715ea8376eb503fb1514d2fbf8752fda151574de177400ef86dbdfdb188db1648602b483aed93b39073e4504f6b4d865d7b16f2bae3bf0f9b4c2 SHA512 c5b4c015b6be7176b978f72c4f461c563d37a32ecadda81da78f6320b71eb0834ece52651e42e8df97e55dae9f791d46f9d9b0a5e89df9bfaa1100a92f9b45fc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20200818-r2.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20200818-r2.ebuild
index 81fa461d1145..96d317777ce1 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for icecast"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/Manifest b/sec-policy/selinux-ifplugd/Manifest
index 6a439499b5a1..ea3792190eb6 100644
--- a/sec-policy/selinux-ifplugd/Manifest
+++ b/sec-policy/selinux-ifplugd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-ifplugd-2.20190201-r1.ebuild 281 BLAKE2B 28cf75e3ccea660a3c4f9886408705cd12863b09d858ca29f1eb5590ce77fcd5d900d9ec02bfd5614d61ad142ca55df57a2a592cf65bc03650e411465ec74ed3 SHA512 55c43b2a8e17d04619857fdf76085b6e05063fe93c9a7c826e123bef02899bfe2ad2a3165068648d89df93b779c3b2b4791c8211a39ab7c37eefa96fb5acbc9c
 EBUILD selinux-ifplugd-2.20190609-r1.ebuild 281 BLAKE2B 28cf75e3ccea660a3c4f9886408705cd12863b09d858ca29f1eb5590ce77fcd5d900d9ec02bfd5614d61ad142ca55df57a2a592cf65bc03650e411465ec74ed3 SHA512 55c43b2a8e17d04619857fdf76085b6e05063fe93c9a7c826e123bef02899bfe2ad2a3165068648d89df93b779c3b2b4791c8211a39ab7c37eefa96fb5acbc9c
 EBUILD selinux-ifplugd-2.20200818-r1.ebuild 283 BLAKE2B e4f9f5e3a350ce6d7306371c2e94eba89527675042b7c9808fb884f1de524eadacf3efffa6966dca6dbe613cdd72ee80b77e492129fcaee01ca020cf82c631b1 SHA512 4df03d07705995d4fb5a0ac7df007bde7879b8cf4f0f71ace253c838f4734f2f80393b6cfb3c8d707fbc08ca0a4d536bf5b7d79993af4c845bd65739adacd411
-EBUILD selinux-ifplugd-2.20200818-r2.ebuild 283 BLAKE2B c09c33b1855ce14ebb213d968674bc6f5fbf04be411ba0da49dd8f86feb02371b7fe5de9c169567cd2185ce7e5cf0e59530e10847c9b49f79f35cd17a366f035 SHA512 59bbbd4475d016fb6992950af4e3645efdfb2ab8e03989793d15b47c68b1670c322971f54ec8cf0dd565fcff43384c7546532948609b3821d53d4255f0d6ea97
+EBUILD selinux-ifplugd-2.20200818-r2.ebuild 281 BLAKE2B 1b4bb5ba9a86bdcdc157d80d782883813501d6dbb0dd8e9888164c6500d16032599d8b41fb091fb3be32bfd3088d1feb195456211492769bc177a815d657db89 SHA512 b8b4dc74c84ac32a80c9dd21dff249d02590df6b92b410d1ea051c705e89b7fb46f7dc0ac419bd0e674e24dcb25fc78e19fbbbd57cd2740276f4d66ba33b2f5b
 EBUILD selinux-ifplugd-9999.ebuild 283 BLAKE2B c09c33b1855ce14ebb213d968674bc6f5fbf04be411ba0da49dd8f86feb02371b7fe5de9c169567cd2185ce7e5cf0e59530e10847c9b49f79f35cd17a366f035 SHA512 59bbbd4475d016fb6992950af4e3645efdfb2ab8e03989793d15b47c68b1670c322971f54ec8cf0dd565fcff43384c7546532948609b3821d53d4255f0d6ea97
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20200818-r2.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20200818-r2.ebuild
index 38c952c52c0a..f80afcc859bc 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ifplugd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-imaze/Manifest b/sec-policy/selinux-imaze/Manifest
index 1e95f2e14d0e..399ab063970e 100644
--- a/sec-policy/selinux-imaze/Manifest
+++ b/sec-policy/selinux-imaze/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-imaze-2.20190201-r1.ebuild 277 BLAKE2B 7dc82ed9d231fb6f5afb19dfa77c051719729809121f752176c814634b9f138d56081c1043222b34ab6034e6a43bb94fb293435821de2faf33d4c87eb93a273d SHA512 f0fa13de0b73d546b8facb83cffac195eef84e9de9b2544b86dfec3afdb44b869a64e16d9fc2ca8ce7f97de15218f4e1de8955a88d4a88942d6a35a7c4cdefb5
 EBUILD selinux-imaze-2.20190609-r1.ebuild 277 BLAKE2B 7dc82ed9d231fb6f5afb19dfa77c051719729809121f752176c814634b9f138d56081c1043222b34ab6034e6a43bb94fb293435821de2faf33d4c87eb93a273d SHA512 f0fa13de0b73d546b8facb83cffac195eef84e9de9b2544b86dfec3afdb44b869a64e16d9fc2ca8ce7f97de15218f4e1de8955a88d4a88942d6a35a7c4cdefb5
 EBUILD selinux-imaze-2.20200818-r1.ebuild 279 BLAKE2B e1f868acc088670d6893d39eb3b1a4f1e93ab83acb59ec1ba7face0059e60b798e3b407f42c8bb59341296063224d35ffc34d0302325850125a0206bfb8b2fdc SHA512 2c1a9570034daf4c4e287984d3299ac5b744057cfd1fde21b7a9cd4db3e3a799a51a2d154e49244433b3438ca2531d7e699a87219c836fd701245bc7b61d4c6a
-EBUILD selinux-imaze-2.20200818-r2.ebuild 279 BLAKE2B f4162a94d6fe437ce7939b5fb8a8da2270cdadfaeb41de430cf5bb4e07aed2614b5ecd7d5d39cc5b9baf743f2cd8617474c827e8db4046194eb7246289831a57 SHA512 e17ab983062152aaf952bfe5f1bfdba576a50b9b9a55f7a1bd7c816945883a1f835bd1dfea161203db206ded343b0a596af882a480813cc5e6051ea152978116
+EBUILD selinux-imaze-2.20200818-r2.ebuild 277 BLAKE2B bbfe29f2a1505003b20bfc644e6d37bfafd5f2e87ac22b53620128f70eb19d876a4a77053bcd0b3d36fe206fede54f80626d3b9b6c2587e7c2a36d9b52cb1c47 SHA512 b8f603a0595420a3d38880f0f8a59946e02b2e6f50283a4677d73bb2847b4e16d0ddef91ccc056241c76b8e9613785f2add39bc62d8987ee72b56e71d6444b35
 EBUILD selinux-imaze-9999.ebuild 279 BLAKE2B f4162a94d6fe437ce7939b5fb8a8da2270cdadfaeb41de430cf5bb4e07aed2614b5ecd7d5d39cc5b9baf743f2cd8617474c827e8db4046194eb7246289831a57 SHA512 e17ab983062152aaf952bfe5f1bfdba576a50b9b9a55f7a1bd7c816945883a1f835bd1dfea161203db206ded343b0a596af882a480813cc5e6051ea152978116
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20200818-r2.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20200818-r2.ebuild
index 5986df0b9ce0..2755f22ebae7 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for imaze"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-inetd/Manifest b/sec-policy/selinux-inetd/Manifest
index 00100a37e797..40d61e52681f 100644
--- a/sec-policy/selinux-inetd/Manifest
+++ b/sec-policy/selinux-inetd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-inetd-2.20190201-r1.ebuild 277 BLAKE2B c3a2adc0b3a054b2a248d8c7156ad615c033d1f4b7264cec586e98bd0a720e2038b036e006e34d6e622bf1368281a329c47246b8dd9c877387dfbdb1f734b7b1 SHA512 f4bb5849085748d632257dc52ca1d5d760c8d4b5c6d271cd363f50ce7fd54394fd18bcb90e668218ab952f5a601979fa802ae18cb72dd0c9c601df900385a64c
 EBUILD selinux-inetd-2.20190609-r1.ebuild 277 BLAKE2B c3a2adc0b3a054b2a248d8c7156ad615c033d1f4b7264cec586e98bd0a720e2038b036e006e34d6e622bf1368281a329c47246b8dd9c877387dfbdb1f734b7b1 SHA512 f4bb5849085748d632257dc52ca1d5d760c8d4b5c6d271cd363f50ce7fd54394fd18bcb90e668218ab952f5a601979fa802ae18cb72dd0c9c601df900385a64c
 EBUILD selinux-inetd-2.20200818-r1.ebuild 279 BLAKE2B da49bfcee3136f48f2cd58f80d9f3f23fa9b47e2a9b57207ec5fe1b82cdf623711e1d0d5806c18922e4d5550bbba73b0a232ca97cca1fd61981a5fb5b454561e SHA512 65e170bdaf9f9f9fe68f4455bf96cd8e0508bbc165b9848e0a77b44c58978fc3be4465582cfdab013481604b26d16c54afcfe42e67d98c10dcf556a10781db49
-EBUILD selinux-inetd-2.20200818-r2.ebuild 279 BLAKE2B 0f9e566a647902796ae0576222cc880832d62351725aa4b94a9c7860a05ba884e68371810ccb2fb0e70bd840a7377f0278181d6551194f99b96c10e4d9bbe4c6 SHA512 a51d8075640ebfda9d00616ef06acf98f3367cc12f692a1c9ae21f830cc42c05138bb3a7160062792746c9adcc40ee3cda5165e7d0540fefae1801f57554ff7f
+EBUILD selinux-inetd-2.20200818-r2.ebuild 277 BLAKE2B ebab356e28650f19791436ea1874b1fd608580986741cb8ad13a08b991bf8494748c762e3f8c996862ca7fb3f9f7b3de0badd78c665b8c239e4299103fd0bb0b SHA512 5922949f0415342a3f55eb7d56684a49f44806d647ed888bf1cc5c642f18848aa31dea3a7ff1339591e847951291ae3932a063b33f6b8e2e5d4acb714809eeb0
 EBUILD selinux-inetd-9999.ebuild 279 BLAKE2B 0f9e566a647902796ae0576222cc880832d62351725aa4b94a9c7860a05ba884e68371810ccb2fb0e70bd840a7377f0278181d6551194f99b96c10e4d9bbe4c6 SHA512 a51d8075640ebfda9d00616ef06acf98f3367cc12f692a1c9ae21f830cc42c05138bb3a7160062792746c9adcc40ee3cda5165e7d0540fefae1801f57554ff7f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20200818-r2.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20200818-r2.ebuild
index 894083a71254..62ffe4b33aa0 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for inetd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-inn/Manifest b/sec-policy/selinux-inn/Manifest
index ee69385e229a..804e114bfc67 100644
--- a/sec-policy/selinux-inn/Manifest
+++ b/sec-policy/selinux-inn/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-inn-2.20190201-r1.ebuild 273 BLAKE2B 672797b7bee8c32b506e039641430ab6a8cd82453528ce848ebe198a28b4179c468b7fd313e973c2fe7f677ccc9f483228c21d284335945e96769af260a7fd5d SHA512 bcc21b2416e6e5a8856253eca82b7b64ac79b1f9af4ad66c1c015d0d4aab59d67efb314842b5ecf6b7cf4c4440944959e7c36dafa593b4d59fb639bbec08ff4c
 EBUILD selinux-inn-2.20190609-r1.ebuild 273 BLAKE2B 672797b7bee8c32b506e039641430ab6a8cd82453528ce848ebe198a28b4179c468b7fd313e973c2fe7f677ccc9f483228c21d284335945e96769af260a7fd5d SHA512 bcc21b2416e6e5a8856253eca82b7b64ac79b1f9af4ad66c1c015d0d4aab59d67efb314842b5ecf6b7cf4c4440944959e7c36dafa593b4d59fb639bbec08ff4c
 EBUILD selinux-inn-2.20200818-r1.ebuild 275 BLAKE2B 6c4227a3d65291576f85ebe38d88fc7e4f64aadf22e3158bd96ce41832a35361deee80bb266d7a904f104099103b2ab03a73e15f17ae77c1ad12d2acb0c3022b SHA512 4171fb3242f09e4fe964d0181f81b75f4c935fe3d3d6716c847f5d27e8a29f078e5c13068d85fdda8e089306efd3448c0320d93a396c6047db3be53bd79a8ed6
-EBUILD selinux-inn-2.20200818-r2.ebuild 275 BLAKE2B 078982a6130bdd1c2b647dd6963aafbc97443fd56e4741fee557fba71d325d2a05d337e446fdf725bb6779d0c156ebf58174d9b055457eab3d8321e0a8b6847a SHA512 f8348b26498d5354eff906b415c0353cffd6fc57da4f01720e45b93e75a1516c83d39789186d7d93f7253da19aadfec00231dc44a4f93f0f0587415be72c1f76
+EBUILD selinux-inn-2.20200818-r2.ebuild 273 BLAKE2B 389803d9241d6b486d4d6aee182f5bdcba062dd2e8063fe157fa0bd8a7df0356d383ce647805dbd361c14b4633a67669d3b2471e2a0c20dae8334db64d8b856f SHA512 fd5d38e4fd693acf2277b02c4bf7322fe8705eb8c1f915a703950d3fbfdcb2b50f18599a646e4ccd241b29d1762769cf76d35b399184f6da41c12d36ad2b6e19
 EBUILD selinux-inn-9999.ebuild 275 BLAKE2B 078982a6130bdd1c2b647dd6963aafbc97443fd56e4741fee557fba71d325d2a05d337e446fdf725bb6779d0c156ebf58174d9b055457eab3d8321e0a8b6847a SHA512 f8348b26498d5354eff906b415c0353cffd6fc57da4f01720e45b93e75a1516c83d39789186d7d93f7253da19aadfec00231dc44a4f93f0f0587415be72c1f76
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20200818-r2.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20200818-r2.ebuild
index d26080c8221d..b1b47fb887d2 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for inn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ipsec/Manifest b/sec-policy/selinux-ipsec/Manifest
index 659ee74d1c75..96ca965b85a6 100644
--- a/sec-policy/selinux-ipsec/Manifest
+++ b/sec-policy/selinux-ipsec/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-ipsec-2.20190201-r1.ebuild 277 BLAKE2B d948c18dc4e3f96307c79918ca3cff77317087120a703a2440b5c457506880e76a51bfb33b25b08c4d86c7edeee9116fb8b58f8017669ac3e1f282bea034ac3e SHA512 36fe0a15e27ab22b1ea410e8eae5e46137b4a145a70e500cd798706dbdd08cf88f80522754866267c778b352f861258a6518e2f6a0c38f9076e5f1fbcd9aa5e1
 EBUILD selinux-ipsec-2.20190609-r1.ebuild 277 BLAKE2B d948c18dc4e3f96307c79918ca3cff77317087120a703a2440b5c457506880e76a51bfb33b25b08c4d86c7edeee9116fb8b58f8017669ac3e1f282bea034ac3e SHA512 36fe0a15e27ab22b1ea410e8eae5e46137b4a145a70e500cd798706dbdd08cf88f80522754866267c778b352f861258a6518e2f6a0c38f9076e5f1fbcd9aa5e1
 EBUILD selinux-ipsec-2.20200818-r1.ebuild 279 BLAKE2B 69f69d5321e5db91a1745ef5ca51a26a6be44a206fd5031455c98514174339376a8caaca0db96144bb971f3324387f983b10a53f7d9d04f738308dc0ae846d34 SHA512 1dbd8f4f0df77b9eb0e585fcfa613976de32bdc8329e00339107b188acad9f6678b6b11ff0bf608b3757539ddc656b8dc542ed16ce98e3f5baf0b74478c04524
-EBUILD selinux-ipsec-2.20200818-r2.ebuild 279 BLAKE2B 2dfc3d1a3b4b0ece6756590c2feaf05344c2b823769b85938d1502ed031ed3f8a3c3be5bb42761cd4eb794e2bda78c7d14162db9c072d4bfbaf2a795e0f4268f SHA512 da296353bba89d675879b99fe2c8612695e8874a0ce125768a3bdb936a352efd069dc3dd5e6cb6c7de307bea63da4f3e1bc0e1a554d63d80e83c3377a2abde4f
+EBUILD selinux-ipsec-2.20200818-r2.ebuild 277 BLAKE2B 2e07217ac1d32f168cd51ed102bbbacd993b2be65f4c9f50bf1e5228e99bad6dcdfc3cbd0ed16efa576694ff63a7a07fec3f8b06fa566671f051ec7390a59228 SHA512 8b44090b7e160db83d66e5b10fd65aae7bf8a67c244e847a2b97f69fbf9319ed14edf56789a941b92fc8cd868397e2572b1fa0866126aa7eb4670a611b74b912
 EBUILD selinux-ipsec-9999.ebuild 279 BLAKE2B 2dfc3d1a3b4b0ece6756590c2feaf05344c2b823769b85938d1502ed031ed3f8a3c3be5bb42761cd4eb794e2bda78c7d14162db9c072d4bfbaf2a795e0f4268f SHA512 da296353bba89d675879b99fe2c8612695e8874a0ce125768a3bdb936a352efd069dc3dd5e6cb6c7de307bea63da4f3e1bc0e1a554d63d80e83c3377a2abde4f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20200818-r2.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20200818-r2.ebuild
index 08627bc93fb2..ba3b529e3d79 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ipsec"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-irc/Manifest b/sec-policy/selinux-irc/Manifest
index a8b74f1efba1..0c6420deeee7 100644
--- a/sec-policy/selinux-irc/Manifest
+++ b/sec-policy/selinux-irc/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-irc-2.20190201-r1.ebuild 273 BLAKE2B d823b81194dde4bf21666381d9b978bb666489eb07b197d364d28186b0533cb29f1fefe3a3fbebb542d2f7c685efaee580d8d4f2765227dce9033d3b023126c3 SHA512 4e1642e2fbf414dbd6a387ad3d8e0fac73a2b7da91c2e53e15f4e9f14ed6ff5cc7f290e40995dcba110cfc0c1d114a50aee1bf44c38df9aec1eb14da6f15e9de
 EBUILD selinux-irc-2.20190609-r1.ebuild 273 BLAKE2B d823b81194dde4bf21666381d9b978bb666489eb07b197d364d28186b0533cb29f1fefe3a3fbebb542d2f7c685efaee580d8d4f2765227dce9033d3b023126c3 SHA512 4e1642e2fbf414dbd6a387ad3d8e0fac73a2b7da91c2e53e15f4e9f14ed6ff5cc7f290e40995dcba110cfc0c1d114a50aee1bf44c38df9aec1eb14da6f15e9de
 EBUILD selinux-irc-2.20200818-r1.ebuild 275 BLAKE2B fb0c2011ee0cdb56ccadb076d616576d60d0eb6c426905116e313660c6429b6db6286eb9f1de66e90d2da5ca06813bd27c42abf07939d13de331af10de848efc SHA512 4d4564ef95e9eea344e64f91bea4c63a4355739591f0219b343aa1207c9cbf00c480e8a03f7477d2c559b94bec62e5746feae61a2ed0b4a57cbf993beba932d9
-EBUILD selinux-irc-2.20200818-r2.ebuild 275 BLAKE2B 004afa2027d0917eb7116fb0376ab5feb838c9145dd3aac89a18e5800164a0a624dd859e1ef001d10ce85f5ad2a029992566f8aa03d6b29b7e54a4dff2e893ab SHA512 a5ff68783bbbaf0c520044ae53ea4cdde58e7c4d61d239f64f2f2297151a2e7d1a1ecf31d6d084dc06fe6fd2011a3f829824d4177b378c5f4131c80ce1acdec4
+EBUILD selinux-irc-2.20200818-r2.ebuild 273 BLAKE2B f3d6ca0541d8aa96ad93761f0c383f60088c87d96f04f939e484dda16aacc97ec24f02c13d28a34c9e5c6a846c294807aa895354c15464bc507b105f3ce3f0de SHA512 b22b8c514cd71b9f5384d4842cb94198b0919ece5bc07e91fef8b5e641501f8bf7abe8941cb6df7e39b16bb8497107f73a0cb97034c583074eab031c5ca66231
 EBUILD selinux-irc-9999.ebuild 275 BLAKE2B 004afa2027d0917eb7116fb0376ab5feb838c9145dd3aac89a18e5800164a0a624dd859e1ef001d10ce85f5ad2a029992566f8aa03d6b29b7e54a4dff2e893ab SHA512 a5ff68783bbbaf0c520044ae53ea4cdde58e7c4d61d239f64f2f2297151a2e7d1a1ecf31d6d084dc06fe6fd2011a3f829824d4177b378c5f4131c80ce1acdec4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20200818-r2.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20200818-r2.ebuild
index 8cc70ed8192c..aacaf7eedf02 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for irc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ircd/Manifest b/sec-policy/selinux-ircd/Manifest
index 679545a2c3d3..685f5b008a06 100644
--- a/sec-policy/selinux-ircd/Manifest
+++ b/sec-policy/selinux-ircd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-ircd-2.20190201-r1.ebuild 275 BLAKE2B f335e64c99275fef0725c372b4e90350ab8bdb2bfa52fe30a72e2f4d3c807338837d77a470e904311cda56ec8808e6252ee8a06391f227dce10c5697828d08db SHA512 5a1fc8777494f4fcb021c1e0ff844175c9068d1409dd94adf87620e44f6c8a832a637aa75164cf20aa554f3d386aac0233dd5a07b4eb405148e214a9c0279e44
 EBUILD selinux-ircd-2.20190609-r1.ebuild 275 BLAKE2B f335e64c99275fef0725c372b4e90350ab8bdb2bfa52fe30a72e2f4d3c807338837d77a470e904311cda56ec8808e6252ee8a06391f227dce10c5697828d08db SHA512 5a1fc8777494f4fcb021c1e0ff844175c9068d1409dd94adf87620e44f6c8a832a637aa75164cf20aa554f3d386aac0233dd5a07b4eb405148e214a9c0279e44
 EBUILD selinux-ircd-2.20200818-r1.ebuild 277 BLAKE2B 1d9465b1cc1c59a9070d47938467e409e78bd6b5db45090195eabd9c538471b5a473b8994ab76cc1eefb99f753a1986c24a07f01ffdbd671049d12d1ce13d2bd SHA512 7fdc775e664cecb066d4434962b55a1e646596830d7f4525c3104e3dcbfbb3bb0355413b3ea5dfd52721b10f8030f6e0d750e06257ed74984e83fa68b310aa3a
-EBUILD selinux-ircd-2.20200818-r2.ebuild 277 BLAKE2B 9e3a0ad19cf6e73b1f17ddc1ae7e2512a98ba22b985e8562d59ff017439ca857ce54d1b4b306e4842d3e127dcf12a0a8b4061560df3bb0af8a5d3e8fcdf08dde SHA512 def9e90a5298f360f96113ebfb54f1d554ebf03daf02ea97f3b4095a0a60bc662d83736b7f2eb6f2080d44bb0dcb8d23aee1ce8fc86e86d6ed7d9d5971f32edc
+EBUILD selinux-ircd-2.20200818-r2.ebuild 275 BLAKE2B 758dd9053b89cdda1fefed05b6b3eb091e2c392d3ea3791db6e4c5ab0aabe0ec4aae4d0960a281421971a13c8f7794ba822442327b17e656930439c0160cd2bf SHA512 04cd17dd5c71ea25d7150573e0af48a30240300d48d87dd770dfd5c69272ab1adfbc699c87db0262eb392473867e5013f698565f87c9fcd154253b722594e2b6
 EBUILD selinux-ircd-9999.ebuild 277 BLAKE2B 9e3a0ad19cf6e73b1f17ddc1ae7e2512a98ba22b985e8562d59ff017439ca857ce54d1b4b306e4842d3e127dcf12a0a8b4061560df3bb0af8a5d3e8fcdf08dde SHA512 def9e90a5298f360f96113ebfb54f1d554ebf03daf02ea97f3b4095a0a60bc662d83736b7f2eb6f2080d44bb0dcb8d23aee1ce8fc86e86d6ed7d9d5971f32edc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20200818-r2.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20200818-r2.ebuild
index aed8e3618371..d9a2206bb6d9 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ircd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/Manifest b/sec-policy/selinux-irqbalance/Manifest
index c9c107bb81b5..7afe3e9f20b6 100644
--- a/sec-policy/selinux-irqbalance/Manifest
+++ b/sec-policy/selinux-irqbalance/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-irqbalance-2.20190201-r1.ebuild 287 BLAKE2B 2061d8cc8531660e9dbcc294820fc76c02151c75ce35c889a3d1f06b0c3b631e534030cb75a9ef6ad14caf1580f5cc2c6673ca8c03aef7dd95b2806d169023b2 SHA512 fc27980a7a4157e08883128bec5c30509be50baf88695bae994bdd10f3b3f55f6ed724630ee473762a651a43b1bffccfe6b48d66176b0f3e86699e368a71ffde
 EBUILD selinux-irqbalance-2.20190609-r1.ebuild 287 BLAKE2B 2061d8cc8531660e9dbcc294820fc76c02151c75ce35c889a3d1f06b0c3b631e534030cb75a9ef6ad14caf1580f5cc2c6673ca8c03aef7dd95b2806d169023b2 SHA512 fc27980a7a4157e08883128bec5c30509be50baf88695bae994bdd10f3b3f55f6ed724630ee473762a651a43b1bffccfe6b48d66176b0f3e86699e368a71ffde
 EBUILD selinux-irqbalance-2.20200818-r1.ebuild 289 BLAKE2B 5f4b2b1e2f2354a490cf6517019f8d377c9d521f0a0d2d914fcf188f28f03f9d71e0c6793866505b48db4cfde07a0ca23264720e6f268997b0ea240db904a562 SHA512 f1d9927f9455953acf8d7bdc5914d64257063d63258386b1dcbbc9cc4bd70252941e80ff8a40f0fd0a4a96ecd98c153251d9fdac0ac57b50baf4f0e5de493411
-EBUILD selinux-irqbalance-2.20200818-r2.ebuild 289 BLAKE2B dd917b1a30945ed0205f25d1ba16c29474533b7c834d9e51227b93314500abec53b688033bf28905f0c57417eea96d407e084035698fed4e98653b8bb8d42df5 SHA512 1c751b44c171e0b35ed73b9885a16ee9d0e90c2d6496c6cb64c39c7cdd59e1eea6cb6f9800c92ec87634025af30d50ca59646f6a430c054391eb298283902c5c
+EBUILD selinux-irqbalance-2.20200818-r2.ebuild 287 BLAKE2B 039144ddf921d120a8e61d2c724897d9935662d0798a7307a531fd0d19e488f2e33e0f77101c60e69aaa30adfaef3e39d5c08ea7b7a98756d97c5244095f8aa9 SHA512 4aa315a552b89842dd0b606bcd646eac2f8f071e0524be296445b0afc6d4090455c6713e7d7d6bb66a2e02e87ccd9bfa908d29336a13f6356ea9ff01fa89abcd
 EBUILD selinux-irqbalance-9999.ebuild 289 BLAKE2B dd917b1a30945ed0205f25d1ba16c29474533b7c834d9e51227b93314500abec53b688033bf28905f0c57417eea96d407e084035698fed4e98653b8bb8d42df5 SHA512 1c751b44c171e0b35ed73b9885a16ee9d0e90c2d6496c6cb64c39c7cdd59e1eea6cb6f9800c92ec87634025af30d50ca59646f6a430c054391eb298283902c5c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20200818-r2.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20200818-r2.ebuild
index 4a7f9fb69388..4c5a65ba5cbe 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for irqbalance"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-jabber/Manifest b/sec-policy/selinux-jabber/Manifest
index 5f783be61b03..64a28ea7536c 100644
--- a/sec-policy/selinux-jabber/Manifest
+++ b/sec-policy/selinux-jabber/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-jabber-2.20190201-r1.ebuild 279 BLAKE2B c6e0525d49b951a2656cbfd5301db8762198c4fdd67cc1cb413538085c40f7def7c1d23a2f3da6c51effac4531de12286712e1fd359a297be5711b07cfa8b441 SHA512 f2c228cf03aa9a2601783e9eb459ed8d966250d6e004f25e846477598e3cb286a422535916a6c1a98b3776a2266cd7c8ba8c7aad5f0e8db54528a493bedb09d1
 EBUILD selinux-jabber-2.20190609-r1.ebuild 279 BLAKE2B c6e0525d49b951a2656cbfd5301db8762198c4fdd67cc1cb413538085c40f7def7c1d23a2f3da6c51effac4531de12286712e1fd359a297be5711b07cfa8b441 SHA512 f2c228cf03aa9a2601783e9eb459ed8d966250d6e004f25e846477598e3cb286a422535916a6c1a98b3776a2266cd7c8ba8c7aad5f0e8db54528a493bedb09d1
 EBUILD selinux-jabber-2.20200818-r1.ebuild 281 BLAKE2B bf4aac75067e65caa8439c52ff79917c5b1df55abe00e7490c2b02dd9369100232866dee94a6db58c20a338f9a644543921d238e4d7144cfa175e1c0f673bc75 SHA512 0fbef72ec09bdcd45678dd005d9abdfc7bd4f4d5c1a2561a80fa210ffed74e24c11fc2101c7f359715d2f4f88b46424ba8c5b57f4d99f69c0ee77b4b4bb3cfea
-EBUILD selinux-jabber-2.20200818-r2.ebuild 281 BLAKE2B 6e4375209b13e5c9f02fe722728448c8572464b51f468e66b980dda5ae5c7f70c7dd4dcde622dbcddca7f0cda9771485e2c0927086128fb7e689e75aa3853615 SHA512 c5be7be7b40833def32faadcec45cf6b4f0d9fec61b59ba170b5e7f28e5e9c08dc356e224f6819521e35a67b4bf2c91cee11b8ffe2014ca34a5b344b6cbb10ed
+EBUILD selinux-jabber-2.20200818-r2.ebuild 279 BLAKE2B c91cd479e000ddaf14fc921a5529ca4e16dff1573a241c5146304c807fe13aff7359f3e5cd659b755f588ada34fe36790eac2986e6a6c93bf2bfb9be477c9635 SHA512 9c27a619bc04288a22fc9263680cdcb421bd4ee5c81ce7ff050931d112ddefe3ee3929932e9f9c40e5d89148ab7f962e9bf4d37b129cc6b7c644fc2806961108
 EBUILD selinux-jabber-9999.ebuild 281 BLAKE2B 6e4375209b13e5c9f02fe722728448c8572464b51f468e66b980dda5ae5c7f70c7dd4dcde622dbcddca7f0cda9771485e2c0927086128fb7e689e75aa3853615 SHA512 c5be7be7b40833def32faadcec45cf6b4f0d9fec61b59ba170b5e7f28e5e9c08dc356e224f6819521e35a67b4bf2c91cee11b8ffe2014ca34a5b344b6cbb10ed
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20200818-r2.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20200818-r2.ebuild
index 289b3ce80495..6b43dc541159 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for jabber"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-java/Manifest b/sec-policy/selinux-java/Manifest
index c8ce811b6bf4..ddc3093de588 100644
--- a/sec-policy/selinux-java/Manifest
+++ b/sec-policy/selinux-java/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-java-2.20190201-r1.ebuild 279 BLAKE2B d5abd5ffaf6e356992b0c6ddc6f2a34bca28d0eb8cff3e68a6268ce1ec578720fb6eae4239476cf01917ee33d5ad56ef9fafc1d39587da44c51d45b597f6d29c SHA512 f36794a527521ff0e87c306a1f2df071e9bd5acc29904ea4d7bb5e0f63daac38b8956a4d51be2d3010a1fe72c2f63d5312f0864ef806f9649e9aaf2a71ed18b7
 EBUILD selinux-java-2.20190609-r1.ebuild 279 BLAKE2B d5abd5ffaf6e356992b0c6ddc6f2a34bca28d0eb8cff3e68a6268ce1ec578720fb6eae4239476cf01917ee33d5ad56ef9fafc1d39587da44c51d45b597f6d29c SHA512 f36794a527521ff0e87c306a1f2df071e9bd5acc29904ea4d7bb5e0f63daac38b8956a4d51be2d3010a1fe72c2f63d5312f0864ef806f9649e9aaf2a71ed18b7
 EBUILD selinux-java-2.20200818-r1.ebuild 281 BLAKE2B b384ca32c7ab2ad85f5ac683e23a09d1306551880f440b0767e94d9dad61822f7c72c2fede2ebac6aa67b445bfb872bd33a7137201dcde0ef2445aa8bf339901 SHA512 5b91c5b50812b06e7a96dedacf0958967a7680f5a5a6c214d2d525a1fe8c166930de7d6573c0ab9778b51679ee016ae0cbf3ea080d0957c9aebbff5e271aadad
-EBUILD selinux-java-2.20200818-r2.ebuild 281 BLAKE2B 654c0ed6bf672846e12c717b35bad398fa488a4b4ede857326e3674c1fb4a3632e6390b84ce462ca9dc7c285687f0d235c2d5547dbfa3a9df01ab72a14dd9d5c SHA512 2ec611abbcaaf9ec98e4153254e3d827df702f9b3dcd6c6673090b27c8644f5d34307a195e1874dc8726bab26a501e3066ac77e5949e479263b6b4ddceae07cb
+EBUILD selinux-java-2.20200818-r2.ebuild 279 BLAKE2B 2a53362e0f3fe12947d816ed593377563b71c8a98ffa0257489ebfb9386de09515c3d997145d7eea8e85d94ad67eac7c1d851bc4cc942e7e7c31e2fd56985538 SHA512 c79aee6fd545e151045049535d780ef879ed652e192c5e9d480d62d75809dc0af065c43b593b0ac71859ad48c2d3d7ca0c0fa72cc782940b6e4852bc6cc56939
 EBUILD selinux-java-9999.ebuild 281 BLAKE2B 654c0ed6bf672846e12c717b35bad398fa488a4b4ede857326e3674c1fb4a3632e6390b84ce462ca9dc7c285687f0d235c2d5547dbfa3a9df01ab72a14dd9d5c SHA512 2ec611abbcaaf9ec98e4153254e3d827df702f9b3dcd6c6673090b27c8644f5d34307a195e1874dc8726bab26a501e3066ac77e5949e479263b6b4ddceae07cb
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-java/selinux-java-2.20200818-r2.ebuild b/sec-policy/selinux-java/selinux-java-2.20200818-r2.ebuild
index 7ffa7fa78257..3d5164219c3d 100644
--- a/sec-policy/selinux-java/selinux-java-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for java"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kdeconnect/Manifest b/sec-policy/selinux-kdeconnect/Manifest
index 560cf05c7f5d..a1496dab44c2 100644
--- a/sec-policy/selinux-kdeconnect/Manifest
+++ b/sec-policy/selinux-kdeconnect/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-kdeconnect-2.20190201-r1.ebuild 287 BLAKE2B 494e52a8c88cd0769d9b6845dbbaac569fca2adc0218e707284431ab9ef1e789a8256178fe6403b6bb0026da53381526590418e9b7dbffb8aabfa4b3f9d590e3 SHA512 2afca4cb4603c09ef54053c2b6a0eaa1afcb9ecf7d31fb8363d35e993bb43afdeb5cc289c0bc3096b2bb28790bc013e0bf163b9f5571c3d785ddd4d85dc6885c
 EBUILD selinux-kdeconnect-2.20190609-r1.ebuild 287 BLAKE2B 494e52a8c88cd0769d9b6845dbbaac569fca2adc0218e707284431ab9ef1e789a8256178fe6403b6bb0026da53381526590418e9b7dbffb8aabfa4b3f9d590e3 SHA512 2afca4cb4603c09ef54053c2b6a0eaa1afcb9ecf7d31fb8363d35e993bb43afdeb5cc289c0bc3096b2bb28790bc013e0bf163b9f5571c3d785ddd4d85dc6885c
 EBUILD selinux-kdeconnect-2.20200818-r1.ebuild 289 BLAKE2B 813c2bfc890198b7e07075997363b7876c67f232941368e4406b9682be11cb5cdd1d21cde0a06cc272ca03dd54211ca01e0373055b07ebd2c625ea7af9269b81 SHA512 8ea6b02be985b002d7ea532f0164994468083b5bcb6a2c53b3f351626bd330b14a002cbf1cb8928fc193e4b172197e3a178ec5e79d6a139564c522d800e5846d
-EBUILD selinux-kdeconnect-2.20200818-r2.ebuild 289 BLAKE2B 566b8315f9b4a9fa04e5a709c919c28826e9ed9833ef870ee88525c496fad21910753f9f7f5a5421c769b9c6bf3802e5fe6ad3b278fbf3fa86a826e98cfaef54 SHA512 f6af8e1402ce1ffa641de6416afb1392a39d2d6b54169972be2ceeb30053db2eb6b5fcf5606312196d70f17a09b9bf597b9c026be552f5c163082950987d0f99
+EBUILD selinux-kdeconnect-2.20200818-r2.ebuild 287 BLAKE2B 7db24e516fc01c46c1734fc8e256a74be93872023f471290bef8e204f0d1ec104528f6e72fc44aca30a36c066ae61fa7ced90b56d8a48cceff39009f29ab5dc2 SHA512 1146cdf2d3de3eb4005c997d17c54aa037c45e405e8e8639b0c0080a194f3cc4bc91d95a941c16f64b99b1071f1542d7068e31174dcb4d12e9bf09f6c3f85064
 EBUILD selinux-kdeconnect-9999.ebuild 289 BLAKE2B 566b8315f9b4a9fa04e5a709c919c28826e9ed9833ef870ee88525c496fad21910753f9f7f5a5421c769b9c6bf3802e5fe6ad3b278fbf3fa86a826e98cfaef54 SHA512 f6af8e1402ce1ffa641de6416afb1392a39d2d6b54169972be2ceeb30053db2eb6b5fcf5606312196d70f17a09b9bf597b9c026be552f5c163082950987d0f99
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20200818-r2.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20200818-r2.ebuild
index 54c8eb1a04c7..7d431056bb07 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kdeconnect"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kdump/Manifest b/sec-policy/selinux-kdump/Manifest
index 4a978125649b..05282aea34a0 100644
--- a/sec-policy/selinux-kdump/Manifest
+++ b/sec-policy/selinux-kdump/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-kdump-2.20190201-r1.ebuild 277 BLAKE2B 1839e1ef13d8f29e0cce4f7c9fe01428e270eebcd9680d4d6c55328abf04447da8924fea2bdcf4a6f732a6c36364dbf9c0f879f0118ced229e772d0f4f3c699f SHA512 7f98f47588705e7774d444db88894513f19d7c1db2348d321759000e172afe6a05e23ef9b8947d6cc086f56d7083aea78bcadd3e04708b4e1b1716a5210412a8
 EBUILD selinux-kdump-2.20190609-r1.ebuild 277 BLAKE2B 1839e1ef13d8f29e0cce4f7c9fe01428e270eebcd9680d4d6c55328abf04447da8924fea2bdcf4a6f732a6c36364dbf9c0f879f0118ced229e772d0f4f3c699f SHA512 7f98f47588705e7774d444db88894513f19d7c1db2348d321759000e172afe6a05e23ef9b8947d6cc086f56d7083aea78bcadd3e04708b4e1b1716a5210412a8
 EBUILD selinux-kdump-2.20200818-r1.ebuild 279 BLAKE2B c23ff26dd7f4d2ade239269450aed3bdf83348087464836254159505851ce4c8c6ecccb3d753dea582b07b0ba3f84ec40375721ed3ab9a7f1197c17334d44d30 SHA512 90d9575912802fae216b558ae4dd60cf5d6fc52c98eaa3af4c33b78bb088a552bf206ea8852c742ffbc8ba1f9fae3c5b8d8ed10beb70e0d8877807e3bae92219
-EBUILD selinux-kdump-2.20200818-r2.ebuild 279 BLAKE2B f3ccd6030d93c49f08c8118ce0f9be56535a3061fe02d51f21df996f494c36e61447dfdf0c4f9da184145df7ae9ad32413f7fb8043193022a2222797a22910fb SHA512 c92ee2af4f11a97c0041a2449f2c9d4b92f273c1a932cabc8333c7a0d4eae17250eb7c5f5b9344e17b8a99228604ff99c9890f6ae75d3491d1488087d4244aae
+EBUILD selinux-kdump-2.20200818-r2.ebuild 277 BLAKE2B 3b7e75c099eb2c2ec4b7ec61058dde996bc9a3694a2c3da27199be901fc41ed077a8d1f59a67416cbb055abf66d86472dd2c67632948885c4b8b77a86ebc7935 SHA512 1685beae8d46ec8de2febfcb67cb1e40f46e24542ce669524d65badc7b5f04c6f7bc9926601a2d059891f5942e385238c87aba52edbe7877ec792749bedf777b
 EBUILD selinux-kdump-9999.ebuild 279 BLAKE2B f3ccd6030d93c49f08c8118ce0f9be56535a3061fe02d51f21df996f494c36e61447dfdf0c4f9da184145df7ae9ad32413f7fb8043193022a2222797a22910fb SHA512 c92ee2af4f11a97c0041a2449f2c9d4b92f273c1a932cabc8333c7a0d4eae17250eb7c5f5b9344e17b8a99228604ff99c9890f6ae75d3491d1488087d4244aae
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20200818-r2.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20200818-r2.ebuild
index 9590f3c251ed..d367c8c8bada 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kdump"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kerberos/Manifest b/sec-policy/selinux-kerberos/Manifest
index de7b1dcbe0e2..a353dc556fff 100644
--- a/sec-policy/selinux-kerberos/Manifest
+++ b/sec-policy/selinux-kerberos/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-kerberos-2.20190201-r1.ebuild 283 BLAKE2B 4f4fdde5fc20001c2e4580818f39b34bb0b79cae676b07599d8cf256dcba00b4cedbc28ba02afcd7f42ea9e5766e0902bd0500549d30da6aa9389a3439c98a5f SHA512 fd57613f65ca50aa97c409da86b15112935ff6fc185b96184a3e40af0482f15d895448545b91f0171de4640d5f361405edfce0c34019090ed84a5e77882faf78
 EBUILD selinux-kerberos-2.20190609-r1.ebuild 283 BLAKE2B 4f4fdde5fc20001c2e4580818f39b34bb0b79cae676b07599d8cf256dcba00b4cedbc28ba02afcd7f42ea9e5766e0902bd0500549d30da6aa9389a3439c98a5f SHA512 fd57613f65ca50aa97c409da86b15112935ff6fc185b96184a3e40af0482f15d895448545b91f0171de4640d5f361405edfce0c34019090ed84a5e77882faf78
 EBUILD selinux-kerberos-2.20200818-r1.ebuild 285 BLAKE2B 9a3b2f7760bfd7591e54c401b3f0590662f93d53eb2594c48a090fb4d897ce75a3634182c4f46fa60db626605a3b0816ad6678c25f930be47f86e91ccaba795e SHA512 ab840d0561effe71c818718457efd11aaf752ec7a1561cb94945b8d67a6a4afcdb8a2149a923dc124398487c4613b8bc8f2efdababc7c96f1c428628ffcec04c
-EBUILD selinux-kerberos-2.20200818-r2.ebuild 285 BLAKE2B da1efbacc0d2bb950c43dad126f2eff01b77697946c5a7f38ef0244fc352b47d81bb8a3e4097af48ef25019e2e21bd876861c6de71a05aee5c0c08b4221f6525 SHA512 585e3a3bfead97802f5dcfae6651e7fffdf7282287b0fc4a542eb05a84b181bcb1ff7a4d9972e9a10a0efe46a0d59ac08566f2bd4a6858a3b8163da57a6f98f0
+EBUILD selinux-kerberos-2.20200818-r2.ebuild 283 BLAKE2B 4329ccf53556fe7f6b9de50268eebbf89d70d6365a4441f9c1358c647617d29fd4c1ddbd6cbcb75fc84ba319fa9c10d98c012ab14a5fabfca170bc6c0a2c92ef SHA512 776cc21474e8a394e372ae34afe8c742ae30f01456497b7da6ecb33ecd0dcd6a4b7a11c2abdffbc7a5af931fbc7ad7918bf882ad0602ea6ed8178ac814f9d8a3
 EBUILD selinux-kerberos-9999.ebuild 285 BLAKE2B da1efbacc0d2bb950c43dad126f2eff01b77697946c5a7f38ef0244fc352b47d81bb8a3e4097af48ef25019e2e21bd876861c6de71a05aee5c0c08b4221f6525 SHA512 585e3a3bfead97802f5dcfae6651e7fffdf7282287b0fc4a542eb05a84b181bcb1ff7a4d9972e9a10a0efe46a0d59ac08566f2bd4a6858a3b8163da57a6f98f0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20200818-r2.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20200818-r2.ebuild
index bba5d81300c6..db1118e162cc 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kerberos"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/Manifest b/sec-policy/selinux-kerneloops/Manifest
index b89610aee470..f332400d5826 100644
--- a/sec-policy/selinux-kerneloops/Manifest
+++ b/sec-policy/selinux-kerneloops/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-kerneloops-2.20190201-r1.ebuild 287 BLAKE2B 3e7c0d257c03a8de0e40eb7a0b4f83bca20f18f5a1927912c53f6befca9765a527f03ffd38e69f10d3afb97797238945ecb982703f177203d378079b4b87c0fe SHA512 b16b21bf4fff03f05d1b449f6b66b9c0272a3180a80527b5b26b2cfb844943410035b87e7638bd48f42e32748763987f503995ed79ec3692eec64c81cc18c95a
 EBUILD selinux-kerneloops-2.20190609-r1.ebuild 287 BLAKE2B 3e7c0d257c03a8de0e40eb7a0b4f83bca20f18f5a1927912c53f6befca9765a527f03ffd38e69f10d3afb97797238945ecb982703f177203d378079b4b87c0fe SHA512 b16b21bf4fff03f05d1b449f6b66b9c0272a3180a80527b5b26b2cfb844943410035b87e7638bd48f42e32748763987f503995ed79ec3692eec64c81cc18c95a
 EBUILD selinux-kerneloops-2.20200818-r1.ebuild 289 BLAKE2B d141aa650f4e5a75a59543a3d898da5831656a53f9560bbaad1e0a3a1340eba32ae144da574d534a8f41e19bcd3c606ddf5559a7897149879d653aeb3282f4dc SHA512 d66f3a98f7181321c42a123d7f32088542c22c98c24191a34360002e12c83cffc2d85ee3f48978dabb53527bdba28ac2bd0a107f29ddac06e483ecccffcf9091
-EBUILD selinux-kerneloops-2.20200818-r2.ebuild 289 BLAKE2B 0f1ae71a11c3552894fd26ce1be29c326e761c5389cfdc7f6b23d1374fd137c91f533dd03f0370b61a30e8e4b253d22385988c7829447ccddbe1512feecd40d5 SHA512 f0bedbf6721cbf39cb8caf6673cacf7b28a77fe64a966678e5a02a8aac428806d3fef5b5798ef7eca8b5de5b313e13fe95cbc2cfc18c28c1888585a05431e84a
+EBUILD selinux-kerneloops-2.20200818-r2.ebuild 287 BLAKE2B 5b2247d589ed6b4f1a9ce5b4ac1bce3f35bea683fed4f69e0d02852e43f1f86dd57409afada0f21c8567f3d4d697919896e5c6e59469df67fc00bbe52bc96fd1 SHA512 e18068fa4f1eb71e5124219c5b95db567f8ec20a8a3fa38123df60f8132863e7c819441bc3be9c956b0478eb1e2d97e050171845335b5663cf98adbe0b120eae
 EBUILD selinux-kerneloops-9999.ebuild 289 BLAKE2B 0f1ae71a11c3552894fd26ce1be29c326e761c5389cfdc7f6b23d1374fd137c91f533dd03f0370b61a30e8e4b253d22385988c7829447ccddbe1512feecd40d5 SHA512 f0bedbf6721cbf39cb8caf6673cacf7b28a77fe64a966678e5a02a8aac428806d3fef5b5798ef7eca8b5de5b313e13fe95cbc2cfc18c28c1888585a05431e84a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20200818-r2.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20200818-r2.ebuild
index 4149b9d76a66..9c399aa3cfff 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kerneloops"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kismet/Manifest b/sec-policy/selinux-kismet/Manifest
index 1102e87196d1..c04dd2894dfb 100644
--- a/sec-policy/selinux-kismet/Manifest
+++ b/sec-policy/selinux-kismet/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-kismet-2.20190201-r1.ebuild 279 BLAKE2B 7a08592bc73eba9fcde5ec8f23a3a7506cdd7b77681dd03d2645c3d20c9c6c2ae5dc48dfb9a6ca7a79376074c17bbfc565b3c7c75852de636507b3ab37e23f4c SHA512 1566bf7a62bb52cdc2ccff7d909d6891ba3a44a56b5d0af8a3464aaa8a27f5d6952fd3c4c83b60e8bd215dac27f708d2e28ab38a311685e587407801b409da37
 EBUILD selinux-kismet-2.20190609-r1.ebuild 279 BLAKE2B 7a08592bc73eba9fcde5ec8f23a3a7506cdd7b77681dd03d2645c3d20c9c6c2ae5dc48dfb9a6ca7a79376074c17bbfc565b3c7c75852de636507b3ab37e23f4c SHA512 1566bf7a62bb52cdc2ccff7d909d6891ba3a44a56b5d0af8a3464aaa8a27f5d6952fd3c4c83b60e8bd215dac27f708d2e28ab38a311685e587407801b409da37
 EBUILD selinux-kismet-2.20200818-r1.ebuild 281 BLAKE2B 84affa8b38d41d0112d1b4f1424d4ad88eed0f359a2b75ca131c2deea23b05990be3f51f84f6e4f59d9e849a5be55d207b6bd44f34591f11ec6ff28e83b4426e SHA512 69bdcacf9e72d741bd64edbd7682604f4b6a01cfa1ecbcd098ccf5d74fa80b49b1e68fac7bcb4f43e541a778fc110dd9804f43a08a1a05c55f36043a53c48aa9
-EBUILD selinux-kismet-2.20200818-r2.ebuild 281 BLAKE2B 0e7f04a544ff42245fd572335a1ab0f4faffb3dac9794082bcd0c40bbb6c54301ff9bc0e3fe2f1f4faf4524d6f4da2d412b0272a21631b73d1ba06592a432141 SHA512 d221092d6c9ce8c95fe516ab8b676bbf49212833ce3679e3404834669a806199267f1c70a51242ed46236603665d6135b3f454b5ef543b16685e46bd86258b97
+EBUILD selinux-kismet-2.20200818-r2.ebuild 279 BLAKE2B 1eff758d3e593549c87a2fd0ff9b02a55b6fc0a4dc19d0e03e63f39e20f7428239f668b8ff053131ed5c04f0cfe023a5fcde2d99242e63f6504c25213f5ee7fb SHA512 931f597727a08befceb081c2626d599cbe4df3854e4f4d9c5aa1c955e34aebd1e7b5d3cda822a8961d8a67367e0ce6836053c1bde92d9d2e95caf7317866910c
 EBUILD selinux-kismet-9999.ebuild 281 BLAKE2B 0e7f04a544ff42245fd572335a1ab0f4faffb3dac9794082bcd0c40bbb6c54301ff9bc0e3fe2f1f4faf4524d6f4da2d412b0272a21631b73d1ba06592a432141 SHA512 d221092d6c9ce8c95fe516ab8b676bbf49212833ce3679e3404834669a806199267f1c70a51242ed46236603665d6135b3f454b5ef543b16685e46bd86258b97
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20200818-r2.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20200818-r2.ebuild
index 4b85436f393a..1e8cefddb390 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kismet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/Manifest b/sec-policy/selinux-ksmtuned/Manifest
index 194ad5fee510..61dd4bfa9c6f 100644
--- a/sec-policy/selinux-ksmtuned/Manifest
+++ b/sec-policy/selinux-ksmtuned/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-ksmtuned-2.20190201-r1.ebuild 283 BLAKE2B ab4270e97b767c41fe852b34f1e9f94eebc0e63b062983a3415018b445b2fb2345e0f5a183c8a36f3b68e883382a387297e0e19fce724ebd1b00792c3d9daa35 SHA512 a52689efde12669969e8e47d2610d3e27304cf8481b77ae3063db54a893c2889638c103ba248c8e6b59418e49f7945ca63ff65aba54edbb3133c6b9e3151210a
 EBUILD selinux-ksmtuned-2.20190609-r1.ebuild 283 BLAKE2B ab4270e97b767c41fe852b34f1e9f94eebc0e63b062983a3415018b445b2fb2345e0f5a183c8a36f3b68e883382a387297e0e19fce724ebd1b00792c3d9daa35 SHA512 a52689efde12669969e8e47d2610d3e27304cf8481b77ae3063db54a893c2889638c103ba248c8e6b59418e49f7945ca63ff65aba54edbb3133c6b9e3151210a
 EBUILD selinux-ksmtuned-2.20200818-r1.ebuild 285 BLAKE2B dfe7290e559be5fd05d85a01241212146a27bf5b6c6481f85b2e048ea99621925936b1125286b7cee8a3b9fc10fe5942ece6f52cfa4ce84ae72856436ca17571 SHA512 746101ad721af0bbb9d6cde73848090f1714ba77c9e120b25dc231e269ecec6100c22b6b14b16d1fa622e19579b4449468190ef684d950608b6e26ec341fe2d1
-EBUILD selinux-ksmtuned-2.20200818-r2.ebuild 285 BLAKE2B ae7c8d7a0d076763ad5e7341d1a77446c85384175353ee059aa7a03e8a6f405d982824ea8e73708c947b2bdab91f16d3673b899ba6e206f5588620d2a23735d7 SHA512 ff40abd27327e1a151b63c785c90ee516be48ad3f879239daa6de620d1cefdbb45aa6c23f956156e022d28dda9955ad3805b8aa959cb202bd09c3b20848658e0
+EBUILD selinux-ksmtuned-2.20200818-r2.ebuild 283 BLAKE2B c9e35c58f1f1efe1c63300bce9f2e45bdf962bb293c63c82c3014d4b8e42039797069791ecea75a575544557b06360a760341abfe3bd4602cf1e34ae7f776535 SHA512 41722a8a690ebb4224de7315599f9d20a4186a5f2f390b5f2dd708aba10d306ffc0e37232e32a1e0b40fe9d7020e49c068619dff277065bcb57cf25caca08572
 EBUILD selinux-ksmtuned-9999.ebuild 285 BLAKE2B ae7c8d7a0d076763ad5e7341d1a77446c85384175353ee059aa7a03e8a6f405d982824ea8e73708c947b2bdab91f16d3673b899ba6e206f5588620d2a23735d7 SHA512 ff40abd27327e1a151b63c785c90ee516be48ad3f879239daa6de620d1cefdbb45aa6c23f956156e022d28dda9955ad3805b8aa959cb202bd09c3b20848658e0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20200818-r2.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20200818-r2.ebuild
index 32692c8ab86b..105bee1fdc57 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ksmtuned"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-kudzu/Manifest b/sec-policy/selinux-kudzu/Manifest
index cc8164586ce8..2f0d0b4f9699 100644
--- a/sec-policy/selinux-kudzu/Manifest
+++ b/sec-policy/selinux-kudzu/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-kudzu-2.20190201-r1.ebuild 277 BLAKE2B 77967b6e4a385d4ba95381f562b878f6e947fa86d54e3a81d11d8e10ee8fc1bcb45f1218967fc62b497cc0fb557a4726e8da68c1eaca68ebf148435b99cc230a SHA512 9b2d26b1027761bb72bf3e1ea5431ee8bc8a72124c0864fcba223fa5f04ab3e013c6e6f45c4ab8228da5e6d2abcef35b64d358ee7719e93bc5bbe1334b99120e
 EBUILD selinux-kudzu-2.20190609-r1.ebuild 277 BLAKE2B 77967b6e4a385d4ba95381f562b878f6e947fa86d54e3a81d11d8e10ee8fc1bcb45f1218967fc62b497cc0fb557a4726e8da68c1eaca68ebf148435b99cc230a SHA512 9b2d26b1027761bb72bf3e1ea5431ee8bc8a72124c0864fcba223fa5f04ab3e013c6e6f45c4ab8228da5e6d2abcef35b64d358ee7719e93bc5bbe1334b99120e
 EBUILD selinux-kudzu-2.20200818-r1.ebuild 279 BLAKE2B 2a269a2212e59896751f2c63ec200bdd508e87107e2c0456edb3d18979f2c31dcdebe1902f2f48bda83d3e0536ba8a0c22db7717f37a4e2cb35e1d26ce5ca813 SHA512 6045d4c16224269ef5e4ba647452560e2f0630da5815a9afc88c46d59ed3b3586d088cb4e953679cee2cef4c873c6fdec1e9a196fa69e3b4b0be3c04fde7f0a1
-EBUILD selinux-kudzu-2.20200818-r2.ebuild 279 BLAKE2B 64dd8b3924db2e2d14ff48353e12cf3f62c3e15b4ada408a388b043759277fadac0c860dbc6b30d0afaf49c7932af5c4443e4861e93d096c34a8a9e7e5f35fa5 SHA512 7c19c49cbfb2be86e738da32f2d145c32f8455df962c8e01d034a8a6607600561f9b475264e2bbf6a688faffe1a6aad0acd782e0d79f2ee2a21cc27a11791702
+EBUILD selinux-kudzu-2.20200818-r2.ebuild 277 BLAKE2B fa421e691d061e7b6dbd1027195894c992ab906fbc11d375978a506e4cb20dc3977d82fe952a45f5df6bbf86282c4439b93a2e1490630152be33c060c279c11e SHA512 19065d57f0903cb36e3219a0a00a8e94740490e7201ff44c6180c64ce6f65e65497a037b7a4f103e6f10e4ba37ac2c6dde32d01a2093a57194ff51234bbed799
 EBUILD selinux-kudzu-9999.ebuild 279 BLAKE2B 64dd8b3924db2e2d14ff48353e12cf3f62c3e15b4ada408a388b043759277fadac0c860dbc6b30d0afaf49c7932af5c4443e4861e93d096c34a8a9e7e5f35fa5 SHA512 7c19c49cbfb2be86e738da32f2d145c32f8455df962c8e01d034a8a6607600561f9b475264e2bbf6a688faffe1a6aad0acd782e0d79f2ee2a21cc27a11791702
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20200818-r2.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20200818-r2.ebuild
index 6eebc17bb020..e2b4534d3206 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for kudzu"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ldap/Manifest b/sec-policy/selinux-ldap/Manifest
index 612d4cdc9927..98cc55a44925 100644
--- a/sec-policy/selinux-ldap/Manifest
+++ b/sec-policy/selinux-ldap/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-ldap-2.20190201-r1.ebuild 275 BLAKE2B 31ea95c2572ed900f869390344c0e39a320c1a0dd13d6aa0d0170c54b2519ca0424552d1dece8d8c090ed2d529bf4e6b9c253c3b331b0d6fde7a9460d02c8b20 SHA512 26f77f3d4da77233a30563a94f858ee3b3f247fd6687f0bed107df470d45511d7e876c9d3884770f72419f81a99bf3745c7b56ee8d2f6169e2737f89e2726cad
 EBUILD selinux-ldap-2.20190609-r1.ebuild 275 BLAKE2B 31ea95c2572ed900f869390344c0e39a320c1a0dd13d6aa0d0170c54b2519ca0424552d1dece8d8c090ed2d529bf4e6b9c253c3b331b0d6fde7a9460d02c8b20 SHA512 26f77f3d4da77233a30563a94f858ee3b3f247fd6687f0bed107df470d45511d7e876c9d3884770f72419f81a99bf3745c7b56ee8d2f6169e2737f89e2726cad
 EBUILD selinux-ldap-2.20200818-r1.ebuild 277 BLAKE2B e375cffb76d3b2920a2d7367dc9786078b9091149fc02b740826b9a02dd057b1a2f1178a6a3394c942a2707ef4ae4c699ede2f239d893093dba6ac51f5fd55a7 SHA512 2fbacd9b0be1f6edc337f5334635ad935738f9bcc57ac4b55a3c2f6d1ce575739f01ba44f99658c8c887a99e0df446b5bd96e63d5b4d31de40a470335c63b780
-EBUILD selinux-ldap-2.20200818-r2.ebuild 277 BLAKE2B 2afc657d58c84cc627d20bf069067a771af26df4bf5557935b123ef4bcba1e75c6ff832838a780ef8d6411299c605ecbc5e359702d5ac4b04d312b254f66d18c SHA512 d2284ae0364732b5717693f22b73cb9dae83d0b30db00e428bbd15c1f7d084e7c9a87ac86da33a4f199b922f1dc263efc36ca056176bfa4e0ef411de3c3bccfb
+EBUILD selinux-ldap-2.20200818-r2.ebuild 275 BLAKE2B 27c4b0dc6ee5962018634f1ced4fc2b10f798ef4b4da4cd90a8f33365805a48c8d5a4c13ab2ef5e4b00ee545649beb5112aafd47d8a05c5e53f6dc5fde47c1d4 SHA512 8e5dea7e798f1a2f39fb727fda1c90ca0f8481d37982af3c9f79da133183b76e457715ad0593bae9152c9090e355ac6cb27225ccdf6935bbbf687ede1f25e8af
 EBUILD selinux-ldap-9999.ebuild 277 BLAKE2B 2afc657d58c84cc627d20bf069067a771af26df4bf5557935b123ef4bcba1e75c6ff832838a780ef8d6411299c605ecbc5e359702d5ac4b04d312b254f66d18c SHA512 d2284ae0364732b5717693f22b73cb9dae83d0b30db00e428bbd15c1f7d084e7c9a87ac86da33a4f199b922f1dc263efc36ca056176bfa4e0ef411de3c3bccfb
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20200818-r2.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20200818-r2.ebuild
index 3846e72188f6..c06e30fc64b9 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ldap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-links/Manifest b/sec-policy/selinux-links/Manifest
index e27dee8a3b9f..a581793fd87c 100644
--- a/sec-policy/selinux-links/Manifest
+++ b/sec-policy/selinux-links/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-links-2.20190201-r1.ebuild 277 BLAKE2B a729cacb89de0f5a4e74dac77a8401fb87726a0cb8ac56ea638385589dd59d3af65a243f285cb8e2308c3a3b453bb2412ae41a3bdd988ebe434e0bcae2267230 SHA512 be4f5c76c9ea80c4c145e17582979c6e22edfc43f0cdab6cd6e4e070cfc4b79eee6f29ef8dec1faf7b30fb84f251e920bfed272c174eb529c25ae5f7e2cf5992
 EBUILD selinux-links-2.20190609-r1.ebuild 277 BLAKE2B a729cacb89de0f5a4e74dac77a8401fb87726a0cb8ac56ea638385589dd59d3af65a243f285cb8e2308c3a3b453bb2412ae41a3bdd988ebe434e0bcae2267230 SHA512 be4f5c76c9ea80c4c145e17582979c6e22edfc43f0cdab6cd6e4e070cfc4b79eee6f29ef8dec1faf7b30fb84f251e920bfed272c174eb529c25ae5f7e2cf5992
 EBUILD selinux-links-2.20200818-r1.ebuild 279 BLAKE2B d6f60a7674f1416d10e701223cea16c74c3eaf8d08a37ff9e1ef4d691be6dd8afa189ffa0df7607081992f6723fb197fb71e6902237a5f54f80fcc422844cebf SHA512 fdfc05698e31939458200a7913a15c3589df6943b17391d08037f7b4e30d3def0cede3968d0c95947c4da89a460162a871ba249ba8aa914f8506b9d894eb1bf5
-EBUILD selinux-links-2.20200818-r2.ebuild 279 BLAKE2B f1db4b44a889cfccdd5ede41e8190e70445f040b4f820a4b586553fa5314401748953e30bdd4b0e9562e80dfc0220772345465e992e80040a71dace923d0df84 SHA512 5f1418d0a63a92e0e6d8567fd27d8f2a3c85b1be0481b0f67162b1e37d0701c112e5aed4b92c3d7a88953902700a2e1a9f1963849fb1062496aa61ed12b48b2b
+EBUILD selinux-links-2.20200818-r2.ebuild 277 BLAKE2B b0a87fb0949d8b9382f00d8f3f616efff9b1bc155e7fe50e407184341c33e9be586a58f281e985987eb43d2945331c8aed02f83f5d8dd50908761ffffcbd3119 SHA512 7d3116edd1581948495da62eddb7582a1b8dd70dca2c3c01b549d2c023fa0755b99e0d17c6115e87522bc9ee644112feb33e32be7670431bf56c82a68a9df8a7
 EBUILD selinux-links-9999.ebuild 279 BLAKE2B f1db4b44a889cfccdd5ede41e8190e70445f040b4f820a4b586553fa5314401748953e30bdd4b0e9562e80dfc0220772345465e992e80040a71dace923d0df84 SHA512 5f1418d0a63a92e0e6d8567fd27d8f2a3c85b1be0481b0f67162b1e37d0701c112e5aed4b92c3d7a88953902700a2e1a9f1963849fb1062496aa61ed12b48b2b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-links/selinux-links-2.20200818-r2.ebuild b/sec-policy/selinux-links/selinux-links-2.20200818-r2.ebuild
index c2a3d09ff6e0..1a834c384c4b 100644
--- a/sec-policy/selinux-links/selinux-links-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for links"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-lircd/Manifest b/sec-policy/selinux-lircd/Manifest
index cfa2b8e4b588..2ca741cf0ae3 100644
--- a/sec-policy/selinux-lircd/Manifest
+++ b/sec-policy/selinux-lircd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-lircd-2.20190201-r1.ebuild 277 BLAKE2B 852848ab60d1bad38c4fb2e0747e2e964fcf7a96dfcbf648b7c509f817bf5cdfa6794297abbc2896a104eb7034314c302520e081428bf97b7b8a9e447a0311a8 SHA512 126f27e675494be8dd61f06ecf7e0e4ddb95aee4b0878030d6858ea69e59e247abafda271d1a1cfeaf400025ba24596131d4dfd7e916c160e3c76465289c0756
 EBUILD selinux-lircd-2.20190609-r1.ebuild 277 BLAKE2B 852848ab60d1bad38c4fb2e0747e2e964fcf7a96dfcbf648b7c509f817bf5cdfa6794297abbc2896a104eb7034314c302520e081428bf97b7b8a9e447a0311a8 SHA512 126f27e675494be8dd61f06ecf7e0e4ddb95aee4b0878030d6858ea69e59e247abafda271d1a1cfeaf400025ba24596131d4dfd7e916c160e3c76465289c0756
 EBUILD selinux-lircd-2.20200818-r1.ebuild 279 BLAKE2B a8cc6f8e0a86e33d407e7aed8e407d85be8bcf41a0a3b4d78f48bbc9aef6fc0865afa8fdf97bdc577844bdc4f26d1f0a4ba5064950abd095e5d3b5a87396f5e9 SHA512 1f0279b656ee66ee79eab21c6145e21d8a19a3d449f1a5c3e268f61630c3fefa198c3afd926ed45aaf86dd44fc8e7a3dc61d8b9a026f7b8676a8c811c61370ff
-EBUILD selinux-lircd-2.20200818-r2.ebuild 279 BLAKE2B 695411eb852dfa55a1fe57d53b3ff638f19623ebde04ef1fc761f8e9a4ea9505e3c915ab67fdfd2623e97aa7bff01a8a062242e1cfd42b6e30d7a0de3925737b SHA512 b2c8ac56f7501968de85af913fe91026872705d6920df06ca26ee072ae820ba35f4f60ae4c5085103ef90ccb448f85f104e55ed89e760bcf23484e48b6e9860c
+EBUILD selinux-lircd-2.20200818-r2.ebuild 277 BLAKE2B 932acb515ce33edc1bf698e32d1b1363445f4f540d6119a96393abb7b749a3fff3a081a5ba38ba5b03ad2630fec22cce0c1be2f95e2c200ab8181878555d6b8d SHA512 e120eb52f9e43f503409ac0ab38dd3c3d98d32a83665b9b457ad6a12c9260934d7613538a6a126786d29086022e49580dbe65a5a30a597ca599ff105d98ee948
 EBUILD selinux-lircd-9999.ebuild 279 BLAKE2B 695411eb852dfa55a1fe57d53b3ff638f19623ebde04ef1fc761f8e9a4ea9505e3c915ab67fdfd2623e97aa7bff01a8a062242e1cfd42b6e30d7a0de3925737b SHA512 b2c8ac56f7501968de85af913fe91026872705d6920df06ca26ee072ae820ba35f4f60ae4c5085103ef90ccb448f85f104e55ed89e760bcf23484e48b6e9860c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20200818-r2.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20200818-r2.ebuild
index 3764549e538e..a9a2ea3b23e8 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lircd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/Manifest b/sec-policy/selinux-loadkeys/Manifest
index 99f43c667d66..146ce2aadf0e 100644
--- a/sec-policy/selinux-loadkeys/Manifest
+++ b/sec-policy/selinux-loadkeys/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-loadkeys-2.20190201-r1.ebuild 283 BLAKE2B 829a2f0ab38b02e4935f132a26fdf56a630b40b2c18563e129638fa755c35733b21d44826295f853645622004d6c33d93c6b9563b30a77d958ad8f733b2fe85e SHA512 4fd82ffad4f23c2abe5e710c4c555971a0e61e6a5cf8a6f2127c75f7741bcda31736ae328a94b412339ffa57974acc1a53a647c1622d8dfbb7c57c62e8ebcd74
 EBUILD selinux-loadkeys-2.20190609-r1.ebuild 283 BLAKE2B 829a2f0ab38b02e4935f132a26fdf56a630b40b2c18563e129638fa755c35733b21d44826295f853645622004d6c33d93c6b9563b30a77d958ad8f733b2fe85e SHA512 4fd82ffad4f23c2abe5e710c4c555971a0e61e6a5cf8a6f2127c75f7741bcda31736ae328a94b412339ffa57974acc1a53a647c1622d8dfbb7c57c62e8ebcd74
 EBUILD selinux-loadkeys-2.20200818-r1.ebuild 285 BLAKE2B 1c227d184468750d717e51ef0402064c6bc4acd71fb0317cbdfb3ded745c8868f6f531df8ed3921a9d0e58c142e07230d222a43042757a928a177e553a4f0f0d SHA512 15c6933a4f26cf12651fe2e499d2d30a9e3c957a1183f6bdfdd99cba89a332c7b86f0187fa563050c8794b2eae0cc7d3bbb552cc9c790079cd6e5827156d3737
-EBUILD selinux-loadkeys-2.20200818-r2.ebuild 285 BLAKE2B 23a023328242d074409649d8a35755afe8e63d1359aa1b3f941d8de68ad5796e12f056b453554e9e0b753dddcbc3a3666e7104ea3a1b49ec06eb395e4e1854f7 SHA512 802a3e5ccfbed5ab4d175d37f6eb8bf9fe45dfa948adaf30be6f3fdf5d7dfbb1d76399d360059b27536d4b0b8f6412370b23f153954fe29a6762c95ea137e1bc
+EBUILD selinux-loadkeys-2.20200818-r2.ebuild 283 BLAKE2B 0bf4218f1af21579f58c49a9cf958a60aec1de27fed96d68317950bda36407155740054be03fe0c3de71cc9ed4d4f18f457b178ce15da08febd276be5f292d5f SHA512 f79a070678e8f28be3fd8cd3a386dceeaf17f16cc5db0437406017b286aad6c1c3170813df6cbbe7f6fb4b64a6c894de3ac131a681c4aee7f777232175cd0a1e
 EBUILD selinux-loadkeys-9999.ebuild 285 BLAKE2B 23a023328242d074409649d8a35755afe8e63d1359aa1b3f941d8de68ad5796e12f056b453554e9e0b753dddcbc3a3666e7104ea3a1b49ec06eb395e4e1854f7 SHA512 802a3e5ccfbed5ab4d175d37f6eb8bf9fe45dfa948adaf30be6f3fdf5d7dfbb1d76399d360059b27536d4b0b8f6412370b23f153954fe29a6762c95ea137e1bc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20200818-r2.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20200818-r2.ebuild
index 7e44118e8d94..082eed5d54f2 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for loadkeys"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-lockdev/Manifest b/sec-policy/selinux-lockdev/Manifest
index b1f1697fbedf..4334c4156bb0 100644
--- a/sec-policy/selinux-lockdev/Manifest
+++ b/sec-policy/selinux-lockdev/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-lockdev-2.20190201-r1.ebuild 281 BLAKE2B e6ffa3646e8b12c1dd1a33f55aed56a4123a26ca7b2124a3fbeedfd4f45a19324144a56c37432a2242a0ee7ede0dca64b8e9e04b72369a502363ed8ed0734130 SHA512 0f61b429f8ecef7386ccda63b30bad29f20d3db2fa8f2a89dce59f12896975a19a8a3dad71270d0806f5d41293328dfd1a7f7aa257467822df225e25adc02d17
 EBUILD selinux-lockdev-2.20190609-r1.ebuild 281 BLAKE2B e6ffa3646e8b12c1dd1a33f55aed56a4123a26ca7b2124a3fbeedfd4f45a19324144a56c37432a2242a0ee7ede0dca64b8e9e04b72369a502363ed8ed0734130 SHA512 0f61b429f8ecef7386ccda63b30bad29f20d3db2fa8f2a89dce59f12896975a19a8a3dad71270d0806f5d41293328dfd1a7f7aa257467822df225e25adc02d17
 EBUILD selinux-lockdev-2.20200818-r1.ebuild 283 BLAKE2B 88ec909be199c57e8afe03beca6432dbaafa7c5881cbcab65f02099627b800c9bebaffcc1617ae36f3c434fc61cd7e7ebcd35604bb7ebeb97c73bbf55b75e123 SHA512 1bdf90460f8fc673ef8ffc5f7e96881e74aad129a3a2e269ba0d05bc98edfc6e39970f15568f8bf0537c20014f84f85c936891a7962f6377c8c4e3cd38821e50
-EBUILD selinux-lockdev-2.20200818-r2.ebuild 283 BLAKE2B 58b43f24d4a5afab6514afaa02826d7fec99cef6157a242357eaddf0ebf02973bb1109e346be3dcd3e52b517e8a355f199d4af3467b2fe49a01aeeeb4b31309a SHA512 6bb0cce3633919281e5397641c4bde043a26fac97ecfe85d9e32fb1f33b9272fd02468212147a901873b0e12ec5a183721d6c49ca9179fc9ede8c07208191a2d
+EBUILD selinux-lockdev-2.20200818-r2.ebuild 281 BLAKE2B 9b986b51f28f9b7dddd4305d8f9364b7c3f96125449bd67275072f53a81fa1b6ac18a320870a9533b74d2f39d6b06601a8c6b2b91c348196fb56724133eadaac SHA512 6c3be5a73df19a4ecfdb1d5ce47af9c94902d22748b0111580a0a8a3805ec39edcbeb521451762d113f33e40940ea023ba9260e3e593f31654d124dc768f7c83
 EBUILD selinux-lockdev-9999.ebuild 283 BLAKE2B 58b43f24d4a5afab6514afaa02826d7fec99cef6157a242357eaddf0ebf02973bb1109e346be3dcd3e52b517e8a355f199d4af3467b2fe49a01aeeeb4b31309a SHA512 6bb0cce3633919281e5397641c4bde043a26fac97ecfe85d9e32fb1f33b9272fd02468212147a901873b0e12ec5a183721d6c49ca9179fc9ede8c07208191a2d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20200818-r2.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20200818-r2.ebuild
index c52e394475cd..4e6a5f177479 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lockdev"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-logrotate/Manifest b/sec-policy/selinux-logrotate/Manifest
index 19959b3876a3..e3ee213d8320 100644
--- a/sec-policy/selinux-logrotate/Manifest
+++ b/sec-policy/selinux-logrotate/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-logrotate-2.20190201-r1.ebuild 285 BLAKE2B b82329427c598c7f05cfa390ff81cb150ab9c2f73ec550cb0d60f7a44a20cb6a573afeda058784a6147ee4435e6cfe502f0a64aea8094962945e3652a128c05e SHA512 c1102a97f3c1aecd94924c8559200f8bc419da5381f914c284616051c1a732c6320d5faa141e7c7a5d5772a3fc4d41dbfa385b82f7072955c27f1314dc98dcda
 EBUILD selinux-logrotate-2.20190609-r1.ebuild 285 BLAKE2B b82329427c598c7f05cfa390ff81cb150ab9c2f73ec550cb0d60f7a44a20cb6a573afeda058784a6147ee4435e6cfe502f0a64aea8094962945e3652a128c05e SHA512 c1102a97f3c1aecd94924c8559200f8bc419da5381f914c284616051c1a732c6320d5faa141e7c7a5d5772a3fc4d41dbfa385b82f7072955c27f1314dc98dcda
 EBUILD selinux-logrotate-2.20200818-r1.ebuild 287 BLAKE2B 2153e6bf5f5177a6990fa34849a5a739104e8ee7ab0b10f80b9afdc67b2a56a0b7685eb883ac0a2a2103b13c3204283861f076332b5fc6896f8cd84981ad9cb4 SHA512 a525fa1e017d52f8ac1e3cff848ce21e4fadc4d0e8629a650b699bb33c8a4221c39ff34ba21aed63a3d5ed7ff872cc3b0a229d461c831b396585416340725f1b
-EBUILD selinux-logrotate-2.20200818-r2.ebuild 287 BLAKE2B 7016bc5050cec24dba3e79c5c15936572f6920c3630d8c3d936881b470abf96b5f94279480718f8b0d6422b40a080f5c6fc2519ce1d0678931fc8381b84f040e SHA512 d7d8bb06b67c34722eeb6075d8b5f170e71a01d1589101b111c79bba7ae60a1cf311a65a42301cbc68a84d19e85e91c63bf0a740685909a9374030f065dcc40d
+EBUILD selinux-logrotate-2.20200818-r2.ebuild 285 BLAKE2B 50da7bbbd3c21edb0c55b0a35ba6d50b6a3c107cdae4a8ac51e7a2f0b45e0f2ca74a48f6389cea0276598cf3996566761521a5a0dd270b04b17646d0c8c4bbbf SHA512 01be468a7b3ec2f658d7244a9e70301bd7aa1334f771f2b8473c019a23d7cb2587fe0cd482433ac5f40fc9b78ec8bb329ce04c85270342cd0a9b8447cfbc2a6c
 EBUILD selinux-logrotate-9999.ebuild 287 BLAKE2B 7016bc5050cec24dba3e79c5c15936572f6920c3630d8c3d936881b470abf96b5f94279480718f8b0d6422b40a080f5c6fc2519ce1d0678931fc8381b84f040e SHA512 d7d8bb06b67c34722eeb6075d8b5f170e71a01d1589101b111c79bba7ae60a1cf311a65a42301cbc68a84d19e85e91c63bf0a740685909a9374030f065dcc40d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20200818-r2.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20200818-r2.ebuild
index a0a8ef93fc90..553957558399 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logrotate"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-logsentry/Manifest b/sec-policy/selinux-logsentry/Manifest
index 69a093641f7e..61e1ff4ae7d3 100644
--- a/sec-policy/selinux-logsentry/Manifest
+++ b/sec-policy/selinux-logsentry/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-logsentry-2.20190201-r1.ebuild 285 BLAKE2B a3b25819b0ba13aab559e2fac7d772e2fd465a70fe8e00ed5e361c3c27c3d745648952e86b3b88131f3872cf61eef604185950b8b3c320c997cce3be1a25f689 SHA512 c304f3bf589a54151c71a5849acfbbb024920f4aba1613c3088fc8e6a556f885ca405de2e2ae4a69c6fdf717bcfacd5a298ea851d8a44157d56ac855c2935df8
 EBUILD selinux-logsentry-2.20190609-r1.ebuild 285 BLAKE2B a3b25819b0ba13aab559e2fac7d772e2fd465a70fe8e00ed5e361c3c27c3d745648952e86b3b88131f3872cf61eef604185950b8b3c320c997cce3be1a25f689 SHA512 c304f3bf589a54151c71a5849acfbbb024920f4aba1613c3088fc8e6a556f885ca405de2e2ae4a69c6fdf717bcfacd5a298ea851d8a44157d56ac855c2935df8
 EBUILD selinux-logsentry-2.20200818-r1.ebuild 287 BLAKE2B c178002c65c79a63f413c7653159a688d6efce08eae2b5abc427e028b10af80c6393bce2a965b57effc3e87a8d93c742af2d19f4b50161acf14b2340685d3b96 SHA512 fbb8e79a4e5cb12e3951270d6592f862c24db02d5fa95dca754c86a8affcf5f966a4a71f9a67bdc9225da2cac164ec3c02d1ab1a39398bc20c429f6d1668b940
-EBUILD selinux-logsentry-2.20200818-r2.ebuild 287 BLAKE2B ba6758f905d3a0966b7d1e2bf01732b11949bffb0ee06a6c38a200048c525345e7b8920657c2fc4e20d1f7e572ea24a2efe2c610b43b7e8b39c83eb9c2a023bd SHA512 ddf8be5e620af72eabc4f9dadb7516af076155ec1761816a956bc8fc8c281fe8163faa66de2d2a178b1064f8168997cefbb7a98cdec6603cc36b2d93320b3ec0
+EBUILD selinux-logsentry-2.20200818-r2.ebuild 285 BLAKE2B 16c5361b804c12dc3edb5501ba3abe380e7841eccda54d06bea399f6f8c08a0b1f900055f738064b115124e254110c3935594d9cfe5bda3f4997678bfeab86a3 SHA512 cf0f79b987eee5eaded2d7ee689af16d852e8dfd18af026bfc43eebc8d54f75884a869c18e75bbbb553336c8834e1b7239402016deba349171a32ca3ad1373e8
 EBUILD selinux-logsentry-9999.ebuild 287 BLAKE2B ba6758f905d3a0966b7d1e2bf01732b11949bffb0ee06a6c38a200048c525345e7b8920657c2fc4e20d1f7e572ea24a2efe2c610b43b7e8b39c83eb9c2a023bd SHA512 ddf8be5e620af72eabc4f9dadb7516af076155ec1761816a956bc8fc8c281fe8163faa66de2d2a178b1064f8168997cefbb7a98cdec6603cc36b2d93320b3ec0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20200818-r2.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20200818-r2.ebuild
index 5a0b3b0202a9..fc0131ccf9ad 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logsentry"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-logwatch/Manifest b/sec-policy/selinux-logwatch/Manifest
index 9c865e6ad8e1..869b81fa0c24 100644
--- a/sec-policy/selinux-logwatch/Manifest
+++ b/sec-policy/selinux-logwatch/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-logwatch-2.20190201-r1.ebuild 283 BLAKE2B 0621c670e01655b2b1b6c34576e87947fbed3fc98702302875f33d6343a645c9618920f36fb9749c6720722eb531bd71e7a4c53b760f4763aff39416f4ab1fbf SHA512 d4c5a2755b2f28893818da317eeae60dea900819e08f8379f09131a57717de58eb8250cb198693fd4564b300ba16fc44b8156f0e36d5a76e48419fdc03de5bbb
 EBUILD selinux-logwatch-2.20190609-r1.ebuild 283 BLAKE2B 0621c670e01655b2b1b6c34576e87947fbed3fc98702302875f33d6343a645c9618920f36fb9749c6720722eb531bd71e7a4c53b760f4763aff39416f4ab1fbf SHA512 d4c5a2755b2f28893818da317eeae60dea900819e08f8379f09131a57717de58eb8250cb198693fd4564b300ba16fc44b8156f0e36d5a76e48419fdc03de5bbb
 EBUILD selinux-logwatch-2.20200818-r1.ebuild 285 BLAKE2B 4ba2af5acd5abf9627b4e7317d2e7d39dd755d037a88503eb56e2f935ecac72199924e292f39ccfbad7d15307e193e8240356c855067c01c30596ab11db2a7df SHA512 ac03b980263951465ac3417ea7a8c0158bf3d02992b9e8f47720e48237f522937d6f80d036d1bcde21437720b6ccee5f64fa71d32e06904bfc1986f43f960e50
-EBUILD selinux-logwatch-2.20200818-r2.ebuild 285 BLAKE2B 2c1b618a91a526cc6c3a8e5eb4d2d42af793caa64f70b71618e2002b458a5db09b059cd2fcd1364f3c6e5175bbce67fecf71b2432ca1dd264a6524fd9e9a74bd SHA512 47a34a6da1b49e82a7140b93bd60329c1cc51e7719a49bebbffa37d3878432030baf40bb7e031b0c5620f7c3151fe5e88488c423a0a4e4f751eca30bfa01419f
+EBUILD selinux-logwatch-2.20200818-r2.ebuild 283 BLAKE2B 5f4d0e3e2d70d58328aad2d7df68213fd4ac1a8c974b81c3b9d8a403b8135ee67a59a584a3d3a33064d4f2f38ae20680cb1f650421cafd6c6ad5440620545d79 SHA512 c74bc0b4eee2c7b0e30e56e8854b0f691231bd7ca5045543da4f1a50ce1b1bafeca1979ece0a132fc9e77bfe179f92c246f3171922d46fd380b582e055d025dc
 EBUILD selinux-logwatch-9999.ebuild 285 BLAKE2B 2c1b618a91a526cc6c3a8e5eb4d2d42af793caa64f70b71618e2002b458a5db09b059cd2fcd1364f3c6e5175bbce67fecf71b2432ca1dd264a6524fd9e9a74bd SHA512 47a34a6da1b49e82a7140b93bd60329c1cc51e7719a49bebbffa37d3878432030baf40bb7e031b0c5620f7c3151fe5e88488c423a0a4e4f751eca30bfa01419f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20200818-r2.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20200818-r2.ebuild
index fa424b8fbd94..38ac1a5b8d5d 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for logwatch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-lpd/Manifest b/sec-policy/selinux-lpd/Manifest
index 0e8be9962b6a..0ba1e55f3e32 100644
--- a/sec-policy/selinux-lpd/Manifest
+++ b/sec-policy/selinux-lpd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-lpd-2.20190201-r1.ebuild 273 BLAKE2B 930fa66f06056ec2325cb0992e25192f313b946ac3a353653ca515f9e4fcb0edef9723ff88ab0d69c8e1c6ae70a9fb98aa5f4f4e5700c98856d5fc5d864a303b SHA512 31ee06927ec7629dfcdcf05eb1930eba2eeaaf9df0b5d41a267f5c54885d825cdf9dc5d5cf67c08a43514e171e71bb2af5017dee41900d87a48db428094455f3
 EBUILD selinux-lpd-2.20190609-r1.ebuild 273 BLAKE2B 930fa66f06056ec2325cb0992e25192f313b946ac3a353653ca515f9e4fcb0edef9723ff88ab0d69c8e1c6ae70a9fb98aa5f4f4e5700c98856d5fc5d864a303b SHA512 31ee06927ec7629dfcdcf05eb1930eba2eeaaf9df0b5d41a267f5c54885d825cdf9dc5d5cf67c08a43514e171e71bb2af5017dee41900d87a48db428094455f3
 EBUILD selinux-lpd-2.20200818-r1.ebuild 275 BLAKE2B 0bc29c0a49e9ea3ac21dfb00c601fc25cb45a159f7f803140f5ebe89371d357637995fe6bb769bea3b7dd1f438bc73b3abf9e5bd72a482987acbe78afaa520a5 SHA512 23b8e103e7ee24383574dc25630b465df1d185f79e65803d104769825b4c7f4a6a18dcd16f766da9ce57bc6bec41071cea95ddd1da8d1969edab8a3a6532a68d
-EBUILD selinux-lpd-2.20200818-r2.ebuild 275 BLAKE2B cd86629e3226a5d9416a9c2d5c2795e5785bee894b9c75e8f48eea340e5262063b8381131016ff978ed6c346cba60b9bd09649c1cc035cb0343b7ab95defafdb SHA512 fff13c5db13acd1ac7c5a2c334abb48913a855a4474b283d4f2e613858760a78f93a57f35909bae3b96a016dd52905bc20883fdeae3e22dc18e3a5aeaeb87a44
+EBUILD selinux-lpd-2.20200818-r2.ebuild 273 BLAKE2B 9668f3d02be1f0cbb344cde61e0a815c65f0cc03843fd67817befa1f0073ca0268dbfcff3b6840d679a394ccd173ab3e78945955e5d89973e0d1d95a04ca79e9 SHA512 0bd4abb13f76777ca9d6d03372acf507d94967271afde058403aa1873ff124d949dc0586b8ca086a1404046125c48cbd25d78bd0b83128d20c2e94e081d7d688
 EBUILD selinux-lpd-9999.ebuild 275 BLAKE2B cd86629e3226a5d9416a9c2d5c2795e5785bee894b9c75e8f48eea340e5262063b8381131016ff978ed6c346cba60b9bd09649c1cc035cb0343b7ab95defafdb SHA512 fff13c5db13acd1ac7c5a2c334abb48913a855a4474b283d4f2e613858760a78f93a57f35909bae3b96a016dd52905bc20883fdeae3e22dc18e3a5aeaeb87a44
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20200818-r2.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20200818-r2.ebuild
index ea47317f3325..708b665bd99a 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for lpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mailman/Manifest b/sec-policy/selinux-mailman/Manifest
index 3639228c1d35..d0c097a7a035 100644
--- a/sec-policy/selinux-mailman/Manifest
+++ b/sec-policy/selinux-mailman/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-mailman-2.20190201-r1.ebuild 281 BLAKE2B a630cd3e7376b1575273b5c7521a8d2da168ea77d7b808b3055b4f395565ea1a5c3b084fa1e32b1e38d65ca51b99c24ee95199720fd2197f81af1fbe08e68081 SHA512 9a6108e7a2b40e5cd5d2d76361917bab9de1a0d7d44e86474f6c5336c97e91deae47373ce9c80c40d3626bca7e1b6c283fdf44bb720e284084de9e8c72654cdb
 EBUILD selinux-mailman-2.20190609-r1.ebuild 281 BLAKE2B a630cd3e7376b1575273b5c7521a8d2da168ea77d7b808b3055b4f395565ea1a5c3b084fa1e32b1e38d65ca51b99c24ee95199720fd2197f81af1fbe08e68081 SHA512 9a6108e7a2b40e5cd5d2d76361917bab9de1a0d7d44e86474f6c5336c97e91deae47373ce9c80c40d3626bca7e1b6c283fdf44bb720e284084de9e8c72654cdb
 EBUILD selinux-mailman-2.20200818-r1.ebuild 283 BLAKE2B 1e3f4c956b6c9ca71eb40deb3962846b97c74350846065c1ffc0b5652eccbe75e59b74fb158666309bfa5790d0e1859d52e0f176da782778e396437be3e88422 SHA512 dd913bfe0c3c6a21a69a4cd68f0ea95ac3bb0629134c040b1d05b009fede10de793adeb1b8b85b1e20eef31ae90e0111ad127f592c1dec2bfcdf82ebf727f4fb
-EBUILD selinux-mailman-2.20200818-r2.ebuild 283 BLAKE2B 70be0201e9337a8de7419e71fcaa7a533e46713257d39c801f44569937a794044613d377760a2b727772a57dd42ef21056b6c7cc7c6a9a200d31643177e141b8 SHA512 2338020b788c1831837c508b8ad6023474dd1c80a479f9e58cb5c41d18e54069d023602071b5facfff900492593935c6736ec13c093d39046073aa23821f80ad
+EBUILD selinux-mailman-2.20200818-r2.ebuild 281 BLAKE2B b9d9c79ddaae59e39837850d413bac9a38b40b154e0f2eda774ba53c81ce9ed1164decb210c7963866bf6f678d486579354a93ffd109584fb8fb28e4416d291c SHA512 ee997c267cee68b1d327694fddc97093b4fd4acfcca7d6e1ceee088b2a511c91c48b418be3b7d405cce811eb332dd86a6dd838d4b541b9e78359106117aacb73
 EBUILD selinux-mailman-9999.ebuild 283 BLAKE2B 70be0201e9337a8de7419e71fcaa7a533e46713257d39c801f44569937a794044613d377760a2b727772a57dd42ef21056b6c7cc7c6a9a200d31643177e141b8 SHA512 2338020b788c1831837c508b8ad6023474dd1c80a479f9e58cb5c41d18e54069d023602071b5facfff900492593935c6736ec13c093d39046073aa23821f80ad
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20200818-r2.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20200818-r2.ebuild
index cf73251b0c97..b89fa432c150 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mailman"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/Manifest b/sec-policy/selinux-makewhatis/Manifest
index 5fed204a4b78..4b4eb0059d31 100644
--- a/sec-policy/selinux-makewhatis/Manifest
+++ b/sec-policy/selinux-makewhatis/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-makewhatis-2.20190201-r1.ebuild 287 BLAKE2B c2054e70d80b0574f66bbc0576408743ea3224ccb4f2bb0861369e63ef1ca7feabc72b9b4a29ecf691ea97ceaccf7b1043b915ac8394c7dc69791cc2fbeb129d SHA512 bdaa22cc8759a37abf24ca2d1f0db7b0187798594bb5e48faa22eddce62d9539f5341668f98bc56b05f88bca675c89f8daa81daada29e4cc1973d1642e452880
 EBUILD selinux-makewhatis-2.20190609-r1.ebuild 287 BLAKE2B c2054e70d80b0574f66bbc0576408743ea3224ccb4f2bb0861369e63ef1ca7feabc72b9b4a29ecf691ea97ceaccf7b1043b915ac8394c7dc69791cc2fbeb129d SHA512 bdaa22cc8759a37abf24ca2d1f0db7b0187798594bb5e48faa22eddce62d9539f5341668f98bc56b05f88bca675c89f8daa81daada29e4cc1973d1642e452880
 EBUILD selinux-makewhatis-2.20200818-r1.ebuild 289 BLAKE2B 74e61ddafccac6bb68b93406211beb28096a44e671d1440c5bac45f095911d40c053ff269c5063a573bfb47f79d354c57651a0e3ee295447a7dd6b55783c2052 SHA512 7ca049c6c311f148f9084f3e440594df128b7f108078c8158df641893ce44c16a8e146ba102df3bfbe3e3d9be9b7f7fe3f20999460e661d9458eee10a0515341
-EBUILD selinux-makewhatis-2.20200818-r2.ebuild 289 BLAKE2B 63a085d04c7cd6fcd3d1df4c74fe182da062c88316dd6e9576384b58d3d21a18e6de3de25debc3ff35b45337d008cccac210f8489fb061349a8a56eb0b213ca5 SHA512 eba7a757dbfe447b706c18b76eacf9fa482acaa4ce522b54c87b17c4bf3f95672aa42d4dd5f3ce9e526886b30d5ea1bdf41c670dacd3ef6e9c1be6b57c89802b
+EBUILD selinux-makewhatis-2.20200818-r2.ebuild 287 BLAKE2B 2451d79fffff81034fb71959a8a4b15f54f0ae33c68f462ba9615c468ec1b36bbd6d51b82734fb2a786dbfa4d89e3b5fd1e9cfab20a308e818f1764c78d28376 SHA512 293a7e3e333267d3ab5ed2a0d477813ad15afaac10b0131c026d7963e4814b58b74134d569cad8ce02401af53a8cbfb88bdac8efe0c3167d9bccd4424c2f6cec
 EBUILD selinux-makewhatis-9999.ebuild 289 BLAKE2B 63a085d04c7cd6fcd3d1df4c74fe182da062c88316dd6e9576384b58d3d21a18e6de3de25debc3ff35b45337d008cccac210f8489fb061349a8a56eb0b213ca5 SHA512 eba7a757dbfe447b706c18b76eacf9fa482acaa4ce522b54c87b17c4bf3f95672aa42d4dd5f3ce9e526886b30d5ea1bdf41c670dacd3ef6e9c1be6b57c89802b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20200818-r2.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20200818-r2.ebuild
index 97af248ad9db..1452cbf20b77 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for makewhatis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mandb/Manifest b/sec-policy/selinux-mandb/Manifest
index c7e1d9a8ac74..5c7e78c71497 100644
--- a/sec-policy/selinux-mandb/Manifest
+++ b/sec-policy/selinux-mandb/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-mandb-2.20190201-r1.ebuild 277 BLAKE2B 9ac772a2d3edba6f2b1deb8809248eb2762d22618e2133be391c2cea9cfdf4d094258fc850e52072cd8855a2cddbc97e70e6e644b98c6af376b6f25de4c96955 SHA512 ed29fe1a629e939492067da4fc95b891d363fde299e63084f7bf8af343c925c3a37ba694184b486fec7d1da9c9d4cd9381b5a752c87eb859625598f54992f869
 EBUILD selinux-mandb-2.20190609-r1.ebuild 277 BLAKE2B 9ac772a2d3edba6f2b1deb8809248eb2762d22618e2133be391c2cea9cfdf4d094258fc850e52072cd8855a2cddbc97e70e6e644b98c6af376b6f25de4c96955 SHA512 ed29fe1a629e939492067da4fc95b891d363fde299e63084f7bf8af343c925c3a37ba694184b486fec7d1da9c9d4cd9381b5a752c87eb859625598f54992f869
 EBUILD selinux-mandb-2.20200818-r1.ebuild 279 BLAKE2B 7968cd95f9ff8a85b15fd57ea3682d29a469c2c129d13755fad493e504a22d9c67464f57c90e84ec780f603cabd2024c75307adb2b96d4da9bbb9b8b95542066 SHA512 1e4751b4d08eb582dfc3e153960336386b3c70cda4c236dec03ffba3efbc506e45842849479e793ba7ce84824cf7c04daeb520df25c867b10940fa88210cda91
-EBUILD selinux-mandb-2.20200818-r2.ebuild 279 BLAKE2B dbfee53b2dfacc4599fc7379f93c982880ef8768df3f38339866138e2feb0aaf90265c7a65da70d94545eba56284fa97fb12ce8eba78cb0ed2aee30e7bc6b64b SHA512 7287467ce66f040217f3e712d641ee5b65d2dcd0159a649e0350f11b71ba22602941c3c40e4c65062699639b2fc03b2f3be3ae3a2d9ffa830122a1052463525f
+EBUILD selinux-mandb-2.20200818-r2.ebuild 277 BLAKE2B d25deb063abb5e411d0b74ece36c15749f9cda3b8d64fecb6c659f4ecf1f4a9b9a6588f144e94fba2b7ceba8cdf99a77ad88611443017da5116cabd45a10897e SHA512 bbcc89561eff88e3d57bbdafdc89f232a827bece9e777539bb80b2bf1e8930eada844ee4fc3cf9c521184b528042f02e8806a89b06b0e93a518fa31ac2bb8972
 EBUILD selinux-mandb-9999.ebuild 279 BLAKE2B dbfee53b2dfacc4599fc7379f93c982880ef8768df3f38339866138e2feb0aaf90265c7a65da70d94545eba56284fa97fb12ce8eba78cb0ed2aee30e7bc6b64b SHA512 7287467ce66f040217f3e712d641ee5b65d2dcd0159a649e0350f11b71ba22602941c3c40e4c65062699639b2fc03b2f3be3ae3a2d9ffa830122a1052463525f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20200818-r2.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20200818-r2.ebuild
index a169d66c4a9f..991f98ab11be 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mandb"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mcelog/Manifest b/sec-policy/selinux-mcelog/Manifest
index 556e72733fa1..d8e3017164cf 100644
--- a/sec-policy/selinux-mcelog/Manifest
+++ b/sec-policy/selinux-mcelog/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-mcelog-2.20190201-r1.ebuild 279 BLAKE2B f1c280daab33ad1c8292d465eef836b78429813ee18502630f878d330e7bc7d000a36397b4269f51eca4bfd7934674c916c6a05af50a2a3ffed81472f08a728d SHA512 e12e2570dfd3d400b57116ef349d3905588f111ec694fa1b53f1b2123da7b31e44bd321d42ed14d9238aa08dd9c5a94c62757b85296982b9bf5611f9e8d9b840
 EBUILD selinux-mcelog-2.20190609-r1.ebuild 279 BLAKE2B f1c280daab33ad1c8292d465eef836b78429813ee18502630f878d330e7bc7d000a36397b4269f51eca4bfd7934674c916c6a05af50a2a3ffed81472f08a728d SHA512 e12e2570dfd3d400b57116ef349d3905588f111ec694fa1b53f1b2123da7b31e44bd321d42ed14d9238aa08dd9c5a94c62757b85296982b9bf5611f9e8d9b840
 EBUILD selinux-mcelog-2.20200818-r1.ebuild 281 BLAKE2B fd7942a06738211e7ba92f809cc119a982e3e61574be0383faa55bd77dfc1f14be55429ac79f0d6217c5f92cfcee7f4ef5236de67eed37d6a90338b5a9ea56e7 SHA512 61b9aaca7f19b5dc25fae2790fc48b70b7eb7bfc1abd2fd76291451204d188813ff6afb3817a48454e9add28d08f464c4a05b73da600850188c39e1b6630b511
-EBUILD selinux-mcelog-2.20200818-r2.ebuild 281 BLAKE2B 46e83fc47f39f7d8f620ff7ccd29ecd3d95204ea991a98078485d594406a14ace7de3362a87379adc7f16eb67fc0865c7106e1117fedc79bbcd2b020febebeba SHA512 6b46f4e0d0700daeefc6bd72ca29285c91c3b3e268d92a55261177b4384b798b481360a373396bcbe82f2b98c15d726ea7ee5464472bfe50dbdacc8351a2f081
+EBUILD selinux-mcelog-2.20200818-r2.ebuild 279 BLAKE2B 3b09fb8ca34ccc3adbd3bf3ac59962df400518434074a5145e97e5e6ca5372465371198c8979ab9c96ce107af264d3011e5e447a16c6ab445edc06951899e367 SHA512 b41f8001a0a8ce41d09efcf9644a6b5ec23f61283fb47222bea267f1dfe85916493fb573652333d048a487f5e399a6ab15d1f0b23854b2315d76e126df26a0ef
 EBUILD selinux-mcelog-9999.ebuild 281 BLAKE2B 46e83fc47f39f7d8f620ff7ccd29ecd3d95204ea991a98078485d594406a14ace7de3362a87379adc7f16eb67fc0865c7106e1117fedc79bbcd2b020febebeba SHA512 6b46f4e0d0700daeefc6bd72ca29285c91c3b3e268d92a55261177b4384b798b481360a373396bcbe82f2b98c15d726ea7ee5464472bfe50dbdacc8351a2f081
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20200818-r2.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20200818-r2.ebuild
index 5e311635597d..38c788ec2705 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mcelog"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-memcached/Manifest b/sec-policy/selinux-memcached/Manifest
index c18f9ae6574d..4552ae42f91b 100644
--- a/sec-policy/selinux-memcached/Manifest
+++ b/sec-policy/selinux-memcached/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-memcached-2.20190201-r1.ebuild 285 BLAKE2B 185d4e6bf092abbc62ed965536bbda42b64660861e372f5774992c811d101bf6e14119e88ad32699743545a564f3de0492ea989e9366be3912c5fa480dbc0c83 SHA512 3b29fe6cd048cd8a27c78205324cd212c616f862508514ec22a8a3065a161a3fd179efcd5f7d707b52049d73d3c0208a7f59d7a402f666da32af723564c23a58
 EBUILD selinux-memcached-2.20190609-r1.ebuild 285 BLAKE2B 185d4e6bf092abbc62ed965536bbda42b64660861e372f5774992c811d101bf6e14119e88ad32699743545a564f3de0492ea989e9366be3912c5fa480dbc0c83 SHA512 3b29fe6cd048cd8a27c78205324cd212c616f862508514ec22a8a3065a161a3fd179efcd5f7d707b52049d73d3c0208a7f59d7a402f666da32af723564c23a58
 EBUILD selinux-memcached-2.20200818-r1.ebuild 287 BLAKE2B aaa0805fb0f3dcbb43adbc279c17f2f73ff0f4b74bea8b50d1d13d74387374b558b30f9fdf27d9e0449baa4e4ceb3ad8e0776d015b9e04665c75031d3ef21708 SHA512 2355845c2ae7fd5a9a0e80739191b64d33fdeb05414a2033ff767d0be708b2d8c4e627bc67d051d6c9b12cee4699854aa62282b2f610e28cca14873a2e0cf103
-EBUILD selinux-memcached-2.20200818-r2.ebuild 287 BLAKE2B 81bfb6e9284f25c3ab4b4c60cb5a7f956a62f24fb2ad83cfc95358f0689f4bf6fe74e2d7343ebefcdc72ecc19cd180998295ecfae85dde48b7c4a0a99bdccd46 SHA512 af240ffe19dbd60a93c8b923d39cc13efed240955407ad1a7b6865abbd07f7cb3dfb57a989797cbd2bee566e0a7be438cfb26e9a408830e367e3f19862bc4d6a
+EBUILD selinux-memcached-2.20200818-r2.ebuild 285 BLAKE2B 2fa50d91a00fcafd566a356b79ba8c9753766f5a1c6d23f2212030d9ecdc470bd8e1ebdebc5979a9b386a31a9b5e131a3c97f5a9441af5580578c131f1f2be6d SHA512 9d5e06f98afe942a4c584f7f7db14c22b233ebdb9d3451232c9d4056345edd65313a6a6aefc73a4298e13d2dea3d2c5b43f8b200a199e26b0147ee249f792d53
 EBUILD selinux-memcached-9999.ebuild 287 BLAKE2B 81bfb6e9284f25c3ab4b4c60cb5a7f956a62f24fb2ad83cfc95358f0689f4bf6fe74e2d7343ebefcdc72ecc19cd180998295ecfae85dde48b7c4a0a99bdccd46 SHA512 af240ffe19dbd60a93c8b923d39cc13efed240955407ad1a7b6865abbd07f7cb3dfb57a989797cbd2bee566e0a7be438cfb26e9a408830e367e3f19862bc4d6a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20200818-r2.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20200818-r2.ebuild
index 8ff826aaf483..38088e1f3caf 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for memcached"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-milter/Manifest b/sec-policy/selinux-milter/Manifest
index 9db60fa4ddb4..92fed37ca116 100644
--- a/sec-policy/selinux-milter/Manifest
+++ b/sec-policy/selinux-milter/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-milter-2.20190201-r1.ebuild 279 BLAKE2B e586c2da97749731eca9568bfb42e93e1869df6fe18eba4a00425717f03b6f02ae663f3dc6ae25f43027d58ced48c4acc1233e1e2e894d5a10e21896519f6778 SHA512 09a609e2227bfe4f7a53b811beb69a4a48c4b23eaf3b7e9092c0f604519603c67163225b5bc51e25b8bcd077b4428fcb751008332bfaf14947253a21b14e92d8
 EBUILD selinux-milter-2.20190609-r1.ebuild 279 BLAKE2B e586c2da97749731eca9568bfb42e93e1869df6fe18eba4a00425717f03b6f02ae663f3dc6ae25f43027d58ced48c4acc1233e1e2e894d5a10e21896519f6778 SHA512 09a609e2227bfe4f7a53b811beb69a4a48c4b23eaf3b7e9092c0f604519603c67163225b5bc51e25b8bcd077b4428fcb751008332bfaf14947253a21b14e92d8
 EBUILD selinux-milter-2.20200818-r1.ebuild 281 BLAKE2B 5e32147c790ccfd44744440d7947102ec5b48de02f395d01adaf33b2cda8f3a941d4fb2cb340c668052cbedd9282bfbd5b3b1536cce70852b1c00d8395d34d75 SHA512 db8f03c41f1e28f1bf5972891322086315a865a905fea8ff850ebe13bc2a2b3bb29fa9da84f53d59abb468ac66eec0f1bb770772eb799be857256aee5f0c43fe
-EBUILD selinux-milter-2.20200818-r2.ebuild 281 BLAKE2B 8471773e14735b3ccc602206b6f7cb9327a53ea3d7015c7bb87f54728ca2de87e454b46dcd87df44aa4cbe76159ddb146d0cb770127e39283b238e5b332844c1 SHA512 5a19712664836e23c77da29cc16f2bc468495099a18599f49563044f42fe1af61e2144ce219d72144f54c0894e5bbfbb1084e65d7565a7b59fa995d36d8ac3b6
+EBUILD selinux-milter-2.20200818-r2.ebuild 279 BLAKE2B 3bd82d6026414d35699e22232b7f12f08e063f6cbef3150d8e2e2ad47f1201393e202c5c498d6d35d25a1cd53bfd78673a3561ed5693d9e40f753787bc4da5b6 SHA512 bc285442387e4e06939e78c1c9a267c26fdf21fd03765697e6afccf20e7d3b5a307f7f6f38578d60570252d833e8315b94be13476ad17061676d36c125fa743a
 EBUILD selinux-milter-9999.ebuild 281 BLAKE2B 8471773e14735b3ccc602206b6f7cb9327a53ea3d7015c7bb87f54728ca2de87e454b46dcd87df44aa4cbe76159ddb146d0cb770127e39283b238e5b332844c1 SHA512 5a19712664836e23c77da29cc16f2bc468495099a18599f49563044f42fe1af61e2144ce219d72144f54c0894e5bbfbb1084e65d7565a7b59fa995d36d8ac3b6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20200818-r2.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20200818-r2.ebuild
index cdf708f576cc..75f485366f8f 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for milter"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-modemmanager/Manifest b/sec-policy/selinux-modemmanager/Manifest
index ea462977c441..5af8ae16b2d5 100644
--- a/sec-policy/selinux-modemmanager/Manifest
+++ b/sec-policy/selinux-modemmanager/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-modemmanager-2.20190201-r1.ebuild 383 BLAKE2B af71b6f2af4017dc42979ca9a57751acebb6e66ce465c995cacd0c188777bd23dff21aa9ab1c034e66d3337572bb42f38fb9daed6e712bda17e13c1c05695671 SHA512 758f6e0ff6c12eecd11adec6c751b4e173f0de60bff9d2469c8fb49c57d89029915024c6840ba9895e8bd670941977b5609d6e90e01018a7a211e9d136dea33c
 EBUILD selinux-modemmanager-2.20190609-r1.ebuild 383 BLAKE2B af71b6f2af4017dc42979ca9a57751acebb6e66ce465c995cacd0c188777bd23dff21aa9ab1c034e66d3337572bb42f38fb9daed6e712bda17e13c1c05695671 SHA512 758f6e0ff6c12eecd11adec6c751b4e173f0de60bff9d2469c8fb49c57d89029915024c6840ba9895e8bd670941977b5609d6e90e01018a7a211e9d136dea33c
 EBUILD selinux-modemmanager-2.20200818-r1.ebuild 385 BLAKE2B 44a236f09deea33b8285bd8feac7a12f93d5943436aa7dff90c526f7131ebbb271bfbdca89d6f32230b7d035a03494b81bc2b990344ee01c8a672308125444e4 SHA512 80148cb0e970570fac4cb9c64fa31a941482335a739c0d1b00e91407f4acab97f1f940eab2df32d335c0f3ad349034db8a80c73387ba0b2ce916ac0fd4ce8fe8
-EBUILD selinux-modemmanager-2.20200818-r2.ebuild 385 BLAKE2B 745189b4bec820469568d6e523be21c9362c1cf633066526b998c4f44d1055555c7121a271ba09901f6f9eab9a9a8f92ddf016f23f3137c1d9a4ee75755f5119 SHA512 616215d7fd9ea95bf0445293d6ba74952becd0cd5c2144575375a2624cb90276cca81021f5c7c95fd45ab3aa86f37d7e5279d6a12a7ec506411c7a045e875ece
+EBUILD selinux-modemmanager-2.20200818-r2.ebuild 383 BLAKE2B c3daaa4faebc9b474df2426c3210629fcb0fb46cf72007d5a089ef5b305975b5a797ddfafa61490453e794b5b6b8bb3ea2ae672e8974bec5deafd371afa1c6c5 SHA512 0ce672d5f50eda853f845d1c9d8ae3437193a6bfd972efecd9ec566d57234b1b50ef9859eb7c18f2621dc5e5f62425f79c9efb8b87b6043bcef04b318d044608
 EBUILD selinux-modemmanager-9999.ebuild 385 BLAKE2B 745189b4bec820469568d6e523be21c9362c1cf633066526b998c4f44d1055555c7121a271ba09901f6f9eab9a9a8f92ddf016f23f3137c1d9a4ee75755f5119 SHA512 616215d7fd9ea95bf0445293d6ba74952becd0cd5c2144575375a2624cb90276cca81021f5c7c95fd45ab3aa86f37d7e5279d6a12a7ec506411c7a045e875ece
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20200818-r2.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20200818-r2.ebuild
index 166746af0431..b21beaa7faef 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for modemmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-mono/Manifest b/sec-policy/selinux-mono/Manifest
index 7643bc229d16..3d8d76c24e87 100644
--- a/sec-policy/selinux-mono/Manifest
+++ b/sec-policy/selinux-mono/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-mono-2.20190201-r1.ebuild 275 BLAKE2B c0e1c6d3f4b565a6b7b25758e4b5e19abf7742c89f7ccd7ca52db9b6dd179c143377013bcc838b83570efcd0cd261cce6c21ff5845dc78cd2fc6746648e926c4 SHA512 7cf9cd3744017213b64d1a96e4cec33209ed8db884e61c9bc598dab904bfb4300da223b689871e75245dc4f4a9f633c77c1dd5ecc8e3bd68ce7f6e0fa7d03606
 EBUILD selinux-mono-2.20190609-r1.ebuild 275 BLAKE2B c0e1c6d3f4b565a6b7b25758e4b5e19abf7742c89f7ccd7ca52db9b6dd179c143377013bcc838b83570efcd0cd261cce6c21ff5845dc78cd2fc6746648e926c4 SHA512 7cf9cd3744017213b64d1a96e4cec33209ed8db884e61c9bc598dab904bfb4300da223b689871e75245dc4f4a9f633c77c1dd5ecc8e3bd68ce7f6e0fa7d03606
 EBUILD selinux-mono-2.20200818-r1.ebuild 277 BLAKE2B ca8de0cec769bd91a5f8450aafcc1cf45b89079e5739db159c0c3a84610583a8eea7223bfe98bc7227eb15f0a3398173d317b04a8ff231d2507ff0a12fb9b63e SHA512 3dea98cbc4065b02d6f54c7195de15cc779d00589171651fd13f95c138d3f93d2f42a1d3422353db525a6f7adb2a76acb574a6574b52d625fa7aacfd1c8cc16a
-EBUILD selinux-mono-2.20200818-r2.ebuild 277 BLAKE2B 44e63d6a884accf9f484f508d4578227ca12f9729f246a5a55ee965692cea5e4344b72557a601cd2cb4f73f0d79bf993aa59831cc198640d495cdd984ee32ef8 SHA512 9cb5a8f2f20be621b49f140dfcdab03e0021e860690582135e2542cb58b1447200c8e1e5c8400da438c4c145bfee78a9ad116d3a6f9da224b4f3b31367411903
+EBUILD selinux-mono-2.20200818-r2.ebuild 275 BLAKE2B 927c6b7b013355f6bb71e1d5c9821f623f1d0798c1574a67af5bde5228c2799cfbffd5f903f72f9fe0e2a61723e8035b9c0703088486238d5bb2d700de00a7e2 SHA512 714e963da362c68b1b8d456010ddb401cfc2f6ed696086ea0fa828e0f0888ab38dd8d3731328cce1e3a7e032312f7fc5ae3114a4166e4df236a5cc3d19584ebe
 EBUILD selinux-mono-9999.ebuild 277 BLAKE2B 44e63d6a884accf9f484f508d4578227ca12f9729f246a5a55ee965692cea5e4344b72557a601cd2cb4f73f0d79bf993aa59831cc198640d495cdd984ee32ef8 SHA512 9cb5a8f2f20be621b49f140dfcdab03e0021e860690582135e2542cb58b1447200c8e1e5c8400da438c4c145bfee78a9ad116d3a6f9da224b4f3b31367411903
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20200818-r2.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20200818-r2.ebuild
index aab71fa99100..79eef27e3d0f 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mono"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mozilla/Manifest b/sec-policy/selinux-mozilla/Manifest
index 21f4de1dba44..b51332c3c089 100644
--- a/sec-policy/selinux-mozilla/Manifest
+++ b/sec-policy/selinux-mozilla/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-mozilla-2.20190201-r1.ebuild 383 BLAKE2B 884e3249671d226ec4daa509733f924ddbed4470c64450d04beb3bdc5803c76039840c568aad16550273f0124614fcab2e3ef10e1995fa5b97309be14f5c1a33 SHA512 05b1ded79f4573edfd02980275d812fb7472e1100ef3382e2aef032a56465595f35aa7d1d6f6a1522fe6955263f51afd02cce4bc168921e04d7319802945ecd0
 EBUILD selinux-mozilla-2.20190609-r1.ebuild 383 BLAKE2B 884e3249671d226ec4daa509733f924ddbed4470c64450d04beb3bdc5803c76039840c568aad16550273f0124614fcab2e3ef10e1995fa5b97309be14f5c1a33 SHA512 05b1ded79f4573edfd02980275d812fb7472e1100ef3382e2aef032a56465595f35aa7d1d6f6a1522fe6955263f51afd02cce4bc168921e04d7319802945ecd0
 EBUILD selinux-mozilla-2.20200818-r1.ebuild 385 BLAKE2B 24beefe1957c420d241166ebbb9b0dd6f5c64f24c902e29629e35af5599c0e7f8d36dd9f18408f8e88a68a734dcf88f550f1cd4524a0ebb404c725415dd0cc16 SHA512 645f62b20ccfe9ba0c05e91e84d58a2203282acb674bcd49a97d4379395580f030eb77a41b61c7db4d8c0c263f4919fb22fb669a11a1f074dade7b3991109998
-EBUILD selinux-mozilla-2.20200818-r2.ebuild 385 BLAKE2B 543ca24ff85af21eab6d2e026fab00e79e320294fb42f10e7d1d3f43e536f3e2baa34216167c6ef8a1b7a3a8c58a9a4536ca62dd9dd7be4dd65359b6129ea3ad SHA512 77f4f7171bb07e2b450a60dcb8bff8fdc950a5aa666aace47cc60d8432332e538c0adcacbba0877f8fb573bc03346be2c01b01e52839285042939359b27cb361
+EBUILD selinux-mozilla-2.20200818-r2.ebuild 383 BLAKE2B 4684fbc5c1d46bcbf13af1fe3a569b3137246a0e22863b09d1a3d155473400e89ed4281d928b1c2cbc5c62215aeec385bcd778dd8429292494c7a9945cfd8fb2 SHA512 f4ec8089a1cc384fc9dd0045f1693268e200977b5829cbd5aad01397f75236749e1a40fa9fff19051735071088702442e3ff6a5cacc45231cc6abc7f35930beb
 EBUILD selinux-mozilla-9999.ebuild 385 BLAKE2B 543ca24ff85af21eab6d2e026fab00e79e320294fb42f10e7d1d3f43e536f3e2baa34216167c6ef8a1b7a3a8c58a9a4536ca62dd9dd7be4dd65359b6129ea3ad SHA512 77f4f7171bb07e2b450a60dcb8bff8fdc950a5aa666aace47cc60d8432332e538c0adcacbba0877f8fb573bc03346be2c01b01e52839285042939359b27cb361
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20200818-r2.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20200818-r2.ebuild
index 923540ec3bfa..7a38d1981b1f 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mozilla"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-mpd/Manifest b/sec-policy/selinux-mpd/Manifest
index 82fa9fa59dd8..60c43b89ce2c 100644
--- a/sec-policy/selinux-mpd/Manifest
+++ b/sec-policy/selinux-mpd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-mpd-2.20190201-r1.ebuild 273 BLAKE2B 8822d165310457fb64a2a8d96ac063bffcbb677aefa09488745f2b959757062a616e4856baef98f0896f8093e1ca25f39bb3a75313bf0e30312f62950fc47890 SHA512 3648614818192041ba3e00bd79b90efa551c4f068cface237bc7290b9e913d1b20d047b4bffa0e6911559322fffbc92a0cfef14f2cfd49b355f042a5126ae38b
 EBUILD selinux-mpd-2.20190609-r1.ebuild 273 BLAKE2B 8822d165310457fb64a2a8d96ac063bffcbb677aefa09488745f2b959757062a616e4856baef98f0896f8093e1ca25f39bb3a75313bf0e30312f62950fc47890 SHA512 3648614818192041ba3e00bd79b90efa551c4f068cface237bc7290b9e913d1b20d047b4bffa0e6911559322fffbc92a0cfef14f2cfd49b355f042a5126ae38b
 EBUILD selinux-mpd-2.20200818-r1.ebuild 275 BLAKE2B cd14db03ecf41975fc3197e5f32a2417b91e07f8ec14aba9219a77b45ed6554f1ef66ce252fee479b7c0c46f4eea68014b2d17e7b140d02e6fb0b6201199edfc SHA512 cfd2c84365b4fab2688e7b07e914309d850a8d4c201859098370868a15aa41a744c6009dda4eb50151240c5f6bccb9482567bb8de2cb4b7897eb7250bc2ffcbb
-EBUILD selinux-mpd-2.20200818-r2.ebuild 275 BLAKE2B f2e9735b0c6845cb863cca434a92e95b0bbbba792482b847999dc7836be7d48a22158b93f432a541581f309649cb5c14ee501dc3fef9edecac448b5d72df4cd1 SHA512 45ca01decf162efc943614f6c2062dcf689c5a46865621ffecf45861a54c4382ffaa37532dfcc0e747ffcc0022ddf7a3d2536c1e64babc07be3f0e539c4dd762
+EBUILD selinux-mpd-2.20200818-r2.ebuild 273 BLAKE2B b844357445d1dafc1b9f1e8b73b421ce0f2cc748cba700f7ebeef09e79295e5042452bfb0752fde1f043f5cb6bf6f2f6cc0063e502468d4508a7853c381cb490 SHA512 38c5d52d5df9806d6815bd3535fe38434e975a2bf668e17dc0b892705676379763a9dc8f3c21d80e32bdddff6aea43dfb50052688a32a43685bb3c4629cdc6d5
 EBUILD selinux-mpd-9999.ebuild 275 BLAKE2B f2e9735b0c6845cb863cca434a92e95b0bbbba792482b847999dc7836be7d48a22158b93f432a541581f309649cb5c14ee501dc3fef9edecac448b5d72df4cd1 SHA512 45ca01decf162efc943614f6c2062dcf689c5a46865621ffecf45861a54c4382ffaa37532dfcc0e747ffcc0022ddf7a3d2536c1e64babc07be3f0e539c4dd762
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20200818-r2.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20200818-r2.ebuild
index d1ea9bea173d..671843ef4e63 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mplayer/Manifest b/sec-policy/selinux-mplayer/Manifest
index ed2b4806be25..98b287a8ad77 100644
--- a/sec-policy/selinux-mplayer/Manifest
+++ b/sec-policy/selinux-mplayer/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-mplayer-2.20190201-r1.ebuild 285 BLAKE2B 016d3eeb81ae1ad9dfb7ee4713770bf42d3053d08fa839b55c5e5a05fd2310d0b6ef0d1160bddb2b3cde3a1f2f935899ecf29959677e488bc8e2ef59a5187d0c SHA512 b1c878ed0f8c5097288da14c22627db2312094c3ac0fee32dbcf935534b5df3848739feadcf1ad1c0541dbe1553c9ee4d00fe7c8547d78ce682e5727a78efa13
 EBUILD selinux-mplayer-2.20190609-r1.ebuild 285 BLAKE2B 016d3eeb81ae1ad9dfb7ee4713770bf42d3053d08fa839b55c5e5a05fd2310d0b6ef0d1160bddb2b3cde3a1f2f935899ecf29959677e488bc8e2ef59a5187d0c SHA512 b1c878ed0f8c5097288da14c22627db2312094c3ac0fee32dbcf935534b5df3848739feadcf1ad1c0541dbe1553c9ee4d00fe7c8547d78ce682e5727a78efa13
 EBUILD selinux-mplayer-2.20200818-r1.ebuild 287 BLAKE2B cc2701c29b5ec8cd7f277b93ef5de4a69576c07b88ef6c1e8b0b03c157ff82a6d9beb246c899961da093125563bc9e8e7e38a7f6b986f8b0df4deb93198c20f6 SHA512 cf80287ce9ad31db8388822f5703755d08a8b560b932ba1546f309986c15a6d1f03db5d7ae8c61951d8412b74f7b599f1b3c308ecca53de1cd11913626f54318
-EBUILD selinux-mplayer-2.20200818-r2.ebuild 287 BLAKE2B 2687b096aa2e31b57818cb45a5726a3756baf75141c646b7f9fc1efcce5a25ac3917d275ddecbe848e4cfd64f33c24837b338dac6ed4039737da7a91ec519d9e SHA512 3e6c26488b58eab38ed4a38117883c13daa70a9814fd2b716a4b02fbb15185967e51cbc7fa2650dd700c2f6c498834aa5006d962c95d3c1c5de11ed92e31c5d7
+EBUILD selinux-mplayer-2.20200818-r2.ebuild 285 BLAKE2B ac34500dd6095abfc0f997aa790bc872511cebe4deb12e2d1e508bd2ac3d05dc1a0db3e045b29d383cc9c7793296f7d2fe23619838fc2876c046a85c4d8cbfc1 SHA512 4d5bf3ba7ba3d06969044217de9f75f2a10d809a779fbd8415dfa7fd6127dae3f6a6e02eb7218ac320b94909f17fd45316aaf8b12ce1c606ec6605c6d0b52adc
 EBUILD selinux-mplayer-9999.ebuild 287 BLAKE2B 2687b096aa2e31b57818cb45a5726a3756baf75141c646b7f9fc1efcce5a25ac3917d275ddecbe848e4cfd64f33c24837b338dac6ed4039737da7a91ec519d9e SHA512 3e6c26488b58eab38ed4a38117883c13daa70a9814fd2b716a4b02fbb15185967e51cbc7fa2650dd700c2f6c498834aa5006d962c95d3c1c5de11ed92e31c5d7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20200818-r2.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20200818-r2.ebuild
index 06d9418da8ef..1488e1b785dc 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mplayer"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mrtg/Manifest b/sec-policy/selinux-mrtg/Manifest
index bc3c415c657a..0c8c9327cbb7 100644
--- a/sec-policy/selinux-mrtg/Manifest
+++ b/sec-policy/selinux-mrtg/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-mrtg-2.20190201-r1.ebuild 275 BLAKE2B 82ec1eb20dd22049692b41b06d58f7d5e4c8e1a5f3a723e78ed4ba567f35b17738f87aade014ee73ad0d1c3dc58389ed54df66de64a1317de28b0fad08722591 SHA512 ebbd7531ae2a4ec415a30321d6b8536de9830d2515266e18fbb87944a0d16e34a942d9b4a12043a51ce5050ebea6408086b689725ff279209519ea0c6d8eff6c
 EBUILD selinux-mrtg-2.20190609-r1.ebuild 275 BLAKE2B 82ec1eb20dd22049692b41b06d58f7d5e4c8e1a5f3a723e78ed4ba567f35b17738f87aade014ee73ad0d1c3dc58389ed54df66de64a1317de28b0fad08722591 SHA512 ebbd7531ae2a4ec415a30321d6b8536de9830d2515266e18fbb87944a0d16e34a942d9b4a12043a51ce5050ebea6408086b689725ff279209519ea0c6d8eff6c
 EBUILD selinux-mrtg-2.20200818-r1.ebuild 277 BLAKE2B 140b1974e28d9c1ed03eff49c8ed7ce42d4034f1606b08ce18faa46071f04c0e167ff9faa62abbfe88a332f8589ad93644e71a7b7547ae5525de280cee2294fc SHA512 299eaeb05d048207e4c00097e068d448368c42df4324fa7918a08f3182ece9cbd48b7ff1d72132e08faa861f2a6d6e8296a3ea026897d7490c9dea4c989f5ad5
-EBUILD selinux-mrtg-2.20200818-r2.ebuild 277 BLAKE2B 2d26420a0309dd7b2fe0421a698c9de50c7bfa0e9815f16b050283d25ccb7b81032c23d0067b2bbd1e0276f2108966b932193e04a6712f1d0d6bcfa44775c776 SHA512 703e0fc969cbf81320e124239f63624656baf005a7ee9855990084ef10ae1102fc78a1087b899eb2aaaa771270808042b7748ca5165452b534720fb97e46cfa1
+EBUILD selinux-mrtg-2.20200818-r2.ebuild 275 BLAKE2B 2e9b2157e406e3d67f9487ffb7d4550a033800a835c24dd938c04f3efd451ff43e1afeed6679975fb9163e53a7eecec94dc619cca194d3a503f5a6af31c206a6 SHA512 e58f8cca2b422e0c5ee8efc04cd518e541266ef9ed637b77e98a6ead3721778475441ce94087f3b8f31e99ccb5535f568693ad969a51d2753946f22a6e300e39
 EBUILD selinux-mrtg-9999.ebuild 277 BLAKE2B 2d26420a0309dd7b2fe0421a698c9de50c7bfa0e9815f16b050283d25ccb7b81032c23d0067b2bbd1e0276f2108966b932193e04a6712f1d0d6bcfa44775c776 SHA512 703e0fc969cbf81320e124239f63624656baf005a7ee9855990084ef10ae1102fc78a1087b899eb2aaaa771270808042b7748ca5165452b534720fb97e46cfa1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20200818-r2.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20200818-r2.ebuild
index 03cc2573ee36..e25d85f26beb 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mrtg"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-munin/Manifest b/sec-policy/selinux-munin/Manifest
index 41bb9b28d316..61dcdcdbd379 100644
--- a/sec-policy/selinux-munin/Manifest
+++ b/sec-policy/selinux-munin/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-munin-2.20190201-r1.ebuild 373 BLAKE2B 18894fa79e099fbab5f7a992a27cad6fa0c426fc21cc5a0c32c00c2bdc1ed5ed052ab3c33b11f854ea5884c90c4654e1e1dde37fa741783db387cadf41061f85 SHA512 4e6e5221456bad0cc842f21e404d4ab569b3a5d4574fff1e3d230eea556e6655d54b5520446695fbe71f508ab35f805bb183ffe96757cd0c199aa549cad5ea1f
 EBUILD selinux-munin-2.20190609-r1.ebuild 373 BLAKE2B 18894fa79e099fbab5f7a992a27cad6fa0c426fc21cc5a0c32c00c2bdc1ed5ed052ab3c33b11f854ea5884c90c4654e1e1dde37fa741783db387cadf41061f85 SHA512 4e6e5221456bad0cc842f21e404d4ab569b3a5d4574fff1e3d230eea556e6655d54b5520446695fbe71f508ab35f805bb183ffe96757cd0c199aa549cad5ea1f
 EBUILD selinux-munin-2.20200818-r1.ebuild 375 BLAKE2B 0d06726d0b39ad69f7b8145b5215dd790cdb3becfc810a5f5bf62a368e06db2c4e14642d87e650f6ed1b1ac1b853bf843572068838d94caa4fd965b986246c08 SHA512 a2009d2ac4162ee773ab08a577908952542b83714f744229c3edc747b82999d6fb33ed2ceb22c6ff1f64c5904d3931581fd05d2262b7570e5b713e14607d1b17
-EBUILD selinux-munin-2.20200818-r2.ebuild 375 BLAKE2B 8c4096ed2a7f4229c550f92735309080ce2de36c2da877139a07d3468206d9ac8f61e2387b92cc4e760b90e2a6b1b247cce52b979091de2c87af3348e60617af SHA512 4cce2cdda96652a459c0dbb754980cdeae6c38164ced268d57e3af2217fef69b1686940e2389e544519ef6ff230463c5b598611f343dd4dfe750417e23f4c512
+EBUILD selinux-munin-2.20200818-r2.ebuild 373 BLAKE2B 38ced17ffc9fa9f4d57f88c0fcab4c06aadf131ae173fa61fd3899584378d9dc71d861047db2e288849d77ac009c12a53f0a80b3d458ec4bd4b0f16718c8331e SHA512 86c4e8537d7d46b900dcd2ed46c3068071b40a3cd3957f743198a9d3902765f4df693af27dd4d7381c482193bb613cf0bd69e4011864dcf663f0979a7db84419
 EBUILD selinux-munin-9999.ebuild 375 BLAKE2B 8c4096ed2a7f4229c550f92735309080ce2de36c2da877139a07d3468206d9ac8f61e2387b92cc4e760b90e2a6b1b247cce52b979091de2c87af3348e60617af SHA512 4cce2cdda96652a459c0dbb754980cdeae6c38164ced268d57e3af2217fef69b1686940e2389e544519ef6ff230463c5b598611f343dd4dfe750417e23f4c512
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20200818-r2.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20200818-r2.ebuild
index 55798620ad2d..41fe78d9bee3 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for munin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-mutt/Manifest b/sec-policy/selinux-mutt/Manifest
index 61c350d9dd59..2e7706bfacb5 100644
--- a/sec-policy/selinux-mutt/Manifest
+++ b/sec-policy/selinux-mutt/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-mutt-2.20190201-r1.ebuild 275 BLAKE2B 4678e6495d0ad049d93bbdad6d1c8d31b981de0e7e47c392cc146c1254a3508b5880437699adda0952bc77ec4b3475158eba8f4a524179145d752a0e0f45e32a SHA512 8bf00cdce8a56da8d24a7fbda4368377e600e24689e1531777e4128f109b9057a392f978ddd435c9e9150816ac2b0007112b7ff422364e7a00db195314b61f22
 EBUILD selinux-mutt-2.20190609-r1.ebuild 275 BLAKE2B 4678e6495d0ad049d93bbdad6d1c8d31b981de0e7e47c392cc146c1254a3508b5880437699adda0952bc77ec4b3475158eba8f4a524179145d752a0e0f45e32a SHA512 8bf00cdce8a56da8d24a7fbda4368377e600e24689e1531777e4128f109b9057a392f978ddd435c9e9150816ac2b0007112b7ff422364e7a00db195314b61f22
 EBUILD selinux-mutt-2.20200818-r1.ebuild 277 BLAKE2B 284100e50cd9683a949d64c4c7805d7b04ffc9e33aad75265109bc769e6a3b2397333e00ca19a3d94a50a6c398105bbb21fca783a770351c56b378a4f3e4ce84 SHA512 0f0878bf8c9410baf499a6f3e73a6d5328d7bbbc3d6eba790de0c3a5104d51a6f25fbbb2a447024c22c1b37f78774d9d0f8b387677845ab629d218d9fdaa954b
-EBUILD selinux-mutt-2.20200818-r2.ebuild 277 BLAKE2B 3c86029dfd16a6224303790efbd5d5ad0c033c16d4045e78028a2f45c9feea6dbcf8cd4ef3f8d36290715d9273ca4e19b4a68c8fee6ad9bb186c8cd145aa3728 SHA512 f748fc531172a151b25e5941257e60700a42ca222af5f560f35a0576db377d1ec558aaefa3faaf075d511fc8beb1b4f4c46953128a0a04844ad37eed79315324
+EBUILD selinux-mutt-2.20200818-r2.ebuild 275 BLAKE2B dae463841b29854789864ccabb3bc4df8afd54f85b628df24ed17fbdfb8a9c962a0706ccc2d12405ad44e8ba7e91defe2d7effaf44219fcc1b59ede7bbf3500a SHA512 e49c15d012ca841dabfab07958bec00f9a58a1b6611435e433ddbb3eb3938596f7f0d19b5da065eb4ca25f74d8332fcb736e3715f92207ce60c81470764fe6a3
 EBUILD selinux-mutt-9999.ebuild 277 BLAKE2B 3c86029dfd16a6224303790efbd5d5ad0c033c16d4045e78028a2f45c9feea6dbcf8cd4ef3f8d36290715d9273ca4e19b4a68c8fee6ad9bb186c8cd145aa3728 SHA512 f748fc531172a151b25e5941257e60700a42ca222af5f560f35a0576db377d1ec558aaefa3faaf075d511fc8beb1b4f4c46953128a0a04844ad37eed79315324
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20200818-r2.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20200818-r2.ebuild
index 6e98427d6b58..a88e76d28b71 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mutt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest
index d104dd3c2a3e..c2307bcebc7b 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-mysql-2.20190201-r1.ebuild 277 BLAKE2B 729c94a3d79deda2cf1adbb328d93389aa795ecde0a47e466cf485dfb417dcef351341c558353b3b2be27d036add93bf71038d068b779b41e30a7692a4d6e1e7 SHA512 c28302ef492b0b1dd67a7394cc1d831e2ae52df4a71597fb2018c1f64e1ce007677bf44fb1fbd8a05abe7b5378303a3d8aadf4901e928fc2001dd84997f29189
 EBUILD selinux-mysql-2.20190609-r1.ebuild 277 BLAKE2B 729c94a3d79deda2cf1adbb328d93389aa795ecde0a47e466cf485dfb417dcef351341c558353b3b2be27d036add93bf71038d068b779b41e30a7692a4d6e1e7 SHA512 c28302ef492b0b1dd67a7394cc1d831e2ae52df4a71597fb2018c1f64e1ce007677bf44fb1fbd8a05abe7b5378303a3d8aadf4901e928fc2001dd84997f29189
 EBUILD selinux-mysql-2.20200818-r1.ebuild 279 BLAKE2B a9de57df3aea1aac1c61ffb2896658d1d8abf08883b56a6f05d8d137b3431b844c8975a3f36f916208831d18afb5d529a411d4ae8569788ac1b5a244d17ca8df SHA512 b338b3995c6c7ccb7e51b170fcff803899e758f66648e8c9fd05e9462bb3d9777fc7619eac56c69aed594ddf0aabd14f5154c9c2c74313be0643de8ad89a9539
-EBUILD selinux-mysql-2.20200818-r2.ebuild 279 BLAKE2B a2cceb18fccf31a9eb2c989212c807d7e49aacd8d20efc74b0683cffb68a7d8607957623ec1913ed3efddab687968b8683a75e831c4286fc81cf82f96c7c61b6 SHA512 7af4e7e7fd2cd9af69d8958007c21ba31f2d6703e3e607f53c9d86a4666f32289a6502ce0d51da9f00efd9ff04c5d93b5f008d8ea9a1887c543038e7a49b8a6f
+EBUILD selinux-mysql-2.20200818-r2.ebuild 277 BLAKE2B f5b14abd620ecef190c4e625cafaa9c779e0ada147061d6048307b219e0337153b41eaba627ee3ad3e1c52563d499bb299a1ee51c9540a08a4fdb0023630affc SHA512 c5d5049ece89445943fca18e8f196b87a90a45dafce665fb30c5068bb3e71edb12cab91f881800e852089ce0cefb72e627ad173375ae39d31bc09610a703a10c
 EBUILD selinux-mysql-9999.ebuild 279 BLAKE2B a2cceb18fccf31a9eb2c989212c807d7e49aacd8d20efc74b0683cffb68a7d8607957623ec1913ed3efddab687968b8683a75e831c4286fc81cf82f96c7c61b6 SHA512 7af4e7e7fd2cd9af69d8958007c21ba31f2d6703e3e607f53c9d86a4666f32289a6502ce0d51da9f00efd9ff04c5d93b5f008d8ea9a1887c543038e7a49b8a6f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20200818-r2.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20200818-r2.ebuild
index bd8b04d96de2..378e17bf130b 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for mysql"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-nagios/Manifest b/sec-policy/selinux-nagios/Manifest
index 999987de65c5..1c7afece3e1d 100644
--- a/sec-policy/selinux-nagios/Manifest
+++ b/sec-policy/selinux-nagios/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-nagios-2.20190201-r1.ebuild 375 BLAKE2B e260921af3335c61ac0a3bcf637a2d8adba7f1be487fbf4e0fec5450db4d08c56658c94a79430d533a5a7cc52c0ef58702e0fb6a78327ebdd2c6cf6916b19eb1 SHA512 fd1994ff7418b42223556f506660982d081bef928d1e34d3271af67b310d14383588f4afcb1d157b4417d96333c2c6ced88c0127f6405039677dc2733c699ecf
 EBUILD selinux-nagios-2.20190609-r1.ebuild 375 BLAKE2B e260921af3335c61ac0a3bcf637a2d8adba7f1be487fbf4e0fec5450db4d08c56658c94a79430d533a5a7cc52c0ef58702e0fb6a78327ebdd2c6cf6916b19eb1 SHA512 fd1994ff7418b42223556f506660982d081bef928d1e34d3271af67b310d14383588f4afcb1d157b4417d96333c2c6ced88c0127f6405039677dc2733c699ecf
 EBUILD selinux-nagios-2.20200818-r1.ebuild 377 BLAKE2B 9e29c8c1c46c276489afb89243d3faa105513fcca272eae5c8d043fb0a8f73da082a3a2eca957788e95673bcaf65ea7751be0d0b506d85c9cb71647e9bfc3e15 SHA512 1175271c167a97675506393413597c0044dc8980d926fd03f9edf9a666e0da984597714efb422552b4ce681bcd1fb11d4e863f4252f8ff634353aa65f27a8036
-EBUILD selinux-nagios-2.20200818-r2.ebuild 377 BLAKE2B 427888e6204852597792c8b25c363ccb94c2a843b939d7517e774eef9914d0f14e9aa08f8b795126bba38d64b783e54ac032be2afe0659409b56611620a311e7 SHA512 c35d6c3b591dcc9a1e41ae82858149c99916638a689bdd253ac1d7f4b87ee84065d79381447e2a00d8986c09dfcb919f22dd5d613b9bba4c924eebb489158edd
+EBUILD selinux-nagios-2.20200818-r2.ebuild 375 BLAKE2B 048800cb45cd6ba6aad04346bbaca7dbb2b3f209c2f7ea2c5cf401513d1fb66aae0ea7be9661c5b097ffc29e2547bfeefa6d35cb143eff7957a163a9c42cb1f0 SHA512 1cc805eb8dee6074ed2007c8acbb784af9fa0187556613bd6a2a9e4a57489f8b71a46c38f21ba6cf0d53a790b9fa0b116021ca65329c0623c9d6d0cc93fd5b33
 EBUILD selinux-nagios-9999.ebuild 377 BLAKE2B 427888e6204852597792c8b25c363ccb94c2a843b939d7517e774eef9914d0f14e9aa08f8b795126bba38d64b783e54ac032be2afe0659409b56611620a311e7 SHA512 c35d6c3b591dcc9a1e41ae82858149c99916638a689bdd253ac1d7f4b87ee84065d79381447e2a00d8986c09dfcb919f22dd5d613b9bba4c924eebb489158edd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20200818-r2.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20200818-r2.ebuild
index 1af84735585c..cfbb58e43985 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nagios"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-ncftool/Manifest b/sec-policy/selinux-ncftool/Manifest
index afe588bb980f..6aff53d94d6e 100644
--- a/sec-policy/selinux-ncftool/Manifest
+++ b/sec-policy/selinux-ncftool/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-ncftool-2.20190201-r1.ebuild 281 BLAKE2B e54aea88b7d35a737ecc7b4489abee893d90cbe694f984ff58c0f8831fee4478dcacbca79c58435db2f7917dedf8b2d25768f2adc23f6d687c4763160c78d743 SHA512 8b89f2898d680a59aaf806d95878d042b693f8548d6663e2629a65f43c8d3b95045bb968a305ceb7a8ed11089b78eff81a5e43ebb58826a8d84bdf9d0a3d54b0
 EBUILD selinux-ncftool-2.20190609-r1.ebuild 281 BLAKE2B e54aea88b7d35a737ecc7b4489abee893d90cbe694f984ff58c0f8831fee4478dcacbca79c58435db2f7917dedf8b2d25768f2adc23f6d687c4763160c78d743 SHA512 8b89f2898d680a59aaf806d95878d042b693f8548d6663e2629a65f43c8d3b95045bb968a305ceb7a8ed11089b78eff81a5e43ebb58826a8d84bdf9d0a3d54b0
 EBUILD selinux-ncftool-2.20200818-r1.ebuild 283 BLAKE2B ab59d548155b8edc8fd5983f3e0feed770d36bf41faeb96674e611e4f4b434610d7bdc4b8ba983ba2791a340b3c150ce1a99145b7b6e045e5f82547b5f091b5f SHA512 8e865421c7d7549aa3f27e948d355fcfbf6f1c1a78a07086b81475c727978644a59698c723c0938fcd0a1bf461b1802dd9a5126870b740cc7bbdc032e65dd9a4
-EBUILD selinux-ncftool-2.20200818-r2.ebuild 283 BLAKE2B fc46fde2ed4785e066fa5c1f5ce0812be0873879aca4c5b879664fd038a3508e65106ce533a99a7fb6cd52e33c5a0297dbe8ac964491086dcd2b5db882aa8028 SHA512 17f720051621a87f11d0287d87538ad967fe95dabc18720e213f163dbaccabf391827a2715650ac50fe1cde282734508b3204a1c0717fba1832a08ce0bdcce20
+EBUILD selinux-ncftool-2.20200818-r2.ebuild 281 BLAKE2B 93b5857002bf3c6af45e9d478da9fd5aaeb71192fc21c04c5335b877902407e4c5ee534cebf09f5247cd0f2381feb1ccb7bccc3c142f7dd1847a156cd7479381 SHA512 a351fabf73e24e192b48349e577b4936f6f6386940c3d082a7d3b46340612a3e49f944ca7fcbb762ba231386b22ff8c10d3cf108e8d5b4f59c5189b0f03c798a
 EBUILD selinux-ncftool-9999.ebuild 283 BLAKE2B fc46fde2ed4785e066fa5c1f5ce0812be0873879aca4c5b879664fd038a3508e65106ce533a99a7fb6cd52e33c5a0297dbe8ac964491086dcd2b5db882aa8028 SHA512 17f720051621a87f11d0287d87538ad967fe95dabc18720e213f163dbaccabf391827a2715650ac50fe1cde282734508b3204a1c0717fba1832a08ce0bdcce20
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20200818-r2.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20200818-r2.ebuild
index 2f1527e1d3b7..6a762a02c5be 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ncftool"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/Manifest b/sec-policy/selinux-networkmanager/Manifest
index 53a710fcfecc..9c0888cfef2c 100644
--- a/sec-policy/selinux-networkmanager/Manifest
+++ b/sec-policy/selinux-networkmanager/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-networkmanager-2.20190201-r1.ebuild 295 BLAKE2B 16c2b045b18b128e4c9127045c1337ed5fd3d29f6e043d667d80cd052a4dfdd0003b23c6753f0090c607c4ce00c087d5003c265531f840f342f2cba65a3403ef SHA512 8effa9351798d54e559d3d61d22bd96aebe81062cc26c70ef23f8031551fb3b8491c99ffa862baf987c781c067de6059e2995f46a2c211153de81a1e313c94f9
 EBUILD selinux-networkmanager-2.20190609-r1.ebuild 295 BLAKE2B 16c2b045b18b128e4c9127045c1337ed5fd3d29f6e043d667d80cd052a4dfdd0003b23c6753f0090c607c4ce00c087d5003c265531f840f342f2cba65a3403ef SHA512 8effa9351798d54e559d3d61d22bd96aebe81062cc26c70ef23f8031551fb3b8491c99ffa862baf987c781c067de6059e2995f46a2c211153de81a1e313c94f9
 EBUILD selinux-networkmanager-2.20200818-r1.ebuild 297 BLAKE2B fa6626a2f87226191eee39c08fd91c587ed385da893cdc6b9f15c8da6e0b5de3ab0d3a926a88b0a29c7543a7e925e1f8cce17fbb1912faeb66b8c506fe42f2fa SHA512 a98fc972b04c90734c62763998b4c9891f6db290834ec6e588ee5a3381ccd3aeb400d8b170b5dc7a97c796417b1e1889538f040d61b6291f8f96d47568d8edc6
-EBUILD selinux-networkmanager-2.20200818-r2.ebuild 297 BLAKE2B 535d96b2615cfa772333ad9274fb296841cff3828f9914705106d328c23ff25ebe24c1df8b031a6da11ca5dec5d0f387eca9871b8e50e45fbfd9120a67803aaf SHA512 1327248650b1c218dead01f9387fcd460321e9312d3c6813ad0766fab0f14e0ea40d0f34ecc92e8472b18109b04a6fef9ad5268bffa5ec4fdb7c017c686cbfde
+EBUILD selinux-networkmanager-2.20200818-r2.ebuild 295 BLAKE2B b9de6932eea9d0ad9b9f3dddadce22c81ea9d0557421b0b5930d389616d4073bd30b797c7d3f6771b58113b8feff9de579d52162e6a283f1fad601eabb1b0829 SHA512 20a62a9b786685cdcc3192f6a35782a5778998b034e71a1591462154da778fcd65e89b35e3273299dfc9a5b3365bc8c309a56ad65fa56c7f9f92e3b4bc5b74f4
 EBUILD selinux-networkmanager-9999.ebuild 297 BLAKE2B 535d96b2615cfa772333ad9274fb296841cff3828f9914705106d328c23ff25ebe24c1df8b031a6da11ca5dec5d0f387eca9871b8e50e45fbfd9120a67803aaf SHA512 1327248650b1c218dead01f9387fcd460321e9312d3c6813ad0766fab0f14e0ea40d0f34ecc92e8472b18109b04a6fef9ad5268bffa5ec4fdb7c017c686cbfde
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20200818-r2.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20200818-r2.ebuild
index b35bb4d9f957..c8be28b64049 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for networkmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-nginx/Manifest b/sec-policy/selinux-nginx/Manifest
index 5ea007dab572..d97052d27f60 100644
--- a/sec-policy/selinux-nginx/Manifest
+++ b/sec-policy/selinux-nginx/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-nginx-2.20190201-r1.ebuild 372 BLAKE2B 80e25ee56b95a2d97f89ead571a83287e7597bded5e1b67ae89083e4355fbbde085150f1ea77e158ef67b7511804205412db4ace86d9580aa6e522bf90a617b8 SHA512 69dcf6b1807c39173c14c232222f03b6b83de03566a652cfb80faa29c44ddffa1e2db8df5fcefba97670a635f93ebab1226bfd863fa87379c5a9a89f62f97636
 EBUILD selinux-nginx-2.20190609-r1.ebuild 372 BLAKE2B 80e25ee56b95a2d97f89ead571a83287e7597bded5e1b67ae89083e4355fbbde085150f1ea77e158ef67b7511804205412db4ace86d9580aa6e522bf90a617b8 SHA512 69dcf6b1807c39173c14c232222f03b6b83de03566a652cfb80faa29c44ddffa1e2db8df5fcefba97670a635f93ebab1226bfd863fa87379c5a9a89f62f97636
 EBUILD selinux-nginx-2.20200818-r1.ebuild 374 BLAKE2B ccffae3a3257fbabc8eecc582a0552d7cb872fd68f15a9937e3d6fba0b25c80db70f2ed9002cb6fc2dfba16199385fe62011e9f049818d3f105745e6f94d6126 SHA512 fab838e453a653bcaf5f82cc91c452830c9c817dc44ac8f5f6efbc3d9fdce729a0e315f7a653b10507d9a3eeb51b262446bf584f4217933d3683059a66e48235
-EBUILD selinux-nginx-2.20200818-r2.ebuild 374 BLAKE2B 2d38b30a7fa0bb51dee3b2b2b06ff5793c4f9b52a25d1812d5b4e4db1b4357a49959e5545c40af94aa3417859295a856c7fee9da0d222779a412656557416239 SHA512 b39a51154e5a9b49124bb4f783e21216911b9795cbf41db00b1f596ea3a7acb5d0c6dd7e7249b9f8e5dbf6721485e3a3a90d8ef44e7cdc1d799e67ede32645c0
+EBUILD selinux-nginx-2.20200818-r2.ebuild 372 BLAKE2B 385fb0576401ddc4575a57b6117612011639dcb797fb1789b30725d90f049822859def5f64dcf888d3ad3621c97a4cf9680833c4bfd4f8e4570684b3e2b3f413 SHA512 5cd1c5eb9f9714bbce58a312b6c3c51bb17f992099e473b6274afe13eb97da8dcd3df3a40540cd4fea7734c1962e1c7a92bea353c525ad381567bb4c46883136
 EBUILD selinux-nginx-9999.ebuild 374 BLAKE2B 2d38b30a7fa0bb51dee3b2b2b06ff5793c4f9b52a25d1812d5b4e4db1b4357a49959e5545c40af94aa3417859295a856c7fee9da0d222779a412656557416239 SHA512 b39a51154e5a9b49124bb4f783e21216911b9795cbf41db00b1f596ea3a7acb5d0c6dd7e7249b9f8e5dbf6721485e3a3a90d8ef44e7cdc1d799e67ede32645c0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20200818-r2.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20200818-r2.ebuild
index e3bd2a5d5cd7..f8dd77089f65 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nginx"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nslcd/Manifest b/sec-policy/selinux-nslcd/Manifest
index 3e3d9878b035..df40f88c70be 100644
--- a/sec-policy/selinux-nslcd/Manifest
+++ b/sec-policy/selinux-nslcd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-nslcd-2.20190201-r1.ebuild 277 BLAKE2B b3f7412f595ddd4ae23c9e99fe30bdae2d2108337343f23ecb3faeffe40e1d2068207de23224facb5c4538b59a35d127ed1bfd69aa71d2a73192103f0f34487a SHA512 64b37d57301730da0c7fa926406dcf23c93c409e63bce76abd0f64ab251b6feaf0c134fb08e72f3e26910e755f1eded0854233bf7013adb98f745f217e974d14
 EBUILD selinux-nslcd-2.20190609-r1.ebuild 277 BLAKE2B b3f7412f595ddd4ae23c9e99fe30bdae2d2108337343f23ecb3faeffe40e1d2068207de23224facb5c4538b59a35d127ed1bfd69aa71d2a73192103f0f34487a SHA512 64b37d57301730da0c7fa926406dcf23c93c409e63bce76abd0f64ab251b6feaf0c134fb08e72f3e26910e755f1eded0854233bf7013adb98f745f217e974d14
 EBUILD selinux-nslcd-2.20200818-r1.ebuild 279 BLAKE2B a54484c40bd208ebb33e2b4072e7f3f706818c2ff1004d346c046ab9fbe2adf93f16c3ec1ba24bb45ec2553333612189c59a15f66a33964ad2a0ea9763804eb8 SHA512 53539a1d6cf28e33489bdbe578a2ac9e8be9a16759e9ea1ceefca43b1fb25fbe735dc105bda89d175bc3ec24e31180b85d4f33e1ac597c9ab655e3cc634f2bbe
-EBUILD selinux-nslcd-2.20200818-r2.ebuild 279 BLAKE2B 57a61614f8d475e78c555a6d52fcbbd664978c485b66afe898470a8918d0acd78c0b9807d057e43f5b1ac05d9b4061ffa827047d89156a224d7c15f59a02fff1 SHA512 62fa16e9a85e07da9e34497be61d12311dc15c69dd0b0b4fec4e84b2f8829b20339a5fc5cc74751a6431e2f206eccdca85124d78804c68d285284551958bfd46
+EBUILD selinux-nslcd-2.20200818-r2.ebuild 277 BLAKE2B 071996d0b175f008286d9e4056f5e1a16ec5508acfbba6dbbcab552a6bb1cdb7c0fb8e3736a341facf42b6ad28f765b8eb091191bf552376c2c88c108e765712 SHA512 4d23410b876cf5c40d36bde9a9c03092d57d2d72d8fa47a9f9f47bfa32140ac45387c861de2a2b544500a1c1e04de69ce0fb5b5622e95e0b6de15f1cd391bf6b
 EBUILD selinux-nslcd-9999.ebuild 279 BLAKE2B 57a61614f8d475e78c555a6d52fcbbd664978c485b66afe898470a8918d0acd78c0b9807d057e43f5b1ac05d9b4061ffa827047d89156a224d7c15f59a02fff1 SHA512 62fa16e9a85e07da9e34497be61d12311dc15c69dd0b0b4fec4e84b2f8829b20339a5fc5cc74751a6431e2f206eccdca85124d78804c68d285284551958bfd46
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20200818-r2.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20200818-r2.ebuild
index 931ee6be0ab3..48428ae04e49 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nslcd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ntop/Manifest b/sec-policy/selinux-ntop/Manifest
index 7dd9782ddc2c..167002f4fc26 100644
--- a/sec-policy/selinux-ntop/Manifest
+++ b/sec-policy/selinux-ntop/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-ntop-2.20190201-r1.ebuild 275 BLAKE2B e53e56ac1c2dbf65a490c075169f9ca33516d9938750a28d6e1c3557604c5b7fba84eec4f1925a5ed6876e18b5b39d51bdede8317eefd839afabfcc309b953ed SHA512 137db26521c5851ff374a1a7153cc726af5a52bca9c3457731cbf1c1a8e8c43ee47b4a5487e621d32b0f624603262ee46a077fb37985e2c7eebaad4979a40e46
 EBUILD selinux-ntop-2.20190609-r1.ebuild 275 BLAKE2B e53e56ac1c2dbf65a490c075169f9ca33516d9938750a28d6e1c3557604c5b7fba84eec4f1925a5ed6876e18b5b39d51bdede8317eefd839afabfcc309b953ed SHA512 137db26521c5851ff374a1a7153cc726af5a52bca9c3457731cbf1c1a8e8c43ee47b4a5487e621d32b0f624603262ee46a077fb37985e2c7eebaad4979a40e46
 EBUILD selinux-ntop-2.20200818-r1.ebuild 277 BLAKE2B 7def9e673ba0537f1c70542e91e2989e72bb7be7bb873d2709cd398996b0249854463114c8a7efbc9718166653f45d3f87e5e4baa48d19944b509d7a455e092e SHA512 2b2a61b9f8a645c51719bf406110395369a6bef19c6972d677e459ff1039a933c78a58660855bb5c25f4c93318698e440be98112b691db94acf6fca62e5c874e
-EBUILD selinux-ntop-2.20200818-r2.ebuild 277 BLAKE2B 0585e2e0dbf797a4defe8110a4665c70344b82eef0d4b32b7af2da6a40cf042a470f7716b0a19deafbfc991c4eb2af57b084864482f0a19fc8e94e055d5ce351 SHA512 bdd8244dfdc70de98cd57ade940ea7e54d1da6a40cf4e1ad127ef54308e50e45a5f141a1bb98f239f6097f821e7b12732b6ad07d9503222d8ee986d7779c141b
+EBUILD selinux-ntop-2.20200818-r2.ebuild 275 BLAKE2B f767bc539f5edc0113523f30576e61b450292226862ddde04267d0a9e27a322f0593f345909b3821702f25e35bf45403c417e4186d5ced461b40513958e7320a SHA512 1ae855d5233fb9d7ae430e1e9b0582ae992aea4f99082da90993eed7a9b6a0d91ce278375bd1f382428cb6e9ad136960c94227fb417071afd6d95ea3b5214797
 EBUILD selinux-ntop-9999.ebuild 277 BLAKE2B 0585e2e0dbf797a4defe8110a4665c70344b82eef0d4b32b7af2da6a40cf042a470f7716b0a19deafbfc991c4eb2af57b084864482f0a19fc8e94e055d5ce351 SHA512 bdd8244dfdc70de98cd57ade940ea7e54d1da6a40cf4e1ad127ef54308e50e45a5f141a1bb98f239f6097f821e7b12732b6ad07d9503222d8ee986d7779c141b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20200818-r2.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20200818-r2.ebuild
index 4ce91fc59bb4..2174953acb9d 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ntop"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ntp/Manifest b/sec-policy/selinux-ntp/Manifest
index 992418a65d2e..05f9358ce836 100644
--- a/sec-policy/selinux-ntp/Manifest
+++ b/sec-policy/selinux-ntp/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-ntp-2.20190201-r1.ebuild 273 BLAKE2B c12dea9012d50b1d4cc587c284d56e380844cf78dfeaba9d92883af1c15746efbaf800fff59e31a9b277c347be23d857f618c43892fff65af7e3c355c69e291c SHA512 fbc5a963048599a51d1b2c1fff79dd7009276bb8132faa98bf0a73c93403b948918f8ed346baf84a576ea2226df99d323fecb047b7a9138902db2c4cecafd38f
 EBUILD selinux-ntp-2.20190609-r1.ebuild 273 BLAKE2B c12dea9012d50b1d4cc587c284d56e380844cf78dfeaba9d92883af1c15746efbaf800fff59e31a9b277c347be23d857f618c43892fff65af7e3c355c69e291c SHA512 fbc5a963048599a51d1b2c1fff79dd7009276bb8132faa98bf0a73c93403b948918f8ed346baf84a576ea2226df99d323fecb047b7a9138902db2c4cecafd38f
 EBUILD selinux-ntp-2.20200818-r1.ebuild 275 BLAKE2B 0e23f8186205e8cc7aeddc07c39f9779d89bfcd5e011516cb802ea6da72321ed0f659f44e0f3325f67a99e54b7e8c306ec726161a2c678d5ccec2556a00a74c9 SHA512 5c4534d9fd91e339f39f66fd17cb6b1de69098d4198fc4568508ba533fc74a66c383b374394426ff05250a85d929cdfec53e4435e261366e83b9740c2f62d1bf
-EBUILD selinux-ntp-2.20200818-r2.ebuild 275 BLAKE2B e32ac54b961081b2dd3aa285abed7da706e0d40eb022dcf66c65afcc4a68de6e9ad8fa08cea91dc5287b58cd8966c1b4552b2fdf5c1bb89f597e80238c801062 SHA512 939509e9444d0ff0667b75940b9a0c319c2ac18e87a8de66f6eeaf3bffb6a2b6e838bac1f51b4155f37564ed5c9d906cf3d825499d55ed9d5b14b6e441c7d4d0
+EBUILD selinux-ntp-2.20200818-r2.ebuild 273 BLAKE2B fd69529c9b211ba49fb3df0f0d1302ecb267f887cfcb5502698e8705879b5c7d43c68d73715f5517fe9ea6ef3114c80d5098946dd26a74d69d97553c45ffabe5 SHA512 b1c7c92a56c0ec0d5d4b08846d280dbf7bba2adffe63e55b14c51d1a1fb6bdfaed567379bde939ed31c9d86d1c9b914af3aec68e7189299bcc2b11e94ece57d7
 EBUILD selinux-ntp-9999.ebuild 275 BLAKE2B e32ac54b961081b2dd3aa285abed7da706e0d40eb022dcf66c65afcc4a68de6e9ad8fa08cea91dc5287b58cd8966c1b4552b2fdf5c1bb89f597e80238c801062 SHA512 939509e9444d0ff0667b75940b9a0c319c2ac18e87a8de66f6eeaf3bffb6a2b6e838bac1f51b4155f37564ed5c9d906cf3d825499d55ed9d5b14b6e441c7d4d0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20200818-r2.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20200818-r2.ebuild
index 6402f325a8c8..7c9199bcf29a 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ntp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-nut/Manifest b/sec-policy/selinux-nut/Manifest
index 274e04337a52..4dd8bb4d9408 100644
--- a/sec-policy/selinux-nut/Manifest
+++ b/sec-policy/selinux-nut/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-nut-2.20190201-r1.ebuild 369 BLAKE2B 0550f096ac246525412f676b7ecffce720ccaa75434d71ec06aa14ada19816711c7f3aeb87fa7704701ea13bb66717078a82b5f31ab72f731d2406ff502e7778 SHA512 3402b4a8ed58b61fc25f91068b044736dbbe533addcd2f0e24cef2be3223644490c0bad1e589eed38813f74224b1ad5c742d0f04c79065b680113d2b6a16f411
 EBUILD selinux-nut-2.20190609-r1.ebuild 369 BLAKE2B 0550f096ac246525412f676b7ecffce720ccaa75434d71ec06aa14ada19816711c7f3aeb87fa7704701ea13bb66717078a82b5f31ab72f731d2406ff502e7778 SHA512 3402b4a8ed58b61fc25f91068b044736dbbe533addcd2f0e24cef2be3223644490c0bad1e589eed38813f74224b1ad5c742d0f04c79065b680113d2b6a16f411
 EBUILD selinux-nut-2.20200818-r1.ebuild 371 BLAKE2B b24f869f29bf9c56f12e55858ba6a9dde12ec5358d84d7e6177e426ae00499a53a3a54451f8a74c94fb704bd56ba1a276ccd4b2ef0d448b0e11736b4370ad715 SHA512 b6f15f7f037408ce4373a71011cf9434210ad0723071ac83a61c94934dd099bce30363402c8ed0f1153a873a46af13dbc4f29a4855f841cac0422da640c7253f
-EBUILD selinux-nut-2.20200818-r2.ebuild 371 BLAKE2B 399042f8ba5aefda743bf4a388fd7918a250f1811c0276f3558d41316c9c29371314cd0bfa347c4cd5ace027d0d31d4859ab7e3a1046d067949152a5e4d363cc SHA512 05ea4746218145c5119c6382247e17f6f7452701a393e5d1ab5b375afd35854a22267892ad77f4b140f39b47c94a1e2e12b2060a97705341dea67641bdc506fa
+EBUILD selinux-nut-2.20200818-r2.ebuild 369 BLAKE2B ce5335fbc51ee22980bf7bce39d22c7dcd16b174355171527177af19fa81ec55725940da631606ca8cd5a0317eb6044142358bd0237f9111fced2efaccd0cc28 SHA512 96f7049d4c21fe7e6df004f90e9c2aac045e110c9e659a5ebbb8b06eb498b695c1383ec8200b26ef3fd7219730a6b226619fd1fcfcb0cc304f62a3ad72df34ce
 EBUILD selinux-nut-9999.ebuild 371 BLAKE2B 399042f8ba5aefda743bf4a388fd7918a250f1811c0276f3558d41316c9c29371314cd0bfa347c4cd5ace027d0d31d4859ab7e3a1046d067949152a5e4d363cc SHA512 05ea4746218145c5119c6382247e17f6f7452701a393e5d1ab5b375afd35854a22267892ad77f4b140f39b47c94a1e2e12b2060a97705341dea67641bdc506fa
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20200818-r2.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20200818-r2.ebuild
index a761f0f14327..a9dcdae9d32c 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nut"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nx/Manifest b/sec-policy/selinux-nx/Manifest
index 31b81d7f0df0..9352bcc8f922 100644
--- a/sec-policy/selinux-nx/Manifest
+++ b/sec-policy/selinux-nx/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-nx-2.20190201-r1.ebuild 271 BLAKE2B 1b35de5c859ed15b79ace55734abf5eac91ec6baa5c5ec53308de93cb2b9ed38b5301b9269b5681f764dd9aa54c1e57bafec88264cd5b4c9c2dcb3d9a28a01a3 SHA512 5b6ec86e65c81992eb4c450149921c7c4137eff84f04e53f0ff8105f703bb997b40e4c77789ad9e8c7c6a38ee41f071dd4414e056e0d13b5c45d1cc116dbd445
 EBUILD selinux-nx-2.20190609-r1.ebuild 271 BLAKE2B 1b35de5c859ed15b79ace55734abf5eac91ec6baa5c5ec53308de93cb2b9ed38b5301b9269b5681f764dd9aa54c1e57bafec88264cd5b4c9c2dcb3d9a28a01a3 SHA512 5b6ec86e65c81992eb4c450149921c7c4137eff84f04e53f0ff8105f703bb997b40e4c77789ad9e8c7c6a38ee41f071dd4414e056e0d13b5c45d1cc116dbd445
 EBUILD selinux-nx-2.20200818-r1.ebuild 273 BLAKE2B 7df9a80399d68c9c014b744000f336c2bfffb5f3c18062e70d3f2c354d60b3ed8fe2fb327622b389b2d84984e3d72828331804ecf73e49205d56904d6ad6913e SHA512 ef8868769c63a1d1fddb15e57551ffbb32bdee7ff3a0b11b4fdb53e6ddde5c7e9140d17525407ffaf20921ac4db9a156c39b52a09ac794e8eabf71e0444384b3
-EBUILD selinux-nx-2.20200818-r2.ebuild 273 BLAKE2B 7bffd9f08ac6652f4c9ae8c31b3b30f8682399faa583f25c6a7f9bb1fc9f923fd1f003143f80a3db1012bd0fac56d6beeec180c8d4d23c61a87f8b78043f96da SHA512 b9313a511b2c5d7add0f8d5deb1f822e7072c667dc2d15a67a8582371a77175c82e7c470fec8ffe502bcd00e13c0731ef175f3f7013777cf85f6547c0d5f6a34
+EBUILD selinux-nx-2.20200818-r2.ebuild 271 BLAKE2B 51524f359839f29fbd2b86a61348d84e211c14ff1588d792cf2aae75178e753627b93486e4f1563d1cd1eb9d31e6cdf08f48b2e7f25dc5c10e3c0d7ad117bb80 SHA512 2c69d99f1695dee10cc8d81debc6de05a4076b547776edd1a33f79d2f0c297a1ce592cc96e549c9caf424b4e471f5e12375c6e43ebeb1bed46beeef56d9ac0e3
 EBUILD selinux-nx-9999.ebuild 273 BLAKE2B 7bffd9f08ac6652f4c9ae8c31b3b30f8682399faa583f25c6a7f9bb1fc9f923fd1f003143f80a3db1012bd0fac56d6beeec180c8d4d23c61a87f8b78043f96da SHA512 b9313a511b2c5d7add0f8d5deb1f822e7072c667dc2d15a67a8582371a77175c82e7c470fec8ffe502bcd00e13c0731ef175f3f7013777cf85f6547c0d5f6a34
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20200818-r2.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20200818-r2.ebuild
index cd119fe4fbc6..746d38abab98 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for nx"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-oddjob/Manifest b/sec-policy/selinux-oddjob/Manifest
index 2eb03ed4f481..a3d5364a8095 100644
--- a/sec-policy/selinux-oddjob/Manifest
+++ b/sec-policy/selinux-oddjob/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-oddjob-2.20190201-r1.ebuild 279 BLAKE2B 44fc11143f580f02f1c1abe7f7730a5a696c05a30f5f1b8618caa3e8c131b28bbf14ad78db373ddfec7cba7f862a8678ddd3a5896c86bd939758bef9bb4c6087 SHA512 fd8d57586f957e4b328230ef18e4af4e6e491e23c14dd28866afc5f27bf258f9b8c2f11ba0ab5977f9deac3212086bb2e915a9452679c612b2bfaf8c4b2c725d
 EBUILD selinux-oddjob-2.20190609-r1.ebuild 279 BLAKE2B 44fc11143f580f02f1c1abe7f7730a5a696c05a30f5f1b8618caa3e8c131b28bbf14ad78db373ddfec7cba7f862a8678ddd3a5896c86bd939758bef9bb4c6087 SHA512 fd8d57586f957e4b328230ef18e4af4e6e491e23c14dd28866afc5f27bf258f9b8c2f11ba0ab5977f9deac3212086bb2e915a9452679c612b2bfaf8c4b2c725d
 EBUILD selinux-oddjob-2.20200818-r1.ebuild 281 BLAKE2B f71e57ac79b2d5c967da8f8fb8db23f1cce3815132530ff69e75704451facfa7edce68196f102d7de8b1988e585a450c155830fa95485fccd799638f6deb616a SHA512 f0e328f4338b9481c2d984c0a5f5e51872acd22edbad19c84e5b980705f2fdb90a71b6ca8e4bcf21ee4f94cf2a03617ad7d66a12457c47fc817f917fa12c0079
-EBUILD selinux-oddjob-2.20200818-r2.ebuild 281 BLAKE2B b1c3d5bbe81c220dc9d9bf9e36cf705afe875f5129734115a54407a5ad102476d519e745c0decdeb0d74f9041612e125f648061c06e7a81c98d5adc91ff88d3e SHA512 710ad4b27bd97d4248de419c9c77e7a64d4b757d73f8f54fca00d2e91aab7fe4ad8e67604973ee3acb179f9418c188345cf4d80c5fcf1ec12b7119407acb6017
+EBUILD selinux-oddjob-2.20200818-r2.ebuild 279 BLAKE2B ba04ad70840cd3ce9bddbfb3ce7ae6ee38eec84d5e73d3db5b99ec8af5a322657e61b5a1a33b6797fd6866a1b6ba4f1d933f0c303de6d43f2c244139e0ecc9cc SHA512 f29f7db5d4fe3b0afd3c36f0f60535fa77a38a37d5275de86af252112d4fb9cec027ebe7700bca6fd4733d453db5725adab58490b4086a94a9cb51dbb3043e75
 EBUILD selinux-oddjob-9999.ebuild 281 BLAKE2B b1c3d5bbe81c220dc9d9bf9e36cf705afe875f5129734115a54407a5ad102476d519e745c0decdeb0d74f9041612e125f648061c06e7a81c98d5adc91ff88d3e SHA512 710ad4b27bd97d4248de419c9c77e7a64d4b757d73f8f54fca00d2e91aab7fe4ad8e67604973ee3acb179f9418c188345cf4d80c5fcf1ec12b7119407acb6017
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20200818-r2.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20200818-r2.ebuild
index 31448909dfe4..27d04a503f85 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for oddjob"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-oident/Manifest b/sec-policy/selinux-oident/Manifest
index 81032abb2b25..0b1fc87aeb33 100644
--- a/sec-policy/selinux-oident/Manifest
+++ b/sec-policy/selinux-oident/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-oident-2.20190201-r1.ebuild 279 BLAKE2B 759f3ad4d9b574d8b64804bbacfe5ed30a63fdce5b20a6ce99a1f0dd85d2bc797e817f351fcebcdabeb81814b1444d5d8f088dd32c8ee6b2cf98875da84d2a5c SHA512 10d21b8bdfedb7fbf38edd74e11e4b6fa6e7a7a6cf4355587a643a902f6d7636d319262f25b4cfded41a4771f5059e82858889a43eabb4c1097a5f30e457fe6e
 EBUILD selinux-oident-2.20190609-r1.ebuild 279 BLAKE2B 759f3ad4d9b574d8b64804bbacfe5ed30a63fdce5b20a6ce99a1f0dd85d2bc797e817f351fcebcdabeb81814b1444d5d8f088dd32c8ee6b2cf98875da84d2a5c SHA512 10d21b8bdfedb7fbf38edd74e11e4b6fa6e7a7a6cf4355587a643a902f6d7636d319262f25b4cfded41a4771f5059e82858889a43eabb4c1097a5f30e457fe6e
 EBUILD selinux-oident-2.20200818-r1.ebuild 281 BLAKE2B 727502457342c051bc476f233fcaec61ecb3a5310d267e0f1ada56a8c06fdb96723458211afe68939a244a55aa90ee52c0c4a8440f5d0c28c90da3bf24aa2845 SHA512 594b8dbb17725dec1b5111729687823f7c3995534a3a34356b7aa4dc46d976797289afaa1b98faf693fa8a37be576d846078b550101477ed627ef61fbcdfc9c8
-EBUILD selinux-oident-2.20200818-r2.ebuild 281 BLAKE2B 3f38477320f0b1bb82ec0b49a1214f078689be316a387cf6dd51d5f7c72558f089ed88fc29d79fe6a177d0646a971ca1c3995caef7fe4642aac39ab61afd5c47 SHA512 aca6d7fce9e283381b4109018091f4cecc92e4aa8916a0f50c37dec918dadf9c43c2065f58188da4289c67b6c3503b57f46148a28fa2ab95351a48104e1ecff0
+EBUILD selinux-oident-2.20200818-r2.ebuild 279 BLAKE2B 32ec04da59ebd16b9c385827ddb8e0ab2f9e959bec6766f4002ceac68c5588192644dca9601e4e879c3754e7d16adb0a525c481169ee3b71f8f062dffe68abdb SHA512 b94c867632e7efded41643ce3130bc241b60a8b9741dd093375f1a7ddc75099ccff0e7265c9cad337ed4dc11f4e3789812fba90f88e74402f91b63b45863d81e
 EBUILD selinux-oident-9999.ebuild 281 BLAKE2B 3f38477320f0b1bb82ec0b49a1214f078689be316a387cf6dd51d5f7c72558f089ed88fc29d79fe6a177d0646a971ca1c3995caef7fe4642aac39ab61afd5c47 SHA512 aca6d7fce9e283381b4109018091f4cecc92e4aa8916a0f50c37dec918dadf9c43c2065f58188da4289c67b6c3503b57f46148a28fa2ab95351a48104e1ecff0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20200818-r2.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20200818-r2.ebuild
index bd7abceb87bb..7c3a67501658 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for oident"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-openct/Manifest b/sec-policy/selinux-openct/Manifest
index b8f7b393e174..3ee10afa856f 100644
--- a/sec-policy/selinux-openct/Manifest
+++ b/sec-policy/selinux-openct/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-openct-2.20190201-r1.ebuild 279 BLAKE2B 7a2cb7239cd30fd655d1fafe209ddb38cff91e8b50e9de55f8be77faabd22d283e4b16e4a4b36ad9a1b6153088c3a029c26c4abb57e77bb9229a5d84b569ad7e SHA512 b98cd435513152795b4459d547b01ea6fdc54341107916b7ef14f707386ba9a5be518e4fb340c71f214aeb37b49a0f8758e70de929442766f73164206fe374e3
 EBUILD selinux-openct-2.20190609-r1.ebuild 279 BLAKE2B 7a2cb7239cd30fd655d1fafe209ddb38cff91e8b50e9de55f8be77faabd22d283e4b16e4a4b36ad9a1b6153088c3a029c26c4abb57e77bb9229a5d84b569ad7e SHA512 b98cd435513152795b4459d547b01ea6fdc54341107916b7ef14f707386ba9a5be518e4fb340c71f214aeb37b49a0f8758e70de929442766f73164206fe374e3
 EBUILD selinux-openct-2.20200818-r1.ebuild 281 BLAKE2B 7261b80232bc7404245cc7578360d71559de0a2a93a51322cfaf205e3348c5acf7008d36d82fcabeb46df26833e43fdde8f868767e7d8eca73b73b996cfd177c SHA512 f86381531ca33ee479aeb392244c7febcb47cb4943d6178a52f48a32f14af55e040fd6a93284bcd20126e56bd7f37043eed0e41506eec4ff0f7d1c3602530f20
-EBUILD selinux-openct-2.20200818-r2.ebuild 281 BLAKE2B 55304d7725fd79fad77d1539706d9235cc06c09d2a29029a82d755744414ff1811316e64d22eaea787cbfec3dd34bc6550db4adbe23ee3b704f275048207faf7 SHA512 7e5064ac60b1e9b881448ec701a9acdfb2556aba6e1a055c639e029527e1b9151dacafdc8771fbb381d0e5b28d8885a9d049a41a7ddc15a01f206e75f98f1aed
+EBUILD selinux-openct-2.20200818-r2.ebuild 279 BLAKE2B 152ba4db14a8f4c2fbd1fb6f2d8f8b32e8bce3f02aa8f794601573883c476c0f4348e92d92ac1299ed32c120d643d2f2bd8288dce60efb372e2e8fcd1de6d1e4 SHA512 11a20c9d7672cef3169021d940dae08e98c6dfb62382e38cdba4d3c22bf8489da63a91094b53e50c8de50b34b7dd00bb069c9ea7d24f32a89cfc5b1009ce4bcd
 EBUILD selinux-openct-9999.ebuild 281 BLAKE2B 55304d7725fd79fad77d1539706d9235cc06c09d2a29029a82d755744414ff1811316e64d22eaea787cbfec3dd34bc6550db4adbe23ee3b704f275048207faf7 SHA512 7e5064ac60b1e9b881448ec701a9acdfb2556aba6e1a055c639e029527e1b9151dacafdc8771fbb381d0e5b28d8885a9d049a41a7ddc15a01f206e75f98f1aed
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20200818-r2.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20200818-r2.ebuild
index c1ec0ecd4a9b..cc871cf4aa00 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openct"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-openrc/Manifest b/sec-policy/selinux-openrc/Manifest
index 6c6d7ff42524..5dc08fbcc2a0 100644
--- a/sec-policy/selinux-openrc/Manifest
+++ b/sec-policy/selinux-openrc/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-openrc-2.20190201-r1.ebuild 279 BLAKE2B a449236e20a9fa1dbbfc56e801e65d0297768b4b2b3e1baa71ee7e8a43157b73c76e2afa5efaa4fb29fc6a1c72b99ea7a08ebb6ca67528fb370e37fb352dbc9b SHA512 8200500eb0253b1b643622cb3fb3055681d838b68d067ac0b97cdd8d31be52891e3fa0a0fd158d2aa52d40b3e64caf1b224fc47e3abdd544db412f2997b6078d
 EBUILD selinux-openrc-2.20190609-r1.ebuild 279 BLAKE2B a449236e20a9fa1dbbfc56e801e65d0297768b4b2b3e1baa71ee7e8a43157b73c76e2afa5efaa4fb29fc6a1c72b99ea7a08ebb6ca67528fb370e37fb352dbc9b SHA512 8200500eb0253b1b643622cb3fb3055681d838b68d067ac0b97cdd8d31be52891e3fa0a0fd158d2aa52d40b3e64caf1b224fc47e3abdd544db412f2997b6078d
 EBUILD selinux-openrc-2.20200818-r1.ebuild 281 BLAKE2B bbe96c869096466ffb73f6a6f1914af16b8855b6c4ca3776bf6a24e98c6f57a06433c06d25afb0d8f41b005ba7037be8eb96eb995f56de0ef94f8820bf170452 SHA512 aad6bef6f133fb0b03f7f1850ef57836933c8066eefbe3bce1cf61f855845399f3cacdb1728cbdfbc7f5d189f6ee0d237d7ddae3fc5e0b3a6731dbc4493afd8d
-EBUILD selinux-openrc-2.20200818-r2.ebuild 281 BLAKE2B 27674567eac583e2260cbd192b51274e515da426e500b3ae51910ff5ad0813ac035170f6d40250ba96f8afab4bc0da6b1b2d1ca2c802cd7a77002e1eb774780f SHA512 22d1585d3b73a57a6eb97c401058ab5d3a85c6b893292cbf74838e67223455cea475f71abd472368df35b3f1c35f435b33235fbab07bf479bdd7e853272dc563
+EBUILD selinux-openrc-2.20200818-r2.ebuild 279 BLAKE2B c5a560ab641f12316e83588afc3bed31cebc741a1898e13cdae0cdb0cc9ea8345106dcfc77b6c9e20c6b1c047cac7cd59e52781b110ec62a283e081b5547f7d7 SHA512 c10a51155dcba8b2dbee98331fdcfa46ef9a82b12e480ac2bbfc1bc61974be6d76ad189c9c8e46531e2d38792812196eedbd057dd005be0320e29d553afa0f3d
 EBUILD selinux-openrc-9999.ebuild 281 BLAKE2B 27674567eac583e2260cbd192b51274e515da426e500b3ae51910ff5ad0813ac035170f6d40250ba96f8afab4bc0da6b1b2d1ca2c802cd7a77002e1eb774780f SHA512 22d1585d3b73a57a6eb97c401058ab5d3a85c6b893292cbf74838e67223455cea475f71abd472368df35b3f1c35f435b33235fbab07bf479bdd7e853272dc563
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20200818-r2.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20200818-r2.ebuild
index a44d48dcd24b..429b5e7aee19 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openrc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-openvpn/Manifest b/sec-policy/selinux-openvpn/Manifest
index 0c7ca03a46fb..d7299f1b686b 100644
--- a/sec-policy/selinux-openvpn/Manifest
+++ b/sec-policy/selinux-openvpn/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-openvpn-2.20190201-r1.ebuild 281 BLAKE2B 3901343914a202fc70b486f548eac099cce66db5f4d311fbdcae92864619588fa98e86da01c22b710ee97e85228e769db497686c56a673992392626165f138b1 SHA512 91ef7e7ab0d229f1d345e2ca3849341518ce02d46a9b4e31f1b477a08454c1d5f57adb34e7fbe0ac71e9af11649a231eb15c5901dfe5bbf7a9603b38d14db23a
 EBUILD selinux-openvpn-2.20190609-r1.ebuild 281 BLAKE2B 3901343914a202fc70b486f548eac099cce66db5f4d311fbdcae92864619588fa98e86da01c22b710ee97e85228e769db497686c56a673992392626165f138b1 SHA512 91ef7e7ab0d229f1d345e2ca3849341518ce02d46a9b4e31f1b477a08454c1d5f57adb34e7fbe0ac71e9af11649a231eb15c5901dfe5bbf7a9603b38d14db23a
 EBUILD selinux-openvpn-2.20200818-r1.ebuild 283 BLAKE2B e24fb6409fe7004584d3076bc79ed70595755950792556c46ef8a6694649e23825b8cdd4a2f40fce41c3473da9f02de9ddbeba30e5a78f888eacd8bfd312ca9c SHA512 507fd6c149240bd099bd50febcde48756e60e53bb50b5b6cf1b3aabec5414e5b6c1913c839acb0ef6b1c1f4d84a1fd65e4ff4f5b142c1ba5e477c514b9686f35
-EBUILD selinux-openvpn-2.20200818-r2.ebuild 283 BLAKE2B ac0a6d1f23a9cb0006aca419a9a2938035a01ce95ba40f18e5c330f5150a1e3240e7176b6accb2dd734dfd92c788050b84e3e54b61939e1e3f2eb66b7e14d0fb SHA512 88548765a8f9b91595255d11a31801d03a205cd3121b1de461592bef8b2c43a8abb6e3b0310ec68f9bb223e0974b07714a33aed88dbd18c84803ff30525e1b13
+EBUILD selinux-openvpn-2.20200818-r2.ebuild 281 BLAKE2B 3b47a3210de8fbddd6e73ed8d39952095e004c7a0e90746504e7cc586e7fa2e9f113c465b1025d8678cab0971c00d345c820140599760bcc04b1bacafe1299fb SHA512 e44f691e46a92aa17fc0ad0b9bc6b7613136ca3792c0a907ba787acf6f573c608f067ba6e4f336ba06010b82651567d95d42d242cce9b6615f17ea3fc87f122f
 EBUILD selinux-openvpn-9999.ebuild 283 BLAKE2B ac0a6d1f23a9cb0006aca419a9a2938035a01ce95ba40f18e5c330f5150a1e3240e7176b6accb2dd734dfd92c788050b84e3e54b61939e1e3f2eb66b7e14d0fb SHA512 88548765a8f9b91595255d11a31801d03a205cd3121b1de461592bef8b2c43a8abb6e3b0310ec68f9bb223e0974b07714a33aed88dbd18c84803ff30525e1b13
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20200818-r2.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20200818-r2.ebuild
index a25b8e1ca22c..11e9234b109c 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for openvpn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pan/Manifest b/sec-policy/selinux-pan/Manifest
index 1922caccd366..503bb6cc8679 100644
--- a/sec-policy/selinux-pan/Manifest
+++ b/sec-policy/selinux-pan/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-pan-2.20190201-r1.ebuild 371 BLAKE2B 02c3cfd92d4e428f1a938bf2eb48fb4b9bf2e9abe07e46a389bb0111d415877e5883d88cbb426f9bfd7ef221074fc1f541353f265704a6e33d06af3f023bf2cb SHA512 589774156f482267066ce616f33b69880a9ac44de8d881ad2bcde80c87e969912e09e4eaeb5b87611106d68a8b8f08c823f1c6e90820ad058b1f032ede3064fd
 EBUILD selinux-pan-2.20190609-r1.ebuild 371 BLAKE2B 02c3cfd92d4e428f1a938bf2eb48fb4b9bf2e9abe07e46a389bb0111d415877e5883d88cbb426f9bfd7ef221074fc1f541353f265704a6e33d06af3f023bf2cb SHA512 589774156f482267066ce616f33b69880a9ac44de8d881ad2bcde80c87e969912e09e4eaeb5b87611106d68a8b8f08c823f1c6e90820ad058b1f032ede3064fd
 EBUILD selinux-pan-2.20200818-r1.ebuild 373 BLAKE2B 56a7b1bb53f9d4d03aedc8140ab64523ffa34d9664d7d109645f3d2bb6e2d8d369a846270293b6a43356102084d3733855b06343e10b40e1a93e00020df2ed8a SHA512 90abb7eb1008b8ca96acc3d50b53157241c5151a492e316231994f6d538ba29aa5aa29f25547f4732b048723813a708c9ab24985befa819a21a0134623c058d5
-EBUILD selinux-pan-2.20200818-r2.ebuild 373 BLAKE2B a2923b44179d22a9a5280b7a4903add6e43dc066fc812c398c25ed8f2bd404b8ced66397a764c7e6c0bc5b0a8b5d1add5ddb9c26afe6a720f0f2bebf4db8fb9d SHA512 58f2aefaa99d920fa1acb5f0b814023bbcf54c2c8f9efb1ae63e379571cd5cd7de6a421b747fd40aedd366b0081f68f2d8ef40c178aec2e5c1504777362e07d7
+EBUILD selinux-pan-2.20200818-r2.ebuild 371 BLAKE2B 30ec05241cc74a2360bb21a579d1b28bc7fcab44ece47b330d3260959b7ed48b5691678170a8b5dc9a1f80f44525d387016b8b60d756af526047c98444363c84 SHA512 506703f1861acdc25f9a1df1e3328d89f1c4aee96b0df181cfbeafecedae228c8d3c76a38c38a3ca34b9149398e8341a87b68e8051eb267c8a0eb8d21320c4f2
 EBUILD selinux-pan-9999.ebuild 373 BLAKE2B a2923b44179d22a9a5280b7a4903add6e43dc066fc812c398c25ed8f2bd404b8ced66397a764c7e6c0bc5b0a8b5d1add5ddb9c26afe6a720f0f2bebf4db8fb9d SHA512 58f2aefaa99d920fa1acb5f0b814023bbcf54c2c8f9efb1ae63e379571cd5cd7de6a421b747fd40aedd366b0081f68f2d8ef40c178aec2e5c1504777362e07d7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20200818-r2.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20200818-r2.ebuild
index 57ca32e1c066..949af67d3749 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pan"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-pcmcia/Manifest b/sec-policy/selinux-pcmcia/Manifest
index 3aaf078bb64b..8a5518a74818 100644
--- a/sec-policy/selinux-pcmcia/Manifest
+++ b/sec-policy/selinux-pcmcia/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-pcmcia-2.20190201-r1.ebuild 279 BLAKE2B 80d1c9c4391cc95929fca29942d85cfddbc1ac34c52516d4031b3d3500a95dad19830f2ba13738736ba9e73bc09463a7898734c7d1e7bb8bc89cc1ea02ef52ea SHA512 fe8df27652623af74dd091a2ae39c81ed67ec2285bf7bcaa70087bceca14beedfc5b04a380831156106e0d4442c60ed357ac7215b98cd4105687aa21e707639c
 EBUILD selinux-pcmcia-2.20190609-r1.ebuild 279 BLAKE2B 80d1c9c4391cc95929fca29942d85cfddbc1ac34c52516d4031b3d3500a95dad19830f2ba13738736ba9e73bc09463a7898734c7d1e7bb8bc89cc1ea02ef52ea SHA512 fe8df27652623af74dd091a2ae39c81ed67ec2285bf7bcaa70087bceca14beedfc5b04a380831156106e0d4442c60ed357ac7215b98cd4105687aa21e707639c
 EBUILD selinux-pcmcia-2.20200818-r1.ebuild 281 BLAKE2B 08dfa0f85738fd137dbfd9839f5179d24ef022d3848caa65e5fccb6ec43940a0d4ae24313a6b4b54603913159f8c23fed126cc751f94b5b95766d5681164c7a7 SHA512 94e89c183838588d84fce435055007808b3cad7eed2e7bcd1f77ed94eff22d41b94ad8ea2484b97b2dce912a5ed8182f5b1538b99d1e02b13972c4a776505ec9
-EBUILD selinux-pcmcia-2.20200818-r2.ebuild 281 BLAKE2B 9b271e27faa462e90219b230e79256ecb3d28ff0eafddde38db741f5be1657f68ec605ef992c49d5a2e1b5a9ca3d745e904e95fe412aceb1d84462b9e16d68ec SHA512 19d62a330b9a2a3e9e5845148ba053694d463c5b502a41d3f0e6a01b89310d253c327137efe0125c1c0184d8839346ee4b39f107479c96a0431edd05d5537c97
+EBUILD selinux-pcmcia-2.20200818-r2.ebuild 279 BLAKE2B 475135c8840e7286aba38e6f481ee9dcc4da1358e03e684fa6190f9401fa72bdf8ca65635fb886f111f7d57391242f3e0bfcd127c257ed002e6f54c79a7c7aca SHA512 185eb53e1736ff184792c9dfec30329f91c8adf275b50914f49bb5443b8ea1280653a705c1ec613f96d155754b2ec8f754b4408b2bf0d416d6652da105da84d5
 EBUILD selinux-pcmcia-9999.ebuild 281 BLAKE2B 9b271e27faa462e90219b230e79256ecb3d28ff0eafddde38db741f5be1657f68ec605ef992c49d5a2e1b5a9ca3d745e904e95fe412aceb1d84462b9e16d68ec SHA512 19d62a330b9a2a3e9e5845148ba053694d463c5b502a41d3f0e6a01b89310d253c327137efe0125c1c0184d8839346ee4b39f107479c96a0431edd05d5537c97
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20200818-r2.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20200818-r2.ebuild
index 6af86c698493..40d94eae4b6a 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pcmcia"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pcscd/Manifest b/sec-policy/selinux-pcscd/Manifest
index e4a25edcd265..8eb5d8059b76 100644
--- a/sec-policy/selinux-pcscd/Manifest
+++ b/sec-policy/selinux-pcscd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-pcscd-2.20190201-r1.ebuild 277 BLAKE2B 14af72f07e1b2d4a35080888afd938f1589e0aaecb161c99dfc8d23d75c3d823d675400bde8cb08b3bf787b3f679d3c7b799a8b29c8c6eb0af4b4bce76773066 SHA512 7af60c0e5d444be8883d7ef4ab016e2aff7441ad7f7991e4c92f55a77d967ed6f5999328c00f8c3e6955663cf115dfe82f8a1d18a8aca8b49e6e27abca570d9c
 EBUILD selinux-pcscd-2.20190609-r1.ebuild 277 BLAKE2B 14af72f07e1b2d4a35080888afd938f1589e0aaecb161c99dfc8d23d75c3d823d675400bde8cb08b3bf787b3f679d3c7b799a8b29c8c6eb0af4b4bce76773066 SHA512 7af60c0e5d444be8883d7ef4ab016e2aff7441ad7f7991e4c92f55a77d967ed6f5999328c00f8c3e6955663cf115dfe82f8a1d18a8aca8b49e6e27abca570d9c
 EBUILD selinux-pcscd-2.20200818-r1.ebuild 279 BLAKE2B 99874230b286462bd5ecc25c3bfb2a630221dd39e32ac43ecc7c9eee63c9d252ff785db419609b6cbd008f14595848c29246c91e1f808d283963b8c780c92820 SHA512 5c41dacc7644bc9ea2b7fab3c761505b2024fc075c37cde20a108e2e97cc863293271e01bbfa3de73dcbaaf2a175da31ab138a90bcf6f905a0094dbf3cc6c995
-EBUILD selinux-pcscd-2.20200818-r2.ebuild 279 BLAKE2B 43ef65d57f1e97010c3eb8d5ae8efa037c49d93a52cd9509a2a5a33e40c75c49857c07069626aa7153e21a6fdd8fb2380ce8d073f3a99c1c5726e2bddfbca7d2 SHA512 d68568ef68c104dd1e719865dcbbe27bc86e0ff19170713212b1f343bcbe8aa8c3d15ebc69e8bcbffd79732eb6be7f02af28ef99344c506f6d9cde146eb1b0bd
+EBUILD selinux-pcscd-2.20200818-r2.ebuild 277 BLAKE2B 5c549fed009e6d318c4897d436b5a832eaee6ba6282c77ba3948983b1ea4545a3cf477ca1dfc6e1f33efe00c0188f172e9d9aed865c07c5b916e625900eabcac SHA512 f5a37490dc118ea1bb48eacd3367574d4a4cae950310d6757563f8736bc01fa753a7efd3e9eb7d2f9462cb3688d130fb4e90266b2a9b6e52c4120590f91099f8
 EBUILD selinux-pcscd-9999.ebuild 279 BLAKE2B 43ef65d57f1e97010c3eb8d5ae8efa037c49d93a52cd9509a2a5a33e40c75c49857c07069626aa7153e21a6fdd8fb2380ce8d073f3a99c1c5726e2bddfbca7d2 SHA512 d68568ef68c104dd1e719865dcbbe27bc86e0ff19170713212b1f343bcbe8aa8c3d15ebc69e8bcbffd79732eb6be7f02af28ef99344c506f6d9cde146eb1b0bd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20200818-r2.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20200818-r2.ebuild
index 48230d7d5433..4da07217268f 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pcscd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-phpfpm/Manifest b/sec-policy/selinux-phpfpm/Manifest
index db2d470531b2..e67331e85ff5 100644
--- a/sec-policy/selinux-phpfpm/Manifest
+++ b/sec-policy/selinux-phpfpm/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-phpfpm-2.20190201-r1.ebuild 375 BLAKE2B 089da64a70fbac8ac9d501782b1461bf0d96315719fdd6ad2c2907c07ac2d0cef52923e5844cdfca64caee95b7606bbe6e303c8d479ae1ddfdb3fbe40b3dfc7d SHA512 6d5ce0f583744237ffd5046672ff00fe0faed7775b4f457d1d1587a7d372141e4232b0b7176474365d5fc6d9d707cd779c66af3c4de548b884088b46d6440817
 EBUILD selinux-phpfpm-2.20190609-r1.ebuild 375 BLAKE2B 089da64a70fbac8ac9d501782b1461bf0d96315719fdd6ad2c2907c07ac2d0cef52923e5844cdfca64caee95b7606bbe6e303c8d479ae1ddfdb3fbe40b3dfc7d SHA512 6d5ce0f583744237ffd5046672ff00fe0faed7775b4f457d1d1587a7d372141e4232b0b7176474365d5fc6d9d707cd779c66af3c4de548b884088b46d6440817
 EBUILD selinux-phpfpm-2.20200818-r1.ebuild 377 BLAKE2B 0b1174701d156d7dde63a3773990c2098cc0e3e790721e85711ec9fbb88b46951cd01922b74bcea83035d502c4b456e4960d0fd2884e7a0c5289f39de29fc809 SHA512 05c54e083b8d2d161baee23b74bdb13486c64937d5f9c6a6f652d201a299ea963a31408fd3c7e399df5f529586ea95d155a4ec5828adfa757a6817f285ba9b55
-EBUILD selinux-phpfpm-2.20200818-r2.ebuild 377 BLAKE2B 73dc9463ce53308a10cb38d652af9d64c84e07321b2c0db15635906a9458ec8ec855b08cae77d810f32bc7ba515ecf0e0289e6f8ce24bc5321f5ae23e453150c SHA512 5b6ba8c43a33cb0cd29b07ed50dfe8cccf2140bd23b585b0e706349964431d38a1a2d21a48bb14e36a5fe6f238053d879bd17ed1e55d956036db70bfbcb390bd
+EBUILD selinux-phpfpm-2.20200818-r2.ebuild 375 BLAKE2B b913329ceede1989051c90cd8bd7e6d8d5564710f68fd16f29dd6b2f30e579bd9c5a57e0bec40d82cf1b7fb43952587e7da4f53c52d84849c9ac50a1e35164f0 SHA512 712a204ab6227bfcb2640dce83c231b35306188ce9eb4654a4a5adf1cf740f29a0e36703ae2f670417c5833eae1680a3748af1eb90d79b7b30bd5e985cc64c77
 EBUILD selinux-phpfpm-9999.ebuild 377 BLAKE2B 73dc9463ce53308a10cb38d652af9d64c84e07321b2c0db15635906a9458ec8ec855b08cae77d810f32bc7ba515ecf0e0289e6f8ce24bc5321f5ae23e453150c SHA512 5b6ba8c43a33cb0cd29b07ed50dfe8cccf2140bd23b585b0e706349964431d38a1a2d21a48bb14e36a5fe6f238053d879bd17ed1e55d956036db70bfbcb390bd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20200818-r2.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20200818-r2.ebuild
index cee0717b0033..89928d5ec634 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for phpfpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-plymouthd/Manifest b/sec-policy/selinux-plymouthd/Manifest
index fde5305d6df4..f66a85bea77b 100644
--- a/sec-policy/selinux-plymouthd/Manifest
+++ b/sec-policy/selinux-plymouthd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-plymouthd-2.20190201-r1.ebuild 285 BLAKE2B 58282aa8ea562e0d1bdc510a3cc5f80bb218d7d6b06e9c917ce282ca89cd9cfc1d7a1c45aac10913dbccf79c4d61b0848c75514a5730aee9d24233030a51b504 SHA512 f81ed583586eea182fc97f99f170e5d6534b9dc029e388dbb9c610fe178ff18d2c5cca8e944ebd9b06f8e53fdbfd9bbdbfa40c565be3b29028087b89e43e3fe5
 EBUILD selinux-plymouthd-2.20190609-r1.ebuild 285 BLAKE2B 58282aa8ea562e0d1bdc510a3cc5f80bb218d7d6b06e9c917ce282ca89cd9cfc1d7a1c45aac10913dbccf79c4d61b0848c75514a5730aee9d24233030a51b504 SHA512 f81ed583586eea182fc97f99f170e5d6534b9dc029e388dbb9c610fe178ff18d2c5cca8e944ebd9b06f8e53fdbfd9bbdbfa40c565be3b29028087b89e43e3fe5
 EBUILD selinux-plymouthd-2.20200818-r1.ebuild 287 BLAKE2B 34eae1fa3e449c554a4411e5df4e3efb6fc64d344b60930f46d7d7ffa17764c55def0312dc15acb8d7f5aa03ef67d338b7a732fa0e31ea90a21a45cc43ab7830 SHA512 893cef17e3703eb9c6aa89735eaff0facf6fbbbcb2a7bda2a972ca354a8c3a471b38215fb751bc5be3239996527c745e1312db88138bebb503276fe291563eb3
-EBUILD selinux-plymouthd-2.20200818-r2.ebuild 287 BLAKE2B 9ba71fb3b53f95cf1df2bd1aee6e4ba4094a7a8805286403f15c3e25fa3804c5a23ff90ecde0bf5b499c5e2700c97e7fdf06f74cef50b3e4e12e8d08bc4d5008 SHA512 7e6f7383ed0e2f37b1d9c2b0d707e5466b847c9195f75516acca973432b1aad6665e5f98ebbce97c4017fc7ee460ef17aa25d27c140037e845b1048c79f90a07
+EBUILD selinux-plymouthd-2.20200818-r2.ebuild 285 BLAKE2B 746652c9d5443c8f808c0789550d9f1e7d0361f3d1153c2bc416a0c7711d111b5f93f98e5da9c39f6273dd272a30f77cccf6aed1214682ae91fde0ad41516af5 SHA512 dabe5a014e6ef65fa22260c7abff524269b7a290143840d9f23df06e1899c6383079275ce0a22bf800a49b02bf4406a48c73169be953969a07759c17cc5bbd58
 EBUILD selinux-plymouthd-9999.ebuild 287 BLAKE2B 9ba71fb3b53f95cf1df2bd1aee6e4ba4094a7a8805286403f15c3e25fa3804c5a23ff90ecde0bf5b499c5e2700c97e7fdf06f74cef50b3e4e12e8d08bc4d5008 SHA512 7e6f7383ed0e2f37b1d9c2b0d707e5466b847c9195f75516acca973432b1aad6665e5f98ebbce97c4017fc7ee460ef17aa25d27c140037e845b1048c79f90a07
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20200818-r2.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20200818-r2.ebuild
index 72e87b241312..38a8927a1dcb 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for plymouthd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-podsleuth/Manifest b/sec-policy/selinux-podsleuth/Manifest
index fd344912ac74..9b2bad37af84 100644
--- a/sec-policy/selinux-podsleuth/Manifest
+++ b/sec-policy/selinux-podsleuth/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-podsleuth-2.20190201-r1.ebuild 285 BLAKE2B fb843da9deaff224e99f07a7cde58c27ec0951038b765d9ddb260fc4c9be9a71a87fb9535139b512c028183e8deff881294c97aaf99b4b7157be693ba46c7933 SHA512 fcdee43eacc756d0be5b911c080c923f630a605e4de3721e92ffdfe22539497a2493640ddcd21c373a4eaa50361193118f37c4cc60496907abef189fb4499ffd
 EBUILD selinux-podsleuth-2.20190609-r1.ebuild 285 BLAKE2B fb843da9deaff224e99f07a7cde58c27ec0951038b765d9ddb260fc4c9be9a71a87fb9535139b512c028183e8deff881294c97aaf99b4b7157be693ba46c7933 SHA512 fcdee43eacc756d0be5b911c080c923f630a605e4de3721e92ffdfe22539497a2493640ddcd21c373a4eaa50361193118f37c4cc60496907abef189fb4499ffd
 EBUILD selinux-podsleuth-2.20200818-r1.ebuild 287 BLAKE2B 097d4d451300b484407b2b3f74ac4f56ac1870da6a8c66e76ccf93580feef9dab92216fe1e2896bbdef707fdcb34b712e316ae798367ed87bdf8704f69d38286 SHA512 23ab0841e758216041fd65da184d524147079228d3c15017b035faff029f8717de2e8de35f096621852b7eed1710435e80cceedf3df48532f5fb9523a31c5945
-EBUILD selinux-podsleuth-2.20200818-r2.ebuild 287 BLAKE2B 0a190127ac6bcf7325ac9cb7c175943a0cde15df8caa999d1b3022bc15d161e5f7a320b5640530029badcd2a52405bb34acfc460f47698884f4499c1033d3b07 SHA512 dbf436d0942afe5f706770aad0cf10954cbe294fcbd36e6b45a794d864545256aee56c21c8bd6fac4cd1464d0d8a0eb843c92fc134d10cc1bd2351d6a454e7f6
+EBUILD selinux-podsleuth-2.20200818-r2.ebuild 285 BLAKE2B 12b8dde5764a350751992aec3744626115022f28aee58e6ea7fd956640332a419856d0f694055e15e1127145a90926c525e375240ec09f8ddc62e47ffde9dcef SHA512 c4fdbec28bc55763e3d3ebac9acbe07556efae84c1d39aa0dd54b52d493cb310a8ce5d619e9b7fa5ce608a4235bd7b33809987c6b31ee6885bf74c69fcf7a37c
 EBUILD selinux-podsleuth-9999.ebuild 287 BLAKE2B 0a190127ac6bcf7325ac9cb7c175943a0cde15df8caa999d1b3022bc15d161e5f7a320b5640530029badcd2a52405bb34acfc460f47698884f4499c1033d3b07 SHA512 dbf436d0942afe5f706770aad0cf10954cbe294fcbd36e6b45a794d864545256aee56c21c8bd6fac4cd1464d0d8a0eb843c92fc134d10cc1bd2351d6a454e7f6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20200818-r2.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20200818-r2.ebuild
index a6b2f452c346..b628ed28426d 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for podsleuth"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-policykit/Manifest b/sec-policy/selinux-policykit/Manifest
index 9361b4a7caa7..ad927c7974e4 100644
--- a/sec-policy/selinux-policykit/Manifest
+++ b/sec-policy/selinux-policykit/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-policykit-2.20190201-r1.ebuild 285 BLAKE2B b2980d5d65e9e35f0278625fe2905e9ac2ddae5798e39012ccb07f46b8c179e18262206f35718cd957ccdfd441614ce5194510a2dde545e7dc799d229d196716 SHA512 505f3e842e8339f204659b908eecc27d0bf7f3f23ce1ef8cfb7a18262461e734b653195dd83125f2a676c05d7555c113b9ccba7a7c3a215ee119f0fa36c082f1
 EBUILD selinux-policykit-2.20190609-r1.ebuild 285 BLAKE2B b2980d5d65e9e35f0278625fe2905e9ac2ddae5798e39012ccb07f46b8c179e18262206f35718cd957ccdfd441614ce5194510a2dde545e7dc799d229d196716 SHA512 505f3e842e8339f204659b908eecc27d0bf7f3f23ce1ef8cfb7a18262461e734b653195dd83125f2a676c05d7555c113b9ccba7a7c3a215ee119f0fa36c082f1
 EBUILD selinux-policykit-2.20200818-r1.ebuild 287 BLAKE2B 2f44323e96d97d826145bbe1e8ce3023f98fe46802df9fb3156ac6acfc6e88de990a1a1821f510270e3bf68a1c0fdb60229f6787d97544c5c01b46c0b5f862eb SHA512 13dfc29dad051e775ae7624691a53870563a649454a0b672c3c33e4a424f6983dc859a6ad29e900c519d2932aceef7d25623c9d8e33e5b2337bbfec3b22fe772
-EBUILD selinux-policykit-2.20200818-r2.ebuild 287 BLAKE2B c672ddc43c5b07b8cf108e67790df23d85a7c5f603ebd65a54b889262a2dd0aac0446d4a81791dc875cd6592c166f292556a80e7ea94d3c367986f811ae9d7be SHA512 48c46a49ce7f23fd2a1675d0d85eda7acbb5cb0fbc792f8f3b59c8cd24ac12510455bf70fe8cde2c2f98e3f06692e883e69461f2c1f24f22fdab4bd51f5646a7
+EBUILD selinux-policykit-2.20200818-r2.ebuild 285 BLAKE2B 5c966ba352001f504aeaf3de6a8e5e45306c34d0ef9aafdf8f78f99ae18617d584fe7a08abf08606071dfd8d3a740d772726b092bd1f1977e4cad620d103485c SHA512 004e5861edda257a10b8fb7d80a8a3a97d35b11a34bb53404e4f1a1802f42691620094af06bbe7d9828cc056be62c10e6b53394a9df557bea8377e4c6b1d4a95
 EBUILD selinux-policykit-9999.ebuild 287 BLAKE2B c672ddc43c5b07b8cf108e67790df23d85a7c5f603ebd65a54b889262a2dd0aac0446d4a81791dc875cd6592c166f292556a80e7ea94d3c367986f811ae9d7be SHA512 48c46a49ce7f23fd2a1675d0d85eda7acbb5cb0fbc792f8f3b59c8cd24ac12510455bf70fe8cde2c2f98e3f06692e883e69461f2c1f24f22fdab4bd51f5646a7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20200818-r2.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20200818-r2.ebuild
index f2f72e3e35af..ad21481c5a62 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for policykit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-portmap/Manifest b/sec-policy/selinux-portmap/Manifest
index b18fcf490f59..b14a1df558cd 100644
--- a/sec-policy/selinux-portmap/Manifest
+++ b/sec-policy/selinux-portmap/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-portmap-2.20190201-r1.ebuild 281 BLAKE2B c816423ad8a07d4736795eebda9f19f77ad1d1bb8fda617c41e8ea13acc6402a4ef36a27a0458c4f70b3cf8e1d90d0adc6ba76782d24b6d02a70e15c31021858 SHA512 29fe6804192f82b24b051641484e89c1934298651e0c1d19f0add6caa2f4892e38065ee00550467e1ebcd9f4b83ae6e42c6259b8bc5ef8e9e11c7943da98bd83
 EBUILD selinux-portmap-2.20190609-r1.ebuild 281 BLAKE2B c816423ad8a07d4736795eebda9f19f77ad1d1bb8fda617c41e8ea13acc6402a4ef36a27a0458c4f70b3cf8e1d90d0adc6ba76782d24b6d02a70e15c31021858 SHA512 29fe6804192f82b24b051641484e89c1934298651e0c1d19f0add6caa2f4892e38065ee00550467e1ebcd9f4b83ae6e42c6259b8bc5ef8e9e11c7943da98bd83
 EBUILD selinux-portmap-2.20200818-r1.ebuild 283 BLAKE2B ab9850ce86f327669e905e386c8c6625232a09dc0bf6e4056180198335419074d8fb1900ecf23c3ccfb7b81ef35a2edda14207d190e414e41f0486759c4a3c15 SHA512 03a73a13745c9fa37d96dd625deeb7940dcb3322254648f63d4d6e81f96574595d5848fe70abdc31800022da1af771bd6f3540967414beda7addca94be18499b
-EBUILD selinux-portmap-2.20200818-r2.ebuild 283 BLAKE2B ab571318f9df3e66589a9038fdb8f0b9672dca302f8dd4de42be485dc100dedc4df555e1567fd7d21604335296c9acfe984096d5edcc71cfa308de0ccc22bf60 SHA512 c46b4a66ff73957b71e7175fe514c4155f831ec9cfdb0e1d9b7631c98d40bb3a94bfdfc42ccfe09bb94bbcd53154dc6f07e61891a85d2d9cea8842444b1bee16
+EBUILD selinux-portmap-2.20200818-r2.ebuild 281 BLAKE2B f2e1a5b22e5f1df790b67c6ea0e0d8b7c22e10797235a9f4e9f88a41e618c95ad33e5f47fa24c870073c51cedab14ad35fe0f3a1ba64e7546f08db29ff634f09 SHA512 0ba77a8fece26f06dadfa4a75ec89f8d5fdef52594af99f88d5cc33551f4b887ccbe867233b7d59d413e800043daa307a7c8ab66623b6810ccc717524734f7ea
 EBUILD selinux-portmap-9999.ebuild 283 BLAKE2B ab571318f9df3e66589a9038fdb8f0b9672dca302f8dd4de42be485dc100dedc4df555e1567fd7d21604335296c9acfe984096d5edcc71cfa308de0ccc22bf60 SHA512 c46b4a66ff73957b71e7175fe514c4155f831ec9cfdb0e1d9b7631c98d40bb3a94bfdfc42ccfe09bb94bbcd53154dc6f07e61891a85d2d9cea8842444b1bee16
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20200818-r2.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20200818-r2.ebuild
index 2697cb74a1a5..a35539bf33f1 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for portmap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-postfix/Manifest b/sec-policy/selinux-postfix/Manifest
index bf1bb22406c1..7126dad31afc 100644
--- a/sec-policy/selinux-postfix/Manifest
+++ b/sec-policy/selinux-postfix/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-postfix-2.20190201-r1.ebuild 281 BLAKE2B 9bf98b6e6c89ffca92aa7336763741d66c6b49c1b19eea75a1975e1208a467dd220efa854586ae32808e005d4cdda4482910a5fb2dddebc71508e42ad631e4d0 SHA512 d4807f6291021980087697022b12ef3cf57c857aa271388622a845cdff7f5c9065b0ef5a68e2203646c6b74d10ba980b17f23ca397cb04ac6f96debeeb83fdfd
 EBUILD selinux-postfix-2.20190609-r1.ebuild 281 BLAKE2B 9bf98b6e6c89ffca92aa7336763741d66c6b49c1b19eea75a1975e1208a467dd220efa854586ae32808e005d4cdda4482910a5fb2dddebc71508e42ad631e4d0 SHA512 d4807f6291021980087697022b12ef3cf57c857aa271388622a845cdff7f5c9065b0ef5a68e2203646c6b74d10ba980b17f23ca397cb04ac6f96debeeb83fdfd
 EBUILD selinux-postfix-2.20200818-r1.ebuild 283 BLAKE2B c272a75a594e3800a78cd0d86e8192a6093d06a76436a0437d161809dd4a56d235b61b84aa506cc2f04edbb797e250cdebe9c9a32f83dc751ca00274fb5f4a58 SHA512 9c16c22d9935b7ac9d4377c18f50fc6c9b18fd60dc5376f2536299bd1abe9175ffafd03478c2eac18574f3fb5e8d3c5fd6fe888ca9b0f2f6e75e5a33f127306f
-EBUILD selinux-postfix-2.20200818-r2.ebuild 283 BLAKE2B 318d68a538d6a1cabb0073b9039e000516f0338ea262cf921fdf665a7b011b8f46423413a562c9ec67b30cf5f369fe6dd742a9fbb98557f7681bace6482d6f52 SHA512 5c50b99b39174d71980137e19b41293f3f0d923d4b12555bbfb91914db059b0edd90d709657d46029870837a919174c5dfb165db0f3c60636c97f8a90a09dc20
+EBUILD selinux-postfix-2.20200818-r2.ebuild 281 BLAKE2B 789005134ef3aea40294e1c233bb9c5a0cfa35d8c3b873829ce2c25f8fa991e152d28d29d5c1b0cf62164cad144246188f20f233f6d4039e0248623a0cc4b639 SHA512 baea6b52bca21649257efb6a70e50124778b6237229bae41fc5da2be52f46e85b825e86a06dbe853f301fd468effb84f814e260f19e7391b41c4232ea3414508
 EBUILD selinux-postfix-9999.ebuild 283 BLAKE2B 318d68a538d6a1cabb0073b9039e000516f0338ea262cf921fdf665a7b011b8f46423413a562c9ec67b30cf5f369fe6dd742a9fbb98557f7681bace6482d6f52 SHA512 5c50b99b39174d71980137e19b41293f3f0d923d4b12555bbfb91914db059b0edd90d709657d46029870837a919174c5dfb165db0f3c60636c97f8a90a09dc20
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20200818-r2.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20200818-r2.ebuild
index f7511221fac4..0c596ecdfa28 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postfix"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-postgresql/Manifest b/sec-policy/selinux-postgresql/Manifest
index 51df778701ac..09590fdd3dea 100644
--- a/sec-policy/selinux-postgresql/Manifest
+++ b/sec-policy/selinux-postgresql/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-postgresql-2.20190201-r1.ebuild 287 BLAKE2B 7fa155ebcc3e9765b332e9aa05b2d7e83464dc1b8b4e2d160fb34ff9bc70084d34e392e3a33ea277fa9db488cccbc2f88e4f7357a01ec1d2eb9866fb63154164 SHA512 4bbd4eae98aefa5cf1ef8f7c8d691bbfa324d38f513962422f38fd5094c9f7d1517acf8897c8ae3715da4e8791893ac8944569e10faacaad3738e677d46e6147
 EBUILD selinux-postgresql-2.20190609-r1.ebuild 287 BLAKE2B 7fa155ebcc3e9765b332e9aa05b2d7e83464dc1b8b4e2d160fb34ff9bc70084d34e392e3a33ea277fa9db488cccbc2f88e4f7357a01ec1d2eb9866fb63154164 SHA512 4bbd4eae98aefa5cf1ef8f7c8d691bbfa324d38f513962422f38fd5094c9f7d1517acf8897c8ae3715da4e8791893ac8944569e10faacaad3738e677d46e6147
 EBUILD selinux-postgresql-2.20200818-r1.ebuild 289 BLAKE2B 25b6eb5b3112729c94270adbee9c93be06bff109b093edf188207931ae1c753972fe52a09c35b5a28593754d09b4098ea66d267d3543b85872e262c69fe0d2fa SHA512 bc3222ca19fc3500767677ee87ef5238330809f0747eb75e653d0d4e462ebb5bc72bc51f13bde36303714423f705b0eb4e779d57a4410b6232d1a70c600a5bc7
-EBUILD selinux-postgresql-2.20200818-r2.ebuild 289 BLAKE2B 911f6425e0ad0f9a7b1e3fc9f6a7cbf7c85a78df5979334cac2db8a1d36ea1c81a98047c6aac59d7da80f0ca616795eba9d18d4a85672c6a7f652cd74c2aadf1 SHA512 9cf5579ae04bdc08fe08288def53e97e3318f7637c405a1dfc41ed165166b831ab771774a44ae8880cd5c9fc167758d63357c1b3ba2ec579dc20a7ef299fb998
+EBUILD selinux-postgresql-2.20200818-r2.ebuild 287 BLAKE2B f857579de62c4612b576f57b6817086a2ac37331167438b6a2a38015dc3705d32420dd0d7309e8e4e9ac871ae068504027efefacc68f614964fa839fce3f25f5 SHA512 58d585f24979f60bd1b10d48dbd884e8b8e4b8dfa34f2779d2fb444204f80e820cac8f6fa28011b55ef20f50d2c2fecaea316216ce4b1937511fec1877eb8843
 EBUILD selinux-postgresql-9999.ebuild 289 BLAKE2B 911f6425e0ad0f9a7b1e3fc9f6a7cbf7c85a78df5979334cac2db8a1d36ea1c81a98047c6aac59d7da80f0ca616795eba9d18d4a85672c6a7f652cd74c2aadf1 SHA512 9cf5579ae04bdc08fe08288def53e97e3318f7637c405a1dfc41ed165166b831ab771774a44ae8880cd5c9fc167758d63357c1b3ba2ec579dc20a7ef299fb998
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20200818-r2.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20200818-r2.ebuild
index 7de04a1cc181..824ab3dbe033 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postgresql"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-postgrey/Manifest b/sec-policy/selinux-postgrey/Manifest
index 9e4dc7c05e5a..becd81ea853a 100644
--- a/sec-policy/selinux-postgrey/Manifest
+++ b/sec-policy/selinux-postgrey/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-postgrey-2.20190201-r1.ebuild 283 BLAKE2B 23e8a3848d40accaf9135e87e3e01418d4a745ac264cb7ad2ccd764a72e8dae31a5c4d71c66c3a710498818ec229ac0e7ac0f0a234cc550d7d60cecf60269146 SHA512 1303580290d65a85135b1e4522dd5a803f40e598c175f29d3f25a6fe309f9db47ed023ebf20367db7d4086b2f53997a5923ddac63b146a9772765c0bab7e883c
 EBUILD selinux-postgrey-2.20190609-r1.ebuild 283 BLAKE2B 23e8a3848d40accaf9135e87e3e01418d4a745ac264cb7ad2ccd764a72e8dae31a5c4d71c66c3a710498818ec229ac0e7ac0f0a234cc550d7d60cecf60269146 SHA512 1303580290d65a85135b1e4522dd5a803f40e598c175f29d3f25a6fe309f9db47ed023ebf20367db7d4086b2f53997a5923ddac63b146a9772765c0bab7e883c
 EBUILD selinux-postgrey-2.20200818-r1.ebuild 285 BLAKE2B 09ec7807fb2405b19b69e3a95777478bc7f679f162697f0148f12c0be557c4f64b49aa053572b1ea3fe1509a2d8d37fd78bcde46b083479b1fc25cadd555accb SHA512 7a9dbfb1f58286488ca130c35c4596c12ee57adade2b230afeffc5d2eabbfe72cfa25f908fb7dc9d90528596e8590514a6aea5e0079dd4e4da73e08829501fa0
-EBUILD selinux-postgrey-2.20200818-r2.ebuild 285 BLAKE2B 009abd0f6cdb8ea77e8c7b50aca3b3341b5e3c50cca741b7872d51752915994b988bf5c76c6e5ee90debb896d7def892c6bb0af3816eebd5b301054e1d90e2b8 SHA512 8a68e615dbe3b2602aad013546b000496d20ff665aee5e2fa16a5d3e1f86961e6c7861e6d68f89a419aef767b72d3ea87cde61079eb12c215caa3db27970f8bf
+EBUILD selinux-postgrey-2.20200818-r2.ebuild 283 BLAKE2B a4a4857c0531c97e4083e760831f0081659025e525fa5ad77d440f665e6b4ef66a75032dde7f7d168a7ef5745e759e71cc708f8335b2ac32093126999deec842 SHA512 f70fbc02801eb07cb6414aaf597e6bdd4f34f1763d568cf82b86c24d344aefd5e60a98aa1d55fb425d8ede571bdfdcbd24f0bf780c7716f1e29bd8322edd0500
 EBUILD selinux-postgrey-9999.ebuild 285 BLAKE2B 009abd0f6cdb8ea77e8c7b50aca3b3341b5e3c50cca741b7872d51752915994b988bf5c76c6e5ee90debb896d7def892c6bb0af3816eebd5b301054e1d90e2b8 SHA512 8a68e615dbe3b2602aad013546b000496d20ff665aee5e2fa16a5d3e1f86961e6c7861e6d68f89a419aef767b72d3ea87cde61079eb12c215caa3db27970f8bf
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20200818-r2.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20200818-r2.ebuild
index 77d8a543302a..b9decd1c1e0b 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for postgrey"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ppp/Manifest b/sec-policy/selinux-ppp/Manifest
index e0b81169d6e3..333b6ed56509 100644
--- a/sec-policy/selinux-ppp/Manifest
+++ b/sec-policy/selinux-ppp/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-ppp-2.20190201-r1.ebuild 273 BLAKE2B 8c81dc3767eed7822f1f328bf0a014e210f0de9a9961c00f80139ac739fb3a4786f2c8bd04631e348d9d6c0c1ac30ac8668cb02889e6fb2631c1d55e87cba2bd SHA512 56e284526a001887312936d1e0f1c9bcbf02b0918d7d12da33395f1d678abb6280fbe5fe4d818a2208d5c9898683b8fa30032e2e7048826ff56b807a0145c789
 EBUILD selinux-ppp-2.20190609-r1.ebuild 273 BLAKE2B 8c81dc3767eed7822f1f328bf0a014e210f0de9a9961c00f80139ac739fb3a4786f2c8bd04631e348d9d6c0c1ac30ac8668cb02889e6fb2631c1d55e87cba2bd SHA512 56e284526a001887312936d1e0f1c9bcbf02b0918d7d12da33395f1d678abb6280fbe5fe4d818a2208d5c9898683b8fa30032e2e7048826ff56b807a0145c789
 EBUILD selinux-ppp-2.20200818-r1.ebuild 275 BLAKE2B 9bd282b03cbb655f7f0512bb4476e48bf254dbdcd95771ecd0ee04e5aa88465aa8cd6b4c07a2027cb739c54585142d5d821593656347c851f733a5bbf45f7fea SHA512 46f589de28149a8d48b3f96d519e90a9978382606f895487d20f2810dd9c9af6f19804b7668e1fe9852ef3223bb92b32045c562c091f9f10abe84e63100cbb50
-EBUILD selinux-ppp-2.20200818-r2.ebuild 275 BLAKE2B d4fc4bf21611760188481180f3d6960fb5e06b8afa272d58e6c078b7e13882a31807dc89e844e6b478d09b477e22f40fa45ae1a7fbc64fa2ed87fa86b005281f SHA512 aaa28e2a7100f98f3007f1485a4d3a4abaa61b34d605ba140836eec9d6568ca66a23e6b385cfe675581d5260cccc4bf11f605201daa7f9e136e35e9975721380
+EBUILD selinux-ppp-2.20200818-r2.ebuild 273 BLAKE2B 1333321a040e5771a11b933b457adc91e99f1114b5a0d196469a1911f9e340dd9fa86eecb86ab4483f99540e578a3020e38f685498ddcf973fc952932506e108 SHA512 5e62cbb901aecad5ffde508e968871e894c8ead033fb88757429e986fcfea3a77e2b8466f1c8df2138fc76289000e39e4d6652fd1a352f1a76bd300b2a909951
 EBUILD selinux-ppp-9999.ebuild 275 BLAKE2B d4fc4bf21611760188481180f3d6960fb5e06b8afa272d58e6c078b7e13882a31807dc89e844e6b478d09b477e22f40fa45ae1a7fbc64fa2ed87fa86b005281f SHA512 aaa28e2a7100f98f3007f1485a4d3a4abaa61b34d605ba140836eec9d6568ca66a23e6b385cfe675581d5260cccc4bf11f605201daa7f9e136e35e9975721380
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20200818-r2.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20200818-r2.ebuild
index 2b985bcbd1c4..51606560b859 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ppp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-prelink/Manifest b/sec-policy/selinux-prelink/Manifest
index 0b3d8fc9bade..a915fe38d837 100644
--- a/sec-policy/selinux-prelink/Manifest
+++ b/sec-policy/selinux-prelink/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-prelink-2.20190201-r1.ebuild 281 BLAKE2B 7b4bba06207855fc4b87b9b433d9928b549671c4f0d8fa347bd50fc151dfc26bceb3d7ef07ad86908879582d487017e816e2155df3c1be90856f842be83ce621 SHA512 c54c22b25e250eaf4001b082565a3b22222a0a8ce9d704341719be20ac58a7ca45cb27fc7a7651007a47e46fbeaaceeaeafb5d8f139ad9ca7b826f18f4e8fdf4
 EBUILD selinux-prelink-2.20190609-r1.ebuild 281 BLAKE2B 7b4bba06207855fc4b87b9b433d9928b549671c4f0d8fa347bd50fc151dfc26bceb3d7ef07ad86908879582d487017e816e2155df3c1be90856f842be83ce621 SHA512 c54c22b25e250eaf4001b082565a3b22222a0a8ce9d704341719be20ac58a7ca45cb27fc7a7651007a47e46fbeaaceeaeafb5d8f139ad9ca7b826f18f4e8fdf4
 EBUILD selinux-prelink-2.20200818-r1.ebuild 283 BLAKE2B 7bc3ffe8630f0b9e66511702be222d066252fb6a92ab8b547c51bb931528828bd18c12e7000d591574a0fa2623d9b56a9dd9298690e09271a8a9adbdc9d63acb SHA512 f320c55acf21429d6dd65cb4c9f0085e2833bf1454b6a9b2e2777704295c208a41410ae62f6996a24be250e776efe51b95ea0e50d258b686b86e9f8927b1d202
-EBUILD selinux-prelink-2.20200818-r2.ebuild 283 BLAKE2B 979bfbfc1d033aa08b582f11a85bc766dccba971de429ffc629853d870cd0988acf3cc387b591ab3d7bd93efe93b29089a83cd7ed7c8743668f26dcfb1d5c782 SHA512 9495960ca29aa2238fc1f9343442ac003827e84d287cbf4cf58b225bf7531c2e4349137d1eaa121ca6a4551659656e4b2d76bc038e8feebf6ab5335afe4ab19b
+EBUILD selinux-prelink-2.20200818-r2.ebuild 281 BLAKE2B a7e62768364070a4e1bf0f3a128ca58ee241ea0b2dbe4ade2145d63b34a40240ca630e431fe322aefabf38c8e70e352b289f0dad6deb93fb038f2cbe27f968ec SHA512 7660d9b6b5acd5a478c04cfc6a0dfc053f1b4a6354cc21abb9ff4372e1dea886031b67908c2fc91e4c12971b31b64b4132df379ac656b5c3194b02ab4c2a52ff
 EBUILD selinux-prelink-9999.ebuild 283 BLAKE2B 979bfbfc1d033aa08b582f11a85bc766dccba971de429ffc629853d870cd0988acf3cc387b591ab3d7bd93efe93b29089a83cd7ed7c8743668f26dcfb1d5c782 SHA512 9495960ca29aa2238fc1f9343442ac003827e84d287cbf4cf58b225bf7531c2e4349137d1eaa121ca6a4551659656e4b2d76bc038e8feebf6ab5335afe4ab19b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20200818-r2.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20200818-r2.ebuild
index a7f873d95563..b5a1c143f7e7 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for prelink"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-prelude/Manifest b/sec-policy/selinux-prelude/Manifest
index 0a7ac3e2ddd5..64fe204a99db 100644
--- a/sec-policy/selinux-prelude/Manifest
+++ b/sec-policy/selinux-prelude/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-prelude-2.20190201-r1.ebuild 377 BLAKE2B 36729c48ac2ea726369673e2c448c7b1b500c2b54d5f5793400752eb40d7775a8935b8098f55acace87a32be169fb555ad51c8b0624fd56eb307480a41fd342c SHA512 81a1ede36ad804765689d895166a3e7182207f493c0c9d5bb8a9c157237421225e5390b1ae99f34e960c1c33406cfdd4b3298cc70ea1e4917776dd465e6933a6
 EBUILD selinux-prelude-2.20190609-r1.ebuild 377 BLAKE2B 36729c48ac2ea726369673e2c448c7b1b500c2b54d5f5793400752eb40d7775a8935b8098f55acace87a32be169fb555ad51c8b0624fd56eb307480a41fd342c SHA512 81a1ede36ad804765689d895166a3e7182207f493c0c9d5bb8a9c157237421225e5390b1ae99f34e960c1c33406cfdd4b3298cc70ea1e4917776dd465e6933a6
 EBUILD selinux-prelude-2.20200818-r1.ebuild 379 BLAKE2B 1e6fc0250258e1461edd36be4148b0bb215ae2ce22cf40dad57b7f2525790310227ff1fac1fb19f4b476a08a97bd6c6ba6d8210a5d375a77a43655a710b2514a SHA512 0bba79b655d3236225aecc62a179ada1378e930cee7809954ffa1a6a75173fe03365c7ae807544d573eadb06f7f22b9c4dd1d063bfeaedbea2d5bfa3d5bcbabc
-EBUILD selinux-prelude-2.20200818-r2.ebuild 379 BLAKE2B 10ab3498c7e0db647798f26128e1a6723ef9f93ead2be0f9774fc25c574b5ee09698ebfb592c9193429702f14eb619529bd602ba4d0baa922a4ffa17eb85b670 SHA512 fc7483801f3c7f1f2d6c85d38102de603b55f0937306329064774bd5d89ed3491167ba720bb14922e647ee2a20343609fa047b5a2e726e95eeec4b153f09349f
+EBUILD selinux-prelude-2.20200818-r2.ebuild 377 BLAKE2B 790da5c84a8da2ab469d4d6554ba5071efe6489d69bd8d06d1fb5d51ee90d7004a62fdc3487140c368e4912cf7dd81701839b98df75d1f34cc1c409826e56d09 SHA512 c38521cebff638ef862936305b7a93c269b8eff4893294f7b0dd1169a647b9a1d92d7ad4e9755dcf5dc0b47158491fb4a3338128854eab296abcb3892aa03bc9
 EBUILD selinux-prelude-9999.ebuild 379 BLAKE2B 10ab3498c7e0db647798f26128e1a6723ef9f93ead2be0f9774fc25c574b5ee09698ebfb592c9193429702f14eb619529bd602ba4d0baa922a4ffa17eb85b670 SHA512 fc7483801f3c7f1f2d6c85d38102de603b55f0937306329064774bd5d89ed3491167ba720bb14922e647ee2a20343609fa047b5a2e726e95eeec4b153f09349f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20200818-r2.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20200818-r2.ebuild
index 3a57fae7dbca..5a5e2170d83f 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for prelude"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-privoxy/Manifest b/sec-policy/selinux-privoxy/Manifest
index 9e52bd141c04..66b25199e252 100644
--- a/sec-policy/selinux-privoxy/Manifest
+++ b/sec-policy/selinux-privoxy/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-privoxy-2.20190201-r1.ebuild 281 BLAKE2B 9d4a68993832a1bdec4cb6e1cb552c0d8bd2e7ee149ee6ed4cb2f6ff582a34e3b02e3b8611c48cbeedfec88b449d08dda32ea031df8454e9da7c9778f77e118e SHA512 8fa84b5730db60a7503dddaa18c5fb2e82dbbcf9380ca58e9205a8ce678be9cce58d2a2a8fda78f369c9fde1fd87980c6050f2cd284b45ac70a0945d5e258cf4
 EBUILD selinux-privoxy-2.20190609-r1.ebuild 281 BLAKE2B 9d4a68993832a1bdec4cb6e1cb552c0d8bd2e7ee149ee6ed4cb2f6ff582a34e3b02e3b8611c48cbeedfec88b449d08dda32ea031df8454e9da7c9778f77e118e SHA512 8fa84b5730db60a7503dddaa18c5fb2e82dbbcf9380ca58e9205a8ce678be9cce58d2a2a8fda78f369c9fde1fd87980c6050f2cd284b45ac70a0945d5e258cf4
 EBUILD selinux-privoxy-2.20200818-r1.ebuild 283 BLAKE2B b357514452afe6c0405a68965ba5fa6dc3605222926f22741a13c1c56491c96ed15f462d403a84180028003a0334aea576fe0b28f97f5fb7cab57df25e9131e3 SHA512 ebde1e10d5c471b476e9dc03ba0408be116fd977fdb597c5b4e099aeb67ea5960ef90e50d70398bc02dc5dd2fd276abd4538dffec79d5d62748f67529bf01337
-EBUILD selinux-privoxy-2.20200818-r2.ebuild 283 BLAKE2B 2028b183bd5ced71ed63532291b4542581d4673564b2b2708238e426f2db56154e3efde876b881fb2df87ebb58d962a6e027d9b85e751937b2a34a2e0c55c521 SHA512 ca834de2c6ecb6882c93404f7d7202f3f707938cf7531c991b13a00164d061848bb8702a1e24a945b2c505ca324da55e2d81db0f1e773d2ea41c58acd45ad400
+EBUILD selinux-privoxy-2.20200818-r2.ebuild 281 BLAKE2B 4b0b3748a0cf8e9ae536dc5fb74e5e3417f7f46a396293499b0a6a62f5bc4bfbf45ed2611a644349ef178e001aff77cf63f032609aab8fbac99500964fa1a0ea SHA512 b0a9384e7058a23728211e7db2c073f447a70c9c84ed18c0490fb47f7c63df9ecdcfccb6f881df62bdd77320ed2a74b9beea84594c631fb72f671f385ff235be
 EBUILD selinux-privoxy-9999.ebuild 283 BLAKE2B 2028b183bd5ced71ed63532291b4542581d4673564b2b2708238e426f2db56154e3efde876b881fb2df87ebb58d962a6e027d9b85e751937b2a34a2e0c55c521 SHA512 ca834de2c6ecb6882c93404f7d7202f3f707938cf7531c991b13a00164d061848bb8702a1e24a945b2c505ca324da55e2d81db0f1e773d2ea41c58acd45ad400
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20200818-r2.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20200818-r2.ebuild
index 3b697c3f594f..c900864aaa01 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for privoxy"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-procmail/Manifest b/sec-policy/selinux-procmail/Manifest
index 17896ef5a819..700073af83ba 100644
--- a/sec-policy/selinux-procmail/Manifest
+++ b/sec-policy/selinux-procmail/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-procmail-2.20190201-r1.ebuild 283 BLAKE2B 0ba492443995f6715a520ceba5d1cf9052dc1e669dafe591b4934d8474a15299ab12a3384fa5b6f32dfdb871de8dfe4682a6676728ee2170430566d16f6129b2 SHA512 963b7045b67b20631949acb81886648ba02bfbb0001c04f17f0ed8d7758668a9f134461612dcdac0bf0f54bd6f944139d10df9474a56df0b86675c2b31f95b57
 EBUILD selinux-procmail-2.20190609-r1.ebuild 283 BLAKE2B 0ba492443995f6715a520ceba5d1cf9052dc1e669dafe591b4934d8474a15299ab12a3384fa5b6f32dfdb871de8dfe4682a6676728ee2170430566d16f6129b2 SHA512 963b7045b67b20631949acb81886648ba02bfbb0001c04f17f0ed8d7758668a9f134461612dcdac0bf0f54bd6f944139d10df9474a56df0b86675c2b31f95b57
 EBUILD selinux-procmail-2.20200818-r1.ebuild 285 BLAKE2B 69aee55525fe54dd2fc47117db418cdeac0fe2eb30f20ebbc1107bf42917ab5d7cd483263f827a45642da4c4069f430940197e5dbb0babd386d6f0f2dec59d23 SHA512 f16d65714726ddc3111cc13758ddd481369e5cc8dbe3a49fae3ad514c97d3af1bd0a34049fbf42e5e7feabf2bd90344c4c3fef9d2b589adad3cadbc1b9e37238
-EBUILD selinux-procmail-2.20200818-r2.ebuild 285 BLAKE2B 8fc5fd56921f88b460d78d157313d7696609c2539ee23f8deec56b9930391021e0c2f48432f4a910613a1b3ddc7a9d61e3fbf276dec7c77757a313833b9d0e09 SHA512 5d1854acf8018b0f825629b4510d6e41e29741fb66eaf80ace1b388e5333b61ea05324cf0925ae2483e651a898ffdb057af95307fdb697409d2c4ebc1c13805b
+EBUILD selinux-procmail-2.20200818-r2.ebuild 283 BLAKE2B ad25dac61e556baadd3e261aaf7ed55b29bc8e6b309c060326d733144b71c62cdde33cc856976c93530033c1081ebd6d8095ceab574f729fb3658c0b47cd0167 SHA512 b4035fd6280fdd0c4e08f97e4ae3c50bf4098072f8b52224352350d3ec09c406ef2c2668288a32d469b96e807abdd581f2f579933d01ad083dd57309bb95b654
 EBUILD selinux-procmail-9999.ebuild 285 BLAKE2B 8fc5fd56921f88b460d78d157313d7696609c2539ee23f8deec56b9930391021e0c2f48432f4a910613a1b3ddc7a9d61e3fbf276dec7c77757a313833b9d0e09 SHA512 5d1854acf8018b0f825629b4510d6e41e29741fb66eaf80ace1b388e5333b61ea05324cf0925ae2483e651a898ffdb057af95307fdb697409d2c4ebc1c13805b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20200818-r2.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20200818-r2.ebuild
index 1f8175689db8..3706be61731e 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for procmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-psad/Manifest b/sec-policy/selinux-psad/Manifest
index ab9c0e1d55a8..4fedc04ce65b 100644
--- a/sec-policy/selinux-psad/Manifest
+++ b/sec-policy/selinux-psad/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-psad-2.20190201-r1.ebuild 275 BLAKE2B 38eedf84ffc91f98d8e39f5c0ef80f492484021dbd3c1c36edacb3c101379d13f5a2fb2b84b04aaff68ea8736a3a746d085c60a943e8abeb738e98b19e64e366 SHA512 c996ee677514903f2a6156861a2e3090cf5e13081e9ace63a1a1d3d69a0c0c67682a8396bac806cc4879e9380b8078326553fc8cfae970d23e76d684a286fffb
 EBUILD selinux-psad-2.20190609-r1.ebuild 275 BLAKE2B 38eedf84ffc91f98d8e39f5c0ef80f492484021dbd3c1c36edacb3c101379d13f5a2fb2b84b04aaff68ea8736a3a746d085c60a943e8abeb738e98b19e64e366 SHA512 c996ee677514903f2a6156861a2e3090cf5e13081e9ace63a1a1d3d69a0c0c67682a8396bac806cc4879e9380b8078326553fc8cfae970d23e76d684a286fffb
 EBUILD selinux-psad-2.20200818-r1.ebuild 277 BLAKE2B 2fe861b036683a761b09fc3ad4c53d98f1293c229806d38dca28a6ca6b500115b0546087bdfb0fd7b196a56d67d78a219b976eccb0513721cd3b9a870bf0901e SHA512 ab17ee91d60c56281645ec2b6a52a918ae92855e8df4d41852c07dddfca35973d90007a0a43e2ad0c9c1e76459d1b3eed9d2a189b69e674c2b2c03b6a2696f41
-EBUILD selinux-psad-2.20200818-r2.ebuild 277 BLAKE2B 4398b373fdb4c89b399ffa28dec0473c4bffa9dc0094cf0a705536273845a103f50c7870c7002850d1b3b724e8a9a2eca087fa89a6489dbf4361d20115572a04 SHA512 6f9427f6589526f42ca48f9e5b2eaf427ec115c68f029c81203d2ae83e8f3ca52257657d4d5cfe28f0787d29d4bcad91be70a53e2584801300a84eb165a38ab3
+EBUILD selinux-psad-2.20200818-r2.ebuild 275 BLAKE2B 1f7f6ffc266d9fbedfd7111288da3d9f8084ca98fb5e058bfc12d7607c589ddda90e34110e7a4d0c1a668bdd9fe8dca767f1f6eca8106a4a01d3740dca989661 SHA512 05855ad03a8e6e58cc6274c798578ebdab0848a27e30d59e82f3a0709e02c22e8231f7df699155cf5e279622125a8700526215bbfa9b81d91d2a2d91d0a43b21
 EBUILD selinux-psad-9999.ebuild 277 BLAKE2B 4398b373fdb4c89b399ffa28dec0473c4bffa9dc0094cf0a705536273845a103f50c7870c7002850d1b3b724e8a9a2eca087fa89a6489dbf4361d20115572a04 SHA512 6f9427f6589526f42ca48f9e5b2eaf427ec115c68f029c81203d2ae83e8f3ca52257657d4d5cfe28f0787d29d4bcad91be70a53e2584801300a84eb165a38ab3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20200818-r2.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20200818-r2.ebuild
index b91b00040a82..82d37cf0b2bb 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for psad"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-publicfile/Manifest b/sec-policy/selinux-publicfile/Manifest
index eef33ddea69b..b753d7a710c0 100644
--- a/sec-policy/selinux-publicfile/Manifest
+++ b/sec-policy/selinux-publicfile/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-publicfile-2.20190201-r1.ebuild 287 BLAKE2B f59014bbd52702c4476ad8c0750f722fdeacd2cf4db91f78e998032c6237bd3b43ef8cd22010150ff359fcb5d46b42391f4e1d5f1c6f289caa9359cb54960211 SHA512 f5d7ac2b6e92a91ca3372a39cb751e16a7f93a813d198b2ce53e905d2fd8e37e44b685e881deb265af4f4ca859a91cee41d5ac3915500f4a7433ad243a82c5ff
 EBUILD selinux-publicfile-2.20190609-r1.ebuild 287 BLAKE2B f59014bbd52702c4476ad8c0750f722fdeacd2cf4db91f78e998032c6237bd3b43ef8cd22010150ff359fcb5d46b42391f4e1d5f1c6f289caa9359cb54960211 SHA512 f5d7ac2b6e92a91ca3372a39cb751e16a7f93a813d198b2ce53e905d2fd8e37e44b685e881deb265af4f4ca859a91cee41d5ac3915500f4a7433ad243a82c5ff
 EBUILD selinux-publicfile-2.20200818-r1.ebuild 289 BLAKE2B 32816713f4a336c67e7529944372f1d3b7f5ef3548a646b28618609d0726f9efb367b67a7ee41881f70a6bf7afae7d2c3e3ad9029d6baa3b547455631d0cd656 SHA512 a4b4777cd18b211a5f862684ad0d82d8bd982d70afde65aff4c8beaedbc91925137c83f894d360385be98d6530caf7a535563c84b5c1fb52b8d157d5603f126d
-EBUILD selinux-publicfile-2.20200818-r2.ebuild 289 BLAKE2B 648818f8699db6b4fa865f527db6419f4dcf347058243d17b5e928ebeda881027faffb8a85577f5b2b53c8fcd99e22eb46f99ee5f153aa03f3d21edc89869e41 SHA512 5a192581a23bb06180dd1321bd9ab025d7a9ae1fd16335d012341ee8cb58f8e25a1ba61e240ae13b6e023ed149415a0487b74f1e965988d455b5e47a258caef8
+EBUILD selinux-publicfile-2.20200818-r2.ebuild 287 BLAKE2B 22b8769758d6013b9be014bf577b8b66badfea1c7b86a584c4a060fd48021a79419d3dca2f7b9141268857d52f50e6980e7660659ef8fc118f614ff3f4f9e7fd SHA512 6d1ed426a7c00cad7625cf260401046c6ec653aec2e3c35c590a83a1f78c5fb2580f22f2848b98cf3df272f0034ed086bf0b36db3d57903e5519e2c8931033e2
 EBUILD selinux-publicfile-9999.ebuild 289 BLAKE2B 648818f8699db6b4fa865f527db6419f4dcf347058243d17b5e928ebeda881027faffb8a85577f5b2b53c8fcd99e22eb46f99ee5f153aa03f3d21edc89869e41 SHA512 5a192581a23bb06180dd1321bd9ab025d7a9ae1fd16335d012341ee8cb58f8e25a1ba61e240ae13b6e023ed149415a0487b74f1e965988d455b5e47a258caef8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20200818-r2.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20200818-r2.ebuild
index 49a6a90273fa..3440de28cc24 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for publicfile"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/Manifest b/sec-policy/selinux-pulseaudio/Manifest
index 1afd337654fd..c83667f6528a 100644
--- a/sec-policy/selinux-pulseaudio/Manifest
+++ b/sec-policy/selinux-pulseaudio/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-pulseaudio-2.20190201-r1.ebuild 287 BLAKE2B edde62e62f4d325c67dd1e0a065402fc075645ae94b1a990c66cd9b3a4ce264c97ee8b6a801a6a3b0f712d867fb394da6747e8c85520348ad8cbd290dff4109e SHA512 3f65d0cc73ec4eaa4557cb899e6a136eb2b2fb7a07ae3308e045c95bce0e789791eb0eb870fc88dde507a2c296f45124816e7b55a0d53ffc40bff22fe1d61517
 EBUILD selinux-pulseaudio-2.20190609-r1.ebuild 287 BLAKE2B edde62e62f4d325c67dd1e0a065402fc075645ae94b1a990c66cd9b3a4ce264c97ee8b6a801a6a3b0f712d867fb394da6747e8c85520348ad8cbd290dff4109e SHA512 3f65d0cc73ec4eaa4557cb899e6a136eb2b2fb7a07ae3308e045c95bce0e789791eb0eb870fc88dde507a2c296f45124816e7b55a0d53ffc40bff22fe1d61517
 EBUILD selinux-pulseaudio-2.20200818-r1.ebuild 289 BLAKE2B c6a330d93461d2d242ca22ce89695dc2ef4c96ec1fa9d6fe0f560884d972d6a5083fff55de44a29a16ee853772418033b3d1fd55a1027fd19b9265f7c18d95bc SHA512 0f35c69b3b1ecc4c3d5ac93e86ac6240c1d1b469d3425942e7f5b91cd26a0ef55bcae47ccf91f0ba042a432f8955a03fbeb23609cb08caca94a6a3c38dc7f160
-EBUILD selinux-pulseaudio-2.20200818-r2.ebuild 289 BLAKE2B addd5dbb8790d8b564469f5682af276fb79dee014dd96b810fd8206690079366996a0cd298433379d36b24758cdc5d7b7bfcfe5593085447849a9d1320bbb13e SHA512 273415910363b3810f7fda75f05ca01f020b56a512255b11a5b26613ee29d6cf32497255b87278237ba8fc44255ba372ac99d2f1eb84ceef371a14e62c69447d
+EBUILD selinux-pulseaudio-2.20200818-r2.ebuild 287 BLAKE2B 2de0f3754c2c0e09ac01df36ba2862a62bc594011d7989aa849e44be0f7ef4a61e6cc673bccbfa040e3363649159f3f59f52d976ff3d5ba3f40b55a991bcf3de SHA512 d98381f598d65852886efd8fe80f921b018769005f0da13c0761f81be1892f7b9b6b4622e243b298e6e84dfddfbe4d02d37a517f1fa818f11afbc741efb87d78
 EBUILD selinux-pulseaudio-9999.ebuild 289 BLAKE2B addd5dbb8790d8b564469f5682af276fb79dee014dd96b810fd8206690079366996a0cd298433379d36b24758cdc5d7b7bfcfe5593085447849a9d1320bbb13e SHA512 273415910363b3810f7fda75f05ca01f020b56a512255b11a5b26613ee29d6cf32497255b87278237ba8fc44255ba372ac99d2f1eb84ceef371a14e62c69447d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20200818-r2.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20200818-r2.ebuild
index b08db9da9308..21805e11fe7e 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pulseaudio"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-puppet/Manifest b/sec-policy/selinux-puppet/Manifest
index 39f32db53b05..4edce8139ea9 100644
--- a/sec-policy/selinux-puppet/Manifest
+++ b/sec-policy/selinux-puppet/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-puppet-2.20190201-r1.ebuild 279 BLAKE2B f17f9fd15dc1c51693ded8a0cfa9dad8b50cf3a697962ec847a2a8741e5a781e431634825dea9b59a2dbaada0e0d1a6524ed7e18f9ada846fab4e5a5d8795f9c SHA512 4d7a270fe6b7f3b66857d24d5053f29acb248cd4f8f3dbcf6e697d4df0b65b3b0da0d2ed6fc6f0db73f679c90afc3d47c2d8e3d72e3d90e6f9a9feece4701ed5
 EBUILD selinux-puppet-2.20190609-r1.ebuild 279 BLAKE2B f17f9fd15dc1c51693ded8a0cfa9dad8b50cf3a697962ec847a2a8741e5a781e431634825dea9b59a2dbaada0e0d1a6524ed7e18f9ada846fab4e5a5d8795f9c SHA512 4d7a270fe6b7f3b66857d24d5053f29acb248cd4f8f3dbcf6e697d4df0b65b3b0da0d2ed6fc6f0db73f679c90afc3d47c2d8e3d72e3d90e6f9a9feece4701ed5
 EBUILD selinux-puppet-2.20200818-r1.ebuild 281 BLAKE2B 4593c183d285e67a9acb698549c79274482a6be17eab5d4d73d6cebcee8984e8ca38375d221a68f3ed766efc7120e74d4b3ec62091ce34861812d4428d27640a SHA512 f236a2ab1823550451e52dfaa481b212520347d1731ca021b380cd740e86cf0cf30e953b3cf2e3e266b734df92f3f55ad69ba9a15979e7b8a4197808d3eb38c5
-EBUILD selinux-puppet-2.20200818-r2.ebuild 281 BLAKE2B 647dec3b66eed6d1f66a5e5c13840ea5f7c70a15afa6d44e1a6bcabd7aec989b5b770773dc8bbb2d46739e5414cfca3d623599b08ad3ac3e03e4df412c8f5c4f SHA512 01a672aaf11e909d6b0fe17c6dff4b6b0e65c7f96306df85d2e92ea79586bcaf131a58864638fb95033d6721c4d28a3899c61b665c31ec77d4f75225217f25e0
+EBUILD selinux-puppet-2.20200818-r2.ebuild 279 BLAKE2B 61384b410c78cb80ded6aa770bc779018901b5d29f933a7a604144b93dc8422b69c10ba20c43f5f1197d92e336d291e7b6bb26faca90ab429d4836248eb5ed43 SHA512 fa26ceb2c5a1d4a01934087a7a834a902fa22949dadaecba8b0631ff41f55feac9c49523f9787711e9882e616deaef3327eebbc04f3bdb2515dd4e1ba48abdf8
 EBUILD selinux-puppet-9999.ebuild 281 BLAKE2B 647dec3b66eed6d1f66a5e5c13840ea5f7c70a15afa6d44e1a6bcabd7aec989b5b770773dc8bbb2d46739e5414cfca3d623599b08ad3ac3e03e4df412c8f5c4f SHA512 01a672aaf11e909d6b0fe17c6dff4b6b0e65c7f96306df85d2e92ea79586bcaf131a58864638fb95033d6721c4d28a3899c61b665c31ec77d4f75225217f25e0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20200818-r2.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20200818-r2.ebuild
index c721b3ae89da..364a40a5ed69 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for puppet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pyicqt/Manifest b/sec-policy/selinux-pyicqt/Manifest
index 98bd9df638d5..85a46a792da9 100644
--- a/sec-policy/selinux-pyicqt/Manifest
+++ b/sec-policy/selinux-pyicqt/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-pyicqt-2.20190201-r1.ebuild 279 BLAKE2B d003e81ef8067d9cce78d1ad911a14ba7f5c006adc5486177607c7d9f7ec7a24ccce65c3cd02cc9c3aceb77a4f6f309b04b1029cc520ab70f16b0a2e16547927 SHA512 d0ac5e93a361db8531082f47b9e9a48e239594be1a2e0d29971a149b4fef6ef7066e757dd009de905568e809503ae27fad783741faf3f5711c94e522dc2f20e2
 EBUILD selinux-pyicqt-2.20190609-r1.ebuild 279 BLAKE2B d003e81ef8067d9cce78d1ad911a14ba7f5c006adc5486177607c7d9f7ec7a24ccce65c3cd02cc9c3aceb77a4f6f309b04b1029cc520ab70f16b0a2e16547927 SHA512 d0ac5e93a361db8531082f47b9e9a48e239594be1a2e0d29971a149b4fef6ef7066e757dd009de905568e809503ae27fad783741faf3f5711c94e522dc2f20e2
 EBUILD selinux-pyicqt-2.20200818-r1.ebuild 281 BLAKE2B 0ea2137a4cc93801b3e4936cd73ef3adbfd4374783245d589adf5fd622b575907174ce47538d358e4b12834fe3f7328b68b3e863b9a55723788740c15bfd3a86 SHA512 a7f53e83466870911144a66dff3460d5832de9d685fc14ee39b996c69928f31a3a8d7dae0e301ea3d6ff84b763d897104ec24e01984ad37c779c0bc6d5bfcaf3
-EBUILD selinux-pyicqt-2.20200818-r2.ebuild 281 BLAKE2B 60d248b3dee62c541907378fb300232cce00e39367a157632a62a530ce145bbc4d99e13d498b46c93f02712a266833e57c76382d19790cc0104ebfd50fe3cf1c SHA512 502f70f9e8b9665956f140fe48232d4521c5e654a5f6c0a7a6495bc342e5367471d70b3d8c36aa01917da4170a769852e6a75699dad6838388acf1ab7da87cfe
+EBUILD selinux-pyicqt-2.20200818-r2.ebuild 279 BLAKE2B 389e29d3e678b427fa8cd1990bd8fbdac148e9a5687c7b5316de7ce8dae28eb1615eb0d0e9ffbe3de15bb8d86285eaef7c746da670d9e4bc83306d11169fa3c0 SHA512 4376e09412f985d17e0dddb0d0f60c397e96b14c95eb7aed2ba01c40668bf613aa33f9b081974520804705c79596c9946cce7bf224619d13205ad253a53cec95
 EBUILD selinux-pyicqt-9999.ebuild 281 BLAKE2B 60d248b3dee62c541907378fb300232cce00e39367a157632a62a530ce145bbc4d99e13d498b46c93f02712a266833e57c76382d19790cc0104ebfd50fe3cf1c SHA512 502f70f9e8b9665956f140fe48232d4521c5e654a5f6c0a7a6495bc342e5367471d70b3d8c36aa01917da4170a769852e6a75699dad6838388acf1ab7da87cfe
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20200818-r2.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20200818-r2.ebuild
index ea5279775b8c..d50810cc0e24 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pyicqt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-pyzor/Manifest b/sec-policy/selinux-pyzor/Manifest
index 2d557baad8c5..a411259fff7f 100644
--- a/sec-policy/selinux-pyzor/Manifest
+++ b/sec-policy/selinux-pyzor/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-pyzor-2.20190201-r1.ebuild 277 BLAKE2B fce32157f155ed1de539056072ef7a9a531c91628f40f17553212bd98cbf18988ba0c4de809a4706e6a6d4d015deb6771a3d0769537ad8e1e1d74af37a0a4158 SHA512 73a921f3b5daf63d307fb82ee37d873b5dd794891669b9b4f18d21d3c508a0d654ae9d99c7716861748ddfd04dda9ba50331be4fb50e6b05a7fb1af4f9c167e8
 EBUILD selinux-pyzor-2.20190609-r1.ebuild 277 BLAKE2B fce32157f155ed1de539056072ef7a9a531c91628f40f17553212bd98cbf18988ba0c4de809a4706e6a6d4d015deb6771a3d0769537ad8e1e1d74af37a0a4158 SHA512 73a921f3b5daf63d307fb82ee37d873b5dd794891669b9b4f18d21d3c508a0d654ae9d99c7716861748ddfd04dda9ba50331be4fb50e6b05a7fb1af4f9c167e8
 EBUILD selinux-pyzor-2.20200818-r1.ebuild 279 BLAKE2B 931ee3a9f03d126b94daa51fcfb6e0951038e5bf3ec8f58be830af7424ef5088bdb189dedc0fe3f95679c4fbef3ba5d11f8885a4791aec6dadf7485d97ebfb80 SHA512 9f519ec3b9f783045586256895d6970a4eff43df97484758397b6a7b5c655e5cc5e7c33dc1994575c47dede026b67c64463cc54f2d3071ea43cde3349f33b6db
-EBUILD selinux-pyzor-2.20200818-r2.ebuild 279 BLAKE2B 1d7fc2765b6216c380751ab9e8a200bbf5c2d86f7a9f38ae8a0bc8def612ccc20df6b6906648ff433ee196040a9dbb27b46511d686ad0cd712112c598400f2b4 SHA512 819c779eb7619bc47f7f50f6531eeb2a41e94c3a190a4f6954dc3bee33f5842201dde5f20e7acc968181167d3d9666835d893fa5a161612537a9c7daeb70d9b2
+EBUILD selinux-pyzor-2.20200818-r2.ebuild 277 BLAKE2B 88c3aefb85df8f089cf646f99f335f42e4f604dff6ada0c19833b74f0f907e99f7e84faed7e0ccb8ddc8c801226ba01193154efe94957375e287573d65897726 SHA512 c7e008e3917019ca442b6484c16b735706caede478a8d4a5929efc6468288ea3da125a894997b6d0fe397c213dbacf1b0c5f8e297d5614cf67401ccb1b697816
 EBUILD selinux-pyzor-9999.ebuild 279 BLAKE2B 1d7fc2765b6216c380751ab9e8a200bbf5c2d86f7a9f38ae8a0bc8def612ccc20df6b6906648ff433ee196040a9dbb27b46511d686ad0cd712112c598400f2b4 SHA512 819c779eb7619bc47f7f50f6531eeb2a41e94c3a190a4f6954dc3bee33f5842201dde5f20e7acc968181167d3d9666835d893fa5a161612537a9c7daeb70d9b2
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20200818-r2.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20200818-r2.ebuild
index 4e42f5d83f67..2b28027a788e 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for pyzor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-qemu/Manifest b/sec-policy/selinux-qemu/Manifest
index 753878c0b351..73ffec6bcf28 100644
--- a/sec-policy/selinux-qemu/Manifest
+++ b/sec-policy/selinux-qemu/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-qemu-2.20190201-r1.ebuild 367 BLAKE2B b37e06d3494f6086963c4d0122fac46c00bd9701b1b35d556f090b2227f431edb94864aaaeee7d7fda2fa9dd53a466324783eccb9403b99f5d54c738af4e9848 SHA512 5724d5e53b5e879f3ac518cfc02ba530cf4277e2e82eecc05dfa90d040208fd8d01d07d5b9b1c1781b3a2fd79b8fc7c659dc569fb7d3d3fdf32db02a3c40ec83
 EBUILD selinux-qemu-2.20190609-r1.ebuild 367 BLAKE2B b37e06d3494f6086963c4d0122fac46c00bd9701b1b35d556f090b2227f431edb94864aaaeee7d7fda2fa9dd53a466324783eccb9403b99f5d54c738af4e9848 SHA512 5724d5e53b5e879f3ac518cfc02ba530cf4277e2e82eecc05dfa90d040208fd8d01d07d5b9b1c1781b3a2fd79b8fc7c659dc569fb7d3d3fdf32db02a3c40ec83
 EBUILD selinux-qemu-2.20200818-r1.ebuild 369 BLAKE2B 2efcfd91667d809b7927cabc60c022a7436dfe968c5d422411f6ea9b150c09c6fcf3fb8e180ea1bb2011c6649bdc1ac3bc65f9faa7949cfe79af8b29c9bb067d SHA512 a602e25c165647dc97b7f0b77f4c678f6392dd5886d3481f67d1a28d0e8b65423305dd6bf807f26d24fb3ae09ba83e54858b57ed2eec83ea90e23cf1c5c9fccb
-EBUILD selinux-qemu-2.20200818-r2.ebuild 369 BLAKE2B 48b38fce6740eff32e94a3703694f67b2e94cae561c40ec8d9113b0ef9171dff407dd277f8d65aaf78237edaa717ff35ac3f875381318ca562a34524dc77a461 SHA512 d24cc7d6b29e65aa832e7d0af621b14ce4edae2fa1f103228639d46296236cc3d62ea37476f829e3aa89fb5a04a5fe9ea3c93ee898d1e246d1fe18bbd34cee0a
+EBUILD selinux-qemu-2.20200818-r2.ebuild 367 BLAKE2B 533bed411c9aa3c2facbe361222d15fa0dd971f6f4d44ec8a69e29fde901466357d3b608ccf2702eb6834532e60948e2e412ea010e557bc32b1fd7229bd9f3f9 SHA512 bfaf1a79ec6093c2bddc8631e70e22acbd8ffc696dfa4348b2f9be8272adb65b156c0f62a98f21de687c4587e446807e6933418b1ca09d53be2647ad1378d6d6
 EBUILD selinux-qemu-9999.ebuild 369 BLAKE2B 48b38fce6740eff32e94a3703694f67b2e94cae561c40ec8d9113b0ef9171dff407dd277f8d65aaf78237edaa717ff35ac3f875381318ca562a34524dc77a461 SHA512 d24cc7d6b29e65aa832e7d0af621b14ce4edae2fa1f103228639d46296236cc3d62ea37476f829e3aa89fb5a04a5fe9ea3c93ee898d1e246d1fe18bbd34cee0a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20200818-r2.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20200818-r2.ebuild
index cb3a72fa2258..b93fd3c696b4 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for qemu"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-virt
diff --git a/sec-policy/selinux-qmail/Manifest b/sec-policy/selinux-qmail/Manifest
index 339fa3e72398..0e8e8ad9ef22 100644
--- a/sec-policy/selinux-qmail/Manifest
+++ b/sec-policy/selinux-qmail/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-qmail-2.20190201-r1.ebuild 277 BLAKE2B df1eefd6d3cad3d2fbf9f359a85c90bed4478b559de742a498161ee008cdba9f7729e1293dd7de2aaff09acf4a57569fb65bc918bdeffe78a14258a400857d4c SHA512 556e1801db80acfd7ce13174d924eb1fcd5086978a8e4a03df0f1816a5b038d0edeaf03ca62b9057edd755380c9cd40c6a2db9e11a8c32092836a1150bcaf8d9
 EBUILD selinux-qmail-2.20190609-r1.ebuild 277 BLAKE2B df1eefd6d3cad3d2fbf9f359a85c90bed4478b559de742a498161ee008cdba9f7729e1293dd7de2aaff09acf4a57569fb65bc918bdeffe78a14258a400857d4c SHA512 556e1801db80acfd7ce13174d924eb1fcd5086978a8e4a03df0f1816a5b038d0edeaf03ca62b9057edd755380c9cd40c6a2db9e11a8c32092836a1150bcaf8d9
 EBUILD selinux-qmail-2.20200818-r1.ebuild 279 BLAKE2B 602a476c140452db26705d8d43842e1dc73b2de7d53ca196100820aab5f2a0d054697a022e5f3908a49a31c8b9e855f0af84e60f2bb9cd9f25348d67890d30b5 SHA512 a0eb1cd2cd0e7f349f13f6fbc58ae96a6c87370892ccb89815b0317f3ecb460352f4c79ba0b32290622f25d2ffbb246720012ab8cb6c1c76b296854795418aaa
-EBUILD selinux-qmail-2.20200818-r2.ebuild 279 BLAKE2B 148a4574023309817c392220f2466649f6a790875ec0e72dada18b6e6ed3dc43102d937b1eb37ab43ed57334cef9ff72182f544b29dbad4219b42714c729cdb6 SHA512 3a8f969f93cdfbac6c70e26bba107315ae0227429658ba7c74541ae2a43a51df174a52f584655b1626a421dffd3c8a28efe8c4bf281b4cdb369219271e650827
+EBUILD selinux-qmail-2.20200818-r2.ebuild 277 BLAKE2B d63766924f1aba016e1ba18c2ac71e35962eee931a7c5d77ba0af6a981b66a4f4c2c1cb68c060e66abfa8221452eb13a09f48043565c85617a7788e3a33c0f2d SHA512 8b97bcf524ad68dd3e31242989c4dc56d1611825ab9692adf5bc8ed5f04e7901a5f0934285e7edb68586cb93afa41d0ef587e33857f9df15ca1016a1a2120f45
 EBUILD selinux-qmail-9999.ebuild 279 BLAKE2B 148a4574023309817c392220f2466649f6a790875ec0e72dada18b6e6ed3dc43102d937b1eb37ab43ed57334cef9ff72182f544b29dbad4219b42714c729cdb6 SHA512 3a8f969f93cdfbac6c70e26bba107315ae0227429658ba7c74541ae2a43a51df174a52f584655b1626a421dffd3c8a28efe8c4bf281b4cdb369219271e650827
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20200818-r2.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20200818-r2.ebuild
index 8f30b5e28ed6..089c1f7c9188 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for qmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-quota/Manifest b/sec-policy/selinux-quota/Manifest
index 67b36f4e7394..2f3379baac08 100644
--- a/sec-policy/selinux-quota/Manifest
+++ b/sec-policy/selinux-quota/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-quota-2.20190201-r1.ebuild 277 BLAKE2B 4873435866ebf5a02df124aa213e5fc6cd0d8323cf85c4b579c8fc3e376befd2d0fdcec3b9b51e01a209fce1f4b23184e0a49c61bc722ae5978f99d30153efc0 SHA512 1bc30bf332cfdba0799a89116799794430615bc74cb9cb907924122b3f10ccb980035e513d933b5f7b6b8160968053fdbe2181b0fd9544b303c8f1de373a8138
 EBUILD selinux-quota-2.20190609-r1.ebuild 277 BLAKE2B 4873435866ebf5a02df124aa213e5fc6cd0d8323cf85c4b579c8fc3e376befd2d0fdcec3b9b51e01a209fce1f4b23184e0a49c61bc722ae5978f99d30153efc0 SHA512 1bc30bf332cfdba0799a89116799794430615bc74cb9cb907924122b3f10ccb980035e513d933b5f7b6b8160968053fdbe2181b0fd9544b303c8f1de373a8138
 EBUILD selinux-quota-2.20200818-r1.ebuild 279 BLAKE2B ff61f3aadb01380221699faa59f9107d0148bbea11eba06381eb201ec97734d02b670724b00ef56772fc4da8f6725c6c9d7506f4fd4da5368087813446610cb4 SHA512 a5594a4f893c7725002540de7751221064de4330549a49fd351bfcd0924cb0baca8badc4de87bf610bc61262c75e4d345993d6630f1fa006d8a4bba4791cd490
-EBUILD selinux-quota-2.20200818-r2.ebuild 279 BLAKE2B 9f70c206ce65a00e1ca80eca5bf4f777548e6e9315abf7bc87987527bec636be665dfdcbc4fc059f7606a4616387edf94d1e5ce5d21187c6317d0014eff3eecc SHA512 e7353f3be6275408de8a97c60371fdea6693da81f10d8586d8196243d0a06efc2e2bb72384ff053804c2e78e107851245cded8e31f95a66d9e1b44ee96fce5b4
+EBUILD selinux-quota-2.20200818-r2.ebuild 277 BLAKE2B 6b6db48df1f0d69057053c33c73db261b3eca56ea891558c743028a073348aeb4949b05c5589d219429d91919ad483ee53a6952140f38c1f0ddae1f586346da8 SHA512 35d912e9bdfcde78e7634893833104b2663a67b40b97eb11ca33b73b0c0795009084076082edd10c6c42c3f2ccfacc83640ad446fca7101faa7d9ef5b5257f49
 EBUILD selinux-quota-9999.ebuild 279 BLAKE2B 9f70c206ce65a00e1ca80eca5bf4f777548e6e9315abf7bc87987527bec636be665dfdcbc4fc059f7606a4616387edf94d1e5ce5d21187c6317d0014eff3eecc SHA512 e7353f3be6275408de8a97c60371fdea6693da81f10d8586d8196243d0a06efc2e2bb72384ff053804c2e78e107851245cded8e31f95a66d9e1b44ee96fce5b4
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20200818-r2.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20200818-r2.ebuild
index d43cc8a24601..e2344979c664 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for quota"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-radius/Manifest b/sec-policy/selinux-radius/Manifest
index 033952f0b542..39507fbff84c 100644
--- a/sec-policy/selinux-radius/Manifest
+++ b/sec-policy/selinux-radius/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-radius-2.20190201-r1.ebuild 279 BLAKE2B 3c7682615146b94e09fc7e90bca1eaa79fd5691da16b65fb0669a20284cd233bbc509f4d38837a1aeed9a873eee5559c7c8fcb9e223e8b015ceb86be284651e0 SHA512 3ff39216cd13c56573d97be8b777af1e915df22eab4f071bba11c4897b76ddb696e74e44cb724c993962dd3cceeb013c07ead234932db76981cf6ad4d26575f0
 EBUILD selinux-radius-2.20190609-r1.ebuild 279 BLAKE2B 3c7682615146b94e09fc7e90bca1eaa79fd5691da16b65fb0669a20284cd233bbc509f4d38837a1aeed9a873eee5559c7c8fcb9e223e8b015ceb86be284651e0 SHA512 3ff39216cd13c56573d97be8b777af1e915df22eab4f071bba11c4897b76ddb696e74e44cb724c993962dd3cceeb013c07ead234932db76981cf6ad4d26575f0
 EBUILD selinux-radius-2.20200818-r1.ebuild 281 BLAKE2B 471673a6e3653af4b80f5c5a08faed75007a39d174c536f4e001a3ef4e01e05ab889f960a8a400ef30c29221f48280d53462239c085bfb429cbc4e9fe75d83d1 SHA512 46d46324bb59b82e6a051f96fa792aff39023c422357f4ae7241d2e1a1226adafe2741a8c57703fcc11652a8bcf7198f2ddda6e337f4d6d29b891ef8252f5082
-EBUILD selinux-radius-2.20200818-r2.ebuild 281 BLAKE2B 1ef2c9176705b434492ad0d01bef43c8c688ace59f817390d1bd872a94d1c053277cca9df28869467dc4e536ead955b5d3bddd6fb4dacfcfef8b70348670f38f SHA512 c955a02642648602789e4d9e9b6e808c7a65eb17cf9830afdf4bf5acc2c01570ef025fde4ab2b7eea51824ee9dfff8a272dddeda167284884c5cfedc513a2273
+EBUILD selinux-radius-2.20200818-r2.ebuild 279 BLAKE2B 5d3218340ad75e281fddf91bb72e9ad02015e4398317773b87d8400ff41fd563afc9f0c1669cdf46cda6ab8f03f0fbacd7ba62c2cf6375012f33397c722a705d SHA512 d5f08a1709f06eaa258e2b801e38845f83caa4d32c696a4047b06daeff9f6bc28a6ee01f090e2be448ebf546399248888f452e4aa5cb164f720d55186a76ebb1
 EBUILD selinux-radius-9999.ebuild 281 BLAKE2B 1ef2c9176705b434492ad0d01bef43c8c688ace59f817390d1bd872a94d1c053277cca9df28869467dc4e536ead955b5d3bddd6fb4dacfcfef8b70348670f38f SHA512 c955a02642648602789e4d9e9b6e808c7a65eb17cf9830afdf4bf5acc2c01570ef025fde4ab2b7eea51824ee9dfff8a272dddeda167284884c5cfedc513a2273
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20200818-r2.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20200818-r2.ebuild
index db6afa344ed4..5f864eef11fc 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for radius"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-radvd/Manifest b/sec-policy/selinux-radvd/Manifest
index 02f70f4c7d84..d6a89e51774b 100644
--- a/sec-policy/selinux-radvd/Manifest
+++ b/sec-policy/selinux-radvd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-radvd-2.20190201-r1.ebuild 277 BLAKE2B e1cfe171b940eda991c3756f9c0f26f55ec9ba561ad907fdcce409884c83201f8fc12fe09d9b31915807ff28f3766de7d836cec37d843c340651cfdaf5f40c12 SHA512 c072dc95eb8f061f0ac6a52c15a7366cf99daab1e52a8aa631f7857ccb90bb4a53a2576a00c11aea0db223611b938ef818fee6b8a480b5f345fa30fa4ac316cd
 EBUILD selinux-radvd-2.20190609-r1.ebuild 277 BLAKE2B e1cfe171b940eda991c3756f9c0f26f55ec9ba561ad907fdcce409884c83201f8fc12fe09d9b31915807ff28f3766de7d836cec37d843c340651cfdaf5f40c12 SHA512 c072dc95eb8f061f0ac6a52c15a7366cf99daab1e52a8aa631f7857ccb90bb4a53a2576a00c11aea0db223611b938ef818fee6b8a480b5f345fa30fa4ac316cd
 EBUILD selinux-radvd-2.20200818-r1.ebuild 279 BLAKE2B 22c0bdb9a9455f8abaf313c92e0df44957de0cfb8ad9eedb5a592b9175506d3aaf5b2aaeb230dd54f83f431cd1fb295b049c233d8cf4c6ca0aa2859548fb86a5 SHA512 a52272286b8df9a18472f0a9a6c5153283431cfb6bc72c555ee1a032be7bd98d3f02f639be5e75539adffc4867e1be56817fd4afec6433fc0391a0457e7e9bf5
-EBUILD selinux-radvd-2.20200818-r2.ebuild 279 BLAKE2B 55f295bd660c83ad434a546b48bd65a4cb13f94109095d6f5598c30cbde93fd2ccc1a547938909e62aee39cb3f30c3504cd1abcc049ba7f880c79a712768acf7 SHA512 dd914c329929732eb4a60ca6e721502c63fdcef811bcd5d906760e729a8fe3906b9fab488160f59c182065de42c5c65ca25a57719a0e975188b67cf570045130
+EBUILD selinux-radvd-2.20200818-r2.ebuild 277 BLAKE2B 0e7a514c8d63ecb1c45e94720d3b8f20e35efdeccc71e7de67adf6d7545e8fecf3ce2625368f9e4b916e02379bc484e1fbf09ff54075cbc75ed54fee4455c975 SHA512 8edacbb7e494cac2a0ac110d574f4d495a85498068af3c997dc4ffc4e38f0823ae137a9190e34a6d32e16a66c9c8192e9a1d40b2603212d728345507613c3096
 EBUILD selinux-radvd-9999.ebuild 279 BLAKE2B 55f295bd660c83ad434a546b48bd65a4cb13f94109095d6f5598c30cbde93fd2ccc1a547938909e62aee39cb3f30c3504cd1abcc049ba7f880c79a712768acf7 SHA512 dd914c329929732eb4a60ca6e721502c63fdcef811bcd5d906760e729a8fe3906b9fab488160f59c182065de42c5c65ca25a57719a0e975188b67cf570045130
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20200818-r2.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20200818-r2.ebuild
index 5eb95e31694b..946bbdd12e59 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for radvd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-razor/Manifest b/sec-policy/selinux-razor/Manifest
index 959150bde99c..fde07bf3118a 100644
--- a/sec-policy/selinux-razor/Manifest
+++ b/sec-policy/selinux-razor/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-razor-2.20190201-r1.ebuild 277 BLAKE2B 7d555e27dfc8a70204b4d55c97264393de7e60dbecfb144d75e697121a46d08f429feee94a1d78d3f71ac822a45a1dea00fe370dda14f81e51e2f2f49728224f SHA512 31d004ab897bc4ddee449c5a459975cc8e03a288430df5391ff2fa73d55a70b39b8646aa4be4907eceb1166da2f0a8aaf9352f6524798883fd766661eeff19f0
 EBUILD selinux-razor-2.20190609-r1.ebuild 277 BLAKE2B 7d555e27dfc8a70204b4d55c97264393de7e60dbecfb144d75e697121a46d08f429feee94a1d78d3f71ac822a45a1dea00fe370dda14f81e51e2f2f49728224f SHA512 31d004ab897bc4ddee449c5a459975cc8e03a288430df5391ff2fa73d55a70b39b8646aa4be4907eceb1166da2f0a8aaf9352f6524798883fd766661eeff19f0
 EBUILD selinux-razor-2.20200818-r1.ebuild 279 BLAKE2B 66a13327b6499ff9db45a2efe440628910481557057cc21283cab966bb7945b6fffd7924cd8ca1ddc26836107d63d5fd3f2990a2fff5415296fe3ca84cfaad85 SHA512 f8b8493147d66d7cf9603d5c21d38e5356af478525414e099e747c24a75b582362b1289e3e6e9d22a780823190f5f4bff287d117d4b8a5e68433b0a0aa9b9822
-EBUILD selinux-razor-2.20200818-r2.ebuild 279 BLAKE2B dcbc86e2c28078c933f8f0c5bacf4c1a8255a480c48f9d97884e19a6a62bfe5e384ab10c9374c33b578a359b223ce4f019077a58edfda65829a37b5596c51046 SHA512 30a61dda8e023f10511da5121c110c8fe532f61064d9ee3ab793dc7b82a651c36e150c902d94f0d59cbb8350753e8ed086c194c471e747f0a3019935c990f2ae
+EBUILD selinux-razor-2.20200818-r2.ebuild 277 BLAKE2B b9a43eb99d284ab2b6ac2193a3feddbe0a40afc3153ea74d111215690dfd5bc3d515ea702eb38b626c3eed9154cd5a117863ce741fd5ffe9a0c2cd20d46dcc48 SHA512 cb996e76289daa41f4d2ec3d0750f4a1a5a98458f886aa56cb0c4213bd61a355d4d64c90844a223d47adf2ed6a17802d40ccd18587320bc3d59bfb865a795e6a
 EBUILD selinux-razor-9999.ebuild 279 BLAKE2B dcbc86e2c28078c933f8f0c5bacf4c1a8255a480c48f9d97884e19a6a62bfe5e384ab10c9374c33b578a359b223ce4f019077a58edfda65829a37b5596c51046 SHA512 30a61dda8e023f10511da5121c110c8fe532f61064d9ee3ab793dc7b82a651c36e150c902d94f0d59cbb8350753e8ed086c194c471e747f0a3019935c990f2ae
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20200818-r2.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20200818-r2.ebuild
index 64c031478b4d..d7f552db63f9 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for razor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-redis/Manifest b/sec-policy/selinux-redis/Manifest
index a3c39a3be66a..533b51b2515e 100644
--- a/sec-policy/selinux-redis/Manifest
+++ b/sec-policy/selinux-redis/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-redis-2.20190201-r1.ebuild 277 BLAKE2B 927268f70a375cb34cde082c7fd0c7bf14521e868724ed09b360bd2ccfde9804bae801d017320efbefa8c53bb59fb26580546b6cb6047c7b0300557fbf3a5c40 SHA512 dbbcbfd2282784268278d7bf8f583ba69bf1a71be225641271858bfe5c1d6c3cb4d2ca9a84d7ec936d8d07b89acbcc2edca216f9c9fcbccc273bc68224212fdb
 EBUILD selinux-redis-2.20190609-r1.ebuild 277 BLAKE2B 927268f70a375cb34cde082c7fd0c7bf14521e868724ed09b360bd2ccfde9804bae801d017320efbefa8c53bb59fb26580546b6cb6047c7b0300557fbf3a5c40 SHA512 dbbcbfd2282784268278d7bf8f583ba69bf1a71be225641271858bfe5c1d6c3cb4d2ca9a84d7ec936d8d07b89acbcc2edca216f9c9fcbccc273bc68224212fdb
 EBUILD selinux-redis-2.20200818-r1.ebuild 279 BLAKE2B 845ba1ac90776ec6df901e0c1da1d7da86a3cebd0118bb445c242e7792ae5abea6825d2dac55dd74599eb7fcd7d00c38b262784cfb94eee9126cb37c50507b04 SHA512 c18280de64a7fd9c0f9d21bddd5a893f6e6bd3ae490d0fb669311c588e2fe7d78c8a23a6fe4e44a642ffe0b1603c65e7239546c0367b849b8a837ba2c5f902ed
-EBUILD selinux-redis-2.20200818-r2.ebuild 279 BLAKE2B 8fef9bec457f36ebd16573dea72ba012fc2d831d67c653dba6f3595c6737922f9b5a00c090b1f36988e3180304df752aafab6eb35ce5d2ab27f30aaae7c52d77 SHA512 f44af72aa74476926607618d2b6a6baa11b0bce4362cca088fa8065151131781da0c0e37a15668b6a6e9becd64e7c23a1e90776efd2c43a10585027c27c934c3
+EBUILD selinux-redis-2.20200818-r2.ebuild 277 BLAKE2B ffbaec4c472709c7c3e24029d4386b855e26219dffe877e2764e785bc6a2c9c737372c391db25e0326c87163554d8843a82301b57e8e50a83b81d3ca4947996d SHA512 d43c4762fdd4078cf8bb5501b5b64927c17b33ec12c7f220aaf5911f1e0a3245da4df1fbf0df2e39ef6d213eb164fb06502e626fcebd634d6abb85e3184cccdb
 EBUILD selinux-redis-9999.ebuild 279 BLAKE2B 8fef9bec457f36ebd16573dea72ba012fc2d831d67c653dba6f3595c6737922f9b5a00c090b1f36988e3180304df752aafab6eb35ce5d2ab27f30aaae7c52d77 SHA512 f44af72aa74476926607618d2b6a6baa11b0bce4362cca088fa8065151131781da0c0e37a15668b6a6e9becd64e7c23a1e90776efd2c43a10585027c27c934c3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-redis/selinux-redis-2.20200818-r2.ebuild b/sec-policy/selinux-redis/selinux-redis-2.20200818-r2.ebuild
index 7e7f1af986ef..9660f9bb6df5 100644
--- a/sec-policy/selinux-redis/selinux-redis-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-redis/selinux-redis-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for redis"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/Manifest b/sec-policy/selinux-remotelogin/Manifest
index df869e51aa5c..66767a0512fd 100644
--- a/sec-policy/selinux-remotelogin/Manifest
+++ b/sec-policy/selinux-remotelogin/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-remotelogin-2.20190201-r1.ebuild 289 BLAKE2B 5343f05e29cf8408593a5da41114de863230f9475de497d99dd3a959389ee73ecac77d2480c5c4e42c56cd90a4e96ab16386fb96c882563c49079483345d1b13 SHA512 800949a67ea9aa632331e28e49b1d21ee1289361328c9a4f913a652bbadc3fc4f4f6e13766c99e6a1e7fd626be933dd75aa2b516a01e329110a6788f109b8689
 EBUILD selinux-remotelogin-2.20190609-r1.ebuild 289 BLAKE2B 5343f05e29cf8408593a5da41114de863230f9475de497d99dd3a959389ee73ecac77d2480c5c4e42c56cd90a4e96ab16386fb96c882563c49079483345d1b13 SHA512 800949a67ea9aa632331e28e49b1d21ee1289361328c9a4f913a652bbadc3fc4f4f6e13766c99e6a1e7fd626be933dd75aa2b516a01e329110a6788f109b8689
 EBUILD selinux-remotelogin-2.20200818-r1.ebuild 291 BLAKE2B 30a5ad39aada322b91ba595ef05522d4d7810ae418162de97f42035f5a0e350383245aaa7a82a3456042f55d357ad3265bc92db84fc009d2ee2d402987ca3036 SHA512 9edbcb1b1e899a15e367efa052405139efc1ef0335b76c2cba2bb1205fdf2af5091a1e39370c319d61d3ab573d66722e0e194cfb843e1436000cefb76346a120
-EBUILD selinux-remotelogin-2.20200818-r2.ebuild 291 BLAKE2B d043a5308b943b017a022eb01b7f0364af8020b17c76fb5815e5c98609260e7690f89cc8b180eb19f6b7912fe01f140ffd932ba09242979aa4cd1a164bd571f0 SHA512 dce86ba610b245ec242c6719b483fe6eda4ba953fca9f0c525a36df52feb2383b2a0ebd574643eb004fd6fdcd2738c0d0be357f355bcfb59f2ab382a328f746b
+EBUILD selinux-remotelogin-2.20200818-r2.ebuild 289 BLAKE2B 51e18325b32fb63bce9371c8223319984345f2393a3fb95ec391efb42cd027e46ab753aabebda08caf24f989ac8ed3bbb81609fd416b797cdb11b5105812181f SHA512 b21b5b26c0bc4be350ca88f08b4385aade0f5cfafeb41126b50a5c4d8c555f3b82ebcd69f7685a9ff5627f6a400fe861dd01aa454ef8cae4200a4c0d4e71c28d
 EBUILD selinux-remotelogin-9999.ebuild 291 BLAKE2B d043a5308b943b017a022eb01b7f0364af8020b17c76fb5815e5c98609260e7690f89cc8b180eb19f6b7912fe01f140ffd932ba09242979aa4cd1a164bd571f0 SHA512 dce86ba610b245ec242c6719b483fe6eda4ba953fca9f0c525a36df52feb2383b2a0ebd574643eb004fd6fdcd2738c0d0be357f355bcfb59f2ab382a328f746b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20200818-r2.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20200818-r2.ebuild
index 9e5d198ddf60..ac6720eadf7f 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for remotelogin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/Manifest b/sec-policy/selinux-resolvconf/Manifest
index ab04064a0081..e1dc4b6ab5fa 100644
--- a/sec-policy/selinux-resolvconf/Manifest
+++ b/sec-policy/selinux-resolvconf/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-resolvconf-2.20190201-r1.ebuild 287 BLAKE2B 8c02f6f0b9051decf2f7d568a9416034367635b033622a2720ea9ad82de3de67e2d29d49453da993a165d992807c0e099301449050f4e59a349edce1e1dc6ed6 SHA512 340bab104b54af8b8ca3a0ce6dd8fc5c3ec2b30e6481fc82cd51c8b44868ce7aa175bb5716cd40e85734e780e03cb56ca00069ef0ae14e0c9db9937231c79b9b
 EBUILD selinux-resolvconf-2.20190609-r1.ebuild 287 BLAKE2B 8c02f6f0b9051decf2f7d568a9416034367635b033622a2720ea9ad82de3de67e2d29d49453da993a165d992807c0e099301449050f4e59a349edce1e1dc6ed6 SHA512 340bab104b54af8b8ca3a0ce6dd8fc5c3ec2b30e6481fc82cd51c8b44868ce7aa175bb5716cd40e85734e780e03cb56ca00069ef0ae14e0c9db9937231c79b9b
 EBUILD selinux-resolvconf-2.20200818-r1.ebuild 289 BLAKE2B 6f460f4bb4ec75a74f071e19ca670a11d4a2a36c7f918972b03e3cb375ca6236c5a8345ac63b2820ccf3703d1a865ce127e8416ed944a7f3a330bca64b6e381a SHA512 180da0b1ad85ae93d3a52ca0e6fe846e57f34473b91834b046bb473f4815a5322aff2d0c56e8e3cda980bc1209ba61ca48b54f2f9c2fc8578c944eba416e1b22
-EBUILD selinux-resolvconf-2.20200818-r2.ebuild 289 BLAKE2B 1c56293418c0721eeb26d42e406bb25d5555d8fed040416d78e64079190cec5fb255ada94debb554a6f7ef236adf3b9380e247ea4052be4586d58dfebf162d44 SHA512 bb7e44e8a401944f942d62c206ac22d99f7c15ab5c614e01983e0834604344ae7ede05401e8278f44cbeaa95e8167f2640956d76b86537dcac7f29aaccbdd084
+EBUILD selinux-resolvconf-2.20200818-r2.ebuild 287 BLAKE2B 13702d52eb448e94ed7c83dd71d1be3c8b8e7cabcdfef4aacd16a47f4202dba160b76050a1f99426a9223a850163b6a6c9e364cb7fa1b281c6d2c75fdbeff4df SHA512 39dcff854cebc3350a1c319698478c2a387fdccf0b9a77b8756cc37affd58affb0630dd3e9949bed0f781c8ad3f5b6c5c1ea23b3ee7e8573d2344e6a6ff2bee9
 EBUILD selinux-resolvconf-9999.ebuild 289 BLAKE2B 1c56293418c0721eeb26d42e406bb25d5555d8fed040416d78e64079190cec5fb255ada94debb554a6f7ef236adf3b9380e247ea4052be4586d58dfebf162d44 SHA512 bb7e44e8a401944f942d62c206ac22d99f7c15ab5c614e01983e0834604344ae7ede05401e8278f44cbeaa95e8167f2640956d76b86537dcac7f29aaccbdd084
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20200818-r2.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20200818-r2.ebuild
index 3e3eada434b4..1c67b0466605 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for resolvconf"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rgmanager/Manifest b/sec-policy/selinux-rgmanager/Manifest
index 7e04454585fc..34050112eebd 100644
--- a/sec-policy/selinux-rgmanager/Manifest
+++ b/sec-policy/selinux-rgmanager/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-rgmanager-2.20190201-r1.ebuild 285 BLAKE2B ce09af481f944d8643f53e19107480dfc21f102d2cc464cb669774b505ec8587ada119f0238fd33be58e4546e201f77e42387360d19a1bfa8f87178ebc10523b SHA512 5f339ba6cd31a4233f52c15dac5daaf9210f66128e8e265e68c24ab0904b4131378cf4ea45b41a1e3840dee797d89094ba341d203e5adb52d8a823f5f40d23fd
 EBUILD selinux-rgmanager-2.20190609-r1.ebuild 285 BLAKE2B ce09af481f944d8643f53e19107480dfc21f102d2cc464cb669774b505ec8587ada119f0238fd33be58e4546e201f77e42387360d19a1bfa8f87178ebc10523b SHA512 5f339ba6cd31a4233f52c15dac5daaf9210f66128e8e265e68c24ab0904b4131378cf4ea45b41a1e3840dee797d89094ba341d203e5adb52d8a823f5f40d23fd
 EBUILD selinux-rgmanager-2.20200818-r1.ebuild 287 BLAKE2B e1c14b5b21803dcb431488d38a2587ef017a8510b487fa4e97faea69140783f42087955384dbbfab7b555571ec7f512a311c66bae12afe98e3fa82a3f4483c6f SHA512 4ec51162c5c1aab7cc503dbfe8e6754179f9508768c36f92ccf91df2bd768650e6f26e1b021ab696b900c59a62e3405e30e689ce00896ea6ccd3e10e31b32387
-EBUILD selinux-rgmanager-2.20200818-r2.ebuild 287 BLAKE2B a305ddf714a47c68d0de8b7b154600fa2c8e5ac1c33a02e01c971e17a9f5978590e54415a3f679a62b32f0ca4d2cc231e83eb21831f26a2be1622d2b6c044eff SHA512 e1a0e89d264787aff74a8279cd53da7ff6c7587af80bb5d46807f655fda6482e1c7091475a5c81c82a399f8838800cb13951feb5188a4a4a15f0824151321625
+EBUILD selinux-rgmanager-2.20200818-r2.ebuild 285 BLAKE2B 527059597f06cf71e8d755e9655f6d54c58d25f9fa0e46593747d09b0ecb408d938fbe69e56041bb9a74d22a5373351d0856dea5bc6a977029b2fd7df740b8ce SHA512 8f3ec5f0787ae9a8ba4c955e87d9a8aebc654198028d4ce0482a54f5b4534bdd3af83c56683aab58b74ee3710ad0d468c0c334e816455ae71f41f3135f776f62
 EBUILD selinux-rgmanager-9999.ebuild 287 BLAKE2B a305ddf714a47c68d0de8b7b154600fa2c8e5ac1c33a02e01c971e17a9f5978590e54415a3f679a62b32f0ca4d2cc231e83eb21831f26a2be1622d2b6c044eff SHA512 e1a0e89d264787aff74a8279cd53da7ff6c7587af80bb5d46807f655fda6482e1c7091475a5c81c82a399f8838800cb13951feb5188a4a4a15f0824151321625
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20200818-r2.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20200818-r2.ebuild
index 5a8465ba25f6..6e5fa873ee3b 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rgmanager"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rngd/Manifest b/sec-policy/selinux-rngd/Manifest
index 175874d75364..eb6325bc3925 100644
--- a/sec-policy/selinux-rngd/Manifest
+++ b/sec-policy/selinux-rngd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-rngd-2.20190201-r1.ebuild 275 BLAKE2B 5fff4f51f0fe4c8799232691402c3b49acea4844da3921017fb91bca6073d62cee422bee333b49328570b5abfccf9d987328a231d0f9afe3a8b3c6a9139e98a3 SHA512 1dccfef008fdc8c622cae17c30138a1ef6f62018dbc4d72a8a0b3933b84d5a21950e359ae25580cd18508d9102a80111902f4a5dc355b76a8ce84f2f014d802a
 EBUILD selinux-rngd-2.20190609-r1.ebuild 275 BLAKE2B 5fff4f51f0fe4c8799232691402c3b49acea4844da3921017fb91bca6073d62cee422bee333b49328570b5abfccf9d987328a231d0f9afe3a8b3c6a9139e98a3 SHA512 1dccfef008fdc8c622cae17c30138a1ef6f62018dbc4d72a8a0b3933b84d5a21950e359ae25580cd18508d9102a80111902f4a5dc355b76a8ce84f2f014d802a
 EBUILD selinux-rngd-2.20200818-r1.ebuild 277 BLAKE2B 9d5cf91d1c686bb617ef427e68f1e681b1a13271ae1e862e13f0a9b81d2b4d9f532289dc39a011261e9fa0c894df8751fc7fb7b8bfecd6df5119e70b5290edb8 SHA512 3037623b14a0e7548e97a0cd451308d78f315f77a37def537067ff0c3b0c31ba248f32ab73ff317c762ad8214dd4bd6e8cf373355340bf95dbeb651e74599263
-EBUILD selinux-rngd-2.20200818-r2.ebuild 277 BLAKE2B 204b5547d1c31f509d297d594773d1fdcf648075960196e591c75b47bdaee8b2078deeaa7dc92da91250e8b31453d568ddfd9c86cb3b3a0e90353221eab2f219 SHA512 ddc984512918816b0ca0dfe0378bb623f3eaddca85627c945cd310c78ab741dfdc707eddd3d8575421e7ab4ac085c193df11549715a3f913442105bf4109c78e
+EBUILD selinux-rngd-2.20200818-r2.ebuild 275 BLAKE2B 88243a516f59b286d3b1e8d09e1cf7cbf818da8ddea02285e4427f8568808f2b955f4faf1062d5c02d8d607b9ff6a74dcf31e145c38dc5f8f73e8b3f7f4644f4 SHA512 0a86cc5c1f14ec8d41a7b738512ee5c45adc189272cb9ba364116643ac15b8f35703b1bfef946b110ff001c96305d79d8a1c6e01c0833c77005dac4887832c80
 EBUILD selinux-rngd-9999.ebuild 277 BLAKE2B 204b5547d1c31f509d297d594773d1fdcf648075960196e591c75b47bdaee8b2078deeaa7dc92da91250e8b31453d568ddfd9c86cb3b3a0e90353221eab2f219 SHA512 ddc984512918816b0ca0dfe0378bb623f3eaddca85627c945cd310c78ab741dfdc707eddd3d8575421e7ab4ac085c193df11549715a3f913442105bf4109c78e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20200818-r2.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20200818-r2.ebuild
index 616cd0f80ff1..7d05f204f3f5 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rngd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-roundup/Manifest b/sec-policy/selinux-roundup/Manifest
index 33e45e6a377a..e4bef1df00e1 100644
--- a/sec-policy/selinux-roundup/Manifest
+++ b/sec-policy/selinux-roundup/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-roundup-2.20190201-r1.ebuild 281 BLAKE2B 0e9bed6d4a7edcf67afd3bada60fc8f322b82fcb77f01f2fd9bf893d96c05ec1f753ed0cafc2e39501effd619d6a0e9dc98cc5b6706a13be372bd172ceb5f472 SHA512 b674a84a978ed88001735bf39f8a375e784ca49d3d82d77b284ee9396fe4fc15092c19ec06d7f598807b7e3102ea7291ce0f94725b6a2bae902f83bd08ff8ac4
 EBUILD selinux-roundup-2.20190609-r1.ebuild 281 BLAKE2B 0e9bed6d4a7edcf67afd3bada60fc8f322b82fcb77f01f2fd9bf893d96c05ec1f753ed0cafc2e39501effd619d6a0e9dc98cc5b6706a13be372bd172ceb5f472 SHA512 b674a84a978ed88001735bf39f8a375e784ca49d3d82d77b284ee9396fe4fc15092c19ec06d7f598807b7e3102ea7291ce0f94725b6a2bae902f83bd08ff8ac4
 EBUILD selinux-roundup-2.20200818-r1.ebuild 283 BLAKE2B b3e9d2d06a2a70d273710b686ec99c8666016419e9a0dba852d43c9ed32882ed3ba2177dd550ff162d54abdf6c0832f5a900fb7f6b02e8c41074bb8a246ba2c9 SHA512 4bba3a4fe51a68250c06debb2aaada78b04a96ff5d1c1a8a5898e9c49921ec19b16ca19e1694f232d3d5c696c68cae57273d6a3c1cc33a4ac319457fee69c5a9
-EBUILD selinux-roundup-2.20200818-r2.ebuild 283 BLAKE2B 83cf5003730236038d97b5ba91a440f7e14fd4ab52a8918fec83a599641d63dcb9cc34b540f78b1c8dc009a47ad48fd2e97ac3c7eed535a47599c9088fa67766 SHA512 6740607a84af2d59f05ec27bb10b325ad76a6bcf31c4afabf3347b2016e97043ec64661b567a7e0fabe01f7a7ffd6a7447be018c08ad1f200a4d357d161a2eb3
+EBUILD selinux-roundup-2.20200818-r2.ebuild 281 BLAKE2B 24a5151a107be16871c431ad63eb6dde9f9433435bca47a45aeedf77c75c87cc1109b67a7612cf45f629f3556fa37befdb9403eaad61ae825117e440aa66d270 SHA512 21e0e67b6e0e3aa17c270d23566ad4b6c54308593d5e67691db7e2c30d582b2727dcb8a4927527d681d9241245f01e3f4383cbad19ac302dd5899fa73095bc77
 EBUILD selinux-roundup-9999.ebuild 283 BLAKE2B 83cf5003730236038d97b5ba91a440f7e14fd4ab52a8918fec83a599641d63dcb9cc34b540f78b1c8dc009a47ad48fd2e97ac3c7eed535a47599c9088fa67766 SHA512 6740607a84af2d59f05ec27bb10b325ad76a6bcf31c4afabf3347b2016e97043ec64661b567a7e0fabe01f7a7ffd6a7447be018c08ad1f200a4d357d161a2eb3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20200818-r2.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20200818-r2.ebuild
index 3112dfdfe9d4..729f373bfaff 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for roundup"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rpc/Manifest b/sec-policy/selinux-rpc/Manifest
index d841367dcb0d..0586329e47a5 100644
--- a/sec-policy/selinux-rpc/Manifest
+++ b/sec-policy/selinux-rpc/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-rpc-2.20190201-r1.ebuild 273 BLAKE2B 8c205be1b6dff8d32ff74ee6c3327e2aef789a20542674ef09b72f5e0bb4bf81555c42d0fa1ed337f832c837ba462512369909ba4d08103fa0e0cf527624cf4a SHA512 4ddbf2c541995cedf12039b952e172d7f18c4c05e9e135741127d6f8ceb888269eea56ca015e4230d35fcc11634e9a2c7276a814240cb4d78bf4f9fb21ec0571
 EBUILD selinux-rpc-2.20190609-r1.ebuild 273 BLAKE2B 8c205be1b6dff8d32ff74ee6c3327e2aef789a20542674ef09b72f5e0bb4bf81555c42d0fa1ed337f832c837ba462512369909ba4d08103fa0e0cf527624cf4a SHA512 4ddbf2c541995cedf12039b952e172d7f18c4c05e9e135741127d6f8ceb888269eea56ca015e4230d35fcc11634e9a2c7276a814240cb4d78bf4f9fb21ec0571
 EBUILD selinux-rpc-2.20200818-r1.ebuild 275 BLAKE2B 1d7fca0a859b357b2115e5374816e183fceea729960eea9ef589ab3f4eb86c03bf988af1ddcbbce510222bbc3a54b33e671b6fa768fdfa6263a83241e692ee44 SHA512 b4a3a224b819129ac724d469c6cf949dae8d2a99aaa7c47027127a5dd48fb0ad1637c036ce847f892d83573a31065e7a7c41d70796468e1577df55d20d1f812f
-EBUILD selinux-rpc-2.20200818-r2.ebuild 275 BLAKE2B 44bd3ff40b8f8b3cef5e512e0c2d51be7c682b546226048e7c0c4f28926d2f051d93c6b905b55a9ad3fffa41586e97b8bebe0dfdd95b5bf5248a0548e2b503f8 SHA512 8e470f9bbc0f9ffea9f18974d553069d76a35a50dfdd9e4bc57b2dbd29d9bbdf3ec0cabe4ad8a0aca36189e70a3a915b39af0006846f736d9f75d21244ad7454
+EBUILD selinux-rpc-2.20200818-r2.ebuild 273 BLAKE2B d7b8a7e5289a984388f723a7505fa04c35ea1c3956669e586bff980f687b80268ef93ece8b77c0afc80f9f9b53240a6ff49b602357cae7ccfff317528abce9e4 SHA512 c4267a4051672bf17d5f9a1fcf3acbaa301bd977024f0605329499c4d749a711ea888743f1dbcfb36b256cb6c7a78b098b3f87b4a85e9ee85d420c54a91bf929
 EBUILD selinux-rpc-9999.ebuild 275 BLAKE2B 44bd3ff40b8f8b3cef5e512e0c2d51be7c682b546226048e7c0c4f28926d2f051d93c6b905b55a9ad3fffa41586e97b8bebe0dfdd95b5bf5248a0548e2b503f8 SHA512 8e470f9bbc0f9ffea9f18974d553069d76a35a50dfdd9e4bc57b2dbd29d9bbdf3ec0cabe4ad8a0aca36189e70a3a915b39af0006846f736d9f75d21244ad7454
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20200818-r2.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20200818-r2.ebuild
index 31ff2c711dd9..2bbd8e684bdc 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpc"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/Manifest b/sec-policy/selinux-rpcbind/Manifest
index 4cc774603dd0..67268eff0dd0 100644
--- a/sec-policy/selinux-rpcbind/Manifest
+++ b/sec-policy/selinux-rpcbind/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-rpcbind-2.20190201-r1.ebuild 281 BLAKE2B 1e7ca05a478cfb2f54888a18cb58c41faf7108b2a0a00b426bd27500d41e3706901a06f06ac82a237c8b8f2957c177a8b7bc1dfc35a6519ce340d8dedb649aab SHA512 f4a9148e5dcb3055deb4dd1e0a46e96b0363725a198ac2b895734fe1a2771979719e81174447b6188dd3886ddc3726df5f0deaf8375b638a74079e553dc96d5a
 EBUILD selinux-rpcbind-2.20190609-r1.ebuild 281 BLAKE2B 1e7ca05a478cfb2f54888a18cb58c41faf7108b2a0a00b426bd27500d41e3706901a06f06ac82a237c8b8f2957c177a8b7bc1dfc35a6519ce340d8dedb649aab SHA512 f4a9148e5dcb3055deb4dd1e0a46e96b0363725a198ac2b895734fe1a2771979719e81174447b6188dd3886ddc3726df5f0deaf8375b638a74079e553dc96d5a
 EBUILD selinux-rpcbind-2.20200818-r1.ebuild 283 BLAKE2B 022c0eebeed710290856d355d92ac26cfbf17d32883a04e33fc9b7bcd355b7a85c740ba63232ddc217dd50de7e993627420a9bcd8135cb76d9aa0ff78e27fdad SHA512 201785267e33d07a98daf789589b5e2536c3026fcfc2bb9d2a2d9b434767e79097ab55a8e56a836f4f3159b1f41ddf633a00948dec6aa46dc40a1e326a4c3f57
-EBUILD selinux-rpcbind-2.20200818-r2.ebuild 283 BLAKE2B 659e6581f250b58690eae08e0b6cc8e11130e0588cb3700d6a5ce21719f222c9a04fcac85e0f6f1393a31503563bf364460f01e9ab35817898a0137637f0ab51 SHA512 a729758bfdcd951ab074ed339aa9c009dbf063ac139143b17db69880b6a37d28eb4283ec85ffecba154e8ded34102570cedfddc044c5747249746a556da687ba
+EBUILD selinux-rpcbind-2.20200818-r2.ebuild 281 BLAKE2B 245a890e1dc64815fafe536acc79dfcf4b8f19fd17b98e207599163d79378640b912935992633f355a0f19ccf59c9b79a37dc8d3e4c6f3abc8856b6d39e44e2e SHA512 f505ff16ae83f744bbefa3aa67992cff30a89b62579c25e65410f9add13e81212458bb05c370c6f20bb870eba3717742400959aca2d00e150c753df88f1ff8f8
 EBUILD selinux-rpcbind-9999.ebuild 283 BLAKE2B 659e6581f250b58690eae08e0b6cc8e11130e0588cb3700d6a5ce21719f222c9a04fcac85e0f6f1393a31503563bf364460f01e9ab35817898a0137637f0ab51 SHA512 a729758bfdcd951ab074ed339aa9c009dbf063ac139143b17db69880b6a37d28eb4283ec85ffecba154e8ded34102570cedfddc044c5747249746a556da687ba
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20200818-r2.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20200818-r2.ebuild
index 61393e245be9..a54c3db26cfd 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpcbind"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rpm/Manifest b/sec-policy/selinux-rpm/Manifest
index 1b2269d3fd01..288f1e56efdd 100644
--- a/sec-policy/selinux-rpm/Manifest
+++ b/sec-policy/selinux-rpm/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-rpm-2.20190201-r1.ebuild 273 BLAKE2B 9bf704dd99a8bacbb71636a17431c2edaf75f01c62ce831df0bc2883cbd6933a15e921210bc57f40ceeec2ca85e2441c9b5743d9454670257d606ffcd38ebd0f SHA512 e2f9b5752721d7a56687f4997fe703ab9283a3e30d79bb94a39f9494852e264c3bf3b980663cb2a2ea294a62849e8395c64ba991a7e04f2b0755fa44c8395124
 EBUILD selinux-rpm-2.20190609-r1.ebuild 273 BLAKE2B 9bf704dd99a8bacbb71636a17431c2edaf75f01c62ce831df0bc2883cbd6933a15e921210bc57f40ceeec2ca85e2441c9b5743d9454670257d606ffcd38ebd0f SHA512 e2f9b5752721d7a56687f4997fe703ab9283a3e30d79bb94a39f9494852e264c3bf3b980663cb2a2ea294a62849e8395c64ba991a7e04f2b0755fa44c8395124
 EBUILD selinux-rpm-2.20200818-r1.ebuild 275 BLAKE2B 0637d8f6de33033f482a116d405f68f27ceb081bb186f59c16cfa8430671fdc980fe7364aee2653fe4e525d8cbd2fdb0038217f5a5393604c1247a380e1a905b SHA512 d762abbaf80e78aacd28ac1ebd7ecea8cb0fc47b66f227ce0b54f1afc9a099a8cdef554d2bfff663a703d88cabe86cd29d4cd239c7b1394b7ef2f265db68d639
-EBUILD selinux-rpm-2.20200818-r2.ebuild 275 BLAKE2B 7367995fe8e5e64bc4334109c872c80350a1d589e4659f6bd7f513123e9cb4455b21b0bc36082957776d87fd8f9319589398cb03b5b60c961ce1731dd58407bb SHA512 580c752fba025c59c522d5d9f9496f2893351ccda92f9f194b0e9ea4ca926a3ea89e43174b8d03075f2330d7d3051d1d05f864c78cfbfaf92742a33980117718
+EBUILD selinux-rpm-2.20200818-r2.ebuild 273 BLAKE2B f418915fa90df1ce4f91a04f70d7870b44e4b0d6e436f90a082f06c7ef46e1ac28aebbc3e8bfbacf6942f91b912c7d817195b7ec636b5adf65e77e610b35f328 SHA512 53e7e963b4877887a254e738a440e74920864ffa3ecdc40f08a885a11f806de0f7330ed8751d4624fe0ba856a08dfea72d76d23b06dfd6ec2052cbe9935b9ec0
 EBUILD selinux-rpm-9999.ebuild 275 BLAKE2B 7367995fe8e5e64bc4334109c872c80350a1d589e4659f6bd7f513123e9cb4455b21b0bc36082957776d87fd8f9319589398cb03b5b60c961ce1731dd58407bb SHA512 580c752fba025c59c522d5d9f9496f2893351ccda92f9f194b0e9ea4ca926a3ea89e43174b8d03075f2330d7d3051d1d05f864c78cfbfaf92742a33980117718
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20200818-r2.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20200818-r2.ebuild
index 43cc9e9d3213..c9c8f8a6ab1c 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rssh/Manifest b/sec-policy/selinux-rssh/Manifest
index 1adac229b74d..70b17eac1af1 100644
--- a/sec-policy/selinux-rssh/Manifest
+++ b/sec-policy/selinux-rssh/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-rssh-2.20190201-r1.ebuild 275 BLAKE2B b5573fc27f907689b62fee6bd1189e389a995671557e2e946d485c0df94c7679593ce1387b3be93ffd3dad141375746288c47988929aafb4bc1cbdeac9e1203a SHA512 881f12332a6d52f5db80acc615e2130c23ced20a7464a870b38f8ea2441dac01b2dedec5252f214fbf31dd44aba7b5b77ac5c9c35c81f9dc677ff197fa1d5214
 EBUILD selinux-rssh-2.20190609-r1.ebuild 275 BLAKE2B b5573fc27f907689b62fee6bd1189e389a995671557e2e946d485c0df94c7679593ce1387b3be93ffd3dad141375746288c47988929aafb4bc1cbdeac9e1203a SHA512 881f12332a6d52f5db80acc615e2130c23ced20a7464a870b38f8ea2441dac01b2dedec5252f214fbf31dd44aba7b5b77ac5c9c35c81f9dc677ff197fa1d5214
 EBUILD selinux-rssh-2.20200818-r1.ebuild 277 BLAKE2B 3607a46536a9c521fd24e642d76616dfddf215a88665cf4ee23ad283127badf3bc3cac486e12b454f8e2bb56c732337b25b79b26f93ca39041e38790de0470ea SHA512 3c182b9239ea8eb886a03a3ed7c30cb01425ac9d0b07cc0986fb8f1dd8fec6991b1783e0df1505f98857ac2b374c233ba8067cc520c640421d97aa6d3e99ef23
-EBUILD selinux-rssh-2.20200818-r2.ebuild 277 BLAKE2B 5935810bb354813a8710582320c238130d42f9cc25b32ac0154252df72f6660e0a26c4be78ab62029bcdd0f20c5ba1d0fd1952819004406dc079027619f49d6d SHA512 b3cec9b39b19fd528b93d203e64a51f394ade98d704ca99a675d60252070b85ea15514193dd094126ea341279801d1a44583920b983bedd7a697c0daa9ffe377
+EBUILD selinux-rssh-2.20200818-r2.ebuild 275 BLAKE2B a9001401dc172a0dc41cfb814f060c4848df4d2b2b5b005d56581d5e175580d261be3a11552c0995c34030a998a4a9eeba360633ed6dfaf7648e0b9508dd4be7 SHA512 b179e90d8cc8dafd856acaa172fd8ab1b645983b1df1d7090e4a8ec211553dbd2ed35f6dc8257a2bac79734f2c316eadd142338a3828588a708de99f8a5b281b
 EBUILD selinux-rssh-9999.ebuild 277 BLAKE2B 5935810bb354813a8710582320c238130d42f9cc25b32ac0154252df72f6660e0a26c4be78ab62029bcdd0f20c5ba1d0fd1952819004406dc079027619f49d6d SHA512 b3cec9b39b19fd528b93d203e64a51f394ade98d704ca99a675d60252070b85ea15514193dd094126ea341279801d1a44583920b983bedd7a697c0daa9ffe377
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20200818-r2.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20200818-r2.ebuild
index 156515aedaae..cdcb13d8fe23 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rssh"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-rtkit/Manifest b/sec-policy/selinux-rtkit/Manifest
index 9edcd097af3e..5ccfac10b1b9 100644
--- a/sec-policy/selinux-rtkit/Manifest
+++ b/sec-policy/selinux-rtkit/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-rtkit-2.20190201-r1.ebuild 369 BLAKE2B 5bfa4d06cd51743a4c2f4e47e51ff85f6beeba6d5a4a2cb9b31121533c661acef9b71c08a4abfe3ab0144b6e73d4df8adc9da8653a9e10f0562c236a3608c485 SHA512 dd9a2fbfbf47bb235892c2ff465d9dbe9006d258898af9276a909a0209d26b3cd7f5400dc4c1b3bfe3cb03da93d49bcc53e29f69f4f957ec91694eaf2ed84bd6
 EBUILD selinux-rtkit-2.20190609-r1.ebuild 369 BLAKE2B 5bfa4d06cd51743a4c2f4e47e51ff85f6beeba6d5a4a2cb9b31121533c661acef9b71c08a4abfe3ab0144b6e73d4df8adc9da8653a9e10f0562c236a3608c485 SHA512 dd9a2fbfbf47bb235892c2ff465d9dbe9006d258898af9276a909a0209d26b3cd7f5400dc4c1b3bfe3cb03da93d49bcc53e29f69f4f957ec91694eaf2ed84bd6
 EBUILD selinux-rtkit-2.20200818-r1.ebuild 371 BLAKE2B 305dcbddda624d71d216bc42ad9fe3224c2bd652bbf375fabcdd555a81003ff6638cafcdd40878c0b8a83d2029cb9110bec987fddd973892cab4c149f3d6b923 SHA512 9654ee1d02faab11f0f273ef5255327e86ca6bc2a099dca512969d2d1818063e49ee3a15d3eb13a949994c4f3280684a7f578856a3229092086032a4eb593df7
-EBUILD selinux-rtkit-2.20200818-r2.ebuild 371 BLAKE2B be4b119e843616d3d8b4ce8bf428c966135c2910e6a6be91fc413c46261ec5d5762ce9742be53224193e411bc3e73e921fbfa9d2a58697fc14f6b9dbf6423822 SHA512 aa2b582044f075ba3c8845a14777d18e9f4af935f33355e46d21f8756fcdea63b9b3dfb262b9cbbb5fbfb7a9750cf6cc74b2531f3926fad137852f0bee283e93
+EBUILD selinux-rtkit-2.20200818-r2.ebuild 369 BLAKE2B 5ed67d35e9d22a1515ae25d1f0134b2db1ccc27a83c613adf1f0fb1a6ee9a244046a95dc92e23edc02e66c4a06041f4500c1bcf3fd7d7bd3aed5996696a334a0 SHA512 488440e4c5ecc768ff76bc3200772a352837de58eb627977d25f13e5082a0fcd4503d5b08263e81faee9616a0fd33f673a680fc3690c50b6058fceb7e2a50e3a
 EBUILD selinux-rtkit-9999.ebuild 371 BLAKE2B be4b119e843616d3d8b4ce8bf428c966135c2910e6a6be91fc413c46261ec5d5762ce9742be53224193e411bc3e73e921fbfa9d2a58697fc14f6b9dbf6423822 SHA512 aa2b582044f075ba3c8845a14777d18e9f4af935f33355e46d21f8756fcdea63b9b3dfb262b9cbbb5fbfb7a9750cf6cc74b2531f3926fad137852f0bee283e93
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20200818-r2.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20200818-r2.ebuild
index cb081be3d5ac..8f740cf3ffa8 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rtkit"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-rtorrent/Manifest b/sec-policy/selinux-rtorrent/Manifest
index 086d3f4bee17..e96ee98c0c13 100644
--- a/sec-policy/selinux-rtorrent/Manifest
+++ b/sec-policy/selinux-rtorrent/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-rtorrent-2.20190201-r1.ebuild 283 BLAKE2B 20863745b3fd14c2529d67710be8197d088ce19068f19d72c6e966eb74396bf447e1017718573233360a53247b203adcf1363e95e840ff9a9657164d0cfb8cc0 SHA512 3ec3f2fdd3486472e6877f15b934416e110c43046a4bc704cc9b4b399457a1683576ca71315772097b5a9ed87bc895f6adad29665c113f2ef19931e2ac62586d
 EBUILD selinux-rtorrent-2.20190609-r1.ebuild 283 BLAKE2B 20863745b3fd14c2529d67710be8197d088ce19068f19d72c6e966eb74396bf447e1017718573233360a53247b203adcf1363e95e840ff9a9657164d0cfb8cc0 SHA512 3ec3f2fdd3486472e6877f15b934416e110c43046a4bc704cc9b4b399457a1683576ca71315772097b5a9ed87bc895f6adad29665c113f2ef19931e2ac62586d
 EBUILD selinux-rtorrent-2.20200818-r1.ebuild 285 BLAKE2B d2d76052f307ffaee102b3d24ce6d4c1377333690383c81b6f2784acd5c696c916a224b54c76fc9088f735aa3f6ea3227e487646eefb9486b93d4ee2c51f3c88 SHA512 db7426e2f7358026c1e5795fa88bc276c89a44f540b04eeefae1350b6fa073f124e721152cb97414c7ff6a79236ff33f25ec1f35c7e5bc4cc58e3a365e3bf93d
-EBUILD selinux-rtorrent-2.20200818-r2.ebuild 285 BLAKE2B ddfaa5d0b5c4b868d7ba0424a6852dc5f5a98746c30dcf518f48931d7b24b3cbdfd848e9be969fd5df462591ee2d53d6cdb631748f96135445dcb1b890f64729 SHA512 d2f03e64e10bae96ced691ec1c2f10597065a4aa294de137e3047f06e01465fff961c150e3c96ea8166300fdf6e310ae44c8abc2cd68e70ef75216fb0c5fb72d
+EBUILD selinux-rtorrent-2.20200818-r2.ebuild 283 BLAKE2B 7792a3c2b8cc71b42c11ba067edc94fbf21487470406ab448df021a5287e28b2fb26a6e67b563f499d96906b8d7889558e48b102f3a102cc85e58051f94584f0 SHA512 8c60580980b3f45b6682fadc2237ed2f45691d35b7e0670fc7ca7148ab0c2b395f95af2a5100dec17bb25003a144198189b67971b18054cc1e9d10473d346b96
 EBUILD selinux-rtorrent-9999.ebuild 285 BLAKE2B ddfaa5d0b5c4b868d7ba0424a6852dc5f5a98746c30dcf518f48931d7b24b3cbdfd848e9be969fd5df462591ee2d53d6cdb631748f96135445dcb1b890f64729 SHA512 d2f03e64e10bae96ced691ec1c2f10597065a4aa294de137e3047f06e01465fff961c150e3c96ea8166300fdf6e310ae44c8abc2cd68e70ef75216fb0c5fb72d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20200818-r2.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20200818-r2.ebuild
index c7de8b6b8e6e..d705586231d4 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for rtorrent"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-salt/Manifest b/sec-policy/selinux-salt/Manifest
index 717ca6fa4b93..bccea8c784a0 100644
--- a/sec-policy/selinux-salt/Manifest
+++ b/sec-policy/selinux-salt/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-salt-2.20190201-r1.ebuild 275 BLAKE2B f04eb70cfab112cfc073f6e9b777eb9285ec34efb970f61f09eb1f7350be98ac2f1702875dc499331e1709c9a2d743892e22d18381ab0f9f9ab441bf22446a61 SHA512 710b5e57bbe32eb0de27020e143df22082ff657070f756d65bf6f31601c21a3e63ed7198a4359887f01a305274ba3427705bdd757603f27e195b5a81321ff914
 EBUILD selinux-salt-2.20190609-r1.ebuild 275 BLAKE2B f04eb70cfab112cfc073f6e9b777eb9285ec34efb970f61f09eb1f7350be98ac2f1702875dc499331e1709c9a2d743892e22d18381ab0f9f9ab441bf22446a61 SHA512 710b5e57bbe32eb0de27020e143df22082ff657070f756d65bf6f31601c21a3e63ed7198a4359887f01a305274ba3427705bdd757603f27e195b5a81321ff914
 EBUILD selinux-salt-2.20200818-r1.ebuild 277 BLAKE2B aefdd8a0819ed3651eec753c43c9e1089c375655421a5ab85f48ca67038484f15081b6ae03f1718a7cf78638d18e7c14d38c9c0a28e4abd88760f9560b1b9739 SHA512 4912a580b054f418cc7fc66b13563aa4d643a2c47231c38abe762609df021b492a1efa432db9ab2caf1fab3d0146e5ffda332bb0462facf7ac6322e1701290d3
-EBUILD selinux-salt-2.20200818-r2.ebuild 277 BLAKE2B 69a0b8b3c6a61d33a7fd3414b6e0ea508d3947fe3339b49da055cd7ee5bec7b2a2050082cd42cac3ed298efb0c79c09cfa7ad466d10d94d2d4d2596804bcad28 SHA512 728d7fe072496f375b8b99f9e952d9b40657a0e39b80fbb59302675c621be50236881afb49fd0420594370045a00e128310197531cc9ed566ec83c52d8eefd61
+EBUILD selinux-salt-2.20200818-r2.ebuild 275 BLAKE2B f4fce10036c3223662e11fff6d50a4f81bae5d79bf02f970623c4c9b6679b2a621feab6543868e585b31b6fcd3a7bf39c9d7d3a1c7891f8ab4baa80b923e828c SHA512 471d0312e129f04aadcab04fd60bb27498ed343559384a5aa0dfed560b37c4acd6a8b709c7987db5caa44de2043d7dc44600f0202a793a7aa80ffdfeab72c616
 EBUILD selinux-salt-9999.ebuild 277 BLAKE2B 69a0b8b3c6a61d33a7fd3414b6e0ea508d3947fe3339b49da055cd7ee5bec7b2a2050082cd42cac3ed298efb0c79c09cfa7ad466d10d94d2d4d2596804bcad28 SHA512 728d7fe072496f375b8b99f9e952d9b40657a0e39b80fbb59302675c621be50236881afb49fd0420594370045a00e128310197531cc9ed566ec83c52d8eefd61
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20200818-r2.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20200818-r2.ebuild
index 0c2983d5babb..f8c90780a92e 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for salt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-samba/Manifest b/sec-policy/selinux-samba/Manifest
index 5d9f497b0ae1..7ce87bb0e04b 100644
--- a/sec-policy/selinux-samba/Manifest
+++ b/sec-policy/selinux-samba/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-samba-2.20190201-r1.ebuild 277 BLAKE2B 88cb059e3026443d8403aecaff9ee2f6a7de5955215f690e1bb33ee625bda84728120565c119a6f95a1568d32c08f5cdcf45ceb35c68236293a516340e6ea0bf SHA512 c03c9efec2e6ec01a3875f0d1e4cd82fecc2d816504b6f440aada9c060118d8ec4ace7a432fbd7272fcdc5afecdabe1a2af19dee78618ff259bd2f6a823191f5
 EBUILD selinux-samba-2.20190609-r1.ebuild 277 BLAKE2B 88cb059e3026443d8403aecaff9ee2f6a7de5955215f690e1bb33ee625bda84728120565c119a6f95a1568d32c08f5cdcf45ceb35c68236293a516340e6ea0bf SHA512 c03c9efec2e6ec01a3875f0d1e4cd82fecc2d816504b6f440aada9c060118d8ec4ace7a432fbd7272fcdc5afecdabe1a2af19dee78618ff259bd2f6a823191f5
 EBUILD selinux-samba-2.20200818-r1.ebuild 279 BLAKE2B e0b9ef24123c6191a12c3270383bcdeb90e6357c3744db79f58a15a5e70a02e3de3c35ef79268fb10b30dd6c2bf21e1b820065fac6e50bc5f55d30eab451028e SHA512 bfdf6d8a31d0de1037ef8aedb6d68d32e7928bc9006e1d804590bf72d2b941abb477cff9611dc0eab6895205ef569e5d91511687e00c792139a9e6efaebf7806
-EBUILD selinux-samba-2.20200818-r2.ebuild 279 BLAKE2B f23c8083af072087c0f4ffccd69da914dfc2c7ea3200e5852666f54b6250c09dc547ae9af0db57d054e06f720c9a0c09094ecce6114433dba6d5a3c6f3e809ec SHA512 39a87253f4454079cbef14b255c52701e645a120fd9253cd5ec900e11f7aa98612abd3c8ca0ec8d61c7c47b8a151b719fb01f30743be63fc04a949a6b54a7f81
+EBUILD selinux-samba-2.20200818-r2.ebuild 277 BLAKE2B 412f5d0441f1998d4fa5cfab9d104abd3731a4187aa5f24742cbce55fa664de2cfd6abb6cd237859fa0726dae37e13bb93f23423c0e981ad43cf4dacb845f482 SHA512 6f681d2b1f8163450cb8c1aa7be74cda16ca3f9e388f2c59e8cf31bfa45b2b6500ad53b205b09fdd7b9d9451c9418eae136612d42f08cd167586da116cb0c9da
 EBUILD selinux-samba-9999.ebuild 279 BLAKE2B f23c8083af072087c0f4ffccd69da914dfc2c7ea3200e5852666f54b6250c09dc547ae9af0db57d054e06f720c9a0c09094ecce6114433dba6d5a3c6f3e809ec SHA512 39a87253f4454079cbef14b255c52701e645a120fd9253cd5ec900e11f7aa98612abd3c8ca0ec8d61c7c47b8a151b719fb01f30743be63fc04a949a6b54a7f81
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20200818-r2.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20200818-r2.ebuild
index de6aa52f30be..f342cba497eb 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for samba"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sasl/Manifest b/sec-policy/selinux-sasl/Manifest
index 136b7629cf19..59ad9b380a5f 100644
--- a/sec-policy/selinux-sasl/Manifest
+++ b/sec-policy/selinux-sasl/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-sasl-2.20190201-r1.ebuild 275 BLAKE2B 9b00429d7622ae32bff528f572a1daf593d92141b9ddaf92e9724f7f673ee8695cb5fae8eb6cb96efa2c7fa66f72fa59fbc7719a006a64d7a4345963bcdbbff4 SHA512 0a5e2cd1c277f53b4d933043b6e07d22036357188a37c7643bf61b766078ca0424fb29b03c27d0e10a7c6322f0e1875b6d2c0b40e9520472f978454e584da8d9
 EBUILD selinux-sasl-2.20190609-r1.ebuild 275 BLAKE2B 9b00429d7622ae32bff528f572a1daf593d92141b9ddaf92e9724f7f673ee8695cb5fae8eb6cb96efa2c7fa66f72fa59fbc7719a006a64d7a4345963bcdbbff4 SHA512 0a5e2cd1c277f53b4d933043b6e07d22036357188a37c7643bf61b766078ca0424fb29b03c27d0e10a7c6322f0e1875b6d2c0b40e9520472f978454e584da8d9
 EBUILD selinux-sasl-2.20200818-r1.ebuild 277 BLAKE2B 214a7c392dcc3641a6a9021e357b7e3bcf412db78a6f7c2fb4a1dfb2ee83717dc2ec9d682540b6e7b7505ade463b06cdef55bf674aa53befa10902db8a298bce SHA512 ba4b8481052c981fe7610fe9c4c32b5350bbd937691a41be15bef7d09d4d83199b78b3dd85af76d8de3465511cade7936c7e6544422b499cd9204b64427194cf
-EBUILD selinux-sasl-2.20200818-r2.ebuild 277 BLAKE2B 20f54b1b60d4aa2c90f012cb9024abbf3b184dacfcf6dd0423822da6a8c16a82c85ad8cb0966444d3ec47982329979c65a1ffe715a0425f374ff3af45b275b56 SHA512 b676fd29edf60906921ef54afba5d8aaa1e3f176a8f4e556ef0dacd8d470bf1581af6e9ea3a29e14ee02ea16efef9543fc0343d99fe2e37076cbde03fc6d286f
+EBUILD selinux-sasl-2.20200818-r2.ebuild 275 BLAKE2B ec0d830f71150c1f7c0e399b57043630eef1b99f154d2cfed0bf8a1d053252db4581fe8857d35d711370bfb87aadfd936fc8537716e533cbdb81e9783abd19f5 SHA512 3deb6a0e77a03c9a1699a922d249d19d79ed0f9db223c46d0d740fed99b6a1e526c5b8d661bc796b531109903a0080a8e17970769a8592126837934410105433
 EBUILD selinux-sasl-9999.ebuild 277 BLAKE2B 20f54b1b60d4aa2c90f012cb9024abbf3b184dacfcf6dd0423822da6a8c16a82c85ad8cb0966444d3ec47982329979c65a1ffe715a0425f374ff3af45b275b56 SHA512 b676fd29edf60906921ef54afba5d8aaa1e3f176a8f4e556ef0dacd8d470bf1581af6e9ea3a29e14ee02ea16efef9543fc0343d99fe2e37076cbde03fc6d286f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20200818-r2.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20200818-r2.ebuild
index 9d06fc56d14b..24d77636a0eb 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sasl"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-screen/Manifest b/sec-policy/selinux-screen/Manifest
index 576b034e10a3..05df8f129592 100644
--- a/sec-policy/selinux-screen/Manifest
+++ b/sec-policy/selinux-screen/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-screen-2.20190201-r1.ebuild 279 BLAKE2B 72da60f4b348baa52f7c6c64382e8513601383c47d79ef055390a5a202640c022d6d019936f08281a660ed4f8cf7dec0e3dada6b2aee6e9a87b67fd69986b22e SHA512 78909c24917c8390078fbd7b25adc0d56f1048023b214187d3cc13ecb2690f6388b6cf102cd502fce173bb5d1118fbc86c42da0c2c020f0ae87f1dcd277f7b17
 EBUILD selinux-screen-2.20190609-r1.ebuild 279 BLAKE2B 72da60f4b348baa52f7c6c64382e8513601383c47d79ef055390a5a202640c022d6d019936f08281a660ed4f8cf7dec0e3dada6b2aee6e9a87b67fd69986b22e SHA512 78909c24917c8390078fbd7b25adc0d56f1048023b214187d3cc13ecb2690f6388b6cf102cd502fce173bb5d1118fbc86c42da0c2c020f0ae87f1dcd277f7b17
 EBUILD selinux-screen-2.20200818-r1.ebuild 281 BLAKE2B adc702f2e3634493c7f5a46d22779a451622a12f665c26cb543df9d8a5359b12bab4960be190b321772a369ebd02a4915e93a5b987804eae96517b5b9f2fdddc SHA512 b04302f47650c9c50b6a4ea83027cf9e6c12b00ec899231e556c9edf0d84aa9a1fb8347aba346fd125fba2dcc05149fa3b989679405e58f8cbd14fdd67abe49e
-EBUILD selinux-screen-2.20200818-r2.ebuild 281 BLAKE2B 9f231f41ef3fbd55a430b659ef19bfb991c61bed27eb6cd74a5946ee19d42dab0830b39a17ccf87ab7543fa0c7ccc1257ecba2b2038783a9050a839d4d5f4318 SHA512 2751869b955b9e62c6857584befcb26292bb1a94bef8aaa0e048867ceda176cf5a205e03f9985a2d119a1db9ebdf69e3255bb03c31881a221212b5aef9f7f07f
+EBUILD selinux-screen-2.20200818-r2.ebuild 279 BLAKE2B cc91282c3d9cf97f708128f4c18cb33c4400fb370daebc0845b09b6bc306f898546fcd22ebb2e1178eb94b21c8536d41b0b71d677c6f55bf998ac086fdef1afb SHA512 a18322eb845d136258e2f941ca432cd7d7b4735616dc528537e63fa58dae1a78ccd79214789c1bfccd7f3f36804d0cf636890e14fc29b26b3fb87edd31630e8a
 EBUILD selinux-screen-9999.ebuild 281 BLAKE2B 9f231f41ef3fbd55a430b659ef19bfb991c61bed27eb6cd74a5946ee19d42dab0830b39a17ccf87ab7543fa0c7ccc1257ecba2b2038783a9050a839d4d5f4318 SHA512 2751869b955b9e62c6857584befcb26292bb1a94bef8aaa0e048867ceda176cf5a205e03f9985a2d119a1db9ebdf69e3255bb03c31881a221212b5aef9f7f07f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20200818-r2.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20200818-r2.ebuild
index 2b6afef3e585..d7bc0f42251e 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for screen"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sendmail/Manifest b/sec-policy/selinux-sendmail/Manifest
index 5bb573e43676..752293325977 100644
--- a/sec-policy/selinux-sendmail/Manifest
+++ b/sec-policy/selinux-sendmail/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-sendmail-2.20190201-r1.ebuild 283 BLAKE2B 4870efd8b8279600e3e6a57dc99fb2ba051005ace385a49717431063036ace40760b645e3663ca5004eaeb614aee3563a85463704bc6a0bab98a61765dcf588f SHA512 436d50b5aaf3d2fc2cc77d574bb64a986b4daec4ba6449254a528b5528fad28cd590cd9421d7e53a3e5ab97286d97b6dc2214100cd470f1a228e83b7e974a9d7
 EBUILD selinux-sendmail-2.20190609-r1.ebuild 283 BLAKE2B 4870efd8b8279600e3e6a57dc99fb2ba051005ace385a49717431063036ace40760b645e3663ca5004eaeb614aee3563a85463704bc6a0bab98a61765dcf588f SHA512 436d50b5aaf3d2fc2cc77d574bb64a986b4daec4ba6449254a528b5528fad28cd590cd9421d7e53a3e5ab97286d97b6dc2214100cd470f1a228e83b7e974a9d7
 EBUILD selinux-sendmail-2.20200818-r1.ebuild 285 BLAKE2B ad520cc33b4744ac665b7554f82882a1b5c65697f91df4bc4ab29b4b3afdc3f6513da46cf2e929b0816d8b74688312bbe19341ff9b8b5455fe552e38fa378fae SHA512 468ddce085e6326dafe8ddd5dc6cd6623815c899c7dc08489b9dd02172aa28e5ed310567f3c3db7d5fdeaeefa4e30494cd7fb8003ef0674ee46b8ec7baa1351e
-EBUILD selinux-sendmail-2.20200818-r2.ebuild 285 BLAKE2B 1add445765a033a3a03133f7041bd70814a5e3f780e687f327d565f38c055f72a9aa272e29597674a65e8156084d41d85cc7291649a23f6976debf0cf84f1a7f SHA512 63e67b488efd217981eb8ccb32a465e872691181e38277866abddc0816411562b69272530fa34a8148215f38fd26646acb86434a251018bf8338e7bec4b92588
+EBUILD selinux-sendmail-2.20200818-r2.ebuild 283 BLAKE2B fd72bf1316c4d84637d5253d1f59f7c56c4e6180244b57c63de2db55e1db033af3b7255d03425bd37d4b5fbf200972359dda96c372011457480f56547819f180 SHA512 8fb706c31f052dac4acc86f607994f5d0b1c5aae2891639c79096b8fdf1a2fc22153852f38431fdcd49ab710816568927b601ae14e815372f1a489602b63f20e
 EBUILD selinux-sendmail-9999.ebuild 285 BLAKE2B 1add445765a033a3a03133f7041bd70814a5e3f780e687f327d565f38c055f72a9aa272e29597674a65e8156084d41d85cc7291649a23f6976debf0cf84f1a7f SHA512 63e67b488efd217981eb8ccb32a465e872691181e38277866abddc0816411562b69272530fa34a8148215f38fd26646acb86434a251018bf8338e7bec4b92588
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20200818-r2.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20200818-r2.ebuild
index f90084f13d47..c9a47ca2fc69 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sendmail"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sensord/Manifest b/sec-policy/selinux-sensord/Manifest
index 29277542b588..cbfcedc58113 100644
--- a/sec-policy/selinux-sensord/Manifest
+++ b/sec-policy/selinux-sensord/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-sensord-2.20190201-r1.ebuild 281 BLAKE2B 8d93a3540c6b5eee06cf0787946d71e75a32e31bfa8045a7b112312cb23bdb3a2ec9ead9707f165feef5cf3357b8d20cb4e1004f5d04be2b789857463d664047 SHA512 1f55e06b99655e463010f57ac9dbd78cda68ee8bfa04639bc3234fbad76d25b878335088b5f954ef333bcd306286e92a9c914552f5581879bb2f3befe3863d6f
 EBUILD selinux-sensord-2.20190609-r1.ebuild 281 BLAKE2B 8d93a3540c6b5eee06cf0787946d71e75a32e31bfa8045a7b112312cb23bdb3a2ec9ead9707f165feef5cf3357b8d20cb4e1004f5d04be2b789857463d664047 SHA512 1f55e06b99655e463010f57ac9dbd78cda68ee8bfa04639bc3234fbad76d25b878335088b5f954ef333bcd306286e92a9c914552f5581879bb2f3befe3863d6f
 EBUILD selinux-sensord-2.20200818-r1.ebuild 283 BLAKE2B d953c7a90b9894c63a9adb8d67817cd8db2e685d000a40f0b7b2dde0392ed44606a8b178d86fb87abe55c1b0ac540bea9e0f9192238bf32fc7e9842f4859ce60 SHA512 e146a6516d3bfe249f4324f247b2a9113c5455aaaff0aaf3b02c498e2715e6ada348f97520a2551d5586dd04ae721ef17c5108f294405cacabfd4b6830a1d73c
-EBUILD selinux-sensord-2.20200818-r2.ebuild 283 BLAKE2B 225ad544a42e9fcaec24d8b2212b97a82458f2142211e8ec802f7991661c982bb930211bc55ca5c02287bc49fdbcae33579779501a1b9c6478cae86ae507d9fd SHA512 a594644aa7453607f42530ffdb998f4163c8b09667f612a423cc4269395654d2d84457ecceec1ff3abca8242bfc0ba680ceec42774288a6d0a8e81d91c46b6e1
+EBUILD selinux-sensord-2.20200818-r2.ebuild 281 BLAKE2B 8099890ce6a53580c0b17944264efa71be6ab835c9ed0aecd0d604b2762fd60584fac6de4f5bf47f25560faad76234dbbd95a36c0aae7eef5735b36b16a35dd2 SHA512 b762b01a961ea3e7e16cf1d881320f62985296fded804fd646803ebaa6a38544e4926f617829546035ee799b7f2ec90e1319421feb20920da01306251f5fd8fb
 EBUILD selinux-sensord-9999.ebuild 283 BLAKE2B 225ad544a42e9fcaec24d8b2212b97a82458f2142211e8ec802f7991661c982bb930211bc55ca5c02287bc49fdbcae33579779501a1b9c6478cae86ae507d9fd SHA512 a594644aa7453607f42530ffdb998f4163c8b09667f612a423cc4269395654d2d84457ecceec1ff3abca8242bfc0ba680ceec42774288a6d0a8e81d91c46b6e1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20200818-r2.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20200818-r2.ebuild
index 4f6993db6e30..e7cc370fdf02 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sensord"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-shorewall/Manifest b/sec-policy/selinux-shorewall/Manifest
index 4ba86006f5db..c5e04e0f2c01 100644
--- a/sec-policy/selinux-shorewall/Manifest
+++ b/sec-policy/selinux-shorewall/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-shorewall-2.20190201-r1.ebuild 285 BLAKE2B a654b02c22fd5d094f1ae4057fb413829692ebc3d59e30d28b6d508bd8460d03215a0dfde6fface76aa6845bbed89e7c1ddd09e34c9cd2d643c5ebd7b4ed90d5 SHA512 39533ad8dca1a4c07e3007830b79508df3cdb9e9b4ca450e05c2ad3ac2de107f1221fc09ffdeb3877dda8d2a0c561addcb75d35ef44482bf3c20e6bfc7ea8649
 EBUILD selinux-shorewall-2.20190609-r1.ebuild 285 BLAKE2B a654b02c22fd5d094f1ae4057fb413829692ebc3d59e30d28b6d508bd8460d03215a0dfde6fface76aa6845bbed89e7c1ddd09e34c9cd2d643c5ebd7b4ed90d5 SHA512 39533ad8dca1a4c07e3007830b79508df3cdb9e9b4ca450e05c2ad3ac2de107f1221fc09ffdeb3877dda8d2a0c561addcb75d35ef44482bf3c20e6bfc7ea8649
 EBUILD selinux-shorewall-2.20200818-r1.ebuild 287 BLAKE2B 040cc943e8dd8ffd996d9db6bd4274e2dcb0335dd18ac6acbc88f24211e147b25662cdb7d6dadfc7352bd4c15794a27bc35eb3474542dfc3652874dd8da4716f SHA512 65fc9c8e555504d4d4fae5377ac183ea0ae8e67a83bc1091cbf4f3448430ac626a8f5b5724bcfc2712dbd8879be136da4edbfaa196ff4883dff91c9d6c06c7e8
-EBUILD selinux-shorewall-2.20200818-r2.ebuild 287 BLAKE2B 37ee1c81025af04b997cd1dbef6c8c4add4e1a90559fb72c23307fc031e971def74873adc5b302de6e9572b74bbb5b40e525977bad5755b10fe43ffe3d8aa105 SHA512 708e15235221bf2fe11e5589cd6c7c09e61dfeb9e790d9c4e9a21bd00bcb3a10177468cfb808abe7e9073dec230ca5746d88567b2c3b03b5cd8edd80fac652c5
+EBUILD selinux-shorewall-2.20200818-r2.ebuild 285 BLAKE2B b217692a08b086f870a4be8e16aed04af466c4b831dc02228035c4176cfc197d00108abbe9172f4bc2a898939ca219c92d623b71d8ec878b256e1441d6499989 SHA512 d5ce975923fe34bfeb1e018fb15cb340f82d3df2dfe30e4f6ec12a999ff12ee81f56241ec451961ae2503e2e783a70232103bcb521366cb053d2e3d9aacf8f0b
 EBUILD selinux-shorewall-9999.ebuild 287 BLAKE2B 37ee1c81025af04b997cd1dbef6c8c4add4e1a90559fb72c23307fc031e971def74873adc5b302de6e9572b74bbb5b40e525977bad5755b10fe43ffe3d8aa105 SHA512 708e15235221bf2fe11e5589cd6c7c09e61dfeb9e790d9c4e9a21bd00bcb3a10177468cfb808abe7e9073dec230ca5746d88567b2c3b03b5cd8edd80fac652c5
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20200818-r2.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20200818-r2.ebuild
index 2f7903fde62b..f665054b1218 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for shorewall"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-shutdown/Manifest b/sec-policy/selinux-shutdown/Manifest
index 678eb52b522c..ca1e3c39d5a1 100644
--- a/sec-policy/selinux-shutdown/Manifest
+++ b/sec-policy/selinux-shutdown/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-shutdown-2.20190201-r1.ebuild 283 BLAKE2B 14e7eb6f288ea0a4bf3c624fb2ecd1aaae328e0379516449a6ef07789a61f51023d7f73219237711b34420084edd29b3984d5c2223fde40be808be2999edaa9b SHA512 4cd508eaed6be39ad3b4c3f6f1e98e071bcbe4cf953be6d970756efbe49e8ea0c110c30482450280fe1f8257660cac1823aaa694f1ff7db6f264cdd53d679850
 EBUILD selinux-shutdown-2.20190609-r1.ebuild 283 BLAKE2B 14e7eb6f288ea0a4bf3c624fb2ecd1aaae328e0379516449a6ef07789a61f51023d7f73219237711b34420084edd29b3984d5c2223fde40be808be2999edaa9b SHA512 4cd508eaed6be39ad3b4c3f6f1e98e071bcbe4cf953be6d970756efbe49e8ea0c110c30482450280fe1f8257660cac1823aaa694f1ff7db6f264cdd53d679850
 EBUILD selinux-shutdown-2.20200818-r1.ebuild 285 BLAKE2B 18449a4357bab6b7fa993611dc52a449f6f39b1a49c33f236d8e021ed47c22ea93f67ac3ca3c7012919a2ea7274737cc7d4b7e816dd7abf2a6bbe5887fda3888 SHA512 abe85f94d40441b84e9f4780708ba4310e20644f71e82725aba3cd4a5342c6003d610cdcef62fbd18e507295163454890d01698cdddb2cd4bfee100976b66ce7
-EBUILD selinux-shutdown-2.20200818-r2.ebuild 285 BLAKE2B 7ebf8a89fbaf80fdaaee074bcfa15d72cfc68517e2ef3dfad8dc76e349c07a0d93a4444e9601476ffe23f7e15033e3b6babaed4f470bbf0c622766a78796f47f SHA512 38d4b4c8f1fac9f8bd89844fe7aa9c0482fd111bf81826e87c03293de769af5d32b57efc61997cc3bc19ad3c3e20255ce380d66ccc050ec01e94e34de062bfd0
+EBUILD selinux-shutdown-2.20200818-r2.ebuild 283 BLAKE2B e030702eae7564110d52e24346fcba388fe46f285de54238e8fe8d53b2d936c671124e997f690965fe099473387cf97427c3a13c5a029b84acc1e66f007f4316 SHA512 bb33ddf4097474995ce728a2a399d3ad261630ef84dafa4a1fa128e44dff24d37d530648dd88b627318c82b1b6a6d103c737b1630988a8a62c756ae2a96e54a0
 EBUILD selinux-shutdown-9999.ebuild 285 BLAKE2B 7ebf8a89fbaf80fdaaee074bcfa15d72cfc68517e2ef3dfad8dc76e349c07a0d93a4444e9601476ffe23f7e15033e3b6babaed4f470bbf0c622766a78796f47f SHA512 38d4b4c8f1fac9f8bd89844fe7aa9c0482fd111bf81826e87c03293de769af5d32b57efc61997cc3bc19ad3c3e20255ce380d66ccc050ec01e94e34de062bfd0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20200818-r2.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20200818-r2.ebuild
index 698b866e80a2..63e3fd51b2c0 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for shutdown"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-skype/Manifest b/sec-policy/selinux-skype/Manifest
index 856fb4d57981..887b23a49be6 100644
--- a/sec-policy/selinux-skype/Manifest
+++ b/sec-policy/selinux-skype/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-skype-2.20190201-r1.ebuild 379 BLAKE2B 5fe1b376770afb508566cb8a4c490b5faf571ab1e3d13d521debdada55657479b8886c67b001b06faefdbc30d4ff16abc6ad424909cbc3007be88111e77daac9 SHA512 13dd3675eb8349c9ed5986c8f1f078d73fdabd852cdb2be30b120ffaee6e2cf3f88d1af707581c4dedad68451e38e2edc6b08db425a13c85985fd6c37092abfe
 EBUILD selinux-skype-2.20190609-r1.ebuild 379 BLAKE2B 5fe1b376770afb508566cb8a4c490b5faf571ab1e3d13d521debdada55657479b8886c67b001b06faefdbc30d4ff16abc6ad424909cbc3007be88111e77daac9 SHA512 13dd3675eb8349c9ed5986c8f1f078d73fdabd852cdb2be30b120ffaee6e2cf3f88d1af707581c4dedad68451e38e2edc6b08db425a13c85985fd6c37092abfe
 EBUILD selinux-skype-2.20200818-r1.ebuild 381 BLAKE2B 015136aded86fff16dfe7b35983f38e2b328bb7e77f2a6a1e88a90068f99245cf106bebc36a3b506ee93ea48375b7bf9d7b71a3b6f15a2a792313badd42e33dd SHA512 e509469a0eda97c1cf4623cd5e23f41816f7257b85ef3cc0b33c333aed4a05173226786444e404b0fc5cfac1081ba30b1bf31bfd5193619b639a40d274ac4abd
-EBUILD selinux-skype-2.20200818-r2.ebuild 381 BLAKE2B 68f4dd26c3e8903bd921d29d8fc1dd8ba0b577107c2c63d4c32bb124b5bcb1e146b089ef32438cdd4133cd5b13623604ae8b1cfb065dadef0c23f2799fcee66e SHA512 b1088feda9bce9ee9b14db1815dbf44a8626c36ee08d9eddf9dbd1763675993740af7217194f5b36be75517ad1c8473b1f262b7fac8ec1db47124b005f14479d
+EBUILD selinux-skype-2.20200818-r2.ebuild 379 BLAKE2B fc7523ad162e0fc8f6e21f264cd4e508befb70bd6d2e146d75c0b43a57e160664d2d346cc67be90d9cee827cb6758b411e46db4feca205af63f19d6ea2f1b10c SHA512 5f698f90f5309d22c36a682f664fcda627eeada1d621c645b32598302bc1db7cf1d44397c85895da33814768ee9523900886910ec7aa4391c4b11bfe1b779a11
 EBUILD selinux-skype-9999.ebuild 381 BLAKE2B 68f4dd26c3e8903bd921d29d8fc1dd8ba0b577107c2c63d4c32bb124b5bcb1e146b089ef32438cdd4133cd5b13623604ae8b1cfb065dadef0c23f2799fcee66e SHA512 b1088feda9bce9ee9b14db1815dbf44a8626c36ee08d9eddf9dbd1763675993740af7217194f5b36be75517ad1c8473b1f262b7fac8ec1db47124b005f14479d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20200818-r2.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20200818-r2.ebuild
index 45b0f8637002..84d68479f3cb 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for skype"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-slocate/Manifest b/sec-policy/selinux-slocate/Manifest
index b0b9c7adf913..9fb65ae6d750 100644
--- a/sec-policy/selinux-slocate/Manifest
+++ b/sec-policy/selinux-slocate/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-slocate-2.20190201-r1.ebuild 281 BLAKE2B 5436328f3845a2529ccd70a9e9ad8e745968c08c4557f991f7773598744824c2d4e8fa03eeb75788104403b33914f601ae48d8e536086a7e7c82895edd9c4635 SHA512 6b64dc152984fe27eae3a5e65cebc7013fbe4b5b385dccac827702e60d9b5871594db1e4b0106e1f0bc297d76fcea78c272c8c154069158375be52353f44017c
 EBUILD selinux-slocate-2.20190609-r1.ebuild 281 BLAKE2B 5436328f3845a2529ccd70a9e9ad8e745968c08c4557f991f7773598744824c2d4e8fa03eeb75788104403b33914f601ae48d8e536086a7e7c82895edd9c4635 SHA512 6b64dc152984fe27eae3a5e65cebc7013fbe4b5b385dccac827702e60d9b5871594db1e4b0106e1f0bc297d76fcea78c272c8c154069158375be52353f44017c
 EBUILD selinux-slocate-2.20200818-r1.ebuild 283 BLAKE2B c9e39930f4b0d4cae728ef17d6fdeca26b78d64624977da0699f63ac279abb954957020c2442b43debd69571858921b6e68654257ea0123dd179c1b0393fc03a SHA512 6c795d548a23b1b4bed8c57706f2143cf4e57b21dc3439595e519f9c3482d47244631523eaa996da0b1dfc85ec04a60dfd0b5fea258c8e441db8323caf3c07a6
-EBUILD selinux-slocate-2.20200818-r2.ebuild 283 BLAKE2B a0db46ea0995ec6dba2e712abad4e3a2a10aa5ccdc653388f2c4d73a117fc1cd3a883374ed97cb71ad0a72c2511f3059ba359bd2a67468d6b077356d73557b5c SHA512 00fdf4e4d3d2ff8324859e4368f34bf562e04377256e982a38e4a65a0df20de7b0fcd07d3a717fd76113e50610942581c914a2c8ff10a441a00a29673d0071bf
+EBUILD selinux-slocate-2.20200818-r2.ebuild 281 BLAKE2B 5a4a786d51cc009c2ffdbfc039880dd9936eeb5a0ef272ceb0fb53b156e6633936a085adef5126dc8350c7be74e328fc182568ffe6b12bbc5c4e92c61f70567e SHA512 78d750d0bbf7cb05947449fc4448447f404d00541db5f56c75288ff1532a1e12802bf1993c8518c894a17d2ef4ac4bf94beb948dc731981408eb8f5d0808dacf
 EBUILD selinux-slocate-9999.ebuild 283 BLAKE2B a0db46ea0995ec6dba2e712abad4e3a2a10aa5ccdc653388f2c4d73a117fc1cd3a883374ed97cb71ad0a72c2511f3059ba359bd2a67468d6b077356d73557b5c SHA512 00fdf4e4d3d2ff8324859e4368f34bf562e04377256e982a38e4a65a0df20de7b0fcd07d3a717fd76113e50610942581c914a2c8ff10a441a00a29673d0071bf
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20200818-r2.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20200818-r2.ebuild
index 6af543c81ebe..75b9c313bd70 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for slocate"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/Manifest b/sec-policy/selinux-slrnpull/Manifest
index 0a0fa48d6431..2c76cdd27918 100644
--- a/sec-policy/selinux-slrnpull/Manifest
+++ b/sec-policy/selinux-slrnpull/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-slrnpull-2.20190201-r1.ebuild 283 BLAKE2B c99ef8bda57b644dd58a15f668eaef775abe36ded6dd70caef0eace559c25fa22c4c9b4413eda5e804cef80b71c1207689ddedf71247fba0ba25d472a994416d SHA512 3c884424eb7aeb832921e8f4bf33602c38a1384d0f6d75a56bacde41d2bce54b143b65d8cb025d988e2313b7cfee36ce69068747b4f43881dabef2848ee9fa59
 EBUILD selinux-slrnpull-2.20190609-r1.ebuild 283 BLAKE2B c99ef8bda57b644dd58a15f668eaef775abe36ded6dd70caef0eace559c25fa22c4c9b4413eda5e804cef80b71c1207689ddedf71247fba0ba25d472a994416d SHA512 3c884424eb7aeb832921e8f4bf33602c38a1384d0f6d75a56bacde41d2bce54b143b65d8cb025d988e2313b7cfee36ce69068747b4f43881dabef2848ee9fa59
 EBUILD selinux-slrnpull-2.20200818-r1.ebuild 285 BLAKE2B 9b998ce9feaa84354154f218f96f7bd3c17a149e0184943997b68d3bf4187439ed0ba763adb7f12ca8fd321a4c3e429abe9a0d63b5b283fa27cb9064bf515f91 SHA512 3974e3f4cb4652685fb218c6376537ed24a90832511d9052770186e5ced170c73932dfe35bd35c373150e78ebec8b92d8870ee90a0faeab0cad0a5ee2002998c
-EBUILD selinux-slrnpull-2.20200818-r2.ebuild 285 BLAKE2B f6227d5f61422e84cee50255b61231a1f0e6ce18340190bdb56b0f991a1bfd83dac1f95abe3004a9d290dcb825c7f2a6f0eeb948a45a484559448fa7a8d90220 SHA512 188c1ae3df38ed391d598d7a3199046fd2a734e32f597c4064b4ac73e8b525df5cf767b680d506f1696bdb6dee472760f0c3a61e64d34334a42876d8afe4a6ef
+EBUILD selinux-slrnpull-2.20200818-r2.ebuild 283 BLAKE2B a42dfe719b838570de3dcbc53105843d029ac8551979edb70001aa02ca780a734d18031a8ee41b8916de15cc5e40c266fee7a2d4ace6007ce7ff3789d7f9fc1e SHA512 db0c777c4cf96e73eacccfadf1bcca605f74ad523a1020ed6f29ce0e5252b62e0e6129a357da658a4a79c6c49078f3b52a3dacc2ff6b6b5fe4ed2dcdab5defcc
 EBUILD selinux-slrnpull-9999.ebuild 285 BLAKE2B f6227d5f61422e84cee50255b61231a1f0e6ce18340190bdb56b0f991a1bfd83dac1f95abe3004a9d290dcb825c7f2a6f0eeb948a45a484559448fa7a8d90220 SHA512 188c1ae3df38ed391d598d7a3199046fd2a734e32f597c4064b4ac73e8b525df5cf767b680d506f1696bdb6dee472760f0c3a61e64d34334a42876d8afe4a6ef
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20200818-r2.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20200818-r2.ebuild
index cc993dc40df1..fa5209d30480 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for slrnpull"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-smartmon/Manifest b/sec-policy/selinux-smartmon/Manifest
index 88e9bf74da1e..e581f2623284 100644
--- a/sec-policy/selinux-smartmon/Manifest
+++ b/sec-policy/selinux-smartmon/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-smartmon-2.20190201-r1.ebuild 283 BLAKE2B b678b299ae6584d638140cf297b4daecb10a96de098f4e8ff52ac6846ee8166941f79da69bd402540d5af1b8c0f24b3f1e4630b738db70b0de561da41fead58b SHA512 264f2784cc85e2e178be9b3f941680e69633124889932bf3d39f9c02068b100907556053117b9b58924f22251bf6579e63ec29b93fc371022ecdb7c0b373dd2e
 EBUILD selinux-smartmon-2.20190609-r1.ebuild 283 BLAKE2B b678b299ae6584d638140cf297b4daecb10a96de098f4e8ff52ac6846ee8166941f79da69bd402540d5af1b8c0f24b3f1e4630b738db70b0de561da41fead58b SHA512 264f2784cc85e2e178be9b3f941680e69633124889932bf3d39f9c02068b100907556053117b9b58924f22251bf6579e63ec29b93fc371022ecdb7c0b373dd2e
 EBUILD selinux-smartmon-2.20200818-r1.ebuild 285 BLAKE2B 8ecd730e0e95aacb14a64fa2f434d5a5553360c765e823b14ede91c38f372199166e862c55f5451be09afd661c45228879177c7c5ee9d9f4645e777cc6a6b190 SHA512 363069e5e6096a7341cb4a56f4c12cc71e5d4d9a8f03c8ef1bd2ace522b76849abdfdcf1b20af15e0cff613fb47cb6eb45f664a6bc19b30f382930fa7c35a56a
-EBUILD selinux-smartmon-2.20200818-r2.ebuild 285 BLAKE2B c5cd058454fb1a7a160a4f01651af1b7aa8dfdf2f5ed93ad6f85d7160ce47d6d8fab7e67606d82112fc95028f7b914b9221b9cd8e3121b4a70895fc98fd5a4a1 SHA512 9cb26061b6c79c8855988b6c7ed1f1eab0c1d6930ac76772f0b10d9bb149f69b973dd1d414ea31838126e90a7bcfd7b35c197d4c0939ef7e8107b23e906d8549
+EBUILD selinux-smartmon-2.20200818-r2.ebuild 283 BLAKE2B 421a28ca5c9ebb7212c138ee540a151c81dccf89321ef61da122a0b059f684bafd2b9acbbb78b43bef633ca8304e9c050c2b91592d19a6e771a6930e50f051e9 SHA512 fe8acc7fa095196ac66942547ea8c44dc6d85afd3b2a6d9a6ca10985bf853fe1095ac192462bdd8143a7bbd3b9a2e632e7405283d770ae40b726dfa00f169ddd
 EBUILD selinux-smartmon-9999.ebuild 285 BLAKE2B c5cd058454fb1a7a160a4f01651af1b7aa8dfdf2f5ed93ad6f85d7160ce47d6d8fab7e67606d82112fc95028f7b914b9221b9cd8e3121b4a70895fc98fd5a4a1 SHA512 9cb26061b6c79c8855988b6c7ed1f1eab0c1d6930ac76772f0b10d9bb149f69b973dd1d414ea31838126e90a7bcfd7b35c197d4c0939ef7e8107b23e906d8549
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20200818-r2.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20200818-r2.ebuild
index e7223088bfdd..b22449974084 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for smartmon"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-smokeping/Manifest b/sec-policy/selinux-smokeping/Manifest
index 7951a27ce420..f0362f47f9d9 100644
--- a/sec-policy/selinux-smokeping/Manifest
+++ b/sec-policy/selinux-smokeping/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-smokeping-2.20190201-r1.ebuild 381 BLAKE2B 1fc869074042b5950ec3c4cca989a3ad665c249c08375dea164d4d5ceb3d2571339dccfbc960d18f479f29a027dd542149627605dea3e569618e9d539e53bc8c SHA512 0a0143271b44f88d8cd0bc87fc5de704d9902e35bc29d8d3a76b94c5a04ab27b4e8db5393face34d2f0436db16fc57606ea9fb1da3afb52ab13e17e07f66f6f3
 EBUILD selinux-smokeping-2.20190609-r1.ebuild 381 BLAKE2B 1fc869074042b5950ec3c4cca989a3ad665c249c08375dea164d4d5ceb3d2571339dccfbc960d18f479f29a027dd542149627605dea3e569618e9d539e53bc8c SHA512 0a0143271b44f88d8cd0bc87fc5de704d9902e35bc29d8d3a76b94c5a04ab27b4e8db5393face34d2f0436db16fc57606ea9fb1da3afb52ab13e17e07f66f6f3
 EBUILD selinux-smokeping-2.20200818-r1.ebuild 383 BLAKE2B a996962d6a9873552b68e4e0b0a2ee029170fe0447e9291faa981a5bb72a0085906256de239e55bb07c516a559fd6004162e9f88fc5ad115d4fad5d670874a5b SHA512 752a0616a133f3074c2dfeed8aa3f2c26c5a6279acf31447fc6acd898e87bb759e8ab34ff587d5e25a5214c06cfbab09ad8f23e4f60379073395b6a64a2606cc
-EBUILD selinux-smokeping-2.20200818-r2.ebuild 383 BLAKE2B 015f454b59937e967026d1ab7b67c889dde29f30eb04e4324e0cb18c8dc2df00df4f8bd40598e3225679ffd338bfb76515f478b32b5c646a2436ce685a60d3ef SHA512 67a832cf238f9f277e6485a1d7d97a37251ed766d76f71e19a9366483d4b63827f4370ee19f9834e0000e956be9d9d89c7af965fae25f9525cf02370674bf1d0
+EBUILD selinux-smokeping-2.20200818-r2.ebuild 381 BLAKE2B 2811c8b003aa8fb18e97fd01783fc7d60d1593359fdd7d9313b046626c855206ca32301ec5940b07578cb8b25ef3726ff3620f93108ddb19653c8c974c9b01b1 SHA512 da2e1b3e192f555e12cbeb3001e86e4ff8b708f7681706dc52452e5999efaf23867710d49bd8eaa7258e715d93292caf1a72ab7f336bcf069163f13602944b2a
 EBUILD selinux-smokeping-9999.ebuild 383 BLAKE2B 015f454b59937e967026d1ab7b67c889dde29f30eb04e4324e0cb18c8dc2df00df4f8bd40598e3225679ffd338bfb76515f478b32b5c646a2436ce685a60d3ef SHA512 67a832cf238f9f277e6485a1d7d97a37251ed766d76f71e19a9366483d4b63827f4370ee19f9834e0000e956be9d9d89c7af965fae25f9525cf02370674bf1d0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20200818-r2.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20200818-r2.ebuild
index c47a989f1d54..ec1fc0192220 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for smokeping"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-snmp/Manifest b/sec-policy/selinux-snmp/Manifest
index 2bad3ee4631c..f26b8068a38c 100644
--- a/sec-policy/selinux-snmp/Manifest
+++ b/sec-policy/selinux-snmp/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-snmp-2.20190201-r1.ebuild 275 BLAKE2B 73d27a9fe629e4365e061a38e88b2350a23f941bb990becc85966f1d11dac56b38bd754e8de91848d0e05f5953fb6d20edbbd900fc281c12dfe0385eb848a7bd SHA512 f2a522d2bdf6f91a1666eb887412f3ffc9901a03d41b6fe1bca4fa5cba62bc12bacf0b2b0c140577d69b0619ed767949a3ada364c66395dfe5b16f543133b229
 EBUILD selinux-snmp-2.20190609-r1.ebuild 275 BLAKE2B 73d27a9fe629e4365e061a38e88b2350a23f941bb990becc85966f1d11dac56b38bd754e8de91848d0e05f5953fb6d20edbbd900fc281c12dfe0385eb848a7bd SHA512 f2a522d2bdf6f91a1666eb887412f3ffc9901a03d41b6fe1bca4fa5cba62bc12bacf0b2b0c140577d69b0619ed767949a3ada364c66395dfe5b16f543133b229
 EBUILD selinux-snmp-2.20200818-r1.ebuild 277 BLAKE2B 37f5f9d24035f2e7bc78f980ec6711c44502ec3246f4bfa6b53890ba14ce99444628dd4e659a2d6a19e8fe5051c1fd4f9ce52a6ec5f72b894217dfd838051078 SHA512 cbc7e4740c12ddd060fb0c97fc9adc89d6d90987a2ac40197f87c2b53184581dd5e78f320688add06b48aae21c2650c7cd42a84a261105db161231d1a912f8f9
-EBUILD selinux-snmp-2.20200818-r2.ebuild 277 BLAKE2B 4ad02e01853129c6e9e6df414b5434f0e86006ce5fc1e51b1a6c735ea202a322b5e8c5bcad40937197e2f71b188d565d85b7208f76a9bfba94097e1871fc5f8a SHA512 3ee41f3fdb98340759967058f535c3f6adc1c85b99643ac60f0992b5ffc46713c3306c92ea993dc5c6b8870e242a58775364cf98dcaae5dc26dcc7a630c69ef6
+EBUILD selinux-snmp-2.20200818-r2.ebuild 275 BLAKE2B c471e4e84c08b4cc465178dd5f664295aafcebcb99f99f7c256895d0cb5c4a5f9b08942d149727b6389d99f84f4c899ad2029de2d57a7a1784c335b68e0b316b SHA512 ca06a5bd6794c0faae799253f8fb03b54ce09986d19413c04b96342039cd9b139dadd5ae57395e424d3a1a3536420f3138f9057b9cd45401375d8e04d264bbb5
 EBUILD selinux-snmp-9999.ebuild 277 BLAKE2B 4ad02e01853129c6e9e6df414b5434f0e86006ce5fc1e51b1a6c735ea202a322b5e8c5bcad40937197e2f71b188d565d85b7208f76a9bfba94097e1871fc5f8a SHA512 3ee41f3fdb98340759967058f535c3f6adc1c85b99643ac60f0992b5ffc46713c3306c92ea993dc5c6b8870e242a58775364cf98dcaae5dc26dcc7a630c69ef6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20200818-r2.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20200818-r2.ebuild
index 675cf7cdffd5..8b60727a34a3 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for snmp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-snort/Manifest b/sec-policy/selinux-snort/Manifest
index 0b1f38fa6254..84657a2cef4d 100644
--- a/sec-policy/selinux-snort/Manifest
+++ b/sec-policy/selinux-snort/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-snort-2.20190201-r1.ebuild 277 BLAKE2B f0485ee3cb9639eddd2c68b5406ba792c141649270bf1ec38a7a13247ea5bf3f19aae0eea69c502d83d02852a5348f75effb2e17da67d1100e8a9dd36ebe7136 SHA512 3a0368af8c40876a94234e2cf766a29b60aa4b090aef9782626001d538e640daf7ddbdd3d19cac56fca260f9c585c1210c8d2d71453aee64ef5cf439f05226c5
 EBUILD selinux-snort-2.20190609-r1.ebuild 277 BLAKE2B f0485ee3cb9639eddd2c68b5406ba792c141649270bf1ec38a7a13247ea5bf3f19aae0eea69c502d83d02852a5348f75effb2e17da67d1100e8a9dd36ebe7136 SHA512 3a0368af8c40876a94234e2cf766a29b60aa4b090aef9782626001d538e640daf7ddbdd3d19cac56fca260f9c585c1210c8d2d71453aee64ef5cf439f05226c5
 EBUILD selinux-snort-2.20200818-r1.ebuild 279 BLAKE2B 62f5ab9c9c5fefe1421a9cfed1612cf1e7ba7be597a31188d6bfcc8c74745c77ffbac800625eb9626531a447aabaa2275b840f34b16a7a1dd843907d4278c10d SHA512 5c09ff345f75b5741cbe8762b4049f757c1e534c3d9232f3bf95dba012715ee2a8a9638e0533719aa3d38e3ee6e42adb315105274558b0025d230c1d7d6b4bb8
-EBUILD selinux-snort-2.20200818-r2.ebuild 279 BLAKE2B c4a0bbf21114f71bf1adc80c0ad543e059695040d64c54d78f9bacbac0031c99fdc0ffb9c31e138e00226f5849fa64711601c31c5187d3dbe86466b62e4e69fc SHA512 86c698c823671c9e4407c41ce2d6743b6caef7cb28c33b8715ca87b133695f4be7799a931d108f5a07c039e6f13b9a5b88ca81d10fe2048815f24cbed27af209
+EBUILD selinux-snort-2.20200818-r2.ebuild 277 BLAKE2B e4c1fdeb947f5cb87a940529cb242aa8a3ff6e1f6b53e84d11841cf9e1bb4365ab14ba391929ba6f592aa8fa8d5a383207af0a41f37645fa9853fb0054225631 SHA512 efc238a1c73ddf9cd695ff427ccfc5a6d76ec104dd48c5878ef12887fe7adaaa5f9470da642527554e0a3175470b630ec147848e4026048f7e76319c58a4a661
 EBUILD selinux-snort-9999.ebuild 279 BLAKE2B c4a0bbf21114f71bf1adc80c0ad543e059695040d64c54d78f9bacbac0031c99fdc0ffb9c31e138e00226f5849fa64711601c31c5187d3dbe86466b62e4e69fc SHA512 86c698c823671c9e4407c41ce2d6743b6caef7cb28c33b8715ca87b133695f4be7799a931d108f5a07c039e6f13b9a5b88ca81d10fe2048815f24cbed27af209
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20200818-r2.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20200818-r2.ebuild
index ab1ca77a8741..3224ba01564d 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for snort"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-soundserver/Manifest b/sec-policy/selinux-soundserver/Manifest
index f368f213a242..575f2e9e6a37 100644
--- a/sec-policy/selinux-soundserver/Manifest
+++ b/sec-policy/selinux-soundserver/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-soundserver-2.20190201-r1.ebuild 289 BLAKE2B 2c9808d59016984e3245f09f5404eedf4d68e8b52a8f295f4a57347aa27a1e791d5ddcbd3d0e6aa586ed63d4528a2f9ef58bf43754452e641f8d4a3bf96bb6fd SHA512 5856ffc33319933e8491a4a453a86cd3b9c50acc3060390492aab9873a62d19c386f9654c2598125d141a5c715ee6b43aef78a893929ae96570a9709b419be11
 EBUILD selinux-soundserver-2.20190609-r1.ebuild 289 BLAKE2B 2c9808d59016984e3245f09f5404eedf4d68e8b52a8f295f4a57347aa27a1e791d5ddcbd3d0e6aa586ed63d4528a2f9ef58bf43754452e641f8d4a3bf96bb6fd SHA512 5856ffc33319933e8491a4a453a86cd3b9c50acc3060390492aab9873a62d19c386f9654c2598125d141a5c715ee6b43aef78a893929ae96570a9709b419be11
 EBUILD selinux-soundserver-2.20200818-r1.ebuild 291 BLAKE2B f95a79b53ad72a60727d2592936e259e02557fe228afa299eee5170971e0dfbe3e8405bd1bcdb7774ac9669112ba86dfc2fed78da2825ef10455dfa75de69af0 SHA512 a3569de1bd7bd15c3175726a403b9156d112b894e72e6edba5e51b060b51f5315ce85e70fd18479be742ccbe7cad48a4cd34a2e4b94700fc4b186a2745a94e79
-EBUILD selinux-soundserver-2.20200818-r2.ebuild 291 BLAKE2B 421c0a85530d2faaeab63864e00a43f44f4955fedf2e344692745d13fbc467c4a8d8879fa9526acf4ea65d825a0ae28ffb4caf82022d78c20cfb8885c5530537 SHA512 59445b62f04d29dc3c5c68534a6a3e2c0cf6afc5dae59aecd49e2b04a2bc4b1b290ed40140ffccb6c86aa65c2f9612d62df940018eedfc50a895ce75df39f8af
+EBUILD selinux-soundserver-2.20200818-r2.ebuild 289 BLAKE2B 16715e01507d4ae560dc4b3a05e81308bd43cb9f6a47f92c847bea46b454c423ba867e6408f8f30af27b64ba92ac47e61b17ae09a0a82c6af7e5bab1c08b4995 SHA512 9d793b87edabbbabb17d3309ee25c690f7f7c1f855138ad59c0b35dcd204e1bc6372f97bef6fea8188232c1c0912636bb75deb550de113141686d2fb77ea00df
 EBUILD selinux-soundserver-9999.ebuild 291 BLAKE2B 421c0a85530d2faaeab63864e00a43f44f4955fedf2e344692745d13fbc467c4a8d8879fa9526acf4ea65d825a0ae28ffb4caf82022d78c20cfb8885c5530537 SHA512 59445b62f04d29dc3c5c68534a6a3e2c0cf6afc5dae59aecd49e2b04a2bc4b1b290ed40140ffccb6c86aa65c2f9612d62df940018eedfc50a895ce75df39f8af
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20200818-r2.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20200818-r2.ebuild
index 3a884c045ea6..4ba11b7c535f 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for soundserver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/Manifest b/sec-policy/selinux-spamassassin/Manifest
index 8e114348b3fd..f171b37afe9b 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-spamassassin-2.20190201-r1.ebuild 291 BLAKE2B a338ea5a5672dce881eaf9e52dde1eb336db50f392767338f32a26bbffdb98ec12efba30946e259215dee21bc18b942bbaa1c45299918fcdd5f41ce6bdf17c16 SHA512 7bd54a5250064423207150241c5eaba746d6643e2388bbede7e653c69fe8126327c1cf0b0ee0e4f88d4bcb15ccf69602823f336265e2aec42f27f8c7f6077940
 EBUILD selinux-spamassassin-2.20190609-r1.ebuild 291 BLAKE2B a338ea5a5672dce881eaf9e52dde1eb336db50f392767338f32a26bbffdb98ec12efba30946e259215dee21bc18b942bbaa1c45299918fcdd5f41ce6bdf17c16 SHA512 7bd54a5250064423207150241c5eaba746d6643e2388bbede7e653c69fe8126327c1cf0b0ee0e4f88d4bcb15ccf69602823f336265e2aec42f27f8c7f6077940
 EBUILD selinux-spamassassin-2.20200818-r1.ebuild 293 BLAKE2B 698905fd4396a05f2e8043ab1bd51d64a58f901a8ae5ff3d22fd771941c2127f54678e8c5881df86c38ae5aac1247151aab802fa217c11f3a391f478aa6540e1 SHA512 93fe7f50bcdacd599963d3e0e6772e2c1a6e49a71ef00c963be66b32e263f3b813feda4928d97aa123cd7022cfd807bba4c93247914c4b9055dc98fbd186dc16
-EBUILD selinux-spamassassin-2.20200818-r2.ebuild 293 BLAKE2B b10ed0afa23de8c00552b305ef84dfcf00217be3b06fbaa82c13ca84b9d60d580d702c6c99ea552993b1adc5439f1124d750d50b61ebc8215353da9fe54d6a23 SHA512 daf23f414504bc989f69b49dc603104962256e71f428b4195549245669161eb0ed4f89c65181f18b6b1dbe00d182f7bf8d07b9420052f05ca57dcab24b72fc56
+EBUILD selinux-spamassassin-2.20200818-r2.ebuild 291 BLAKE2B b42ff8311f3f21e3ce2593f26a69fc720ecbdc6bee59f85f1b6084f9115810aa7b1280d52aac4edb16a70f63a3d7176de6e178d01c1f0ce1125b5d1ed1385fa7 SHA512 a0b214f1584fa94803b03e7ffd6072746f9d3cb5c67399ac8c5a984a449255ef39bfeef10e1801d589f8a9835761d901d8f0f8b7c6df71e02c165fdc022d8411
 EBUILD selinux-spamassassin-9999.ebuild 293 BLAKE2B b10ed0afa23de8c00552b305ef84dfcf00217be3b06fbaa82c13ca84b9d60d580d702c6c99ea552993b1adc5439f1124d750d50b61ebc8215353da9fe54d6a23 SHA512 daf23f414504bc989f69b49dc603104962256e71f428b4195549245669161eb0ed4f89c65181f18b6b1dbe00d182f7bf8d07b9420052f05ca57dcab24b72fc56
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20200818-r2.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20200818-r2.ebuild
index 0d3c64ff976f..1fae4c634cc4 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for spamassassin"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-speedtouch/Manifest b/sec-policy/selinux-speedtouch/Manifest
index 84501ddeb65d..f4e8bbc26e91 100644
--- a/sec-policy/selinux-speedtouch/Manifest
+++ b/sec-policy/selinux-speedtouch/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-speedtouch-2.20190201-r1.ebuild 287 BLAKE2B 91b7c9d71e494f8abcdf6bbb23a4043eba586839998cbb51baea2167d938f9d26194938f58ab08dae530a7ee746370aca56fc4ab3116012e980be73db5ae9f3a SHA512 2bd3a369f45d26502c3f343200ea9295b2941998f625119b9f7988044b237251422f3492fb85a3582646f702ca08eda6b63574baa1d9ea2b09a8d009ae4459c2
 EBUILD selinux-speedtouch-2.20190609-r1.ebuild 287 BLAKE2B 91b7c9d71e494f8abcdf6bbb23a4043eba586839998cbb51baea2167d938f9d26194938f58ab08dae530a7ee746370aca56fc4ab3116012e980be73db5ae9f3a SHA512 2bd3a369f45d26502c3f343200ea9295b2941998f625119b9f7988044b237251422f3492fb85a3582646f702ca08eda6b63574baa1d9ea2b09a8d009ae4459c2
 EBUILD selinux-speedtouch-2.20200818-r1.ebuild 289 BLAKE2B 5c5de5f25a744c21c3cc278b8ee19812fc81fed8d108ff2782fce002856fe651307235d8665dbe0deeb8d426b5c6e6005052d2c56d97df1145bda066ca42416a SHA512 cf9531ffbeb95768eb0d6bb6534de1f974908b8c6f78622e6288c994bd30eae221dd90fdedc2c411bf99b496c4d8a46a24a78630247830134e8b53b914af5424
-EBUILD selinux-speedtouch-2.20200818-r2.ebuild 289 BLAKE2B 6cc84fee788a4694505241209d437f19cb4e660a942bfb6414a7bbb45a09025c903ce316821d39b36d27d07c23ea4f031595aef45f7f128bb0d64f531c710406 SHA512 170d4cb8cd1b0c3e06eb42ab681e3f0021f459c64b953568f8e47eea1240a472df884c77b835498627af9ac7afa6d8c2c9943102e0103174ea44f35f9a965043
+EBUILD selinux-speedtouch-2.20200818-r2.ebuild 287 BLAKE2B 4cddfa8b833982ae1602700620127e4a8917f93ac4be9ee8026fad6655e9e3bb64690f8cfb67f814532a17d1bc140afee7b2813a2e01877a1f1d284e13ae72a4 SHA512 ed71eec4ebc4cc1ab8768669ef9398fd7fdfe16486440fd5c108e4735ef21ffad8f63b8218dbd2e76b30f27981c94a0c212847f5b79b1991555a843fcec6400e
 EBUILD selinux-speedtouch-9999.ebuild 289 BLAKE2B 6cc84fee788a4694505241209d437f19cb4e660a942bfb6414a7bbb45a09025c903ce316821d39b36d27d07c23ea4f031595aef45f7f128bb0d64f531c710406 SHA512 170d4cb8cd1b0c3e06eb42ab681e3f0021f459c64b953568f8e47eea1240a472df884c77b835498627af9ac7afa6d8c2c9943102e0103174ea44f35f9a965043
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20200818-r2.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20200818-r2.ebuild
index 90ae1ab45797..dee0f824f601 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for speedtouch"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-squid/Manifest b/sec-policy/selinux-squid/Manifest
index 06816579caec..5b70be8a4be7 100644
--- a/sec-policy/selinux-squid/Manifest
+++ b/sec-policy/selinux-squid/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-squid-2.20190201-r1.ebuild 373 BLAKE2B 885e8be9dafaa146bafd587381bdaae448b8eeebea3d2ac01706ed62fd5415874ad39e6843889397e210b9fe67fa7e55409ba177c5904cb991f629dcd6b8ad5b SHA512 825fce44d425433ac28994bc6bdecec3bbefd31534108621253decdd5bbd963b4f6bee345d2ff8c3f900a07766b46334ba1771749adf3545fb23663af6629eb8
 EBUILD selinux-squid-2.20190609-r1.ebuild 373 BLAKE2B 885e8be9dafaa146bafd587381bdaae448b8eeebea3d2ac01706ed62fd5415874ad39e6843889397e210b9fe67fa7e55409ba177c5904cb991f629dcd6b8ad5b SHA512 825fce44d425433ac28994bc6bdecec3bbefd31534108621253decdd5bbd963b4f6bee345d2ff8c3f900a07766b46334ba1771749adf3545fb23663af6629eb8
 EBUILD selinux-squid-2.20200818-r1.ebuild 375 BLAKE2B 537febddd608108ba4af2c65d9ef50ffcb714532e105f11b77f1cb8d5abbda97d477c1af85b70edfb3757f89feea0a309f914eaa45fc951a6de45d10b1ca4f51 SHA512 5621d99c90b2ac184b5ea860edfe7e2e7d8e56765619511b7e9e3166ff9d556d7f04e9fb3bf5737618863931fd68c853d4ebf126b38685e1948bfc61a6b17662
-EBUILD selinux-squid-2.20200818-r2.ebuild 375 BLAKE2B 2cf3522a7f41340624df9fd3aca52e76534ca8e500212eb2b6fb9c99e05a6ca167890ef42a08285f4c3264faa960d0f7daefa1cfb5178d45146d060ef4c9fc2c SHA512 01ff169efaa407aae83d2c7c773fdebb80fc6beece802542456a8f6b216fd80b5a6e0a39966518d1513cc52f3e33ce79244a3d93b2b68a68920f3141233b536e
+EBUILD selinux-squid-2.20200818-r2.ebuild 373 BLAKE2B 2d8eacb29322102db41cad620da7d6b98e7d778ce4aa89a9ed1bec478481fd34e89cfa564e9545b89b242ef087171474cac891ea01e2ee05c68d5d9d55338460 SHA512 75a5300745daa1877c39cd3b87864a7c27ab782c08bc248dec24474477ad1d0f615b0800c76158434b863c75d257b133d550ab452f5421b32c840c45e1daf426
 EBUILD selinux-squid-9999.ebuild 375 BLAKE2B 2cf3522a7f41340624df9fd3aca52e76534ca8e500212eb2b6fb9c99e05a6ca167890ef42a08285f4c3264faa960d0f7daefa1cfb5178d45146d060ef4c9fc2c SHA512 01ff169efaa407aae83d2c7c773fdebb80fc6beece802542456a8f6b216fd80b5a6e0a39966518d1513cc52f3e33ce79244a3d93b2b68a68920f3141233b536e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20200818-r2.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20200818-r2.ebuild
index 44d2e7912f3d..484f56d69f12 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for squid"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-sssd/Manifest b/sec-policy/selinux-sssd/Manifest
index b1e554a4c182..d54eef1f182d 100644
--- a/sec-policy/selinux-sssd/Manifest
+++ b/sec-policy/selinux-sssd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-sssd-2.20190201-r1.ebuild 275 BLAKE2B 5c248ba6396435f5c41598041df096caa7920fb070ebbab9f60697a212caaccec4ff5713decb29968cdf3717bb921126f2b619bcffaadf93fe2e3bc683272102 SHA512 c814224a8376179498d09381ce1f79a6528072e40c63e1bdd51ad1ec6408167e6b61d269461ca4e7dcd64d0499c2fad573413fe69bf7592d0a47438291d5f96e
 EBUILD selinux-sssd-2.20190609-r1.ebuild 275 BLAKE2B 5c248ba6396435f5c41598041df096caa7920fb070ebbab9f60697a212caaccec4ff5713decb29968cdf3717bb921126f2b619bcffaadf93fe2e3bc683272102 SHA512 c814224a8376179498d09381ce1f79a6528072e40c63e1bdd51ad1ec6408167e6b61d269461ca4e7dcd64d0499c2fad573413fe69bf7592d0a47438291d5f96e
 EBUILD selinux-sssd-2.20200818-r1.ebuild 277 BLAKE2B 267b7cd2dea6b8872cbc8524c36345bf99a15862879bbbf2745a13fa4882ff542498d268c291b60b93aa3811357990a977691670373c1dad805da35dabd7c5a6 SHA512 be97c8318562a0ef55b0707bc0783ec58dd1c3499751e2fc3d1cb3b7a4afa8dc1bdbf0a1f451cd39461c12f7064559180f8c6ae15b65fa0248aeeb722a8b3b2a
-EBUILD selinux-sssd-2.20200818-r2.ebuild 277 BLAKE2B 4f3f53820eee71b03d0423db6f72989bec947e4dab1588274340ddc1a522a3ca45f815f854343acd04a5dd38727d9713578ffb16f637c1e9610309dae62dc0f8 SHA512 90132c6c5de88793e8eeabded480f8e9a163be017f8520c2d3d8ca5bc773a544a36abd9f28106e9a93b16f313d468bb84663477720444850a97d435594f5b856
+EBUILD selinux-sssd-2.20200818-r2.ebuild 275 BLAKE2B 696d6bea1cc669dd1db0a73ea64638947430ab14b3f4735605b958cc3c2a7370e37d94f43751e4bd691e38ee00327751d4e54ea40565391a4522530013eacfba SHA512 24337867459aabed4176891a2b88fc520d2aad13abca739f2a3fecc14e5f3cff9184f7790a352b6edea2ba970ec949e6c9b81bdd44be29d8f361cdd86683286a
 EBUILD selinux-sssd-9999.ebuild 277 BLAKE2B 4f3f53820eee71b03d0423db6f72989bec947e4dab1588274340ddc1a522a3ca45f815f854343acd04a5dd38727d9713578ffb16f637c1e9610309dae62dc0f8 SHA512 90132c6c5de88793e8eeabded480f8e9a163be017f8520c2d3d8ca5bc773a544a36abd9f28106e9a93b16f313d468bb84663477720444850a97d435594f5b856
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20200818-r2.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20200818-r2.ebuild
index 69e1d26c00bf..414bf67d66f9 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sssd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-stunnel/Manifest b/sec-policy/selinux-stunnel/Manifest
index afbd3e77670c..c57aef6e712b 100644
--- a/sec-policy/selinux-stunnel/Manifest
+++ b/sec-policy/selinux-stunnel/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-stunnel-2.20190201-r1.ebuild 281 BLAKE2B 6c6ab57feed40d7726421496a55389c71fddf846467e8ac4ee0007aa3bd97cc94d4aeb64a41f2073e12351dba298595dcd9caa40a19f5f00cb843b25735923d7 SHA512 efad942cd5e28fab4bf0a6b61167e2b1a47d3aa765a27781910edfd6838cb21ff797b14982d4c0dd5f59e1bc6a2a0e90b46b0570f10f0e2ae0eba171592eb8c9
 EBUILD selinux-stunnel-2.20190609-r1.ebuild 281 BLAKE2B 6c6ab57feed40d7726421496a55389c71fddf846467e8ac4ee0007aa3bd97cc94d4aeb64a41f2073e12351dba298595dcd9caa40a19f5f00cb843b25735923d7 SHA512 efad942cd5e28fab4bf0a6b61167e2b1a47d3aa765a27781910edfd6838cb21ff797b14982d4c0dd5f59e1bc6a2a0e90b46b0570f10f0e2ae0eba171592eb8c9
 EBUILD selinux-stunnel-2.20200818-r1.ebuild 283 BLAKE2B 8f5adfe5fdb791f681c829e3f7ae23386463d8c7efca33c5975de27c16739656ba9150ff108ef5b81c8d560dea2f9b0c54ac373a46b6cef7457e8bd2ca6ee134 SHA512 f3cca4a120258b7ad71b069506c14f70b7cfc02719f4a70f630adec1c6f6a4f730b3a03d87edcfba927400523fd45970549b9706b5bf39ce30ded3193ebc046e
-EBUILD selinux-stunnel-2.20200818-r2.ebuild 283 BLAKE2B ec6cb8a1bf903737eccae4239cff8a52e4d6df5d52e740c99db95fa7331e1f9308677e676e3255a0ed18e9215cd9606d67d53bc9dd2c4a4173ecb1ab0252fb4e SHA512 c770f90ec1323d86975375cebc4ec51831fee997823875aa0f1aa8de50ee32d68ed365ab1258df0ef72926366995b6235205e526df85e13a08bb16291663777a
+EBUILD selinux-stunnel-2.20200818-r2.ebuild 281 BLAKE2B 351a29c883297ffea6f3c35e00699bc30b3bd21793e377e4e767dc6d39ce25e037afdf9d8ba53eb660b497a10e33464d9f305ecee43431e72bbe4175d5a483a4 SHA512 16405a36b17c7834d3f3beda2ea7cbed01fc19a3182f7da83438722b12be4c76f51c978c5fb402c49a531d434f4ea097c2711cef400dba32f35c505311941935
 EBUILD selinux-stunnel-9999.ebuild 283 BLAKE2B ec6cb8a1bf903737eccae4239cff8a52e4d6df5d52e740c99db95fa7331e1f9308677e676e3255a0ed18e9215cd9606d67d53bc9dd2c4a4173ecb1ab0252fb4e SHA512 c770f90ec1323d86975375cebc4ec51831fee997823875aa0f1aa8de50ee32d68ed365ab1258df0ef72926366995b6235205e526df85e13a08bb16291663777a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20200818-r2.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20200818-r2.ebuild
index 898e5b85f020..f2323af15956 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for stunnel"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-subsonic/Manifest b/sec-policy/selinux-subsonic/Manifest
index cdede0884e21..9d8dc7e917bd 100644
--- a/sec-policy/selinux-subsonic/Manifest
+++ b/sec-policy/selinux-subsonic/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-subsonic-2.20190201-r1.ebuild 283 BLAKE2B e7306aa02db984d41307e894e19324b22db2f1f512cffcaa90aa00cf5ab79cf7d0f7744cdae472342fe211f767af061c8cbba40fd47a0178b7bf640af30578ae SHA512 13293a97acf3d1fe6db500661d285e9abd1f6c8bb07c1f25c627f07b8971ce1b44d7898d5aabc88377d3c4b38b968e5a4fc436afffb34e73813e0300dd7acbb2
 EBUILD selinux-subsonic-2.20190609-r1.ebuild 283 BLAKE2B e7306aa02db984d41307e894e19324b22db2f1f512cffcaa90aa00cf5ab79cf7d0f7744cdae472342fe211f767af061c8cbba40fd47a0178b7bf640af30578ae SHA512 13293a97acf3d1fe6db500661d285e9abd1f6c8bb07c1f25c627f07b8971ce1b44d7898d5aabc88377d3c4b38b968e5a4fc436afffb34e73813e0300dd7acbb2
 EBUILD selinux-subsonic-2.20200818-r1.ebuild 285 BLAKE2B 5c622e40d2e8e4a4820310e2e33d857fc3ef5edff5b9d3c364610af7cf446d797e154f98d958162c9895862aeaf909a952008c9f2c7a1e9b732026d9ee784351 SHA512 87108b73a03ac2a26e0c9be5d7f4fd21447134549eb6066f76b30f631d3615c0f2071624419ea4c7970c621a810981c6f752b56012bd264c707eada174091aa6
-EBUILD selinux-subsonic-2.20200818-r2.ebuild 285 BLAKE2B 067ac606cd06226e5f33bd5be6b9ad8f7a951349b40e6d6f5e7ca0285f7947bbc0f6a1c1623890885dfdbfda605a7a434d9f12179149184a5e7bc86606e67a2e SHA512 8a643db8396c740c489348f0e099f4a2a051e2e94f6584ab18af353fad184569bae4cfd42f96c8719c46334c9c0bec4aa1498a5629f2f9f2275f1f777bdddc82
+EBUILD selinux-subsonic-2.20200818-r2.ebuild 283 BLAKE2B 1a0d94be5929b94f5aaf2b22b7d3ec02b6f442bdce483ff29688b5fbdf87cee177dde6814bbfe8ef476998403b3fd9d52c43488a10a50ac150ee864a0ca727a0 SHA512 cffed24077f333e7342f651cd35159d491a8ce0a8b2e108e802ad5767be3535f78a4a3b0afcd87185ba49e9a839d447dffd883ae17eec444b4f6e951a76967c6
 EBUILD selinux-subsonic-9999.ebuild 285 BLAKE2B 067ac606cd06226e5f33bd5be6b9ad8f7a951349b40e6d6f5e7ca0285f7947bbc0f6a1c1623890885dfdbfda605a7a434d9f12179149184a5e7bc86606e67a2e SHA512 8a643db8396c740c489348f0e099f4a2a051e2e94f6584ab18af353fad184569bae4cfd42f96c8719c46334c9c0bec4aa1498a5629f2f9f2275f1f777bdddc82
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20200818-r2.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20200818-r2.ebuild
index f55df8f16b79..0eb6cd045ef9 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for subsonic"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sudo/Manifest b/sec-policy/selinux-sudo/Manifest
index 752613ff4a07..0da26ae814ea 100644
--- a/sec-policy/selinux-sudo/Manifest
+++ b/sec-policy/selinux-sudo/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-sudo-2.20190201-r1.ebuild 275 BLAKE2B 6e7928aada5c94058dd1b9f0b7508718c56404e0d6ad980eb43d3a5325bdadc24bade31fe9eee11ef00b44361ca1bd3b31f9b1687882c9c45df698d4dd4b80a1 SHA512 23d4d3f33c6aa11b393d97c5dc5c1c5534a4a4ea5ccd1a2a0a068c36ad709469b03dadd3cc972b2d570c46458fded80707e2855f87134e76419c114827c74bcd
 EBUILD selinux-sudo-2.20190609-r1.ebuild 275 BLAKE2B 6e7928aada5c94058dd1b9f0b7508718c56404e0d6ad980eb43d3a5325bdadc24bade31fe9eee11ef00b44361ca1bd3b31f9b1687882c9c45df698d4dd4b80a1 SHA512 23d4d3f33c6aa11b393d97c5dc5c1c5534a4a4ea5ccd1a2a0a068c36ad709469b03dadd3cc972b2d570c46458fded80707e2855f87134e76419c114827c74bcd
 EBUILD selinux-sudo-2.20200818-r1.ebuild 277 BLAKE2B e0a33229f702bc5432e0fa42e79fcac9896363be93885184e6b62ff2ccaa579a3d418632036921f5f1ac0ef5fac6e7ba4a7236dbdfa7d7f0243d52bd9987b7b3 SHA512 ebf65314e8e0cd25a0d9eb94665907413a5cdd27ee1af6f3400b2cb2fc8ab5e2a0d05a8606ab4abf9be2fff1f890ee3d26baad8890353542183772bf33fa6807
-EBUILD selinux-sudo-2.20200818-r2.ebuild 277 BLAKE2B 16ce64929e586e14c2df1b0c3c7abf2364e80c9e45c74e6a67e47369cdc1f5b4e85443d138bc0a87d792734cc21371bffae8e0bbe091459d6c38a562ef9e2946 SHA512 e831c31baf64e9baee313572ea02e9828abe527e160b2705c43e824e4337fac8113201e59255db43eca0672f8d64545a302247d8bae80a444b245eba3e5c3f0e
+EBUILD selinux-sudo-2.20200818-r2.ebuild 275 BLAKE2B 7d0d466173942207a0499e6f3f7f683925b4943c6cef888f36fdbeb2556a545537f1c7b87463077421f51c0af6d299367eec2b1be0a66153de4b92a93b4f3fa6 SHA512 3a780e03925070fb7e9b1a05f232e125245407ec69a03776c39c8eb7415c55e9e7f668850d260c712441080026b29c877ecf44291ea521414f30767dbd186d7e
 EBUILD selinux-sudo-9999.ebuild 277 BLAKE2B 16ce64929e586e14c2df1b0c3c7abf2364e80c9e45c74e6a67e47369cdc1f5b4e85443d138bc0a87d792734cc21371bffae8e0bbe091459d6c38a562ef9e2946 SHA512 e831c31baf64e9baee313572ea02e9828abe527e160b2705c43e824e4337fac8113201e59255db43eca0672f8d64545a302247d8bae80a444b245eba3e5c3f0e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20200818-r2.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20200818-r2.ebuild
index 04acfa1e6089..51eb5da35073 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sudo"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sxid/Manifest b/sec-policy/selinux-sxid/Manifest
index b498064dc84f..e10bac69c9b1 100644
--- a/sec-policy/selinux-sxid/Manifest
+++ b/sec-policy/selinux-sxid/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-sxid-2.20190201-r1.ebuild 275 BLAKE2B 68ecbc21cc4f297e1d3aebd753c1e42dd5baa06e6d759ce184f9455693593276eea223d559607af1bf5a534be2c3d307b622f2cf4e64cd31070c019db6545340 SHA512 f3068b1b9ec3413f298139d0f74c03034c903410cb093e994873c1cf6329c3035ae3b27624174fe4386c808a223cd3623fd3e342b2e104768bc22c3a94215de2
 EBUILD selinux-sxid-2.20190609-r1.ebuild 275 BLAKE2B 68ecbc21cc4f297e1d3aebd753c1e42dd5baa06e6d759ce184f9455693593276eea223d559607af1bf5a534be2c3d307b622f2cf4e64cd31070c019db6545340 SHA512 f3068b1b9ec3413f298139d0f74c03034c903410cb093e994873c1cf6329c3035ae3b27624174fe4386c808a223cd3623fd3e342b2e104768bc22c3a94215de2
 EBUILD selinux-sxid-2.20200818-r1.ebuild 277 BLAKE2B a896bcb37a4e5f8a90e058c41773541b32882b7192e14f72b11c2fb21894201b6269ffafbce3ddbb8920ceab03c352da9bd8cc060eb477ed9c3665f2adad859a SHA512 f6b2595554cdb3f5a71190342eab3e22e833f6ce4de63cef82061c041684d7303dc01602d005fc348a5815825804e27a91dca56f85dc7a6aa412e627123acb87
-EBUILD selinux-sxid-2.20200818-r2.ebuild 277 BLAKE2B 1f9056abe8030f43b085ac1dbdf9abadb403f9a4e008a6c9a3573421ab6d2d541fe54ffba5a78807a62839394fc839ab6fa51a9fcd7a870a064eecdc36e7cd13 SHA512 aaadca31718589e0b1cd21d6951b0ae633ace044f3ac8b356f1aa01da1d0f53a01b65b24d6385ae25830f01afe4e02ed52a298f9517be8b359da45a6f2699c14
+EBUILD selinux-sxid-2.20200818-r2.ebuild 275 BLAKE2B f723c5fa92839dc07c022b63792c85f77f65b3e90e738062712e81c682a678db5e587774b2e11964e04f7fff78eb73457d716d3e049d81a97dada8006420f413 SHA512 85d6869a8430f8989c2774be3382a779b451abbef0dc4ea8592027f1691482c9bf848a1e7d1c9ad0a34139d81ba1afb3f2090ec1864d28253204c43ad499641c
 EBUILD selinux-sxid-9999.ebuild 277 BLAKE2B 1f9056abe8030f43b085ac1dbdf9abadb403f9a4e008a6c9a3573421ab6d2d541fe54ffba5a78807a62839394fc839ab6fa51a9fcd7a870a064eecdc36e7cd13 SHA512 aaadca31718589e0b1cd21d6951b0ae633ace044f3ac8b356f1aa01da1d0f53a01b65b24d6385ae25830f01afe4e02ed52a298f9517be8b359da45a6f2699c14
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20200818-r2.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20200818-r2.ebuild
index 985609e03795..f35d5c8b4eef 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sxid"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-syncthing/Manifest b/sec-policy/selinux-syncthing/Manifest
index 5af9eb71f51a..ebf20fed5668 100644
--- a/sec-policy/selinux-syncthing/Manifest
+++ b/sec-policy/selinux-syncthing/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-syncthing-2.20190201-r1.ebuild 285 BLAKE2B 334255c6b081e0a00ca143276d5458dbbfac617cfbbc586d38ef46ee61169bbe873b18c8bc2575a60970fc5f2a0a2c8614403b2c82fcf8a3e5aa4f2def185676 SHA512 4e4e77d1515b6f2c283482ad4f93881b78017e40a143f9b8be36e8be4caa7faa7a80c9434c70d0fb87496ce5c41e94444d282603b8219566caf602f4941d7e46
 EBUILD selinux-syncthing-2.20190609-r1.ebuild 285 BLAKE2B 334255c6b081e0a00ca143276d5458dbbfac617cfbbc586d38ef46ee61169bbe873b18c8bc2575a60970fc5f2a0a2c8614403b2c82fcf8a3e5aa4f2def185676 SHA512 4e4e77d1515b6f2c283482ad4f93881b78017e40a143f9b8be36e8be4caa7faa7a80c9434c70d0fb87496ce5c41e94444d282603b8219566caf602f4941d7e46
 EBUILD selinux-syncthing-2.20200818-r1.ebuild 287 BLAKE2B 94eb55f5d290047ea1c25958e5a5887314adff2674803464d81c87fb3728dc405a92e6b8c0f601b00790f918a667eaadf4dbc8fa9ac3d603ccadbaa13892af7b SHA512 89e0206923c6d4c1de630ab3298f643eec90232bd4e7ee78e1963a96d5c0123ccb827755b00a7ef32b46c3d588bf62e9277692e50324f2af20eb4a7219fbdda2
-EBUILD selinux-syncthing-2.20200818-r2.ebuild 287 BLAKE2B db01c93176aca739bfcc7bf2a740191cdf42d2e38e73e621aae4e020f6a2535fc1aa94c1208c88d094330994bec3a7a26025cd1619680765d098ceb013fecc34 SHA512 8f6e7a6b129347bfa355e5a719bcbac23aed0b1d9325aff20abffc084751a180033b67c0993715955ca835df1230058485337d0cc7b0ebe5b7c17f25eee9b039
+EBUILD selinux-syncthing-2.20200818-r2.ebuild 285 BLAKE2B 4dffb0e40ef042bea4f236be5fc87c3ec871d9d3d3e444f60315140fec314b6963adb8775a24716d7571675235851b0e9f4175c5953f2cdd34d9610a0c0a3bc6 SHA512 b8f511627b9b78a55c5a4cef8677c2a428844baea76690ef46d933f9d59e4e89befd8d78b0ca7f82f8762e5ca7e0a8493860e111e811475d9e9ce8149f6fb9a7
 EBUILD selinux-syncthing-9999.ebuild 287 BLAKE2B db01c93176aca739bfcc7bf2a740191cdf42d2e38e73e621aae4e020f6a2535fc1aa94c1208c88d094330994bec3a7a26025cd1619680765d098ceb013fecc34 SHA512 8f6e7a6b129347bfa355e5a719bcbac23aed0b1d9325aff20abffc084751a180033b67c0993715955ca835df1230058485337d0cc7b0ebe5b7c17f25eee9b039
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-syncthing/selinux-syncthing-2.20200818-r2.ebuild b/sec-policy/selinux-syncthing/selinux-syncthing-2.20200818-r2.ebuild
index 5bd0d132c1b9..10b661b7be1c 100644
--- a/sec-policy/selinux-syncthing/selinux-syncthing-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-syncthing/selinux-syncthing-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for syncthing"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-sysstat/Manifest b/sec-policy/selinux-sysstat/Manifest
index bf1de11742da..7f969da94347 100644
--- a/sec-policy/selinux-sysstat/Manifest
+++ b/sec-policy/selinux-sysstat/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-sysstat-2.20190201-r1.ebuild 281 BLAKE2B a29ff809198c6e5eda129fa9b0a7faafcc77e165b116f1249bfd5fabc47c6e5f81adf06fc20ecbc646757fe29ec8eba2a4b232689169b79ae54db482bb11e201 SHA512 944f82805f5892f3b1e683a35c8c868d48366e89be517cad423dc4d539478350fb2eb7caa5fda1ccdb04a9a57db6e5a395eb8a941c3cd0d842b0d1170d4e1c3f
 EBUILD selinux-sysstat-2.20190609-r1.ebuild 281 BLAKE2B a29ff809198c6e5eda129fa9b0a7faafcc77e165b116f1249bfd5fabc47c6e5f81adf06fc20ecbc646757fe29ec8eba2a4b232689169b79ae54db482bb11e201 SHA512 944f82805f5892f3b1e683a35c8c868d48366e89be517cad423dc4d539478350fb2eb7caa5fda1ccdb04a9a57db6e5a395eb8a941c3cd0d842b0d1170d4e1c3f
 EBUILD selinux-sysstat-2.20200818-r1.ebuild 283 BLAKE2B 8e1a01a2b1e26da8bdc3c90dde92c44a3f6080aa509017750550f97613793eb05b991c3ca1d9872f226bc1d12b82395aa2f288f2be0dbad5d0c5f0609e298c8b SHA512 d04d21f568d0cd1310b4554e4bc3386e91dc99278d5553ca2e7618a7ccb9d55b6a1792a0a28a05d29cb92667c1fdce8d9521f643a9501665c6b369e609949bf9
-EBUILD selinux-sysstat-2.20200818-r2.ebuild 283 BLAKE2B 334a1be93aef8c408b973a2fc04add142f3377d64f8ba1ab0c9dcc4663ffe79effb828bf7b459a66a6853311503a09dec36c53d1fc7c0efac66ced7d74dc1e3f SHA512 f1596d9f6e96c4cbad383d5dcf7073c972abdbc09b3559088eaf834dff4ab29d9efc24be6ba648e2d35cbc8beba49743c792f5d8d9dd0cc3159602e98405fe38
+EBUILD selinux-sysstat-2.20200818-r2.ebuild 281 BLAKE2B 8e3571a1a91ef3e41888e6f325bbe328aa839fafae5ef7eb0e7332890335b17bb9d79f2e4fc4e237c2d079313dbea49e46fa0459d248c5d78a3fb089766b476d SHA512 7fac0536409183722359158c81152cbb5d946b841a92da88dd85b3e7bfe4ed7415055b113bbdff7d4c16951189c6658eb9e724ae03405041b8ef53d39aae571e
 EBUILD selinux-sysstat-9999.ebuild 283 BLAKE2B 334a1be93aef8c408b973a2fc04add142f3377d64f8ba1ab0c9dcc4663ffe79effb828bf7b459a66a6853311503a09dec36c53d1fc7c0efac66ced7d74dc1e3f SHA512 f1596d9f6e96c4cbad383d5dcf7073c972abdbc09b3559088eaf834dff4ab29d9efc24be6ba648e2d35cbc8beba49743c792f5d8d9dd0cc3159602e98405fe38
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20200818-r2.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20200818-r2.ebuild
index 63bf31748ffc..8af23de457d5 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for sysstat"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tboot/Manifest b/sec-policy/selinux-tboot/Manifest
index fcc1ce32c3b6..be11a5d16a6c 100644
--- a/sec-policy/selinux-tboot/Manifest
+++ b/sec-policy/selinux-tboot/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-tboot-2.20190201-r1.ebuild 277 BLAKE2B 8d930c9ef0ce03bc878e4e12956a420870fa9831aa6401b2d2e27d3a849e75c9a26d95207b7860adb28346ea4f7ac9e38da9a8f86e71616acddca5aac9ad30fb SHA512 e661fba84f8965319720a19d668c81b5d6b0b3a6caf6e69056e9b98a626c07e6cf37c76401dac0fa58b63a64a46c6f0517ec4ab0f8ce0a52b6826e0d8db8545a
 EBUILD selinux-tboot-2.20190609-r1.ebuild 277 BLAKE2B 8d930c9ef0ce03bc878e4e12956a420870fa9831aa6401b2d2e27d3a849e75c9a26d95207b7860adb28346ea4f7ac9e38da9a8f86e71616acddca5aac9ad30fb SHA512 e661fba84f8965319720a19d668c81b5d6b0b3a6caf6e69056e9b98a626c07e6cf37c76401dac0fa58b63a64a46c6f0517ec4ab0f8ce0a52b6826e0d8db8545a
 EBUILD selinux-tboot-2.20200818-r1.ebuild 279 BLAKE2B bc9605d5eba988790e640a610df49418be85d3008b50851af78fa54694df476c16cb38ec7b96d0b8da00df14ff04f44b60cd46c67df42ab4cdff90eb3431b411 SHA512 e9203768914e138850464f1d7cb38f71b94fb977c3c63612a495e069bc57716e4ab05e34742cd4a1db7d9d29c12ba7d5c8e3962a020f0b78bfb7b39430c43731
-EBUILD selinux-tboot-2.20200818-r2.ebuild 279 BLAKE2B 43f9ca7fbc3cb03e810dd20a080a25b038df12bac3c65ee3667d960621264ae53af77726f2abeb76e579a96254a0b5f40e2596a7d6444e0827364dd9f1c67f89 SHA512 f97f89e3e442acafaba3ee1de23cbfe513c4b8a8955a8260d07b3294e3ce5021b50b071b79869d8bb3c8ca14f5a24ef6df0e575314b6d4ea46a972e579f3dcdd
+EBUILD selinux-tboot-2.20200818-r2.ebuild 277 BLAKE2B 596de9c3e5971c320ce0e69e5cc624a99e96b677d8bccb2a8bb25440f357b1a563292fe60162c315cd42364905163e634d7f4cfc0b3028c91e78074f73eb36cd SHA512 19fde3a056f8f88351da1a04af305b71ba9b00526615ee6f9fdb50938a3a9b0853aec32c0bdeca5ecd7667b1445d33aacc6cfe3409d9d38e2d92eec35c3d7ae6
 EBUILD selinux-tboot-9999.ebuild 279 BLAKE2B 43f9ca7fbc3cb03e810dd20a080a25b038df12bac3c65ee3667d960621264ae53af77726f2abeb76e579a96254a0b5f40e2596a7d6444e0827364dd9f1c67f89 SHA512 f97f89e3e442acafaba3ee1de23cbfe513c4b8a8955a8260d07b3294e3ce5021b50b071b79869d8bb3c8ca14f5a24ef6df0e575314b6d4ea46a972e579f3dcdd
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tboot/selinux-tboot-2.20200818-r2.ebuild b/sec-policy/selinux-tboot/selinux-tboot-2.20200818-r2.ebuild
index 05d877bad538..fe6740b6615c 100644
--- a/sec-policy/selinux-tboot/selinux-tboot-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-tboot/selinux-tboot-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tboot"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tcpd/Manifest b/sec-policy/selinux-tcpd/Manifest
index 9148ddb68c55..bbd4066d667d 100644
--- a/sec-policy/selinux-tcpd/Manifest
+++ b/sec-policy/selinux-tcpd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-tcpd-2.20190201-r1.ebuild 369 BLAKE2B aa2e7b1295709250a9ec4d3410b57c196114779c003752eaaff276507fefe7149f732bfc911918ff5415cead5e5da52c22c64b7f2d064c76d5c8d7db6ec545e1 SHA512 3bc6615fbf7d0e364dd00af18a1d9262967383917dee55f334aca02096705e7d9726ad00cc162664883cd78b48dcf3111efef25ebf0d045977895582e468aeda
 EBUILD selinux-tcpd-2.20190609-r1.ebuild 369 BLAKE2B aa2e7b1295709250a9ec4d3410b57c196114779c003752eaaff276507fefe7149f732bfc911918ff5415cead5e5da52c22c64b7f2d064c76d5c8d7db6ec545e1 SHA512 3bc6615fbf7d0e364dd00af18a1d9262967383917dee55f334aca02096705e7d9726ad00cc162664883cd78b48dcf3111efef25ebf0d045977895582e468aeda
 EBUILD selinux-tcpd-2.20200818-r1.ebuild 371 BLAKE2B 45c75342f53bd64d59db96ecd618016c5a1e329432bb2b2f4043ca9e71623ae96b6470aaccbdaaafb7b48a3c1ea9eba4d18a8df40a1692d476b3772ee6c04333 SHA512 f49219c1f05cac03b56c440e05fb2e350dfc2b7f6995b89f5ec668d948fe34336f231b654c68f93200752e429616bc6269e97dcdcca412ddc4b0b24375049fc0
-EBUILD selinux-tcpd-2.20200818-r2.ebuild 371 BLAKE2B b65d6cbbeb83b8d9cbbc48b6015f86f52147c88dab0cfde802c75a0a3d29565195ceee60553982ccbd2c3d2fe9c9a21457641e9d304886299b5bfee09e3b5d05 SHA512 44d598dc69a091c1a86d14308c8b178db878e84e79b933ecfff3b3b312c5f444a9ab1bb7228329cc57d6c417f28e5af08dbae3f3d8f55a47a54f48738fb761e8
+EBUILD selinux-tcpd-2.20200818-r2.ebuild 369 BLAKE2B 3b6fa706268892351f17064e8daffff7b62994a1e3e86d2b9f33fb98d3d39b9c64c9fb2c381b9e3f71aea374714cee559d1fcbbde53d19777f0550f4149f81a1 SHA512 ed543952b02c10c52f4c41ad753494ac2db648488ef356e9587c6c9ab24ed76952c6a4212aaea2f7de779564a0c04a7fee2041d2a57cbb310347f22cb7d96ef7
 EBUILD selinux-tcpd-9999.ebuild 371 BLAKE2B b65d6cbbeb83b8d9cbbc48b6015f86f52147c88dab0cfde802c75a0a3d29565195ceee60553982ccbd2c3d2fe9c9a21457641e9d304886299b5bfee09e3b5d05 SHA512 44d598dc69a091c1a86d14308c8b178db878e84e79b933ecfff3b3b312c5f444a9ab1bb7228329cc57d6c417f28e5af08dbae3f3d8f55a47a54f48738fb761e8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20200818-r2.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20200818-r2.ebuild
index 74bed79dbd35..b1222e12aa03 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tcpd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-tcsd/Manifest b/sec-policy/selinux-tcsd/Manifest
index 99af362d5675..91904d5986d7 100644
--- a/sec-policy/selinux-tcsd/Manifest
+++ b/sec-policy/selinux-tcsd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-tcsd-2.20190201-r1.ebuild 275 BLAKE2B 0c158d22f23d0fd438d9bb758ac6d5fcd4d624ca08325428c76ba19c81a3c28903b25830c60d3672d2db5d376a3946eeaeffbc2e0e810e820dd4bbb0f0b83697 SHA512 66338412af5f0237503fb35762b419e00b0b874dfab6b38dbb4e40873c5c22901decae2f5b57cffe924e53c249087bfa2a07c213efbcd5ce75edcb4298551ebb
 EBUILD selinux-tcsd-2.20190609-r1.ebuild 275 BLAKE2B 0c158d22f23d0fd438d9bb758ac6d5fcd4d624ca08325428c76ba19c81a3c28903b25830c60d3672d2db5d376a3946eeaeffbc2e0e810e820dd4bbb0f0b83697 SHA512 66338412af5f0237503fb35762b419e00b0b874dfab6b38dbb4e40873c5c22901decae2f5b57cffe924e53c249087bfa2a07c213efbcd5ce75edcb4298551ebb
 EBUILD selinux-tcsd-2.20200818-r1.ebuild 277 BLAKE2B acc017be579b247aa26cea4f1cb13830fc12a115f2eb0bcf938e46e29907aae102eda21b8ba383064dc44b87b0d548ccdd45ed8689e49922763146c4a5b90a41 SHA512 7c83226d5dd31fd71a3f05bbe8b893ea34294534eadaa3d199fb0b5c48a455d33b7fe0a06dc8e023705444497a0dd74e17e6263dc7cc23946d376832b6abca70
-EBUILD selinux-tcsd-2.20200818-r2.ebuild 277 BLAKE2B 1e6decfab12278bbda8e7c73ef82059cf28e2e188f45a4384c5be9d3a2d53c4e4ee75d6ea58c1fd9795e41a8130cbb743c60793647052e159428bb8f0336ff85 SHA512 0d3afe42b4226b1fe8c6bb10a27650726a2950b096d0f5fa22fb2cffa6b13b52f7746b1746669d3be6f02b8761b5d09f52af50df1d74796b827ddef95458a87d
+EBUILD selinux-tcsd-2.20200818-r2.ebuild 275 BLAKE2B 8c2c8e7d67ff1c7c43930ceffde3eee667f6de4eb9f996b86cc2ff0fb668853f3ded1ae1d6eb6eff58cec1183b056d6c4c3851f1ad507c826e4e8babbdbe8baf SHA512 ab03d45cc2b31e4230229c6477c5f34a230cb9345d23ced18515d77013d752f9f7490e0850a43c32d88cc7cbfd24ed34262687728573369ed317d615a4122aad
 EBUILD selinux-tcsd-9999.ebuild 277 BLAKE2B 1e6decfab12278bbda8e7c73ef82059cf28e2e188f45a4384c5be9d3a2d53c4e4ee75d6ea58c1fd9795e41a8130cbb743c60793647052e159428bb8f0336ff85 SHA512 0d3afe42b4226b1fe8c6bb10a27650726a2950b096d0f5fa22fb2cffa6b13b52f7746b1746669d3be6f02b8761b5d09f52af50df1d74796b827ddef95458a87d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20200818-r2.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20200818-r2.ebuild
index a8e87956f4ad..4db92310b83c 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tcsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-telnet/Manifest b/sec-policy/selinux-telnet/Manifest
index 821c74012448..c974cf8b2b7d 100644
--- a/sec-policy/selinux-telnet/Manifest
+++ b/sec-policy/selinux-telnet/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-telnet-2.20190201-r1.ebuild 385 BLAKE2B d7d4910f1b547668f075766c610278866cea1a43597f990070ae3a2eececf3aa155296e873c081d2a3ed8d14926fb15ff3f3115ece2b20d16d6d60e01ad2406c SHA512 09651d9c80a5981b332a3f21e19521a8b4457f7e2cfc04b8a2c2b6d0e805d81f7b8b33cf5b5bc5cbdbd0beb4c29e06498c0f6176ff11ab4f30922d23d40542b9
 EBUILD selinux-telnet-2.20190609-r1.ebuild 385 BLAKE2B d7d4910f1b547668f075766c610278866cea1a43597f990070ae3a2eececf3aa155296e873c081d2a3ed8d14926fb15ff3f3115ece2b20d16d6d60e01ad2406c SHA512 09651d9c80a5981b332a3f21e19521a8b4457f7e2cfc04b8a2c2b6d0e805d81f7b8b33cf5b5bc5cbdbd0beb4c29e06498c0f6176ff11ab4f30922d23d40542b9
 EBUILD selinux-telnet-2.20200818-r1.ebuild 387 BLAKE2B 6f52a7e3a1dc9b46058fd4e31d77adb044eb76b383eeeaea3905ef94c80ebdbefc46391881ac5f7695ab16a2e72645f422816a49f2c5f6a0dfbbe4eef5d205fa SHA512 b9ba504f87721f5241dff2ff941bbf96a94aeb9a6a42b3ba1e4e1289cc473810016c89b9fa3e7f079ea38ab6916d57771deaccf363e55dc2aa83319d18098544
-EBUILD selinux-telnet-2.20200818-r2.ebuild 387 BLAKE2B fe5f453f8d21d8a0c0037761c5e881b317e2cfb527073b6bbb12115200265a13462fcb2e02f9ba4612f2988d01fc9553fba8d72c8391ff13676dae79aa6e103a SHA512 7de8106232a33c0f3167584b66b38c90895f6d7665d999307aa564defef82acf827e0123a27a7183832c708d728768b706d18d11020b07b5a57d9be605c5b2db
+EBUILD selinux-telnet-2.20200818-r2.ebuild 385 BLAKE2B e5061d83ed4ffcc5b6db65ef1884b474edb39e14e747a805c5f630885592fab35cf807f69243a3c533b55e4fc34aed5e3f4c2c6498d0787df23143fd83ef1183 SHA512 a06347a357e29a92adc622a54f30be01dd37e96b46feef28127723b6748d60c864ecd43fd5e11704ef04b0dbdf46834a8723f2972854ebf1f4a3eb1ee5207dc5
 EBUILD selinux-telnet-9999.ebuild 387 BLAKE2B fe5f453f8d21d8a0c0037761c5e881b317e2cfb527073b6bbb12115200265a13462fcb2e02f9ba4612f2988d01fc9553fba8d72c8391ff13676dae79aa6e103a SHA512 7de8106232a33c0f3167584b66b38c90895f6d7665d999307aa564defef82acf827e0123a27a7183832c708d728768b706d18d11020b07b5a57d9be605c5b2db
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20200818-r2.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20200818-r2.ebuild
index 0cb209cad847..96d5e8237afc 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for telnet"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-remotelogin
diff --git a/sec-policy/selinux-tftp/Manifest b/sec-policy/selinux-tftp/Manifest
index 512316ea17ad..a878ccec6da5 100644
--- a/sec-policy/selinux-tftp/Manifest
+++ b/sec-policy/selinux-tftp/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-tftp-2.20190201-r1.ebuild 275 BLAKE2B 9f7f227089af0f732a9a341fda002d3444dc2f9a23114644208275d0f93420746e3503caad7b3b088b4320d169f12303c12ed56a401849697b1873be734e870a SHA512 cac8161c439cd6789b7bba3db8ccb79cedcb26743dee228637384faae87fd5d910caf56d644385ac8cbb4ae4d6a6fefae1f7abf4b2eb660146be2de49198dd59
 EBUILD selinux-tftp-2.20190609-r1.ebuild 275 BLAKE2B 9f7f227089af0f732a9a341fda002d3444dc2f9a23114644208275d0f93420746e3503caad7b3b088b4320d169f12303c12ed56a401849697b1873be734e870a SHA512 cac8161c439cd6789b7bba3db8ccb79cedcb26743dee228637384faae87fd5d910caf56d644385ac8cbb4ae4d6a6fefae1f7abf4b2eb660146be2de49198dd59
 EBUILD selinux-tftp-2.20200818-r1.ebuild 277 BLAKE2B 8312e41bfc211d081105c6bf16f35b4fac672f4ad143cec04b7070c4335399defdff5c0243a5076d0d8eb9308f903897d9cf4731dfbe4260fe09e2a9155382df SHA512 ea647b7e39380afbe0f4e797d66c0983f0d1a08b5478760484bbb026740defc4a3546e8336c30e420fadf2f784024930c3d2741bd0b3de0159a26d1379be4dd0
-EBUILD selinux-tftp-2.20200818-r2.ebuild 277 BLAKE2B e5b5a746e82fa412836b2f4a973a8e02e8775a8161d19c570da0e8caf41aa30c0fe2210783f26dad66f5a9a3234c3d0a7946971c6a2913e15f9f668ce19b2361 SHA512 9f56642de4d27e42f04513c788ae420155d6813acc0dada234f3c419cc3ac8e1a48aa0d113f7060b800fe0a46ebbda75253d7ba227a0c77ad06cc219e90c674c
+EBUILD selinux-tftp-2.20200818-r2.ebuild 275 BLAKE2B 5217c2edf9be3a9fc0ec67645f9ff8b6cdab115832f80ad5f63986c0ff8d0e028f7b17382a39966d8e6387139c2b80c6b43a78ac32c48c874bc44a6ca68e7239 SHA512 e026e21d92738684e80d5dd8942d19561843aa48eaa03e05625039ca86a3cdc80df6abc8a1f347b63f7c2ce71632c04122519103ad0678597a4863b446693b5a
 EBUILD selinux-tftp-9999.ebuild 277 BLAKE2B e5b5a746e82fa412836b2f4a973a8e02e8775a8161d19c570da0e8caf41aa30c0fe2210783f26dad66f5a9a3234c3d0a7946971c6a2913e15f9f668ce19b2361 SHA512 9f56642de4d27e42f04513c788ae420155d6813acc0dada234f3c419cc3ac8e1a48aa0d113f7060b800fe0a46ebbda75253d7ba227a0c77ad06cc219e90c674c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20200818-r2.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20200818-r2.ebuild
index 03475187eade..781f00eeb9a8 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tftp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tgtd/Manifest b/sec-policy/selinux-tgtd/Manifest
index eee29d25491a..94e25e944820 100644
--- a/sec-policy/selinux-tgtd/Manifest
+++ b/sec-policy/selinux-tgtd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-tgtd-2.20190201-r1.ebuild 275 BLAKE2B 440b48c8d6a7ff6532d1d7436dca9d5de3a9f1e2e6641bc31b54e5dd74088dad4c9f1671eba952e82114a01af09fc02dd7d76766184ecfe9c4f82140ab0b8d9e SHA512 b5e30f711a2a7102ad0a27c68c76d15fb74f96062f4a200527fdd74fba0ff732737c34f4a3a11261965f1a894c616c829b6c8f2af2ff0a3a89549095efdde49c
 EBUILD selinux-tgtd-2.20190609-r1.ebuild 275 BLAKE2B 440b48c8d6a7ff6532d1d7436dca9d5de3a9f1e2e6641bc31b54e5dd74088dad4c9f1671eba952e82114a01af09fc02dd7d76766184ecfe9c4f82140ab0b8d9e SHA512 b5e30f711a2a7102ad0a27c68c76d15fb74f96062f4a200527fdd74fba0ff732737c34f4a3a11261965f1a894c616c829b6c8f2af2ff0a3a89549095efdde49c
 EBUILD selinux-tgtd-2.20200818-r1.ebuild 277 BLAKE2B 8c351a5b1c804b4c19fd95d8583c52e6a1a4bbecff4479627c6cf0b14c1962efb220968d25a1b057e3bde91ca004c6a57b68cdee00dff6929cf26f2ee65c2755 SHA512 6fd39446213a35b9285765ac399999f46d8bcfbcbf1d9f3d7f50e9db34b4ee787db853daff4e2faf36a66073895dbc9a3b1dbb6ccf2353154b82b4c44edc072b
-EBUILD selinux-tgtd-2.20200818-r2.ebuild 277 BLAKE2B 655cf9bd7e68722402a3a192fe2bee1d8553f069a117363db0a83097bb77838d22c4439010cfd2674499d8cbbcb2901995b2c02c4211c3ae63fec917cd541501 SHA512 655634558bf1dade15572046cfc226c897911c6f0325758890f1eb0038d8e92e5cdbc8a153174d9b0935fef6dd263205ea31102c1f6aab9165b0edaaa68b2a7f
+EBUILD selinux-tgtd-2.20200818-r2.ebuild 275 BLAKE2B e6108d7a7ded30378777b0677fc43ee0cd85a2328c3f02273e771731cf44ae1a41fdbb04d699afe3bcd9046d001765eed71519b16c2927f13ec6c7b15636f960 SHA512 e9f479a86089d12f2dc32eaf172a6961358df7ac7fb946169fbeb8011a4a6a5f7d0978b6b3e9bc7f4561b8c3806b782855049ac48d073e1ddfe1d40975b9bb38
 EBUILD selinux-tgtd-9999.ebuild 277 BLAKE2B 655cf9bd7e68722402a3a192fe2bee1d8553f069a117363db0a83097bb77838d22c4439010cfd2674499d8cbbcb2901995b2c02c4211c3ae63fec917cd541501 SHA512 655634558bf1dade15572046cfc226c897911c6f0325758890f1eb0038d8e92e5cdbc8a153174d9b0935fef6dd263205ea31102c1f6aab9165b0edaaa68b2a7f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20200818-r2.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20200818-r2.ebuild
index 0d7645c9cc54..d22971365234 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tgtd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-thunderbird/Manifest b/sec-policy/selinux-thunderbird/Manifest
index 249e28110fc3..7ea9d6a4b358 100644
--- a/sec-policy/selinux-thunderbird/Manifest
+++ b/sec-policy/selinux-thunderbird/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-thunderbird-2.20190201-r1.ebuild 387 BLAKE2B d95651896a7848be99b7e8995d534717e17900cdb7b1ecd5a5a43f5815ce50680344d8bf87aaf0fcfdfb4d6e34f328d9c7d391472ad42acd4cfbf70f3cb1caeb SHA512 52cb0e22e8ec6bbe831becadf9fa0fca996b40e34b4e7d6c608e398a0f2ab0eae7608b203216c65bb693ccdf9d8ca103ceceb51f2c3848d6b0a84bd7d403ac52
 EBUILD selinux-thunderbird-2.20190609-r1.ebuild 387 BLAKE2B d95651896a7848be99b7e8995d534717e17900cdb7b1ecd5a5a43f5815ce50680344d8bf87aaf0fcfdfb4d6e34f328d9c7d391472ad42acd4cfbf70f3cb1caeb SHA512 52cb0e22e8ec6bbe831becadf9fa0fca996b40e34b4e7d6c608e398a0f2ab0eae7608b203216c65bb693ccdf9d8ca103ceceb51f2c3848d6b0a84bd7d403ac52
 EBUILD selinux-thunderbird-2.20200818-r1.ebuild 389 BLAKE2B fc2945e2929812873dd1321d625b333a07209f2f2fe09e805cc528f7020305c7a2a32c1f32b6d5055688a922bd061acafefe07bf6dd714b4d71152accb1ce45d SHA512 bc2e50a48f860c97bf23655aad77ca4ec1461949b86f8633ec9010b250e97f631dcbc46a4c066256b727d71c42da81afae16e9095a1932a62d98aa4d92890165
-EBUILD selinux-thunderbird-2.20200818-r2.ebuild 389 BLAKE2B 9df5c268e82b993068d083fe4598c26e4520e02a2bf122da09a7babc4999376f28f19e851708e5a4d912e10981a600c631e292d90fe3581461bdd6ec4135c050 SHA512 b55c8bf2334a61c0a64a2bf17b0d293bf624547d7b808e5300e85dff704a63e15ba45166a0b62fc262601f1ba6033ddf175059481b4a411c5055aae86067e431
+EBUILD selinux-thunderbird-2.20200818-r2.ebuild 387 BLAKE2B 37b4baa794dc51bd23e401f658762011133cc40d7d4879b10064390172996325d40e2b03c7ec1a74c00fa0570346837e706d2f4f5cf02aded95a46e1c9ebd0ea SHA512 accd99668546892416ad0f4ea5c250afc2fbf6776a0b1015437fbe778940a68e21c1a549db378357011fe33efb42afb062b903be56ee237fe45a7d654597c2a6
 EBUILD selinux-thunderbird-9999.ebuild 389 BLAKE2B 9df5c268e82b993068d083fe4598c26e4520e02a2bf122da09a7babc4999376f28f19e851708e5a4d912e10981a600c631e292d90fe3581461bdd6ec4135c050 SHA512 b55c8bf2334a61c0a64a2bf17b0d293bf624547d7b808e5300e85dff704a63e15ba45166a0b62fc262601f1ba6033ddf175059481b4a411c5055aae86067e431
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20200818-r2.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20200818-r2.ebuild
index f8d484eaa3ef..985511767b85 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for thunderbird"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-timidity/Manifest b/sec-policy/selinux-timidity/Manifest
index 88ee0fe37dea..e47e4370ae6e 100644
--- a/sec-policy/selinux-timidity/Manifest
+++ b/sec-policy/selinux-timidity/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-timidity-2.20190201-r1.ebuild 283 BLAKE2B 2d9649f5543cac5a900a4a1e4191bc1c05f22118a97e52192791cad747162ca50d0682f687240109ec6ea0787e14990aa563e33294116a678677aba71a7d2b38 SHA512 17f798f3d4504fa7b89a6e950c2d60edde74ae74227c9cccc3a2e0ddde43818c98b69794c8ca8f4475822080a0b858e30e9f478125d446b07f32e440c49a8973
 EBUILD selinux-timidity-2.20190609-r1.ebuild 283 BLAKE2B 2d9649f5543cac5a900a4a1e4191bc1c05f22118a97e52192791cad747162ca50d0682f687240109ec6ea0787e14990aa563e33294116a678677aba71a7d2b38 SHA512 17f798f3d4504fa7b89a6e950c2d60edde74ae74227c9cccc3a2e0ddde43818c98b69794c8ca8f4475822080a0b858e30e9f478125d446b07f32e440c49a8973
 EBUILD selinux-timidity-2.20200818-r1.ebuild 285 BLAKE2B 4b8f9cf32752001090de2bd7328812acf93cab4dc43d2b66457a671426eef0a3a3d221ea9a10a1e33ecc770a797919746b895e2b3d543cd4c84e66aa09a86082 SHA512 312dcc1be0b66d6abc8c5a08a84f8c51b137b3b4265a1a2af431be90086e0ad558d74e9083dac2535ffdf6f5f613039c4fc34e2c031c18932dd17dcde6725dfe
-EBUILD selinux-timidity-2.20200818-r2.ebuild 285 BLAKE2B 9af670c3d4c17c5f431875e14ed97905ea6a04279a17ebfe8ae86d92ff046ce345c4fb9439f22bf4280e8360560d8b9c20b1072ab66080f96e2c31187567f83d SHA512 c7a4e3af18cdea160705b7d8f63565cc5118af374424d138223685b89dab13a6817bfb991b733bcf3f78bca5559a51d8610b29daa65b6d29739226c706a247d8
+EBUILD selinux-timidity-2.20200818-r2.ebuild 283 BLAKE2B b0632c96a5008ca4f85b9734b3b26c02ee793a13ecb2d1ac9d3d5cc536644e893d29740df6d1e29cd321690cc6f4ef692abb635406621ca6042f357914d0661f SHA512 a42b6acf77635ad86ed61c9ff821eee2cb5f8771b1178a2e40606be09a19e9d16827a93da74c71a230ee8f4e07767f7be4108c1b3e5724c0ab9fea7cc58fb05b
 EBUILD selinux-timidity-9999.ebuild 285 BLAKE2B 9af670c3d4c17c5f431875e14ed97905ea6a04279a17ebfe8ae86d92ff046ce345c4fb9439f22bf4280e8360560d8b9c20b1072ab66080f96e2c31187567f83d SHA512 c7a4e3af18cdea160705b7d8f63565cc5118af374424d138223685b89dab13a6817bfb991b733bcf3f78bca5559a51d8610b29daa65b6d29739226c706a247d8
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20200818-r2.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20200818-r2.ebuild
index 5ca52844bacf..737dac98c618 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for timidity"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/Manifest b/sec-policy/selinux-tmpreaper/Manifest
index 5bf956cb6561..8ef8fb6f666b 100644
--- a/sec-policy/selinux-tmpreaper/Manifest
+++ b/sec-policy/selinux-tmpreaper/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-tmpreaper-2.20190201-r1.ebuild 285 BLAKE2B b998e327d8e1f53f3fbce83c5ba041de9ab5f1cbcdde61a98d443cc1e6a21fe543091383d0c1dfd724119aa23c5e3a55e726a774ced10c2d9a64b7d26857dec8 SHA512 53b9bd46e7619c6988c3001ba03c098cd487b49cbbbf3df1d022fc0a48c88da5f6f33f5095b1f0cb6c80ef96e0145ef94e59983701b0d949e8e2623905540aff
 EBUILD selinux-tmpreaper-2.20190609-r1.ebuild 285 BLAKE2B b998e327d8e1f53f3fbce83c5ba041de9ab5f1cbcdde61a98d443cc1e6a21fe543091383d0c1dfd724119aa23c5e3a55e726a774ced10c2d9a64b7d26857dec8 SHA512 53b9bd46e7619c6988c3001ba03c098cd487b49cbbbf3df1d022fc0a48c88da5f6f33f5095b1f0cb6c80ef96e0145ef94e59983701b0d949e8e2623905540aff
 EBUILD selinux-tmpreaper-2.20200818-r1.ebuild 287 BLAKE2B b08a3b66ff4db3f7f3462ccaaf9734736c5ee55b645098190aaa8a9887431b909822a86d02293287f5e086a267162a8d8936b5e36841ec484ecb7e1fdaa172c6 SHA512 f61fe5b25af0603df4bc822061bfa4a57f8e76b0778945d65dba14a93fd4cf248327b69e49effbd89897d25937353c818abc3b727585328546c1724a59481270
-EBUILD selinux-tmpreaper-2.20200818-r2.ebuild 287 BLAKE2B 7739b39729eda6e56928f6f3f9f951fa87984373a57dcd0931e889c64600d44d5c377426372f48fb50e56f34c368d9f1f3a40d8dc37e0abdeee0887bd04d058c SHA512 8c0c10c2b9ce53f234e8af142eb1ad1617d7d37216310096c46bde4ddc146a8b4493745e6704a3ec7e903b0ba8d326e045c86a888dcd0323a8c80707be34157b
+EBUILD selinux-tmpreaper-2.20200818-r2.ebuild 285 BLAKE2B 8feea21f5a5b89dea886263ac59dab3b577d5e66bf6c6aeb7eed8123caab7103d455dfbeca9f15fe9a8e1ff13a3a41ee52b030e395f6d08653b9e417752758dc SHA512 198cfa8468af3539bd7f21c9f16112d7c900018bff46bc345bc0757850104e4221e39d5ee14e90ccd29c3ca3a2690c97815f8174493ca43a9ffef3a2e850e2b7
 EBUILD selinux-tmpreaper-9999.ebuild 287 BLAKE2B 7739b39729eda6e56928f6f3f9f951fa87984373a57dcd0931e889c64600d44d5c377426372f48fb50e56f34c368d9f1f3a40d8dc37e0abdeee0887bd04d058c SHA512 8c0c10c2b9ce53f234e8af142eb1ad1617d7d37216310096c46bde4ddc146a8b4493745e6704a3ec7e903b0ba8d326e045c86a888dcd0323a8c80707be34157b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20200818-r2.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20200818-r2.ebuild
index 361bc61955ee..66151d0f5673 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tmpreaper"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tor/Manifest b/sec-policy/selinux-tor/Manifest
index 76e3883a5d53..f79b022ce4f6 100644
--- a/sec-policy/selinux-tor/Manifest
+++ b/sec-policy/selinux-tor/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-tor-2.20190201-r1.ebuild 273 BLAKE2B 131332cb3779fcc000b431017e3ea9837cd9eaeef10ea58656e9877cc6866f2d2fdc301539fd19899e874be010233034dca7f9a249916a8809003df62ae7396d SHA512 ccc73ed226782bee5e93a6825d8fb35c4e6f6fc890c82602937855bd68e65c25b37603168ff24b752d66c4aad5d4c358c7091ed2d684ebff4684e16a29edf16b
 EBUILD selinux-tor-2.20190609-r1.ebuild 273 BLAKE2B 131332cb3779fcc000b431017e3ea9837cd9eaeef10ea58656e9877cc6866f2d2fdc301539fd19899e874be010233034dca7f9a249916a8809003df62ae7396d SHA512 ccc73ed226782bee5e93a6825d8fb35c4e6f6fc890c82602937855bd68e65c25b37603168ff24b752d66c4aad5d4c358c7091ed2d684ebff4684e16a29edf16b
 EBUILD selinux-tor-2.20200818-r1.ebuild 275 BLAKE2B 264c1e1abd3d5df9a6872a1e00f8f649da2f55e3d262df940c40ec1826150508557829e10d986e0e8ea97628dbe5ebd47a5d690d20d9a618b0be62adf7c2ce1e SHA512 5795313f889dc4f2479408b3720623aa3742d700de330c64be3e78cb33b4201e43ffae0ce84cffdd51ca569b7651775e98aaa61b83a2a7168f841cb21b406c82
-EBUILD selinux-tor-2.20200818-r2.ebuild 275 BLAKE2B 67914d57b0be142eb2762a13ba2a9f5985a9656885a8c40e087530fd93aed81318e9f96f98b0e8636b1ed75ff0450133510d9c02771a6f0a30a631c5f298e454 SHA512 046c9f7fc6cf1459cdb0f8285c5bbb541d94b0a575021b7147e2b4f0452e3caf19c991d3fca360af035255214094fa2b43b0ccdcaf57518b698449e18e3150b0
+EBUILD selinux-tor-2.20200818-r2.ebuild 273 BLAKE2B ef78d6d449fc26fc07b8ebb481d3271905e36dc22875ec3a7cc06c21788e58550c0f61e3c158ff97117af364f51124abe8dd2b7308011aba6ee328d67fb75a94 SHA512 236a705961db2008bc2e65b47cfb47fd4580c4a4d8fd5a054888f755f93c6b9e2a20b841add7dc435e861da1c8b35696ecfb81b14dd9e973f8f928dd51db7bc6
 EBUILD selinux-tor-9999.ebuild 275 BLAKE2B 67914d57b0be142eb2762a13ba2a9f5985a9656885a8c40e087530fd93aed81318e9f96f98b0e8636b1ed75ff0450133510d9c02771a6f0a30a631c5f298e454 SHA512 046c9f7fc6cf1459cdb0f8285c5bbb541d94b0a575021b7147e2b4f0452e3caf19c991d3fca360af035255214094fa2b43b0ccdcaf57518b698449e18e3150b0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20200818-r2.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20200818-r2.ebuild
index 628a94163a61..0802860b07bf 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tor"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-tripwire/Manifest b/sec-policy/selinux-tripwire/Manifest
index 41a8bd9af2f0..b25c191f2607 100644
--- a/sec-policy/selinux-tripwire/Manifest
+++ b/sec-policy/selinux-tripwire/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-tripwire-2.20190201-r1.ebuild 283 BLAKE2B ccd98ca72969d8949fe63ae594dcb74d4290089e94e93d63222e88577e2327caf55937c8a612f96035d5dbfa2c4e901159600733a16b77e836ce9ac3607642c3 SHA512 704d837b2534be4397ce92c4bd1a776b17047f77e82daec9540c2bd422fdf7d9529e9a4c3a9fb487fe63d4a5807ec41a9b65bcf03621fbb2ac78ff8a123f3605
 EBUILD selinux-tripwire-2.20190609-r1.ebuild 283 BLAKE2B ccd98ca72969d8949fe63ae594dcb74d4290089e94e93d63222e88577e2327caf55937c8a612f96035d5dbfa2c4e901159600733a16b77e836ce9ac3607642c3 SHA512 704d837b2534be4397ce92c4bd1a776b17047f77e82daec9540c2bd422fdf7d9529e9a4c3a9fb487fe63d4a5807ec41a9b65bcf03621fbb2ac78ff8a123f3605
 EBUILD selinux-tripwire-2.20200818-r1.ebuild 285 BLAKE2B e5c8aee4403594ce1b287c26b6cba68b0a5348ca1d094dfb295c16354df4664ecdcfa90aee112368cad2be2c5ea48186dc3cded3adf7b29347f6ec6613a92e57 SHA512 a685a8b3e9cfefdf1844486bbe47f5eacce78be48d069007d18f310f040a9fae7a4e6baa05b3ebcc31b1e5eaea2391b2418ea57a715bde3fd0c9673291da65b3
-EBUILD selinux-tripwire-2.20200818-r2.ebuild 285 BLAKE2B bb140ece7d86a7d90dfd7c94cfb94c02babc2aea4d5d044370612204cc68d8cb3fcf44cf55eb62e4a6446e05d735adc2667c761c5bf429cad10f3171dad136a1 SHA512 a094e1894812dbe4d0a6c88c7182cb100876dd96cee27248a8bc1c79ab7878e3b8f083597b99f46f006bef37c541651778ae9771085585410e428d883e4866dc
+EBUILD selinux-tripwire-2.20200818-r2.ebuild 283 BLAKE2B eba09247e9d331a7f26f45d8140d4e7e2afcbb85538d32b0dccd4dfdc09bca17ea150fbd4ba9e7b3e8a3c910817ec4367b3ab1581767f5c01518d343dce3f154 SHA512 eb7436c2650a0bf6fd49067ddf78394302ec53b4dda90a6dfd8469a1c6750fd4f9b24845d8ec6b3c903e298febf1e8bfeab38b76b34111a44d4a921114c4badd
 EBUILD selinux-tripwire-9999.ebuild 285 BLAKE2B bb140ece7d86a7d90dfd7c94cfb94c02babc2aea4d5d044370612204cc68d8cb3fcf44cf55eb62e4a6446e05d735adc2667c761c5bf429cad10f3171dad136a1 SHA512 a094e1894812dbe4d0a6c88c7182cb100876dd96cee27248a8bc1c79ab7878e3b8f083597b99f46f006bef37c541651778ae9771085585410e428d883e4866dc
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20200818-r2.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20200818-r2.ebuild
index ce4895afdc4a..849109b7156d 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for tripwire"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/Manifest b/sec-policy/selinux-ucspitcp/Manifest
index 86130e2c329c..08615ba88ee2 100644
--- a/sec-policy/selinux-ucspitcp/Manifest
+++ b/sec-policy/selinux-ucspitcp/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-ucspitcp-2.20190201-r1.ebuild 283 BLAKE2B b0960d3ec1d5a7b67d77d7ac1712098c3e2c0459ac750ef057b8b59e9db6e8ae77b99a2f7856ceb7978dd44059a9bec0e422412626f4b0205a19c59e05651fc3 SHA512 d4ec638c9a11a9a11de642367e724ad4713f9bca3f5712f313bf9c411ccbcea02b0493f9620994b7b6138f5de36868fd27cddab6bfffd8b68edb5b3db5f21902
 EBUILD selinux-ucspitcp-2.20190609-r1.ebuild 283 BLAKE2B b0960d3ec1d5a7b67d77d7ac1712098c3e2c0459ac750ef057b8b59e9db6e8ae77b99a2f7856ceb7978dd44059a9bec0e422412626f4b0205a19c59e05651fc3 SHA512 d4ec638c9a11a9a11de642367e724ad4713f9bca3f5712f313bf9c411ccbcea02b0493f9620994b7b6138f5de36868fd27cddab6bfffd8b68edb5b3db5f21902
 EBUILD selinux-ucspitcp-2.20200818-r1.ebuild 285 BLAKE2B e2c7f64288a5dca21f0432d4dda01b28b783678b5ab96aa4b4312dcbd41e90c35880c06ed9ca561dc43a26dd91c0d9bd37e88275620048669badb900ee26a61a SHA512 0bae871e80d8361dd8054c24175f0013234731ee7ba4b220332e42a05456b8daa754a10128a43d01258db78734a2056fd9a0e867ce341cd3df2a48dc327ce7f7
-EBUILD selinux-ucspitcp-2.20200818-r2.ebuild 285 BLAKE2B 1c6345b751700a03a844b75792e3a1d91e6945b1f8e2ea711e0504711590fc5be04909cae8f2531d685c66b8dd44231cfd67e9d0c6b893f4a5756dd215e2b1f0 SHA512 097543d1582c6a6665360f8a8896b1831e924bf5450556584940052e8076109ff3087da2b79ad18753d86d8be7fa4a5f5a8bf5cdeb52bb4a3087768d853ba43c
+EBUILD selinux-ucspitcp-2.20200818-r2.ebuild 283 BLAKE2B ecb8c41f262948901749509ee67fcae6b452d6f21bc5d725361b7d460617ae825ed9a28775645837b691672bb6f5655d73c74f860fa259df25d25259ca806700 SHA512 77a411ed40578a821608786ff18731821fd6b95468ed00606398645afd099c678b8bf2a48bc9b4084157f78cb34653c919ad37196375394299c6be9027da31d5
 EBUILD selinux-ucspitcp-9999.ebuild 285 BLAKE2B 1c6345b751700a03a844b75792e3a1d91e6945b1f8e2ea711e0504711590fc5be04909cae8f2531d685c66b8dd44231cfd67e9d0c6b893f4a5756dd215e2b1f0 SHA512 097543d1582c6a6665360f8a8896b1831e924bf5450556584940052e8076109ff3087da2b79ad18753d86d8be7fa4a5f5a8bf5cdeb52bb4a3087768d853ba43c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20200818-r2.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20200818-r2.ebuild
index afc59e511110..fb7d82368df1 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ucspitcp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-ulogd/Manifest b/sec-policy/selinux-ulogd/Manifest
index 1d5ebe0e7d40..a030ad4f96a2 100644
--- a/sec-policy/selinux-ulogd/Manifest
+++ b/sec-policy/selinux-ulogd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-ulogd-2.20190201-r1.ebuild 277 BLAKE2B 5dcc0cc39d07cfb1d7f2d2714c1c9d1ac0e2d1bf5f92b6bfce809e462bb66b63c1b0e08e48f5574155332d7ec89c283d18662db98f38372611cce328a2a65153 SHA512 412e79d26982788e11dc98c997c4122534482c40b724bec8fbb4a7f65d86d529fbace3ffe5cca2d21c5dfec9275a3157d10822daf64cecd060a9613f20eaeb89
 EBUILD selinux-ulogd-2.20190609-r1.ebuild 277 BLAKE2B 5dcc0cc39d07cfb1d7f2d2714c1c9d1ac0e2d1bf5f92b6bfce809e462bb66b63c1b0e08e48f5574155332d7ec89c283d18662db98f38372611cce328a2a65153 SHA512 412e79d26982788e11dc98c997c4122534482c40b724bec8fbb4a7f65d86d529fbace3ffe5cca2d21c5dfec9275a3157d10822daf64cecd060a9613f20eaeb89
 EBUILD selinux-ulogd-2.20200818-r1.ebuild 279 BLAKE2B 98d825654e618bece1bc0b87cdf7dba90c8b9023280e361d186a62e8252cafae01763a1e68d20ce38727dc3b6b2a60ace9042a09d990c8f70e10ef0052f1cae9 SHA512 056fd0ffa2d0d509957d5a88dfabe4f8a1020eed9e364210896c1952925f36beb50b24255718ca3261056e792b130a98d1a2e74f16792303c2238ebcb199315e
-EBUILD selinux-ulogd-2.20200818-r2.ebuild 279 BLAKE2B 2d2ebcca0346bf06542e3d14c232d56532cb54c5c2e2bf2fc83d87f9143a2c397e98701edfd84a05c50e4c173a4fb427f7e1408b75355955685f76e928910514 SHA512 0384c67c611db33e31060d65a431012f9d8f54e98716411cf390215d60a33325f98b2e4604e3ed15fc73d952e5c4fc5530a5da8186b8acb072765534c29e86a3
+EBUILD selinux-ulogd-2.20200818-r2.ebuild 277 BLAKE2B 8c01ab80811240fb2d16e6201213ff4ee3bea9e5131ca6a0a2e599578c0b9643d0b6a7fb0a56ad552427d12416cc67a92f2c826730a323bd7ee02eef774c4be1 SHA512 f252f0a7d67403bb17fe1d5adf7e3b5af47f96f2417b8c57b45c51dd7914c3f0782a1a11eeaff61562a49286ac198a2c04f714538fd94a65de20ece4727ad6f3
 EBUILD selinux-ulogd-9999.ebuild 279 BLAKE2B 2d2ebcca0346bf06542e3d14c232d56532cb54c5c2e2bf2fc83d87f9143a2c397e98701edfd84a05c50e4c173a4fb427f7e1408b75355955685f76e928910514 SHA512 0384c67c611db33e31060d65a431012f9d8f54e98716411cf390215d60a33325f98b2e4604e3ed15fc73d952e5c4fc5530a5da8186b8acb072765534c29e86a3
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20200818-r2.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20200818-r2.ebuild
index dab579594653..0b7de328991b 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for ulogd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uml/Manifest b/sec-policy/selinux-uml/Manifest
index 3674a5d13fe3..de245c8958da 100644
--- a/sec-policy/selinux-uml/Manifest
+++ b/sec-policy/selinux-uml/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-uml-2.20190201-r1.ebuild 273 BLAKE2B ebe2a8ead24ce2ed1ba44455ca40fba890871bea8fb0e5eba791e80f95e6f42f8f012ba472ccd4472c732374534fd7fd456b60b19240ef51a79fb2a1f271e3d2 SHA512 930e9367014677112f28c34c008c3a8474c23f46906ae2a21da1c737c79f587e06825e706fd0e38bba5c5a128c1db6037818e1087fcc073361634fa4061e9b2d
 EBUILD selinux-uml-2.20190609-r1.ebuild 273 BLAKE2B ebe2a8ead24ce2ed1ba44455ca40fba890871bea8fb0e5eba791e80f95e6f42f8f012ba472ccd4472c732374534fd7fd456b60b19240ef51a79fb2a1f271e3d2 SHA512 930e9367014677112f28c34c008c3a8474c23f46906ae2a21da1c737c79f587e06825e706fd0e38bba5c5a128c1db6037818e1087fcc073361634fa4061e9b2d
 EBUILD selinux-uml-2.20200818-r1.ebuild 275 BLAKE2B 9109088baa57b286de84f78ad2b659ad50264e214d55663593ef2c740e68d2fcaa73cc21060990e21d613f717f36d1cfc328a2d9f616e6978bcdc428384ab762 SHA512 15a339ac5c23a733fb4f42f918c63aa52272789b2a3cc46e0b4ae3a3e63364b95bcdff32d7f61659cf52f4955603bc8e9110d325349ee64e885e9d3cbcd2f443
-EBUILD selinux-uml-2.20200818-r2.ebuild 275 BLAKE2B 691b2279fd8b637c3dca551ca408c5bf38526f9f88747f073d193aff634a14de83f7821876651e0fcf6ba7fb670a134c9376c3c57ce2b090831f68d03bea871e SHA512 c118bd851926a04e38c557420be446ade7845660a3c2ce5e25dc72df5aeab839e4cadcc92b74eedbfad2c8b86350b5c6edea00799dc8b825344dda97eeabe900
+EBUILD selinux-uml-2.20200818-r2.ebuild 273 BLAKE2B 824266ee7a2b4fab20d99c522c54dbe1748e8c6a1f51f2f4405aff13f87b9329414b215a0f3e85ea6269fdab181f26463efe34b94c533d18b689e37936ccf0f3 SHA512 348958ae75dddc6ae72f27ca48cdb31a547ed756e3955dbed8a5455c02ca7370b5c42c04f9146f57f96254364be3927168c761974127bd75267773c4e0b940e1
 EBUILD selinux-uml-9999.ebuild 275 BLAKE2B 691b2279fd8b637c3dca551ca408c5bf38526f9f88747f073d193aff634a14de83f7821876651e0fcf6ba7fb670a134c9376c3c57ce2b090831f68d03bea871e SHA512 c118bd851926a04e38c557420be446ade7845660a3c2ce5e25dc72df5aeab839e4cadcc92b74eedbfad2c8b86350b5c6edea00799dc8b825344dda97eeabe900
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20200818-r2.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20200818-r2.ebuild
index 6651b64cd596..712be6e5a60e 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uml"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-unconfined/Manifest b/sec-policy/selinux-unconfined/Manifest
index 4c0ab14b824a..d53aa67bae14 100644
--- a/sec-policy/selinux-unconfined/Manifest
+++ b/sec-policy/selinux-unconfined/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-unconfined-2.20190201-r1.ebuild 287 BLAKE2B 34a7074f83d3a412bda88dd3a476ab1d100f5b5ce61b6ab03563f52cc2c488f68a734054c6186cfdb1904080d9e3ffb27c2a25e2a81e7f1ef3a9e10e7472dab5 SHA512 6bb924e88d93d801503a9e3ed7e233b03d6ddbcceda9b29f7114635e70b9d4b644ca2c0f70396f9390a8280911e8cbe68e65b69647a4aa42e88721ed53bf67c5
 EBUILD selinux-unconfined-2.20190609-r1.ebuild 287 BLAKE2B 34a7074f83d3a412bda88dd3a476ab1d100f5b5ce61b6ab03563f52cc2c488f68a734054c6186cfdb1904080d9e3ffb27c2a25e2a81e7f1ef3a9e10e7472dab5 SHA512 6bb924e88d93d801503a9e3ed7e233b03d6ddbcceda9b29f7114635e70b9d4b644ca2c0f70396f9390a8280911e8cbe68e65b69647a4aa42e88721ed53bf67c5
 EBUILD selinux-unconfined-2.20200818-r1.ebuild 289 BLAKE2B 67df438c56155a53a7b9372c63419bd3713ab939c4df9fc1676f63253cca14596344eae92c6204871f4bb1188b6accc3006ba4dd8f942edca0a483fa41c239b6 SHA512 e08786cd691d12076f101620089013b75963a7c0448de3bd83a211f597f9a7d9579bef66e070cc541a2e53acb82bbebc63f6f9ad7cc1345db5cc824379731801
-EBUILD selinux-unconfined-2.20200818-r2.ebuild 289 BLAKE2B a28c3eeb85e8039aa502d0af00048fb7dadd746c634ac2e547cbecc8581703a678015556fa5bfb21af94c19752d3b4bafb92348bec9650c59cc586142d9fa28f SHA512 533d95ade1cb1dc787b2a05acd498425736ed28811fb1c17d58440eb2932e7cde7de772e42bb0cfe97b24ca27b3fc6c6c7b57bed143a8b8a36b973d820202df0
+EBUILD selinux-unconfined-2.20200818-r2.ebuild 287 BLAKE2B 238ae3eb41300b08d6366be4d103f57a0fffe53ce3625b1f470c31b8200d2b0fd6f36f3748ceb91cf2930965fe65bef1f50107f6bcbc3c507da2b8c3d1792839 SHA512 3871549d0d97bbb9efa77d0d0e4f7abf6ab8f30ae31d508adaf4945798734ba70b6218f2c1476e6dc1237ff4bb4d75b683b3db5b8d200ea328c3e48d8fdec7ea
 EBUILD selinux-unconfined-9999.ebuild 289 BLAKE2B a28c3eeb85e8039aa502d0af00048fb7dadd746c634ac2e547cbecc8581703a678015556fa5bfb21af94c19752d3b4bafb92348bec9650c59cc586142d9fa28f SHA512 533d95ade1cb1dc787b2a05acd498425736ed28811fb1c17d58440eb2932e7cde7de772e42bb0cfe97b24ca27b3fc6c6c7b57bed143a8b8a36b973d820202df0
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20200818-r2.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20200818-r2.ebuild
index 6726305669a8..8a4b64438cbb 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for unconfined"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uptime/Manifest b/sec-policy/selinux-uptime/Manifest
index e10c5a1ea017..49d4a68d0951 100644
--- a/sec-policy/selinux-uptime/Manifest
+++ b/sec-policy/selinux-uptime/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-uptime-2.20190201-r1.ebuild 279 BLAKE2B 1bc1eb65bccb2bb7c80e535ab45d8b20e28df28684b5af62154df9eba51ba7c8cd34f55043b69a57313ea3cce6ad3214298026571e46566ef736f683e31760ab SHA512 b9c349eaf58f844cf66b65d43d83ad708af56a5ce78e0c47a9668a45f2fc54e86157e55ecc49e12f1f1f3b8da286e4b5519447879f0c75a3735a1dcd70088ca9
 EBUILD selinux-uptime-2.20190609-r1.ebuild 279 BLAKE2B 1bc1eb65bccb2bb7c80e535ab45d8b20e28df28684b5af62154df9eba51ba7c8cd34f55043b69a57313ea3cce6ad3214298026571e46566ef736f683e31760ab SHA512 b9c349eaf58f844cf66b65d43d83ad708af56a5ce78e0c47a9668a45f2fc54e86157e55ecc49e12f1f1f3b8da286e4b5519447879f0c75a3735a1dcd70088ca9
 EBUILD selinux-uptime-2.20200818-r1.ebuild 281 BLAKE2B d4147f87b15c10df44ef21851d2cb64cf558cbbcc509a49f124dcbb9e31365773ac669745f9971bdf3faa5a80168df8cf7396d0fedbd55c731ad54f87f7e8b02 SHA512 9d0d048d289d34bf50663ee068a8c605181d2d1d2b701ef6a709211f927439321825d571009e108b24ec0ad1e867b72967ed8964d894b1be41bada8dafd5f02f
-EBUILD selinux-uptime-2.20200818-r2.ebuild 281 BLAKE2B 47571fb1de4b963588aa191de430ead879c3cecdaeca6341d5d177f293a8fd5766c55ace7ced09e2bbe6cde01d764aee9749e1bdd738dbbde0b3ff3acc23a9f5 SHA512 e818af341996a8e28acb01fbda658ce9dcae80d378a1073cc5cf26a8e3ccc83ffaebff68f4ea4346ad457fded40ad787d0e2d132adfbb9f79771275a8be1b90c
+EBUILD selinux-uptime-2.20200818-r2.ebuild 279 BLAKE2B 7ce9868901368afc47cfa71cd8c18fc609402c7268e2d27484f93ad88e8ed58a1b9bf78a81e582d28157f48e94f230feaa02e1515f138629e20307ee99c01205 SHA512 e86f3b16b8e45bef3e0d58b93d4c20fa8d71762ee9ca2e2fea8fe74b289d6c924c81ae90f1534524e273878bf3de3bc96cda28ae5fcc36401f76e51e18968741
 EBUILD selinux-uptime-9999.ebuild 281 BLAKE2B 47571fb1de4b963588aa191de430ead879c3cecdaeca6341d5d177f293a8fd5766c55ace7ced09e2bbe6cde01d764aee9749e1bdd738dbbde0b3ff3acc23a9f5 SHA512 e818af341996a8e28acb01fbda658ce9dcae80d378a1073cc5cf26a8e3ccc83ffaebff68f4ea4346ad457fded40ad787d0e2d132adfbb9f79771275a8be1b90c
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20200818-r2.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20200818-r2.ebuild
index fbf233228f70..30720d5404fe 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uptime"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/Manifest b/sec-policy/selinux-usbmuxd/Manifest
index f323fe5ddd98..24fa23e8cef5 100644
--- a/sec-policy/selinux-usbmuxd/Manifest
+++ b/sec-policy/selinux-usbmuxd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-usbmuxd-2.20190201-r1.ebuild 281 BLAKE2B 6897686f21679307acb4c462d5cdba0f351d36e49df077da305899d23bd7a23836727b8790382ffb38827b7f1484c319dbd78405f8a5f88d9bc9f2096d669a27 SHA512 c04817dc00d9d8eecf119eef3cc67bbc29bf9243d7eec1ad4850ff24d2e8a7766588496c3ca39d6c3b85348594d20216f132c9705663be40b40182c62030ab49
 EBUILD selinux-usbmuxd-2.20190609-r1.ebuild 281 BLAKE2B 6897686f21679307acb4c462d5cdba0f351d36e49df077da305899d23bd7a23836727b8790382ffb38827b7f1484c319dbd78405f8a5f88d9bc9f2096d669a27 SHA512 c04817dc00d9d8eecf119eef3cc67bbc29bf9243d7eec1ad4850ff24d2e8a7766588496c3ca39d6c3b85348594d20216f132c9705663be40b40182c62030ab49
 EBUILD selinux-usbmuxd-2.20200818-r1.ebuild 283 BLAKE2B c56202cd9cf22bd30c590d785ad102891ca18c514346ec4950d8d1a1e2d0706def335fa5aadfd8a879ff55052fa27a5c848abeaa00e1c5873c22852633790b55 SHA512 624b2b55ad438f15a1686810fc9e5413a2f947856ed159e41b4f280ac9475fa85c47057ca92c440c1ac7eb18ba08398e32debc082f4fdb1b68456cd2aa94b073
-EBUILD selinux-usbmuxd-2.20200818-r2.ebuild 283 BLAKE2B 4fbc5de36ea89106c35f13ce9a050f5a279d3ed93b230d9f2245cd05ef46bb01bff1c24d1304ca77d8f6e26522af6c57c2cb104668227a8aa409745f938d646b SHA512 9d5d6dfa7408340eeb1759bbb2ec0404dfaecacaedd2795ae75ec1192415e6c93ecaad5565ab2adf16bd5884bf0e2635af57a6f61a7a7ec7968c77bee47931ae
+EBUILD selinux-usbmuxd-2.20200818-r2.ebuild 281 BLAKE2B e04fafb854750d9aa5116095c8fed26f1e6fd0f70bbf6a434cbf1104e75f6389ba088b1ccd3a8d17bc995853b01d7c6eccc5f9ef73877ffa0db1ccca1983a52a SHA512 5030225a8c978ae168d6fdead0b8eba2125184e0d2179a5bf1b07a11e7782efd0aff659e1dba310739530b47cd259bf360c07619038bf04f1e5ae10c38817aa4
 EBUILD selinux-usbmuxd-9999.ebuild 283 BLAKE2B 4fbc5de36ea89106c35f13ce9a050f5a279d3ed93b230d9f2245cd05ef46bb01bff1c24d1304ca77d8f6e26522af6c57c2cb104668227a8aa409745f938d646b SHA512 9d5d6dfa7408340eeb1759bbb2ec0404dfaecacaedd2795ae75ec1192415e6c93ecaad5565ab2adf16bd5884bf0e2635af57a6f61a7a7ec7968c77bee47931ae
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20200818-r2.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20200818-r2.ebuild
index b112e59cc092..87abf3dbf177 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for usbmuxd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uucp/Manifest b/sec-policy/selinux-uucp/Manifest
index 6b5067082657..4180d07f35a7 100644
--- a/sec-policy/selinux-uucp/Manifest
+++ b/sec-policy/selinux-uucp/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-uucp-2.20190201-r1.ebuild 369 BLAKE2B 310aa51886741611f95bd6d3229f46f188a9f9b57e7c7f2599c666a7df098b292eb4c6deb21f4e478f52b7a5efabe8d8cfaaf812eff8dd62d8d8f8b96744eb97 SHA512 a2eff3d95877db3563fde7d878c8dc9083fb66afcdfc0836ce82a8895bed629f9c84aec89cc92db3614241fc30b68a4d5832ce2b6261bbede7f0a5c1bfef0ba4
 EBUILD selinux-uucp-2.20190609-r1.ebuild 369 BLAKE2B 310aa51886741611f95bd6d3229f46f188a9f9b57e7c7f2599c666a7df098b292eb4c6deb21f4e478f52b7a5efabe8d8cfaaf812eff8dd62d8d8f8b96744eb97 SHA512 a2eff3d95877db3563fde7d878c8dc9083fb66afcdfc0836ce82a8895bed629f9c84aec89cc92db3614241fc30b68a4d5832ce2b6261bbede7f0a5c1bfef0ba4
 EBUILD selinux-uucp-2.20200818-r1.ebuild 371 BLAKE2B e756a9df1c56f406c6e7774a9397273c22725de74fc39f325edb64757f1e88c04a41ec2a99e68c4a871c7487bc22de5940af06f76ab72d2d61f63958a44fecc8 SHA512 83cefa45e622f47e5e42dc9916bdfb32edad99b9097009e032ee545273b2f4b277606b577827090c3245f0fbf34ae8b5a85b0525102caffcc3e6a782c246df38
-EBUILD selinux-uucp-2.20200818-r2.ebuild 371 BLAKE2B 8edc715b2d5807839e55d2554c38a61ea3a104b1fe2b96ab9fd1bd672ff6efbc8914b6007cb4e5d08e2ce04d252632ff0204d9c478a1a49d828c422308cb8b24 SHA512 91e8545ed6392fb3ba5340a5c7a791cbe1c408374538e6e598984caaa6b116bcd272044094c4a9730875a3daa8a6f8673d8c6281025855c4db612feb1e1caf52
+EBUILD selinux-uucp-2.20200818-r2.ebuild 369 BLAKE2B 0931004d80e27e6fb6e4b3b1cd04d9e05b2a9caef2c93a15d03abd271a4a99d1e3040402012c5909a504f4b8233c3eeb46dcb96484a6aea6d8d8e54845db3dd0 SHA512 631b9ef1fb76c02407952732e9d4f04ef0fc5b4605207ff3cd862b9f47a591456a430269261af98459a5590ab2dac207e3535dd6365598b5430fb2e52f3ddb8a
 EBUILD selinux-uucp-9999.ebuild 371 BLAKE2B 8edc715b2d5807839e55d2554c38a61ea3a104b1fe2b96ab9fd1bd672ff6efbc8914b6007cb4e5d08e2ce04d252632ff0204d9c478a1a49d828c422308cb8b24 SHA512 91e8545ed6392fb3ba5340a5c7a791cbe1c408374538e6e598984caaa6b116bcd272044094c4a9730875a3daa8a6f8673d8c6281025855c4db612feb1e1caf52
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20200818-r2.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20200818-r2.ebuild
index 09d7859b9ea3..aa2b779c1900 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uucp"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-uwimap/Manifest b/sec-policy/selinux-uwimap/Manifest
index ea2c5fa9b761..54193b66d116 100644
--- a/sec-policy/selinux-uwimap/Manifest
+++ b/sec-policy/selinux-uwimap/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-uwimap-2.20190201-r1.ebuild 279 BLAKE2B beea953b0dac410ffa7f3ca7e417c1329c91cb37a88b49e4e1ecb6330e6a126e26e6ce2db83bb69c0a10a7b4f02842f6d1d17860481dcf4b5dddb3493099c2e9 SHA512 a0537e4e9cc4a10803b48b13d218bad3d21dc97c5a0639a8953a7df4521ea3cb342e9cf43b01a94a165384481ba37d2d5966e055b17af425b4d970d7e956a07c
 EBUILD selinux-uwimap-2.20190609-r1.ebuild 279 BLAKE2B beea953b0dac410ffa7f3ca7e417c1329c91cb37a88b49e4e1ecb6330e6a126e26e6ce2db83bb69c0a10a7b4f02842f6d1d17860481dcf4b5dddb3493099c2e9 SHA512 a0537e4e9cc4a10803b48b13d218bad3d21dc97c5a0639a8953a7df4521ea3cb342e9cf43b01a94a165384481ba37d2d5966e055b17af425b4d970d7e956a07c
 EBUILD selinux-uwimap-2.20200818-r1.ebuild 281 BLAKE2B 688a64d74beaad52a6469829a6798d3dd994764d924cdb47c5ab5e845361422197885605d3630695233e73f65c093e10b1cf3173460b26eb63a3036325ed07fa SHA512 e4e481c9292e858418fce86152cb5a1ae01f42bff51e46b56c612e8cd1df8fb0ad0a614f958e211e437531d069e64fccc59a6625876f760eb02bfcd81023e21a
-EBUILD selinux-uwimap-2.20200818-r2.ebuild 281 BLAKE2B fc2e7c5ddef1d75a2b680c18d105c17ae62ff94455b8d95ce063d049f200360b4bc922e428ec2a6d3087c4e98e9af9ee71ae5256b419a93e7a6239fea791403b SHA512 30240bf6943685f0d12e800986bf74cc6f80bcea2f45fd69afb27dd6138bfdf879452a2fc6c66aad6f6307e825d50374f80f07fb604b3e2f8630028b77f8dbc9
+EBUILD selinux-uwimap-2.20200818-r2.ebuild 279 BLAKE2B d0a6b6b1890b9f9d5192505feef7b3d18e77edafa8de1264bee0cb223f0b68ea06e233910ec4a24eabeefb6a8a05864be29e7bb75573525f9558cd9f32ec8280 SHA512 69d4682e4ef6bb7a045b3aa2a83fe18f4e781dfadc60545c6576a7df56977b8195b300651f812c2248d0796316c509ba614aeeaf187c67a58f9a06ea19b36280
 EBUILD selinux-uwimap-9999.ebuild 281 BLAKE2B fc2e7c5ddef1d75a2b680c18d105c17ae62ff94455b8d95ce063d049f200360b4bc922e428ec2a6d3087c4e98e9af9ee71ae5256b419a93e7a6239fea791403b SHA512 30240bf6943685f0d12e800986bf74cc6f80bcea2f45fd69afb27dd6138bfdf879452a2fc6c66aad6f6307e825d50374f80f07fb604b3e2f8630028b77f8dbc9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20200818-r2.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20200818-r2.ebuild
index f0c62bf537f6..7655b6b063a0 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uwimap"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-uwsgi/Manifest b/sec-policy/selinux-uwsgi/Manifest
index e1ef93e30fc0..6c30c9895ff8 100644
--- a/sec-policy/selinux-uwsgi/Manifest
+++ b/sec-policy/selinux-uwsgi/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-uwsgi-2.20190201-r1.ebuild 277 BLAKE2B 90acecc49ed9692e90db1752b8ee9ad28f34f3ad0c6a486b769cb7a56da165cf7b80100c19e603a99edf7b0154b21c1dbbbbe2bb12c74f018511f42c93ce904d SHA512 d3469826786157ba3942859c9e33abb345ef4ec13eaa39111b6af1450a87bc508ada367bebfffc40b2ef8237371410eb2a7309e59b43525ede15c4eb9122cb55
 EBUILD selinux-uwsgi-2.20190609-r1.ebuild 277 BLAKE2B 90acecc49ed9692e90db1752b8ee9ad28f34f3ad0c6a486b769cb7a56da165cf7b80100c19e603a99edf7b0154b21c1dbbbbe2bb12c74f018511f42c93ce904d SHA512 d3469826786157ba3942859c9e33abb345ef4ec13eaa39111b6af1450a87bc508ada367bebfffc40b2ef8237371410eb2a7309e59b43525ede15c4eb9122cb55
 EBUILD selinux-uwsgi-2.20200818-r1.ebuild 279 BLAKE2B a31f95ab70aa27ddd684c94dc3afde95688880e26171d39c258f5031d6f8a3c7be9483104d44c84e39b8770a2de5c0e069066d6504fc86cf9c4bd42f2c1e73de SHA512 a092c69d158f731541e542075f0665f0aa0f2d8d820e929d2b3c6dae7eb711db5bc2bff95d1488a8de430185eecd6178b7e1224ea105812d2f856c9a3b5e92ac
-EBUILD selinux-uwsgi-2.20200818-r2.ebuild 279 BLAKE2B 9d648f0f6887098899652678cc219eb59115221c263538700afe3819ddf16957579ab5b8d269871248c3809da31f46edb48ab27e9e18ca8cd2e61582c18c4e17 SHA512 c8ab34f259475c0b8f5dd44044374e4805b6f56c656a0accc1010ea6cc53358569ea9bb29700f7b3d97ea90e71fbeedb0b3b9a243275f158865abf5f646870eb
+EBUILD selinux-uwsgi-2.20200818-r2.ebuild 277 BLAKE2B 202b501e7a062b6a5a246df0c88ad7cc096c74c5cb470ab2503e0609170f1a1605bf54d8909d5159739d25de83c0d28e835996d97acf6bd347f6d68bc8cc88fd SHA512 62c4f73cf708c5f71e4487227f2e2750d0825543d91de12f4f95e254dac645c55579c1fa80adb54b5141a426340c862c8ae79dff5e1d4cce346be14943f76477
 EBUILD selinux-uwsgi-9999.ebuild 279 BLAKE2B 9d648f0f6887098899652678cc219eb59115221c263538700afe3819ddf16957579ab5b8d269871248c3809da31f46edb48ab27e9e18ca8cd2e61582c18c4e17 SHA512 c8ab34f259475c0b8f5dd44044374e4805b6f56c656a0accc1010ea6cc53358569ea9bb29700f7b3d97ea90e71fbeedb0b3b9a243275f158865abf5f646870eb
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20200818-r2.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20200818-r2.ebuild
index 15ebcc5fff20..023734034139 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for uWSGI"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-varnishd/Manifest b/sec-policy/selinux-varnishd/Manifest
index 5a4d392157d2..a550eca5da1f 100644
--- a/sec-policy/selinux-varnishd/Manifest
+++ b/sec-policy/selinux-varnishd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-varnishd-2.20190201-r1.ebuild 283 BLAKE2B b1df558436b2c54129b2acdd14e7a38975a220b1fa2c1d3605f2c5c99b4d7cb23682d77fba126b2aa7524581c8fc84e91d942f8d133836fd8a6ea0c007eb69e4 SHA512 e8de582734b979089238168e6f2074cc6aa900887b1ef19fee80a79cdfb3bd8bfb51e83ea341a60456bd5055cd363bc54c76bf188e312e2a8f6527dff1b07dd8
 EBUILD selinux-varnishd-2.20190609-r1.ebuild 283 BLAKE2B b1df558436b2c54129b2acdd14e7a38975a220b1fa2c1d3605f2c5c99b4d7cb23682d77fba126b2aa7524581c8fc84e91d942f8d133836fd8a6ea0c007eb69e4 SHA512 e8de582734b979089238168e6f2074cc6aa900887b1ef19fee80a79cdfb3bd8bfb51e83ea341a60456bd5055cd363bc54c76bf188e312e2a8f6527dff1b07dd8
 EBUILD selinux-varnishd-2.20200818-r1.ebuild 285 BLAKE2B 54b279b27c4c024b6da25c27e1c5fa5323a9797e0e2ff06f639d2eae9fac08d2d9ba0502ea64266d4cb4740d7e444c607c3d6b029d564d8daaf94bc08210fa1f SHA512 b14fac2baaabfd2d77aa78f1b3904ab57d8ebbdd2c8b15694974d16b442663bc8b9fab3fd3e4a7031861a12b51a73bd9a6ecf44ee97f578957aa10407e0047eb
-EBUILD selinux-varnishd-2.20200818-r2.ebuild 285 BLAKE2B 76972231bfa4142d6a9e7fad413381f3f7b147e4c447985f1da0e4affbe07054f108218213e5d1875d7e34dfe16a41bf4cc3dec7b079c0dc2fd5bf4714fa98cf SHA512 dea2033ab06f030026a1f46db50294b0fef32f80d7ba5172ae1e17741ee1304faab3bc71afe9a6e288d3cb80f00dcc1689c1df2d78b783f66df748358f13009f
+EBUILD selinux-varnishd-2.20200818-r2.ebuild 283 BLAKE2B 07fd66644b63cd687ea25d5249192e2788a28e9f4d3d0f6c71c007a5f4ef440f4ec90a61163efb8d9cf81e9e702c43471d693f0c8a8d6ccdd7134488b4c869f5 SHA512 2716b8989b84ec4ec887ee9ded9f4fac02f1f8a398e7869773e7abe7449f6a7945bca92876341051a7a99daaa592cdc0cc9d0e2f849f283fb98eff19276a2590
 EBUILD selinux-varnishd-9999.ebuild 285 BLAKE2B 76972231bfa4142d6a9e7fad413381f3f7b147e4c447985f1da0e4affbe07054f108218213e5d1875d7e34dfe16a41bf4cc3dec7b079c0dc2fd5bf4714fa98cf SHA512 dea2033ab06f030026a1f46db50294b0fef32f80d7ba5172ae1e17741ee1304faab3bc71afe9a6e288d3cb80f00dcc1689c1df2d78b783f66df748358f13009f
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20200818-r2.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20200818-r2.ebuild
index c2a7dea1731e..5c7d626d6be5 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for varnishd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vbetool/Manifest b/sec-policy/selinux-vbetool/Manifest
index 248289931a96..10c6b9da88fa 100644
--- a/sec-policy/selinux-vbetool/Manifest
+++ b/sec-policy/selinux-vbetool/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-vbetool-2.20190201-r1.ebuild 281 BLAKE2B 47fb7322916c27362ee37a1721bfc5e2d6fcd479fb10f57fbd473773585b6e2a96d07bc5ba263dbcb20c7adaaa53339927d76f3117682cee679e6e0eb81896da SHA512 cd305370e1c08b49c1993036d2f6aa3e157313768c2bc5f411976acd358c44fe8972d8d72f4d6d71cedb4f362ccfec088b46e9a78fdf3f0c77dcf9a2d579fe09
 EBUILD selinux-vbetool-2.20190609-r1.ebuild 281 BLAKE2B 47fb7322916c27362ee37a1721bfc5e2d6fcd479fb10f57fbd473773585b6e2a96d07bc5ba263dbcb20c7adaaa53339927d76f3117682cee679e6e0eb81896da SHA512 cd305370e1c08b49c1993036d2f6aa3e157313768c2bc5f411976acd358c44fe8972d8d72f4d6d71cedb4f362ccfec088b46e9a78fdf3f0c77dcf9a2d579fe09
 EBUILD selinux-vbetool-2.20200818-r1.ebuild 283 BLAKE2B 18bc0306922cd42ea6af2c496f4d172fdd529498eed53f840da27c46f1dff7e8fe00e9e0684d9d6cc23839cfdff5350f02854c2f91d984aead07f78e14fb3274 SHA512 5552bf3908a73e989cab6882a10dcbf6992e45fa213f6e5022d5c3f5df62da9d86d4f8d9dd17e69452be680e61edf5891d304a3b7203d9e75482d52ed4989017
-EBUILD selinux-vbetool-2.20200818-r2.ebuild 283 BLAKE2B 8f61a03cc43069d90020b3726a79d711edb16331b6409daad3d8d5c41a0e72f78859ed5d10b4ba0b51c786f3e3c990486704c9a74b95c9249c3ee49d1be2e384 SHA512 6cff43f8fefb25f608cfa39ce2198f74236a682c40314b9bcdef3006adcae43df8cf37daabd3f15637aed45800f0c25eaece083e331b253d8ef3318f3d6916b1
+EBUILD selinux-vbetool-2.20200818-r2.ebuild 281 BLAKE2B 587c4392d2501d3af7fc149cd01621ff1211210910995383d2ea1e8f48e6aaad7880b50bd2c7fc0d36bfc709b23cb3e009992bab7526d463a2062adaed9176a0 SHA512 2e7b087cbd37e797c87bf4977195b9f748e2087d6819b50307543973f47b2e9322f2392292706b14b3306f91a955c301c519eb9586f6f10b8b2919eabba2b854
 EBUILD selinux-vbetool-9999.ebuild 283 BLAKE2B 8f61a03cc43069d90020b3726a79d711edb16331b6409daad3d8d5c41a0e72f78859ed5d10b4ba0b51c786f3e3c990486704c9a74b95c9249c3ee49d1be2e384 SHA512 6cff43f8fefb25f608cfa39ce2198f74236a682c40314b9bcdef3006adcae43df8cf37daabd3f15637aed45800f0c25eaece083e331b253d8ef3318f3d6916b1
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20200818-r2.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20200818-r2.ebuild
index a193a4f58258..3c122d1ad1bd 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vbetool"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vdagent/Manifest b/sec-policy/selinux-vdagent/Manifest
index b284c3a901f7..04afceb93e48 100644
--- a/sec-policy/selinux-vdagent/Manifest
+++ b/sec-policy/selinux-vdagent/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-vdagent-2.20190201-r1.ebuild 281 BLAKE2B 85fb068beebf8e50793b64a9b1495f1a03723854c96acc8f2383e3f2a8d11e0dbb68ef1bc894040792b35344014ca3b92fffd1fda7b9340e4e38c5b854666775 SHA512 9003ded8d440c503f291891167964874d769fc35d690f3a98892db320612fe3756b0ca8056df8ba5a96e2c677fd5ad5ce394b1133034f9743be45f1712b8a7c2
 EBUILD selinux-vdagent-2.20190609-r1.ebuild 281 BLAKE2B 85fb068beebf8e50793b64a9b1495f1a03723854c96acc8f2383e3f2a8d11e0dbb68ef1bc894040792b35344014ca3b92fffd1fda7b9340e4e38c5b854666775 SHA512 9003ded8d440c503f291891167964874d769fc35d690f3a98892db320612fe3756b0ca8056df8ba5a96e2c677fd5ad5ce394b1133034f9743be45f1712b8a7c2
 EBUILD selinux-vdagent-2.20200818-r1.ebuild 283 BLAKE2B 3482d796b85c6017f8c2dacfdee9ec3cf16b8e619858551fedf1ad0122b8a7bede859c5f310065bd4bdab3c6c20bfd96cb28777ed93a0b65cd9a191b87cfe30d SHA512 77d8d26247bb1ee354cfb25ca2ad842c780709e78b8476cee5b1d9ab19d6ee5877536aab2e0d6df8799eaa939a20ad21991224872fb3aff22b78bb04535ee9b6
-EBUILD selinux-vdagent-2.20200818-r2.ebuild 283 BLAKE2B 8cd24d8468ff04a37d586d65255782fe7538e9e574b8564ea48ca93ccbef9cf4f7cc3da35137ec8b3ecb70c5a8113eac78ca3c14a15dd44325a2ad5efa4d5169 SHA512 7ae36d411b7a94e2b65702f81897788bc2350314a804b31542a75e19ae72557d3e29eba8650fe15abc68a5ce307973831435190ee264e81301d7918ef9133b06
+EBUILD selinux-vdagent-2.20200818-r2.ebuild 281 BLAKE2B 1c3fdcce7c8b6cc15ecbe6ce97492084e71e0d583fe8ed47184752246c094a2a94b027d8fb479dffdec0b079ae56f50d7ab04f2f55ebabd36c3f1916e198c8ed SHA512 b61bb755391c9e037d896d61f60695a1470084e0f9a1096a7f782042c14c58d928e1ab8f928defc8b96ced96ca9ee81e77dc80fe0c74d2df7bac5f21b538e9e3
 EBUILD selinux-vdagent-9999.ebuild 283 BLAKE2B 8cd24d8468ff04a37d586d65255782fe7538e9e574b8564ea48ca93ccbef9cf4f7cc3da35137ec8b3ecb70c5a8113eac78ca3c14a15dd44325a2ad5efa4d5169 SHA512 7ae36d411b7a94e2b65702f81897788bc2350314a804b31542a75e19ae72557d3e29eba8650fe15abc68a5ce307973831435190ee264e81301d7918ef9133b06
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20200818-r2.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20200818-r2.ebuild
index e549d655e163..c7a1dce2a40f 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vdagent"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vde/Manifest b/sec-policy/selinux-vde/Manifest
index 0ff8d75b7b70..f5eb861060ce 100644
--- a/sec-policy/selinux-vde/Manifest
+++ b/sec-policy/selinux-vde/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-vde-2.20190201-r1.ebuild 273 BLAKE2B 30c4eb1f029a7d5e3636ca938f9e8b0f8b17060f12861f8244f267592b755c4b176b925c175012f4436aefb85338dc4975ae13e2f42f28243f6bb17609ab2bbe SHA512 b7a1f4fc18eeeb055980b52302a267bddfd71792bec58d140fbf42a7dbc8c2eaa9f2fafbeb1a46769bf754c93ebc7be9c7bbe69cb38b891436551804d904549e
 EBUILD selinux-vde-2.20190609-r1.ebuild 273 BLAKE2B 30c4eb1f029a7d5e3636ca938f9e8b0f8b17060f12861f8244f267592b755c4b176b925c175012f4436aefb85338dc4975ae13e2f42f28243f6bb17609ab2bbe SHA512 b7a1f4fc18eeeb055980b52302a267bddfd71792bec58d140fbf42a7dbc8c2eaa9f2fafbeb1a46769bf754c93ebc7be9c7bbe69cb38b891436551804d904549e
 EBUILD selinux-vde-2.20200818-r1.ebuild 275 BLAKE2B dfaeca4d2d5d777598acd33ac9304f7c55cdc16361dcc19b0d6d6ec50e402c5105727dc0a4fb26f5782cd70117d2199c07ea3010c2072583cf36d8ce802b77a5 SHA512 714eba8a2ba748e2db579c3503dadc1a6d8dee28ca510ced900b221d7d6476f100d4d2b44bc4ba5588e3b60d436ad75be46c22afdf467f11006ebb4757c8e457
-EBUILD selinux-vde-2.20200818-r2.ebuild 275 BLAKE2B 4238887c4d91869eeb4c09824ada0c8d4a037781c240d3a8308f439c736628312a5e80d3fc040012c45cc812be667d6a6f845a5228de6190399bd5fa8263d6d0 SHA512 396b1ad89abc8f4ab5014059acb59022d227973045070ed3753aba9677e2116405c16529fdf96ef5d01afb916108aa6819440ad69c91091b419d894d1f0f96b7
+EBUILD selinux-vde-2.20200818-r2.ebuild 273 BLAKE2B c470ad915c20d4fb978c4774d9371e5f02f1acbf07a60fad7d3ac9cd5ccf0586cff8125cc1a54fa8bf28c7fb09d6f1a22c312666810555f430016c04debfaf5d SHA512 b9bf878e1c0606a1570fef0200d7b15dc8dee9a11e75342d38cc774260fdab0c431fb2700eca7ba80d27fa96ab682cefc69e04bd51e337235797aed8c848884f
 EBUILD selinux-vde-9999.ebuild 275 BLAKE2B 4238887c4d91869eeb4c09824ada0c8d4a037781c240d3a8308f439c736628312a5e80d3fc040012c45cc812be667d6a6f845a5228de6190399bd5fa8263d6d0 SHA512 396b1ad89abc8f4ab5014059acb59022d227973045070ed3753aba9677e2116405c16529fdf96ef5d01afb916108aa6819440ad69c91091b419d894d1f0f96b7
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20200818-r2.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20200818-r2.ebuild
index c352ae5b6555..cdc266e47ad7 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vde"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-virt/Manifest b/sec-policy/selinux-virt/Manifest
index df88da57b8bb..78a030ae6ef4 100644
--- a/sec-policy/selinux-virt/Manifest
+++ b/sec-policy/selinux-virt/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-virt-2.20190201-r1.ebuild 275 BLAKE2B 55562e3594028f93fe64638d9f0f4b7f51c57e1a241adfe1c5a4a5127285eb619daeeb96767b591fca26d04cccb53b2781619e124a6f3af0decc88e85bfc93f5 SHA512 b95550cd39d85273495f0562947c0f54fc82b7940f83e9333c2e083827856f705128914650735faf633882b94233191ac580447da4f4b36eb4665e9b009fbf5d
 EBUILD selinux-virt-2.20190609-r1.ebuild 275 BLAKE2B 55562e3594028f93fe64638d9f0f4b7f51c57e1a241adfe1c5a4a5127285eb619daeeb96767b591fca26d04cccb53b2781619e124a6f3af0decc88e85bfc93f5 SHA512 b95550cd39d85273495f0562947c0f54fc82b7940f83e9333c2e083827856f705128914650735faf633882b94233191ac580447da4f4b36eb4665e9b009fbf5d
 EBUILD selinux-virt-2.20200818-r1.ebuild 277 BLAKE2B 7233f2565fbe43a1dfe315115a77de01034155d2be8fe29eddc06647a31179f28aa7209d540fc5d9f3213ef0c5a73372392e91dd74df732a1723fb72dd24813c SHA512 9701ac07c5ce36f38d7431704ee8fa1f25b16b5fa38bf998bf5a6add1cac3f7cbddd6d46113e66627d90bbb88563a1d5997c56b7c84557dc8883a89a76a13916
-EBUILD selinux-virt-2.20200818-r2.ebuild 277 BLAKE2B b4a4ae0aad1d9f60faa9d46f689315be1ee453d9352681b075070c6791b44f71c8e384a79063717dfe2da4e236cf1e65ba53c1562c1bec54c70f7932df8c233f SHA512 532cda7d8115e129246ce6888dd70fe66dae7ae9276c8d9cdba1e4144a1b24685cc14e2b04b0bb1a7dfc0db30ead1d1564f303eea2e905a11aa722df10ac787e
+EBUILD selinux-virt-2.20200818-r2.ebuild 275 BLAKE2B 63f8c748f7db912e57096b7e022d3cbf928c3397f985f02a0cd084b6aad7a59ba5b5517251ecfff91ab7c3f30cf77e4fb84c7acaa829c4e3a316d0bd6277c13b SHA512 27ee9b5abee83b681386100715a8b8e49d5cb67fb3ca8b6d05165a3984fbf238d0e38454907b662d80712ca5cab1505f1be2c72d908402c257123b303b7b02fe
 EBUILD selinux-virt-9999.ebuild 277 BLAKE2B b4a4ae0aad1d9f60faa9d46f689315be1ee453d9352681b075070c6791b44f71c8e384a79063717dfe2da4e236cf1e65ba53c1562c1bec54c70f7932df8c233f SHA512 532cda7d8115e129246ce6888dd70fe66dae7ae9276c8d9cdba1e4144a1b24685cc14e2b04b0bb1a7dfc0db30ead1d1564f303eea2e905a11aa722df10ac787e
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20200818-r2.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20200818-r2.ebuild
index 212b7c40b8a1..e1f07cc7c485 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for virt"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vlock/Manifest b/sec-policy/selinux-vlock/Manifest
index 609d1a03f9e6..8e4b19b3586f 100644
--- a/sec-policy/selinux-vlock/Manifest
+++ b/sec-policy/selinux-vlock/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-vlock-2.20190201-r1.ebuild 277 BLAKE2B 68e108c0e46a9751a5ae19b8d03bd0768c3cdf043922fb4b9fcb1ec492c857f9f090c734ea92c42aa8904766f8a296a7de9a75b535acc52ade76910cdd70c0f6 SHA512 ef2c3a1e30bbf14617a08aaa50260ed3f1d280abd3a42edc45151b8f456f17c6fae1fdf41acfe45ea2d723720db1b36ee6c8c1b0d59f067d1f5ba67dc7abce01
 EBUILD selinux-vlock-2.20190609-r1.ebuild 277 BLAKE2B 68e108c0e46a9751a5ae19b8d03bd0768c3cdf043922fb4b9fcb1ec492c857f9f090c734ea92c42aa8904766f8a296a7de9a75b535acc52ade76910cdd70c0f6 SHA512 ef2c3a1e30bbf14617a08aaa50260ed3f1d280abd3a42edc45151b8f456f17c6fae1fdf41acfe45ea2d723720db1b36ee6c8c1b0d59f067d1f5ba67dc7abce01
 EBUILD selinux-vlock-2.20200818-r1.ebuild 279 BLAKE2B c3f8071b73cea50e296979673e5e9ce913b6b120156787c12c688b8dbd3ad63e979282333fcbdd8c9cf967c3151d6c452ab89dd67ec58f384bf294058112e337 SHA512 7bb30213850a4c889671f583b5bdb2ef7d28cc075e36f480142656c76d72f0420a1b409766ec359f3a8fd17d334184f58afdd553e612bb4d4523322a098a3ac7
-EBUILD selinux-vlock-2.20200818-r2.ebuild 279 BLAKE2B d4bab26a19e3ccdbab2831e8d952566425bc0a329c9219ce95b865998a22b5de14b2b397e06532ec6976b96b7c2f3970968c85d216c17ed8f3ad5ebba4287b14 SHA512 e1e662a3acbbaeed2a727bb4fc0207278a007150d5ea83d22f5a99336577334b9624869b293c894e2fe23d7e28d95a0c23557090ee7d1e59387c6f73f0da8968
+EBUILD selinux-vlock-2.20200818-r2.ebuild 277 BLAKE2B 5736c0e43a02fba02b87f3fd0ca38d81e1c362cb2e3b1d532887247521b701110856da9c40bd31af1156b6de68d45d113ed8a7a56abe2a95fd7086214ae8959d SHA512 53220c9c41be7ff908dcbb19a4b265e8650dc7bb12ea6b1440eba8d6240684beca1b3fee32bfd6e9e75d5aae2355e26da41a67acfca4886d28d7a0a6e265e3ee
 EBUILD selinux-vlock-9999.ebuild 279 BLAKE2B d4bab26a19e3ccdbab2831e8d952566425bc0a329c9219ce95b865998a22b5de14b2b397e06532ec6976b96b7c2f3970968c85d216c17ed8f3ad5ebba4287b14 SHA512 e1e662a3acbbaeed2a727bb4fc0207278a007150d5ea83d22f5a99336577334b9624869b293c894e2fe23d7e28d95a0c23557090ee7d1e59387c6f73f0da8968
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20200818-r2.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20200818-r2.ebuild
index 6120a58de678..e90717a7d636 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vlock"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vmware/Manifest b/sec-policy/selinux-vmware/Manifest
index fb49139dc1c0..f404338c5162 100644
--- a/sec-policy/selinux-vmware/Manifest
+++ b/sec-policy/selinux-vmware/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-vmware-2.20190201-r1.ebuild 377 BLAKE2B 7e2f7ae3e796337f0c4f8869babc09e1d5a37e6987f57bea921b89a9527ac035eed575a6114e6be877f20b8f4748c7e9e30d33c5c4d7e2eda68ee36225ecc85b SHA512 da87cef25654143dedb6842507333600fcc1a5511b0871f9874ce37c07ea78b74d6367a81f69c5b0fe587702df5ae6f760bfc7324ddd4a21fb0d81feabac1d7b
 EBUILD selinux-vmware-2.20190609-r1.ebuild 377 BLAKE2B 7e2f7ae3e796337f0c4f8869babc09e1d5a37e6987f57bea921b89a9527ac035eed575a6114e6be877f20b8f4748c7e9e30d33c5c4d7e2eda68ee36225ecc85b SHA512 da87cef25654143dedb6842507333600fcc1a5511b0871f9874ce37c07ea78b74d6367a81f69c5b0fe587702df5ae6f760bfc7324ddd4a21fb0d81feabac1d7b
 EBUILD selinux-vmware-2.20200818-r1.ebuild 379 BLAKE2B 15a55076f17d1bc3194f4db7673c069afa0b3fd99a66f424305148065d863426aef6a3bc27e701ea0bbf1a8f4c3e7d0287dfec6efc0cc959aa58cce1366cb63a SHA512 f2a09a778b0fcf60965578e8e7572e4d6919d30549293ced51969803f5aecf0f4ec05036985f7fa3cc4f5bf88fe5553b83333e83a8ee0fb6aa014c4f061dcd81
-EBUILD selinux-vmware-2.20200818-r2.ebuild 379 BLAKE2B 13d294e6cd501f05e59ce51309d6b95d2b7c5df7f0ea329f2a23739e9389bc2ab6ec37c0c0b47d83285a02f190337ebfc7321d4d777d9c14e191f9a05fca604a SHA512 59234a17bb4b8974a25ab9213c2c0e747a2ca9ecfa704a316237e4e61638fcdbf467447559d97ac8a32dbbd0709d135a0573c3ef03a8cd32d642fa567882734b
+EBUILD selinux-vmware-2.20200818-r2.ebuild 377 BLAKE2B a1bf5638b2e08fc5133aca5c44ce107c29a79100c13a61664c9774323601bcce686f677d56d5dc999630fc8328448dc0c32a085f98707b09e295c6110acdc027 SHA512 850a2dc55b0bb5458c3475951d056cac5611aa92999396810b8b2d8644c9f76136a12fad4d315894f849dadb384460483fd6d749131ed50026335644c3521f02
 EBUILD selinux-vmware-9999.ebuild 379 BLAKE2B 13d294e6cd501f05e59ce51309d6b95d2b7c5df7f0ea329f2a23739e9389bc2ab6ec37c0c0b47d83285a02f190337ebfc7321d4d777d9c14e191f9a05fca604a SHA512 59234a17bb4b8974a25ab9213c2c0e747a2ca9ecfa704a316237e4e61638fcdbf467447559d97ac8a32dbbd0709d135a0573c3ef03a8cd32d642fa567882734b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20200818-r2.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20200818-r2.ebuild
index 8f6e2fc966a5..7c6160179b8e 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vmware"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-vnstatd/Manifest b/sec-policy/selinux-vnstatd/Manifest
index f7fbb68b5c83..5a125ae507cd 100644
--- a/sec-policy/selinux-vnstatd/Manifest
+++ b/sec-policy/selinux-vnstatd/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-vnstatd-2.20190201-r1.ebuild 281 BLAKE2B 27d9cf45e247792a8bb5447b8e7721a67c964b742e5c088166649e187407d80e139726efca62780e5b079187b411fa74a9c551cf1a907dd063824c6af6d9e3f9 SHA512 0cf2c85b7c6a0580a7cfdb58a76a459e4d2cc2c922a18bba56666f0b32444963704d0124e5f9bd90c2ee5f13099ed071a47218626e851a987791a3cfdd830633
 EBUILD selinux-vnstatd-2.20190609-r1.ebuild 281 BLAKE2B 27d9cf45e247792a8bb5447b8e7721a67c964b742e5c088166649e187407d80e139726efca62780e5b079187b411fa74a9c551cf1a907dd063824c6af6d9e3f9 SHA512 0cf2c85b7c6a0580a7cfdb58a76a459e4d2cc2c922a18bba56666f0b32444963704d0124e5f9bd90c2ee5f13099ed071a47218626e851a987791a3cfdd830633
 EBUILD selinux-vnstatd-2.20200818-r1.ebuild 283 BLAKE2B 5227d011c8c9848dce64ac6b32e4e6c2984af1dcefc43068941a16fd29545d880c4b3674bb42707c6ab2c55c9321af0f33d5f97c4f1d96c17a1898dd816c162b SHA512 450f3dec70dc66a01bea2685a1648915e02fc17e32a1094a7830c2d633ae6fb8d5493e80a71d813ecb10789c70f58d2650d3dc69f424deb132e402f54f1a6ba9
-EBUILD selinux-vnstatd-2.20200818-r2.ebuild 283 BLAKE2B 348e2d0b234c6aee258347147aef3b36f9343d755f20819b6450ac6e54d5350507b8e2f300da0d0c88fd5020f0d66c79bd3435c6552bb3b1489f9b3b0f5c36c8 SHA512 014e5b5524ef0ad2d110c57409c5ba6e23a6cee9ce8b2fcb2ae744489ad0b099f4d49eb0d810838e737effcc230752cb6b5dccf574ca1de1e979f915b20ad8f9
+EBUILD selinux-vnstatd-2.20200818-r2.ebuild 281 BLAKE2B 301a1dd9ccfd5dba1b425a1e9024ddf2d129992b4d5c98e4e260d9871efcc6ce381f3a8d367f24415f778db408d75d5c2c675b203436b245faf7ee5c820ba531 SHA512 073e6a021a2e87e4d8028c1abd2b300c27501fd49ed68987bba70a9ed717495d6c43190df436783fbcccc4ed904712b7e9b2d7bf624ad88df655636037aad2a1
 EBUILD selinux-vnstatd-9999.ebuild 283 BLAKE2B 348e2d0b234c6aee258347147aef3b36f9343d755f20819b6450ac6e54d5350507b8e2f300da0d0c88fd5020f0d66c79bd3435c6552bb3b1489f9b3b0f5c36c8 SHA512 014e5b5524ef0ad2d110c57409c5ba6e23a6cee9ce8b2fcb2ae744489ad0b099f4d49eb0d810838e737effcc230752cb6b5dccf574ca1de1e979f915b20ad8f9
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20200818-r2.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20200818-r2.ebuild
index 29b6c095a650..76761a09f5ca 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vnstatd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-vpn/Manifest b/sec-policy/selinux-vpn/Manifest
index 82d09c3fe132..1bc588ca3321 100644
--- a/sec-policy/selinux-vpn/Manifest
+++ b/sec-policy/selinux-vpn/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-vpn-2.20190201-r1.ebuild 273 BLAKE2B e52da9f4595ac959526dff9f2beecd318262ef7263542eca9299ed151f88137ccd12bf41dd226306cb6d308c8b211b20a0d1f48701c6ebc282ebbedd5befe170 SHA512 3cb9270a3c00ba1524c974e25ec0fd559a884fda4d24100466d5996eb63386d06d9c3b88fbda4dcbd3119a21490798b20b5930acbac2d19894f8261fde30bfbd
 EBUILD selinux-vpn-2.20190609-r1.ebuild 273 BLAKE2B e52da9f4595ac959526dff9f2beecd318262ef7263542eca9299ed151f88137ccd12bf41dd226306cb6d308c8b211b20a0d1f48701c6ebc282ebbedd5befe170 SHA512 3cb9270a3c00ba1524c974e25ec0fd559a884fda4d24100466d5996eb63386d06d9c3b88fbda4dcbd3119a21490798b20b5930acbac2d19894f8261fde30bfbd
 EBUILD selinux-vpn-2.20200818-r1.ebuild 275 BLAKE2B cd6cab90183121f48eb13217b717d0d2cfc2e6e2a55e565cde0551b309d717867c7c4dc942f7e29999c6fa6c30c796241984f0361d28a143e54e16512da1c364 SHA512 5250e6f07c454984a3b13928a67515d919c73d5e43866bf48b545e6857869c1d2f3c305a8b2648ce1454b7114279884c0bd8217a0b34f36193a0f3d8ffc4e20e
-EBUILD selinux-vpn-2.20200818-r2.ebuild 275 BLAKE2B 4e83f9cadbd5cd4d5ce05d9f408ca3fc54c0980c17e6d7879dd72ac2b45075dfdc63f56771a3428ccfef7785f858f0f0f49cdf14016815c7aa931cf3309f27cd SHA512 6799576794c825e52d571a9853124adecb2de4614809985c2ba544a949e5eaa99cdb63e94990ff6149307cfff525c63daa0f25a0f1de7ccfdbac96796a43e4ba
+EBUILD selinux-vpn-2.20200818-r2.ebuild 273 BLAKE2B 5a40362b4251a1a109d52f300c154ded8114b8b31986dfcd29d3974addc2c0771e7ee6240fa4c4e202ecae13f177e52364c0a4331b6b94fe9349e60854b2e14f SHA512 3d1f586df3820a65db78544d057343269c99d26203fdcddef328de286047de03d73b8f0778ce4ba9dd4ce6c7b38eb3cab4a67e21fb7aa7f54a748c4529eb3fe4
 EBUILD selinux-vpn-9999.ebuild 275 BLAKE2B 4e83f9cadbd5cd4d5ce05d9f408ca3fc54c0980c17e6d7879dd72ac2b45075dfdc63f56771a3428ccfef7785f858f0f0f49cdf14016815c7aa931cf3309f27cd SHA512 6799576794c825e52d571a9853124adecb2de4614809985c2ba544a949e5eaa99cdb63e94990ff6149307cfff525c63daa0f25a0f1de7ccfdbac96796a43e4ba
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20200818-r2.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20200818-r2.ebuild
index 070a05219ccf..fec33dc4e28e 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for vpn"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-watchdog/Manifest b/sec-policy/selinux-watchdog/Manifest
index 369047243153..f5f5721dfceb 100644
--- a/sec-policy/selinux-watchdog/Manifest
+++ b/sec-policy/selinux-watchdog/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-watchdog-2.20190201-r1.ebuild 283 BLAKE2B 1ec59d0cb22913024fcb6325490b989b79a293de1f563720d5191dcf0ad70823e59dee3296362a878f3f4b00dd2f24c805f5e07e2392018797996646f3448a9f SHA512 1312237f3a635a7fc0d2eb1553f000b7e3bdb2c485e486c308f7642ed0b609bd52ccbda5a4167faad82866fba3811e5b3ae3774b9fca1b79ba3c2e073ee40fbc
 EBUILD selinux-watchdog-2.20190609-r1.ebuild 283 BLAKE2B 1ec59d0cb22913024fcb6325490b989b79a293de1f563720d5191dcf0ad70823e59dee3296362a878f3f4b00dd2f24c805f5e07e2392018797996646f3448a9f SHA512 1312237f3a635a7fc0d2eb1553f000b7e3bdb2c485e486c308f7642ed0b609bd52ccbda5a4167faad82866fba3811e5b3ae3774b9fca1b79ba3c2e073ee40fbc
 EBUILD selinux-watchdog-2.20200818-r1.ebuild 285 BLAKE2B e5d8dc68d4f3b87779d0a5ed821c985c027c201de0f864b2293f7226f8fec60e78641cee9a34a7b5bcb727ca666b16f9460c95c650cd1e96cdac94dab72d278a SHA512 40821b8d2042523d109af8cd934d149e728bd0a7f83cd0a443ca4046172463aabdf99a2db73c28a2537882e686608821c3aff3402bc9e98a841e8561a03b1dc1
-EBUILD selinux-watchdog-2.20200818-r2.ebuild 285 BLAKE2B 57aeab4c284bf4cbbaf8f5fc951ab29e4c42aaf064d82661d63b2f47abb786b8b682b5eae2f3e8325781f135d2ae17d091b07083b1dd65ebffc5310a125e12b6 SHA512 078443d77bae3115599cb4d9a54666927d65ea1e14a122dd2407aeb35b105880f318853b3751ba684f8ab3e717010e9bcb52b8f4237ca196c8c27e03d2e0d44d
+EBUILD selinux-watchdog-2.20200818-r2.ebuild 283 BLAKE2B d8ec0478e5492c5ba7e0bad61c1afeca29ff3dbd9472c8abfc154ad83c2b4aa6970cae7dc9b786ecc63fc874da5f25208e66481d629e1b186dd05b5d5c92b64b SHA512 594e6624f390f7e160a016be3133c3f3c81b9b345d6eca756b7f1a63b2dc00ff88359c89573209b2ca2ef36e5cdedd38469d15fdf236287da3309d11e60978b3
 EBUILD selinux-watchdog-9999.ebuild 285 BLAKE2B 57aeab4c284bf4cbbaf8f5fc951ab29e4c42aaf064d82661d63b2f47abb786b8b682b5eae2f3e8325781f135d2ae17d091b07083b1dd65ebffc5310a125e12b6 SHA512 078443d77bae3115599cb4d9a54666927d65ea1e14a122dd2407aeb35b105880f318853b3751ba684f8ab3e717010e9bcb52b8f4237ca196c8c27e03d2e0d44d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20200818-r2.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20200818-r2.ebuild
index 9b76517076a3..91ac8b9818b6 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for watchdog"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-webalizer/Manifest b/sec-policy/selinux-webalizer/Manifest
index eee15e79f6d1..68a23766a3ae 100644
--- a/sec-policy/selinux-webalizer/Manifest
+++ b/sec-policy/selinux-webalizer/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-webalizer-2.20190201-r1.ebuild 382 BLAKE2B 150c2707998435fe0966a2d90b56af04938f0ab272aa09dbe893d3744e11b6686c6504a8b3fff126e734f746050d0cd085ea6d839808a0b3ae0a70005c62bdcb SHA512 c5b8df3032eac57687a95cce16a82ef15b729786f1a5a9661f1797b30bdabe45ea4c5ebb6ca8248423fae13348a05376a8fd3f361bd62ca2f743c63e0d9cf8de
 EBUILD selinux-webalizer-2.20190609-r1.ebuild 382 BLAKE2B 150c2707998435fe0966a2d90b56af04938f0ab272aa09dbe893d3744e11b6686c6504a8b3fff126e734f746050d0cd085ea6d839808a0b3ae0a70005c62bdcb SHA512 c5b8df3032eac57687a95cce16a82ef15b729786f1a5a9661f1797b30bdabe45ea4c5ebb6ca8248423fae13348a05376a8fd3f361bd62ca2f743c63e0d9cf8de
 EBUILD selinux-webalizer-2.20200818-r1.ebuild 384 BLAKE2B f526dfe16148db5e8151c865135fef0b83aa2576aa2d1152565ed65c048a836edfe5da19d4e69127d0badebeb8574c144d3fe4496dbed473a3613d86cf6ea2fc SHA512 703052e00a2ca9de8a4bc35dce91e92e9c3cd608b7b47e9bca52a58e0cba34fa94ab1203457a714705605518ec071d2280b580bab922783cfff5808927fb3ed7
-EBUILD selinux-webalizer-2.20200818-r2.ebuild 384 BLAKE2B a667575f6cd7a08b2f80e74210b076402051eb328594197cc2cc0cc70f198bb545110d9a0934c4c17f1abdf8070587186caa0368e123cc7888bcea0314a2e1fb SHA512 52e634a4fe49d4b9bd9fbaef015a3e9801bd0f6bbe411e4a79b6439739ab32b9dfcf77bb829d189bfaf4eb97d5803405baeb2e259e763a683f057a20430bff03
+EBUILD selinux-webalizer-2.20200818-r2.ebuild 382 BLAKE2B 972e2f5280af1462fbb02ae68b3c05fae1936ddbe8a7087015c54a21b54adb5687147392d9d8b85383c2e38037b7f66fc935acff51c5c4e4d2077d027031dd4f SHA512 6d3e837a0faea1d31ecd57079c723e9fb3d0c435fa0345fea70e1c462dee274655c6f258cec967105911942ce3588f735c6151f90766a2e2ce610ab6aead0463
 EBUILD selinux-webalizer-9999.ebuild 384 BLAKE2B a667575f6cd7a08b2f80e74210b076402051eb328594197cc2cc0cc70f198bb545110d9a0934c4c17f1abdf8070587186caa0368e123cc7888bcea0314a2e1fb SHA512 52e634a4fe49d4b9bd9fbaef015a3e9801bd0f6bbe411e4a79b6439739ab32b9dfcf77bb829d189bfaf4eb97d5803405baeb2e259e763a683f057a20430bff03
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20200818-r2.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20200818-r2.ebuild
index 2eb0924d8a03..05fb2862345d 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for webalizer"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-wine/Manifest b/sec-policy/selinux-wine/Manifest
index b6ce5b724f14..60d2e64aacbe 100644
--- a/sec-policy/selinux-wine/Manifest
+++ b/sec-policy/selinux-wine/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-wine-2.20190201-r1.ebuild 275 BLAKE2B 0fd3e56538df2548af786f9263163c2fe0a6889e4e3924200d20685e022042ad9b3e9e2937bc242a2d0cf35f22a4889db875f52bd8e2c6ebd774b42da18314ce SHA512 faeeebc0d0f9000c7dbf605f7c9268f5434fb98c914293b8587a860cd9b24386acb38c05a2198b006265687ec16f7ba424664cf500c41299f050bf31da236d12
 EBUILD selinux-wine-2.20190609-r1.ebuild 275 BLAKE2B 0fd3e56538df2548af786f9263163c2fe0a6889e4e3924200d20685e022042ad9b3e9e2937bc242a2d0cf35f22a4889db875f52bd8e2c6ebd774b42da18314ce SHA512 faeeebc0d0f9000c7dbf605f7c9268f5434fb98c914293b8587a860cd9b24386acb38c05a2198b006265687ec16f7ba424664cf500c41299f050bf31da236d12
 EBUILD selinux-wine-2.20200818-r1.ebuild 277 BLAKE2B cef9261846b5407a8fb2ca20ecd7f3280261118a67d9de07c056a40c0d18e5cd5120d47ca2ad74099558c1618c9556ed44d71aca2fdc1dad64d4cb810faca33f SHA512 91ad49f69144114e24261f39f63b28d550cca861d2edc713997c0f4f1b8a2f9237f48f69d2d79ca07564dac48002cddb476e76093b4319042d279079ab75e7bf
-EBUILD selinux-wine-2.20200818-r2.ebuild 277 BLAKE2B 70afd074935d4747e0f0ed0bef6ad8b1c4d84aca900effb832eceb0dade3c58aa1839aa6cea71e18e9420f90ae558fd205ba39c4052fafe1a5d1a95dab1af90f SHA512 287d8f4f9a215535d2e570c235a528a1f9fe715d7b73c6bf1d6fc08615fed605026dda172e4505367c876499cdec804bd9d4886ed33130f859c19b1d19406413
+EBUILD selinux-wine-2.20200818-r2.ebuild 275 BLAKE2B 2eedc9b5a1ecc1ea6d30b3b6f49c54f80e630123285a73cf9e037cf64cded25a80c57834a24913835e68944c6fe2e4666d590b7044bcab4cf8457d339cdcfc6b SHA512 65dc8e91d5e07b2eefa99d6b2e759646f789212983804a7c3646cc26f6275e9908e16e573fbd2c4eecfac812c64d1cda9c2a66d188fe0c578174aef33ff67c97
 EBUILD selinux-wine-9999.ebuild 277 BLAKE2B 70afd074935d4747e0f0ed0bef6ad8b1c4d84aca900effb832eceb0dade3c58aa1839aa6cea71e18e9420f90ae558fd205ba39c4052fafe1a5d1a95dab1af90f SHA512 287d8f4f9a215535d2e570c235a528a1f9fe715d7b73c6bf1d6fc08615fed605026dda172e4505367c876499cdec804bd9d4886ed33130f859c19b1d19406413
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20200818-r2.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20200818-r2.ebuild
index ddde6edc9994..0bbafc8a05ca 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wine"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-wireshark/Manifest b/sec-policy/selinux-wireshark/Manifest
index 0cd441b5a5b4..4efdee3f9481 100644
--- a/sec-policy/selinux-wireshark/Manifest
+++ b/sec-policy/selinux-wireshark/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-wireshark-2.20190201-r1.ebuild 285 BLAKE2B ed7bdd340f4cce9f367d24d0e6fb02aba83da5cf32bd258c13ecb5363a6c6f9eaca3f8662f39cb0178775515707aa36a3063220ed9816de8f8b7af4aa375f8c9 SHA512 2e1a00b2cb510131cd8fbea60649db98046255d0eb80907cc79357f7586764987b2b198aa008a52167e9d0a04566e5455d4217e2a4ce80367fe95bb231979050
 EBUILD selinux-wireshark-2.20190609-r1.ebuild 285 BLAKE2B ed7bdd340f4cce9f367d24d0e6fb02aba83da5cf32bd258c13ecb5363a6c6f9eaca3f8662f39cb0178775515707aa36a3063220ed9816de8f8b7af4aa375f8c9 SHA512 2e1a00b2cb510131cd8fbea60649db98046255d0eb80907cc79357f7586764987b2b198aa008a52167e9d0a04566e5455d4217e2a4ce80367fe95bb231979050
 EBUILD selinux-wireshark-2.20200818-r1.ebuild 287 BLAKE2B c8606c89e55e9ae10d10eb3b7c6e0a2b54257a1accc318398a1554714442acf9eb3020fe0cbe83057beba42cb88c9dc085de489bf8bc42abd046b174f8bb2405 SHA512 1eb840bd4304b7fbb963114d26f4d877d715ba7aad8caaa8bd302bb9ef6de4b90dd5ae17d5e317789f32da55080a5056f2ed0b3c2f1a12d758445054cafcf8c9
-EBUILD selinux-wireshark-2.20200818-r2.ebuild 287 BLAKE2B 0d0b155d2bfa55d0009c112276938083d96026e2c2bd7c9e5201da50b0b5cc1ec70cf93ba9ef9f5159ac33cfbe03633c850787f8b773daf8eb2348d76d15a9c0 SHA512 78e72cd2f9cbad3dd1c0d7181e5a54a37ba6618646c948e92cc32107b56785127d9b16f2c4721bc761c64f878983c331ccd418d71a87dfc682cb498cd460006d
+EBUILD selinux-wireshark-2.20200818-r2.ebuild 285 BLAKE2B 3359158378cd980a3f80c182e30be453c9e89ea0ae32ecb2c6c3c76643373a17c7be57211a30d07159199fb89c2ffd73b7bb1e9fc429e07bd5c997c01ac20ddb SHA512 0b96eecb62eda8f181370311da790f7f3073250df3c73164bcc291995daac6ec9ec7760d57f1bb312e00176bcd85dd6161c23a6c3ab7a25b43fb18c688635f6f
 EBUILD selinux-wireshark-9999.ebuild 287 BLAKE2B 0d0b155d2bfa55d0009c112276938083d96026e2c2bd7c9e5201da50b0b5cc1ec70cf93ba9ef9f5159ac33cfbe03633c850787f8b773daf8eb2348d76d15a9c0 SHA512 78e72cd2f9cbad3dd1c0d7181e5a54a37ba6618646c948e92cc32107b56785127d9b16f2c4721bc761c64f878983c331ccd418d71a87dfc682cb498cd460006d
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20200818-r2.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20200818-r2.ebuild
index 1bcf924bee8c..2aa0044b7c9f 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wireshark"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-wm/Manifest b/sec-policy/selinux-wm/Manifest
index 96bb576032ca..1037ffef54ef 100644
--- a/sec-policy/selinux-wm/Manifest
+++ b/sec-policy/selinux-wm/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-wm-2.20190201-r1.ebuild 271 BLAKE2B feddafc4369b99d34917fec85039c0b38bf1c935881af4fc960dacfdb53545f4a3a87dab1aea924ac85011768d8bc1802d96bdfe96e98045bc61df581f46d464 SHA512 f6b17c011dbb69844b84b1fb7a80ec83d4511575965bca055e859ef989b0a3b54805b38d4813ce569475e2a15a8f91b73b511deaa350a62ef05427503e4737c2
 EBUILD selinux-wm-2.20190609-r1.ebuild 271 BLAKE2B feddafc4369b99d34917fec85039c0b38bf1c935881af4fc960dacfdb53545f4a3a87dab1aea924ac85011768d8bc1802d96bdfe96e98045bc61df581f46d464 SHA512 f6b17c011dbb69844b84b1fb7a80ec83d4511575965bca055e859ef989b0a3b54805b38d4813ce569475e2a15a8f91b73b511deaa350a62ef05427503e4737c2
 EBUILD selinux-wm-2.20200818-r1.ebuild 273 BLAKE2B deddc52a6d4b1b283503a48c8b8bafe21af5b966f097f3d96b856eb4804aa078cc25092e42894f0ef8592bea6fa849eabeea381486fa8019136ff3813b0f2dc5 SHA512 c4f8d05706e8db4b9ca84f39bbcf48957e8050fa27efa3cc07930afcf64640683574fb10ecac2b3b014ea156b93e3b6fc2c86d5ed48ef4c2c6bd2a8fdaa8482f
-EBUILD selinux-wm-2.20200818-r2.ebuild 273 BLAKE2B 37960c762f840d016afa142f076a6c13cacdbc4d11ec101ee14d903d10bb54c7837723f14e810edb3076080747155d2d8551a2525dd8215097344a654d211232 SHA512 bf23b421ac04c12936eca6238796133a404270c8c30bc6e2d98a4ed8235cf18f1121cf1a96315fde694b2010c3a30163d35a0a9d530d785984b8e2d25e84a1f6
+EBUILD selinux-wm-2.20200818-r2.ebuild 271 BLAKE2B 6dc45de5877278b3de4eca6a8b4b31d08727f20f22dfcc9ca753fb43eacac18b1202fb664539e481f6b48bb0f809596b218ffdda4078682592a689c5820a9fa5 SHA512 301b5648f5246b8c8a54e2415651c74458656d2b05d5f3c0403965ee9b24880db3e4453efb4e14fdd737be77d6d56a8f7e0a6d75238289c8a2344089474c6b9b
 EBUILD selinux-wm-9999.ebuild 273 BLAKE2B 37960c762f840d016afa142f076a6c13cacdbc4d11ec101ee14d903d10bb54c7837723f14e810edb3076080747155d2d8551a2525dd8215097344a654d211232 SHA512 bf23b421ac04c12936eca6238796133a404270c8c30bc6e2d98a4ed8235cf18f1121cf1a96315fde694b2010c3a30163d35a0a9d530d785984b8e2d25e84a1f6
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20200818-r2.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20200818-r2.ebuild
index 4a9d1c5e4df5..68988d43b0af 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for wm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-xen/Manifest b/sec-policy/selinux-xen/Manifest
index 431a7aa0cbac..86c5032609ec 100644
--- a/sec-policy/selinux-xen/Manifest
+++ b/sec-policy/selinux-xen/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-xen-2.20190201-r1.ebuild 273 BLAKE2B 5c8d8a3eb267a918fb4d857e8283451676b6bbd469cd8af1da4c4a9f791c513b022e626f236bb0c41d8734a50bda32abea2e61a0fbf9cec377ee0a38490651d9 SHA512 12d9d1d2ecacd012b8d36262af75f7ce9b9910d5947b8d6f393e6d7d93d227d2f250dc97e5de3389d22e16fb91992f33b33acfffa89ff042ed7d7477dd82ba17
 EBUILD selinux-xen-2.20190609-r1.ebuild 273 BLAKE2B 5c8d8a3eb267a918fb4d857e8283451676b6bbd469cd8af1da4c4a9f791c513b022e626f236bb0c41d8734a50bda32abea2e61a0fbf9cec377ee0a38490651d9 SHA512 12d9d1d2ecacd012b8d36262af75f7ce9b9910d5947b8d6f393e6d7d93d227d2f250dc97e5de3389d22e16fb91992f33b33acfffa89ff042ed7d7477dd82ba17
 EBUILD selinux-xen-2.20200818-r1.ebuild 275 BLAKE2B 77e72be4252031224f00448479c5d6d141d3c9e36e02b61d3dd8ddce986a228537111b9cfa86b8337422b0fa8906706c0d4b076ab7ecd0c2c9a2099c5c85adea SHA512 2c0f89ad9758afeab27f0ca7fe77cbc954ca273966a6ac99e712dee2cd1983fb5d993a42327916849ebbbafead7042d4544a4ab3cb4db4a917950722675044d8
-EBUILD selinux-xen-2.20200818-r2.ebuild 275 BLAKE2B 653f0ae36484b9b25b7640413100a6dd60c842acf68c0fa375f4174375a4746f7dec3b322735a840852466309a559483fc006bbae46023a07e860b009705b9fa SHA512 1af9cc048a27137e461d60252ce099dbb2297def65cd46451a04db42a37693d7398717fcf2ce8cd4282092aefa8252448b9c3c7901436624ab6e0bae42cb6610
+EBUILD selinux-xen-2.20200818-r2.ebuild 273 BLAKE2B ef5c7d230c4e17c9bed740ea323c88a0b93f98dbc9e3889596ecc46e5948ccd26d7a9ede880879f55dfcf27bf75f9accadab307774c22df24d2479ddd6916e80 SHA512 709853c2240def44fd617d9e39479a5418e0ba3508d743f6f5921797cf512ca646cf73e94c677d643023d0a59100d7fd2458c00ec50523fc8fcc6d96218f7c70
 EBUILD selinux-xen-9999.ebuild 275 BLAKE2B 653f0ae36484b9b25b7640413100a6dd60c842acf68c0fa375f4174375a4746f7dec3b322735a840852466309a559483fc006bbae46023a07e860b009705b9fa SHA512 1af9cc048a27137e461d60252ce099dbb2297def65cd46451a04db42a37693d7398717fcf2ce8cd4282092aefa8252448b9c3c7901436624ab6e0bae42cb6610
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20200818-r2.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20200818-r2.ebuild
index 9bd027ef3bc8..ff2c41c1a7a9 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xen"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-xfs/Manifest b/sec-policy/selinux-xfs/Manifest
index 33ae60e49e20..1bc746452055 100644
--- a/sec-policy/selinux-xfs/Manifest
+++ b/sec-policy/selinux-xfs/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-xfs-2.20190201-r1.ebuild 273 BLAKE2B 00ed3ca31777de3c935aa226070ea7fca903949078434035569bd00303e3f7c7169d3ebab4bf8c4fca9a2ae97e6ab55be2bc98758eaa7bf8defd8d83457321eb SHA512 8eb4d58ab62da2310ec6f75d85c0e0a1a2390835c5ace4bac6b4ede130955cdca125c595f2a1e93779f930b28b7d63fae62dae52146a1ef845b620af8fba5de6
 EBUILD selinux-xfs-2.20190609-r1.ebuild 273 BLAKE2B 00ed3ca31777de3c935aa226070ea7fca903949078434035569bd00303e3f7c7169d3ebab4bf8c4fca9a2ae97e6ab55be2bc98758eaa7bf8defd8d83457321eb SHA512 8eb4d58ab62da2310ec6f75d85c0e0a1a2390835c5ace4bac6b4ede130955cdca125c595f2a1e93779f930b28b7d63fae62dae52146a1ef845b620af8fba5de6
 EBUILD selinux-xfs-2.20200818-r1.ebuild 275 BLAKE2B b8b9a4263c66629b8dee6bd89961ab20706fb41861fd7519cde29190ce42dbc270cc070c30e51603f2476ce9bb8aa3d4e9a35e6fb3815b4652e05b6591961a8b SHA512 0098d1a02bfa96756a35bf1ec09d2ce888bd1fbf1d246e96e1ec62b7aa645b42359300f53380483498b79c5ddc4b5f0e0fad454d47d015ec00d810eeba0d5718
-EBUILD selinux-xfs-2.20200818-r2.ebuild 275 BLAKE2B 97a4bc106ebe013142a56235304806452602c5621f6e8848a7359aa1e5c8872f2b974b070be6d2aa8266e2f7e75f720fdc28e4d30c2210509eff6cb53758c6f9 SHA512 401afd3dfa55c3c49a1ff8e82643b553b150e756807c616d9cb9da32e7e69d139c04d695537beb56c3fcaff61c644f95e5acdeaf4ff40350a78c1ca4208dcc57
+EBUILD selinux-xfs-2.20200818-r2.ebuild 273 BLAKE2B 63e2d3ffd5bcd68c4800342829e12f662acb8c4e59e96615b706f7e9fe9f2e71d1b4d5e9ce542a21d3c4c812ca2b5836880d0a5cbe4f77e4a503487b8c1af20e SHA512 2813a75959774eb9ea35986d99ccdc49fd20a5b1994e7a625a5c58b29791438fda455b1b27abcb8b25d386646ceb1712d301c4a8a15336ec2c6a865254ea8a7e
 EBUILD selinux-xfs-9999.ebuild 275 BLAKE2B 97a4bc106ebe013142a56235304806452602c5621f6e8848a7359aa1e5c8872f2b974b070be6d2aa8266e2f7e75f720fdc28e4d30c2210509eff6cb53758c6f9 SHA512 401afd3dfa55c3c49a1ff8e82643b553b150e756807c616d9cb9da32e7e69d139c04d695537beb56c3fcaff61c644f95e5acdeaf4ff40350a78c1ca4208dcc57
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20200818-r2.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20200818-r2.ebuild
index b8dea2e046ed..3ea0aeb1be5f 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xfs"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-xprint/Manifest b/sec-policy/selinux-xprint/Manifest
index 0a71adc75930..07ef8e67fe1b 100644
--- a/sec-policy/selinux-xprint/Manifest
+++ b/sec-policy/selinux-xprint/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-xprint-2.20190201-r1.ebuild 279 BLAKE2B e9da20cc39ca840072cb0a6fc3756414c1e5bf7d2084f6d695613926dae939dc73ec2463d211aa64cedd3ebb9b0cb368de9546d75a2d036429069b6a14e3420c SHA512 183588aa3c252a5df4f873d23729291239b8c0a73562361ccc9196ba549c7fa6108236a10ebb9ca78ed8a3f7cc39d0688178e6fc9e17a9e73ee844ce81ce4036
 EBUILD selinux-xprint-2.20190609-r1.ebuild 279 BLAKE2B e9da20cc39ca840072cb0a6fc3756414c1e5bf7d2084f6d695613926dae939dc73ec2463d211aa64cedd3ebb9b0cb368de9546d75a2d036429069b6a14e3420c SHA512 183588aa3c252a5df4f873d23729291239b8c0a73562361ccc9196ba549c7fa6108236a10ebb9ca78ed8a3f7cc39d0688178e6fc9e17a9e73ee844ce81ce4036
 EBUILD selinux-xprint-2.20200818-r1.ebuild 281 BLAKE2B 4128a6f8fd2af563d26a3f615f79e7b0e4a4129e241170ba81c3a3ec38c0ada581ebce7124c28b8a915130632c6064e01da18e1433fc0377fc69e4fd4550e029 SHA512 94cde5173a5b40278d4a7b49988be7a17c24677f50f27ce995a591fbb2453eecdd2136ed06c4ad676ac5e871e3adaaa359191410da7c5f123541000dad771632
-EBUILD selinux-xprint-2.20200818-r2.ebuild 281 BLAKE2B 7b974b64f966c9f87171bc8447fd97da13c161e32673a43fdeb6be1ceb41790f1da5e460d023461989dcc191a9dce6dfab5f30ac1c0875492b20446cd33156ae SHA512 f8e32fb4960dfeb9f6b93287f497e16cb192c81e2119f1c72215279b2a05cf6d6643bbd4a0a1bbbe079d72c2667754c7ca76d13032e966dc9309c0c505781f3a
+EBUILD selinux-xprint-2.20200818-r2.ebuild 279 BLAKE2B 83a0df8879cac56518ccd2eeb9e71d1782c436a044aa5fb91c65612ab0bf425a836f2589105559752044f3fcae2aaa7df7945fc0f8bae23f8f45a4f57b2959bd SHA512 c332c14843f4463a6b504524c665e3c4e8ae5394110412cdee65632c697658d0c6aade3184d87288d88cc69b7761fb14d830dd09df558837291ab08bcd3b882d
 EBUILD selinux-xprint-9999.ebuild 281 BLAKE2B 7b974b64f966c9f87171bc8447fd97da13c161e32673a43fdeb6be1ceb41790f1da5e460d023461989dcc191a9dce6dfab5f30ac1c0875492b20446cd33156ae SHA512 f8e32fb4960dfeb9f6b93287f497e16cb192c81e2119f1c72215279b2a05cf6d6643bbd4a0a1bbbe079d72c2667754c7ca76d13032e966dc9309c0c505781f3a
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20200818-r2.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20200818-r2.ebuild
index f1cb07cabbd4..79fe0b24866a 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xprint"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-xscreensaver/Manifest b/sec-policy/selinux-xscreensaver/Manifest
index 529d01812f21..64615693c136 100644
--- a/sec-policy/selinux-xscreensaver/Manifest
+++ b/sec-policy/selinux-xscreensaver/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-xscreensaver-2.20190201-r1.ebuild 389 BLAKE2B 7ae12eb40aca72fba630e5802ce603690b57b289fa605f5eee2ed68bb6b98bf516d5ef5a09e16d21564bf45b96f66b56cbab4581430b2cc6314c6aba12d6f620 SHA512 ee579a742789726b6668e8b4bb66f9da39e30bd5ec423af1966bc4b181ba5f7cbc7bfae7730c11a23d48c9e8b0b3f82912ea2685fdd28f769b35c074370543e2
 EBUILD selinux-xscreensaver-2.20190609-r1.ebuild 389 BLAKE2B 7ae12eb40aca72fba630e5802ce603690b57b289fa605f5eee2ed68bb6b98bf516d5ef5a09e16d21564bf45b96f66b56cbab4581430b2cc6314c6aba12d6f620 SHA512 ee579a742789726b6668e8b4bb66f9da39e30bd5ec423af1966bc4b181ba5f7cbc7bfae7730c11a23d48c9e8b0b3f82912ea2685fdd28f769b35c074370543e2
 EBUILD selinux-xscreensaver-2.20200818-r1.ebuild 391 BLAKE2B c0a3b4d987537cfecec49b36d7558ec3f7c606cd43d94e61e51798034c2023b109e056c20dc616a522f16539d0cfedf1c30752ffbafb8b92b162e18b74971fdc SHA512 4ba9b5c65dbb8e8813832fbd52177762a1956d4ccfe630185ecfc2340896a7e4a907954ffe11aa06816d8c0d758a9c6b14af6b76d048b2723f94611ddf3e17ed
-EBUILD selinux-xscreensaver-2.20200818-r2.ebuild 391 BLAKE2B 6f474026899073c206fce9b39443937e95ad7de8de6b07d0cee091aba287da07f21e11df03ca70bf4526e6c4d98308f337b564700c340817330b9b1b5c3a38e9 SHA512 f26f5fd009d64883a1b49ec2da8b6293147ba6557036be558127490c88c394f7c803eb5090b7e9df3b3737ca2445b9776926817402864875af85ef88809140ce
+EBUILD selinux-xscreensaver-2.20200818-r2.ebuild 389 BLAKE2B c9c6032377570b4642e47678dd1b59c95e9754fb135b430840b2fffa1f9cf7c3f34d16996d7b0edb917e617ad56bf831913ad1cd48559339f41d38ef30b40321 SHA512 c13a433b28bc519f66781613a57cb6b249bfb22dd47086f379c560161c5153491afdae3aefe8b194a015485997e262f3ca2ce821683fa2f29d76eaf818f92f37
 EBUILD selinux-xscreensaver-9999.ebuild 391 BLAKE2B 6f474026899073c206fce9b39443937e95ad7de8de6b07d0cee091aba287da07f21e11df03ca70bf4526e6c4d98308f337b564700c340817330b9b1b5c3a38e9 SHA512 f26f5fd009d64883a1b49ec2da8b6293147ba6557036be558127490c88c394f7c803eb5090b7e9df3b3737ca2445b9776926817402864875af85ef88809140ce
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20200818-r2.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20200818-r2.ebuild
index e22075edc06b..7e2edc3eee69 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20200818-r2.ebuild
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xscreensaver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-xserver/Manifest b/sec-policy/selinux-xserver/Manifest
index 16efd74cf76e..37372ed84ba7 100644
--- a/sec-policy/selinux-xserver/Manifest
+++ b/sec-policy/selinux-xserver/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-xserver-2.20190201-r1.ebuild 281 BLAKE2B 28195b2ea31c6f9b091990a183c4f69faffa0c4d5f633edda8fcffeaff320c7f886065d474b05012d070a0c87f762421bfd4ef45f3b67d0a981c844ae6824b62 SHA512 17d01cf4a01c0530cfeca8228cef603f3811cfe068a09004525d8ca43c04c862f6e57d99b7229bb57b218eb2b3c85a8cf10f6821464c9259cd564df968978674
 EBUILD selinux-xserver-2.20190609-r1.ebuild 281 BLAKE2B 28195b2ea31c6f9b091990a183c4f69faffa0c4d5f633edda8fcffeaff320c7f886065d474b05012d070a0c87f762421bfd4ef45f3b67d0a981c844ae6824b62 SHA512 17d01cf4a01c0530cfeca8228cef603f3811cfe068a09004525d8ca43c04c862f6e57d99b7229bb57b218eb2b3c85a8cf10f6821464c9259cd564df968978674
 EBUILD selinux-xserver-2.20200818-r1.ebuild 283 BLAKE2B 39da47b56979c493e7f724086a741df5ca1a29ea899061680813813a2ecf24b50ca6e5f486de6406333f02a4776110e97de070f7286e20d470570a68594a11e4 SHA512 20fa0c6186d526c13ad4a2663d186ba344e575477d8cc57ac1c98f3d54cb46f3739be3eda7d78fc3bd45a745250a341bc356f4635100a362f4f94a34269fea07
-EBUILD selinux-xserver-2.20200818-r2.ebuild 283 BLAKE2B d90646458e2c993343da4ff76f54a64e64e8e7209bfa274a10ceffcea5e2a412ecd1d9828163b426bab935e3a102183fea862571e835729ce0f4612988d3da63 SHA512 9ff754e4b5d74de7c24876d91a079df2edd7f97f7c1f48fa3e94f4d128d1714645554839696db4f213131343b774142b8a6c90c1f9ab8aee9760afba267c4448
+EBUILD selinux-xserver-2.20200818-r2.ebuild 281 BLAKE2B 1fcf4f906db0c884e057fbea642095f34392725c2fe611c47860b9192ae50959267f706957a4344b05cc8a9859e7d4a752970edbed0ed3a7554239ff4da6a819 SHA512 9c2624bee5c97b1ae49a51577030647a48b3334102d62fe3b201aa4848de4cd057ec69e851917877d8263c0dd57518b83f277deedcb8384ad1f4f1b71344cec9
 EBUILD selinux-xserver-9999.ebuild 283 BLAKE2B d90646458e2c993343da4ff76f54a64e64e8e7209bfa274a10ceffcea5e2a412ecd1d9828163b426bab935e3a102183fea862571e835729ce0f4612988d3da63 SHA512 9ff754e4b5d74de7c24876d91a079df2edd7f97f7c1f48fa3e94f4d128d1714645554839696db4f213131343b774142b8a6c90c1f9ab8aee9760afba267c4448
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20200818-r2.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20200818-r2.ebuild
index e8a1d11290e7..5a355b2c4060 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for xserver"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sec-policy/selinux-zabbix/Manifest b/sec-policy/selinux-zabbix/Manifest
index 7d9667ce9249..a234f792db45 100644
--- a/sec-policy/selinux-zabbix/Manifest
+++ b/sec-policy/selinux-zabbix/Manifest
@@ -8,6 +8,6 @@ DIST refpolicy-2.20200818.tar.bz2 570896 BLAKE2B 502c00fec39e1b81e42de3f7f942623
 EBUILD selinux-zabbix-2.20190201-r1.ebuild 279 BLAKE2B 9b7bd2f98af01553301ebc6e03534644be7f5941496ae97fa42e083480113fc808f10d347ee8f8aa16b2ebbcbd00956694d702866977ee19caaead0b11e74bec SHA512 0fde234a371633521694b64cb91f3cab8f4eb16bddf8dd45c1181780eaa21ea04bd8589357c6fd404715a1603579ca4cd1139d72581e57cd09fc7f35e4e65b26
 EBUILD selinux-zabbix-2.20190609-r1.ebuild 279 BLAKE2B 9b7bd2f98af01553301ebc6e03534644be7f5941496ae97fa42e083480113fc808f10d347ee8f8aa16b2ebbcbd00956694d702866977ee19caaead0b11e74bec SHA512 0fde234a371633521694b64cb91f3cab8f4eb16bddf8dd45c1181780eaa21ea04bd8589357c6fd404715a1603579ca4cd1139d72581e57cd09fc7f35e4e65b26
 EBUILD selinux-zabbix-2.20200818-r1.ebuild 281 BLAKE2B 9f15a08fcbfca1721435adf35b60557268aab9d4ba373a57315d778280f02b1d43fc520d8b951da3715a126480369b170c66d7384794b2a4c34d5293da421782 SHA512 0e6c6285603b7962aed402d4b9ca04f8f2321cf906a05148f6eb975f5f13ce6570312e882ac36b06795949ddd217d65485c3344838f6d970992d7a33fe13e190
-EBUILD selinux-zabbix-2.20200818-r2.ebuild 281 BLAKE2B cfe7c2b0d92755068bba1d4f34844eddedbcbbfd098910dadc0b66040a3ce4ad18b3b8822f7f6afee2d4a6e6ce39d421e4efad94448611aa542bf90140b73158 SHA512 726a0debb9b22c1b22c5ac9c3dd6ba4e2079124bbb4ae1b0ad144dc98c326428585a6c676d1874c3cd2d7d1576007c58e437e8314b2deb7332abf5b51051894b
+EBUILD selinux-zabbix-2.20200818-r2.ebuild 279 BLAKE2B 733bb1edf6d7b08dc8a6210e66f0ece2b7b305e29c8d49cb8a560da4b2d0d0ba392dab879d6668373e960c3510073c87441a8b3b017ae57a7dda7e4ee128370d SHA512 67b33739b2026aa0d0abb48dabf7324d9a6130c1129a37ce7e6263562d470f18fb0dd06e93b546b1fadf540575014a6ad973a55d093355fafa9a19f593171243
 EBUILD selinux-zabbix-9999.ebuild 281 BLAKE2B cfe7c2b0d92755068bba1d4f34844eddedbcbbfd098910dadc0b66040a3ce4ad18b3b8822f7f6afee2d4a6e6ce39d421e4efad94448611aa542bf90140b73158 SHA512 726a0debb9b22c1b22c5ac9c3dd6ba4e2079124bbb4ae1b0ad144dc98c326428585a6c676d1874c3cd2d7d1576007c58e437e8314b2deb7332abf5b51051894b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20200818-r2.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20200818-r2.ebuild
index 166beccd9bdb..6338b2390fca 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20200818-r2.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20200818-r2.ebuild
@@ -11,5 +11,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for zabbix"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e5355b5b2e49..a1fcd8fe39fd 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index 450152409eb7..abfb99a58907 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -7,5 +7,5 @@ DIST ack-v3.4.0.tar.gz 251106 BLAKE2B 192d1e851ef5bd3547e21fe49cf276180eb278af78
 EBUILD ack-3.0.0.ebuild 810 BLAKE2B 2617de5e26ff8f9ecf601ee5a4f5c2104ec9acfc2e42fcc1fe56742dbe64c729bfbd58f780374bdd1bc6563bac29e05284e99e73ec5f5310cef0fa10cef239b6 SHA512 574ee3043cc235a1914d2002ac9a3184890f2ae6f23037823a699bca22b04b44d15c2617d4bd910e4e00123106d2c5a47d36e8289d75b1583e758f4b6cefd51e
 EBUILD ack-3.2.0.ebuild 812 BLAKE2B 916da318cdcc7aeb9b98f65f156365f103e59248c1087615c293da0a73d4fc1ad3f535e2f6f5a422406a26a522cebcb12f97d9e05c3d80aecf64e2e445020898 SHA512 b4272f60a2ffd169b490b07f2ac28db6c069ed5543451202d1b49b34f2deea2dc05098a0a304bc4a8b5cfde86419f2ab486a8a9b5dd88951d8994d2c4946a2eb
 EBUILD ack-3.3.1.ebuild 812 BLAKE2B aef52558bf7791b754afdfdce9fb497c26b44a3aeebe8a1b2bc587bcbce6d5477340194c33d551f7aedb4b2f5fe9fd71fce8aa6e382fffa686dffc0ea2a7fc87 SHA512 93c5e79e1800400bd40405993f5a8e05e43a446c308b26f3e6c9f670df36c354e2cf6f0396b5ad9fe636a1f6031d8a5e4a655b8b32e2e5abc1af4158983972f2
-EBUILD ack-3.4.0.ebuild 812 BLAKE2B aef52558bf7791b754afdfdce9fb497c26b44a3aeebe8a1b2bc587bcbce6d5477340194c33d551f7aedb4b2f5fe9fd71fce8aa6e382fffa686dffc0ea2a7fc87 SHA512 93c5e79e1800400bd40405993f5a8e05e43a446c308b26f3e6c9f670df36c354e2cf6f0396b5ad9fe636a1f6031d8a5e4a655b8b32e2e5abc1af4158983972f2
+EBUILD ack-3.4.0.ebuild 819 BLAKE2B e4c91dbfdf8f0ffe12337a1c3cab49b05251a6600c8e5ce377a42e0453f361ca810b3d33e5391e3aa403898e99388489be87fd7628eb35957c80b9e7e811b0c6 SHA512 f675194f2b7c765b98aebc1317ac97c31e42126fa418415f46eae2af416eeee41af04d68c9a48226c3077a82f187fc07892ce13941c82007ee40a9def930a805
 MISC metadata.xml 1749 BLAKE2B c8803cd3161065885162a0a3c21a426e36914ff7796b3f99eb57f1e1db40be7cb789df331dde048e112f6ab691a30607100a521091ece034d2edabffc22751ee SHA512 91bee1d028fac56e397138f7db10742721a509c3ba1f7de21aebe5d9c334b2bc56736cbedf47df90f3dec5bc6193feacccceb45ad247e54fefdae5a06df65dac
diff --git a/sys-apps/ack/ack-3.4.0.ebuild b/sys-apps/ack/ack-3.4.0.ebuild
index 0df2c490211b..b076054a04a2 100644
--- a/sys-apps/ack/ack-3.4.0.ebuild
+++ b/sys-apps/ack/ack-3.4.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://beyondgrep.com"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 7afbba7ab144..d6adc34f11a9 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -3,6 +3,6 @@ DIST checkpolicy-3.0.tar.gz 69037 BLAKE2B 30b8a5e19e02472d1cf256636c70f957390985
 DIST checkpolicy-3.1.tar.gz 69072 BLAKE2B 31cb5ef52533b0a62f954e770278fc5766a961d87fb86260b04abe562bcd90d0025b33931c6ad54096c64ab54150c7562c112eac80eb2f60dbcdda57f4cacfe2 SHA512 2276a5a0919286049d2ceba386ef5f6de523745b588bb81cb4fed5eced5fd0b8070249b7a3ae5a85e2abb9369a86318f727d4073aad14ab75c43750a46069168
 EBUILD checkpolicy-2.9.ebuild 1167 BLAKE2B abc8401583d733530e3673cfa96c3059a8c3041578754fe745fb7850bbf92b852cac3458cbd0bbd550589e9830087d36c8e408d094be02a74d6ff396646deee9 SHA512 739189cf5e8d475e2eb3db2a3c323b32e03d4fff9b7684da149fe1d8470666d2359ca91470578ec0aec8b2f6d0c8e865c16016a0187b8eb2fbd0b8a62a2bce66
 EBUILD checkpolicy-3.0.ebuild 1167 BLAKE2B 033bc5b87495376881fa6d0cd2cd0152059478db0fbc262b13dc182955fc02e1a1c14e70b6cf9b756f458ca6631007d910805a744cbb98d739c0309f8a10f455 SHA512 d169a4348be5b8a48f87b244c40b2673857cb7695ef293cfdba084ef9f0db95110ae10857cd1e0cae48d338576fa05c30bdeec5762e7df5f12a4471e52f8b12b
-EBUILD checkpolicy-3.1.ebuild 1207 BLAKE2B 4ab6d0a6ed8f2080f89536b87676af9c8fcc4227047b7e35f96c163f76ade44fbd53b399ccde482c05181da82f64c419cb74416d3be57cdfce0dfe3968b71858 SHA512 e37923a568790a7155be174ee451616e78b8b2ce994ee6e96525fb6a7e4a2bdc5465f352f2be94f753c5b079088a5f689f347a3520321e73a6682e9592743a27
+EBUILD checkpolicy-3.1.ebuild 1205 BLAKE2B ae6dcf8e32b169d8f2b4389106d3131284f2af359056c42c03fafd1dc443df4bda0277b16af1fe59bf490ffb3ba604292e357eae90fa4bdcc2e1dfd9129c4020 SHA512 ee2d92c22559eea88f13b68f97b026992c7d4f16d8487c126d3b62ef10fcfb6917652bbdd03558306c4b978a4179c8981c090d7af4140ad0c441b6a9dcd10fc8
 EBUILD checkpolicy-9999.ebuild 1207 BLAKE2B 4ab6d0a6ed8f2080f89536b87676af9c8fcc4227047b7e35f96c163f76ade44fbd53b399ccde482c05181da82f64c419cb74416d3be57cdfce0dfe3968b71858 SHA512 e37923a568790a7155be174ee451616e78b8b2ce994ee6e96525fb6a7e4a2bdc5465f352f2be94f753c5b079088a5f689f347a3520321e73a6682e9592743a27
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sys-apps/checkpolicy/checkpolicy-3.1.ebuild b/sys-apps/checkpolicy/checkpolicy-3.1.ebuild
index fe88e2f1c073..070a1f1418cc 100644
--- a/sys-apps/checkpolicy/checkpolicy-3.1.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-3.1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 0954bdc6cc28..f3522c41b71b 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -5,5 +5,5 @@ AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e973
 DIST dbus-1.12.18.tar.gz 2094453 BLAKE2B eba48940c80a7483b858199156b297d97896232283988940d3cdb915eaa30bcdd13bc01f8410dcdb34193040a8bc8ce2dd45f1310aed791071e5dc5a6b38eb27 SHA512 817674e86a5d4cbfa705a79ca5197176311e47505c5da02334c2811f63b55014b582a12bce53bc73a08a3ad5061f210ba0d1e5f3bbf7697c81ca70c22a76fc13
 DIST dbus-1.12.20.tar.gz 2095511 BLAKE2B b467526e7e0281db7b8c7c178469fe006dab29ccb1ea197c02495bd297e8de766230b68ed86c4a7e05dbe09ca30ce941a15e0bf8030fe0df66c04febf0534b3b SHA512 0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056
 EBUILD dbus-1.12.18.ebuild 7240 BLAKE2B a011b8160b8f1b726494d7abce057e76dbcb4372f7e4ff32796a262af5054f7b8144bbb2edb6adb299e0127e6ec87dfb096384d7a5105f43533ed2c05405e923 SHA512 9f8a2e40db604792b55729d2f571281c5090bd65cf364381fae096fa19f88d0b444eb12cbc213aa0430d6c273d9e5b8de5aea14d0c78bad7b7cd4dde1c3253e7
-EBUILD dbus-1.12.20.ebuild 7240 BLAKE2B a011b8160b8f1b726494d7abce057e76dbcb4372f7e4ff32796a262af5054f7b8144bbb2edb6adb299e0127e6ec87dfb096384d7a5105f43533ed2c05405e923 SHA512 9f8a2e40db604792b55729d2f571281c5090bd65cf364381fae096fa19f88d0b444eb12cbc213aa0430d6c273d9e5b8de5aea14d0c78bad7b7cd4dde1c3253e7
+EBUILD dbus-1.12.20.ebuild 7244 BLAKE2B 9309576f2db0c83aec2ade10570f4c329f91456a228b8b9872dd11ebed2b0b411ef21f97bfc1f3ac95477df57065e5e91adb6f72260e26ecebc78cb12e92ba8e SHA512 bc30ee39a3036fb7f82d438f8f4087420b30c550b9cd1b54d955444576e264bdeb7c80cad709868f013ffb051dab18284731e2d2ca060cacee5d115ce5830629
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.20.ebuild b/sys-apps/dbus/dbus-1.12.20.ebuild
index dae892d4e87c..97618ac15178 100644
--- a/sys-apps/dbus/dbus-1.12.20.ebuild
+++ b/sys-apps/dbus/dbus-1.12.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd virtualx multilib-minimal
 
 DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index a4f6d2c1615f..53d7b8e1c5fd 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,5 +1,5 @@
 DIST firejail-0.9.64.tar.xz 419464 BLAKE2B 9425910bd78739dc628a05247877f3e96065f9eab6be1fa87a70932ff04a53817e03cd67a81b35b0e5a69b5598fc5be9d6191f9c5c2bf511bc76c1edaf0eb22d SHA512 89bab9aee944ebde6221a96f0f028380f607cd49046cad5348d5974efcc92c50a172edf5e50c56606091d2060d1d8f0c50a41f05f63327672a3c3cb48eb93699
-EBUILD firejail-0.9.64-r1.ebuild 2482 BLAKE2B 3703d9d5ce29d3731c78d676a16ec3f2783be1e9a279d5097b91cde0bddfa947534f6daeb0de1248c1fad260a3b2d490866b9a62ae9ff7959f79fb82ab2f367c SHA512 99fcad32da86fbf263813f41a756027577875fd5a5836ec8211c4232aa1047d2408493410c05513aa4bbd15997fb5490d2be4f3132b5985d17042ff216ba0d54
+EBUILD firejail-0.9.64-r1.ebuild 2489 BLAKE2B 0192407f9bff829e28a8f258b809820ceed898494131e55e2e4016e6975363831c11308ad7fc9fd3a2679902b41034b863e06fe3f66f14bf713b796e2d605033 SHA512 d00daf9eb58c2c0f83ac16dc895b0659575607144c685b95ffb06c3213f46edb34ef01a94bb7b165b2ce337352662dd085126df784e66a901841a8c79d358a92
 EBUILD firejail-0.9.64.ebuild 2280 BLAKE2B 2c8f17dab51ab876796b249dec5ac848cc22606d9d5ffa806a6fdf2f1a041a2b9c33b5e41fbce69315574a5304c077f45e0b33b2fe73186806f3198a8d200a9b SHA512 30c053e6779f15d97e9a7dbb2377429e0a4b3bcc25491f647d1b66076f50f76b7cc79cebc09da8fbaa8b5454867d00153c7eceb6eaa828666ef702d2dd7104f7
 EBUILD firejail-9999.ebuild 2283 BLAKE2B a7b65c61e0954035bcbadc74fdb2e81882114f2b163b4a3c45a73017224684fb4a8ae8bbf6cd2deb3d6676a6edfe2c7797178fe992a86f4372ed56bc51b06ecc SHA512 c97f99ede18629d656520e45c4767bd76c5e4432352002e000eb78675ea28f2d8733eebd8e61f0032597f574270acbf83c176d0b982bc8ad5451ff46bb1598e2
 MISC metadata.xml 1832 BLAKE2B aec785bbd3674d6ec089390d65c064b6ce1f56c9ae459f39808a393dd478b9225821dbaad8892f22f367d5c163f40b664b29afcd130aa6463a87fe6c46ef592f SHA512 c1f8ee756c4bd7e79cfa81b4c5ac92a3377ab58a5d8df6f5535d9906d3fcb55d9f34664f2206c950b3b8ba560e3ed7e4d18b7f5637463ac8cb1934a90b2b68d4
diff --git a/sys-apps/firejail/firejail-0.9.64-r1.ebuild b/sys-apps/firejail/firejail-0.9.64-r1.ebuild
index 32dabff199ad..0cb2f6813469 100644
--- a/sys-apps/firejail/firejail-0.9.64-r1.ebuild
+++ b/sys-apps/firejail/firejail-0.9.64-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6..9} )
 inherit toolchain-funcs python-single-r1 linux-info
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
 else
 	inherit git-r3
diff --git a/sys-apps/fwts/Manifest b/sys-apps/fwts/Manifest
index 58e05e009c91..53c1621087a4 100644
--- a/sys-apps/fwts/Manifest
+++ b/sys-apps/fwts/Manifest
@@ -1,3 +1,5 @@
 DIST fwts_20.05.00.orig.tar.gz 3817917 BLAKE2B 10365979a1b6bf2768930e144baa3982d462f05b77b1ca81116f7b44b80487924f37e097e46602c49696e987d9061a1917e3613e016bdb126146d880699c38f8 SHA512 4f68f6fc8351024e877e6fa6c9b856c7c3720348c1936f33fc8b455f5e85df83c9dc39a5c2dc16e106c851d4ac622f0a1d23b70f2b7726689f92077dbca5d82f
+DIST fwts_20.11.00.orig.tar.gz 3845548 BLAKE2B 3d08bf3dd339543fc67984f5da081a4ac4a0e1b413431bb0836ec2a99130f76cd717ff61128b09e9e7c24cb275b52cd2503c34daa273c8328cee7eb2453706ea SHA512 650fa21ceb4528a6d7fa40ae44c3258e01208186328fce8ca889df2809f82abf9b966c76c99791b3f40b17e5c2efda5b15dd2def4aaf494004778337f5074b55
 EBUILD fwts-20.05.00.ebuild 1127 BLAKE2B c966a749987a9f5a23d7bb2ae3b7f506a5ace2bdab79851615d601cafd0aae20d2a845d89b064944a0c12076d6cce058604195ad266918dde1e8295eed241ede SHA512 4ce7fd15f1bd44644998be1b7d0913a6a8176bf3d76738077e1d793294b8d865aea579e386deba766b3d8080d5f2b08bf58722c6b0e950e8b990c62abf7951fb
+EBUILD fwts-20.11.00.ebuild 1160 BLAKE2B 3babb19a62e51f008dffbeec21350e6549a3857bc370e26252dcf6b9fe835723f17fd0e8cddd46b33c5ac37cfce584cc03aef2d7ab32615496a861e1d8f9152c SHA512 fb2e7c94ca9b19f36e329b7ffb9b6a4955b7eb8581cffec849e10797851e598ababfaf4dc05b3adb8ae01413cc97b66cdcc42b175a960c7595e5c4c1ad5851ba
 MISC metadata.xml 241 BLAKE2B f00f58ea265e1a7321a74a2e8a86824f7a1930a6e99162af446a1c1f831139711d626045b21215856a29e6ba4575bc38c7ab965ffb547757dbf4305235245039 SHA512 9a4d0499ef0c9cb67816755a3313bbba0b42f01b35d5d7da31dfe3e14a94fead3b8c202b95ffd4a9c5edbda7b046045b19095924b57a08cd97aacbda5bbd4550
diff --git a/sys-apps/fwts/fwts-20.11.00.ebuild b/sys-apps/fwts/fwts-20.11.00.ebuild
new file mode 100644
index 000000000000..0d5da91d7a1c
--- /dev/null
+++ b/sys-apps/fwts/fwts-20.11.00.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Firmware Test Suite"
+HOMEPAGE="https://wiki.ubuntu.com/Kernel/Reference/fwts"
+SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	>=dev-libs/json-c-0.10-r1
+	dev-libs/libbsd
+	dev-libs/libpcre
+	sys-apps/dmidecode
+	sys-apps/dtc
+	sys-apps/pciutils
+	sys-power/iasl
+	sys-power/pmtools
+	"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S=${WORKDIR}
+
+src_prepare() {
+	default
+	sed -i -e 's/-Wall -Werror/-Wall/' configure.ac {,src/,src/lib/src/}Makefile.am || die
+	sed -i -e 's:/usr/bin/lspci:'$(type -p lspci)':' src/lib/include/fwts_binpaths.h || die
+
+	# Fix json-c includes
+	sed -e 's/^#include <json\//#include <json-c\//g' -i \
+		configure.ac || die
+	sed -e 's/^#include <json.h>/#include <json-c\/json.h>/' \
+		-i src/lib/include/fwts_json.h \
+		src/utilities/kernelscan.c || die
+	sed -e 's/-ljson/-ljson-c/'\
+		-i src/Makefile.am\
+		src/lib/src/Makefile.am\
+		src/utilities/Makefile.am || die
+
+	eautoreconf
+}
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 4bc5042858ee..b5a902fcceea 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -10,5 +10,5 @@ EBUILD fwupd-1.3.10.ebuild 4148 BLAKE2B d05855a501dd88e13c9845b1755e940cf231a0f7
 EBUILD fwupd-1.3.11.ebuild 4150 BLAKE2B 8fd9c91985f344d898cdd16a95807c5d67d83125ca7fc2035d23ed7e1559803ca5dfa84b5f678c84e7b7c480e93e860ce3f2fa9b84d19dcb0400b80455dec0d9 SHA512 a830693d00099e0ee12aa2d9e6b0be6239958c32684c517c0ca8d118ec9faccd88c6264b86f0d704c5d0e1f9595b34b75973169ab15c4abed62242ec4481b5df
 EBUILD fwupd-1.4.6.ebuild 4058 BLAKE2B b5741ff3e24a276de100341b9a0bb37bcc71ac958ac19c2437b3c5471212247c75d71aad74c136ad4f103daf8397be495cc01ee858d3ea25886675e3ec637a37 SHA512 c25d3f5b6f8c74937761ba587959bc39a053ad74059750ee63d13ccc098f92c8fe91b1b8cb37d0ee86220f65f05235fd403de8a3cc670035e89a97ddceb90ff1
 EBUILD fwupd-1.5.1-r1.ebuild 3970 BLAKE2B 8e4a68c32d0adf5f38f183999d3810a4426c7711b414e8f1d531beac605fc0a3a6165a6275ebb34bfe80fd6455e619bbb35a8456c07ae2037d0967efdade1fc3 SHA512 a8dfb85985376080361b405ac579f623f4dc62ac4e112b035cec445b8c8927c80a198e8d3ba3b50e77498973e2c1cf2608bf8994430ffbbd062d48d9fc5ea7b1
-EBUILD fwupd-1.5.2.ebuild 3970 BLAKE2B 8e4a68c32d0adf5f38f183999d3810a4426c7711b414e8f1d531beac605fc0a3a6165a6275ebb34bfe80fd6455e619bbb35a8456c07ae2037d0967efdade1fc3 SHA512 a8dfb85985376080361b405ac579f623f4dc62ac4e112b035cec445b8c8927c80a198e8d3ba3b50e77498973e2c1cf2608bf8994430ffbbd062d48d9fc5ea7b1
+EBUILD fwupd-1.5.2-r1.ebuild 4003 BLAKE2B 8bb0bb266dfdfb1f8ffa287a74516b02a03e62d1b8126ad54fb149eb1e8094ef187e00ba0f88401dc88fb8b22c3079481bcd036b77c50631bf2807b9e768ecec SHA512 411f505b510b5db1412fb53b96dab4d8bbeb0c58a66bc1910d288a7dda67288bd05945ad86f6a28975ee1739a0e2c204706eeb152776fb2bc4f567bd71276474
 MISC metadata.xml 1181 BLAKE2B 467c8aa0e5816a75af46609baafd0472db7d28918e91032fb56cbf97eeaef3b196698d965f3e407d843d5f2fc90efbbdfcd4bf4263cab0919c09ec0e6e48b2a9 SHA512 77fbab8ce23a4e2e3568c4b08a7299d8aeea6a3333b12be6073bfc7a17020cd4122f04f8d592b891daf06176bbdcca345c0bae322a8d6db1da096f72ec2a93e6
diff --git a/sys-apps/fwupd/fwupd-1.5.2.ebuild b/sys-apps/fwupd/fwupd-1.5.2-r1.ebuild
similarity index 99%
rename from sys-apps/fwupd/fwupd-1.5.2.ebuild
rename to sys-apps/fwupd/fwupd-1.5.2-r1.ebuild
index 9ab001c44f90..4f976f3aff6b 100644
--- a/sys-apps/fwupd/fwupd-1.5.2.ebuild
+++ b/sys-apps/fwupd/fwupd-1.5.2-r1.ebuild
@@ -52,6 +52,7 @@ CDEPEND="${PYTHON_DEPS}
 		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
 	')
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
+	net-misc/curl
 	virtual/libelf:0=
 	virtual/udev
 	dell? (
@@ -69,6 +70,7 @@ CDEPEND="${PYTHON_DEPS}
 		media-libs/freetype
 		sys-boot/gnu-efi
 		sys-boot/efibootmgr
+		sys-libs/efivar
 		x11-libs/cairo
 	)
 "
diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index 434831b493d3..244ede6423fc 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -4,6 +4,6 @@ DIST mcstrans-3.0.tar.gz 44570 BLAKE2B 82358f6564e42ebfa50647892b35e4788ff9b8636
 DIST mcstrans-3.1.tar.gz 44598 BLAKE2B 1755c2f56e3d40fa2ea95c349988fe5dd7b52a9f26bef0f42e42bda8f7b94993b9a47d2e333337f746cbabd9dd571118b0a8e1ffb7c22c604db58fc809bcc033 SHA512 21e9b7a8c9d98cbee61f2eb1c440a51d19ac111a5955c24d365a8784e1aa34fb47a22a108e550c8a4cde4f25ec5afc466126a68e9faedfc796bef83eada93b60
 EBUILD mcstrans-2.9.ebuild 1112 BLAKE2B 28e4b4e11895e7ddc472808e950074ecf831e96fccfb72528b6d946498b96163a0472409cbe1bb6232a84890f95595fede1866a7bf87b5357dc664b1c887f99e SHA512 50d08031a4443b91d3819ab7e49e1e8fbc2dd28bf5fa612d65e080572e732c1832ae2ff173f46b6183d7758b2ae5efe8eebd883c6a8d128170e9ebbfce5f41b0
 EBUILD mcstrans-3.0.ebuild 1112 BLAKE2B 098b5e20768fd54d2a3baaa4dedc56a58cfc36b764c0c8825206c8d10f4b885044d8c4d45abf9339218eaa8fde566a73d03c3f54c245d10aaa667ca25abc740a SHA512 b1a3d390c8f5ef1be73040ad7c4c18f38739d46d1cafd721bb56de422bbca404c686b4172300ee5ac72224c58b0e8c338a0a05b6c7be71fbffcf5ae43f50c774
-EBUILD mcstrans-3.1.ebuild 1078 BLAKE2B 1862d557c4f0cf0269328357aa068ebfae379e920e31eeffbd1341191ba0bb08e780da0367f9123d82b6260b7c92a8541b03e02a7e8962ebdf788f56573b7ed7 SHA512 575049fa3e79bb24ca551182a110832463025a56a29f69b1239fbe02e20eb36a0a467d24ccce9daa2465273391c8d5eb68b538bb9cfd3a28e6966ae8a8d59654
+EBUILD mcstrans-3.1.ebuild 1076 BLAKE2B 95420d079ff83b4a3e4aa7655932d1ded963f53e01e4cefad6b49613f882458c3ac9ec4a9f0771f314e32d341cad58e5684aa56b669e191b0a353c217c2a3a2c SHA512 4c41ad6cb454f39743f3d822298743abb5cba0846a030e2666e7beae9fb245ec8acc60b32762c1ce66131f188cb0dfbe69f1fc933dabcc62d8ae9d2dc5884e78
 EBUILD mcstrans-9999.ebuild 1078 BLAKE2B 1862d557c4f0cf0269328357aa068ebfae379e920e31eeffbd1341191ba0bb08e780da0367f9123d82b6260b7c92a8541b03e02a7e8962ebdf788f56573b7ed7 SHA512 575049fa3e79bb24ca551182a110832463025a56a29f69b1239fbe02e20eb36a0a467d24ccce9daa2465273391c8d5eb68b538bb9cfd3a28e6966ae8a8d59654
 MISC metadata.xml 334 BLAKE2B a76cd05e8b752345f7624b375455c1f25ca0417c60a16cc0f2a37d2a876ce237faa80b4c997d34de967e61f05c299a4b1fbe848799d93a5f16dcfebcfed5ebdf SHA512 3bee1c898adaf223c205ba41afe4adfc620ccdff69ea77abfd02b3e33d21a307b889945f2d674b1c88fb4f853c6ace7cca67143f7339315abc3d167f752a1cd5
diff --git a/sys-apps/mcstrans/mcstrans-3.1.ebuild b/sys-apps/mcstrans/mcstrans-3.1.ebuild
index c848c15f507c..5510582a2b53 100644
--- a/sys-apps/mcstrans/mcstrans-3.1.ebuild
+++ b/sys-apps/mcstrans/mcstrans-3.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 636250fa3b71..fb40a42b9332 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -3,7 +3,7 @@ AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.41.2.tar.gz 245302 BLAKE2B ab80dc4f3a7c2c464fe64cdfa7fd31363d5a9d25e90d0239325be05561e5802f22c47013fde82650f5ce08cf99f16f5f479d8617c254647b8c40cec9609d0b6b SHA512 ebfa691cae4704bb3023ea0508a712a45b8c20809828729dfa5292e96f3fd1b309813d80d7c286d0c09680bf5378aba40cfd994f27951f43a3ffb1fd0d69a58b
 DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
-EBUILD openrc-0.41.2.ebuild 5250 BLAKE2B 99e9d190d921a13d249e0da95ba800b5d813b1d3caa4bdfc95d86df3141ad41adfffde2cddb3b66d3969699bc0b48a979def988317419781ff13fc1bae0de457 SHA512 70080e095841aa340d56b4ae916c8fd3c1c6eaffa58820e2a96867a12c17800f04fb0f7afd00d7faf53ea2aff562294b6b394d2af3f7559f2917449891fa8a04
-EBUILD openrc-0.42.1.ebuild 5403 BLAKE2B fda5f7dcaa69e13b63f6017fa32c24f33839486357dd758d896968f95a93d3470cb078c4a7b36eb3a6db760c6fbe513db5e40940076fc7c84e577c16ac68aa76 SHA512 32eb7bc513dadb6295ca6ca973213e0d1c57f50e1628637748564f71bcd1f139366b86ea4fd55a37a12885a18480d21f2b1ca03bdbeb376a935836e2f55d1226
-EBUILD openrc-9999.ebuild 5024 BLAKE2B e436f5a2d30359e32cd92b237d7ffb2ea821d26830ce6fe137f3c71f90ea245d9e300a9227984c7d93e2acb0f81a6674cc19960768fbb1a65dbdaadbe0300e43 SHA512 36442c0b1a737903ebb6251587d4ad200b4424e52031df41037eaf52b7e121a9ab216d0d202301cd74a2dc1fe9379432a82ab9e407403e60f4e781698b926604
+EBUILD openrc-0.41.2.ebuild 5251 BLAKE2B caddba8654402dff27269c1460233758824effa7185f323d6b65da9811432246093c16b72b00bfc37e923ba7ef6b92ba96ba99d6446a6ad54305db239617dd77 SHA512 a3688714d603639ef95748a1b5688a7cd2158387260ddd63f0e92c945b0ae75df844a03bb3a2cebc05b5ccf0615ecd6da7082cc9945721dbaadb52c95c417780
+EBUILD openrc-0.42.1.ebuild 5404 BLAKE2B c8e1bb298988e4249d3b3bc8143b3dc0cc08514278ca50663f2d87d1c0f4501921545413736b91978495e09f5456ccae6253780f15fdfc0398cefb0313e960b1 SHA512 6e7c07b0575c098339c71234d061d605b50cf5255407addc4c0414b8b80229b0f1ee909a3f396a32e8a6cf3070e263e9a50f2755c3fcbf35ab4926f6c37725a2
+EBUILD openrc-9999.ebuild 5025 BLAKE2B 9f19179f99c2ce4885917e4d5bffc82caa10deda853ee84160ec7617a91062fe169220b4a8e3cf51a7a5e6ba3cbb118804c36dd1ad17312e0d241ba0f2b7d386 SHA512 5517b720f81200a6d086e05a016d5192e982960980a3f2c03923a41d132ea3771de380c35f9a167bc6c4824b14847bfc21208e415c25cee41b537bb2533ab94d
 MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1
diff --git a/sys-apps/openrc/openrc-0.41.2.ebuild b/sys-apps/openrc/openrc-0.41.2.ebuild
index 63a8bbbd49d5..afd7df37c6b7 100644
--- a/sys-apps/openrc/openrc-0.41.2.ebuild
+++ b/sys-apps/openrc/openrc-0.41.2.ebuild
@@ -176,7 +176,7 @@ pkg_postinst() {
 		ewarn "You have emerged OpenRc without network support. This"
 		ewarn "means you need to SET UP a network manager such as"
 		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
-		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
 		ewarn "Or, you have the option of emerging openrc with the newnet"
 		ewarn "use flag and configuring /etc/conf.d/network and"
 		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
diff --git a/sys-apps/openrc/openrc-0.42.1.ebuild b/sys-apps/openrc/openrc-0.42.1.ebuild
index 663c940fad47..a10ce3384c69 100644
--- a/sys-apps/openrc/openrc-0.42.1.ebuild
+++ b/sys-apps/openrc/openrc-0.42.1.ebuild
@@ -180,7 +180,7 @@ pkg_postinst() {
 		ewarn "You have emerged OpenRc without network support. This"
 		ewarn "means you need to SET UP a network manager such as"
 		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
-		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
 		ewarn "Or, you have the option of emerging openrc with the newnet"
 		ewarn "use flag and configuring /etc/conf.d/network and"
 		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index d07f1b872887..c159c6cdce2d 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -170,7 +170,7 @@ pkg_postinst() {
 		ewarn "You have emerged OpenRc without network support. This"
 		ewarn "means you need to SET UP a network manager such as"
 		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
-		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
 		ewarn "Or, you have the option of emerging openrc with the newnet"
 		ewarn "use flag and configuring /etc/conf.d/network and"
 		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 53d72d7a1b64..c60b62966bf9 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -7,6 +7,6 @@ DIST policycoreutils-extra-1.36.tar.bz2 8830 BLAKE2B 6d98e41ea379d3e95221a6e53d8
 DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f
 EBUILD policycoreutils-2.9.ebuild 4875 BLAKE2B 2b97a2f7563e4e3474898b77ea0bac1c301ce1f6cddb3841e863e9f9fca6ed566221b012c53099e7b035c0d705a8f1fe67cbee88201c30aff7bc6f126aaa6899 SHA512 d967b6d20255f0983cbebead02302e14b4a7f8dfab70a079d82d38a3d8255b673ba56583a211d3cc60c2674d8d6a9c275d34a9572b1f6595e14fd0de19ad75a5
 EBUILD policycoreutils-3.0.ebuild 4753 BLAKE2B 3238ceb29eec9166041462b3dd6ea8d91c54d130733033fa5d4a7f1e53a903645f25399d359e31ef1b4e713e5fa68b5ddf07f83cf57a4de7a32d122958891d7d SHA512 60a11fe6afae58bcaecc640671bd3adc55bcb100b463c0931e91d387236320692b8b878a685e413f9728308f5de903aec44a6548db6283740854461e5d700a67
-EBUILD policycoreutils-3.1.ebuild 4855 BLAKE2B 55a1687ae733cda69f5c3589fef3abf3fa00cf80102036cbc976fcf06635ed9caf83232ffa53a89014b1e95fcac946c1a4bc32bcb1e8a99f1df38284a91e553c SHA512 69c740d15913531bf59c3785c09e34878d19de5990892967711f02ae90c07b079ce0b0cdd7ed18a3155ecc798a5f7b7a07eb72c82851bb61c454ccc0f244185e
+EBUILD policycoreutils-3.1-r1.ebuild 4857 BLAKE2B bd3811ab4897547498d1677b5c0071ed6a9f1f2cdae234e4ef697151bad616ff828319d067621601f310ede0f787bcccb831c7220888bfa32fba13bd7221f00d SHA512 1584f7f965ad31095697843ee3a289681cb8175c3c74a582ace11a61431d8972b44677587c5974c1b3caa951dbd952420cb121e9ac45f6ce4807c49b4929cf45
 EBUILD policycoreutils-9999.ebuild 4855 BLAKE2B 55a1687ae733cda69f5c3589fef3abf3fa00cf80102036cbc976fcf06635ed9caf83232ffa53a89014b1e95fcac946c1a4bc32bcb1e8a99f1df38284a91e553c SHA512 69c740d15913531bf59c3785c09e34878d19de5990892967711f02ae90c07b079ce0b0cdd7ed18a3155ecc798a5f7b7a07eb72c82851bb61c454ccc0f244185e
 MISC metadata.xml 1117 BLAKE2B 0ec558cea900ec5f25cef43a76a5c0436562ca9d43cfa23d9251ac4e8eb22f0154ca577f061f50762559be9b567faf5dd7ed994c59308ba140f2fe2b8a5d1ad0 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5
diff --git a/sys-apps/policycoreutils/policycoreutils-3.1.ebuild b/sys-apps/policycoreutils/policycoreutils-3.1-r1.ebuild
similarity index 98%
rename from sys-apps/policycoreutils/policycoreutils-3.1.ebuild
rename to sys-apps/policycoreutils/policycoreutils-3.1-r1.ebuild
index 742b9fca0890..9ce99c44a21c 100644
--- a/sys-apps/policycoreutils/policycoreutils-3.1.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 PYTHON_REQ_USE="xml"
 
 inherit multilib python-r1 toolchain-funcs bash-completion-r1
@@ -31,7 +31,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz
 		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm64 ~mips x86"
 	S1="${WORKDIR}/${MY_P}"
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d1f0c36662d9..d8a7f51a5c97 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,13 +3,14 @@ AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906
 DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88
 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
 DIST portage-3.0.10.tar.bz2 1048234 BLAKE2B 9011c7a3a7ea6c5c78190c5344370d26700e4bf95e56fdf7036c3c4e1ef2e8bf691f5ee21142aaa4e15d5798404e5abadfdb2b5fea288451666840f0adb0ef77 SHA512 d5823fa263876350f5128e03c92350a90f665a5539e0eeea1cfb9320a1c83cfdffe91315bfa54dbc1ba6ffb42fdcbda3b0b728f79aaf3ef254ebb7fd09563188
+DIST portage-3.0.11-bug-754903-pdepend.patch 5379 BLAKE2B 34d2bca2af7d0a7286fa8ca7e3486341112c0a2d52f79d76a89cf5b68d85be4bc66434b8c3916987824ffdb799ed97db4a50f7b10744d55e229c6ca923e8d3ba SHA512 ecb01de1dfd1a331231a6d7a4e77bce36f7f663354cacd1640eefacdd14873b64ebf30c30105df87b4857fc7d1b8612d61f5f44d6d617bc109fad7583d3940b2
 DIST portage-3.0.11.tar.bz2 1048734 BLAKE2B d52e6d90750da0a2474e7b0071955111382aaf14d0c464bd66e673fc953ee90c2a426bd2e05b3642339483184a390ba416b2024849779d0fd95172d383ad4851 SHA512 048f7df9f2748565b8cc258667d1ea8fe0cd5e2dbea58d70ce9670885ba00949c16f9c5e7d2c3b2f795fd8f1d977792a9cb083613376128d33bdf9c1e1e4a8e9
 DIST portage-3.0.4.tar.bz2 1042654 BLAKE2B 6f869b2eb24f9e590bf8e01172050105a1bd9ea88657db5893133b4620231a0ddcda871d6fcc10623f7f2ef809116310c76355263819be6c3734b0ca184d5fc0 SHA512 7a0c39cd4ed65aebd84ff8bbadba29760b3aa392a0d606c5b29a1112fd0845c42f74eebb0728a069b2b097a6eb7eec2d18af615fd9edcc38f1018ae6ff686812
 DIST portage-3.0.8.tar.bz2 1046968 BLAKE2B 662147c37a9e7b81030fadb4d6438b734ee57a9eb9bfcee80991d137a017aa3541565961282ebf8736db71aeb05532ffa139ff3a34a84bc9064cf74427acb666 SHA512 5f97870a11ecca30ffe8f463f87cd16a1edb52b44832c6eaba15cadcfde2b4f7edf963749e45c8043b45b38e53ee210dc913aa2d2432a2bd3928cc27c8765a85
 DIST portage-3.0.9.tar.bz2 1047839 BLAKE2B 44cf96ac69c1b6d2f95aea8b6e87af5665bfa797ef97d3ae09d4faeefa5b36671f542a5bb8b141b0d914afef96d536a63da4539d27336471621363008d2f73bd SHA512 01ad255a12381fb3b52a8d6c1b04cb377c52b8856973aa296a1086f2d89dd6458244486a0d477e95d4247c3edf7e8e3bb20523263979401443b212085737e618
 EBUILD portage-2.3.99-r2.ebuild 8482 BLAKE2B 9880361867a65a42c22b277e46fdf973d32b57679519dcce4728fe3297a6b55990a0cc319e161f3056f33c72979101e9b54168e01ef6a1a2bfdc6a92df042821 SHA512 c04cf3569d920a4e55da0eac94cbf93b5780d9b2eb3afa45c918fbae88c11a0f130aba4370b1897628a0f03fd24dcf573aad03164c4e9a786ec754f96cd0939d
 EBUILD portage-3.0.10-r1.ebuild 8627 BLAKE2B 305994b05147a9e3fd5c8fc8f4281c23f356371dd8bd016f7976e0411da6f55d7b37cd6bff0f3d2e6c05cf7ae3f6d6e58c1f1ee6d7256d4933992b713b3a3118 SHA512 92679a639c18d00b38f9dae80e07641e5c78801111ac1a9b8f0e99f226ecd4fa1453417a9da4c6468412ad783683edbf84c63fcef4cc63dfc3da6f3d2ad21b26
-EBUILD portage-3.0.11.ebuild 8386 BLAKE2B 31a02b0077c892cfa61726a716b5cca2349d731fe6e9480476512ad62e457c4b051ab1c0ec236f02728e6955f6f1c45d45c71b8302dd2e35b00cc662dbf2b9cb SHA512 b48ccbf8f975a22b7c61859ca239584c67cd0bc6bc718b2191ee66daabebb600e10f7e0bd5328b0fb3aba5077095fa823d824bb82f5b7dd944f6e319a005241d
+EBUILD portage-3.0.11-r1.ebuild 8585 BLAKE2B 5b916eb2ffa16ffd390f852909b3f27d4e29b0c037c937792a44b5a782bf612b139b3a20ff2a7c1a941da1a1098d0f0c96544b660db8cc827be70967751cc595 SHA512 1cc944d7516682be9a98fddf28c605469952c3f20e7a2986dc990a74faac28b32fd35b6e9148ce479776a3b99e6d0b4932a426668431346d7d07db37c627a4eb
 EBUILD portage-3.0.4-r1.ebuild 8527 BLAKE2B 631108e364ee22d284e334c5c641f4e807375ac75804a7c3099837d94a74f4c41cbbaf6ca365624516f858ee68c07b8551a3c1c9f1950f6352d0186db4bd28c6 SHA512 8ff2a857a31c283408b9d8a6f5d1a984c6299ccd1b7f8eaaff2e3b5f3b1dcc62f32bee8dbc1496a4a75e836f4772f91a295a23facb005d035c337032ed63d6a1
 EBUILD portage-3.0.8.ebuild 8379 BLAKE2B d2c21e67e7e182c79c0435033dcafdef239a28d4108a953a74839bd6cd8fc83076bdd324f35cc2d64028c13f6a9b4bbb6a725b3f797be035e1a0710f07a9e980 SHA512 b000f7461b73ea27b71e228df180f7cca078890d93a89f8c835986e49eba31d9faa1b6ade34db6aa9e35a4fb9cfed05eb104611e9952dbbd6f99cff41f75b850
 EBUILD portage-3.0.9.ebuild 8378 BLAKE2B 6d286cf9502773ffe070393836d1bb524e1e7ab5ae23106f1bebd4b1e407ff674387681bc9134e03439f8ef0b6d95fe5fff4855d4df07227eb60e19d522eba62 SHA512 0274d6dabbc5d1cc25bee61483a53d6e5088a432984a8961f3631f010aada1e55082d766f180eeb5acf251c3d5f834957e24120c62bd19e2ceee328ab40818f2
diff --git a/sys-apps/portage/portage-3.0.11.ebuild b/sys-apps/portage/portage-3.0.11-r1.ebuild
similarity index 97%
rename from sys-apps/portage/portage-3.0.11.ebuild
rename to sys-apps/portage/portage-3.0.11-r1.ebuild
index 28cd3d04cca0..a681356abc48 100644
--- a/sys-apps/portage/portage-3.0.11.ebuild
+++ b/sys-apps/portage/portage-3.0.11-r1.ebuild
@@ -82,7 +82,12 @@ prefix_src_archives() {
 
 TARBALL_PV=${PV}
 SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
+	https://github.com/gentoo/portage/commit/07a604537e746814613dc171a5c09072ef0266af.patch -> portage-3.0.11-bug-754903-pdepend.patch"
+
+PATCHES=(
+	"${DISTDIR}/portage-3.0.11-bug-754903-pdepend.patch"
+)
 
 pkg_pretend() {
 	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index 5e8dffdf74e6..92c00887f84e 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -4,6 +4,6 @@ DIST restorecond-3.0.tar.gz 18797 BLAKE2B 354477ea9f57cc27c14a2648b99b32c45ac6d4
 DIST restorecond-3.1.tar.gz 18939 BLAKE2B 3a3fcde057dad3ed05692d679ba27e0b24f191d92ed5114fa38cb5f846c4cc00d85bb09b5d4e560ed2b914444e0c2d1c407f6c03900610624d5626d05f2991bc SHA512 cdcf299f48b89a7c641ded9507b9b966bf648497394f8e988a9cb1ceb3224c86369706027f3416a4f9750836f7a8f4580a4b3df76673e03f897b383d7ed0e2c8
 EBUILD restorecond-2.9.ebuild 1145 BLAKE2B af99619a522615ebd01935b687f24c45d512510522bd725eb66b430c6b7d46086cc33634db109dc9f08f165f82e8bf059d34cdd4414ab9873298a52020d9730a SHA512 d6de5a092b1241d43e2b4663441e93568fa463444d41b032245e157c7994d072e318ac217a8e252549994bb72acdbdfb36453d51966707c18dd628fa5b7d4126
 EBUILD restorecond-3.0.ebuild 1145 BLAKE2B 2c533c3af22c23562873d976e5961ae897bce49080283002120454042ffa4cff29303cfc34b92e1b016f0ddca500f8901c668b10f8a6a9729b27e4d523c3444e SHA512 9a55df70a4e7482a456a298b56f9d4560b62863a09da9ecbd9f8cdcc3d967ac59d0ccc09b82cdf2af2e64d26dfbeac4162d4ed5d6cb6bee66819ec6ab863c532
-EBUILD restorecond-3.1.ebuild 1225 BLAKE2B 3b9cef9ce1ffada0499058dbc7999707bb49ba253b9fb7c50a4b88cc5fb03f5a8469539480eb2650aec0d8958e4020684bdfc1fc4bf3926ad525d73a8a0d3e82 SHA512 fea6248c0b7f99efafb7cb9b33f38d2566792277a04e41c1336f21a906e0c58092dad436508c8d266403545b4e38bb6db4a65be1fde26e67050e4dfebc1dfd04
+EBUILD restorecond-3.1.ebuild 1223 BLAKE2B ec5249e704e332e23cb35504417f7d16828e9b54885f0896d09306a2ffc91ab11fa3e93bef34c11d4f3cd33373d1f5caa1fade40da9002dc992dd6a1de2aedea SHA512 5eb40f7d4fd35de6508874babbac075b2e0c3afc15b963f5696135c866a5782b57fa6096e12f128814e501f7d29cd567db2d35eaa8a70e1d2a6d9da468fef99c
 EBUILD restorecond-9999.ebuild 1225 BLAKE2B 3b9cef9ce1ffada0499058dbc7999707bb49ba253b9fb7c50a4b88cc5fb03f5a8469539480eb2650aec0d8958e4020684bdfc1fc4bf3926ad525d73a8a0d3e82 SHA512 fea6248c0b7f99efafb7cb9b33f38d2566792277a04e41c1336f21a906e0c58092dad436508c8d266403545b4e38bb6db4a65be1fde26e67050e4dfebc1dfd04
 MISC metadata.xml 334 BLAKE2B a76cd05e8b752345f7624b375455c1f25ca0417c60a16cc0f2a37d2a876ce237faa80b4c997d34de967e61f05c299a4b1fbe848799d93a5f16dcfebcfed5ebdf SHA512 3bee1c898adaf223c205ba41afe4adfc620ccdff69ea77abfd02b3e33d21a307b889945f2d674b1c88fb4f853c6ace7cca67143f7339315abc3d167f752a1cd5
diff --git a/sys-apps/restorecond/restorecond-3.1.ebuild b/sys-apps/restorecond/restorecond-3.1.ebuild
index 001d8cd6d3f8..90da950241da 100644
--- a/sys-apps/restorecond/restorecond-3.1.ebuild
+++ b/sys-apps/restorecond/restorecond-3.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index 084ae7ae46bf..d4546a41383e 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -3,6 +3,6 @@ DIST secilc-3.0.tar.gz 176060 BLAKE2B dcceaa72f3e34777f0d4a6a05de073e4f2dc53b757
 DIST secilc-3.1.tar.gz 176631 BLAKE2B e79818580d2a788d672574ebd77349f0c59b678d2be628479f517412ca876fa225ba0dd63ef3200ed15ff693cd5f4cb4ff537d81666fef3a008ba4b3a7577e0c SHA512 79e3e4910178af49ea164d620aa997adb21dd18581c054a4023dd9116ec9dd203bd12989ef308aa1d253b47fcd251ee2b99c26e143d1db3de22a7f374ff38e0b
 EBUILD secilc-2.9.ebuild 902 BLAKE2B d21e16c113f24dcde2db43a79ea5c6618f55e5ee24e8bfba4006b44b092760ad9b3240d72b8847e1dbe2a3cad581a9a0d08540c9bac70528ac7cfad14f6b7578 SHA512 77304add0be53344872bbd68e91da6e1d5747b58d1b5af4ce47a42377f82e02bcc3df46477dbb169a1bd053a2f0a5548a30dc46bb74fbd6e636caec970eb6363
 EBUILD secilc-3.0.ebuild 902 BLAKE2B edd6c9642e5cb1457c58fed5e391ee9163c31b223217f8b775411d7f7459ba10278ee726612f24a6baad884642970baa441c39bc4b47075543822717a1bc1cee SHA512 b5ab249d7279d50bf97e26004f6f0bf5e57df6ccd24b5261fc99ff20b2fcb9d4df8cc241aeb11d759a346b05c50fe39c03233fc109c6a2367ba244b77957322e
-EBUILD secilc-3.1.ebuild 904 BLAKE2B 4393b427e8c7bfa3aeffeed3b22c43d561b1f7e82a3b444562151bb79e70ab66e40b2555b090b2704ad83c574eb95d1f44cca193add74ce00a464ff72c377a8f SHA512 fc08f700371c287d7b9dee5cc2af798981358c9c0f97b045d1dbd039d1088833a7d8670c4ae9aa4d411732eb4b2d42f5b0f0b7282d4d5bee34cac39d5a075068
+EBUILD secilc-3.1.ebuild 902 BLAKE2B 3a2c205279d1d2870fb89bad1506fda1864b044fa6788f02ebba8f9b4c9b1155541dfa26fd18e3cd2823cad09597553be2510ff9058f4de2640d800a225ca19e SHA512 b418e483ca94112e6ae467b60a93231b20d45ff065d9d6bb6d20df41c4baf163f140114a0c7e3745423bc2283023df4d5e37815abb95c6d68cd1f4c57c9dc377
 EBUILD secilc-9999.ebuild 904 BLAKE2B 4393b427e8c7bfa3aeffeed3b22c43d561b1f7e82a3b444562151bb79e70ab66e40b2555b090b2704ad83c574eb95d1f44cca193add74ce00a464ff72c377a8f SHA512 fc08f700371c287d7b9dee5cc2af798981358c9c0f97b045d1dbd039d1088833a7d8670c4ae9aa4d411732eb4b2d42f5b0f0b7282d4d5bee34cac39d5a075068
 MISC metadata.xml 517 BLAKE2B 69224c0360ff5acd98dcd493463266090ad17693588e91a434e412460352594673563388b52eba5313c7a9aa3b745d916f089805fe88ba8270cef1528f1fe13c SHA512 457ff97de6f9c6992a025588a5af5692abfc38a7df8537de2006ac841989a9b7e566b796b16d304252ad03cf66f205dd3a4fb0218281fd551c430c58b9039310
diff --git a/sys-apps/secilc/secilc-3.1.ebuild b/sys-apps/secilc/secilc-3.1.ebuild
index db36c3ca9f49..84a3781d99e3 100644
--- a/sys-apps/secilc/secilc-3.1.ebuild
+++ b/sys-apps/secilc/secilc-3.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 9904de74f117..5448cb0be073 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -3,7 +3,7 @@ DIST selinux-python-3.0.tar.gz 2100098 BLAKE2B 6949911020139378e9bdcc2b7c01c067d
 DIST selinux-python-3.1.tar.gz 2100549 BLAKE2B c5d207bad60c379259e3bfc8f029f76d4572818cdd41a263498ed4434a70eaf7ff51af7772cfb27de0e9e4af03bcf9906ab0f6a59e88de10e81cbe0e8c5928b8 SHA512 5dd98f77ae8ea8bac6a89ec7def76e12496b9a9f8c9612c4cc1dac7a8e8c60380a00c857426bfefbcb4273706addd2594e9b467f69408ef284f082a09d45bd49
 EBUILD selinux-python-2.9.ebuild 2552 BLAKE2B c3a46c9b484dd134426ee1cfecdcd0caedefa0d02cb1071789ca62c7a2ad860c12f770bd8130ed25f660b70e352ca2c65b062ee6bf9ac2b185e651ccfd44e861 SHA512 2d896bb07f08d2def9eceebfaf0aad8fa27e3041ca44e04c3e936502d9323b48a0d8c89c5611ea9885c90d90a9c0823f3c8786bec5520857b20ad4f18461fe61
 EBUILD selinux-python-3.0.ebuild 2558 BLAKE2B c390f92149cd44b5443867439f64d0e71b75c9614e7d3115008b57b04d0307dfc36fa4c4a43ca725a9b5a723c12091c9496257dc0f4c31908a52c922a943c348 SHA512 5c4533c9bf0545c13881c7b2f4281c4e3e14498f4e5def1285843b0464d232e6f6bdaaf49cbd9b3ffd3b72e07f03659d56405e2431b5f195dd27f592c42aff61
-EBUILD selinux-python-3.1-r1.ebuild 2594 BLAKE2B 253043520f734e82b27141c2e2d1088dbccb3ca016f35607ace5808f365498060400500172e7c5bd217168464f5fd14c09328ab3b19df47ad29ef74692aaa4eb SHA512 8814d31ee68f9bb1ca40b354b4f955982eff55f13a4f8022d433083cc9316e2fa3f32d799c8157e2a5573f6f083c3ef5c6794be8f812bafb6b5c803439bb4ce9
+EBUILD selinux-python-3.1-r1.ebuild 2592 BLAKE2B 4e8887963e09d6138443885f7a52075206118bf5711e2ca1b4fbd3ce4251e3c7c7a2982d8ea263e45d9308211e6f614680870dad023465dd89d5c909a08a32f2 SHA512 da4d84af8e26af692c07b4009fdc7549c2fc13236dc7574d8967864976a83094ea877dde63591ad88a48c7be3391720ebfc8895476202fa39b7f29b73f5adea3
 EBUILD selinux-python-3.1.ebuild 2542 BLAKE2B 617dde2527956f09f532fc118ef84962fc384a78c647aeec98f2f6e2f40da23f562aae4afd2c6c90ab66a19e1ea10d1af03cf7c8265b59519898d86f276b95b2 SHA512 f2e98e15ed3c1b91498d829b7938473bf73b780cff4bd6d2a559b8b12b4e63de88cc19e8208ad94a7260c0ea316ca16299ff6bedb618651ae0fff2bc0c4a6461
 EBUILD selinux-python-9999.ebuild 2594 BLAKE2B 253043520f734e82b27141c2e2d1088dbccb3ca016f35607ace5808f365498060400500172e7c5bd217168464f5fd14c09328ab3b19df47ad29ef74692aaa4eb SHA512 8814d31ee68f9bb1ca40b354b4f955982eff55f13a4f8022d433083cc9316e2fa3f32d799c8157e2a5573f6f083c3ef5c6794be8f812bafb6b5c803439bb4ce9
 MISC metadata.xml 557 BLAKE2B 40a5075b9313be98cc5566696ebdf42dfa77814d2c5907832c06b8f846cb902023949bca3aa1b37a03a756649c6025f5f91357c0f6c73292b864396ea1c118cd SHA512 248d0177b4794bd342b35ce901f91a67227f1d8b256f6a56f06b3d424e94dbfb48b8500623bdccc2e0650402276cc1e50d1a7f475e2b04505ec0d4b4f2b590fe
diff --git a/sys-apps/selinux-python/selinux-python-3.1-r1.ebuild b/sys-apps/selinux-python/selinux-python-3.1-r1.ebuild
index e3fe4738a86b..c92909383ffe 100644
--- a/sys-apps/selinux-python/selinux-python-3.1-r1.ebuild
+++ b/sys-apps/selinux-python/selinux-python-3.1-r1.ebuild
@@ -26,7 +26,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN#selinux-}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index 0fd63ec0ea35..2d85657cd4aa 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -3,6 +3,6 @@ DIST semodule-utils-3.0.tar.gz 14263 BLAKE2B 119f40b34184e2cb0719e6a34ffb026f23c
 DIST semodule-utils-3.1.tar.gz 14257 BLAKE2B c8c9a1ce7c9c4f53b1f4c728d16b149fdc284f4cff8b4fce0cb59b77d37d6d7e9bf2102c7177c4eaf94677af6147e42d8d0bd55c0bf3a358968d0162d5a6c65a SHA512 b92794bbfbce5834ee7f62fddb40b5506e9291e8fa7c5d669b2e281089b8f8dc40c4522ea287ac5deffdaee751442ba8e691e2ac45fdd378b60d5d6b2527d157
 EBUILD semodule-utils-2.9.ebuild 977 BLAKE2B deb8b71bd36deb5b50e05578d31ede94a40c5e8c81070af3b55c83f82e17e5cd320a09ab6816a1aae945a431d3827773150c14bbe2b32743e59f544ec6dfb678 SHA512 4d817a11754753080b233110e1f24fa832427fb366ba39462959e197f724064b335e848aa47b1fcbce235627b7691b61c527e5b7e7e8410d81c0e2c84f811701
 EBUILD semodule-utils-3.0.ebuild 977 BLAKE2B d36ef3f0bdd532b05eb8c204ff1cd8c11174b85bd0469aec8f420e9874f35b6b7bdeb482c2021f6e15bd7ad826c6483c991e7d0ac6eace075eab8f57be0281c0 SHA512 35159c6ba4ead2c0909f86cc45f8995928565dd1e36b6bc513cf73d273188c6e93689724104991c9a46c6cfebea6bee33c5776057b8ad08016297c72906f4601
-EBUILD semodule-utils-3.1.ebuild 939 BLAKE2B bf2a3ee661d25124602ddefce76746570ebc974e6b8d7b28c78e0ba2b5144de528c7db7ad15afdcf6704ed86916535a6476aeca13d03aba498c3343b9df1e941 SHA512 20ae6289b23580918bac2b032357db24b847c771d290ada9391d66e5fc648fb57bd604b19d890edb7b6867cf840d3cb6ae34b7698d8dddf97b953c5a93df154e
+EBUILD semodule-utils-3.1.ebuild 937 BLAKE2B 2a17b566209258d0f47adf56d8c38f7c920f6ceb053e07bfaf7dd51139e39a42cc60a4e1986ccb19b50c4bc89b1c97b3a133c02a38431127dfd17200e361e535 SHA512 e36fad3f19c5f81791e57a02ff677a42d02e8037b4cad66d24d7bf37fa50863954c8fe58c18d1416212d24537febed8b91bdfa6fa3ce9c79efb5c80675b3d476
 EBUILD semodule-utils-9999.ebuild 939 BLAKE2B bf2a3ee661d25124602ddefce76746570ebc974e6b8d7b28c78e0ba2b5144de528c7db7ad15afdcf6704ed86916535a6476aeca13d03aba498c3343b9df1e941 SHA512 20ae6289b23580918bac2b032357db24b847c771d290ada9391d66e5fc648fb57bd604b19d890edb7b6867cf840d3cb6ae34b7698d8dddf97b953c5a93df154e
 MISC metadata.xml 400 BLAKE2B 688a9292eb5fc938ae1aef1e62cb46f7cfb119f8d8e784e03c7d3f0d13d48b5120037195d1aac27080b6768a28fa51c209a6928ad0b84aa3802bda55d66f94be SHA512 737d2e097f9b98132e1a75d42c95aaf8ec51be2c4da9898f33b7b07ef519bb846bfc36836c33fc3ddfc716fac06c610475149b5923a684a249f4edf6cc13a147
diff --git a/sys-apps/semodule-utils/semodule-utils-3.1.ebuild b/sys-apps/semodule-utils/semodule-utils-3.1.ebuild
index db1d166cceb3..21cea74be5de 100644
--- a/sys-apps/semodule-utils/semodule-utils-3.1.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-3.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/smcipmitool/Manifest b/sys-apps/smcipmitool/Manifest
index 68a3d232b4d1..5e57809fa438 100644
--- a/sys-apps/smcipmitool/Manifest
+++ b/sys-apps/smcipmitool/Manifest
@@ -1,5 +1,5 @@
 AUX fake-java.bash 301 BLAKE2B e164317201544295dfaa10724c0319a4dc980d25256706172cb8547706725c05244c827489929faf19c0375630db0597427b1e42c758521a4b4d352d1e742d33 SHA512 bb5b4a57a0492df04f9428bbeedb6917fe5cf7273f0c73a300adb13e4d8b6e5cd907729cabfad548bafaa71a98e4ee1d996914fa4dafe0cd6e5a5310b1625e6d
 AUX launcher-pre.bash 149 BLAKE2B 7af8c0fb3d29784008e0c94aefad7d4f586e42f49a3dc9542c82755e1bf9af91cca452f8050b1c8c96f7bac887cb7da1c782efeae9d9eba24350a3a09c958025 SHA512 1d3ae073b2268ef070b4480a7d117091c6bbdc029a33e9f97c8cb5f008aa4b2d951371c17023ee91199b7daee4cd1fcd42f72cd8c3abb50c9932d29e65bb01a7
 DIST SMCIPMITool_2.24.0_build.201007_bundleJRE_Linux_x64.tar.gz 81360010 BLAKE2B 9903172cdfbe962b8147489bb96be57550b61dc4e4dff3728e980d105c6fbfbde1448c0264153e3bb38be1fcac7580e4fd96e2cd7de3a9ecdf797839fde7f133 SHA512 9ac85b79d3addbbedf938bd07d001ebd421f5261aad7d0ebe11b26d69c7d4ebc7c48a57a1a9c6538f51289962c8d18d09b6cf52946a686ca030012bb915bfb05
-EBUILD smcipmitool-2.24.0.201007.ebuild 1839 BLAKE2B 132b8c51469f0a37bc4ca4aa5170510f2741e2aa9121f056493964ed28941bed8e8fc5d0b8341c7b1b5ce7cf605e3b90260e3dd17d0394fae7b5b7414230dee7 SHA512 31347e3b5f314f2034f13f9f7f77496fb5baeb228cbf05a46872d9401ee64cbaf55d0b86040ca36a6132a6986f51b7fc68af6361f88a7907fefaab4c226fa44e
+EBUILD smcipmitool-2.24.0.201007-r1.ebuild 1825 BLAKE2B 790f51598495ef5e791da5ba9cbbbb677d8525d93e70061cf7ada04ce9f2a2a3528766350c81efcaa97f8b84cc688d095ba7dc74478ff423ec429aca4fa3638f SHA512 22a989fc5e2633503d05d26ac5ea2eea078924c77a39ef50896679a7151b9714c6c6a0e7583a1adeceb4d68950c1147123ce60fb52aaf1ea0544a9f9a0427a8d
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/sys-apps/smcipmitool/smcipmitool-2.24.0.201007.ebuild b/sys-apps/smcipmitool/smcipmitool-2.24.0.201007-r1.ebuild
similarity index 98%
rename from sys-apps/smcipmitool/smcipmitool-2.24.0.201007.ebuild
rename to sys-apps/smcipmitool/smcipmitool-2.24.0.201007-r1.ebuild
index 279c66adc7f2..585fc347333b 100644
--- a/sys-apps/smcipmitool/smcipmitool-2.24.0.201007.ebuild
+++ b/sys-apps/smcipmitool/smcipmitool-2.24.0.201007-r1.ebuild
@@ -47,7 +47,7 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar *.jar
-	java-pkg_doso libjcurses.so *64.so
+	java-pkg_doso *64.so
 
 	local pre=$(prefixify_ro "${FILESDIR}"/launcher-pre.bash)
 	java-pkg_dolauncher smcipmitool-ikvm --jar iKVM.jar -pre "${pre}"
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index e1fc89782dc6..0cabfe34c76e 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -3,5 +3,5 @@ AUX stmpfiles-setup.initd 396 BLAKE2B 54796d5db9fc350a98e467cf763afaa82bc27f5477
 AUX stmpfiles.confd 56 BLAKE2B c26aafd0e47b01354c7f20869cd71d36d7a8560e9013863eca6abb736d78c1eeb3eec00427c6bc8d37ab5b9bb88155d11b9e18809da9110ed40c77a34ebb1a82 SHA512 464cb238b87a8fbeb57e6534d0f2d861e8ade4219be9b7e2faf05c799f717cd2f23d176393bdd3c3b236058aa6f8bda837ad947fbe8f9489405760e9bfedbe40
 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
 DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7
-EBUILD systemd-tmpfiles-246.ebuild 4491 BLAKE2B 17124a80e29a2211b42ea9d059bb8e45c6eadc7c1cd04d3bd25a263534f31cb6b7e942b294f55f68c558d5c56c7c9e531de11ee761cf89c77ab645660f35e273 SHA512 289624de6d5eaf333273969ad1fd82785fc17ac56a31b11e69857f264455acf00413250f0146de3337e34a24f2aea9ed88d4f862dbe19305742c3bc9459bba25
+EBUILD systemd-tmpfiles-246.ebuild 4549 BLAKE2B 592ed0907b0046b698effa1b4f82a59f048e4f8a950ddf1b566facb581dbe99fd48b759d80a36bb2cc22ce8afd9ebe1b42af8c2f8989017d8d99d93034564014 SHA512 e560d0aa52526c673423ed23220b09067f75e4142f601c79ffcc80cac8e4bec1618284c4d4102c0e0a49b7d53d76b0d8adefe26a07f08401bf448ed4ce05cad4
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
index 99967bb12780..2714d7621532 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${P
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="test"
+IUSE="selinux test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -23,6 +23,7 @@ DEPEND="
 	>=sys-apps/util-linux-2.30:0=
 	>=sys-kernel/linux-headers-${MINKV}
 	sys-libs/libcap:0=
+	selinux? ( sys-libs/libselinux:0= )
 "
 RDEPEND="${DEPEND}
 	!sys-apps/opentmpfiles
@@ -117,7 +118,6 @@ src_configure() {
 		resolve
 		rfkill
 		seccomp
-		selinux
 		smack
 		sysusers
 		timedated
@@ -147,6 +147,7 @@ src_configure() {
 		-Dstatic-libsystemd=true
 		-Dsysvinit-path=''
 		${systemd_disable_options[@]}
+		$(meson_use selinux)
 	)
 	meson_src_configure
 }
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 588f71c15736..8b52dfb55039 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,5 +1,5 @@
 DIST usbutils-012.tar.xz 98388 BLAKE2B a19d64edeb08bafe3e6a0d6be7cb5196cebb68623cfb5cd21941f109a3f3def774382bc6fe8b68398278e530417190030c8dd39ab982c088329c7acbb36cb672 SHA512 e26a60229e6eed5de670d6511dd1fa5ee3453cc5a848820531b46a1678b69378a2a45c29e24a218a8e7065c2c345356f03a2992f8298ddae6c8026d181f8de66
 DIST usbutils-013.tar.xz 98056 BLAKE2B d6e7925e180ba90f27ca12f13ed985f34e51b230ec08188c91bf39bb8e64baa319aa63d473318e1a4cb21b53808e8610f837ea0bb85657072f1c70107d037873 SHA512 eb1751e5b82f7a1bdffc667662cebee6fd42f466e59d4eb4c98f0d3723d740305377da1df1ba5831402fddbbd1697bbfa2abd22d9ed175e2dee55d6d007e9e54
 EBUILD usbutils-012.ebuild 1198 BLAKE2B f0952377a3e94cde2e205ad0d47c78459ec7a623230233fd6c8d49f3925e9a4c163892e798008879cb51a8b0df99957bd58e94f8ee5518715879011e419e1d27 SHA512 f55e68020504640468567e54cf41fe8c526135f73c16f6c8b6dcb214a550c8f76412035739ddd2f1d62d5bece2d8ef25cfa5ddecb20e3f3aedfb8a79cfe69dbb
-EBUILD usbutils-013.ebuild 1209 BLAKE2B e405cc0d7447a33f58b19258f20e5679e09dd46f9695a7cc0f41cc5e0ecaa0a045e0a305a5208f5642794b80c932bfbe1a12f59486a51f590a7e4c8577285659 SHA512 64fcf736021b6bd90c08049d49f1515c1c0954b9c7dac638b399da83fd7da287011db38fb8b206d600af6f54a87ea0a907e0371f13a3866651cad99b6e5c8b65
+EBUILD usbutils-013.ebuild 1205 BLAKE2B 028ff84e822a5c9b7cc040935b819fa1f3ac28bacc4dac8474f9ebfb53a9f43ebe059b5a4389dad19a10fba1a128df3df450a62fb6050956adaa964acf93345f SHA512 a9459c43cd7b73a1a946766d61275bf2eafc244899735d34bb0faff8d3f6db940bf5894ab468a0e44a6449d9712402a365d13ba065d8bc49c865c24a674aec6b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/usbutils-013.ebuild b/sys-apps/usbutils/usbutils-013.ebuild
index 60aebb858601..47f444af1216 100644
--- a/sys-apps/usbutils/usbutils-013.ebuild
+++ b/sys-apps/usbutils/usbutils-013.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 1c9455846d4c..abade3054f24 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -10,7 +10,7 @@ DIST util-linux-2.36.1.tar.xz 5231880 BLAKE2B 52d867aa0b722a84828c37958d80b0bdcc
 DIST util-linux-2.36.tar.xz 5242420 BLAKE2B a03b626a376815f37a17b3808d1d421c7ec27a133edf857116603de38f7e13f527687691d0c8aa68f4f6868be6f3bcc64573d759308d74731107e02067449ce6 SHA512 cbb4975da8d99a1edd45514171d59ea7b019ce0f77a81e88b447a733f725e91c53540d9dc78bc626dc011dca129b8b150aaf9e64ccf62a4202ae816581acf4fd
 EBUILD util-linux-2.33.2.ebuild 8417 BLAKE2B 3b6971e04a78a962f7bbd5e6b663ce3408d57befe412d40c6b4b05777f40aea034e9f5f52872aea7537393210a2127fa952ed548061e89c15ef627987d2cfcec SHA512 7a1e0c679a1c69f2e64b54c6897a5e7c430bd8ce1fde91f9b02a00dfec115ec0c2deccbc760c1280fa092f8782c48610366828b4ebdbbaa10b2a6741a1a65a03
 EBUILD util-linux-2.34-r3.ebuild 8450 BLAKE2B 84795217360708525a23bad91268d45c997fb0ae87215a7a0c9027e2245fb98decc6f523faff98855b101e380f49663e6f7b34bb82d18d93641326e91567edf2 SHA512 3444d77384f176ff6c1b3c7f023c90b021723a4158456b504fc927b141a1ad438dfe59802d297fc136cf55d08f01be002d8f136b85df50fa762d083abacb4857
-EBUILD util-linux-2.35.2.ebuild 8893 BLAKE2B 7e815f2d65257a1165a5a4f9e60c3338754a5300e800bae1872786e7e4c8be549668565dcb861856f4cce63e20e5f103120d77f0cf7498723f271a95f7ce9d78 SHA512 d0a4c98fb3049508a6a5a8ed0fbe5e1dd73cab5a343cb7d6f4d9a959232618868647c149766b8cd5c73e8ffd7fa4b5a56fb2359e34bd578f51fae60b81cd4415
+EBUILD util-linux-2.35.2.ebuild 8892 BLAKE2B 25db98e56803e586ab9a8e8a8f7cfd31e13dd7c1bbb29b3c40746bbc50e222e1a58e63a932f0da6884c9b9e95a1371c06eadb005c4a0c5b6bc833d4367bc2926 SHA512 7e7a86e00590a23eb35c81e4313813f688a8917b1260f2a39eb1f0a6b60e689912bf2c032326e07abecaae40a9841136879b545bf2b4603059766dcebbf1ced9
 EBUILD util-linux-2.36.1-r1.ebuild 8904 BLAKE2B 3db44617352ed3acc74500ea6698e2baa41ce85d0260410cf5dfd9cec4f462254264a4481f89f1d21a8240a089928c2780395074a9413c4b4be6ffdfd4aa8d92 SHA512 f8f052242bf3262e30dac8053c373ad2ade653432d3e2a9ceb3801873ccbe6a134dff3dd368e4832389ed623bc61dd5808771682d9c62aa6a7dd0f8789243484
 EBUILD util-linux-2.36.ebuild 8829 BLAKE2B 65c336d5168454eefa2441d274921fe68df7fc273f593240ea063eaa34c4d1b97c8589849d8a0bc89dcdfee4984c08501847d068aff9e17f6f5d0296d98a6a73 SHA512 b7cc930e138a4763a57468ce2028e78ac4fee20b3748c5a946b5b8f89ba9410b9d2324fd95ccc81f3770ecbd9a127690497476d992f459f3f506462506e14108
 EBUILD util-linux-9999.ebuild 8764 BLAKE2B c9273cc668518f91dbff6ccb5edcbe4f9ba30f580240ec840f91ed66c68e69de682471390a0c9604d0f60926d6667d0265ebe8bc48aa8926cd6e1320b284ffec SHA512 950550197233fa9cafa404e04a69abcaaceeaaff8408cb1dd850efb7ae7a3ed57754210f2802dd81fe37f331ccb0ae58c0c141e192b0943ad99e050502a813eb
diff --git a/sys-apps/util-linux/util-linux-2.35.2.ebuild b/sys-apps/util-linux/util-linux-2.35.2.ebuild
index a8a3a209c72a..006fd2ec7b8a 100644
--- a/sys-apps/util-linux/util-linux-2.35.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
diff --git a/sys-auth/AusweisApp2/AusweisApp2-1.22.0.ebuild b/sys-auth/AusweisApp2/AusweisApp2-1.22.0.ebuild
new file mode 100644
index 000000000000..869fe92ebae0
--- /dev/null
+++ b/sys-auth/AusweisApp2/AusweisApp2-1.22.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Official authentication app for German ID cards and residence permits"
+HOMEPAGE="https://www.ausweisapp.bund.de/"
+SRC_URI="https://github.com/Governikus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EUPL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebsockets:5[qml]
+	dev-qt/qtwidgets:5
+	net-libs/http-parser:0=
+	sys-apps/pcsc-lite
+	virtual/udev"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF )
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/sys-auth/AusweisApp2/Manifest b/sys-auth/AusweisApp2/Manifest
index 1e14c9418c03..cb4e90f495d7 100644
--- a/sys-auth/AusweisApp2/Manifest
+++ b/sys-auth/AusweisApp2/Manifest
@@ -1,4 +1,6 @@
 DIST AusweisApp2-1.20.2.tar.gz 10110603 BLAKE2B cb3063decb3a5aacbc1d7690c58566914776032cd305d29f6352df659a27dcf81e07550613809849822ee20d7aaa467303f33602c40aaa39a99501daa7d1e887 SHA512 4a968d3d9043f9eba5927f049155e203448a27034f0c051c10fbaa262bb7b4257c5a6de4763c1fa470a1c46d51bf67636f14c136c7e7c8038eab7e929dcb38c2
+DIST AusweisApp2-1.22.0.tar.gz 10845370 BLAKE2B 2b35bece49c96f7aca391a918539115351737b9cc6bcb913121f7f44db7ff88fb615bd3a3822d7d5670e83c81ac7c409fffb1696d6dd9310fdbd595c3f7fa88f SHA512 c2340625f4792afccde2f09d54e050efed0e78a7d921f545ec73f4bf23746b7b0c422fffbc87822abe2dc8b69a8439615f3d43179a98a64fa4165503c2e74079
 EBUILD AusweisApp2-1.20.2.ebuild 925 BLAKE2B 7af37159e128a4c5b6a4773f0a529c16863558c919471b103cd8f362e01d69b5ccc61d0fedbc8a76b38923f2b669e34f39178eaef1fa02e33759c5d3b5d439fb SHA512 27383f1f34166f1f041715dbf2d0526a854dd64cfb429c0750d0de3616388b85bf67a6cf18d001715af3d586618082f906cf040348c4c5c381c5662c14ca3983
+EBUILD AusweisApp2-1.22.0.ebuild 927 BLAKE2B 189d052846901114eab68f288d8cab9ff15795b52fb573c17cb48a3ed03d5f2d496fe1937a9bf48486804ed63d9fbb60d1f6e56ec952bd8f9e49b8e0d1c9a156 SHA512 fb174fc212561015ce6ecc55a7b2f9f2785d4fe91b8a1834189b88a4fffdc7fb0995a3f82c83f1283154f108430271136eeeb3e1385d335eb5fddeb92d913bb1
 EBUILD AusweisApp2-9999.ebuild 891 BLAKE2B 924618ee8a22a0ef8ad2ef62a0e8fc7448033f142371c32f814965275cb376d46e15822a9899031cc03a8003cd7159c1a94e8652a0eaf8c4acfa34eeeffa4e40 SHA512 83506e86320528f4ac17c6ac9aa80060aa9ecdf875817d12f0a680dffaf242495546aa0076c1f8185dc7eccf3dd00e87490e7ccf18028b14a57330f9f75a9894
 MISC metadata.xml 569 BLAKE2B ff252fd4eb0ba94a0b1737dc7170be7e77c031bd7be1c642c1b1b6a83ab2c217facfdc3a689bf10bcbecf044d2b4fd01563e9bd77e84d8b31a85a900f865e137 SHA512 cafac913b71aa8a40dcca2e1dd69132aad723b2d2a75dae6fb0c8954c5c3692aea1cbfb94bb1e0d8638bf4d0a74c9adfeca4d8243fe6f20cd3ad941d239760e1
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 236812bf74a2..56313c40311e 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index 30911ec8bfd0..61b2cb35b770 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -10,5 +10,5 @@ AUX nss-pam-ldapd-0.9.4-disable-py3-only-linters.patch 403 BLAKE2B 2e17a92b3650c
 AUX pynslcd.init 515 BLAKE2B 711ba152ea9cc52198171e451889ab42a224581bae7e4378846f480063ed9a672fdb38b153d6941364d3d06e325d9feb95f6fd17885b4e6181d99393cb54de0a SHA512 56334d86cc027e538d8a0bf9a8b87308e3ae6e91be608a4a630f21c57cc41b6cb5dc6fb3220fed1ca555dd4da6a5c7c10b2776f9e49a7b71a96ece21fc65fed7
 DIST nss-pam-ldapd-0.9.11.tar.gz 777878 BLAKE2B c2b442786dd788dcf4373939ed52b4585d1821a7168fdd342ded3c99ef9ac8f3e4af0ac360f842b61885c1f2bc2ef85a0ce9ce0c1027bc974d0ba5242505657f SHA512 2b307805667526b85c724e113fe38899eee397e5c8673e89090d4836ce6d0ffcf18dd022d6c20a5e11d4138e736451b841a0f16ba379d524de4faaaf02906645
 EBUILD nss-pam-ldapd-0.9.11-r2.ebuild 4176 BLAKE2B c0d054d5cb6a3ed392d020145bc5443778136b02d974bf51f8795a5467ac6d5dcff5e1287741dce40dba6e782fb0e145210fa1b421b2b57d25d271b2a6f06b24 SHA512 fb245bd9af6207f684964e995348232034ec7d1338ed973cb497cb2962041973d7ed158f6d0b06b27c11177b416dbc6f87287ed48aa75355f877105e02b8b654
-EBUILD nss-pam-ldapd-0.9.11-r3.ebuild 4331 BLAKE2B 7e46f38bfd579f0a9d4e0d4ccfb6237385776bda1a30a2e515f6b0f294a850e308118b89f6cc143002392311d5e91d788807f1e0d2481190fe7606863840c139 SHA512 92a1f91eb4f610b10c7441b924147796530fed0a75658c620537fe16dccd52b4a5994845a71b4a9c67c3694adfe808e9d3869134b76af8d9d5e75a3847b1f709
+EBUILD nss-pam-ldapd-0.9.11-r3.ebuild 4329 BLAKE2B c016afe69357bf6c2639a44cf42527399d48c94808bde78f8d6e977a3c5ffbfa013f36708ad5da29970a4c2b86e483303aa08206b2d961001362b1a56830f857 SHA512 6f78c88901bbebdc257e52b2e3108189b1cafb152e7da8888d53df0b394260d6bcb4aeaa303285ab77cbfc024ec0188a4f88030e72e9e1e02ced71cda632da7d
 MISC metadata.xml 1169 BLAKE2B 22b5c9adcafb123a6af088ddfcaa1962eaf250ed153020e65afe36a0e6473b1f8c624f770634a91c3a983c74ded1d43535bb4930f13c6470fad681f5a77fcd51 SHA512 ab658f7d791db370920a4eb57da8ead2713b1cabda6f2dccd24478855043802e7c70a07c3aeaa33829b19dc94a4317d8b5ebec07d1caebe07b4fb3bc59b27b4c
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild
index bc76968a7184..ccdbf3ac4381 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://arthurdejong.org/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug kerberos +pam pynslcd sasl test +utils"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index f2c3bab12887..35d40bc24e3c 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index 7f6e19602005..bb09b845f8d9 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,3 +1,3 @@
 DIST gparted-1.1.0.tar.gz 4032829 BLAKE2B d47d45e77a3d9dc29e9fa0428aaa7c12bb863cb70ac11f4055cbcc0a0fde8019fbb20266b7f810d6a47c5239248486049c8e9813ead8e88081dd16f445da036a SHA512 afaad690fccbec7385b078a299b78bf4f0f83999e2661f89cb97f9e8f2b30ee41f0535450075e3a7174967e77c75024df78863d0d90d5e8dc726a487b4ae0bae
-EBUILD gparted-1.1.0.ebuild 2165 BLAKE2B 27462145c570c272e776d505eabfa082fe2b345fa964c43000d82e30a5ceb59477fb5f6f7cc3ec12390d817e58fba2a106c4cd1eae9df57ddb3fce240d9a0349 SHA512 abd09f8d33e728da1b433226697501fb21dff98550db0bed7aa9750491539f127feb44b7a06128c5e370a160af7405994464373ddcfa2005974286ec547bd8ef
+EBUILD gparted-1.1.0.ebuild 2172 BLAKE2B 9b3ca7d93c60746378c1d3c83b2fb74af17a70c43a0e1fd3f8c00a12b58ddc3be80560c785fbda89b99d2a0d0f582dba3a4e6e0f9779c5d6032555cf217e3cf1 SHA512 7fcc0b78d4de2d58a08794dcab6b5b025646ca52e186db9984493131a7f6b158cdb5f3dbfe066d8f7d02b5f1c8d91fc888af8be0ea79b53125b00e252a1c6b65
 MISC metadata.xml 2003 BLAKE2B c1568f7b030ae6d3f0ddc3724424bac3701fd470a535c5cedb8c5fb01f2c7f4f20476075be0033dacaf59bc9797f155c7fecc7ea4ef19ac4545454c275b82010 SHA512 03814c5741c01c342ebaa7b4923253f8efeb7beeb5026866dbc8a28ce1b3c3562c06eff108a15f2365070d389a84fe6d498bde39ed0632a63cf1eef412b3b97b
diff --git a/sys-block/gparted/gparted-1.1.0.ebuild b/sys-block/gparted/gparted-1.1.0.ebuild
index a1e937d24c61..b718488bdc55 100644
--- a/sys-block/gparted/gparted-1.1.0.ebuild
+++ b/sys-block/gparted/gparted-1.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="btrfs cryptsetup dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 udf wayland xfs"
 
 COMMON_DEPEND="
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 8e1570ebdfa9..2f2152c44cc1 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index bb49b83155cd..d496f6b18df2 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -2,6 +2,6 @@ AUX syslinux-6.03-sysmacros.patch 950 BLAKE2B 60fb26a4bb462409074802b8cf01afe29e
 AUX syslinux-6.04_pre1-fcommon.patch 2111 BLAKE2B 6b0d047cc729e7e9c9658ccd6ecd1166eb1ff2be569132f94b0d2bdc71eb9412a05bf23aa287626949a6ea376b2a8d02877d72182d4ea50d54e445df9c38ac81 SHA512 50c58bc44c77a5a68910cd40370f4259afd1392fe8e1b5c6ac25f7e610d994ebc8d17434eb8d3f832a14f098e16b5b597c723f98ce8c12a89118f5b8d2c65529
 AUX syslinux-6.04_pre1-singleloadsegment.patch 4744 BLAKE2B a28ff29b9a4bdd2cb65a6700c96ff99ba1a045a401d50587efe59d703f12aca3e47a14a8e7a569c50f11d367545990d09c35f90362efe49d0c9d489802885879 SHA512 9585edfc8ab0e22d4d7757ccdc435c198c5457466fb4fdefc1829cbbe8951f3406b7b51eea56044cc297d29e45772e2154e5746e6d9b92310f17c880c950ff8a
 DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e850631b642e26a86e3328196ddd998596693c3a26db0ada4c0ba78a4ba692a1cc01886b6eb693d877ddafcfb325ecdeb639 SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98
-EBUILD syslinux-6.04_pre1-r2.ebuild 3217 BLAKE2B 15b770ce608e6644033d014970a92f693502cd6d9567fa719b05f47ae7deb7e245f69059c5217639b7eae807ab904d69f9a0c6dc9412b9f8c3ec535f966c638b SHA512 330fc00b75f935146c0b34756c22dbab07dfbe8eaf5a85c2df98a9611141baf8d4bf6ef0fa6084c21568cd2ece750fc94afd56e2d00e0388a0150049aa3e540a
+EBUILD syslinux-6.04_pre1-r2.ebuild 3216 BLAKE2B d35aa6293cd5c84f411dc88ffedd7116e02ec8a93186f7995bf998dd067fcfa943b8eac48d1c2ad13c6a18dd9712fef3b762bb7cf2b93da4cbe29a9a712c790e SHA512 146b77e98e4fdce99f2e53368af97d5dcedce55077dd42cffb60c45d7c2bd5a13f3422f7481e0a8a5b7464d386b62bfb39a61b036eb25fc44664827548d877c7
 EBUILD syslinux-6.04_pre1.ebuild 3489 BLAKE2B 78481eb4d56f6670a9e3dd6fb8a1b4abfc8cdf67ab3d549c16e88f6cc8a908c4ace33d04e857ea40b7990a1e06d9fa04573077a876634fa77d3f00bd35b3fa12 SHA512 3d628c258a6671c4977d98e575d05d88101451f2d962433eec373777921773658460fba7e7f992d1857ae5a28f64faa02b6bed8bdd5bac8a65311b8e009aaffe
 MISC metadata.xml 411 BLAKE2B d3b00622fd68d6ae1b4ba7aa30c33c790b2fbdc688637d3c573cb4496f3952a62f8ae20384badda70b9cbd4ed036e0884becd212d63ec015decc511f1ee7970e SHA512 e8256115d61eeef51be14bea35df6765b356471d145ad8e43e75e6301a4557d526af5fd99b8957fb02ecd9c4a7a0bd0d3db4790abef935887bff8a102709c518
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
index 415672bbf778..52aaa1653ef6 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${SRC_URI_DIR}/${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 IUSE="custom-cflags"
 
 RDEPEND="sys-fs/mtools
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index c41add89b654..76fff89dc629 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/corosync/Manifest b/sys-cluster/corosync/Manifest
index b5b6d802fe8e..db22aae12c12 100644
--- a/sys-cluster/corosync/Manifest
+++ b/sys-cluster/corosync/Manifest
@@ -4,7 +4,7 @@ AUX corosync.logrotate 93 BLAKE2B cc8f22c668dfde3fe4dac13fb295be81ff1ca13c808155
 DIST corosync-2.3.5.tar.gz 428253 BLAKE2B be9fc2b27b60357acee6dee013bc95c08045c114acafc62eaa82a1821f07ff76b8821b9d06f31246b9978f8aef46e3a9e1a2d61ca74465bc74d4140c0ad0d0fa SHA512 212a95d8a68a2941f27c9ec22750a88598744d6fd4db6b46abe0b4cdfa988d3906f760bdf67c403d8c6d0a04da64f29ec744fb68ca51c7269ba58e306553cee9
 DIST corosync-2.4.5.tar.gz 587015 BLAKE2B f1ef6b0a0f34e23a4ab5a5e9a6f21ba1886fb6cebec7d9440f6e189acb095cd825049dfceb174b490be1b6d85195ae4b99230ea44a31e427db9020257e8fc428 SHA512 e8476c006df8fd0c5291a8b0099c4756f884d41c7e9c13573c34458f63cd057d49d6fa0c1d5344d5fc44341186817ddee66997d51937339e6d70dcada0c402ee
 DIST corosync-3.1.0.tar.gz 447073 BLAKE2B 1a0d5b744ac5cba1d67fed6d58a159d8dfc63615aa6fbe5051b20f6e41da589871b6d0b59937db0ac31b4186e4f051378e48308ffc3e0743a5372e494485b3c7 SHA512 05be0d417f3ebbba993b92074f261dea3d951e20d2054817b9017eb04a8a017c9c3f3d0119dafd689944accb690beaafc9f11c1e67f53d978918ea49e51a5e6f
-EBUILD corosync-2.3.5.ebuild 1735 BLAKE2B 765b8975199936351fbf79d3b185bdd4f8acfb85136476699a4ee5e7a63829e9bfaa66477541f1af1a4c9dcbc8e0579da958baf0ef9ba72f42fb534e32886ff0 SHA512 4811829e99eea8738d8ce9647919137d90910fbed382409ddf21f285e961a5e45ded341d1acee98c80e346e5a13fd6eca231877b393a7d2a47509d091af2c955
+EBUILD corosync-2.3.5.ebuild 1735 BLAKE2B 979a985503cbaaf0dd961604bc7022e5e4da046d78417543634c8a799d0ab1ab2e08b23789b310e7a58806e5031384ce7211e87802edd83c4a962732a85372e5 SHA512 803fa60d64bb64bd724852458231963021fbde8b374f115bcbf801aecacc83d2c5bd0b1191f187902bab3cbcf086937f06d6837454c4309c6071ea55e6ce5ea6
 EBUILD corosync-2.4.5.ebuild 1702 BLAKE2B dbf853cd542094bb4edd03a50c76895d83ae886cefb67115790a408f6e565d4d46e8a9a377e239bf233905cf6ff7771cb372ab5173d90a5ee158fa696fba890e SHA512 a012365a627b1813af9b109460b37c8a3a6d3e34ee533253524dd48b54f370c43dea425ae475ac681d387bdf5271020c6d3645e196f9984b1bd5137b2d31c91a
 EBUILD corosync-3.1.0.ebuild 2545 BLAKE2B 0b03da2f70e6c6151c3d7c399be6f0754cf9e626c139f601c8271f061b545b126dd35daabc9716820008261f735db0144207e3a187bbe5e7e48db7998c636be3 SHA512 175d460ca94d22fdc9fa8e45c4633fcb2e44cec6325de818bce61e73ac24021224dc673db9442ed1a252ad95bee436fb7dccaf010f83f34468ea1b311f99250f
 MISC metadata.xml 568 BLAKE2B b37326b0f2809f7e67a1537b9a0a9126b7f6801559007fab15a2b90fa8bd094a907414eb6b384ebce9cfd32ff6dfa8e00e73b637a5629c5e56dad6217872a58e SHA512 1f37d14000dac9555b731071cef48a008a775893f200488b2acc55e5c90f789223202da8fb3f7a016db05e84b2c75b311baa5dc2a95f8f73a2ea9194c1d6a2ff
diff --git a/sys-cluster/corosync/corosync-2.3.5.ebuild b/sys-cluster/corosync/corosync-2.3.5.ebuild
index e40a5ddb5edb..d1a1fc207d47 100644
--- a/sys-cluster/corosync/corosync-2.3.5.ebuild
+++ b/sys-cluster/corosync/corosync-2.3.5.ebuild
@@ -26,7 +26,7 @@ RDEPEND="!sys-cluster/heartbeat
 		sys-fabric/librdmacm:*
 	)
 	dev-libs/nss
-	>=sys-cluster/libqb-0.14.4"
+	<=sys-cluster/libqb-0.17.2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( sys-apps/groff )"
diff --git a/sys-cluster/placement/Manifest b/sys-cluster/placement/Manifest
index 4a060dbe889a..c172830c0ee7 100644
--- a/sys-cluster/placement/Manifest
+++ b/sys-cluster/placement/Manifest
@@ -7,5 +7,5 @@ DIST placement.conf.sample-4.0.0 26306 BLAKE2B 037ce73d52066fc2f2fe0542c10e3879c
 EBUILD placement-2020.1.9999.ebuild 3435 BLAKE2B 8173219bc9b16f85ff1c1c157c7e00ae7256e6b5e07c53aa8b9ae89663f8d7599662850efbd0f47e9a5c820b16087bf4bcfaef27f28e31a7a6847874367a0228 SHA512 fcbd301eb249084468498d96e1385a1db312ecda5774721b3d36c87cc83e825e085bd5e3d0e6d00ea91c04433824543a23c8af99eefbd93f18846b93f93d805e
 EBUILD placement-2020.2.9999.ebuild 2790 BLAKE2B 3165ca6ae8a9954218b9891f9deb1d097ce795b036102a03349b08b9766c4c74ba071743f251073ac58c5d3be39ff72fc99f5dc38240bdbd106e521d43858f9a SHA512 49e4f3ae482c6a581dbe531d0238fb576c8475375490e3b51b38ec971081a1b0905ef9cb2d57e36da799c345053fbd87b7c32c0cc2d4c6ff8b353b1a7fd6f83d
 EBUILD placement-3.0.0.ebuild 3433 BLAKE2B 4761a686efe2e36e389bb9b37f08810b0616656f954fd8ef96d7753224a97fb3546aa6453e558d8fd6a6401b4817b2589aed9edc0895d4ac0c3611388b1dc33a SHA512 f8e54b76f4e8777996fe5586a4d6a2df9432284316aea4bbe180dbaa6291a88421d8ce8eec8435d0a3f489089cdf2d500f3546ce3eccb67d0e0ca0ad37c19bce
-EBUILD placement-4.0.0.ebuild 2790 BLAKE2B 3165ca6ae8a9954218b9891f9deb1d097ce795b036102a03349b08b9766c4c74ba071743f251073ac58c5d3be39ff72fc99f5dc38240bdbd106e521d43858f9a SHA512 49e4f3ae482c6a581dbe531d0238fb576c8475375490e3b51b38ec971081a1b0905ef9cb2d57e36da799c345053fbd87b7c32c0cc2d4c6ff8b353b1a7fd6f83d
+EBUILD placement-4.0.0.ebuild 2788 BLAKE2B 94306657e2060c1f19ea4220ee123fe79b7e251de0954a5bf8c56a7d1fcf46ff73e223be8d242c0cf0f41829ad9feb40561493b82c12d5b5941443ec7acf7f7d SHA512 3987bc996abe9691d77111a095cd02c346b7115e7b27426bfbe7e487ec8fbbef04177f19033f09596af1edc814ee082f314ff203f2d0d3d0f83f1a090e2da1e8
 MISC metadata.xml 590 BLAKE2B 52aa7d1deb487225f34afa59f668939abe56f4d377626b3cd6dc20c2c94fc1b104f2cac7047d7ba461c62c90515cd39e75b8a94d17a341dd8c549d6bdca6bee3 SHA512 188176cc3f839d3a53dbcaf38f74fc71f1c223f7e938bcc9627e71b2509b14e535647513a7c1bb2eb2d250a317b9e6f0ef906cf464e465697d5a26b4bb013f78
diff --git a/sys-cluster/placement/placement-4.0.0.ebuild b/sys-cluster/placement/placement-4.0.0.ebuild
index e54645cb04c1..5b83b21d629a 100644
--- a/sys-cluster/placement/placement-4.0.0.ebuild
+++ b/sys-cluster/placement/placement-4.0.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/placement/victoria/placement.conf.sample -> placement.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S="${WORKDIR}/openstack-${P}"
 fi
 
diff --git a/sys-cluster/sanlock/Manifest b/sys-cluster/sanlock/Manifest
index d8ed348f2180..6b23dd0616da 100644
--- a/sys-cluster/sanlock/Manifest
+++ b/sys-cluster/sanlock/Manifest
@@ -4,5 +4,5 @@ AUX wdmd.initd 261 BLAKE2B 65b393f2f084896d3c17aa0345f9930badeec7a3ee4cc7e47bd0a
 DIST sanlock-3.6.0.tar.gz 221666 BLAKE2B 7fe95bd6813c13b76993b343a5ad605c7ba642583987ffa5fef583f34c053ee62b0f9e5979f5b5cb9e4fcde53268ae3debc5ec36b04f6651cc4cb902dff52df9 SHA512 59eb2a6f12e95d54886fdf6d56fd9a6814dd20fe11f39664f2bb82a56326fee48c9465ae30e6d04f970c8f1b0d9c2e22b90d21ab1f657c6d6b61ff9f02332443
 DIST sanlock-3.8.2.tar.gz 266780 BLAKE2B 5248d08225bcc2a19594a3dcd3872c8c69ca8b217d31f6263f2717e4594180d4ba4685c9679ce2f31b6a2dcb4fe9f3e6a5dd5ac3ed073aea02599e7bbc04390c SHA512 2fa92e16eee4d2f3dac452400522f7e90b93b71349d322564d5957e2d87fb4bd69f0b5617b05f4b296c272d6da9a404fccadbbfff106354a0e302c436593eaac
 EBUILD sanlock-3.6.0.ebuild 2055 BLAKE2B ddf101be000bf9d0b081a50386bbd8947e025d8edb475457167cc460c4f3a44f9863d0a3db1720839d239da61b9b3925d8eb953a29029501281eb6e6873575c9 SHA512 1c651d40550f67858d4ff552f8cbeea125205396087cb2290e3b70d370a410fbdab29d7e2fc0da9d01593b59c29042080a463fff920601b37e5577a5cec125bb
-EBUILD sanlock-3.8.2.ebuild 2090 BLAKE2B d8eca28a2869f76a0817e27b26632517ba8634fbe97a41bd4b19978519a2560c4382869bf776f3995eda9e50e66ba027cbb1f2ac4887917cbe31bcb2fa54d8e2 SHA512 b5250d978145ce6fab960531b7945e1195d5d6cfc9b91d80726ebdc3ed07fe538aecc3751ca15d039c94ca331a23232168418dc7df7f2f50ff85baf988b75508
+EBUILD sanlock-3.8.2.ebuild 2087 BLAKE2B a731f9ffac537963c48f14a1f54c0c2725b2a5b68870dbfd5320f5eef49095a31ebc90c9bf23d2bacad6814ab9e759a00d729360f72fd026a7f5b47352a6bb8a SHA512 d56ffcadb926ae25cf9efca56593b539eefa1e05f446354a6a9b41720edb6c2068e73e5c002bda9f460985d248d9964902e84c6998a2eef430f4f5f4da3e656b
 MISC metadata.xml 368 BLAKE2B a15a411ea20eb7649f299e38704b394344194d7526f9bc92b27c0a26760d7dba05b1e5d483ff5f9ce73a6d1cd527a18ac905344a614c8dc31a0c1180b2be07e7 SHA512 2cc3ec3c99cfff2e0c576ab6c7b0a39460af875ba826ce0cf3c5a1a4f0f3def6170753c8d42af2fc7a139ad7f2135e309c3165bde83b4e7574292768c96e8086
diff --git a/sys-cluster/sanlock/sanlock-3.8.2.ebuild b/sys-cluster/sanlock/sanlock-3.8.2.ebuild
index 449fd2f3274a..3b6ff5e345c8 100644
--- a/sys-cluster/sanlock/sanlock-3.8.2.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2+ GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index c43b6c007aac..030cc2728a4c 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -4,8 +4,6 @@ AUX slurm.tmpfiles 31 BLAKE2B f08dbc53517cc15463be5264505d858fcf1f2196565868d164
 AUX slurmctld.initd 1842 BLAKE2B 25c9fd76dc888544888abb2790d8a0ae66254c0f8807bf48433a54fd34f49d2f4f95b5c6dd9e4ab1f40938c274be6be2e88cdb8959ecb12b4a86d07bc0a5bc86 SHA512 4356552630d1a154bbf369012c0315baf08b5b98ff6411d66ea3b1b039bfff5f105091b110e8fa1e64209eb0990038abda86d980cf2316ca97a5c10a43243df6
 AUX slurmd.initd 2001 BLAKE2B a0464ee0407406c7ceadd8e78f0229f5c6eda7081a691e24e609caa50f627d9bbf9c2d57bc6746b9c719a66cf2f4b0d756ecbbaf3bcd070846ad5ced6b289c9d SHA512 bb9447c25d2e96de1aea5935084ea78ea403701bd655d89d1a9d1d21bdbf88bdbae3888cfd618aabcc86dd8808401157ff84402ef35c4e138263457fd954046a
 AUX slurmdbd.initd 1717 BLAKE2B e177a937f8bd97bb2f45e479e0f34b23cc23ab44b0000165a856ff8476560638a567baecad8aa8d57aeb76062f248039da7f440ddca8f5827e4729136a10d7de SHA512 6d21f667f4222ab62dc8d7f648e00205da982612d58b98e8e35e6b6602b3ad31c03e5130402437c77d3677b424da7b5226e2bfa8c5d29bc908fd618fc02697a8
-DIST slurm-20-02-4-1.tar.gz 8689917 BLAKE2B 69d78b7f82065f7ca1c869c0648012cc23e746c81b1a76d612d96fe2c6c66cc2fc1727a1e164a0f6d338b568c45bb1ac78b815181325a3982957683b77ae60d5 SHA512 932989a3c03468783d244d9925472fb9bb4dd0007a91dccc37a3b12763ed81902ad0dc039b8527526bde58f7540d056727df4cdab7581182b028f67e597fb7d5
-DIST slurm-20-02-5-1.tar.gz 8690263 BLAKE2B dd05ea11cd59385135d8988b6490d3aea6aed9e487afb8e920fc5104408fb8b440c8e8af85732f888841d5d7f9a09e95e3df7cb91b5d0fa855ff9b2127265263 SHA512 3eaeee276453ab9aea4f0eb921e8172a912b86d59a93756fc0b83a8c08eeda04c9f3cf64a33d2eab0b8e8daefb19c0e0bfcb895a5aefb327eaf18ed4e216161d
-EBUILD slurm-20.02.4.1.ebuild 7988 BLAKE2B c95a6d86019b74668c7f3cdb46b0bddad929d438f6085b24edf4c44caf6c0a766251f05ebef3b77d675f5bab9e3c992185dea028d9d3334b3785f5b391b31cdc SHA512 ae6b7c18c32f217bc690ad53070e125e9259ba684e0683891f1ee61bb2b65189aad460e2eecca3fbc911a5abdabf83ba0b63fa3c1f56968c71bae2ad00983fa9
-EBUILD slurm-20.02.5.1.ebuild 7988 BLAKE2B c95a6d86019b74668c7f3cdb46b0bddad929d438f6085b24edf4c44caf6c0a766251f05ebef3b77d675f5bab9e3c992185dea028d9d3334b3785f5b391b31cdc SHA512 ae6b7c18c32f217bc690ad53070e125e9259ba684e0683891f1ee61bb2b65189aad460e2eecca3fbc911a5abdabf83ba0b63fa3c1f56968c71bae2ad00983fa9
+DIST slurm-20-11-0-1.tar.gz 8762691 BLAKE2B 1e24a04b3faf97f4df98bd982d67d47f79670b863f466326e45e00fac0b99124122e94e30054a97471e4337234cbd213806791bdd5b3bddfeb05bef55f42931e SHA512 9a57f2610f7294ba6cd265746b874e32a7930100f30c0adf41d95b261787c441bdcacaa641f0b9785150b94fc7d6b5b7608ec618f668bffcae6f774752f17678
+EBUILD slurm-20.11.0.1.ebuild 7764 BLAKE2B 252d3cb8c68645d40b1d0bfe28295d896985787c7b66213569f55ce39d40a2fbfdcac327963453e499948c11f81e9f278864a3174eb9fe3cf86bbe10b59af094 SHA512 3b69f91188cbd5cd436989c2f561c5cf553c2522c7fb46b072fd4b9e55f60f619a286f237f752f0c5072623989cbc7a5c89191a2b6d8144582219f1f1b7fc03c
 MISC metadata.xml 1199 BLAKE2B b52e7cae7554d439e7f25da2a80d98993d5c7f7abd5ba8b76c09bf60731b035040f976ac1bfc3c153f81b8feed89e2ceb5e6b676c25cc7b6219c4bcd87bd7e50 SHA512 8f48d582e61789373fc07ffd1db123cb8f43d337b03611972e480179ca5b43f2866392203f470d3d69784f2aae79cbcffdf583cba0aa4a9c25969f2c72a3f55f
diff --git a/sys-cluster/slurm/slurm-20.02.4.1.ebuild b/sys-cluster/slurm/slurm-20.02.4.1.ebuild
deleted file mode 100644
index 74a772b3b669..000000000000
--- a/sys-cluster/slurm/slurm-20.02.4.1.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/SchedMD/slurm.git"
-	INHERIT_GIT="git-r3"
-	MY_P="${P}"
-else
-	if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
-		MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate
-	else
-		MY_PV=$(ver_rs 1-4 '-') # stable releases
-	fi
-	MY_P="${PN}-${MY_PV}"
-	INHERIT_GIT=""
-	SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT}
-
-DESCRIPTION="A Highly Scalable Resource Manager"
-HOMEPAGE="https://www.schedmd.com https://github.com/SchedMD/slurm"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X"
-
-COMMON_DEPEND="
-	!sys-cluster/torque
-	!net-analyzer/slurm
-	!net-analyzer/sinfo
-	|| ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
-	mysql? (
-		|| ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
-		slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) )
-		)
-	munge? ( sys-auth/munge )
-	pam? ( sys-libs/pam )
-	lua? ( dev-lang/lua:0= )
-	!lua? ( !dev-lang/lua )
-	ipmi? ( sys-libs/freeipmi )
-	json? ( dev-libs/json-c:= )
-	amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] ) ) )
-	hdf5? ( sci-libs/hdf5:= )
-	numa? ( sys-process/numactl )
-	ofed? ( sys-fabric/ofed )
-	ucx? ( sys-cluster/ucx )
-	X? ( net-libs/libssh2 )
-	>=sys-apps/hwloc-1.1.1-r1
-	sys-libs/ncurses:0=
-	app-arch/lz4:0=
-	sys-libs/readline:0="
-
-DEPEND="${COMMON_DEPEND}
-	html? ( sys-apps/man2html )"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-user/slurm
-	acct-group/slurm
-	dev-libs/libcgroup"
-
-REQUIRED_USE="torque? ( perl )"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LIBSLURM_PERL_S="${S}/contribs/perlapi/libslurm/perl"
-LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
-
-RESTRICT="test"
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	tc-ld-disable-gold
-	default
-
-	# pids should go to /var/run/slurm
-	sed \
-		-e 's:/tmp:/var/tmp:g' \
-		-e "s:/var/run/slurmctld.pid:${EPREFIX}/run/slurm/slurmctld.pid:g" \
-		-e "s:/var/run/slurmd.pid:${EPREFIX}/run/slurm/slurmd.pid:g" \
-		-e "s:StateSaveLocation=.*:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
-		-e "s:SlurmdSpoolDir=.*:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
-		-i "${S}/etc/slurm.conf.example" \
-		|| die "Can't sed for /var/run/slurmctld.pid"
-	sed \
-		-e "s:/var/run/slurmdbd.pid:${EPREFIX}/run/slurm/slurmdbd.pid:g" \
-		-i "${S}/etc/slurmdbd.conf.example" \
-		|| die "Can't sed for /var/run/slurmdbd.pid"
-	# gentooify systemd services
-	sed \
-		-e 's:sysconfig/.*:conf.d/slurm:g' \
-		-e 's:var/run/:run/slurm/:g' \
-		-e '/^EnvironmentFile=.*/d' \
-		-i "${S}/etc"/*.service.in \
-		|| die "Can't sed systemd services for sysconfig or var/run/"
-
-	sed -e '/AM_PATH_GTK_2_0/d' -i configure.ac || die
-
-	hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-		--with-hwloc="${EPREFIX}/usr"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
-	use mysql || myconf+=( --without-mysql_config )
-	use amd64 && myconf+=( $(use_with netloc) )
-	econf "${myconf[@]}" \
-		$(use_enable debug) \
-		$(use_enable pam) \
-		$(use_enable X x11) \
-		$(use_with munge) \
-		$(use_with json) \
-		$(use_with hdf5) \
-		$(use_with ofed) \
-		$(use_with ucx) \
-		$(use_enable static-libs static) \
-		$(use_enable multiple-slurmd)
-
-	# --htmldir does not seems to propagate... Documentations are installed
-	# in /usr/share/doc/slurm-2.3.0/html
-	# instead of /usr/share/doc/slurm-2.3.0.2/html
-	sed \
-		-e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" \
-		-i doc/html/Makefile || die
-	if use perl ; then
-		# small hack to make it compile
-		mkdir -p "${S}/src/api/.libs" || die
-		mkdir -p "${S}/src/db_api/.libs" || die
-		touch "${S}/src/api/.libs/libslurm.so" || die
-		touch "${S}/src/db_api/.libs/libslurmdb.so" || die
-		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${S}" || die
-		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
-	fi
-}
-
-src_compile() {
-	default
-	use pam && emake -C contribs/pam
-	if use perl ; then
-		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" perl-module_src_compile
-		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
-		cd "${S}" || die
-	fi
-	use torque && emake -C contribs/torque
-}
-
-src_install() {
-	default
-	use pam && emake DESTDIR="${D}" -C contribs/pam install
-	if use perl; then
-		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" perl-module_src_install
-		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_install
-		cd "${S}" || die
-	fi
-	if use torque; then
-		emake DESTDIR="${D}" -C contribs/torque
-		rm -f "${D}"/usr/bin/mpiexec || die
-	fi
-	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
-	# install sample configs
-	keepdir /etc/slurm
-	insinto /etc/slurm
-	doins \
-		etc/prolog.example \
-		etc/cgroup.conf.example \
-		etc/slurm.conf.example \
-		etc/slurmdbd.conf.example
-	exeinto /etc/slurm
-	keepdir /etc/slurm/layouts.d
-	insinto /etc/slurm/layouts.d
-	newins etc/layouts.d.power.conf.example power.conf.example
-	newins etc/layouts.d.power_cpufreq.conf.example power_cpufreq.conf.example
-	newins etc/layouts.d.unit.conf.example unit.conf.example
-	# install init.d files
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
-	# install conf.d files
-	newconfd "${FILESDIR}/slurm.confd" slurm
-	# install logrotate file
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" slurm
-	# install bashcomp
-	newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
-	bashcomp_alias scontrol \
-		sreport sacctmgr squeue scancel sshare sbcast sinfo \
-		sprio sacct salloc sbatch srun sattach sdiag sstat
-	# install systemd files
-	systemd_newtmpfilesd "${FILESDIR}/slurm.tmpfiles" slurm.conf
-	systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
-}
-
-pkg_preinst() {
-	if use munge; then
-		sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"/etc/conf.d/slurm || die
-	fi
-}
-
-create_folders_and_fix_permissions() {
-	einfo "Fixing permissions in ${@}"
-	mkdir -p ${@} || die
-	chown -R ${PN}:${PN} ${@} || die
-}
-
-pkg_postinst() {
-	paths=(
-		"${EROOT}"/var/${PN}/checkpoint
-		"${EROOT}"/var/${PN}
-		"${EROOT}"/var/spool/${PN}/slurmd
-		"${EROOT}"/var/spool/${PN}
-		"${EROOT}"/var/log/${PN}
-		/var/tmp/${PN}/${PN}d
-		/var/tmp/${PN}
-		/run/${PN}
-	)
-	local folder_path
-	for folder_path in ${paths[@]}; do
-		create_folders_and_fix_permissions $folder_path
-	done
-	echo
-
-	elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
-	elog "through a (javascript enabled) browser to create a configureation file."
-	elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
-	echo
-	elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html"
-	elog "Your kernel must be compiled with the wanted cgroup feature:"
-	elog "    For the proctrack plugin:"
-	elog "        freezer"
-	elog "    For the task plugin:"
-	elog "        cpuset, memory, devices"
-	elog "    For the accounting plugin:"
-	elog "        cpuacct, memory, blkio"
-	elog "Then, set these options in /etc/slurm/slurm.conf:"
-	elog "    ProctrackType=proctrack/cgroup"
-	elog "    TaskPlugin=task/cgroup"
-	einfo
-	ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
-	for folder_path in ${paths[@]}; do
-		ewarn "    ${folder_path}"
-	done
-}
diff --git a/sys-cluster/slurm/slurm-20.02.5.1.ebuild b/sys-cluster/slurm/slurm-20.11.0.1.ebuild
similarity index 97%
rename from sys-cluster/slurm/slurm-20.02.5.1.ebuild
rename to sys-cluster/slurm/slurm-20.11.0.1.ebuild
index 74a772b3b669..e74fe466f7ea 100644
--- a/sys-cluster/slurm/slurm-20.02.5.1.ebuild
+++ b/sys-cluster/slurm/slurm-20.11.0.1.ebuild
@@ -190,10 +190,6 @@ src_install() {
 		etc/slurmdbd.conf.example
 	exeinto /etc/slurm
 	keepdir /etc/slurm/layouts.d
-	insinto /etc/slurm/layouts.d
-	newins etc/layouts.d.power.conf.example power.conf.example
-	newins etc/layouts.d.power_cpufreq.conf.example power_cpufreq.conf.example
-	newins etc/layouts.d.unit.conf.example unit.conf.example
 	# install init.d files
 	newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
 	newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 2e734be2ecd9..7a6104ad64a5 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index e3680aa29422..ae8b62c14001 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -1,5 +1,5 @@
 AUX ac-wrapper-13.sh 5055 BLAKE2B 66fd728f347cdb873007e51113225608b3dae87c5979ba512a5e65a3185d8278502cdbaa60675b33643e0f9f459cf3956967f8e07b198d442139abb06a75f597 SHA512 0bbe9a992cff140bd60161404f1d1f6a9da6c79b1e9909000092f5e1159e457edee3fcefcb8fcaf47cedd9a7074505c4a61bc25107277d248150cdde5f11c5b7
-AUX ac-wrapper-14_pre2.sh 5099 BLAKE2B 2c5561f5ddde45c2eba8e2fbdd17ba9f33140bc160048a3266c8da03de86fec5418509b48b49abf58a9f4d9028ac0a2a21b0ce4fbddfe2bb32cd4a1ec5ff22f9 SHA512 4396019ec735893cb60bc79a172a27cb9bfb942ea0c96d1a3d7364c3b9cace49757913af173370826e4809bac80397a38be67cad80b3670f02f74b45cc480323
+AUX ac-wrapper-14_pre3.sh 5099 BLAKE2B da3c4ecf070f30604d548e110c5f1ab0ee29e801c0c66d18bb1098ceec24616a515c24fe43a52e5cccf33bf4aac762a45726b38340f2f45a5f4d1ee3cc26d978 SHA512 e386e0260a616e7f4c02cdc970b44ed7b0200f498ef406bc11f78af0a910b7b79335e830df9ad5a5fd9dce6e31109e0a82553e77177cc470c851f7da53a2259e
 EBUILD autoconf-wrapper-13-r1.ebuild 816 BLAKE2B a5b0e9c7047aee1614b6af4ddd0d82307af513fb56ce0b2256234eb268a184afd7cb1129b5521a8b03fd1936505e951f89e9a2b33763689cd68d38353e1a9cd3 SHA512 cd35df1e8a453812f738ec7820862815fbb7124eb85ee95b5aa3b93185ac395193aec23ea3f1d540da25a84630347a69a975c918fb85c0d8118ad2f3059ca08a
-EBUILD autoconf-wrapper-14_pre2.ebuild 854 BLAKE2B 5a5b2a6dff654e10fff1477922395b074728d15ec0f9e139230935646bf3b600d73873cb24311d36609db1171e444b8dd0a3358c953f17968a23ef21acf4c33c SHA512 0eda50d8bdd3c8500de6c7cf759b9d20ed4c55215bf97414a7693e3063649878f8117d14e615fb595845e95cf676b477005ae9aa3a4e0f181993892d7f4c1cdf
+EBUILD autoconf-wrapper-14_pre3.ebuild 854 BLAKE2B 5a5b2a6dff654e10fff1477922395b074728d15ec0f9e139230935646bf3b600d73873cb24311d36609db1171e444b8dd0a3358c953f17968a23ef21acf4c33c SHA512 0eda50d8bdd3c8500de6c7cf759b9d20ed4c55215bf97414a7693e3063649878f8117d14e615fb595845e95cf676b477005ae9aa3a4e0f181993892d7f4c1cdf
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-14_pre2.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-14_pre3.ebuild
similarity index 100%
rename from sys-devel/autoconf-wrapper/autoconf-wrapper-14_pre2.ebuild
rename to sys-devel/autoconf-wrapper/autoconf-wrapper-14_pre3.ebuild
diff --git a/sys-devel/autoconf-wrapper/files/ac-wrapper-14_pre2.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-14_pre3.sh
similarity index 99%
rename from sys-devel/autoconf-wrapper/files/ac-wrapper-14_pre2.sh
rename to sys-devel/autoconf-wrapper/files/ac-wrapper-14_pre3.sh
index b414cf348339..177d2c641f15 100644
--- a/sys-devel/autoconf-wrapper/files/ac-wrapper-14_pre2.sh
+++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-14_pre3.sh
@@ -79,7 +79,7 @@ fi
 # Start at last known unstable/stable versions to speed up lookup process.
 #
 if [ -z "${KNOWN_AUTOCONF}" ] ; then
-	KNOWN_AUTOCONF="2.70_beta3:2.5 2.69:2.5"
+	KNOWN_AUTOCONF="2.70_beta4:2.5 2.69:2.5"
 fi
 vers="${KNOWN_AUTOCONF} 9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
 
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 204716cfc1eb..c815a32f6923 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -7,17 +7,15 @@ AUX autoconf-2.69-fix-libtool-test.patch 1093 BLAKE2B e7b98ae1c84d6d0a41daa16c71
 AUX autoconf-2.69-make-tests-bash5-compatible.patch 2275 BLAKE2B 17fd9702c37cc7686a232e0bb93e5fc04d11b65945f89d79673302bec393bd5572a961b0ecedd743b3336f2583534063b6dd9b3095d0cc6bbd4cf55a58145c54 SHA512 f2672e99afb69cf625097ba5e6d15356eec5c41e095ff60da33331184ecd635d97fa20f20a2db8cfdeb96fde14dca0cdee7081df3328e8032f66eeed58374e36
 AUX autoconf-2.69-perl-5.26-2.patch 1003 BLAKE2B e2a858f905f20d46a52ac7d78be63ef0ea5ce0b87a7059ea17317bed3b658c0eafe3f9d8b1b11f4d84d3160bfa3f504e980870fe562d7a1ba6da1c70177e49bb SHA512 b02086ac8a468a626d8b6506aa14e19ef10e4d33b91a7647f74d5746cce9f690d6cf5840ea81c593f63e8f94275974f31c8695065844380678e83153c1b547d0
 AUX autoconf-2.69-perl-5.26.patch 820 BLAKE2B 405d92044f338b8c7f0ebc6b0007938143c011eff116a65dd06a126a9ab3b127ee766c618e0d51caf88821d979632e7949c843ebad1c5c9e87ad066aa4a46376 SHA512 0202c099b85102dab18ad7d4268b836cadf587d0a48aefa386e70539b3b689fd580053d7287730f1d0a9cc97d6eeb41c1579a181a82a5cb2e04e436bb96d0b20
-AUX autoconf-2.70_beta3-build-aux_avoid_autoreconf.patch 12665 BLAKE2B 492810e53148add9fdf09d70ad919ab27cd0ccd441c4e1dd7a0439feb27cf4ea7a84286955396ecbe2a35688acbfd967fe4223e53f3c8a56ab1c660d5e4016d1 SHA512 f4683465a1a8e129cb9209364b1c0d11790157308e80c0a94e7c5e121876b2a3caaec95bae9837832ea7583b40768d276ed73484ef7a8eee709f549efa96a15c
-AUX autoconf-2.70_beta3-build-aux_no_transform_name.patch 2000 BLAKE2B f177580dad9ac81ab7d3313b999a2fc972102ae7e344974ad0ffaa33bc1ab4ecde4de703e63110261f3bf1e4c9ea608c7cc9c0d4320af634b144b9b5f09d28df SHA512 919be556d085d1a5c1d014fb5d18fcf41e53002c44197650b5e411f25ff800e442a58a256a38e66cc628d444b7e6126d543125535f079918ff4975a005a3a5db
 DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b074192b9892330402ddc5b62dda1a3485ce0c36e72191daa9fd49382b99851cb6aa3a13aca8cf2ae6e884638fb6 SHA512 602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad
 DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d1782f259846da48dc8106a1d32ae2b24f3a864c3be0e9e8dc7d6b6ca8781b83ff33a691c88e68391d1ea861ccf23 SHA512 ee4b504447c14a59b849d0915e55a90522cfb071d1583af2bd3575e5a05d7bd290e55e0e9d0760c8f36043f926199fc2d962b559d27d2f95c70d0e147b4ad0a3
 DIST autoconf-2.69-runstatedir_patches.tar.xz 257096 BLAKE2B ae765e0ca7fe8261117f6f6b75611c232fc3d4016c22c86346afa72f2b7e6c3b7ccc1f9dfe134b2443f8bde6d578b503d79cf88472f76ce75b6c2e843ef55b8e SHA512 55f93299fe5243151f6bb782986a7935270f06d5065929f4d365a37aba05703e3ce66ecf7981d30413db50ee6b4f77d81d10a71b539c8a366c5c5a156c5443da
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
-DIST autoconf-2.70_beta3.tar.xz 1321512 BLAKE2B 92dca4fbd6c247a3b3383289e1a2d6c127f5a333969b8a7051f98adfbe080e702c90b3001dde4759a84c89d5e7ccd7991e509492533a8753fd299aaa46080f1a SHA512 d825d9ce7501f0dfa667ad220339a1668c9472f0601a0ec7dac109af994cacfc2ce49dd01c478a47c7c25f98ba3726c735f1e7002e7b4da71451799f742a2eb1
+DIST autoconf-2.70_beta4.tar.xz 1338832 BLAKE2B 20c801e67d5aa811f0ae18dd0b5f90b843f017a584387a655541215e29f65b2c1e0145d3f436f9a9b9a5f5e35c94e52ed865e0db5b3b0c36c0e6f312e504b6e5 SHA512 e4de63c8be4736a3f864c75d3175b190067a543013935d1be1448060502c1f4c45258619dbf5d80ece96d8a0b5754a664ed084359234a427a3a08082ce12f1af
 EBUILD autoconf-2.13-r1.ebuild 1539 BLAKE2B 30a8d2ddaba7e878177c86ef825d41122c7c99f24ab77169833e0172bc3c3fb6f9879c3ad48863c4c0a2f305a9ce304f072b1afd02d3c01fa1ee5585dd14cf8c SHA512 033383d86e1b2097992a79e9078a931557041af2ddc09f02a3f256343a40ba5dc5ef5380232d1c88b6f0716936cb599ecb789a9a3b9af5be8bdd713f1b9b4ff9
 EBUILD autoconf-2.64-r1.ebuild 647 BLAKE2B 7af4ebd9fe46e9808285a02471375d268d8fb2e24f00d60a9aec1c962c6bacea1ae8f256b9decf22ffda6470bd3a44f43a89bb05bc91c667abd10bdceb171ece SHA512 abf831a67e7d72816a69ee00735a47e624fb74739ef4b3e8b901f660e2aaa285c44a5950fd29c19b27bc455466a27a654fa8472c958649178644b75f86001a89
 EBUILD autoconf-2.69-r4.ebuild 1331 BLAKE2B bfc38c5419976a69f7c8e80c26656760dfd2305f3fe6c18571cd9367017b5d564d761e314171da186b0f9e1a02a72b3287269f52fd9bada941f064b2da8dbdfc SHA512 77ea183450866b03f924af1455fd499c95e7db55493d457234d28966cae1edbaf267bdabd019d11b7260bb071a1f067aaaf6c5175aad3625119988148a3f5020
 EBUILD autoconf-2.69-r5.ebuild 1851 BLAKE2B aaedfb452edcdd3c6e7f23094250e0d055df02f47044532d4f32a0993375678e75f45c68f3214daa37895568786357ae7e9a51f264a2b497cba3541bae07fe5d SHA512 a6f4a86fbd1d3ea73748f7ed3f090af35c0c371eecba7977b5f5306663524e77d0dd4a7e3e58e88a6f020caab5a1d03708cc968916ecc632dea7d35dc0394eb3
-EBUILD autoconf-2.70_beta3-r1.ebuild 1716 BLAKE2B 94c9953bc1a61b2e90b3c8a67b096d64c68c2af4b3c537c934426e165db903b6b8c132cf1294b84805de463385fe019311fa328c51292ba63fc38aa8f5e789e1 SHA512 2fd2e545b771e58a34489500fac9bf8d3c86ef62e64e985939ca6ea15299deb87ae32a19172129b375b7b78c577dd54478973554bd92318f2c2485b317b1b9e7
+EBUILD autoconf-2.70_beta4.ebuild 1588 BLAKE2B aaa167ca0af81eb378c23e758d5ebe3ceb86caefbbfb46ed29a33758cd268c89c33f72dc8e2b0a30540714bf2a1afa7d2e6e815305c4231298ba4c273f73d53e SHA512 0f30506608a46f241cd16789937fd9fa453c50dacb29706e0887655c29a36dcefb6fcf8bb62da45dc7280af2fb90d4d60519f009a2cdd24eb30badd53fb4ed5e
 EBUILD autoconf-9999.ebuild 1201 BLAKE2B 54056afab7ae1d33423957ee088defa5210313283b1287dadacd86291e8029b2337707c75bc28cadb9c33c5933ac94142684ffed93112fffff5e59aa045a1cc2 SHA512 5fda1ae65b6831eaffbcb1ad1f63bfd0cbb98aabafa0abc183038e394931d7feeeba98a5d9824a54ca937aa9f62f332b3b363970b7a239c4a81faa0a3a22fb0e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf/autoconf-2.70_beta3-r1.ebuild b/sys-devel/autoconf/autoconf-2.70_beta4.ebuild
similarity index 89%
rename from sys-devel/autoconf/autoconf-2.70_beta3-r1.ebuild
rename to sys-devel/autoconf/autoconf-2.70_beta4.ebuild
index e4079a394a27..c11bf9d76d58 100644
--- a/sys-devel/autoconf/autoconf-2.70_beta3-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.70_beta4.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
 	inherit git-r3
 else
-	MY_PV="2.69d"
+	MY_PV="2.69e"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz
 		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz"
@@ -29,15 +29,10 @@ BDEPEND=">=sys-devel/m4-1.4.16
 	>=dev-lang/perl-5.6"
 RDEPEND="${BDEPEND}
 	!~sys-devel/${P}:2.5
-	~sys-devel/autoconf-wrapper-14_pre2"
+	~sys-devel/autoconf-wrapper-14_pre3"
 [[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
 PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
-PATCHES=(
-	"${FILESDIR}/${P}-build-aux_no_transform_name.patch" #753023
-	"${FILESDIR}/${P}-build-aux_avoid_autoreconf.patch"
-)
-
 src_prepare() {
 	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
 	if [[ ${CHOST} == *-darwin* ]] ; then
diff --git a/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_avoid_autoreconf.patch b/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_avoid_autoreconf.patch
deleted file mode 100644
index a884c503d164..000000000000
--- a/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_avoid_autoreconf.patch
+++ /dev/null
@@ -1,272 +0,0 @@
---- autoconf-2.69d/Makefile.in
-+++ autoconf-2.69d/Makefile.in
-@@ -221,10 +221,10 @@
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
--	$(am__configure_deps) $(dist_buildaux_SCRIPTS) \
--	$(srcdir)/doc/version.texi $(srcdir)/doc/stamp-vti \
--	$(dist_lisp_LISP) $(dist_autoconflib_DATA) \
--	$(dist_autotestlib_DATA) $(dist_m4sugarlib_DATA) \
-+	$(am__configure_deps) $(srcdir)/doc/version.texi \
-+	$(srcdir)/doc/stamp-vti $(dist_lisp_LISP) \
-+	$(dist_autoconflib_DATA) $(dist_autotestlib_DATA) \
-+	$(dist_buildaux_DATA) $(dist_m4sugarlib_DATA) \
- 	$(dist_perllib_DATA) $(am__DIST_COMMON)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-  configure.lineno config.status.lineno
-@@ -258,15 +258,15 @@
-     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-          $(am__cd) "$$dir" && rm -f $$files; }; \
-   }
--am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(buildauxdir)" \
--	"$(DESTDIR)$(infodir)" "$(DESTDIR)$(lispdir)" \
--	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autoconflibdir)" \
--	"$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" \
-+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" \
-+	"$(DESTDIR)$(lispdir)" "$(DESTDIR)$(man1dir)" \
-+	"$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autotestlibdir)" \
-+	"$(DESTDIR)$(buildauxdir)" "$(DESTDIR)$(m4sugarlibdir)" \
- 	"$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(autoconflibdir)" \
- 	"$(DESTDIR)$(autoscanlibdir)" "$(DESTDIR)$(autotestlibdir)" \
- 	"$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(pkgdatadir)" \
- 	"$(DESTDIR)$(pkgdatadir)"
--SCRIPTS = $(bin_SCRIPTS) $(dist_buildaux_SCRIPTS) $(noinst_SCRIPTS)
-+SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS)
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
- am__v_P_0 = false
-@@ -341,10 +341,11 @@
- NROFF = nroff
- MANS = $(dist_man_MANS)
- DATA = $(dist_autoconflib_DATA) $(dist_autotestlib_DATA) \
--	$(dist_m4sugarlib_DATA) $(dist_perllib_DATA) \
--	$(nodist_autoconflib_DATA) $(nodist_autoscanlib_DATA) \
--	$(nodist_autotestlib_DATA) $(nodist_m4sugarlib_DATA) \
--	$(nodist_pkgdata_DATA) $(pkgdata_DATA)
-+	$(dist_buildaux_DATA) $(dist_m4sugarlib_DATA) \
-+	$(dist_perllib_DATA) $(nodist_autoconflib_DATA) \
-+	$(nodist_autoscanlib_DATA) $(nodist_autotestlib_DATA) \
-+	$(nodist_m4sugarlib_DATA) $(nodist_pkgdata_DATA) \
-+	$(pkgdata_DATA)
- am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
- # Read a list of newline-separated strings from the standard input,
- # and print each of them once, without duplicates.  Input order is
-@@ -754,12 +755,23 @@
-   lib/autotest/specific.m4
- 
- nodist_autotestlib_DATA = lib/autotest/autotest.m4f
--buildauxdir = $(pkgdatadir)/build-aux
--dist_buildaux_SCRIPTS = \
-+
-+# These are declared as _DATA so that they are not subject to
-+# --program-transform-name; $(pkgdatadir) is sufficient to keep
-+# multiple installations separate, and autoreconf looks for them by
-+# their unadorned names.  However, autoreconf copies the executable
-+# bit when it copies these files into a source tree, and _DATA items
-+# are installed as not-executable, so we have to make them executable
-+# in a hook rule.
-+AUXSCRIPTS = \
-   build-aux/config.guess \
-   build-aux/config.sub \
-   build-aux/install-sh
- 
-+buildauxdir = $(pkgdatadir)/build-aux
-+dist_buildaux_DATA = \
-+  $(AUXSCRIPTS)
-+
- dist_man_MANS = \
-   man/autoconf.1 \
-   man/autoheader.1 \
-@@ -994,56 +1006,6 @@
- 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
- 	  done; \
- 	done; rm -f c$${pid}_.???; exit $$bad
--install-dist_buildauxSCRIPTS: $(dist_buildaux_SCRIPTS)
--	@$(NORMAL_INSTALL)
--	@list='$(dist_buildaux_SCRIPTS)'; test -n "$(buildauxdir)" || list=; \
--	if test -n "$$list"; then \
--	  echo " $(MKDIR_P) '$(DESTDIR)$(buildauxdir)'"; \
--	  $(MKDIR_P) "$(DESTDIR)$(buildauxdir)" || exit 1; \
--	fi; \
--	for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
--	done | \
--	sed -e 'p;s,.*/,,;n' \
--	    -e 'h;s|.*|.|' \
--	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
--	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
--	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
--	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
--	      if (++n[d] == $(am__install_max)) { \
--		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
--	    else { print "f", d "/" $$4, $$1 } } \
--	  END { for (d in files) print "f", d, files[d] }' | \
--	while read type dir files; do \
--	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
--	     test -z "$$files" || { \
--	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(buildauxdir)$$dir'"; \
--	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(buildauxdir)$$dir" || exit $$?; \
--	     } \
--	; done
--
--uninstall-dist_buildauxSCRIPTS:
--	@$(NORMAL_UNINSTALL)
--	@list='$(dist_buildaux_SCRIPTS)'; test -n "$(buildauxdir)" || exit 0; \
--	files=`for p in $$list; do echo "$$p"; done | \
--	       sed -e 's,.*/,,;$(transform)'`; \
--	dir='$(DESTDIR)$(buildauxdir)'; $(am__uninstall_files_from_dir)
--
--installcheck-dist_buildauxSCRIPTS: $(dist_buildaux_SCRIPTS)
--	bad=0; pid=$$$$; list="$(dist_buildaux_SCRIPTS)"; for p in $$list; do \
--	  case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
--	   *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
--	  esac; \
--	  f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \
--	  for opt in --help --version; do \
--	    if "$(DESTDIR)$(buildauxdir)/$$f" $$opt >c$${pid}_.out \
--	         2>c$${pid}_.err </dev/null \
--		 && test -n "`cat c$${pid}_.out`" \
--		 && test -z "`cat c$${pid}_.err`"; then :; \
--	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
--	  done; \
--	done; rm -f c$${pid}_.???; exit $$bad
- doc/$(am__dirstamp):
- 	@$(MKDIR_P) doc
- 	@: > doc/$(am__dirstamp)
-@@ -1385,6 +1347,27 @@
- 	@list='$(dist_autotestlib_DATA)'; test -n "$(autotestlibdir)" || list=; \
- 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- 	dir='$(DESTDIR)$(autotestlibdir)'; $(am__uninstall_files_from_dir)
-+install-dist_buildauxDATA: $(dist_buildaux_DATA)
-+	@$(NORMAL_INSTALL)
-+	@list='$(dist_buildaux_DATA)'; test -n "$(buildauxdir)" || list=; \
-+	if test -n "$$list"; then \
-+	  echo " $(MKDIR_P) '$(DESTDIR)$(buildauxdir)'"; \
-+	  $(MKDIR_P) "$(DESTDIR)$(buildauxdir)" || exit 1; \
-+	fi; \
-+	for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  echo "$$d$$p"; \
-+	done | $(am__base_list) | \
-+	while read files; do \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(buildauxdir)'"; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(buildauxdir)" || exit $$?; \
-+	done
-+
-+uninstall-dist_buildauxDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(dist_buildaux_DATA)'; test -n "$(buildauxdir)" || list=; \
-+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+	dir='$(DESTDIR)$(buildauxdir)'; $(am__uninstall_files_from_dir)
- install-dist_m4sugarlibDATA: $(dist_m4sugarlib_DATA)
- 	@$(NORMAL_INSTALL)
- 	@list='$(dist_m4sugarlib_DATA)'; test -n "$(m4sugarlibdir)" || list=; \
-@@ -1794,7 +1777,7 @@
- all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(LISP) $(ELCFILES) $(MANS) \
- 		$(DATA)
- installdirs:
--	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(buildauxdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(lispdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autoscanlibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \
-+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(lispdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(buildauxdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autoscanlibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: $(BUILT_SOURCES)
-@@ -1858,13 +1841,14 @@
- info-am: $(INFO_DEPS)
- 
- install-data-am: install-dist_autoconflibDATA \
--	install-dist_autotestlibDATA install-dist_buildauxSCRIPTS \
-+	install-dist_autotestlibDATA install-dist_buildauxDATA \
- 	install-dist_lispLISP install-dist_m4sugarlibDATA \
- 	install-dist_perllibDATA install-info-am install-man \
- 	install-nodist_autoconflibDATA install-nodist_autoscanlibDATA \
- 	install-nodist_autotestlibDATA install-nodist_m4sugarlibDATA \
- 	install-nodist_pkgdataDATA install-pkgdataDATA
--
-+	@$(NORMAL_INSTALL)
-+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-dvi: install-dvi-am
- 
- install-dvi-am: $(DVIS)
-@@ -1980,8 +1964,7 @@
- 	while read files; do \
- 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \
- 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done
--installcheck-am: installcheck-binSCRIPTS \
--	installcheck-dist_buildauxSCRIPTS installcheck-local
-+installcheck-am: installcheck-binSCRIPTS installcheck-local
- 
- maintainer-clean: maintainer-clean-am
- 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-@@ -2003,7 +1986,7 @@
- ps-am: $(PSS)
- 
- uninstall-am: uninstall-binSCRIPTS uninstall-dist_autoconflibDATA \
--	uninstall-dist_autotestlibDATA uninstall-dist_buildauxSCRIPTS \
-+	uninstall-dist_autotestlibDATA uninstall-dist_buildauxDATA \
- 	uninstall-dist_lispLISP uninstall-dist_m4sugarlibDATA \
- 	uninstall-dist_perllibDATA uninstall-dvi-am uninstall-html-am \
- 	uninstall-info-am uninstall-man \
-@@ -2015,7 +1998,8 @@
- 
- uninstall-man: uninstall-man1
- 
--.MAKE: all check check-am install install-am install-strip
-+.MAKE: all check check-am install install-am install-data-am \
-+	install-strip
- 
- .PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am \
- 	check-local clean clean-aminfo clean-cscope clean-generic \
-@@ -2026,24 +2010,24 @@
- 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
- 	dvi-am html html-am info info-am install install-am \
- 	install-binSCRIPTS install-data install-data-am \
--	install-dist_autoconflibDATA install-dist_autotestlibDATA \
--	install-dist_buildauxSCRIPTS install-dist_lispLISP \
--	install-dist_m4sugarlibDATA install-dist_perllibDATA \
--	install-dvi install-dvi-am install-exec install-exec-am \
--	install-html install-html-am install-info install-info-am \
--	install-man install-man1 install-nodist_autoconflibDATA \
--	install-nodist_autoscanlibDATA install-nodist_autotestlibDATA \
--	install-nodist_m4sugarlibDATA install-nodist_pkgdataDATA \
--	install-pdf install-pdf-am install-pkgdataDATA install-ps \
--	install-ps-am install-strip installcheck installcheck-am \
--	installcheck-binSCRIPTS installcheck-dist_buildauxSCRIPTS \
-+	install-data-hook install-dist_autoconflibDATA \
-+	install-dist_autotestlibDATA install-dist_buildauxDATA \
-+	install-dist_lispLISP install-dist_m4sugarlibDATA \
-+	install-dist_perllibDATA install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-man1 \
-+	install-nodist_autoconflibDATA install-nodist_autoscanlibDATA \
-+	install-nodist_autotestlibDATA install-nodist_m4sugarlibDATA \
-+	install-nodist_pkgdataDATA install-pdf install-pdf-am \
-+	install-pkgdataDATA install-ps install-ps-am install-strip \
-+	installcheck installcheck-am installcheck-binSCRIPTS \
- 	installcheck-local installdirs maintainer-clean \
- 	maintainer-clean-aminfo maintainer-clean-generic \
- 	maintainer-clean-vti mostlyclean mostlyclean-aminfo \
- 	mostlyclean-generic mostlyclean-vti pdf pdf-am ps ps-am tags \
- 	tags-am uninstall uninstall-am uninstall-binSCRIPTS \
- 	uninstall-dist_autoconflibDATA uninstall-dist_autotestlibDATA \
--	uninstall-dist_buildauxSCRIPTS uninstall-dist_lispLISP \
-+	uninstall-dist_buildauxDATA uninstall-dist_lispLISP \
- 	uninstall-dist_m4sugarlibDATA uninstall-dist_perllibDATA \
- 	uninstall-dvi-am uninstall-html-am uninstall-info-am \
- 	uninstall-man uninstall-man1 uninstall-nodist_autoconflibDATA \
-@@ -2200,6 +2184,14 @@
- 
- lib/autotest/autotest.m4f: $(autotest_m4f_dependencies)
- 
-+install-data-hook: install-data-hook-make-aux-scripts-executable
-+install-data-hook-make-aux-scripts-executable:
-+	for s in $(AUXSCRIPTS); do \
-+	  chmod +x "$(DESTDIR)$(pkgdatadir)/$$s"; \
-+	done
-+
-+.PHONY: install-data-hook install-data-hook-make-aux-scripts-executable
-+
- man/autoconf.1:   $(common_dep) man/autoconf.w   man/autoconf.x   $(binsrcdir)/autoconf.as
- man/autoheader.1: $(common_dep) man/autoheader.w man/autoheader.x $(binsrcdir)/autoheader.in
- man/autom4te.1:   $(common_dep) man/autom4te.w   man/autom4te.x   $(binsrcdir)/autom4te.in
diff --git a/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_no_transform_name.patch b/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_no_transform_name.patch
deleted file mode 100644
index 079fa15306ca..000000000000
--- a/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_no_transform_name.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 0f7e5a5477f97b8a105d563bc7590ebefaff854d Mon Sep 17 00:00:00 2001
-From: Zack Weinberg <zackw@panix.com>
-Date: Thu, 5 Nov 2020 10:19:26 -0500
-Subject: Do not apply --program-transform-name to build-aux scripts.
-
-autoreconf expects to find $(pkgdatadir)/build-aux/config.sub etc
-under those names, not names modified by --program-transform-name.
-Placing them in $(pkgdatadir) is sufficient to keep parallel
-installations of autoconf separate: anyone doing that would need
-to adjust @PACKAGE@ anyway.
-
-* lib/local.mk: Use a _DATA rule, not a _SCRIPTS rule, to install
-  config.guess, config.sub, and install-sh.
-  (install-data-hook-make-aux-scripts-executable): New hook rule.
----
- lib/local.mk | 23 +++++++++++++++++++++--
- 1 file changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/lib/local.mk b/lib/local.mk
-index d4ecf3cb..e380403f 100644
---- a/lib/local.mk
-+++ b/lib/local.mk
-@@ -201,8 +201,27 @@ lib/autotest/autotest.m4f: $(autotest_m4f_dependencies)
- ## Install auxiliary scripts.  ##
- ## --------------------------- ##
- 
--buildauxdir = $(pkgdatadir)/build-aux
--dist_buildaux_SCRIPTS = \
-+# These are declared as _DATA so that they are not subject to
-+# --program-transform-name; $(pkgdatadir) is sufficient to keep
-+# multiple installations separate, and autoreconf looks for them by
-+# their unadorned names.  However, autoreconf copies the executable
-+# bit when it copies these files into a source tree, and _DATA items
-+# are installed as not-executable, so we have to make them executable
-+# in a hook rule.
-+
-+AUXSCRIPTS = \
-   build-aux/config.guess \
-   build-aux/config.sub \
-   build-aux/install-sh
-+
-+buildauxdir = $(pkgdatadir)/build-aux
-+dist_buildaux_DATA = \
-+  $(AUXSCRIPTS)
-+
-+install-data-hook: install-data-hook-make-aux-scripts-executable
-+install-data-hook-make-aux-scripts-executable:
-+	for s in $(AUXSCRIPTS); do \
-+	  chmod +x "$(DESTDIR)$(pkgdatadir)/$$s"; \
-+	done
-+
-+.PHONY: install-data-hook install-data-hook-make-aux-scripts-executable
--- 
-cgit v1.2.1
-
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index b2195b31cfa1..61fd66a78459 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -10,6 +10,6 @@ DIST bison-3.7.4.tar.xz 2617336 BLAKE2B e49a4a6fba1dc93314133541c24c6619b465a818
 EBUILD bison-3.1.ebuild 2482 BLAKE2B 2595a1242d213c2839fd7cf1d3a069b666d3915d1e86a4903ee35136be9018bc5d0a960c9e4c24927c9f0573d76802a764ab8da9157ab399dd000238d196760c SHA512 97f27e6390787b602ad7aad377e1d8313d58036e7b3f3acb141b009bd8327839e2cac72ae3231d8ffed5fbaeb66298c356834956c8ea5665d1b0e674751457db
 EBUILD bison-3.6.4.ebuild 2456 BLAKE2B 3d5bf57304e3cc58529ab940baa619b0300592dffcd9de892afb694a0efe1e023e10960998418c2bea6f06f8438eb6a59772da67f077040b4f13b61a64e55cc1 SHA512 4034360fdeb456588bc8e0c86709efb1cdd4e775c484fecb93c5d0f804229f108d0470fad4f3964ba18cfb6d4a268c775dc159548a30ebfe238ce846191d4b2d
 EBUILD bison-3.7.1-r1.ebuild 2564 BLAKE2B 39e2951e7b56da27efe14877358c2f290cca25c60a4beda65854edc4923b10ed8e51074dffa8578ae03ab6c673fd07d1345269e30b296cdc7fa4d3ab7a0a106c SHA512 b377a5c91dfc518f51778d9ff81b5410b7631cf7c3a24618ecb21e1b80084afbe2f8a128bfbae0c753f72ea1bc1f2640624755316737294158a445646151f09c
-EBUILD bison-3.7.3.ebuild 2467 BLAKE2B 2ff19e248de0e3776637da828ec0877ca7759482e444fd044e658c87f807c41a41c4f2ad3dff046c53a57f6555206dffc39f67dcca30258231fd8b06e91c4710 SHA512 742ea840f92996802971b1facaa9159bd806653a2ddf1816d25d31c5f61d0d8d74040ee2e6125e70d246346afdb4db2fd06a0cd5cac1fff4365f20a475411c43
+EBUILD bison-3.7.3.ebuild 2465 BLAKE2B 9c6756af434e16cdad3238904a503c515d6e68b0637ee412e9d692581bc0fa45de269d489cd980d575841ba75ff9a6f0aa498caff25725a3f24a766b5615f9ee SHA512 3b5102af2adb4ace723245d88bdc9283649e333cd0cb9084e135a3a5884b83c53a290abbc380e7f808916c5bd831ee5a3ea6c82f16b6fd32f95f2a3a0fefa1fd
 EBUILD bison-3.7.4.ebuild 2472 BLAKE2B eb303a11c93c006e1c90ba0b7f1fdf00f7ba5220d2b7ac64b49e1206cf43fd76f07dfd4a44f323e39a6eea666fa4e5ae858e9bee398e0b497d0cfe813adac68f SHA512 c4b89e95de226dfe0f74b366ce65ff27bd58a48b50e55c4fc1df776c5f4d6b7cd88b6ce1e182a70987b56be4041231ffd6fc517a4f363ab932163fa2344da282
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bison/bison-3.7.3.ebuild b/sys-devel/bison/bison-3.7.3.ebuild
index faaa396f35c2..b32068f1bd0c 100644
--- a/sys-devel/bison/bison-3.7.3.ebuild
+++ b/sys-devel/bison/bison-3.7.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/prelink/Manifest b/sys-devel/prelink/Manifest
index f153ff72aa04..70dffcb04799 100644
--- a/sys-devel/prelink/Manifest
+++ b/sys-devel/prelink/Manifest
@@ -6,6 +6,6 @@ AUX prelink.service 108 BLAKE2B 69055f868da9a2e0a2f91e18b7846f4219ca599d8594e133
 AUX prelink.timer 140 BLAKE2B 2ed2a1d3b2d64c8d7329c888bf72cddb154a0d09b95d6dafe30ea4422ab7043bf62eabc121ea8d0bcc48585b28e969a8a34e8a9f3a4c755361f9d3d0e80d09a0 SHA512 66d06121fa0f7b797baa8a29350e001cdae0c3f9c02b348f5c686c417c12de0ba0b1f044e90a6a74d521fe0134f23dd9ef19cc7a6226a55616b42d483f48b5fb
 DIST prelink-cross-20151030.tar.bz2 701337 BLAKE2B 4875b936254a03afd0eeb1ee81ee99f97a2d654b7c0379acb80ea3763412f3e892c366a9962ff3e1493bba9c83a8a140e79a1d5fb08b269a08ef596d63fd1d32 SHA512 75edd8617b95ae5bd3bfc968732ee142c968855c97c5b2b93784d3476a9724e0fd9a4eb7af681a5356616a4f023e24d5c5a2e75fb57e2a25b142cc901d9bfcaf
 DIST prelink.pdf 474129 BLAKE2B 6df5d4998d0822a8032c5dcd1103d7eafa8e9002f2cbfa8fa821131d7c804d2998100dc98d310ae3ae601137b6815435ecdd2684d547a8d25025984c20c06318 SHA512 86b7163fcf6f43d1764183b3dfc30aad8de99ce198b2721af276c81fc361e9f5fd8f4aea1e8e0c653f0566e8346dff4b4ba72909359167aa92c094f5561d2e1e
-EBUILD prelink-20151030-r1.ebuild 1790 BLAKE2B 451d353fcd6b153f8e7d82227aeffa03bb81807ff1b1d159538588af4856f6fe196e24c84a673901b5be61aa255eaf22fe1af3cd2f1ac82fdef5ece1ae39c36a SHA512 e9a57df9ff5c27e5c3e090fda02831eadc9aa5cfedf94395cdf84d05b19adbfaf55a148c9d1c926a73b5b141d1f7d226d7dfa3676ca6efaac2eaa3b4b76c8d98
+EBUILD prelink-20151030-r1.ebuild 1797 BLAKE2B 63cfcbca4ba06f7624eba4724fc2e76985df9900379a895a27eaa3e393f93dd0ad9702b84c7ccbf14fd564b6859229140fd33e39ed766639eff1f64eb01e09f0 SHA512 01827dd31ebfd6dec7c37523c1e6ca13aafc89f6b328426ffd4521389d8ee0f1175d2267a6ddb3e05b7cad2c49e7938aa2fcb85781934e0f588a6a77f05fb42d
 EBUILD prelink-99999999.ebuild 1723 BLAKE2B abdb7d80d8a9a1330fd5e9c67c40e9c4a26fa7b849726249f35ccd541ba219607d5bc00a81de4c1b86b4fa51fe542de04636251958687ce6ce1afbb9c6856fb9 SHA512 a070d459d47e21ecb1f550f56b4cd1ecbd224a43184e11788062adfaeacb45cd404da0c4834301b6b2150151673d9e4b2b0e712342eb406f29a63679b20cb1a9
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/prelink/prelink-20151030-r1.ebuild b/sys-devel/prelink/prelink-20151030-r1.ebuild
index bdc53549a487..17c39b3993ef 100644
--- a/sys-devel/prelink/prelink-20151030-r1.ebuild
+++ b/sys-devel/prelink/prelink-20151030-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://git.yoctoproject.org/cgit/cgit.cgi/${MY_PN}/snapshot/${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="doc selinux"
 
 RDEPEND=">=dev-libs/elfutils-0.100
diff --git a/sys-devel/slibtool/Manifest b/sys-devel/slibtool/Manifest
index 70cecd906ec1..1199996e2ae8 100644
--- a/sys-devel/slibtool/Manifest
+++ b/sys-devel/slibtool/Manifest
@@ -1,3 +1,5 @@
 DIST slibtool-0.5.28.tar.xz 61124 BLAKE2B 86333684b6572a09fdc258146f245815a5febb9963311b241d2eb0df756fd05937e85d195af0a5e1eeaebb9051ad926b9330d76b18cfde6c7b1e3294c642af81 SHA512 bfd9a39a60203606286af53ba9acc8d06490691cec7edae5ab6978b8547029412881b9895e8e0470c4f70bc9c349fdc6918200aaac810df99cf628e5848c6563
+DIST slibtool-0.5.31.tar.xz 70008 BLAKE2B aa46b2bfe02e22dabb3dc56b2de9521ef8fd3b54774561bcccca15763c8ee88154a03bb6defd4f6b828eaadb040e66725d18b788aac0a4d0170ce02cb044e9eb SHA512 658ea3244c6d1e9bd389ea5c222c29df6ba7acc5d6f2ada7a94dd3ac29ffbb681f377d8887a99861ab2ab484a7d3551e020bac2b92bdb07ad0e9ee96facfc6bd
 EBUILD slibtool-0.5.28.ebuild 426 BLAKE2B c2dc699691870320b1f1368846b599277b101a7a6721ff9e0a2a3039b1ce9e6c25330ac2494a5e735be0b39bf6960d01339c0e6e2397c426bb5cb28501184116 SHA512 e81d7fe8ae95b6076000b45050a2490cef2f4c39e06b6374578cdbcd07b7259ce1cb9b7ac8fa1e21600f32219d9b4c665041f5984376f0fb54a7d599bee01616
+EBUILD slibtool-0.5.31.ebuild 481 BLAKE2B 8ada2b664076fc2570991c47357e05d6bb227151881cdee8a5593dc1e32a1ff9e42a86f2789087609070cc9afc346359c9daf9c86146fbf118787411c4ad0583 SHA512 d14e5365748e0b9da1ea2d643cd9e40afe2143fadd6cbdfa38654e2d591904d7190f6723e93806d5253a4bfb7b97840787bf2af221f971d3b03e8c46529f2cbc
 MISC metadata.xml 365 BLAKE2B 9fe6afdbd6ccfb6b2bb5283a69ee95db93a6de6f487718be7b190a19204cb9e6426bbb8f2f1536fd6512c819955b5214c70c151344668ebf2c58827cbdcd24bb SHA512 f87d93b660215d0d7271ecb980798e1c5bef9ab24a4773ea2e60748cfa4dd57644567820d5862e33520b7a71f4ef07bac60265f0e656a26aad5360c74b7611fd
diff --git a/sys-devel/slibtool/slibtool-0.5.31.ebuild b/sys-devel/slibtool/slibtool-0.5.31.ebuild
new file mode 100644
index 000000000000..d446adc69292
--- /dev/null
+++ b/sys-devel/slibtool/slibtool-0.5.31.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A skinny libtool implementation, written in C"
+HOMEPAGE="https://git.midipix.org/cgit.cgi/slibtool"
+SRC_URI="https://git.midipix.org/cgit.cgi/${PN}/snapshot/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+
+src_configure() {
+	# custom configure script (not generated by autoconf)
+	./configure --host=${CHOST} --prefix="${EPREFIX}"/usr || die
+}
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 58b6b9c7e039..6a9a0e802a87 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/bluez-firmware/Manifest b/sys-firmware/bluez-firmware/Manifest
index 2f100fcd491c..9e35d9bfab2b 100644
--- a/sys-firmware/bluez-firmware/Manifest
+++ b/sys-firmware/bluez-firmware/Manifest
@@ -1,3 +1,3 @@
 DIST bluez-firmware-1.2.tar.gz 370623 BLAKE2B b7a1c4b8d038db681cb4cc789a51a67148fb53f81a1e23d8d3364cf08f620f717eeff05b6ddf0464e93a8995dd7d5d122c3cff91b40e2a6598777830bbc05b57 SHA512 15db2f9d38a496882e4cc3754af1e58aa99e1b849f2066c541d76c66a8ffdc5532799fe1fd473cfc158bf5ea86a46687716cbcf83c6dcac0ce66d97d679648dd
-EBUILD bluez-firmware-1.2.ebuild 465 BLAKE2B a2904bb194f5ab5152385538faf97f2b7bd5e2a83a8204ca8498c1cb8fa9a42a97bfc12c3fcf42780e09fc2c075131125527256034daacb33a14306bf792ca99 SHA512 2da3bcf8d9b67ffd7f7e1f80bac5056469e6751db37c35243717cdea13c8089f0b94d96a27e0c82aa98ef2496b3cccf2cff6333e2dabc9f4e9325e4ee19eec9d
+EBUILD bluez-firmware-1.2.ebuild 469 BLAKE2B 08d8aa0096410281f3e51952d9246d611ccd5e95879f95b7963105ec72d9143397fd7e51b70b03f4e0c3b3b6146fed0b52125019c09aa49af00e521a16623fcc SHA512 fb53b36c05024b1aaa653be353d2d590b049414e206e43e502280184337e0776ff323ccf503d75e5bb02b5f27c1f4be1ab732707a23d892996e2c5a18f03cc8b
 MISC metadata.xml 242 BLAKE2B 78d3015bdf37096017ab68dacb081eb118362ceee2a5fe91a537403e0361b92b0577d545c5ed2604eb7c33ceabc8125eeb25341ff49b33a732d587bc226c3185 SHA512 177ec4d2bc092d7b041afde72e44300ad7952d5bf13f267aa811b0f958b6d34c78a7a5951bef746d3e4ad2f1cd8fc8acb73b8fc60aaa1ebb6af6edc903222db7
diff --git a/sys-firmware/bluez-firmware/bluez-firmware-1.2.ebuild b/sys-firmware/bluez-firmware/bluez-firmware-1.2.ebuild
index 1085fb206560..76c7d42baa1a 100644
--- a/sys-firmware/bluez-firmware/bluez-firmware-1.2.ebuild
+++ b/sys-firmware/bluez-firmware/bluez-firmware-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ RESTRICT="bindist mirror"
 
 LICENSE="bluez-firmware"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
+KEYWORDS="amd64 ~arm64 hppa ppc x86"
 IUSE=""
 
 DOCS="AUTHORS ChangeLog README"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index dafc6c8b619e..d23ea12e3ee7 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/dmraid/Manifest b/sys-fs/dmraid/Manifest
index 8d67bafa0ae9..aa3fb380a990 100644
--- a/sys-fs/dmraid/Manifest
+++ b/sys-fs/dmraid/Manifest
@@ -6,5 +6,5 @@ AUX dmraid-1.0.0_rc16-undo-p-rename.patch 531 BLAKE2B eef9d2ef5f2766773bf83bba93
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
 EBUILD dmraid-1.0.0_rc16-r3.ebuild 3266 BLAKE2B cae1fe9893033caa1ef9c166e5d76582520e0d672b2d2124183a1ea88268d21c90205bc49515cca08d6104024d46490840cba2391f1ee77b13e14da61cf767eb SHA512 509e0ebed35e1a7b6832dea0d69d10dd5ae96cf48605117ba228d5c12a8dbe7c52d91a48bf73bde8ac0efabd1b30743671e9d1f4effc5d8489826e765940d690
 EBUILD dmraid-1.0.0_rc16-r4.ebuild 3199 BLAKE2B df8cc50e363a354ebbcfa4adbb98b3fac4d4ee23a102950819a4337576a69bc7d8501f73f9fa62f908c8d37220135546b15f1b8329d7179cd6270972ba27e94b SHA512 db1ac9ee6140aae30d3124895d4b8cffb414663449c53f5559a6d76f17d19433057419516c8978fc9b8afea0462f9071695d7042e766c427b08d86bf0432b9f4
-EBUILD dmraid-1.0.0_rc16-r5.ebuild 3295 BLAKE2B 56f9cd517355efbfe9534b5dbeb9374b7f432090edfd62a5bd654aae0e03dbaf824674e73a6966a7bb5d29aac31e2667e3b57d018aebf0ee912fb03f211d0bca SHA512 4a0674eb7eafbcb82e9f5aaaf65b926c4190ea44e5852fa7dfedebc7e238c98e543b1e005f9a154bf817e2a77e2bad934a0301777ae29a3d352afb0aa07993fb
+EBUILD dmraid-1.0.0_rc16-r5.ebuild 3302 BLAKE2B 80754d66d259660813df47f4378cff9541fc34cee3e7bc1314bea542c71cfc7635e18c11c1ea871dbf60af4b572df5bd2c6b8b08786fae3ced93357ca9c652d0 SHA512 306fa1221f44860fcf29fda84f481df1d87c04c975504ab2cb762e07e33c426981386f283f4d01d9d9dcd3e0f9cb1b91abe5cbec8cf42a88270245b40347f42d
 MISC metadata.xml 769 BLAKE2B 58eaf54f32d2bdfa2bdcdb149d97a5e23cfaa91edcf261041953b46ca79291dc8f687da56d9fc2c821697fe69cdc54f78515581566c2ab4a5afc125273e4c3a4 SHA512 e716dad80405dae942af5ded092214854432f43a5c622e8ce41f36af3f514c9425de401da278e2b0a2abc96103e4894896ff539f5665e5c48ec2640e57d11e26
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
index a4b58735f59a..7d42581d1fd8 100644
--- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://people.redhat.com/~heinzm/sw/dmraid/src/${PN}-${MY_PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="intel_led led mini static"
 
 RDEPEND=">=sys-fs/lvm2-2.02.45"
diff --git a/sys-fs/jfsutils/Manifest b/sys-fs/jfsutils/Manifest
index bcc8c804fd17..498be7e545a9 100644
--- a/sys-fs/jfsutils/Manifest
+++ b/sys-fs/jfsutils/Manifest
@@ -4,5 +4,5 @@ AUX jfsutils-1.1.15-gcc10.patch 2015 BLAKE2B 58accef19b804367f6801724a443e9eefd3
 AUX jfsutils-1.1.15-linux-headers.patch 318 BLAKE2B c04fc414526ed854ed9fd0ac6cd8c1874c924e4446ade2ec85eec2ccbdd8a9c6f580fe6b4b91e61050a468855c46082f2373de08246640362ab81b8e74199cad SHA512 1fd097f403e0ffd434b433fcbf20664166b7ed9b9878f81719d45747fc96249ebac25f8afc9f1f6e532bfac90fe98f1474bb616da3c83fd69cc57d2fe3c11815
 AUX jfsutils-1.1.15-sysmacros.patch 276 BLAKE2B 5c45f4bfc1a03843f59d715bf1c837f33a455e74508b82360c7f77ecd19205e23bc53f445e1bb8c03ca5e88d210685e0dc0ac28f8dfa3eb0b88c4347888e94fd SHA512 3f6472cdfc706e32cc2cefdf673450cb98e81c24c16dea47cacd95f83d75461c8750a9f4dc73ac30782d91e2b7814efdc7e736ef30bffb6cc8ceaf6dba8d51d5
 DIST jfsutils-1.1.15.tar.gz 539148 BLAKE2B 8fe3b4b157482311e7afd938b0d7d22af62a4d342c5d0e6527fc04a90ecc3a5b80de226a4faec582b17bb5a5f10371ab8e0f87e72dc5e1211a0b79180cc5a952 SHA512 fa8ba7f4997471da3e6ea7239564f3395046222cfbb2b10e37b24ad0bd107b7eadbb51ce328d89d193034360b4035ca5e0e5b0b416a74483d7a2c0a2b9c65858
-EBUILD jfsutils-1.1.15-r1.ebuild 1211 BLAKE2B e7d449eda7a3419417b8f74142f48d1e13a06e9029f824498d31035ad72fab053191fa73e5615759ae2dcd0c1a17ed42e59808f408237c9b3d8273ec568a00a0 SHA512 ffbb3a604b0c781f8ada406873c17e008b9626accad700197d062ad9a0aa1966327bacb135664e625e585a7c07d8418fdbb6272fb164e06338d34e010b08fdd2
+EBUILD jfsutils-1.1.15-r1.ebuild 1218 BLAKE2B 67890f2cb6f5284e00d7770477f18a38811fef5ee3bf95ca59c20798248a2cd8072be2afa9b37c9f60df7383b4627de6cee7d296c249e928b4e3b410f5dbc87e SHA512 ac1b2cee8bbc0c54f193d782dc5525c08ad10cbd76f59664b41ece9396f0f182261f475635fdde34b72f2bdde3b6a82624410310100aaa60f70202089d5377fb
 MISC metadata.xml 683 BLAKE2B db09548b3469462387d1835ad1c835cb45be5fdf5f18b4940ba35e20a1dd5a57159519e862672fdf08989a0c1b4351d721226ee289523fc214dfafb506150f23 SHA512 e81833363d32078db3c370d6a3faa1803857af05e6df470bc3b625da06680bcf725b443697ef356d73d3b4d4c7e4230ba54459e260f9a5e738978a08742af189
diff --git a/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild b/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
index 2a8654317bd8..bdca7f2146f3 100644
--- a/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
+++ b/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://jfs.sourceforge.net/project/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
 IUSE="static"
 
 LIB_DEPEND="sys-apps/util-linux:=[static-libs]"
diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest
index 80e33c8123a8..0ecef932eee8 100644
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -4,5 +4,5 @@ DIST mtd-utils-2.0.2.tar.gz 355964 BLAKE2B 9a795ddac1287c7c44f52215faa4b6295cf5a
 DIST mtd-utils-2.1.2.tar.gz 380333 BLAKE2B 46cccf9cbe870f3415237deaa00a3ff57fbaacc019d4adc69e1ed516e752e58776ed5f53be0d46baef69dff8a0d90e1df5ca32a80ecbb620dd4bb0231f8c94dd SHA512 bd2d61d81f367a1d9f5345fa3985f5403e37fad1c1f811e2ab291b64339170514aa1fbceb89b78ba7a357f8cc3d7ade99796e9318c9624a40e2266fa0b3a9921
 EBUILD mtd-utils-1.5.2.ebuild 1577 BLAKE2B b180c7b895a621d8ee4078b5ab94ed92d3d41b0c88f47898fa8f0ecc42b85b446e7c92537d9417e03675f45925344c37af0cbc1be98e5116cda0ed7076e4bd5e SHA512 19af1ceda473ad24fc128c2f6704d9d33b630dc63aa4975b03cd5139978d55669210617597f2128d4fd192908428dcddadde2900749bf8db76408e4239ba5216
 EBUILD mtd-utils-2.0.2.ebuild 1334 BLAKE2B 5ba40d20c85da672c1c066bbae5b9ab2396aec08c97dd6688a08886c70f393c7004ca879860d3d9ce499db9835ae8305e38e75427a7bfc3d0c24451c2387241c SHA512 7d8e5bafe51f74121c167261c43023bc889baab53ba60e8c69cac792a0b9ca5011e8082d4d2bb59d0ef8b803fd9154e706301e05586b4760a1f730f34bcaef21
-EBUILD mtd-utils-2.1.2.ebuild 937 BLAKE2B e141ed661b76f446d363103893685ad88cb940f702929ecfd438a3de2ba6bae6ef339abc4d260b2b81937ddd76233cdab51b0d3a783c8e2ee3ceda976f79db0d SHA512 dd6a9fd6d4dc454cb82020c1bd5bb498c204be3669ca18536901d0b499c16471d9f8da75a0612fc6e0380b8acc5188b2edc471f14243119bf13def14b2b9a72e
+EBUILD mtd-utils-2.1.2.ebuild 935 BLAKE2B f8d9c0dd764c9f3fe78aa1245f2172aa884b282c5f92d44216e9641148e3ee6135ccb1a3bc476ae4060b7884f0362aa236246d956995d1961794ff044833b403 SHA512 2875c2174906d106ce4a234ba569520604037f480977b560d758bbdd5e3e073f8e1ba5f6b5172a8085ed416cfa3a0a2e6d18e1139dbbf13802c1a29697dbe154
 MISC metadata.xml 416 BLAKE2B 88cdc71a56448e05d3d8bba7b5bb031b043d7b798ad40a04d7ab416b5148fc9c27501366991d26a51f44186953fa6eb3a1214cc8d0872f6e3cd39861c532a672 SHA512 e75a4504c7558e19937f8f608a852905853f8efc2aef32ca3c383517fce86673aa3647a6ed5305d105f16be2c6a0f9667bb8326a9453050810b29b8f72fdc7ac
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
index 297168afea61..57506c7cb320 100644
--- a/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sigma-star/mtd-utils/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+lzo xattr +zstd"
 
 DEPEND="!sys-fs/mtd
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 37d782a1522a..3ca674c640b5 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -3,5 +3,5 @@ DIST mtools-4.0.25.tar.bz2 421807 BLAKE2B 54b0de421d5de003c6dff9a524af2a37d7fe0f
 DIST mtools-4.0.26.tar.bz2 420648 BLAKE2B 02f75722e8569c75d09fbee8667b24d8fd5c685940b235de33e268b8a349a49798f50db22470200e9fa30244768c07a568bfe124969f2a34f652c157ddb37e89 SHA512 32303ea16314ca00f33aee103451958f13c71ab1f3975e9a1dd9236c8e775286985ee776c38c64a1f8f5f8d0a66cbf84643182913e4e2c2dcaff384a9acd8633
 EBUILD mtools-4.0.24.ebuild 1045 BLAKE2B 2861833d297fdaf906239a2a52a5c922e0a195116ae73548c6d47212faa682b7b12f7bd20b68a167d86ecebfd2f6561236ff53bffcf093686bbf7c2c1893d6fa SHA512 dcb73024498715f8173c65076fa02a78873d01f22849fa568a6757384fc93e47981f1c95125a56646612f7dc4af39b4995ba0ef1ef41467f51eb60a99ee2b030
 EBUILD mtools-4.0.25.ebuild 1051 BLAKE2B 8bace5704234712bffd3c88ffce51534a6a141caa283501cf6599a96d0e6b99ae7bc40543ea064bb8385900e4bb6623c0005b8bde0b9a3beec510bd9cbbd8f01 SHA512 4ed910c39dd8683b28a2238e46bf015329a36f516761c486f9dfc987c919e8e3780270de173885b97eb9455232639d5dc1d83da5a24bfcffdeedb2bc637700c4
-EBUILD mtools-4.0.26.ebuild 1051 BLAKE2B 8bace5704234712bffd3c88ffce51534a6a141caa283501cf6599a96d0e6b99ae7bc40543ea064bb8385900e4bb6623c0005b8bde0b9a3beec510bd9cbbd8f01 SHA512 4ed910c39dd8683b28a2238e46bf015329a36f516761c486f9dfc987c919e8e3780270de173885b97eb9455232639d5dc1d83da5a24bfcffdeedb2bc637700c4
+EBUILD mtools-4.0.26.ebuild 1058 BLAKE2B 8236f510b4711b3d09257cc283075f271e02a704895930590a22ab9d6b9f91780bd4f0e47a6375b8e7dd2a149ba878b54d9df8fef0cc890f08df649044d37812 SHA512 c5330d2e62434e874b80bb13843d33c30a52e73a0ab64a588cd8a97481d413e4b166dcf538218be5e419ffa41515b2e621aa6cb290e42ea7a30636bb438e0815
 MISC metadata.xml 327 BLAKE2B 24ec22d469778c0c13d9bf96aed3214f59598b5ddf6a6bdf7dbe971e014396e8075c62059b1033ccdca6c5acca1af0fa2c1f377b006471358238402b40d7fec5 SHA512 9b9c5a4a88cf046ad30bf9764d7d865d692c73477220cc871e7e727fe3f718302c9ff1a8492b165270a88049e2bdebe68923415e52da1257971d887d8f808f7d
diff --git a/sys-fs/mtools/mtools-4.0.26.ebuild b/sys-fs/mtools/mtools-4.0.26.ebuild
index a10154dee9ba..9ad4033e88f1 100644
--- a/sys-fs/mtools/mtools-4.0.26.ebuild
+++ b/sys-fs/mtools/mtools-4.0.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="X elibc_glibc"
 
 RDEPEND="
diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest
index 581bd251c366..73653a881241 100644
--- a/sys-fs/reiser4progs/Manifest
+++ b/sys-fs/reiser4progs/Manifest
@@ -4,5 +4,5 @@ DIST reiser4progs-2.0.2.tar.gz 994469 BLAKE2B ac680b901807c22b246ea5601b89d51fdd
 DIST reiser4progs-2.0.3.tar.gz 995921 BLAKE2B fa38c8998603ca0c26a17c75240d07afec6c46da1b437e5a733ce3a5a865329591d4343b52d7fd5dc56bb6afe34f4f7685e7dc258ed075dfe4a70a7ad420324a SHA512 59bcd6d73a220fd0e71cc4213489801f45597ebfcf0be55f150e929ef391e0a461a94ab99ee9698e1fb1eb58840497277ece6a2ea57e88d54573347a8854da87
 EBUILD reiser4progs-1.2.1.ebuild 1295 BLAKE2B 8ef4781ad4a121a92f6c732ba92eb8d6adb51f918eb975eb7cb97969135d1380e41bb1b010788ebd970805d29d8ca7267387ed3da75943922ac0fad729066ef1 SHA512 81f2db7655fe926394e628cacc97ef1d1749a4387393a7c04575cff245268f42b8e9fa58c974a5a8647b9d34f9e73b4f9b596dc70bf512f53b90fd3022af9fdd
 EBUILD reiser4progs-2.0.2.ebuild 1341 BLAKE2B dd6207a5efd9f565c717ae0fc1517a1c2208e9efdddc71fed1d3b83ff0c890def4681029e828208009fd5c5f0fc7dab22c2ed488893921817b2bcd9cc17f331a SHA512 1d14e1acf510629aa32e6b7a50dcdb962e332ae7f5c8402b63e97ab2b5d16d244835a7a858cd477143b5d1a085db3534903c183e2cb81b113c4987840a1cc5a4
-EBUILD reiser4progs-2.0.3.ebuild 1341 BLAKE2B dd6207a5efd9f565c717ae0fc1517a1c2208e9efdddc71fed1d3b83ff0c890def4681029e828208009fd5c5f0fc7dab22c2ed488893921817b2bcd9cc17f331a SHA512 1d14e1acf510629aa32e6b7a50dcdb962e332ae7f5c8402b63e97ab2b5d16d244835a7a858cd477143b5d1a085db3534903c183e2cb81b113c4987840a1cc5a4
+EBUILD reiser4progs-2.0.3.ebuild 1348 BLAKE2B 309eb37179f526c8eb55d848c5da2de5288ea3df88dcdb09e3155151eb6b0e2a1efd5190886b58a910c912b4e992a08b035264dccc12ca0ef5692a7d9928e77b SHA512 1a9f042cdb874e0a207774d62a7b804ae8980d7b09920cb05b6ed1439583d8aff4164e51b511b2cbbb172df6f9800435aa9a65570ca8348d617d1793e0af3246
 MISC metadata.xml 327 BLAKE2B dcc63f48d652f59288d08c38c2f0e430bc15f4224e2b5cf8b690e4e2cb1bcbd7ff97151d2e13f7482f21c1e9a92f45b867beef2aded7bb090f9011532c401e93 SHA512 f578c1f4305a1e24c06dfc53231a053cffde7ddebdbd7f61dd0fd58b650dadc8bc1cefa48213ca9734e081d30436bb7e5a093682eccc1a4a1a9e5bf707d61846
diff --git a/sys-fs/reiser4progs/reiser4progs-2.0.3.ebuild b/sys-fs/reiser4progs/reiser4progs-2.0.3.ebuild
index fa83088da8fb..45ddbfaabf1c 100644
--- a/sys-fs/reiser4progs/reiser4progs-2.0.3.ebuild
+++ b/sys-fs/reiser4progs/reiser4progs-2.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
 IUSE="debug readline static static-libs"
 
 LIB_DEPEND=">=sys-libs/libaal-1.0.7:=[static-libs(+)]
diff --git a/sys-fs/reiserfsprogs/Manifest b/sys-fs/reiserfsprogs/Manifest
index d3bbe3c31488..51c59e4fd9ab 100644
--- a/sys-fs/reiserfsprogs/Manifest
+++ b/sys-fs/reiserfsprogs/Manifest
@@ -3,5 +3,5 @@ AUX reiserfsprogs-3.6.27-loff_t.patch 504 BLAKE2B 6c38ac24d9d8e0bc665557303b5cc2
 DIST reiserfsprogs-3.6.25.tar.xz 448984 BLAKE2B d9f032e51f70497cf84f5877172b68e8acacf8fecb3fee7d7c3d82c98cbd5c70f870baa96471b02f092345a86bb02501bd53156cc8e7e3230660a7a6865c2421 SHA512 247ca392d227680fb24e94cd490319e77e82d00d7d357516690d2cab6f0bbe8b35879f8a25ed5046bd3a7a3e1f2b140a8a82404043aa0e7f6f60f57d069857ae
 DIST reiserfsprogs-3.6.27.tar.xz 449176 BLAKE2B cd22120faa4d6d11ab545349fde5304f41cf3ca88b2c988255b7ca0e87961c9ccaa3095cad086e479a2b50627ad9bf3e90b2af46ddda64abc119e2a6755b8341 SHA512 bc524aa1ad7f8502238761fd185bfb8473048947bd579e2803c73371928c6b245e0d90bd9d458f4bebcbf163892dbc9f4bae65aec68ebbaa436be7451c13f50c
 EBUILD reiserfsprogs-3.6.25.ebuild 1195 BLAKE2B ceaf86a46b3f368ec17e317838c73b63542c983cc1d968306a240005941b5eb3edad629e31df7f0642cbc3fe5da19b77667f522d14cd3688e923912e147e72b0 SHA512 01ba30ac86e5c4cd042348ede60a3e456fe178031ff30a0a6f326e8228e08b05f0ea69d65a94c8bc4bdbbd43a6a168feddc84a29fa30883e235eaf4504fed680
-EBUILD reiserfsprogs-3.6.27.ebuild 1247 BLAKE2B eb821d09d7001f03ad03507212d841fd1b30126af795a0a70ed2f1d34b2b245aecb06501e6e28e873c2143ce8654ab2784df0f2769dd4829a35c1e8ab05569c8 SHA512 71e269dbb1bba07a352a2822228278c38a4621cd21831d1eef8b552476ab8c655f3db931443ae43434ac2b08f0f4c1dbe27702c3db6dee8ad2ea7dd9a491b09f
+EBUILD reiserfsprogs-3.6.27.ebuild 1254 BLAKE2B 192834988dcbfad708f466890f79fba99ed14b2ced9db74e7929d400b4a40ecfd644734d40521ec84ba0e2237b9962db3e6c1b849744b1808310751ad13b4fb1 SHA512 563cb398c78889aa1699bda1ac0e14fe2af5c5b50f43be1f29d9a1e40161d6d49bce84b9383e412822ab87f9ebf38b523208eadb817c275e210c78590b3a0415
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
index d4e1b9ebc88d..1889e0c146d4 100644
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/reiserfs/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index be44d2f8e75a..258ca9020e18 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -1,5 +1,5 @@
 DIST udftools-2.1.tar.gz 555440 BLAKE2B 09ed67d67a5194aff1611ca40907465cf5d9b83a6a9c1771118c80599be29e8d68fc48c10b38d33a4aed4fa6e7e6dbf0399b5d04bd103153f42a705e17edcf6c SHA512 0bdb3f2e0595200dadb771af4f31ba513d0bf6a0fbd30bc3a1f8aba4ab5f487f61635e65dc155926d2f566cb6e2b2f3a57938071616058cf703692d529971a64
 DIST udftools-2.2.tar.gz 543515 BLAKE2B 8702959e9840415201668255272a7f5bb3b88d1e11a20ea6818c9c031d602ceba25a4892965f77961e265d55a687c6574a9aa7c657610d85e56549550a978d58 SHA512 1d6f7b725053ab8c2092ca07bce07fb075168ba48f7d2580076ee84b2652af3898622746c5a2f0bdb8c0d1d0e09d1f4a3cbaae4f998924652a56561b84690e2b
 EBUILD udftools-2.1.ebuild 550 BLAKE2B 026a1ff99b0c4cefe88ab802897f98aea94f7711db84a1d40e8b5683fa76e02a2273657ad844482e7aafeb101e408b7c0305f10dc37003682524ce8585c836b8 SHA512 a541cbe3dc4079bf074a3320079035749b4e0e8d812801e25a161de109a678847dee96af60180998d00ab3e6ba497f8e2f54f764538ee82a42dab899ff48d4a8
-EBUILD udftools-2.2.ebuild 581 BLAKE2B 5661c7835873585f282d2cbf4e1bbc7e549b5a20e3e83b0d2107980c458ce418567ed85044c56d4a64a5c45c9b8bd0fe233b14c01b8f4dfaa6b8931a6ec5f9fa SHA512 17e539835787fa78119e67d5a39f869bd09b959c6276764d92ca5b179f4a8522ec94029bdf92e9e432cec8d1be6db6ce8d871622ad8eb426018749ad5992d3a9
+EBUILD udftools-2.2.ebuild 588 BLAKE2B c29176d9459319cb4fc3115e9f2c4965fc894b353978aeb5599338b2d122537e0d8b85e2ae4d7096f0825a9820d8919a2f8d33a532aa004437189849221677d7 SHA512 4d1ee19fea8cb7af3e5b98935b8fb9374263942b4dafe1eb75e93016cb42fca7b48a397dd3ddbe949379361ec03b8f48141224d5af0183a800ca63e81086986e
 MISC metadata.xml 389 BLAKE2B 9ce42e5303df1f4d7fc293387617a2b6335377b7a3943e768cd7f8e58e9dd456c568f9b72c1fe3d12f2876d364edfc184b3644aa76569e04bee22fbb3673d8b9 SHA512 049fe016aafa25e50396b166ac9931ea7c293aa581467fb587e0d79c0bc4e79621bc3d5bf295c2e9e589a517a4c1fcfbb863fb71175fe5061f99e45a26c7c61f
diff --git a/sys-fs/udftools/udftools-2.2.ebuild b/sys-fs/udftools/udftools-2.2.ebuild
index 03a562512736..a57b048c42ec 100644
--- a/sys-fs/udftools/udftools-2.2.ebuild
+++ b/sys-fs/udftools/udftools-2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-libs/readline:0="
diff --git a/sys-fs/zerofree/Manifest b/sys-fs/zerofree/Manifest
index 2086c9aaac7b..666899a7a4be 100644
--- a/sys-fs/zerofree/Manifest
+++ b/sys-fs/zerofree/Manifest
@@ -1,4 +1,4 @@
 AUX zerofree-include-sys_types.patch 284 BLAKE2B 45b375568b6bfc767a65d5d1082f44db4030ae687edb4d528f0000d1fc8dc78c10f98cd6bf57eaa9b9dd2d0ce96aee408ecddc1126ddd59faa737f7dcd236d7d SHA512 0cf3833271195c2f1da591af625928d8207d6bb39702cdc9f8ade0e7e773096e4f55860438863f06639f205283c0cccbaaf8b4d9ee98e3850a5075e38d06a187
 DIST zerofree-1.1.1.tgz 8710 BLAKE2B 76a84de7db60473c8824129a29515212acc74235e2139eb15fe7f41d1801c42c85378734fdf39a668f0a4eb285c55c49ce2281dda9444b2008557897428bc645 SHA512 2d7ee57a877bff2491c48054338a26d624ae75c238ac2b0568a75de88b6621c16cc1e7d65500879825d14d8ba44a5173587a061459072769c165bee47c3f9f1c
-EBUILD zerofree-1.1.1.ebuild 947 BLAKE2B f2d5575eda702b83c454889bfa54e816405c3037a983705a3ad1cc260a74b9cef35c9a3ba78af281d246853a23c3306bf76f7030ad032807fefd4a22a807bfa9 SHA512 f7750e84509daba6bb0242bc6f59744678c94c298384bffa54d03631d3aa267a1c0deeb3fb38e2300e20905d0e68cf0cbfea7de02bcd98129d88b68c7615c3af
+EBUILD zerofree-1.1.1.ebuild 954 BLAKE2B 6201d8c315c1a47d6661165bf0e486306fcc9993fb9604fe34aecfcb3f986273e579b4d07844aee2abca50bfa9e776e72de322901e4f6215cbbac49ab86e407c SHA512 83f746c7ea899b3d07a5a5e9fb56bad5b13911ac1c257e9dc87e481997bb8d02a2a14fb24f245bfe3d34dcd7650096d1ce104043c68b52b29da7575d87b9bd53
 MISC metadata.xml 433 BLAKE2B aa623f9df641917cb34f2a028d4db98e33b241e89b94ac424045fb053bbe16b124f62329394d30cb6163689f8716a1eef4697115648f06f9834ee41c2914ae26 SHA512 c454915a2972c289341df97d9d8cb9bf26ea2f4c00ba4555a2d14e69e8f48f7bc8fc33c404ad19c175ff7e96900f3cead4dbaf32b0c36981c8a4926212a017e8
diff --git a/sys-fs/zerofree/zerofree-1.1.1.ebuild b/sys-fs/zerofree/zerofree-1.1.1.ebuild
index d234d5d2144f..ffa8a9947d42 100644
--- a/sys-fs/zerofree/zerofree-1.1.1.ebuild
+++ b/sys-fs/zerofree/zerofree-1.1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://frippery.org/uml/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 IUSE=""
 
 DEPEND="sys-libs/e2fsprogs-libs"
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 647fd7e18afc..0c6dbab0dc96 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,8 +1,6 @@
 DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773
-DIST zfs-2.0.0-rc6.tar.gz 12896465 BLAKE2B e7a91d980940998a7312d48a43c07561e3b1aa72cc6f88eb534cb39b5e18de4280964ba7f690b63f5e2dd3cfdeb57d718d7389f8ab2062ff7bb6e8bb4174801a SHA512 5daf8d39766f8c8f8bca340585ae36c39507e33642a7cd2dadb74bbe1d529d5be40420057edc95814c0b554121128c0ebde59c3fbed17259870b123a56acd2e8
-DIST zfs-2.0.0-rc7.tar.gz 12994030 BLAKE2B 12dde3b935cddabd3d3e5874685cd914f0338526ba8d22aaba2b1ff09aae64a67cc66ea0acc7d08cdc438fd8dfc93a2727bab5e90c08c2a294074692f4189214 SHA512 fbef7bc76c2b913ef8c4af55e6feb46bcadbca856b8ba28c72432bb91b8dc88de191d657aaeb5efd67ee2d67a6ffcf5d3d53b4490f9a32211a571687694e7e65
+DIST zfs-2.0.0.tar.gz 12989903 BLAKE2B 2961b97aa6736af9b4a2bc968d1488f49ec0c0fd7bb22b6bc015047239279efd2d48f8d7c593f9b467ac9d40f99d67363ab551bdfaf1dd71335c37c48c759875 SHA512 2706ae1aa54b882b272502e7a46e57ff41f9db9b123e8cd5dafbdd7f61975d05538167016f943804145d22aa018a1f11c884f692dc3992b28c24eac08112650f
 EBUILD zfs-kmod-0.8.5.ebuild 4537 BLAKE2B 4cc63f9a5645b5ea988f9a4ccc3aacb1d0e0091047192210a39273ba35cbf7bdde85c495194e9777c84478de2041ed4b44692bacfc82830c6105264d07c8076a SHA512 9bf1464089fa6b0b1dadf4799174ad87331c9f322b59dd234a01542714eabec8fefdc677cbfe7a7f14af0c0067e58599c7342ef0cfea1517aa913781cb62a322
-EBUILD zfs-kmod-2.0.0_rc6.ebuild 4316 BLAKE2B 1e999fd68487f8fb2f4fa66210a530820858e89984985d069d9b4ec0668fc7d385a316ce724334d92893c30cf115a6c91c674f8f0ea06f4b1b10bb285afaf859 SHA512 18bb55ac74eb466d04832fcfab34b2f7e4d118d341314474f7d25b3fba6769161732d3bb50ac91845c8f6d71350ddf023911ddad2470c5331e1e7c04ef0a6c89
-EBUILD zfs-kmod-2.0.0_rc7.ebuild 4316 BLAKE2B 1e999fd68487f8fb2f4fa66210a530820858e89984985d069d9b4ec0668fc7d385a316ce724334d92893c30cf115a6c91c674f8f0ea06f4b1b10bb285afaf859 SHA512 18bb55ac74eb466d04832fcfab34b2f7e4d118d341314474f7d25b3fba6769161732d3bb50ac91845c8f6d71350ddf023911ddad2470c5331e1e7c04ef0a6c89
+EBUILD zfs-kmod-2.0.0.ebuild 4316 BLAKE2B 1e999fd68487f8fb2f4fa66210a530820858e89984985d069d9b4ec0668fc7d385a316ce724334d92893c30cf115a6c91c674f8f0ea06f4b1b10bb285afaf859 SHA512 18bb55ac74eb466d04832fcfab34b2f7e4d118d341314474f7d25b3fba6769161732d3bb50ac91845c8f6d71350ddf023911ddad2470c5331e1e7c04ef0a6c89
 EBUILD zfs-kmod-9999.ebuild 4317 BLAKE2B f805e2c20a65d928b89496aaff71f548c49594b5f4d7decf776339a173b16f39ea5a7e0bfca78f5b1fc01c08ea3a06fa11317458dc2cc4022bdf459d273d68ed SHA512 4ce6398c6ec3cb2015751b0deb6e8694afa22a6b19b0ca83661eed0e195f7ac06f5fb73eaa52a4d86ad2c039dd300de4d49c8901a51e1d80dd37b3e1b0185319
 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.0.ebuild
similarity index 100%
rename from sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc6.ebuild
rename to sys-fs/zfs-kmod/zfs-kmod-2.0.0.ebuild
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc7.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc7.ebuild
deleted file mode 100644
index 81328da6d290..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc7.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
-	MY_PV="${PV/_rc/-rc}"
-	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
-	S="${WORKDIR}/zfs-${PV%_rc?}"
-	ZFS_KERNEL_COMPAT="5.9"
-fi
-
-LICENSE="CDDL MIT debug? ( GPL-2+ )"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-
-DEPEND=""
-
-RDEPEND="${DEPEND}
-	!sys-kernel/spl
-"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/awk
-"
-
-RESTRICT="debug? ( strip ) test"
-
-DOCS=( AUTHORS COPYRIGHT META README.md )
-
-pkg_setup() {
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!TRIM_UNUSED_KSYMS
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	use rootfs && \
-		CONFIG_CHECK="${CONFIG_CHECK}
-			BLK_DEV_INITRD
-			DEVTMPFS
-	"
-
-	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
-
-	if [[ ${PV} != "9999" ]]; then
-		local kv_major_max kv_minor_max zcompat
-		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-		kv_major_max="${zcompat%%.*}"
-		zcompat="${zcompat#*.}"
-		kv_minor_max="${zcompat%%.*}"
-		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
-			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
-
-	fi
-
-	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
-
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		eautoreconf
-	else
-		# Set module revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-}
-
-src_configure() {
-	set_arch_to_kernel
-
-	use custom-cflags || strip-flags
-
-	filter-ldflags -Wl,*
-
-	local myconf=(
-		CROSS_COMPILE="${CHOST}-"
-		HOSTCC="$(tc-getBUILD_CC)"
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	myemakeargs=(
-		CROSS_COMPILE="${CHOST}-"
-		HOSTCC="$(tc-getBUILD_CC)"
-		V=1
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	set_arch_to_kernel
-
-	myemakeargs+=(
-		DEPMOD="/bin/true"
-		DESTDIR="${D}"
-		INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Remove old modules
-	if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then
-		ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs"
-		ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon"
-	fi
-
-	if use x86 || use arm; then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	ewarn "This version of OpenZFS includes support for new feature flags"
-	ewarn "that are incompatible with previous versions. GRUB2 support for"
-	ewarn "/boot with the new feature flags is not yet available."
-	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
-	ewarn "Any new pools will be created with the new feature flags by default"
-	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
-	ewarn "create a newpool that is backward compatible wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 1c4bb2e0b701..07a349c2e783 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,9 +1,7 @@
 AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319
 DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773
-DIST zfs-2.0.0-rc6.tar.gz 12896465 BLAKE2B e7a91d980940998a7312d48a43c07561e3b1aa72cc6f88eb534cb39b5e18de4280964ba7f690b63f5e2dd3cfdeb57d718d7389f8ab2062ff7bb6e8bb4174801a SHA512 5daf8d39766f8c8f8bca340585ae36c39507e33642a7cd2dadb74bbe1d529d5be40420057edc95814c0b554121128c0ebde59c3fbed17259870b123a56acd2e8
-DIST zfs-2.0.0-rc7.tar.gz 12994030 BLAKE2B 12dde3b935cddabd3d3e5874685cd914f0338526ba8d22aaba2b1ff09aae64a67cc66ea0acc7d08cdc438fd8dfc93a2727bab5e90c08c2a294074692f4189214 SHA512 fbef7bc76c2b913ef8c4af55e6feb46bcadbca856b8ba28c72432bb91b8dc88de191d657aaeb5efd67ee2d67a6ffcf5d3d53b4490f9a32211a571687694e7e65
+DIST zfs-2.0.0.tar.gz 12989903 BLAKE2B 2961b97aa6736af9b4a2bc968d1488f49ec0c0fd7bb22b6bc015047239279efd2d48f8d7c593f9b467ac9d40f99d67363ab551bdfaf1dd71335c37c48c759875 SHA512 2706ae1aa54b882b272502e7a46e57ff41f9db9b123e8cd5dafbdd7f61975d05538167016f943804145d22aa018a1f11c884f692dc3992b28c24eac08112650f
 EBUILD zfs-0.8.5.ebuild 5695 BLAKE2B 05e6a12ea2ab6c7655b2a62d642ed97a9acaa59959f648896a20f9b2336b81af79a60a398e5ad53844b7173abe95705b18fd420362f7e82182896ef0360a637f SHA512 f879e459304b5a2a3a53c5ebb01c0d54d822c3f1f1abb4d26c7a065bc5a184b744aab2777340b7bee9227a855cae4bf44e9cb1ab61b98031b1190d3b387a9367
-EBUILD zfs-2.0.0_rc6.ebuild 5952 BLAKE2B 617854bd385ad9f86e8c031c1e96771776d4fd0fb963fe22fc2580d6befd3008e19492ec0023dfdf073a229289c19fb2227f818e9ce5631b5c66f55c2dd55d60 SHA512 e2d6f029c687c32440a35069e22d8cb38c6677999c737ad32c8d73ea43d04fc1234314f55fdc0e072e4bcc967ed73fde6c66055b9153603d10cc3b0582f51cc4
-EBUILD zfs-2.0.0_rc7.ebuild 6017 BLAKE2B 7840d4202527a1ace8caeb8b0ef251e9ffc7382aac43338e4b8f786189be5a11ad06d7024f4c5acaa7aff042341391185e10092860d61b8dcaf262b3ddc42b26 SHA512 5256bec61f8e04e6f7eae77fb57c6d16bf95687a799a49ab51b84c1df9ad089ba94d36c5d08f3f5b1a7728a943b7e94c55521eae6ec813cf9790e9ad4e8deb8a
+EBUILD zfs-2.0.0.ebuild 6017 BLAKE2B 7840d4202527a1ace8caeb8b0ef251e9ffc7382aac43338e4b8f786189be5a11ad06d7024f4c5acaa7aff042341391185e10092860d61b8dcaf262b3ddc42b26 SHA512 5256bec61f8e04e6f7eae77fb57c6d16bf95687a799a49ab51b84c1df9ad089ba94d36c5d08f3f5b1a7728a943b7e94c55521eae6ec813cf9790e9ad4e8deb8a
 EBUILD zfs-9999.ebuild 6017 BLAKE2B 7840d4202527a1ace8caeb8b0ef251e9ffc7382aac43338e4b8f786189be5a11ad06d7024f4c5acaa7aff042341391185e10092860d61b8dcaf262b3ddc42b26 SHA512 5256bec61f8e04e6f7eae77fb57c6d16bf95687a799a49ab51b84c1df9ad089ba94d36c5d08f3f5b1a7728a943b7e94c55521eae6ec813cf9790e9ad4e8deb8a
 MISC metadata.xml 1003 BLAKE2B 640ef6d6f178ae9c3f3281a8e8539980c4a263f6cf0c5f4e1de3f0572f2acfe409865e85a12473129eb026130c9b76b946ee7698bd990b05f14e6b26c40fcb22 SHA512 965eabb5488a3cb54b360b33c847a2eb0d326a2c6761d86d581e06c2f52db9478fe7df131f68cb57bf32a2a872ecc1597e2a1a6b457d254f578d684cf73810c5
diff --git a/sys-fs/zfs/zfs-2.0.0_rc7.ebuild b/sys-fs/zfs/zfs-2.0.0.ebuild
similarity index 100%
rename from sys-fs/zfs/zfs-2.0.0_rc7.ebuild
rename to sys-fs/zfs/zfs-2.0.0.ebuild
diff --git a/sys-fs/zfs/zfs-2.0.0_rc6.ebuild b/sys-fs/zfs/zfs-2.0.0_rc6.ebuild
deleted file mode 100644
index e5684e2ff427..000000000000
--- a/sys-fs/zfs/zfs-2.0.0_rc6.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 linux-mod
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
-	MY_P="${P/_rc/-rc}"
-	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
-	S="${WORKDIR}/${P%_rc?}"
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0/4" # just libzfs soname major for now. possible candidates: libuutil, libzpool, libnvpair
-IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs"
-
-DEPEND="
-	net-libs/libtirpc[static-libs?]
-	sys-apps/util-linux[static-libs?]
-	sys-libs/zlib[static-libs(+)?]
-	virtual/awk
-	virtual/libudev[static-libs(-)?]
-	libressl? ( dev-libs/libressl:0=[static-libs?] )
-	!libressl? ( dev-libs/openssl:0=[static-libs?] )
-	!minimal? ( ${PYTHON_DEPS} )
-	pam? ( sys-libs/pam )
-	python? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="virtual/awk
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="${DEPEND}
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
-	!prefix? ( virtual/udev )
-	sys-fs/udev-init-scripts
-	rootfs? (
-		app-arch/cpio
-		app-misc/pax-utils
-		!<sys-kernel/genkernel-3.5.1.1
-	)
-	test-suite? (
-		sys-apps/kmod[tools]
-		sys-apps/util-linux
-		sys-devel/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-	)
-"
-
-REQUIRED_USE="
-	!minimal? ( ${PYTHON_REQUIRED_USE} )
-	python? ( !minimal )
-	test-suite? ( !minimal )
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [X] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		eautoreconf
-	else
-		# Set revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_prepare
-		popd >/dev/null || die
-	fi
-
-	# prevent errors showing up on zfs-mount stop, #647688
-	# openrc will unmount all filesystems anyway.
-	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	use minimal || python_setup
-
-	local myconf=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--enable-systemd
-		--enable-sysvinit
-		--localstatedir="${EPREFIX}/var"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
-		--with-pammoduledir="$(getpam_mod_dir)"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
-		--with-vendor=gentoo
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable pam)
-		$(use_enable python pyzfs)
-		$(use_enable static-libs static)
-		$(usex minimal --without-python --with-python="${EPYTHON}")
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	default
-
-	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
-
-	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
-
-	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
-
-	if ! use static-libs; then
-		find "${ED}/" -name '*.la' -delete || die
-	fi
-
-	dobashcomp contrib/bash_completion.d/zfs
-	bashcomp_alias zfs zpool
-
-	# strip executable bit from conf.d file
-	fperms 0644 /etc/conf.d/zfs
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	# enforce best available python implementation
-	use minimal || python_fix_shebang "${ED}/bin"
-}
-
-pkg_postinst() {
-	if use rootfs; then
-		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
-			elog "root on zfs requires initramfs to boot"
-			elog "the following packages known to provide one and tested on regular basis:"
-			elog "  sys-kernel/dracut"
-			elog "  sys-kernel/genkernel"
-		fi
-	fi
-
-	if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
-		einfo "Adding ${P} to the module database to ensure that the"
-		einfo "kernel modules and userland utilities stay in sync."
-		update_moduledb
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
-		einfo "for default zfs systemd service configuration"
-	else
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
-			einfo "You should add zfs-share to the default runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-		remove_moduledb
-	fi
-}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 187dadc285b1..971531e7e165 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 13b600f6d406..cc8bead644c9 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,12 +16,16 @@ DIST gentoo-kernel-5.4.80-1.x86.xpak 52825910 BLAKE2B ddcf84a5e99a25fc690c487c11
 DIST gentoo-kernel-5.4.80-r1-1.amd64.xpak 61053571 BLAKE2B 24eebf676e1824b01aa6b75963ff8afe25e797afe90440016f4675e8385e1d6b1a04aa662d7c92217af97d56d79f9631a84c2a271b005b5ea7ad71bb8637d941 SHA512 ea99729ee68a44f6b5081e0d81dd7d5abbb50482eda8c4e435d6ee997572362de09d7c813da2ecf1aac4ed299feb73205bcff7d4d359793889690ce07cfb057f
 DIST gentoo-kernel-5.4.80-r1-1.arm64.xpak 56217629 BLAKE2B 217f015713b11e18467a87253af61d5ec0c976576fb0ab11b1d21e983472d8e86de23f04add9aa76ee9057e3ff9759ff21b84a7c2b24387b1ed8deb181f9bfe7 SHA512 b63b00991c5f6e67890b07ca75968078709e29ed1e06aa4f4c592573e09ef04bc8015337e43c56652b597ee5365e054b811e1e922f06d2c136084d6b0c2395fe
 DIST gentoo-kernel-5.4.80-r1-1.x86.xpak 52880910 BLAKE2B f94a7bbdcdbd383e919f2542251d2552e50e34264ab495a43d75e28dab881162f2549b48383b32a3b2a813a192b7d9f602eaa8210085733ac123e2246e6a285b SHA512 3b5dd91103461306f4a4ea4554792d4cdabedba6165de119523b927abb2009adc7d554f23110ddeac1a1add69b2d1674b7b87b93b1e1b186a2594174808dd9d2
+DIST gentoo-kernel-5.4.81-1.amd64.xpak 61059891 BLAKE2B 2a8aa181e46886f7a9faa3c9bf5d57d3d929bf5d21c1070a47668ef360dc961984b4436fc137220c430e6c79678d98cb1cbc9d48411daebd7eab958efc07c8e3 SHA512 d8e293efec047690e09046c3590f734dbf7afe879c9cb6229fdefde86ac08524ade3dec3aabda6ab3ef5e09e4b66d27783347c915638682d0c509fefb0262e05
+DIST gentoo-kernel-5.4.81-1.x86.xpak 52879835 BLAKE2B bb93d0cd2280d7c7981e2330a405f00e7ef3aa906d6b52be8a03b0a7a71b9af3fb8bcd5af16adec36a198dc2d7f950759c800154afe14e3c29e8c276e0d3b013 SHA512 359fe6ec58b85f1cbb9780368582c332e2095f96b0363c04bc613cbe4f7fdbe3606e18571072b260ada8422d22088d0e50400975030c780581c56038d398b818
 DIST gentoo-kernel-5.9.10-1.amd64.xpak 62950591 BLAKE2B 032e27aaaf9f622ce16b3ee699752215fe7485052bebdafddf2155aed370b6316be07eb009da3e207a9b12f8c7865c70c7466451b205cc4b4f374c731a815fd5 SHA512 7f504e2f15319d60f464a4e45edee9503316a100eec8a6258e27ec7a00a4d2a5cbf9ead4e77ae5342ea05778572fc8ecda94c63b425b99b6ac3a5f183e377bbb
 DIST gentoo-kernel-5.9.10-1.arm64.xpak 60852046 BLAKE2B da0ee409eb47ae9bf570a08640bd060894974f5f09fb348b3d43c525f7d006f982a447ff9b17bc22969de929b05a316ee72668d40a20d8c3b8e2084588898416 SHA512 3ae82b223c97903a9c25abcad4a9f1f9e4ede68caf796833d9aa0c0cb23898c5b62e4023b8d3a00ff91cdd1f1ee8e82d51e9198454bf87ea16fed9c99147e202
 DIST gentoo-kernel-5.9.10-1.x86.xpak 56077741 BLAKE2B 40c1b066b5f91b5b53dd16d90be5d28e2699b900fcbc272e14417d69bef942a91058ebb5d74e0d8dd52263e6147bec1efafed75dc57f8f511f11def4657420e7 SHA512 7c778185d98c83fc0f5431111ef0c0623e54c76cde3e225b4d132bdc515319f6edd063fc2141b0d3d58cc4006ef4561088c5069fa047b04a6961cc53e23e7ef0
 DIST gentoo-kernel-5.9.11-1.amd64.xpak 62957405 BLAKE2B 0bca1ae3772d6cdd9d5cd1a857a7660825d53ba61fbda69ceea363c0c242ab0fce641274638a7d04fef99ab2cbe6bdc125a328ac864b6eb65b8f5cb7d31dbb87 SHA512 2643bffe415e6ab5c42bae0a0df409d0610733aef3590aef0a47806b8d294441704a4bd932a3486440805939dc17943fd3833662ba364c3448325706ac15f5c9
 DIST gentoo-kernel-5.9.11-1.arm64.xpak 60826912 BLAKE2B ab43a72729adca0520618669792b8840483c668d9ffd38afb2ff9902faea9e0e036edb9b7f5d86f3f05c7d8d154b42600a367068d25ce49f39a4aa021db05dfb SHA512 10b9cc509a39c2377e18f33c72aa6b7c2374a7208a591f51adda45645af6ce45961bbfe3961d227cc39dd17f4e48e9be359490baa102289bb3a262f51a54e304
 DIST gentoo-kernel-5.9.11-1.x86.xpak 56006453 BLAKE2B b6cd2f09c96de87757557ed4ebea5cfb3fe998bd1bb0199b688740a79f24e23cd0739a8c2ca5290eb85c8690853f5c5683a6847a077a4a4f7d8f6ea360915ec3 SHA512 e09051027aa448b737658b2f0db8f88de5811751437e08cf628ecfa4df9e90ae12459768a9f3d047967087d183bb668b15d29e083ddb6418c7c5ac7140ccc067
+DIST gentoo-kernel-5.9.12-1.amd64.xpak 62965041 BLAKE2B d9172f6bbf71a577aa54db9736c46e17b7dda2c032e0fc915ecd432cf2398a6ca2ff84b25e8fa9b66a8c42ecb7cb2d2e0d8874715aaf7926634ce2bf7e7fc5e4 SHA512 25f054ec467888bac76dba23b9cbce5b0f089ef94fcd46f984c8d6e3dfb2821cf8ab2b6c6ae78e948271914738cd73de71c7423d35e46b3084ecd85c925e7ea7
+DIST gentoo-kernel-5.9.12-1.x86.xpak 56011322 BLAKE2B b306e3b8d78130ef846faf27b6d994a9c7f7c1791b16c65f24cb351ef50adbd7324384aa4ce25f0504ace16f103c3a55c0d8a2b058b31a6538a20c5d0a385a85 SHA512 3b1ff4bddb116f069ed1f186a8ab4519ff9a0a075e81232ffea293da8a5e1b7c74a2103be3901d25fe161a2566a919c24377c76567dc3b9ed92cb4046293a831
 DIST gentoo-kernel-5.9.8-1.amd64.xpak 63386669 BLAKE2B 6ebe70d1085d0ea33361ab398d076ba5bb3cd21aab1769d8a106978d7b320b993878fd32a59800997a5832483a19b3bce2e396b09ed25c0f34d5786ae9b7f90d SHA512 61f4d150f8fb5cca735e09ca8021ae972d953b0297dc52d9d623d1ee3f3d4a3e5cd7f98d39f785e279891373c9719166a5dad624ea16a9300c7c3fa7b0777aaf
 DIST gentoo-kernel-5.9.8-1.arm64.xpak 61440507 BLAKE2B 4704fa85533e68763346f3b4ccd462473424404c1e8f0302a69300e48ccc265857c2911aa36b11b38a0fc908d5ba681c4d35038f5cee473172b83ab331075cff SHA512 0df3f58142b0015457de82134b4c3535f8826f6108ef8aa32e2097cc5294fab35a76135fd4a4fdaed50e2b52be149833bd3e9137546f5beca90c7861f3c0c579
 DIST gentoo-kernel-5.9.8-1.x86.xpak 56613649 BLAKE2B a43bec4bc59613576749cbb58b6eff8b4e120410ae2dbb3b38b3596eab0a4d5dd56e427d91e4ebe044be9794f36e11dd89174a9ac01678eb4f268813370fd444 SHA512 b1d0a1bae0adc8788d46e19bda9875c49a611da6e4fc786d5a79efc8a5a5bbcb8eafb9f8628029685650235d5ec853d7a40b2ec0dd367c9b2d4436618ce1f2c3
@@ -40,10 +44,12 @@ EBUILD gentoo-kernel-bin-5.4.80-r1.ebuild 1371 BLAKE2B b11c2f146a3f72d590347cdb4
 EBUILD gentoo-kernel-bin-5.4.80-r2.ebuild 1254 BLAKE2B fc2f3af07ca853fed3f3841402d0a03acdd74901b2a0704443ac44d027ae514e98172b932fda6a7683a8a91c9602d4764775660aa127beef1926d599eab7640c SHA512 409cfc1a4fea4e6089201ca575c513e4ac0271a95617db48d32dba8656861854efa0d23659bf68dc4dcf53db40e3cb6322a4e2db8e37a1adcb61f9ba52d3ee18
 EBUILD gentoo-kernel-bin-5.4.80-r3.ebuild 1375 BLAKE2B e5c123e73bab8dc5dc2529f71f4d145df36d0f118433db3794e9b05a93dc904e7d0968ff77f1b71596e21233217a9e4f51d6c7171d2ea927b9f6afc8da943c51 SHA512 94730707229f41499e65bd0cc551e5cddc6061937ce45376f2d399f922a2653de2433aad6d49e8a756e7cffef260d6b25801bbe050f5ba231471a27cff2688e9
 EBUILD gentoo-kernel-bin-5.4.80.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
+EBUILD gentoo-kernel-bin-5.4.81.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
 EBUILD gentoo-kernel-bin-5.9.10-r1.ebuild 1119 BLAKE2B 35eb8258b52a640365502e8c1095d105232a81fc1eabd98c7d870194cd9d92cc1b3e0405e904bedcf21865812d5db6d51d799b48eaa9a89797da4e5e4273c893 SHA512 1e809eaf4e474b6344beded4342c0ed8f07aa99f47035456fda32051301d16f2a6d2b09b998c14b75cdf9cdf067276c6d5e46ea90bc6a8120ff5d591e95d1c9b
 EBUILD gentoo-kernel-bin-5.9.10.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
 EBUILD gentoo-kernel-bin-5.9.11-r1.ebuild 1119 BLAKE2B 35eb8258b52a640365502e8c1095d105232a81fc1eabd98c7d870194cd9d92cc1b3e0405e904bedcf21865812d5db6d51d799b48eaa9a89797da4e5e4273c893 SHA512 1e809eaf4e474b6344beded4342c0ed8f07aa99f47035456fda32051301d16f2a6d2b09b998c14b75cdf9cdf067276c6d5e46ea90bc6a8120ff5d591e95d1c9b
 EBUILD gentoo-kernel-bin-5.9.11.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
+EBUILD gentoo-kernel-bin-5.9.12.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
 EBUILD gentoo-kernel-bin-5.9.8-r1.ebuild 1119 BLAKE2B 35eb8258b52a640365502e8c1095d105232a81fc1eabd98c7d870194cd9d92cc1b3e0405e904bedcf21865812d5db6d51d799b48eaa9a89797da4e5e4273c893 SHA512 1e809eaf4e474b6344beded4342c0ed8f07aa99f47035456fda32051301d16f2a6d2b09b998c14b75cdf9cdf067276c6d5e46ea90bc6a8120ff5d591e95d1c9b
 EBUILD gentoo-kernel-bin-5.9.8.ebuild 1250 BLAKE2B 3d3f0d807e983e9417b7e0bfa79601fba04450de0f4df0dff1b4816af586f4f5080cc86f6c4c77a25c813c4e8194e9c93ac1abdb9265ea7942d2d4d03b9455a3 SHA512 35e02ff8e5e4a2c0ec592f92f84acc6bd740bfee40e71834abf287c9708b904374dee37388bcb2a771e0dded46095cc93f3b4db39ed717d040a7eca26803ab03
 EBUILD gentoo-kernel-bin-5.9.9-r1.ebuild 1119 BLAKE2B 35eb8258b52a640365502e8c1095d105232a81fc1eabd98c7d870194cd9d92cc1b3e0405e904bedcf21865812d5db6d51d799b48eaa9a89797da4e5e4273c893 SHA512 1e809eaf4e474b6344beded4342c0ed8f07aa99f47035456fda32051301d16f2a6d2b09b998c14b75cdf9cdf067276c6d5e46ea90bc6a8120ff5d591e95d1c9b
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.81.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.81.ebuild
new file mode 100644
index 000000000000..d6e61fa69369
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.81.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv * "${ED}" || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.12.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.12.ebuild
new file mode 100644
index 000000000000..68ca59b57351
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.12.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv * "${ED}" || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 2dce54fda097..0a6dd96b002a 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -10,10 +10,14 @@ DIST genpatches-5.4-81.base.tar.xz 2591356 BLAKE2B 63c0ef166e2691c6747a2b2a8317a
 DIST genpatches-5.4-81.extras.tar.xz 1772 BLAKE2B 93bedfbb023ab9d3913751cd242a4221b204685751f57d0ac31494fa8f8caf8e5faeb3ae10eed5332016f9a40b20670a6af6c4198eeae1136b14a3b28174beb7 SHA512 8776735a73aad4672d4b857d750f985ff6681f8e565a906106e2cfcd4d7839fa518d8fa19b39a0ac948736a3384656be44aad239ce2516786c797303f492ce01
 DIST genpatches-5.4-82.base.tar.xz 2792480 BLAKE2B 39960646116f5f85ee657a29557d8fd9e809ae9bc60aac349c91e7680f2a0565800ba37a478573098dbad41b686336a058985d2925e5046fa68eeaea8df25477 SHA512 6a76eebd7178e2ccc522477f53c36f74e6fd691f87c547dffa2602a516ad9a6a01f05c953e12bbe6ba9aa2ce34b176a6a081a22da40c7d86855e5dfc34098059
 DIST genpatches-5.4-82.extras.tar.xz 1772 BLAKE2B 8eff7ca01490badd5dad15497f77bf43c268ccb494db9eb4c18f4f59219f1a5d79ef2a6f35caee87e3c423b0fff1ef94a6d6477e5074397f78e4bd23b9c40d95 SHA512 bdcc7eb08c1cdb599e69b254f55685f7beec83f256518d42c31d0df9a4e1c6376c184145ce47d28e0b688d2166e139445ef5f9f284e817ba9f37eaf812852a88
+DIST genpatches-5.4-83.base.tar.xz 2815436 BLAKE2B 5bf3a971d5c14baca0b21a8aad8ffc4e470f91b179b5e03779be4f588b43a671fd2f261325ca0525139c3c7e9c2b7c1020a803045eb809b2857c61134d919db2 SHA512 96735cb1c2107eee8a7d475f6558e418264dc1aba7f2f803b59db5ed7a9a249d5d0b79689a539b46e8922ce1b278b578d4194b20f20962c2b3aae83ac58954e3
+DIST genpatches-5.4-83.extras.tar.xz 1772 BLAKE2B 9bccf13ea0eb0aae0d0b84302b9e9c82986bd60de4e85ee3703c570a5338474b08580095a952749d43104b53d3c07dbb558473e707a13ae12f7da5e5020ddf3e SHA512 0b536e4f8961513f181c5d9c4c01b51656c1e53707cf19c26d858e1a40bb1e8bc9e0bd0b314f82252047fe45a8df3e306e06abdb88f67a6116736e89236bbbcf
 DIST genpatches-5.9-10.base.tar.xz 521384 BLAKE2B ea65c4e0977bc07459297883aabba1589b746de718c054127b1cb5fb2d79702798dccd918e8f5542d439d316d3c6c3ae38514155ff2cd5f61c7916eacfaf5177 SHA512 54836cd45b62fc97c857f85bd96ebcb99d5f5d80b3c80c31e70a48e3aa8e54eca5eae802e9a8780c0eb0a1d166c190f39751512580ab10eb122a887d31ad3a57
 DIST genpatches-5.9-10.extras.tar.xz 1768 BLAKE2B 8177c3e2b8d92785b9ee71a7733432c783977a4c18f2db282c3c5b079219a911f6c302cad0dc3bf14c886bd3765ffdb2808f353ba0ecb89bb01d522f24f54c0b SHA512 462b35b3ff7a142877d11ddf02992a50043ba677f9f10619a308424f3e4df54d45436bc148fc503581c1c707a2a936ee278b18d95c02c6d5cdfec08f94257171
 DIST genpatches-5.9-11.base.tar.xz 580544 BLAKE2B 59989b81c77e174e421b4fd6f570b7b8daf3649c4869eb61808607c98999467c60f9fe0a9f1c798807e9395ee064fd183a3110482536f1061b80349156af1b83 SHA512 5f5570bb06e62220304c235d5cd93c0d7f738bcc978cd1215ba262dd6bc9a0b0d43cf8d51cf36f2f0a66996b79f656463c7a0323e14f8c46899f28b0420155cf
 DIST genpatches-5.9-11.extras.tar.xz 1764 BLAKE2B 51e216b1f4970b10e89fdea37bbe5621af2accdad098f4954884314c513a1ebb30c02f07cf725d8d32047513024cd360f2b222606a340c330990fcf7497b0285 SHA512 d6624234d3a64a28be09f21ad21ec3c82239166495c34987733755c4d64c20e08939a9c547f253468e44cf31d1ed6bf5fdbbb9b0adba393ab8eccc0619b93de1
+DIST genpatches-5.9-12.base.tar.xz 628408 BLAKE2B 6dbb2c992971cf3ee1c0a0c7a7b70876bcc41e93dd6def0fe87e2a4ddaf62ebfe808487ac117b79eb629c34e66ef1a02bf7adc2191c3273bf77ea384260a5bd3 SHA512 bde0614ff1eb3dc9f681fa8a5f8207c8d2f9a959984fd3a0c8bc4da8ca432d6e1a32992735a8c59074de738a6d1341aa688efc75eaca6cb575f41e694f333d7f
+DIST genpatches-5.9-12.extras.tar.xz 1764 BLAKE2B 8bfbde759342d00f10d6fe12e313d449de35aba13a5ba3564043d0489205eafa709a6481e7249bb79f54c84c759f50ca7f630e2e2bbfebc71942f72b3c8ea6e8 SHA512 274a2d2fce2f446503c4540d30daa3c3d6a86e6e6c206f0a2e1e89ee1ebd496f6ce2706add35ca6fc39df2c0758719faf332a230db18dfa9f81dab787f24eb3d
 DIST genpatches-5.9-8.base.tar.xz 443192 BLAKE2B 48c79a97fe1201bab87ba601feac1e05ce12f2db155e53e0a543c7994ba8dfcac75b17e315929c0b68b8136913fdf93005690ccb260640ccc31527088beb326b SHA512 c365018bcfe84ff64a8171951fd4f97bb89044633df137926d22bedc738cd17ebe72c26800eaf30171c3495ce2b1bfdc93866112756bdd2207e6e184b5f1fb6f
 DIST genpatches-5.9-8.extras.tar.xz 1768 BLAKE2B 96413f75c606fe4515d0facb8f0ca784702bb5d83591af87fb4bcf2b6c5e135eabcc55e0e84be9ecd3854ec108b8ed93cff11c41e7efba8c45aadefa291cacff SHA512 646efb1f6e0b9252b0220aa5922b0c0d8f093dba8edb7e40e127680c8a471aa49724f9591a3147925d7a4084af8d5e1cc5f78b0e72297072fd15bd13d1c93e40
 DIST genpatches-5.9-9.base.tar.xz 513024 BLAKE2B de77ed5aa32336d44f0a299703ceaf290a6ec00ec8fe80f3ad6cf85d89374bdeb278c0fed143f7d7899e21146bfd6daadafbe2274ed10c3bc9170186015ba772 SHA512 d1c7640fc3510e8d47aa07b13c2876a14f510a30e74d53cbac2d6b564b3258698b833c028ed8e8694b8e4aaa31c899c7ae8023825e57e0b35e136f99e667185d
@@ -37,8 +41,10 @@ EBUILD gentoo-kernel-5.4.78.ebuild 2719 BLAKE2B 3a8fca6271d30695909ec44a6bd929a9
 EBUILD gentoo-kernel-5.4.79.ebuild 2719 BLAKE2B 3a8fca6271d30695909ec44a6bd929a9ab7da6a1b161be9696b3fc9014195dac5bf402fd1c753d22f84503e5514657bca863cc7cfea0bf0a566b1790a0fd0ec3 SHA512 5bec6cc4611461071be98e4184aa632666b63e54329ec4b26e8d38e17744d8c6b2cf83003914f08fc10c86b02e53b8d61f112fe4dec7227405da0a20140a15f4
 EBUILD gentoo-kernel-5.4.80-r1.ebuild 2719 BLAKE2B 7bddd3ad74b8b2169923146f98b00913bd67017dba785bf561c3613448da3c5a30b3adb1dcd72625614ae4f46f7726bc9b7cd6c1f2457a3fa41acc829b32dc7a SHA512 1a58d81ed2717febcf73efe4e656d90c55b609e6ea3da89affb58dcadfac6246845c7c65cb0408c0272620c217225c4e3ebfacc2c67bfe631480ffd56be7dadb
 EBUILD gentoo-kernel-5.4.80.ebuild 2718 BLAKE2B c4427b3c3136587b38ca707ca922d55f571d55cdce6e4431b079b0472b0ec813c1e7395780e3ca5f393c47074509fb64a3d73480fea3f3e33181141fbb4d4c14 SHA512 6d26a76638de8b136f23066bef185ba5a97fe9d8b7f72f38bb82e1d05f3a42e4c1d7b44f9372632d3834e1ef1ca045bb8176bcd40c2f41c30cc45253061eb5ca
+EBUILD gentoo-kernel-5.4.81.ebuild 2719 BLAKE2B 7bddd3ad74b8b2169923146f98b00913bd67017dba785bf561c3613448da3c5a30b3adb1dcd72625614ae4f46f7726bc9b7cd6c1f2457a3fa41acc829b32dc7a SHA512 1a58d81ed2717febcf73efe4e656d90c55b609e6ea3da89affb58dcadfac6246845c7c65cb0408c0272620c217225c4e3ebfacc2c67bfe631480ffd56be7dadb
 EBUILD gentoo-kernel-5.9.10.ebuild 2536 BLAKE2B c2bf44e94abbdf5cfcebe040e37881ed321396dbd00df8ca784d72a5514430f16e17db5872f2173b9f34bc527cdcfb984ebcd15dfc588df7bbfa4785bc169c3a SHA512 6503d3b862ebce4036b34d80a42d4ee7c4956677bc60a5aa5f4f6c761edcad670baa2f46851c12a8856eec737f2d5fa92baeaa546d8a57edb6b1ff7107447e1b
 EBUILD gentoo-kernel-5.9.11.ebuild 2536 BLAKE2B c2bf44e94abbdf5cfcebe040e37881ed321396dbd00df8ca784d72a5514430f16e17db5872f2173b9f34bc527cdcfb984ebcd15dfc588df7bbfa4785bc169c3a SHA512 6503d3b862ebce4036b34d80a42d4ee7c4956677bc60a5aa5f4f6c761edcad670baa2f46851c12a8856eec737f2d5fa92baeaa546d8a57edb6b1ff7107447e1b
+EBUILD gentoo-kernel-5.9.12.ebuild 2536 BLAKE2B c2bf44e94abbdf5cfcebe040e37881ed321396dbd00df8ca784d72a5514430f16e17db5872f2173b9f34bc527cdcfb984ebcd15dfc588df7bbfa4785bc169c3a SHA512 6503d3b862ebce4036b34d80a42d4ee7c4956677bc60a5aa5f4f6c761edcad670baa2f46851c12a8856eec737f2d5fa92baeaa546d8a57edb6b1ff7107447e1b
 EBUILD gentoo-kernel-5.9.8-r1.ebuild 2536 BLAKE2B c2bf44e94abbdf5cfcebe040e37881ed321396dbd00df8ca784d72a5514430f16e17db5872f2173b9f34bc527cdcfb984ebcd15dfc588df7bbfa4785bc169c3a SHA512 6503d3b862ebce4036b34d80a42d4ee7c4956677bc60a5aa5f4f6c761edcad670baa2f46851c12a8856eec737f2d5fa92baeaa546d8a57edb6b1ff7107447e1b
 EBUILD gentoo-kernel-5.9.8.ebuild 4314 BLAKE2B 2e86ab3b0627612b0cbd906f70867c66f6bc014a793a70f5c162c67863da3d5a90148bb3f1164f1234127507d39df87400a361ffd065b2800266b65b3a65ca43 SHA512 c32becc02962fa0391cf64a13c6b4c437d2cfe9f4c936923b71f658d86c2fcb50ccffac4e07f7cc9e5871003587d158f7051460f20412f9b225f377de183b7a7
 EBUILD gentoo-kernel-5.9.9.ebuild 2536 BLAKE2B c2bf44e94abbdf5cfcebe040e37881ed321396dbd00df8ca784d72a5514430f16e17db5872f2173b9f34bc527cdcfb984ebcd15dfc588df7bbfa4785bc169c3a SHA512 6503d3b862ebce4036b34d80a42d4ee7c4956677bc60a5aa5f4f6c761edcad670baa2f46851c12a8856eec737f2d5fa92baeaa546d8a57edb6b1ff7107447e1b
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.81.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.81.ebuild
new file mode 100644
index 000000000000..0c806189a34d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.81.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.77-r1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local merge_configs=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.12.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.12.ebuild
new file mode 100644
index 000000000000..2bbd08ab2819
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.12.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-${PV##*.}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.9.2
+CONFIG_HASH=94a4277f8827d1b2c911deabe56e7d929dc93146
+GENTOO_CONFIG_VER=5.9.8-r1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local merge_configs=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 555c46dcef76..ac8a911273ac 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -16,6 +16,9 @@ DIST genpatches-4.14-218.extras.tar.xz 3340 BLAKE2B 29f052e3b1a79e7be43818324d01
 DIST genpatches-4.14-219.base.tar.xz 4733352 BLAKE2B 3a2c41bcdee77395ae2b19ee4a9e53771795d2b21a9a31c821d20853521f911ceb6f49219fd9c2e65fe0088251aa6cdee2a139e5d3f23f5cd665001e48154822 SHA512 a0837de333740e20a870324638b81708133420e7c9152bb194ef5623f29a38df6b8211686fb13f9b6f3785be8071c1dc3cbc989cae8cecda79db97aaf85d1868
 DIST genpatches-4.14-219.experimental.tar.xz 6092 BLAKE2B 7df1ac766e4bda252718f06751aae3181af7bbf68e609562db059577c8d123e816fde728a049a9d1ea3baa4148d9433c5c698c79e61097ec2de2389ea781216f SHA512 1dbee51c8021a3103c64e79684ed810de436d88f3f1883c4d53b1898a55274600da07f452910eece720b0cee1f6a6d32af68760a468a42759bd9b0b15e28eea4
 DIST genpatches-4.14-219.extras.tar.xz 3340 BLAKE2B 2a7077ff685b93d393f8c1ef3e7d02fcc3aa69ec209d88cc19339e4a5bf64e29e456f88cd1d49826e4a81537622365cd390884d6a621e358525179c0f97f343e SHA512 e2e32ebb01afdeb67c4556982c9a9abaa26f0fb46d251c07513e191b03429d9c238193345fb4c6b08de315e67d89b28f675da4ef942c30ec4d9ba31d8466a913
+DIST genpatches-4.14-220.base.tar.xz 4745992 BLAKE2B 71ded67b5bf42e8974fc71f3c47e7b7c38a4714f004d0eab1d3fc659318382518ec265d21d36e46f8b5f7ac5d5dbac77bfd5845c45c0b10d6e8ff83af662df1d SHA512 5ab21ec37af7eec0a6322bebd6ade3043afa449ecf906fa36375b1b8f6afffd639e84eee9928916e4d5c2ba862e9ebd85b9aa58371e4c633666bc524efe05d82
+DIST genpatches-4.14-220.experimental.tar.xz 6088 BLAKE2B 5146d0b4a651db52fbab2fc7dd90805f81e790ff1ff414cb1db062c23f8cf68bc136f9e2176abc140c3895ba1d2f3612939f06a5974686c6ca1673ccbc9bc785 SHA512 d27f48b31bcbad863d7fb4f58dafb1793e50c8afec88c96e42d5973ecbd6ae6aecde47a0640d4d5cef659356bc2f4326b8a0403ac694cbdcc7a866fa686b4d33
+DIST genpatches-4.14-220.extras.tar.xz 3336 BLAKE2B 3641a778efd8776ee3702ee4da9ad55521f53bf9260c0d8712af3e3bef19b51a7a54ba7708db64d27b1a18003a1dee98594819680ea84980aa5bb174675cc76e SHA512 ef25506c1ddde134a1b95c16450b06e4d9c576e807b5ab9859d8a169d475fc12d1d4181f712b96356a1547c58faa652066a9173b8ec9915a71e548b3bc11abe5
 DIST genpatches-4.19-151.base.tar.xz 4004372 BLAKE2B ab830d3f5ae37f48d4aa71e6b9913498397c00fe17630184b7283b42415ed55b2a3fe0d9d3c619923f43c8e244b476ed28916f0dc2e44c53dc8022a21ad152f8 SHA512 0b7d374b9dbd90f99ae73537e543d19c253d219ffea77e56a1c6825516d94f5bf4e2d85323f5a7318e0b8b5233e8b7363fbb2962e60c09b5c9825b1718bc7ae9
 DIST genpatches-4.19-151.experimental.tar.xz 6976 BLAKE2B 136a9a1f5de573917000f3b41f28a6bf84b61588cc8d61824d43df5fd191feb4608a55e5418633f18df9002dde899670a03b9713feaddf6b60b64c207005c256 SHA512 1650b33e6a3a431d91c3d9f054bcfe6a3bf3a93d2eda87beb23af93846f4b04ff8b67f31e71361584bd8963e2cacdecea7c33ad15e273c3b708aa353467afce8
 DIST genpatches-4.19-151.extras.tar.xz 3316 BLAKE2B fd6adfc4ce72c3a84b4821c6adcc79cf421e30609c1556dd9534b851faec4b5eb92210a48d2cf5e3c4a34781fefd4101ee6ede03808bbccd5aeb5875cc9d4515 SHA512 288a504278449d0646377e9e6b5191787fc218d5912a2298b7243a0cf8cddb21a7108449e9868f36c6e97e43081e8eafa880093ad1d87673f670042e31467e59
@@ -34,6 +37,9 @@ DIST genpatches-4.19-158.extras.tar.xz 3320 BLAKE2B a0e1ad33e71fb8b22bd7136d53f3
 DIST genpatches-4.19-159.base.tar.xz 4174792 BLAKE2B 1381a2531b6297e1f76af70107c08a3b7b304177b14a1407ffc41a5851a4249ec4adf5ed00539542c97a0c8dc0cffdb20c3681b9da17409cd9d4ac711b353dd8 SHA512 e75991fde39f093c77b4e7f16aca7b24be47e1e438df7a60a97e0db7aa14ae6c0ed868685da0979c10ce9064839adca84c76a6ec87c1fbe41eed7a20788ca776
 DIST genpatches-4.19-159.experimental.tar.xz 6980 BLAKE2B 62605b1fe8ad86233bdfb183df2019dc4d6c74243678f5aad08167ae67b8e0dc45be7a33cae59a9c30678c986c9066722dd32ff18ee572d9ee5f7f2f51caae20 SHA512 240ecdaecca79bf417b080f6ea3dd2cad113694d2f49ae7a9910e26250f381721dcac0804b3e983272a5ea66cc1455cf94c668442e98ce5938868fea1913050e
 DIST genpatches-4.19-159.extras.tar.xz 3312 BLAKE2B 480dfb15464c46ff0cad7447476ec66535c6b32ea9ca822ef7f8911b4db7d389c6bb1d1b80811107afb77e290fd4c887ac1786a95729c58673180324246d655e SHA512 8d55a3f9e1516e32e95719a5c9d5c1018bbcdd8f2412b138a46da1419252d9e088d2f1071a5c44dea969bbf4d93461c58edd17ca1b9ef835addb9bd065eda259
+DIST genpatches-4.19-160.base.tar.xz 4190068 BLAKE2B 9239276be20d03962b0d823c7cc1a83167ca3fa4f6367268ceca8cc597740ce1883fcf08cc78e5b2298bca41854f8524ce9504b0ef4d8548096b953eab94e7f5 SHA512 921de33214f912555a93e07f4703bb46cf20e5f566ea5cba5fcb6bdce6e0f671a94c5dc17b89582e8938e1f1a6e6e59954105ffa6e01e1dd141e21eaca658a7e
+DIST genpatches-4.19-160.experimental.tar.xz 6976 BLAKE2B 083754458a1585098c4831b954c041226fe49459a9aa06f79b16292994d2b2a796451f9f337508733ad14bea411b623c67f3950ce36aa7d04dc0da2211b27678 SHA512 9b0723f60de46805681fd57d167a4fcfdd7826e8479f5bbda449727e96aaae8242a2a275ae8f71b04eb4af998b6726830b9c66d2305f438c9165de4979066902
+DIST genpatches-4.19-160.extras.tar.xz 3320 BLAKE2B daafc306f8f634acd3dccd2726340b0e52e53ffd94f6baec5ad15f7c2ad4a908bbb6690c6b188141d587998d7d3d8dc1141d48475f4b9d15890f834f026a917d SHA512 da7e4dc03410ee8342a493f5ea3e74eeaabd81db667e3d46c641a0bb0ca8d124b324d5f4fe921987f38e2c4bfc35bdc16b6772e4e43410497f2d862a9270c209
 DIST genpatches-4.4-242.base.tar.xz 3875244 BLAKE2B 68290360fa72bdf29eb6233ac762cb74d3cd8839f4e46d972e86c85944468f15ebc183efba6f8e28d8e64b1dd5568ab81f1b42178cc3606ccccda82566fdf817 SHA512 daa0026c97721043963dd02b9996c6a84ffc82e046533ab20b70520b3d7711288816ae3a98bbea671ae0d06b675d727dc508a38d82de3ea126ba8dd797c5d680
 DIST genpatches-4.4-242.experimental.tar.xz 83280 BLAKE2B 1af36c13ce2967a172436a3ebacee54e46a49478a5ef01aec66c428a9d885b638dbce2eb15276a602dc9d90866175baee5b04f3e8ba6e0478c9a10e23a2062cf SHA512 e9a0ebd1016b170e89889c59d0020c6e3a28fb0576a13f65b5adf764c950df65d64f2cf8a75d8e5c09131c8429612e112a4a452aeead3e74c96ebd0a8b12039b
 DIST genpatches-4.4-242.extras.tar.xz 1788 BLAKE2B f511bd0b8c25664b89951a7c990e1649ba765043ef6f6b37e0f5a7b63a4c234f0366319323cf8c463faf592190f226b17958a8cf515c307262f93af1e4d62085 SHA512 2822691dc7ed45753fc4fa972e1941bad589448c450f6948678c64e4078f50dc24abb0bdb9323e0e02c82e3dfb88174376f8f02cb54bcf52b0b283a905c6b4ca
@@ -55,6 +61,9 @@ DIST genpatches-4.4-247.extras.tar.xz 1788 BLAKE2B f0227bcd6db73a2469f29830192ac
 DIST genpatches-4.4-248.base.tar.xz 3950896 BLAKE2B 86c1c74e41d3b450079492d26ffb773e9c78bd69e128869ad90938adb35e00efdc55f6ae2eaf5d163fbfbc592f6556d4cabcfdb83b7c874203fa02698986632f SHA512 266467cd2a82e51ba8d388540b260e86c058de48761c083e6a6c3dd37f7e2c6b2d4a3901b030e69d0eb7a5b13b323e141764ea79a9d5637d7a3568c6672218b6
 DIST genpatches-4.4-248.experimental.tar.xz 83320 BLAKE2B 1f30185954ad3247e5cded8074f4a28350116d3ce1006b717de63842d9cd5cbef8241ce29e3ec52aaeb0fcd08082502a722ad2b618a26778d2553d9999530c72 SHA512 e5b5401e6a47c34a5eb495f317f4db9aac2c43676e07798d385b947db179e41e6e462fa0ef577100ed21a8a7491e7387df77a8c1e7250ce45e887e65a9d1bcf0
 DIST genpatches-4.4-248.extras.tar.xz 1788 BLAKE2B 3526b5cc83cb4c9fef68c4613d23c44acdfe84e89b46a3d50df90b91536077ce76973993eb6469947150faa2302ac1739ee9824264903a80edf8c24f763b7553 SHA512 e7e63456442b7fc51b3f3c1aec0512e0598d6e85cf5e0a2ca2c2046e86f754932900dd59b4f5510cec2a782f4c806c5b979cea8b13ae2fe455604efb478ac985
+DIST genpatches-4.4-249.base.tar.xz 3956436 BLAKE2B 3856750716046101dd6ff4096bc6c9c42b64f2dd0e8ac27d48da990ab4d143ff8f1065ea57de0f9345e01f654021cd416cb765421c5bbf799062baf65fbc6e1b SHA512 9b482260c043a176becec6469a7ba383a50de11b29a42ed33417258e8a95ee1bcef1836d2e3d8206a4da3a1bf7107f2e5e187b0859fcd674b7167e2c75ec5de8
+DIST genpatches-4.4-249.experimental.tar.xz 83284 BLAKE2B 0f77215e35d4a2e2e50d75f6b7e2f39ba18e4a5eb3e36fffd35ebfd306c91b74a2abf75f1b035dac9d34c2e7c5c66051dd25b05d5d9a70c3631f651efea7b7a8 SHA512 6faf18e1d7f82243ca14c0083d9c5b4aaa8057672562c1f49de528c7c6c89a66b5178186cebe7c23c17ba85fd5cd37b50087acc8c9336d5b69f878c3570a45b8
+DIST genpatches-4.4-249.extras.tar.xz 1788 BLAKE2B 5f5492ab8614466053b5d09f7445a9b051775136620f1c12d423ae6d4c0052f92d456320ceb4eac1253bcb0d759e3c50e19cb67ce3ef6560a20edcddab5ee2cc SHA512 577c5f842d33774b522a40b810dfead1eb484e109a2b1cbb3fab84a080b566a565dbca86d481e0250688b9317abeae4e84c9bcbbbec9821c9696f77c21eba06a
 DIST genpatches-4.9-244.base.tar.xz 4329708 BLAKE2B 564e2a065bf6e017419b74fb8485194ed4b4f4a0025dafefbe7c9feb0fcad78fe7f1fbfbf5c6b2f12a9953bfe91f98939f495f49052bd8a5cde67a4bd6df0443 SHA512 03d7599c0223162d33ca398807086bc5c5f7b56d08f7e82d32c17b630348f3c7fce3505d02d3ef3524e9b1ca85228196c989dc4cbb56e3398a56d5bffd18a111
 DIST genpatches-4.9-244.experimental.tar.xz 106376 BLAKE2B 22e39755ae9122137ea20037048fc493024f23cefc73d46fac6f41db903ca217c214592d9a3e178a0669f827c1a5ccd7d0bdf5a7fbe9046205b436ac2fffd224 SHA512 1e3f4ef55a3321964582c8ec6d81876977f2a6154bd1a880a31d25b1bd73ec6f51dd4ab3425717bad973bb886f376ffb65e58df4048a6d86823c665c98ab2c15
 DIST genpatches-4.9-244.extras.tar.xz 3340 BLAKE2B a04e319c89064205c0e8a5308fcf50e5bd6be6b77630cb4cd8b81fdb3dfe7020e78cedfd297125e9c7235b45291f6973fba53fe31cf75b200fee61f7a62ada2a SHA512 5750914ef1564766c3d27f3fcc814311b021690647c293ef58d40d09f8737559ecb235b3632bb18c307736dbc96cd9b39c53bb351c94d204295a273b60b73cb7
@@ -76,6 +85,9 @@ DIST genpatches-4.9-249.extras.tar.xz 3340 BLAKE2B 649ec90c746481dbb215aa7eeb882
 DIST genpatches-4.9-250.base.tar.xz 4423652 BLAKE2B 028223b668bc00d1bfbd4bcdd5dd201f9fab0c9a4ce68f5e107c1de83320c88865826eca0f38b5aaf25c96e2d66a76f0d305b73bd659197898818515275d48f5 SHA512 f10dc4626b1863177d1dbc5e1283c8848b84e6ab10b3208291a0679a3023c5f7d34cfbcc6091f7fcdb71e34f02afba3e7685e24b1f38730c88197c621e41fe08
 DIST genpatches-4.9-250.experimental.tar.xz 106372 BLAKE2B 409a0fdfc2246e57f461abfea86f76694ee835215e0ed816e1c445c2e5bb3439ccd47414315f81e9cc791f7206b12ce45c9f46892e9152341194e15d0a44a090 SHA512 63f8d3e6dd777fbb8ed0dad1b67e0405926fdb0c1e40d3c9bae63494de87a3cdba37e41f20cbd7ed109eba6a933125bc6354814f5539c20c377be449cfac3b48
 DIST genpatches-4.9-250.extras.tar.xz 3340 BLAKE2B 14cb6c6993c772cc8fd2a4a63f7fce94d850a926c74ac954aebf66e3bbb5db1c20001c264056a8f49561d21e754048963464226d56a0c10eb03cb59384420487 SHA512 a1eac658ade3bc0ecd6c98d1e0fc82f006e75ad4147ba0f2facc58e647bef731098527ff77d1d817f7605c0acdf3dd3f536464953fa2af27c32eba2863065db5
+DIST genpatches-4.9-251.base.tar.xz 4434572 BLAKE2B 0c9f5fc9f1b4ab2ade7a56815f1ba59a2a345578e10d5abe47259638063f7fbebf412c921a53df81bb16705ff904d5a568bdf2172236db027ac65a2cf5c22cc0 SHA512 f597d8b1f5c210bb20535305905659f413d4cee679fa26e8532e8f381773de72dcaaaa99a27fcbdbb704a6c503c93223b06f84e1b75d2b4449c06b08e58159b4
+DIST genpatches-4.9-251.experimental.tar.xz 106444 BLAKE2B dcc9f7ae1534498de0d1c0d33dd0c0ddca071d16a720001609272b6698c92ba74015eee01d1429e46118c467c1772e2db77d1700a5d68896ec637dab1dfda0cd SHA512 0b50fea309d5f1b6c0c80ae153ce3247a0e0837c5bc7872b0a7403a6142dc522e17fa0b3ccc0d34e911dc0a6cf6de57e4d311dd90d4c8199d08ac0ff95aef843
+DIST genpatches-4.9-251.extras.tar.xz 3340 BLAKE2B 3c539c1e45ab2f01cd74883fc997c7d38a32312ea4643f53b429f93251f3f8d531fb72ea6f8c2bdb99b7ffd742e020e5b4d1ad7b9f4dfc3636b9b5bd291411e2 SHA512 83be80e466a3936eb8f99a654b4d5ae1fb057a8805ade3a81a199f27b57dab13b46268c432fba07012d451829cc63d04f04d6a908b49ea7ab2878c192e071f81
 DIST genpatches-5.4-73.base.tar.xz 2527064 BLAKE2B 6e0b392681d6e5e709a02c1c8f15fe06ef1651f1530506982feec7fd436aa04ea75079eeb5d3a61c91bcbb46c59a232cb8cb67c62fa7b2e8b289591142dd9430 SHA512 db987b95895fc37243e3697f3ef8f33787489e173fefb84ad09a6600898b2b9b285d9113e6f867aab0c3d5b4c65398f4bcbc40a4220f3cf2b355da9def209dae
 DIST genpatches-5.4-73.experimental.tar.xz 6696 BLAKE2B e722d747bcb24b501f3d63c8f6fdade889b620794bdd6fe0931c044147d32f5d9b3fe503fb9afe476cf1e791ca0d1247edb47df3a1d547c99e9a3107a2522139 SHA512 7ae9228a9677f3b7888ff8286b1db8ca5cad14fe829efbcb8da8dfe7e82bdeac95368a0dfb2e7bbf0ea82a2b103f5c2ee3c99826c89eec7e07f3be70bcd51430
 DIST genpatches-5.4-73.extras.tar.xz 1772 BLAKE2B 7475a0907f287fef28ee8bf220932528107bbac0d612dc05de6ca8b2dd86ddf37d9acea31ab2977a677f6ea3a19c594737b23e504da405fa811c4d0faf00b94a SHA512 751898547b1f60070f1d8431cd89daff55e33473c8fe68415a15e3b8079ae2d3e44318815ba47a1ce9750feb1cac1812eb8eb7765426b204eb1357993cc68cb0
@@ -94,6 +106,9 @@ DIST genpatches-5.4-80.extras.tar.xz 1772 BLAKE2B b549a8901e55cddb1742e394166f8d
 DIST genpatches-5.4-82.base.tar.xz 2792480 BLAKE2B 39960646116f5f85ee657a29557d8fd9e809ae9bc60aac349c91e7680f2a0565800ba37a478573098dbad41b686336a058985d2925e5046fa68eeaea8df25477 SHA512 6a76eebd7178e2ccc522477f53c36f74e6fd691f87c547dffa2602a516ad9a6a01f05c953e12bbe6ba9aa2ce34b176a6a081a22da40c7d86855e5dfc34098059
 DIST genpatches-5.4-82.experimental.tar.xz 6704 BLAKE2B 4dcaa6977e25a2d9327d043a15115eba34a802bfa80d532ff2ae3c1495a861d4a4a85ad102e69558d247ae9a0effbf4628e8963f435b949eeffd35f735ea49bc SHA512 4fba72e9efc3dd11fe934be4820703f2f8268c5479dcdae1183104a6b1c2c22715b4529d6e8a4f65d8e46d52b12ab47e3d2eee8dda038af5cac7b799263e84d2
 DIST genpatches-5.4-82.extras.tar.xz 1772 BLAKE2B 8eff7ca01490badd5dad15497f77bf43c268ccb494db9eb4c18f4f59219f1a5d79ef2a6f35caee87e3c423b0fff1ef94a6d6477e5074397f78e4bd23b9c40d95 SHA512 bdcc7eb08c1cdb599e69b254f55685f7beec83f256518d42c31d0df9a4e1c6376c184145ce47d28e0b688d2166e139445ef5f9f284e817ba9f37eaf812852a88
+DIST genpatches-5.4-83.base.tar.xz 2815436 BLAKE2B 5bf3a971d5c14baca0b21a8aad8ffc4e470f91b179b5e03779be4f588b43a671fd2f261325ca0525139c3c7e9c2b7c1020a803045eb809b2857c61134d919db2 SHA512 96735cb1c2107eee8a7d475f6558e418264dc1aba7f2f803b59db5ed7a9a249d5d0b79689a539b46e8922ce1b278b578d4194b20f20962c2b3aae83ac58954e3
+DIST genpatches-5.4-83.experimental.tar.xz 6696 BLAKE2B a56f189a5b55da43e244c64df106c02655bdbb40014d999c01039ca953d8b17ec5227230de2fb53f774536f57e2d77e66c5aa94c0bb5045fabe04c815118843e SHA512 9876ace02d7a4da2642aa46bd096f6dfd1c59efc8d5ccd39157d0628724f3d20d52f49c81bc702d1990a0cb475baf1eafec7cab3be2b3fbc2164f290b8469566
+DIST genpatches-5.4-83.extras.tar.xz 1772 BLAKE2B 9bccf13ea0eb0aae0d0b84302b9e9c82986bd60de4e85ee3703c570a5338474b08580095a952749d43104b53d3c07dbb558473e707a13ae12f7da5e5020ddf3e SHA512 0b536e4f8961513f181c5d9c4c01b51656c1e53707cf19c26d858e1a40bb1e8bc9e0bd0b314f82252047fe45a8df3e306e06abdb88f67a6116736e89236bbbcf
 DIST genpatches-5.8-21.base.tar.xz 783528 BLAKE2B 8b4e64de64d97f069014d353e45aab7900b37f508ed8e99eb469797df4780f715e0c038fbeff4b8ebb34e81c935dfd7df3eb63324121e31c1dd07591b3159a3a SHA512 4485056f47723e14f5248854edcd4353562c5ec6cb95c926310815e5bf5514d5d8edce16a241dc3d881c57832333f950562b092c21f2555a6838b9106ff329a4
 DIST genpatches-5.8-21.experimental.tar.xz 6060 BLAKE2B 42cc1a6c5a7cbe3086321ab4a6616f0cbc758b34061a82898c8d4745f9550e9bb60ec3e76b176c95962834358052794e9bd4ebbccbd891031b3cdce12a62c2e0 SHA512 c98a560c0b564ae565ab1dbc2421827593568be5010b4b0fa017def4b2401d737c89499f7b9558b6c8700b2dca4bf0e0bb86e172b43c3092cc7a867775a8fe8f
 DIST genpatches-5.8-21.extras.tar.xz 1768 BLAKE2B 238c16ed6628c2fd379fa46cf700038c08358e26af5fd4e7f1037626e2057fcbf224df72a6bd1df4b95fa896793539108294d3523118ee7a6cb7e39604e91112 SHA512 c14b718bf292707472edff04b022c722f45330b7750dd4b7b507347b0a9a29ebd236e16f01c03b6aa85bacc9220b420f5108f7728e88e6566dbb888efdbce714
@@ -103,6 +118,9 @@ DIST genpatches-5.9-10.extras.tar.xz 1768 BLAKE2B 8177c3e2b8d92785b9ee71a7733432
 DIST genpatches-5.9-11.base.tar.xz 580544 BLAKE2B 59989b81c77e174e421b4fd6f570b7b8daf3649c4869eb61808607c98999467c60f9fe0a9f1c798807e9395ee064fd183a3110482536f1061b80349156af1b83 SHA512 5f5570bb06e62220304c235d5cd93c0d7f738bcc978cd1215ba262dd6bc9a0b0d43cf8d51cf36f2f0a66996b79f656463c7a0323e14f8c46899f28b0420155cf
 DIST genpatches-5.9-11.experimental.tar.xz 6092 BLAKE2B 8cee5c88308a689008e64b329f7f191dc7016c79d44af13f6cdf3eb8c17ba8a9c3a1c50dfa6ce696d3f27195426a1bda95620a8d86456645577f8da4482a431f SHA512 d7da161fb1120dc2648f70f24ad86c0c8e4eb82382183b836b32e6590f08d986f0c1888e1178b638f3a3f706308b2d87fb3d0a9ba1451570561724f07ebe2793
 DIST genpatches-5.9-11.extras.tar.xz 1764 BLAKE2B 51e216b1f4970b10e89fdea37bbe5621af2accdad098f4954884314c513a1ebb30c02f07cf725d8d32047513024cd360f2b222606a340c330990fcf7497b0285 SHA512 d6624234d3a64a28be09f21ad21ec3c82239166495c34987733755c4d64c20e08939a9c547f253468e44cf31d1ed6bf5fdbbb9b0adba393ab8eccc0619b93de1
+DIST genpatches-5.9-12.base.tar.xz 628408 BLAKE2B 6dbb2c992971cf3ee1c0a0c7a7b70876bcc41e93dd6def0fe87e2a4ddaf62ebfe808487ac117b79eb629c34e66ef1a02bf7adc2191c3273bf77ea384260a5bd3 SHA512 bde0614ff1eb3dc9f681fa8a5f8207c8d2f9a959984fd3a0c8bc4da8ca432d6e1a32992735a8c59074de738a6d1341aa688efc75eaca6cb575f41e694f333d7f
+DIST genpatches-5.9-12.experimental.tar.xz 6088 BLAKE2B e6773b615967443b961e498e50ce50c48608b71f0373bbf8c68d2aac4906c18dcca3e1578157ab0413c700ac2f67140fc47901c757d8292e1d1051f6ef77c21b SHA512 bf21c813045ecd51d2fef01f15269eb77c9c672e3133dcbb60461190e6c5b5f7f3bacf557b7d48f4bed702ba3135a665d319ed218cce1b8319ee83d93d1eeb19
+DIST genpatches-5.9-12.extras.tar.xz 1764 BLAKE2B 8bfbde759342d00f10d6fe12e313d449de35aba13a5ba3564043d0489205eafa709a6481e7249bb79f54c84c759f50ca7f630e2e2bbfebc71942f72b3c8ea6e8 SHA512 274a2d2fce2f446503c4540d30daa3c3d6a86e6e6c206f0a2e1e89ee1ebd496f6ce2706add35ca6fc39df2c0758719faf332a230db18dfa9f81dab787f24eb3d
 DIST genpatches-5.9-6.base.tar.xz 406744 BLAKE2B 79052b91967819329a94b796ad72d6b7eec43d2e83615333abb7b9e0f3c7b737687de05e4ed8ebdb1db064ee16c2b45786ee3652f6f4b107b7e64ee309d9bb1a SHA512 2ae6a445936221337035b9d38336285c8dd2cd9cf2686bdfdd7dc229efb8f61d3088b834c8c63ee633ea197cd48455dffb24dcf11aef0955c42e4e271da76f42
 DIST genpatches-5.9-6.experimental.tar.xz 5828 BLAKE2B 6315137049438fca8a3835858321311dcf1a3ab374eb7c1cc0ec77847891112490ebc8427896381da78b2415855a73b444a69c5a521438f09df55219d96a9a77 SHA512 81bb35477a6e6180b08776b0a27fed4703e8796a54110959869b8ed86100c6e9c71b8ea523e5f905099ef64f8b99a8c5f699e0ce32d4c76dead9bf2121feb1b6
 DIST genpatches-5.9-6.extras.tar.xz 1764 BLAKE2B 3ea79d40f67a97fe14c5adc7c0f5bab19ab28bf37778a334c50852cbbdd91f32ff696e65e9a8f703c8573be7714447a75913c1783118d7b8acaaedab8518075b SHA512 d0f470637202283ae8295bf822b86609f426023fa6f0c00b1a3c0cce461d005c3804bfc7cdbcf965ef9d6a2e68917c2fdbcd30329e551b91d50055106c4f5cc8
@@ -128,12 +146,14 @@ EBUILD gentoo-sources-4.14.206.ebuild 736 BLAKE2B bb02d63f970eef34eb8d0913c7156d
 EBUILD gentoo-sources-4.14.207.ebuild 736 BLAKE2B 666b08ca1007df5e676eb051317528956095969f6e34b21f7cf061ed66428e3f92a4afa3eadd42c97c155bd2943653008a1c2d6cb5ab3d96566ca6e7496091a4 SHA512 e2e6e94cb7994da5fb68811ee3c870e9ac12d5f34f85c81a584c5e9ffccbec94534bedfe6b2c911849933201e72d522d68481fe820ab652449dc87d1605c4e83
 EBUILD gentoo-sources-4.14.208.ebuild 736 BLAKE2B 28a198049ab28c506ec7cb803e5baa35df6eef799cae25347c2b7807d99ab471c174920124351bd140dbbcd220db87bdcd8d09bc00c7d35e4facfe22776529bb SHA512 8c1f30fb6eafbeff7dc68960beabbabd16b2c985823a8b467ccb01712783e703368aa0dffec46a881899497a35b9230670384ee632f45627faa776fe77eb0856
 EBUILD gentoo-sources-4.14.209.ebuild 731 BLAKE2B b3a70f5936486c2a1bc8e8bf49ed225800d243bd8830860191a4598c6d072521a8e058cd74830814d3a22cffc12f977a3a42380a0536c13cd8d3b3f9d630b8fe SHA512 c9bb1cf580a4f48f42dc3771952ba2f96c0e59a9f67f13adbcfc2ced24c7a9ffb875e6075c427342febb4313a61d85829ecbe85101334c4aa6af59117e32b70e
+EBUILD gentoo-sources-4.14.210.ebuild 736 BLAKE2B e7f67033fbc13419efd200a58eaa0f26c5524a533da35f741ed9160fea7c66d2a476b737aaf5e027cf6cb7842d551d31b5f57555e2671706790751322f6a5ebf SHA512 aa7e09003cc9c1f76644f35f481b5d06d5e7ace804073d2d12705aca817c7baeb8de9994fedb09db0716ebf51a5bf6d96d0286a132aeb31e162c0530d585b7b7
 EBUILD gentoo-sources-4.19.152.ebuild 729 BLAKE2B af92f3c7e501a8163751ef29edf64a7ef10b3dc71e5088e3d7637e5761673b1a999ced2283c5fbbf246249e5de3018a0367c91552bb84f77d232531122153276 SHA512 7051bd5e350e2a5fd97720a895831b3b0fa5818dd0edfff2e7aed7221e6e562ca89aa8cb5dabfd4973c539384914e33651cdb220da9f20f4b5b231d427597419
 EBUILD gentoo-sources-4.19.156.ebuild 736 BLAKE2B b0d24c5546d811882ac3cf1ab943b27ec118a6737bf6134e8d97daa44177ec50297536e0a356aad260997cd6ea49aa753e3ea8bf3828c43721821a20a507efc6 SHA512 a3676de02527c93a33d67b9ccafee4d1afab38515a4595034b76f2c37f104c85f3826b37ba22df47057591d38b21db630a3b2f39f6321b3bae1c82596e2af4e0
 EBUILD gentoo-sources-4.19.157.ebuild 736 BLAKE2B c315f01e45cf90f84605c38625a51f693a9366ab047eed7618e53a0f6aff3b0670aba90c6f7680099b5c0126e4bc60b0fea747b3fabeceac975758b46f3a0ab6 SHA512 a58670eab246d30372fed7e6d757f614cc700669bc27e78b7b4656f06ee3539201698c263a846ae3772c217ad3a6aa1cd5e01e79782b2530f8d886fad28dea9f
 EBUILD gentoo-sources-4.19.158.ebuild 736 BLAKE2B a9fa4f8ce86772b5711b032495650d3d6680543d62122b9d3a98a179c16f97857d197698830ee91f1ebdefb357ea7297cfdc22237b72cc7c2584ae129270220c SHA512 56e8fc2abc441aa6b4fde17f6159c3101b1190aff15be3dc49acb8e3ece1d7d0cd5d5660ee9c35f14c62554edc22901277f7ea5019258abb370aba754d6b8ae3
 EBUILD gentoo-sources-4.19.159.ebuild 736 BLAKE2B 310edc0164ab12aa6990d375bbc7ed4fa1f804d07ef1a5ee4896cfeec84619b97a2cd8747385f0f1b6b4bea1ca8cc9957d5a9f5ffae06a364c861e6bffdca881 SHA512 78b124d620a47db6dbf2b794517b267e5284367646126a0baae895875bb7aebc3ff0364b1e135a10c12a557f3bfe95d568d1905768e0e0583783a32d83de4406
 EBUILD gentoo-sources-4.19.160.ebuild 731 BLAKE2B 895af16c9ba7d65fbdfbadaa4966e6c577d70b3196bd9912c2b9bc5704f1fa73ad90bcff33154d9cdb64c6154f4d59e431e9e3d5f89ac611401bd6f533c442e0 SHA512 855743fa1175fef8b9535da2bf15d938ab2c44be6401daa73a8f032e39ee824501528a7bd3a38657a99fa818ceb83594c5260af559d5de1389498fa73b7342cf
+EBUILD gentoo-sources-4.19.161.ebuild 736 BLAKE2B 874b1e12b1859ee2afdbd621c6ac8559585130184442e2e0d724c587b996ea75756ea1c2f7a3f99193fd5e75d684f9d11d2043da10f191929945a50b0810b628 SHA512 9e70f87f9f8508b5ec91af5d2897d45c1d63496c87af475eaf24e10c2c93320a77812b11fe7dc6056cd940982ce0f2ecae0e7f5261e30e9950f5eac5920dc71f
 EBUILD gentoo-sources-4.4.240.ebuild 729 BLAKE2B d8c6039decfcf4b564ebcafd95aab1324bbc5532431b5356b9ac01f4117545c94c7b6f1675101f90414dba03632e5afa1ad89f85fa9a8f42f87ffdf12eefd083 SHA512 bd58aaa8202e984d54d4f73537616684a9745d5f2f9f4682c01ebac010b428a89e2ec887046692d4729e6d6166fc8239401f3fe78ca92afc27c3368d477cde01
 EBUILD gentoo-sources-4.4.241.ebuild 736 BLAKE2B c9b5553d58852333a0b1e66087cc50f317c3a807e02cface7c4a387b46288227063f1e47f92eb12332e83dd4d6fb7bd37efe203d31518e90bd3a73105ac461ae SHA512 a2f941f1db6a599456167286080bc48cf1696ee00c6c79281a34ca8717392fd7293a0a9a60128dcc9e0071e40c8baa84b2587c7a5bd015619f2765b494c3a115
 EBUILD gentoo-sources-4.4.242.ebuild 736 BLAKE2B 7f6db552af8c84891b2668ad6cb803a2f8a41225996b408376ed3e3c6f97b9b7e23957fd8c541146bd002a3c8f1b08f413bd41bcb61fd5a23e95060e64443557 SHA512 69df9fb2064513b39f0b55ed4954e3b7202265ca2c75440365ea6ed1d6a3b0f0fc3c72c398ebd9f1e04169c56b7c341e27b8cdbf55c02cf128f630f3f82a92ae
@@ -141,6 +161,7 @@ EBUILD gentoo-sources-4.4.243.ebuild 736 BLAKE2B 606855eab2ec55c7f3ec26b95392c45
 EBUILD gentoo-sources-4.4.244.ebuild 736 BLAKE2B 073b5fa6c20d5d6312c905e8d1b656ddcb6a3cf6a715bfd0aa19cbddee9ff8695dac0260056cabab3aa21e2048f013fe8d623c9d6a9b4073b776e377f70354bd SHA512 60b4930008b2c1bf168c98de45d82d61e8d06e2eb59839b5aaf4519363b3929efe9c791d762154525eec9a5f17f703e6a0d2b4dc90105098502e5d975c93d983
 EBUILD gentoo-sources-4.4.245.ebuild 736 BLAKE2B 7cd984927f75a3771a40487f5f9aeebe21d217fe6d9abb69fb6e200b5f97478fa59e65b439b454596fcd9ba3356c6ba35de83fa65b83845c1b05869b7884a2c9 SHA512 7f3878fdb5753ffd26c1dc2aa9db136230e5afc2f2069e42295e591d613ddc1989069c851b6d0b376fa5e16810595e9f72c19ba30bbe97002b0a2cb94b24bdae
 EBUILD gentoo-sources-4.4.246.ebuild 731 BLAKE2B 48e474ee0b124198d6c6250a2ad0b8f7449a04b9abc04732fc877d0c0da3b944f90ba4e9fb2c94015da76ba0da3b1a20d787373c8d57329cc8689b6973fdb310 SHA512 83639333d54b7a245200132534215d74cfd0485a00d912b9f1d3f315a249752b721760a8d0c3767444ff40f6c35781ab82783cea5b77724cf0590d1e70d312eb
+EBUILD gentoo-sources-4.4.247.ebuild 736 BLAKE2B 5d497c876fd97ebc065fa88f212025a133e5ca17fa21c6f64c0396009f3f288b8cfe36a0124e51e63c986ea5c5096392c4f0edfa95423eab39a9cbbff2156ac5 SHA512 65392ae49304ee685ef22bd7a81752436b9684ceb153029aacdd7270a86224c9d0166c4e9d4149f288069f6bddd7f37b5c05e77d930a5a4a23b86bb060014f66
 EBUILD gentoo-sources-4.9.240.ebuild 729 BLAKE2B 1ffa95b048658a51278083948fafc653c03fa6483cc57742a9a279be3c72269315ff38cb85350e4d52a1928f99aa08fd6f446a9c009e049c8a7949eddc7d87b0 SHA512 50a2b935993aa2a2cca5d3ad17d7a06cc7c853647c3da2b6449aeaeb7817788d3d809bec2479077a7bbe049d18cf2f185464d0932f300468db03c4ff7357b747
 EBUILD gentoo-sources-4.9.241.ebuild 736 BLAKE2B 606855eab2ec55c7f3ec26b95392c4551494d04307fabfd8ecae5ddca614d552cba57efa99efc4abb8ba2903d9bf35f227af6d577cb799bd969882c5eac8fd42 SHA512 7c830f58ed46b01298d1a94c5e64bf93b563815a52e073b674baa9b21ebfb04e5abb03e83d82fe1997f7aa6d4b5edd742c45c07c37e434fe1e3cbf584ff24a6e
 EBUILD gentoo-sources-4.9.242.ebuild 736 BLAKE2B 073b5fa6c20d5d6312c905e8d1b656ddcb6a3cf6a715bfd0aa19cbddee9ff8695dac0260056cabab3aa21e2048f013fe8d623c9d6a9b4073b776e377f70354bd SHA512 60b4930008b2c1bf168c98de45d82d61e8d06e2eb59839b5aaf4519363b3929efe9c791d762154525eec9a5f17f703e6a0d2b4dc90105098502e5d975c93d983
@@ -148,15 +169,18 @@ EBUILD gentoo-sources-4.9.243.ebuild 736 BLAKE2B 7cd984927f75a3771a40487f5f9aeeb
 EBUILD gentoo-sources-4.9.244.ebuild 736 BLAKE2B e6b562746eddba6d0b45dd4741613744f3368f3d953d8a34c67f788c2891b3087e94f3ba2d7181986be5e9a88ad9bd2f0637cd0e8623b76a67abfd322468811f SHA512 33fa5a535efe5eb4da60fb3c3018f8b3325c3cccff5a748c633e4b8459968e6c9791e6c918efb9326eb6980728f6458fc0dcb8d5b7b37d95949d1820661a0f6b
 EBUILD gentoo-sources-4.9.245.ebuild 736 BLAKE2B 5d497c876fd97ebc065fa88f212025a133e5ca17fa21c6f64c0396009f3f288b8cfe36a0124e51e63c986ea5c5096392c4f0edfa95423eab39a9cbbff2156ac5 SHA512 65392ae49304ee685ef22bd7a81752436b9684ceb153029aacdd7270a86224c9d0166c4e9d4149f288069f6bddd7f37b5c05e77d930a5a4a23b86bb060014f66
 EBUILD gentoo-sources-4.9.246.ebuild 731 BLAKE2B 1b290e2f27d5b166e1ee796cb50f2997def85ebccbf67f36665c2f7f82bc4339acd4915b4c9708bce2d1c1ab4d2a90d1ac134f45328745142d2e28ab9eaf8c13 SHA512 40a422d703a6fad87ef05174a77f50e795b55a2ce56ff4bd48b180f1bebe84c3749389aab4095ec452acb89518e5940e956174e866093724125ac0eb68859ef9
+EBUILD gentoo-sources-4.9.247.ebuild 736 BLAKE2B 2ca5c5341e7696ffeb58cac1a48934a2378a33058f1a02f961688195bc0e5db65f56142b3a548ae0c4167b3a491d061efa6bf44a7c4e56d23a77a4028ca6e831 SHA512 d2670e3ad0f6dc7757b262a3cb9c3e862aacc1a48c53562df2ceb39f0885b5fb24a6ba585b087983d8f302e819f1d72a661d38aca8fef2eab407a3f97d8c521e
 EBUILD gentoo-sources-5.4.72.ebuild 727 BLAKE2B 9a89ee62a4b72cff60cab136237751830f0642d7a65eea3bc9d952da178bc7fa3d9c482b9b1fd53d22b2ee92abe6b38e48e5bedf02ec5f39ec3ea402a7114e36 SHA512 3742724f8d9e9f36111457324c77196acf965067b5e203743a4bf67a317228c51552b0a8a32be7f18d18c85ec051050d7c9ee0e18b7dfee2784c77e9c8ad11d7
 EBUILD gentoo-sources-5.4.76.ebuild 735 BLAKE2B ae397faf76750809950ef683a8ab6db1d1985f5dfcc4657b469e2a2c0cf94ea487a16325bb6ef0e92bdcce333dfa1bb53d0fa1d1213dbc331a7c5803ff2c11a4 SHA512 c8547727f20d9eb59a84749c3b8460755d34d5ec9f80ae57963f0c7e1750893b21d94f7b4d29399838fa9982b0d523ed52ce4e0f02df1fb6c148dc27bbe98fa3
 EBUILD gentoo-sources-5.4.77.ebuild 735 BLAKE2B a6ee2f711c4d1af8d8516e46aa91b26ac591864356e50963bcb4ff849aa52a685e282a62fd8c0b6c6119f76f056aa703e24073b6f4ba98dd96013d257c0f02ae SHA512 7df086f90c042cec0c7fe3bc925ae20e331b59f9559329a56ebbb58047f24a6d0b52d25ddb350ff8b70785ad8f91d396338714d073266f8a03cccecb8ccfa37e
 EBUILD gentoo-sources-5.4.78.ebuild 735 BLAKE2B 626bd045a118701e7f5dfffb6bdcb9b89097c687428bde7b956edae68044e6766f43fb7ff0e39524d42cdbd5928a40c213bc4f6b5bd087fc891308c371ee3ff3 SHA512 51fea2a3892f66c1dcef9ea3bf85661339f7e72ec4c7a636815a97a878900a90c4e9ce4916cdf9305f1fcc8b7ad6170efe252440a22641279de9aedaa31c68f1
 EBUILD gentoo-sources-5.4.79.ebuild 735 BLAKE2B 08dceb72c3a89c9298595e475e46664e260131aabede8492e6debba770b0df3832717ccb88de4fd466fc9eb509e24f9d3e75cfdb3591a5850d9d5700ff6e81b5 SHA512 e88735d5abb3b36046a6ee521168be099f74ce252fd23e0d84ba561b2ee136293325697df2d64b18c64ac25b4fc6c39d0ceaefdbe43901cf0fd27bb9bb37b58d
 EBUILD gentoo-sources-5.4.80-r1.ebuild 730 BLAKE2B e256abdd2b1ea8a1cd92c5fa419d03f42d42928c283983d1cb96518828d6b8d7c99625cb6f99ba84405c608cdc2feac269b19a47a2e76065ffb8accc8fe0231e SHA512 e4cbd4f8e2dbd41b2b3777deb542b1e8d41bf464cb1d348500ebc57ccada3aeee73f362e2addf62bb615c38c4d5f7fab379621d683a85cc03396240eb8cea56d
+EBUILD gentoo-sources-5.4.81.ebuild 735 BLAKE2B 4efa2d6ae76366adf8caab7cf38151b59799c1a8b1d1d6144b3f2c247fed0356b26b74e4e20c97adf20796575d0d717e1e2056f5ff1b1aad0b818e69c81d6b0c SHA512 4b795898d93d6dfecb229a4384ac0d3f68a80acaf2ff7e00d85f8d6a3cdc75973a0d86adc2d7771065c9078160689312c14f58b03f3c0bf05ef9359d14f7366d
 EBUILD gentoo-sources-5.8.18.ebuild 735 BLAKE2B db28f4bc1823b6439d9fd95da850b18afb4defba0d321e75d4d425f61a1a22cfa8d33cc29d8afd40732a16ba2827d2f235451e5ed70c2d6e5a363884390b2f6e SHA512 86ff4d97323814690dd974d5d5f2c0abafe85b49bd340995c275f4d58d1a3d38fd1e0742165889c8a3f166a0440626c8e1fc8df90190ad60445bb5029097dacc
 EBUILD gentoo-sources-5.9.10.ebuild 750 BLAKE2B 341c7df92d7e5854dca74a5f9bb0d281b80eb6624e5fab2013921f1fdd9e68497c3d2ee11007781162d6dd1e4638145788ef875f0ada46573ed590c04b2f116c SHA512 8ecbacbfc2f721d6af45d9161e3ba859dee2da2d2638061f73b093d80e541544a41e5a2d61f126bfd45597346759a695ac40c46c31d1adb0d4171d5d97122e3d
 EBUILD gentoo-sources-5.9.11.ebuild 750 BLAKE2B de81293d134e9d0c67bda1deb8986eb26d6b0abe32e33109a819a954cb0d2981014b908e8d0f77977d766705ec53e8b6a311ca392276b074da637dd3b646c21a SHA512 d69969546944c262ee98dc7607705b444fc82ac14be1a595156fc1cb9d962599f94abba80664f14fab53c618788b10a8815f20bdd4f304f4ebffec3d1583179f
+EBUILD gentoo-sources-5.9.12.ebuild 750 BLAKE2B 3f9e69efaa8f6f9f228576841db3b09f173d6ac6d0ff2ce8a19102a2b08be8d2590c9562d24879e6a2627fd597ffd280df3f9c077675ef8e787c6a10b1a867e4 SHA512 8181e2fdaf0961fd2130e25a9157840415a2aae29232e2d24dc00a08a5ffc521207ab35bb5e4422b7d8805f428a9c0ef9b38b9a875413ab709b94ba0e4680076
 EBUILD gentoo-sources-5.9.6.ebuild 749 BLAKE2B a2d3c57b518d5f45be58cce130c673752bbe38a4a1bca75200f34d99ef57ea1fbf7728806b2c97ad1bd8023301559dcbfd2f1f6e503a746663cbcf400e6cdab2 SHA512 aaba1763e9d288d876edab6a75f154ddc7c01ed1fede2e3d171389827ecb1888bca31b5413c0994a4b2f63f956c4cd9f4a7d16cb7108e68ed25e0ef1baa0908a
 EBUILD gentoo-sources-5.9.7.ebuild 749 BLAKE2B dde49ef428f6d424feda21f0377b26c3b3d5c5e23ab947788ec948c57b4e7a24c86336c2d85095b6cea4f63ac885198a26031afa3e4739a190f906a639965f03 SHA512 2611ea70289bcec09d73565b19bffb5f57b14941df362b149afd3c58535655aa4649a2b10e5183340d3a450576521069d426129cb93cf2fcafa18e1ae74feb2e
 EBUILD gentoo-sources-5.9.8.ebuild 749 BLAKE2B 9df69a40fa241f7206ad2281ffcac6330f0be3075ff337a4d1284f9bdc8eec245aca5702ba8102e23902f82941503fbe20906b1e9f4d77d3c49ff6277455e9d8 SHA512 94a3f23598326915e56eb6af0210fa8daf89bb72902ae39f6c2e30234e227b8393eccaa5ce3e1ebaa00a62d2d59d3156b6eb435831709da72360a1b1c8c7cc20
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.210.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.210.ebuild
new file mode 100644
index 000000000000..238ad822e882
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.210.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="220"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.161.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.161.ebuild
new file mode 100644
index 000000000000..03ddb6cb0adf
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.161.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="160"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.247.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.247.ebuild
new file mode 100644
index 000000000000..635f5610488d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.247.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="249"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.247.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.247.ebuild
new file mode 100644
index 000000000000..ddf941762081
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.247.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="251"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.81.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.81.ebuild
new file mode 100644
index 000000000000..dac49cdec96e
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.81.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="83"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.9.12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.9.12.ebuild
new file mode 100644
index 000000000000..ac425b878029
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.9.12.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="12"
+K_NODRYRUN="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index bf186619d8aa..848e76747555 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -13,10 +13,12 @@ DIST pf-sources-5.9_p1.patch 35818 BLAKE2B c28c292b527c1116b927861dbcdfb948e1e7d
 DIST pf-sources-5.9_p2.patch 1222181 BLAKE2B 1a444ba68ade78f7862c474d52c021064ed78eefb68f03960ac9beb75edfc48f1da970cdaf06f78642d1d4d06fc266801228e184eafd211f3ae29811019ea8d2 SHA512 a2073d9a38fba54f32ec21fd4df928831649b80aa4786f2d58f7ce090d7f768abe2556e92c7af719c7bc8674bee5f940f2555bc5ba39b9528547e6ea5a819a36
 DIST pf-sources-5.9_p4.patch 1978557 BLAKE2B 1863fbf17732dad7e6f96b2ddfb66b424cc4cf9649eaff06b9e043e763a6d7a5941a80f3a1d2b6edc9987da41b3e9eb346c1fd63422f14f5cee285fb2de12f0e SHA512 d08011d285cfc1db431a92de9e58f5c3bde3e556cbca3237a7fd9ca234b9598c34b71482d0a9ac117e1fa15860c64aaa60c61435443c7cfa0548a620fe992b16
 DIST pf-sources-5.9_p5.patch 2334422 BLAKE2B e90fa94cc371995f36dda11b0d758c157254a4bf7f47ee31af34a83b6a4b6ebb3720d9bfaf752705c5cf3e2fd53cb7df1399654bdf20803c5a1a72e9c731aad8 SHA512 e562acccafa1ca2cd743ad20f5920a61607b27aa1310552e5a3cbf822668886c49ce020fd381d4ce987ec9f77f3c6e861fe83e697acfcbe2d0a5665619614cc8
+DIST pf-sources-5.9_p6.patch 2906787 BLAKE2B 23478dbafee1637661544d0deba45b619acadfc4a368b7f1530358450a0c4112556a779866a31de3b68f1bc1788028d408cc530b40fd1250e30c92f7b85f996a SHA512 eb31a8efbf80c1b22bb491b59b540a1cd3e03b8d20dd97a233b6ab118baa5d4ed7b4f3bd5c02df6ab268f1f38bee08c6219e0d2f88a73da73ee8897c75223b1f
 EBUILD pf-sources-5.7_p7.ebuild 1958 BLAKE2B 87e715f7443e52153f1e41592c3e2471760e75e66691f61b843024be88ab8c042327b926d79ea49268115413147457083be5a4e7ea8f2c26196dd3a2eda12017 SHA512 c831c884e7fdcb78f89f7611ec2c0fc96b9ae56e6a69615c90940513dc56e9e28ff9803e631e2bb469baa73734d902b5da184c21a7e5db523c187c712e869b63
 EBUILD pf-sources-5.8_p7.ebuild 1958 BLAKE2B 87e715f7443e52153f1e41592c3e2471760e75e66691f61b843024be88ab8c042327b926d79ea49268115413147457083be5a4e7ea8f2c26196dd3a2eda12017 SHA512 c831c884e7fdcb78f89f7611ec2c0fc96b9ae56e6a69615c90940513dc56e9e28ff9803e631e2bb469baa73734d902b5da184c21a7e5db523c187c712e869b63
 EBUILD pf-sources-5.9_p1.ebuild 1958 BLAKE2B 87e715f7443e52153f1e41592c3e2471760e75e66691f61b843024be88ab8c042327b926d79ea49268115413147457083be5a4e7ea8f2c26196dd3a2eda12017 SHA512 c831c884e7fdcb78f89f7611ec2c0fc96b9ae56e6a69615c90940513dc56e9e28ff9803e631e2bb469baa73734d902b5da184c21a7e5db523c187c712e869b63
 EBUILD pf-sources-5.9_p2.ebuild 1958 BLAKE2B 45ad93609aef6566468c1365734aa1a42c563a0fcf87135c1f6cdec8af3c637ce3434c69e55f75ccebed12de28250b61bf15d7c2f961c1effc1dc6e03c37cad8 SHA512 b669acb26f1c7a745a99e23107b8b0cc327b3b66044f7934a962281f78bb3cc31bfc0ec3b0ee20f9180d5e9f86822febad923c9337cb552626f194bfa9fb3c9f
 EBUILD pf-sources-5.9_p4.ebuild 1958 BLAKE2B 45ad93609aef6566468c1365734aa1a42c563a0fcf87135c1f6cdec8af3c637ce3434c69e55f75ccebed12de28250b61bf15d7c2f961c1effc1dc6e03c37cad8 SHA512 b669acb26f1c7a745a99e23107b8b0cc327b3b66044f7934a962281f78bb3cc31bfc0ec3b0ee20f9180d5e9f86822febad923c9337cb552626f194bfa9fb3c9f
 EBUILD pf-sources-5.9_p5.ebuild 1958 BLAKE2B 45ad93609aef6566468c1365734aa1a42c563a0fcf87135c1f6cdec8af3c637ce3434c69e55f75ccebed12de28250b61bf15d7c2f961c1effc1dc6e03c37cad8 SHA512 b669acb26f1c7a745a99e23107b8b0cc327b3b66044f7934a962281f78bb3cc31bfc0ec3b0ee20f9180d5e9f86822febad923c9337cb552626f194bfa9fb3c9f
+EBUILD pf-sources-5.9_p6.ebuild 1958 BLAKE2B 45ad93609aef6566468c1365734aa1a42c563a0fcf87135c1f6cdec8af3c637ce3434c69e55f75ccebed12de28250b61bf15d7c2f961c1effc1dc6e03c37cad8 SHA512 b669acb26f1c7a745a99e23107b8b0cc327b3b66044f7934a962281f78bb3cc31bfc0ec3b0ee20f9180d5e9f86822febad923c9337cb552626f194bfa9fb3c9f
 MISC metadata.xml 345 BLAKE2B 26083da0607ae4e301d8dd622cd9b0016630e1e70dd6197fb8b95912578015a13da38c8434df3cebdf13f22566a132ffa9ac2ee4a32ed482cf780c55327316da SHA512 4bbc43612402fe253b02894ae6bf290ae44082c98a48d31e3d822946a8709752d3c4fb9d338fdb6779d6b421e73073c67f5f951ef423728aaa5cc18ac7958b2e
diff --git a/sys-kernel/pf-sources/pf-sources-5.9_p6.ebuild b/sys-kernel/pf-sources/pf-sources-5.9_p6.ebuild
new file mode 100644
index 000000000000..f2344adc15dc
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.9_p6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Define what default functions to run
+ETYPE="sources"
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Just get basic genpatches, -pf patch set already includes vanilla-linux
+# updates
+K_GENPATCHES_VER="1"
+
+# -pf already sets EXTRAVERSION to kernel Makefile
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security team
+K_SECURITY_UNSUPPORTED="1"
+
+# We want the very basic patches from gentoo-sources, experimental patch is
+# already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+inherit kernel-2 optfeature
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="${KERNEL_URI}
+	https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+PATCHES=( "${DISTDIR}/${P}.patch" )
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+	see: ${HOMEPAGE}."
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	kernel-2_src_prepare
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	elog "Optional features:"
+	optfeature "Userspace KSM helper" sys-process/uksmd
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 9bc4e0a889df..bcbd69291939 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -17,10 +17,14 @@ DIST linux-5.4.79.tar.sign 989 BLAKE2B 26a1fcf560cb14a68ecb57e32ab7d6eed0cd33082
 DIST linux-5.4.79.tar.xz 109628092 BLAKE2B b18636d55425207c572cfdf81d4b316ae2ea0054ca9d35bcddd46c17b16fba2e9f4776c57dd049296d4068669106ae15a9a19ed949b428dcab6d82e59117c477 SHA512 cb0ed9cb4b70b22d62c5faf607dc5ad1d338f75640e0ea6540bc508ee7803df572012a29cac50d1ccfc7ec9302416ae7b5451101b676ed789128370c9bad2470
 DIST linux-5.4.80.tar.sign 989 BLAKE2B 7d0fa889c353c83eeb38d4868de3736baf6dd668db2b6660472b85dd6f9fffa83350954da80bd8e6441b54aa15324d68734ca863b0b1980b92a7b3a58073037e SHA512 54b7a124065020a69702fbc4ec82359c728ba32e8cafb7ba083d12974914c8309cc6b33b85769d87f91cbb2583b7c0a20d019d1b3808f32f07dda0ec795e8906
 DIST linux-5.4.80.tar.xz 109626784 BLAKE2B b395b0326162ca6d9b9a59966e641eb1df63dbd402c8287b276c915478819132e201ae68fcbab2fbae353591ff4f38951a643b6a2e1283a551ab8464c21a2abc SHA512 ba400e61ce4e55a8bf391b45df15bb71f43f42de1f2cf2c19468f503b102ec1269589908fa186bfff946baf031ae1531f30ab420605a078439508898e5fdfb37
+DIST linux-5.4.81.tar.sign 989 BLAKE2B 2ca269f0675bdbe25658449704356127d61df07c9bb9cd1112ce0178c8e50683a0d817cd9e596c743a7c7cee3d938a568051f45c0c729043c026966dbd2d4000 SHA512 f9e0abf50c4e8177167a1e68906d9f58b4379f213901cc6ba1a5b3f74ac9468ed78945a6ac11895f93bf22989098be65645e92d9ab40daaa57ae75ffcb0f9159
+DIST linux-5.4.81.tar.xz 109638792 BLAKE2B b33192fff45e5f4b2e2d32684e1520657781c92f1b2b131885b16041c244de44e65bba9dd4ea62f7a9e67795145e35bd66fc515dacdb2518e19e1290c6f9e5f6 SHA512 562d460c916a239f62af3f0cf892c02b23614652bf8fb6aff39fb264536d28039e592c32b231888b62f816a9264f6aca687bcd219c56712e7db6638a30ad779e
 DIST linux-5.9.10.tar.sign 989 BLAKE2B 28777305ef639cdeb41d76bd5db9212994a2a8d505b394b822f798937af43b946a4098477d1dce132a9caafc4b1009d7f3edac4a79b9eb45d66ff4bdfab69680 SHA512 a68c71883e0972e3cee877156b3dfdd5bc2ac6fee18d9da48c8355d2f19a8c2cf5bca2237f1806bdf0759c330f882331a581fbbf49fa2410f2a42e3cadfa5012
 DIST linux-5.9.10.tar.xz 115545932 BLAKE2B 423d0e2fea39d54c9bbda532dce95f67c2736646b88515e72a3cea97842a25f4b2b4ef0aa2896d623bbc89eb6e8ca14f5b447030f190677601048816ae4a76e1 SHA512 f3f5195508affa84ccac30621c852b0dec42a227e2a3677a31b6fafcffdcf34964bf43cc96b08698faf319a1eead54f26638d7c70c20df31592e1c00ff00ae06
 DIST linux-5.9.11.tar.sign 989 BLAKE2B d8c810fdbf587f70d7665960ed0df082417cde3d9b55b336147b672c2879c80630885162c57adcd437e14d9fc41112fd3f0cd20459822500b7a13c29b4da5e39 SHA512 4046df5a6318a9fd22ce13ca806028a8a97402224c6f8a032d222179d1dd24f80892fe60f51b63c6815370769a3eb7d64985bfa3b076cb61fc082c2de00dba3a
 DIST linux-5.9.11.tar.xz 115547356 BLAKE2B fbcf8b93e4a37e0f45c2de4275ecdfdb80ade1a6cf7e2b62cb331cce2d8fc247eedc14c5c37583b6e10cce58515ec3c9e541f21d067ee8d19567f9edcf065b62 SHA512 6a85177d72862769f203d8dd8ad7986e60cd57382c1cc907826c1bae40e725d8d54568f319ef0c0aa55a16300364e5b0d7e83c428e96987f32bfc968e63c69a5
+DIST linux-5.9.12.tar.sign 989 BLAKE2B 14996a6003b12c9fbaad31c3e8921fd8cdfa25cd576aff18eddfae1fd115e68c262b7c9ce6f686915bb3822d2a6b96d99de2065f9f554f663a033e13a655a5e1 SHA512 ecc31612e88ab74f170e32f77ea819ac2b5d76ee91c4837d15f8370071a8f10459d917a16ff31cc96d66ceacf5faeb02f3d0789c1cd97dc554b024d43b00e7fa
+DIST linux-5.9.12.tar.xz 115553420 BLAKE2B 9e7a86c22993f4bf1a2eda9edd8aacf768ddfb67d109eba78f0719a27d0243767b197a205142524b158c176fe5e1a08de091f4c8f35612267737f2a5ba2dbdc9 SHA512 164a89388a56140140e0b4ba3f39a45f85a73c9862f5104cf591a6d6826cfc2498b4080f862cc592f04853328ba9236f8aa305e4f0f876f6b18eda2e42ea6dcb
 DIST linux-5.9.8.tar.sign 987 BLAKE2B bbe7c04acb6b3f61333e96582fc3d64834bb51c79f7f1d1eac455d6b89b62b614e8975adf01d2dda0b3a43813b32abe51f65f111e4ef68a0b4da9b26e22dafc8 SHA512 1e3ba4a90414372790718adabf3d8311cc6cca91601f048c8c7b2efdad6cd7ab9628a906407168df92aa6cfdf6ad93a9d9341a9f31bd8d46d9e808f4c9edf848
 DIST linux-5.9.8.tar.xz 115540828 BLAKE2B 27b8820bbd7ea278b47e1c208efeeb41c890276ae59d33971ab0d8ba0081d45e57c579f9390c5e3019a4f3beebaf17a29a959e1b6cadb9e1824ea4e568f90205 SHA512 063e853ccebe3e9422407dd4ed7f74a6202546761d4eb542035b3d71d0478efba9daa6eaeb1e2452c13d3093dd64729d9fd2df17945319b9535724d95be94a69
 DIST linux-5.9.9.tar.sign 987 BLAKE2B 9a23d3b858f3df31bf00fd5f2d3e318fbda5d794fa97884a6d2cbd26d71d39b4dd99f5b59c9812e4ff74cdc641a83c6f68e09690000958225ec5dde4e3eba852 SHA512 afca72f0efbd938a3822308a725a6b04685dc10694ad44da1d54ac7f9abab083fe5d820ce88bc470c3983b4daf973e39ead03b91d0f0913a179f2e312a253538
@@ -30,8 +34,10 @@ EBUILD vanilla-kernel-5.4.77.ebuild 4546 BLAKE2B 6896f7b9416bf122f46cec386398aa9
 EBUILD vanilla-kernel-5.4.78.ebuild 2880 BLAKE2B 6218766f0f62f3decd69c3141427a6a1b583b64e9dde1431cf43ee4f6d69ffac947d3d31557eac3724ea09e3c922cc90775d6a8069dd0a4feb4c6f86c23fe455 SHA512 4854edd0c0098a6b6f097c4a019f344919a43de3eec49dcb9155dac581625f708f86b556a7bb0d9d7c054ad08a8072072c640e72734898f97167a60d8d9e7d7a
 EBUILD vanilla-kernel-5.4.79.ebuild 2880 BLAKE2B 6218766f0f62f3decd69c3141427a6a1b583b64e9dde1431cf43ee4f6d69ffac947d3d31557eac3724ea09e3c922cc90775d6a8069dd0a4feb4c6f86c23fe455 SHA512 4854edd0c0098a6b6f097c4a019f344919a43de3eec49dcb9155dac581625f708f86b556a7bb0d9d7c054ad08a8072072c640e72734898f97167a60d8d9e7d7a
 EBUILD vanilla-kernel-5.4.80.ebuild 2880 BLAKE2B 6218766f0f62f3decd69c3141427a6a1b583b64e9dde1431cf43ee4f6d69ffac947d3d31557eac3724ea09e3c922cc90775d6a8069dd0a4feb4c6f86c23fe455 SHA512 4854edd0c0098a6b6f097c4a019f344919a43de3eec49dcb9155dac581625f708f86b556a7bb0d9d7c054ad08a8072072c640e72734898f97167a60d8d9e7d7a
+EBUILD vanilla-kernel-5.4.81.ebuild 2880 BLAKE2B 6218766f0f62f3decd69c3141427a6a1b583b64e9dde1431cf43ee4f6d69ffac947d3d31557eac3724ea09e3c922cc90775d6a8069dd0a4feb4c6f86c23fe455 SHA512 4854edd0c0098a6b6f097c4a019f344919a43de3eec49dcb9155dac581625f708f86b556a7bb0d9d7c054ad08a8072072c640e72734898f97167a60d8d9e7d7a
 EBUILD vanilla-kernel-5.9.10.ebuild 2717 BLAKE2B 7582f39744dd26ae928d605148ab062a0c35ffcfe0828c3d185f0ebbc0d1a27d78bf4e1b4bc96cacfa2b772618ce24e4e56825afa3cc75594b2c0ad6c4c8310a SHA512 fca7cf1007b491269f694c157b57ca35bb5b49849d55d80fecd00082eb21b4427875906b4350a3173ac1bda634d0c0713481e8ebe53e6639f12992bc824bed2c
 EBUILD vanilla-kernel-5.9.11.ebuild 2717 BLAKE2B 7582f39744dd26ae928d605148ab062a0c35ffcfe0828c3d185f0ebbc0d1a27d78bf4e1b4bc96cacfa2b772618ce24e4e56825afa3cc75594b2c0ad6c4c8310a SHA512 fca7cf1007b491269f694c157b57ca35bb5b49849d55d80fecd00082eb21b4427875906b4350a3173ac1bda634d0c0713481e8ebe53e6639f12992bc824bed2c
+EBUILD vanilla-kernel-5.9.12.ebuild 2717 BLAKE2B 7582f39744dd26ae928d605148ab062a0c35ffcfe0828c3d185f0ebbc0d1a27d78bf4e1b4bc96cacfa2b772618ce24e4e56825afa3cc75594b2c0ad6c4c8310a SHA512 fca7cf1007b491269f694c157b57ca35bb5b49849d55d80fecd00082eb21b4427875906b4350a3173ac1bda634d0c0713481e8ebe53e6639f12992bc824bed2c
 EBUILD vanilla-kernel-5.9.8.ebuild 4495 BLAKE2B 2b3738a5ab60473eba2d15dab12ee16cf5b1dd135d7055ab8493b44dc0a39f4ce3be7e1623f808be4e8cf76c3c48085a485c5931896a9a0945467b30d31942d7 SHA512 ab711b5368ea901fe595df6b7fb6c2d4f463eaec4a835db62e862b0c46c0f7e0e09b6c90efb31868bebef17f0b7f9befa0d28dfe1649a2b37aa2bcc90e59ecd0
 EBUILD vanilla-kernel-5.9.9.ebuild 2717 BLAKE2B 7582f39744dd26ae928d605148ab062a0c35ffcfe0828c3d185f0ebbc0d1a27d78bf4e1b4bc96cacfa2b772618ce24e4e56825afa3cc75594b2c0ad6c4c8310a SHA512 fca7cf1007b491269f694c157b57ca35bb5b49849d55d80fecd00082eb21b4427875906b4350a3173ac1bda634d0c0713481e8ebe53e6639f12992bc824bed2c
 MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.81.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.81.ebuild
new file mode 100644
index 000000000000..9c5f2af87fff
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.81.ebuild
@@ -0,0 +1,103 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.77-r1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local merge_configs=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.12.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.12.ebuild
new file mode 100644
index 000000000000..7f2ee941c17e
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.9.12.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.9.2
+CONFIG_HASH=94a4277f8827d1b2c911deabe56e7d929dc93146
+GENTOO_CONFIG_VER=5.9.8-r1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local merge_configs=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 0817f20dd276..6ca0f2335466 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -4,16 +4,16 @@ DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
-DIST patch-4.14.209.xz 4032252 BLAKE2B 56b26eaa2a6d657a539e22816cafba817de6acde4b691114e86e3ac86dbfd5b43f4965733f86b47b6c5eaf627f6c3e521aa5ff586c472273259816c8365d3522 SHA512 1dee831b07a07db7b28d85018b4d31be2c98f606c8c56ce5ec5fe21bb5422b6d06325de4370bc5b2150662f2d78d631578e6e7d3c206743dbfbc270577adb663
-DIST patch-4.19.160.xz 3638736 BLAKE2B 8a31b8f6b4edcd42d1947e7f04dc8da0447b0568e9beae767c446b0aa5c0bd1f335a5feabc31de5ac659560a61aba91e77e6a243bea037bf83f5b4c25aeb52c4 SHA512 beb8fcc81a595c50bf2168624aed651c2d7b30c7ada6ddfc8585db1e5d477c336e7c5334e137350405f2aa1e3d4e21950d0e47de4fc58ee5542eae942c7ffb55
-DIST patch-4.4.246.xz 3401200 BLAKE2B 4fa35a176f36628b70f4fdd03b07513652373580d5009301fe746b44526a1f72d6d83e986002714719706e2f82cce09bd4c669ac6d58e94665341ec6a4f76753 SHA512 1e1b45db67050864193ed369f8958126fb91b375a4ba5ff90a7eb0c9d5f765c05db7e202a63c974e0d512fab863cd2dbf514a519ae2d0d9c9cc0355958939a6d
-DIST patch-4.9.246.xz 3780588 BLAKE2B dd9e84774b739619187b39a7e8fb01322d638c0bd7d2de12df6162fc6708b0b35bc067406624981b4056832d675e5e936fa77a694e5d3d646209a1c8d3310421 SHA512 c26bb03d50e9c2e8452657486250b090979a764671cb460be2391cef23047f4b74184900245a663b4de442d207e46c741635946da5e3e36c8ab73e7e68921d4b
-DIST patch-5.4.80.xz 2376300 BLAKE2B 19bf6c247c3577a61fa0de17407ab4158c06f770fcbe80e0f233e71350da4b68500f27e91eec582552789e5753bc910d863a64ea776055259574adc38b49de82 SHA512 2dd24c1ff86ff325b8c426dd3f8cc2cc97b9d8b213c3b014ae33429f85d56f2bfe8e540771104c0eafb09a96fa3ecf4be820536dc0baa9859099e537310f8622
-DIST patch-5.9.11.xz 567176 BLAKE2B d818fd153cf276f2f20360cdd6786bb22506a9d2dcd1c46da39c4f35eb27514e71df46ea66458881d8485c75d34b6048f688f031b082f07330db0cdc17ba0440 SHA512 1509a98ef46e00297e2e2fed24cde5ce70d05432ee276320e708cbdde7205683efd857c5aee3367df9ee0ac02010fd553ae999db796ab5ba16c6c3f1a6b0ee92
-EBUILD vanilla-sources-4.14.209.ebuild 426 BLAKE2B 53560374e44ba493f1f5efe280bccde63e1bb7f46adc690666fe1eb413de70bc08bad313f0b13499e736547261de2680c8fca6d00c922ff052ffc89a6197b32a SHA512 220501df3c17e284eb0710ed0951ec5be5f2611492e6de663338afbf7f45df245e41ae7b8b8cec0f2173c59439502b4676eb26f2fa4d534be7af5e9117b37e3d
-EBUILD vanilla-sources-4.19.160.ebuild 426 BLAKE2B 53560374e44ba493f1f5efe280bccde63e1bb7f46adc690666fe1eb413de70bc08bad313f0b13499e736547261de2680c8fca6d00c922ff052ffc89a6197b32a SHA512 220501df3c17e284eb0710ed0951ec5be5f2611492e6de663338afbf7f45df245e41ae7b8b8cec0f2173c59439502b4676eb26f2fa4d534be7af5e9117b37e3d
-EBUILD vanilla-sources-4.4.246.ebuild 426 BLAKE2B 53560374e44ba493f1f5efe280bccde63e1bb7f46adc690666fe1eb413de70bc08bad313f0b13499e736547261de2680c8fca6d00c922ff052ffc89a6197b32a SHA512 220501df3c17e284eb0710ed0951ec5be5f2611492e6de663338afbf7f45df245e41ae7b8b8cec0f2173c59439502b4676eb26f2fa4d534be7af5e9117b37e3d
-EBUILD vanilla-sources-4.9.246.ebuild 426 BLAKE2B 53560374e44ba493f1f5efe280bccde63e1bb7f46adc690666fe1eb413de70bc08bad313f0b13499e736547261de2680c8fca6d00c922ff052ffc89a6197b32a SHA512 220501df3c17e284eb0710ed0951ec5be5f2611492e6de663338afbf7f45df245e41ae7b8b8cec0f2173c59439502b4676eb26f2fa4d534be7af5e9117b37e3d
-EBUILD vanilla-sources-5.4.80.ebuild 426 BLAKE2B 53560374e44ba493f1f5efe280bccde63e1bb7f46adc690666fe1eb413de70bc08bad313f0b13499e736547261de2680c8fca6d00c922ff052ffc89a6197b32a SHA512 220501df3c17e284eb0710ed0951ec5be5f2611492e6de663338afbf7f45df245e41ae7b8b8cec0f2173c59439502b4676eb26f2fa4d534be7af5e9117b37e3d
-EBUILD vanilla-sources-5.9.11.ebuild 426 BLAKE2B 53560374e44ba493f1f5efe280bccde63e1bb7f46adc690666fe1eb413de70bc08bad313f0b13499e736547261de2680c8fca6d00c922ff052ffc89a6197b32a SHA512 220501df3c17e284eb0710ed0951ec5be5f2611492e6de663338afbf7f45df245e41ae7b8b8cec0f2173c59439502b4676eb26f2fa4d534be7af5e9117b37e3d
+DIST patch-4.14.210.xz 4041652 BLAKE2B cd52ea48f1f78d46b0946caa75e0f00fe7a07240e1c2fcb7e54bde4cb8fd7d7d1bd3ed8ccfb1667cbdbe24ef80238905ace25dcb9c1cb823cf413964554bd6ed SHA512 91802c8d4a86a9c97396d4b3349619754011ef1a38cc09982d66bb9376aae82c38045a52ca1aa70dcb2f4dc9f5026cfc04c73f970fe135ea882ed5bbf69d0dd4
+DIST patch-4.19.161.xz 3649928 BLAKE2B d9208f6b07a59c14e9f46acca1b1456bc02e8afd64b2c634a8376d28bdd5df61de66e7cfd42a9482e986d8fb822518b3dbbac9bde4f2e0257fa73b4dba59c51d SHA512 6483da5d53e4660515fd053c3e6ee3083b222db199d8de3b00a80fe7d2414f61e4bfc2abb88d8186943c8aa01e16bf29ef38e352c32e0ccac29ba6555523ae00
+DIST patch-4.4.247.xz 3404480 BLAKE2B 5095d7353b56c11ac42c56640dd6223c5f5418aeb367ecfefb103ab8c94eb20e88bc5dc9fbba5722d2f1cbcf733b8b0133943213d8b0f2550ce3d41863d546c7 SHA512 353eb02080153a651faa50aec7bfd36ace06e683699ffafd1161addac6bb9a5d1eb73ad8259becfa0607f75ea6f761bea807d88d5ecc15808413026f74f03825
+DIST patch-4.9.247.xz 3788468 BLAKE2B a866ac523f2612b384794cf07a18ed1a414c8d34c501fb02a7e40792e73bdc576c65e7ec77fab3f04cee4dbd4534f45811c729a6bc17f044ed2196a0fe6877a8 SHA512 4af0e2c93e70af1119f28ea68f3ed1a56226fc0e00d0ec8d12e42498623afe74cfbcd44db3087bfb7748b7148deb3836c7924369e6e6102809a40084bf242a1d
+DIST patch-5.4.81.xz 2396180 BLAKE2B 3a42b28cb5fb9cdc83171df46854805cc39e83f122f47b00eb823a05c0663880e688d7c44dfd2c21875fdbb0f02e494396df69ce07cc4ca76d03cee521d48ece SHA512 f97b6d8d58d43449491d543dd0c3afe8e4c7f7ea4527c4712b0bb6b7a4817daba61f507e8518a4f72254042472d7b5f8095e5df1c131fd010f4c0453c9d8cde5
+DIST patch-5.9.12.xz 612468 BLAKE2B babdf390cba9ede83b9056c90f769b98d58d86b168b8666035bf17e3e7d5f942d45a7392e56b6acd0423d0a4e8a1b3fa629a40ba12ba4a8ced4719b7218cef70 SHA512 eef914d5124dae25d0d5c6162cf0d19cfe6adabd3da5594609275527ac7bca9b8b3c9bdd8ae5cbc061cb93a4559c30daed3f104f789b31caa2596f3da371f2aa
+EBUILD vanilla-sources-4.14.210.ebuild 426 BLAKE2B 53560374e44ba493f1f5efe280bccde63e1bb7f46adc690666fe1eb413de70bc08bad313f0b13499e736547261de2680c8fca6d00c922ff052ffc89a6197b32a SHA512 220501df3c17e284eb0710ed0951ec5be5f2611492e6de663338afbf7f45df245e41ae7b8b8cec0f2173c59439502b4676eb26f2fa4d534be7af5e9117b37e3d
+EBUILD vanilla-sources-4.19.161.ebuild 426 BLAKE2B 53560374e44ba493f1f5efe280bccde63e1bb7f46adc690666fe1eb413de70bc08bad313f0b13499e736547261de2680c8fca6d00c922ff052ffc89a6197b32a SHA512 220501df3c17e284eb0710ed0951ec5be5f2611492e6de663338afbf7f45df245e41ae7b8b8cec0f2173c59439502b4676eb26f2fa4d534be7af5e9117b37e3d
+EBUILD vanilla-sources-4.4.247.ebuild 426 BLAKE2B 53560374e44ba493f1f5efe280bccde63e1bb7f46adc690666fe1eb413de70bc08bad313f0b13499e736547261de2680c8fca6d00c922ff052ffc89a6197b32a SHA512 220501df3c17e284eb0710ed0951ec5be5f2611492e6de663338afbf7f45df245e41ae7b8b8cec0f2173c59439502b4676eb26f2fa4d534be7af5e9117b37e3d
+EBUILD vanilla-sources-4.9.247.ebuild 426 BLAKE2B 53560374e44ba493f1f5efe280bccde63e1bb7f46adc690666fe1eb413de70bc08bad313f0b13499e736547261de2680c8fca6d00c922ff052ffc89a6197b32a SHA512 220501df3c17e284eb0710ed0951ec5be5f2611492e6de663338afbf7f45df245e41ae7b8b8cec0f2173c59439502b4676eb26f2fa4d534be7af5e9117b37e3d
+EBUILD vanilla-sources-5.4.81.ebuild 426 BLAKE2B 53560374e44ba493f1f5efe280bccde63e1bb7f46adc690666fe1eb413de70bc08bad313f0b13499e736547261de2680c8fca6d00c922ff052ffc89a6197b32a SHA512 220501df3c17e284eb0710ed0951ec5be5f2611492e6de663338afbf7f45df245e41ae7b8b8cec0f2173c59439502b4676eb26f2fa4d534be7af5e9117b37e3d
+EBUILD vanilla-sources-5.9.12.ebuild 426 BLAKE2B 53560374e44ba493f1f5efe280bccde63e1bb7f46adc690666fe1eb413de70bc08bad313f0b13499e736547261de2680c8fca6d00c922ff052ffc89a6197b32a SHA512 220501df3c17e284eb0710ed0951ec5be5f2611492e6de663338afbf7f45df245e41ae7b8b8cec0f2173c59439502b4676eb26f2fa4d534be7af5e9117b37e3d
 MISC metadata.xml 516 BLAKE2B ec4d6b5a7084baa9ed012e2108690e78422b269c88926baa66e8d0705dd5a7cc82fd76edcaeaf9a481c8b5099f65fe612388a826541a6e9a9c5256ab8aabdd92 SHA512 138d42372bcd976186c5c51f1e62b498df6b35662beeba737a46350e9e9f87b3d8bd97aeb57db43c99fc219ebb992aa2612c3ac8473cf4cc68e7d084c0fd8b93
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.209.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.210.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.14.209.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.14.210.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.160.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.161.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.19.160.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.19.161.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.246.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.247.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.4.246.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.4.247.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.246.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.247.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.9.246.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.9.247.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.80.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.81.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.4.80.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.4.81.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.9.11.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.9.12.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.9.11.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.9.12.ebuild
diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index b1f45e5dff19..eeeb44bfd6dd 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -1,6 +1,6 @@
 DIST genpatches-5.9-1.base.tar.xz 4004 BLAKE2B 8a4577d42262fa901186acc60d28221d00e5c9140886705f018d9989f818d96ee4d9a6586b292e7b1d945bea9e2408e3161a73e0999defe1b7f99d0a339eb7be SHA512 d6ba1051f9561aa30d7b196336c34930285d613e8119b152f1d6cc447cb22db5ac07c25f89d4ceddf58c9370c42699d0250a31449be2da3c591896b0c87d8718
 DIST genpatches-5.9-1.extras.tar.xz 1764 BLAKE2B 32d29f0448aef113ba9c9591c5d3b671d00d07abde9f35f365b48168887913bb2da95a8a52b852453307cabb111115a26178be4cbcc016e53a26a31f783a9df7 SHA512 df007dc98c1acdd31773f7dcf8aeb22812aa55e5593e8509b6a8762f2dcf06c95d69ad7cdce992e7a5fe730754bef26242acdc4e4da51ee29206fabb86c9cb0e
 DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
-DIST v5.9.10-zen1.patch.xz 685296 BLAKE2B 6bf669449cb0418ef0532a2c15010b8929a32d4225ac3664de155f9fc6943f3cc9a0fc1a1f37cebc2cf38221a2e7c5b33091bd471e3f42923d7c1e7bc759e800 SHA512 31af40cbdfd4e19cd20be0670b4b2db862c1e742487063111f698f2d6e6786e1a4cc72c68b25727f04a1271318fa645d5ab5bbea58ceae95ac4846edb79a9035
-EBUILD zen-sources-5.9.10.ebuild 1122 BLAKE2B 1a431d849dfcbce48364408c1d512a7a2b708ccf552f5dc92b4fb4d5df84bbc3646817a4a288230068ce8214dd4be93b624e9e4f12a6f200f45fa7db3747cf36 SHA512 3743f12f89e2c2b71bab144fdd96921dc1b87432493994ca3717827a515616d0c79ca39ee6d9ed21a621412bbf2cb870d9b0f643eff63e25b6d6b654863036f2
+DIST v5.9.11-zen2.patch.xz 745552 BLAKE2B de7f45152bdf7c5d53705f71e1e37728d9af75be33b6a4d646e0ab1a080a66aed99ab6d6c771ad8f7b0f56e031d3f6e0b37ce082efdb1ab45b1943963c477f78 SHA512 032c83130e4f0f5ceb4e9dddcb375f066c784482e91e7860b2e8a48971c232839c1e92b470f00b56ccc9eea854a129fa12d409bade045d6e5c1bc2499a7eeafe
+EBUILD zen-sources-5.9.11.ebuild 1122 BLAKE2B d494254b77cfbe9331aca0a58379921c5f43020eaf938e73900ec0ec1b15958839cb4f81f04974b05f0a7cac61d32bd393d4e2d46eaa2e65afa707a8e9cbb449 SHA512 3f2c0f39ce7d4ffca1edd633f3df197889a862032e677b91a3a4c2476194816d5d1f72f315eebc2cdc9000a2e8ca911847f42792951caf49759c6c56a155a691
 MISC metadata.xml 403 BLAKE2B b007ba7583bf43c622ac26808e1511274e1586c18b7d35e97f7e32d2c7b224e5eb89fe0dfacd6d71cf8367b4ce2c5967d0158abb706b1633218a95996fc70f34 SHA512 9655d79b7a09271fa0ba35435a727bec7dfd46b01d97a3e0a4d9fdd87ebf4ce66ca7093ee8cbb0812ba5ff0a64fe750db353824127e7d8aa731a1a95efdfd8f4
diff --git a/sys-kernel/zen-sources/zen-sources-5.9.10.ebuild b/sys-kernel/zen-sources/zen-sources-5.9.11.ebuild
similarity index 92%
rename from sys-kernel/zen-sources/zen-sources-5.9.10.ebuild
rename to sys-kernel/zen-sources/zen-sources-5.9.11.ebuild
index c3dce435487e..8649fd3feb1e 100644
--- a/sys-kernel/zen-sources/zen-sources-5.9.10.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-5.9.11.ebuild
@@ -18,10 +18,10 @@ IUSE=""
 
 DESCRIPTION="The Zen Kernel Live Sources"
 
-ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen1/v${PV}-zen1.patch.xz"
+ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen2/v${PV}-zen2.patch.xz"
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
 
-UNIPATCH_LIST="${DISTDIR}/v${PV}-zen1.patch.xz"
+UNIPATCH_LIST="${DISTDIR}/v${PV}-zen2.patch.xz"
 UNIPATCH_STRICTORDER="yes"
 
 K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 85df761af1e0..c98dc933ea5d 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/libaal/Manifest b/sys-libs/libaal/Manifest
index 17b63b20778a..b7ba3540578c 100644
--- a/sys-libs/libaal/Manifest
+++ b/sys-libs/libaal/Manifest
@@ -1,4 +1,4 @@
 DIST libaal-1.0.7.tar.gz 376068 BLAKE2B 2fb7802401721a64b17c0409f3ff668524399efc03b4bda4b4523af2cce204fdb5cf41bb2b2a6af5cbda34ee88cbb4703eec9bb76774d705b1759c91a33b1e34 SHA512 9b39a8cd3f49257ea912bb0e463c0c63ad06914e8a310deb4d4dce544d3ee34f492203c7321f971af71dddc1eb85f207082a4791b19bd4fad3f7dab516513b3d
 EBUILD libaal-1.0.7-r1.ebuild 853 BLAKE2B 15e4af1abf762925174d00143fe5ca7ed2ee15cfd764da6c9dd6b10c0ac7538475dc1d66e546aee2f17af81dd948e1196f77558973796c5d491abc421bb6e386 SHA512 0749602dc24a50cd9b829de691d726a2f1e905fc8fa76a58bb9e9c4e905b115a86006edc9c7782e482732a92872dce4cc4da7afc10141d625bf9dbe70effe81c
-EBUILD libaal-1.0.7-r2.ebuild 907 BLAKE2B e1fb5f233bcab87ba3bd72286bad8870cd943d8bb77d0e52047628e7089f3a77ffdb303a123574ee650b1f049112d8765e7c50c724e150b6fba86196b230d064 SHA512 ac7487e0b9a3fe04822608808b3f034578867ab22a3eddf7a2c0f71c6601c96fa48b1be36365bbc70cbd556235ec57720a69ba9a2f9fa4d7687e1649ee84356b
+EBUILD libaal-1.0.7-r2.ebuild 914 BLAKE2B 926ddc5be6647a2e799a935e0e659e5551f4143dcc0c6de70b1bbf8fa4adde96d449a5429eaa2881e84d0e52fbed2f46677b147689c55bc5da739568417065a6 SHA512 dd9db007425607099a9df6189710b1d1d8f43890e7ba39e581e5935a6854bd62cb1b91d2830a98465cc7255b8bb34fe215978aa382d429cdf9284fb922acf773
 MISC metadata.xml 493 BLAKE2B ccc5d79189bac603eaec22245f68952afbed30677759278dd3078b1af4c15358ee945b7f20c9e5b0210e04e989d5e784d4780a69516e9647aec87a47e5bb39d3 SHA512 ec9eee8ae224303648bd688c0309cc8809cb2dd0d80aa1fe77d7a039a0258aa4288745e9cd191ac2c70de64160cb62c47f43983ef852f171044ad39f5a5120df
diff --git a/sys-libs/libaal/libaal-1.0.7-r2.ebuild b/sys-libs/libaal/libaal-1.0.7-r2.ebuild
index 0fd56b9723d6..f25fd9d74e4b 100644
--- a/sys-libs/libaal/libaal-1.0.7-r2.ebuild
+++ b/sys-libs/libaal/libaal-1.0.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/7"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
 IUSE="static-libs"
 
 BDEPEND="virtual/os-headers"
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index a11bc6fbc1f1..1d702b464297 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -4,6 +4,6 @@ DIST libselinux-3.0.tar.gz 212096 BLAKE2B 7502c77243928adfc445f55357b0e894087859
 DIST libselinux-3.1.tar.gz 204703 BLAKE2B 72ff2d99dd6640405e804f58bdfbf05e152615ea92f902b3942602af13dc17080afeabb942ed33ae6b3f528870f4b11584e533848e455a97bf8f7151a8d44646 SHA512 57730cddd2d4751556d9e1f207c0f85119c81848f0620c16239e997150989e3f9a586a8c23861fd51ed89f7e084ad441190a58a288258a49a95f7beef7dbbb13
 EBUILD libselinux-2.9-r1.ebuild 4245 BLAKE2B b0e9aeb008f9a1d8e0cb540960020a5627ff1c2b9f65142fdcf0ad97b84fee1cdfc3b194a9af9f9a934c41a79e0a50506536ad91be14e9ab34a59f01b2e23a5e SHA512 1dcaa430921c721a9d390dca4152124d6f794cc954d0314780ca5d7c7769e1c16e98a02c40e6485b5136f993145e19fdd3036833b3912e8a07b03b7196e62c60
 EBUILD libselinux-3.0.ebuild 4215 BLAKE2B 09618d2fec347866b6bff952aa543a097ac5e183eca36ca7bcb338da8003a66a2b57e3cb12fe789639f7205ec630584dae67b0aaf58f20436efa10419ce3110a SHA512 90fad4e56ba9c1a511ddef1b76374be8adec12c4d3c72d2c44712485eb0f4982710978a3894e314eadff60d070009a48906eab1f29181b55ede7f0dfd58bab6f
-EBUILD libselinux-3.1-r1.ebuild 4226 BLAKE2B cf6479f1c938e92238459f77d71550b25d242b898998feb2ee3be6b8f804b04627719a8f7104a5401896ed8a71727f74090a863c8ac20573fcd448187ec55938 SHA512 98f642b8485609ba9dceb1ea2a1a5a4fff60b7c4775cb6a7622ed58f00575d4791c72a9d18280115e65f83dd02ae624342bb60253021ff65bd224f778c1934ff
+EBUILD libselinux-3.1-r1.ebuild 4224 BLAKE2B f51671c06ece8c7fa63cad1cf7d901593435d4ddbc329ea3c11f6600a6d461832421859b92f7f3a15eccaf996ceb5bc21cda9fb7d11c0fd2b1f936f5b27dcfbb SHA512 64db5320e7c5c9ff8193c727018c2897c0a0962d69390ac8d94d5ccddf2d1df944f5d28e0d87993e3cb3ab474579205c4d88cd3fcb766feb620d0c879155f0cf
 EBUILD libselinux-9999.ebuild 4226 BLAKE2B cf6479f1c938e92238459f77d71550b25d242b898998feb2ee3be6b8f804b04627719a8f7104a5401896ed8a71727f74090a863c8ac20573fcd448187ec55938 SHA512 98f642b8485609ba9dceb1ea2a1a5a4fff60b7c4775cb6a7622ed58f00575d4791c72a9d18280115e65f83dd02ae624342bb60253021ff65bd224f778c1934ff
 MISC metadata.xml 745 BLAKE2B 6658dad55bd195725b345865e152b62528e04201b9743dd3688058eeb6f3ca87add86035c2a14bea0b238273328464f5e2fa36ce6b96ac35fb1cc679e3cb4a7c SHA512 ee405602d0345a118c4b8eac9126417f082f4a37a7d5816a991e21191d4ce71ec883abe7e91f10f5330cdc61e6f7a174968c12f873b08a4bda5186cc4986b363
diff --git a/sys-libs/libselinux/libselinux-3.1-r1.ebuild b/sys-libs/libselinux/libselinux-3.1-r1.ebuild
index d28e9b76f0f1..d16c89c5228b 100644
--- a/sys-libs/libselinux/libselinux-3.1-r1.ebuild
+++ b/sys-libs/libselinux/libselinux-3.1-r1.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest
index b6275dd0cf57..1462331851e1 100644
--- a/sys-libs/libsemanage/Manifest
+++ b/sys-libs/libsemanage/Manifest
@@ -4,6 +4,6 @@ DIST libsemanage-3.1.tar.gz 179601 BLAKE2B 69450a4eda1f3728d339f65db1eec9940995f
 EBUILD libsemanage-2.9.ebuild 4646 BLAKE2B 1ed46e0bec6805c3759a182e839a3f296954dc643f560b4e343e14790919f5ad082cbb3e3bc5f45162f9bfa9a0a1392001a06f42344e6e17108d06bcc73104f2 SHA512 39f5b2672d5425e205f76ea05fe2761bc29dbd7aa2c7399a713d3aedcf56038cc4f89ef094979322dab66795786dc1f1ac8c0fd2645a51b25a55f7396af389d8
 EBUILD libsemanage-3.0-r1.ebuild 4700 BLAKE2B 2ba6d17b0bfd6ebc2d3e88c2e4b61a3022e2d602ba4ae621802a92a005852650dcba58062997941bcc72fa250161b85754734451f87b7e15b0a16a1de7749491 SHA512 bbd622c190ec2d68d7d10bea5fc6ebb81b39c640a3849c4b86b4e6ac40ace1f575eeb06e6a822ffe7d0a781c9b4d1c2b03e7f66572e262b90651f5ac757b9bc3
 EBUILD libsemanage-3.0.ebuild 4658 BLAKE2B 9de1e8527dd161016ee3ea2a3bfc23f901b7f77818a41ffb0b4722d16cca9cdd6d94628fc241e8f9602a9b1eb25a4d2730985807375ee437e414d835a213bd75 SHA512 d54343724a8b853c549c68ff2331ad705f9db6725b8a4680069b504d84c39f0ba0b57eca5c01b7aa93e61a3f13b3720c3e44b0ee79f91f6c8d5e7547b43e7ff6
-EBUILD libsemanage-3.1-r1.ebuild 4300 BLAKE2B 1180edbcd9265598c2e1379f4e9f14e31700faa39a72da48a30f7ba4bf19d8b46bc241f79eeb9c09ada1cf04352a5da4e5f03845c12470460facffdb5cfbbd80 SHA512 5bf7865189ec86dfab1ede90aa73ab33d3406ca1f5a01199327a4e9c7ab0c49244a853e699e26943d0558fc8a551350733e027fe7341026ed161bba905604fce
+EBUILD libsemanage-3.1-r1.ebuild 4298 BLAKE2B d1491b55eb23349bee26b646ccdb25c8205314086edff38861a72d9b09d34122c18129b068afb88f96c588e61312daaf7e2e82c3612814d3d016027e199bbb0d SHA512 4eee1d71e83fba1038946f37a6c27ef6bd1b68452db72cb41c8474737269fb42f0cd1d07de38af877c9dc5f931f66256a2c6918028b7f8bc2d64396267570030
 EBUILD libsemanage-9999.ebuild 4300 BLAKE2B 1180edbcd9265598c2e1379f4e9f14e31700faa39a72da48a30f7ba4bf19d8b46bc241f79eeb9c09ada1cf04352a5da4e5f03845c12470460facffdb5cfbbd80 SHA512 5bf7865189ec86dfab1ede90aa73ab33d3406ca1f5a01199327a4e9c7ab0c49244a853e699e26943d0558fc8a551350733e027fe7341026ed161bba905604fce
 MISC metadata.xml 334 BLAKE2B a76cd05e8b752345f7624b375455c1f25ca0417c60a16cc0f2a37d2a876ce237faa80b4c997d34de967e61f05c299a4b1fbe848799d93a5f16dcfebcfed5ebdf SHA512 3bee1c898adaf223c205ba41afe4adfc620ccdff69ea77abfd02b3e33d21a307b889945f2d674b1c88fb4f853c6ace7cca67143f7339315abc3d167f752a1cd5
diff --git a/sys-libs/libsemanage/libsemanage-3.1-r1.ebuild b/sys-libs/libsemanage/libsemanage-3.1-r1.ebuild
index a1f7982ff44f..b7babd077820 100644
--- a/sys-libs/libsemanage/libsemanage-3.1-r1.ebuild
+++ b/sys-libs/libsemanage/libsemanage-3.1-r1.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest
index 6835d02ba791..e43b23eb8bd1 100644
--- a/sys-libs/libsepol/Manifest
+++ b/sys-libs/libsepol/Manifest
@@ -3,6 +3,6 @@ DIST libsepol-3.0.tar.gz 473864 BLAKE2B ff4da6e12c1635de88a2aaba26bd3630576a3806
 DIST libsepol-3.1.tar.gz 473842 BLAKE2B ef1d596c4d53cc0a87e899ef4aeb5bf29c9d6b8303632ddc866c100d30debd8aedd0e8b38cb4ce3141b80421cd914148ff072e492d63dc2dacf03ac2ce59ca5a SHA512 4b5f4e82853ff3e9b4fac2dbdea5c2fc3bb7b508af912217ac4b75da6540fbcd77aa314ab95cd9dfa94fbc4a885000656a663c1a152f65b4cf6970ea0b6034ab
 EBUILD libsepol-2.9.ebuild 1101 BLAKE2B 15d24d96643fe4cd0448a5fa917f0784bf34310ad5f326f428896e58eb7e4b4de02f6acab25c9f4f833b237a06b4ac7044e9c10d15548b8bc56dd00308515ad1 SHA512 caf47ce74e8463c2ece4bf8c39271f28c92a9700a6eaed4e39d35356a0169f09f83af257e7afa1b56099b22e6b79e373427e644a017eb9addf515ae0da2e18a6
 EBUILD libsepol-3.0.ebuild 1175 BLAKE2B 5a6b43474a6d61bc1f17351d50e0c95808132c4c05eb4a836e2089575c46a6fe1969fe2e5d075da05ac24831d2e51d755d92832a06e904624b6137f14494ad09 SHA512 928fd7ccbd052b9b2d66d195db9d702fea2d4c76be0e7634d52a8bad44a4934d0ec0fb211b55133aa4228beeb75e3d6de897562bbc0bad3035eaf840aa7d80d0
-EBUILD libsepol-3.1.ebuild 1177 BLAKE2B c57df83301d492f61448cf804de24e1f6d4eec6c50fb2215684e9321eb734ecd3d5542d6c9514fbcb6326cf3a18adf9ffac62e93c540608400798b16ba7ac609 SHA512 dabaaff3825a5e71fd0ad66d6de40fc03273115d018f91b0faba0a2935829983f2f39392afc5a5ade5091f65b9455cc0c332a514792a8fc8fde51bb35da68776
+EBUILD libsepol-3.1.ebuild 1175 BLAKE2B 328820118f6657851eded73262d8f7d34187a7b9598c19e1ab3f3735a12cd6c87152a3f311890daaa97d19aaba0c7a13f0a68d3040b58c0d03469a8bdaaa3cb1 SHA512 d46ed4792c0e215d82facbbe4b715e284e7f411357257a8bca7ba6fbbf31bfae876a6f60d9e01da41dea917115e78f4ab4b6eee88ad17857fd4a4cae3cb6daa5
 EBUILD libsepol-9999.ebuild 1177 BLAKE2B c57df83301d492f61448cf804de24e1f6d4eec6c50fb2215684e9321eb734ecd3d5542d6c9514fbcb6326cf3a18adf9ffac62e93c540608400798b16ba7ac609 SHA512 dabaaff3825a5e71fd0ad66d6de40fc03273115d018f91b0faba0a2935829983f2f39392afc5a5ade5091f65b9455cc0c332a514792a8fc8fde51bb35da68776
 MISC metadata.xml 401 BLAKE2B 8d8df536f4fc4276a16dd448cd50fc3344f4f934ec7a8bc34a69e86e368ba47e69d1b8522771229f24dcb6400b3256106b26f9662ec1173cacfd539bffd7ba9a SHA512 67f5d428e108ff13135a3260189f3a4ae70b50f52e1d342029c25fa7e2c8ff2bc1ad579117a0f0caa0cad427a6f1f2aa6b8a6c540551656dd61849b495e10029
diff --git a/sys-libs/libsepol/libsepol-3.1.ebuild b/sys-libs/libsepol/libsepol-3.1.ebuild
index 5b122e23e551..423969ff82d1 100644
--- a/sys-libs/libsepol/libsepol-3.1.ebuild
+++ b/sys-libs/libsepol/libsepol-3.1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-libs/nss_wrapper/Manifest b/sys-libs/nss_wrapper/Manifest
index 021318907f6c..4efe3a26283b 100644
--- a/sys-libs/nss_wrapper/Manifest
+++ b/sys-libs/nss_wrapper/Manifest
@@ -1,5 +1,5 @@
 DIST nss_wrapper-1.1.10.tar.gz 89593 BLAKE2B 9f478f87acbe9a842edf443ddfc45642621cee22dd03342cfb7dcc03fd4b188950a43527d3b332b03714729f7f57cf072b77ffb38574b98124dfdbb4b03f227d SHA512 7c2f0eccdb3535643015aea8b4bdb87b421c3575c3124b62c8f17c9d3db54d92ba012524674c41c16f02a1b6ebe4177724f04eefdc04760ca49b32d3f77910c5
 DIST nss_wrapper-1.1.6.tar.gz 57893 BLAKE2B 4952b1af2b2b0487104b650b98694e5d39aed9edb44992d22e10ea38a2c4009f076aafa36f43775a021eca5b1f2708c9f42fa711d6715c43b077a9a3341570e8 SHA512 213d611abc072cb8d098b0782f661b4cdf1dcfd04fb564fb05034f023197aeed15a684478c660c00fb72f9438a192914e7b6878e505e4380435534bef52e0328
-EBUILD nss_wrapper-1.1.10.ebuild 413 BLAKE2B 77d98a2dc0b6eda08829de64f4171126dd518ecaa548e6bd645651d285b37c47b3d7ac0dd80623fbafca09a83f28ef9ad63d8a74c15ad0fb70a31c04386ba698 SHA512 015d70d09478f31e8ef787aef44f05e1d12e03a6ac4febf94004bc86cabfd7e412b5184eb96995f69982eba871d6cd8eae6fd24aace72dff97abbaef39aa8323
+EBUILD nss_wrapper-1.1.10.ebuild 410 BLAKE2B 1630831491d96974f1902aaa8c6ce96395e3fbfcc2dc1975a1226c4748d210b4fda569184ac2dbb14a492640aef6cb74cddaabd1f735a099752112dc5b82876c SHA512 59465d312157401dbceca6064a8075f7ace44b5a9f8d5521b50772eb130b8e25a6631b876d5eba6083a361b91ecb1b055cc9533477cc6a6e03d34940e34a640e
 EBUILD nss_wrapper-1.1.6.ebuild 406 BLAKE2B 9c7f1db9406e4d19353b3aa905030a59f2a66efaf5ba59d13c33e8a57636685f2cf334819bd6b7ff93f5b2c25677296189b8d500d0108262c260e2a354baaf89 SHA512 5cdab07c6b3373f84cca9e8fb751c2cf23e1893352a8ab4ace9dc2d6bdc4a974214c12cc7b1869da92496b7f03b3857d0181d722dd78fe2433647ef0df47757d
 MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/sys-libs/nss_wrapper/nss_wrapper-1.1.10.ebuild b/sys-libs/nss_wrapper/nss_wrapper-1.1.10.ebuild
index c7252f28e7a2..a78bd1cff155 100644
--- a/sys-libs/nss_wrapper/nss_wrapper-1.1.10.ebuild
+++ b/sys-libs/nss_wrapper/nss_wrapper-1.1.10.ebuild
@@ -12,4 +12,4 @@ SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 32dce480ed55..0d57c587bf65 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -3,5 +3,5 @@ DIST tzcode2020d.tar.gz 260182 BLAKE2B ddf00c3a87b09de52f9ebb8ce8141ca22c2cec534
 DIST tzdata2020a.tar.gz 397245 BLAKE2B 2a85a9a9badbf2b74ba2ace3f7fd436cc7752202557785be503c1c8f2f698dfc8cfb412b3f08ebc0bd4a8d0e27293b47eeedf937f713dadb4386dad14322b871 SHA512 2a2fc2e3ad8a6e4c574242296c847ad582c2c1d86add9c556e65c812d19b9528522e3c4dddb5239017091825d2acc5a2ccaf21dc41b900b6c300ef4264cc5a9d
 DIST tzdata2020d.tar.gz 401479 BLAKE2B 0136bf157e9a97fba56a02a2a495be19cc9b2008c6106eb9d4f4af13cb24848bd72e7e9c0182ca4643819a95ecfdff8750ff199bb2d1f9a560b4cd6685b41e50 SHA512 362e4569a666b0776614be3f63f1fe3d5ae259055e7051c9875f36023db9c52b0c5a10c19067114443a4cf2bf92475f8a0aebdf79bac836d967527fcdea4e9b6
 EBUILD timezone-data-2020a.ebuild 5200 BLAKE2B 3db29450f1cd759b3cb5cd1c8f45dd8ad4663aad1928c10bd3d81220f650ca76f859e6d220759cffcbde9d36f3e203264ca26793318b69fcb93bbcbabd50387f SHA512 9c2bb39c24a32a282abcaf345ef87f41fcaf8ed878ab6e5a2d814d982c8ffa9bb9b0b8f0081f1a2494e2862a11dc79d6df6e2abda41070cb12743e330c83a505
-EBUILD timezone-data-2020d.ebuild 5405 BLAKE2B 29819a434735e8698f9e9fe600d420df5ddc809b4e62a2477843d8765fb4d73281d3558643e91043cb2a2279ba0e788db78e1ceebca53e007432d1bd4e37d3f9 SHA512 38623e62f943f9b277b57256398048d00053f016dc358c21e257a241b4179fb8cc96c32349981c3612d06d077f9a7f03b1d88a0f84782caa65441a43fa05dcf1
+EBUILD timezone-data-2020d.ebuild 5402 BLAKE2B ee6d09fd50b2ff2738c53c3df4637036ea6115e5042bd90b4eb37a37e1d94b46f103b889d7ce5b48d59a37aea986efdd124a4999656e8b411bde822d9afc01bb SHA512 b0cfae3eb49c8da9a761e38fd0c38a901e7b6938774558c96ac226d1f2e080958a1012d8d345b618c18affb4d208ddb1b8c1d9eeac0e744757375ba02d366f4b
 MISC metadata.xml 728 BLAKE2B b390f4f3d184c7f424d97a36883c9ab67f56a2445d6ecfe6deca69d42864b1249fa2fec6a48bf693f9b2101c167597e5a435cf13a8797784e8f37ad870bf3daf SHA512 36e2c2fa026441ae4b21d33b9425a7195c4d4d404e8f010e9bf894be3095b0d461079a87126f22c398475652777301aa5dcf151b195502d25b4094420c56c7e4
diff --git a/sys-libs/timezone-data/timezone-data-2020d.ebuild b/sys-libs/timezone-data/timezone-data-2020d.ebuild
index fb2dcd4562fb..119d9ded8bc5 100644
--- a/sys-libs/timezone-data/timezone-data-2020d.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2020d.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t
 
 LICENSE="BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls leaps-timezone elibc_FreeBSD zic-slim"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/sys-libs/uid_wrapper/Manifest b/sys-libs/uid_wrapper/Manifest
index ee987d715c5b..68ba1e0ccc65 100644
--- a/sys-libs/uid_wrapper/Manifest
+++ b/sys-libs/uid_wrapper/Manifest
@@ -1,5 +1,5 @@
 DIST uid_wrapper-1.2.7.tar.gz 47580 BLAKE2B f33a2a29a3e61315ae48317b759898cabcfcc50f72a7fac9388b2b5791a76f66e88a6339ca45c319df102354d592d6a26c8046193b7c4d07c4e4ce3f4031672e SHA512 ed906638ded4fbd981212f38de66112e65514b618bda6b1bda85a915c00691d471859df7c8dc7915b546e5c8e107e2e07e6b3a841fcebeedc8cf4b18e5c16f1a
 DIST uid_wrapper-1.2.8.tar.gz 47864 BLAKE2B d165954b4418ee23c7564d809a3c2189fc43c91822c8e4a73bdf6ea8e1621156bf0a29097b07a4d8b31ea1d10af35c3be367c4ca8f1e13db1b430f297b47b6ea SHA512 536f353f35e84ffd350a3cd5a96ff30e7b1fd4ba455dbe34fd232ed1a14b061351110c7e0cb4376a27cbde1eda789ef93e635ffa2e9948cadc41c2f1fdcfc3b5
 EBUILD uid_wrapper-1.2.7.ebuild 448 BLAKE2B 82427f8b6b11ccd7956351dffa127d41b48c9fe106d127ff1b676b1b461a7254405fb62b673ef02d0ab36a07ec2ab22512db5bc87d5bf3e2c471099890b120aa SHA512 9a3acb300189688453139b1e58d5cb0a6cf41d3ac4729c1cdaef42fd7a8993d68ac151eb8b03257acab41daa2a71f63b173ec53c85037e58ea2dca9e6f0983a5
-EBUILD uid_wrapper-1.2.8.ebuild 455 BLAKE2B 63f95c7fab8ef50d23a9de01778bf03f1b1f3b4692e7656333cebf65f8d81ffc18e4e6450ff96e5a10a6da9ded1dfa88647e65bde54a333ca420b92b90c51d91 SHA512 362aa0ee1442b09bdc4c81403acb19d50c4f8053d63bed1d7a00e7ff4396c950330271f1d11c9807cb6a4b4448930d89e1ddc97ce9bc038d37fb3fa0c96bb595
+EBUILD uid_wrapper-1.2.8.ebuild 452 BLAKE2B f2a0e2fd3759edfd1d83fd9ed61128a8ebe78a932717f1e1aa26dfb54918b8b4dae88b004cba04107133721185bb23899ef8fa53c66d907faf18e2712116539a SHA512 26f8214b05b6594e9f480483de9680f3af2098c4582a1922e444e3cedb31e54cfadce782e4b1ed130feb5c59618f0e1da3e3f7de3dd589d37ee500817a1e9d15
 MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.2.8.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.2.8.ebuild
index ad2fbf4c53aa..fe2ef5f2b9f2 100644
--- a/sys-libs/uid_wrapper/uid_wrapper-1.2.8.ebuild
+++ b/sys-libs/uid_wrapper/uid_wrapper-1.2.8.ebuild
@@ -13,4 +13,4 @@ SRC_URI="https://www.samba.org/ftp/pub/cwrap/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index ec8cc6d2ce97..edc379678895 100644
Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ
diff --git a/sys-power/acpilight/Manifest b/sys-power/acpilight/Manifest
index 76ce453310fa..84f41e960990 100644
--- a/sys-power/acpilight/Manifest
+++ b/sys-power/acpilight/Manifest
@@ -1,6 +1,6 @@
 AUX acpilight.confd 269 BLAKE2B 196245bd083f89d9d975a81aaaf66d0422655cd6a5f575c2cbb898747c92bdb888f8123dbf8ddf34089be2547d39e33508119065ffb97c26f9d1d3915bee8bb2 SHA512 28e513dbcaa30cec4d2f876c244766037eb6e94ff660ff2caf9cb955f40c710ea750cac73eb5e3890b42904227ccbd7f6c3e2595c2496e54d3339d6afdd0ffb0
 AUX acpilight.initd 742 BLAKE2B bc2ad5027cd9e5c9f8d0d55e249117f7f59ad587522d21ea2baf69e45a884df242d46cb3001ef46ef63c1e1f87a18bc5c05d4facf1e9d72d4b596926e9a6b69b SHA512 9fe648ea994eeb9baa294226b55bd6230cb2b28952f651755da622278539fc071527e3aa2425e26687bb8065ef2e372ab93d7090532dbf3208ccac8519f01fca
 DIST acpilight-v1.2.tar.gz 18068 BLAKE2B 469fd12c0a24b152681d73add559733a294f8a0848f46d0d3a1e209dea2ad3b180294677a8d84a82387ec34b00bbfda85a10f447fe22b81a3c51225cdce14051 SHA512 ef634ec0f315fe94dca138f1b9231f320b93340db3365ab9a09cf898fe4691f70573041bcb04563d760f1201000ea3ff11ab5dad3bfffddf3d3070dedb5732d7
-EBUILD acpilight-1.2-r1.ebuild 1505 BLAKE2B df5b446e3dd8723995171c8e6021480d2628a1d205be2554bea606758ba6b3df5c29d268a1d4e45a88d2d440f6ce37c6fb4bf492c7cbbae7c86c1cc736ca76ad SHA512 84394a2b323ddd5eaa16d3b3c94b39c3fec7f95487b6f119bb6fb047dd7a69c6d5f0e9148436b912d85a1c4fb37c2788d602d923050574798dad4514697fd9a7
+EBUILD acpilight-1.2-r1.ebuild 1503 BLAKE2B 9cc6e6cb3d613fbdf7e5ae9b74fc3bb189f52801aed07e684336e631d4cbb6de6ad17dcbc781c137835a908daa6d2d460fd574d911f434fedf967c52a7c17200 SHA512 8898fcaeb5ca91bc82f3d22a75dbc63294a1841f299de36df27e176d4171fcf897b615108ed76b896604d622bbd07a11c0368324d655c2d11687541dd4c12368
 EBUILD acpilight-1.2.ebuild 1506 BLAKE2B e3185588af5d251aedd7636fdab21ebe54fbaefe37f7a281515c6dde65848d28a6992cfd60c119d317a5f6ed63f025d7b61f4f1c7f036927ea85f0eed2cce7e9 SHA512 ae50de05acf6242c929fa79bc2543a5d01efa39e48c22a65af364a2a22099718be2dc0627d5a68102e6b10142b2af46870c1f4a9c1ef52b21480bf2beba560a8
 MISC metadata.xml 337 BLAKE2B ad7ecd612b078bad830f6f10efaca7f41b7b5ef1d290799ce4c2dbd5489076c5c0fc3500e0c64bc3f00f448f80a1eedb9737c967258bbea5e105a85d7e4b8749 SHA512 6f624eadeaad1f4a440a2663ac9672cd6a36dbb668d11bcdb621aa5ddb739632c8bc74bbbde9905adf023618a9432a26bfec4f6861f5e4ba6167a0c2658dacd0
diff --git a/sys-power/acpilight/acpilight-1.2-r1.ebuild b/sys-power/acpilight/acpilight-1.2-r1.ebuild
index 36f03785d73c..97741e44434f 100644
--- a/sys-power/acpilight/acpilight-1.2-r1.ebuild
+++ b/sys-power/acpilight/acpilight-1.2-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://gitlab.com/wavexx/acpilight/"
 SRC_URI="https://gitlab.com/wavexx/acpilight/-/archive/v${PV}/${MY_P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 1d7b27e3bc49..a9944f53f73d 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/audit/Manifest b/sys-process/audit/Manifest
index 10329e5ca77b..aa7aa87275ab 100644
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@@ -20,6 +20,6 @@ EBUILD audit-2.7.1.ebuild 6206 BLAKE2B b9b6109a7e75546eb3c6cad3d8f1d720572ccf95d
 EBUILD audit-2.8.2.ebuild 6140 BLAKE2B 751cce3ad1146270470bfc8df41bb117c427edcd1ca21fb032a929ecd54f0e43a0bd72244d3e60eda8ccba960963c6906e0302dada72b4b1d9bcab5697eb3888 SHA512 3be981935f47ff0db641a57612a3d156297429805acda9d0cf2a1974a7fd660c464a2afcd1e6395f7e1745a0a37157ac98e88337890371ce2a1cd7609e65637e
 EBUILD audit-2.8.3.ebuild 6132 BLAKE2B 16fa21d0b4937b162fefaa41fe6ede13fad9eb755b3e8f2d15ba54a69f4bd45b229fa70dc2ddbf5ce649c8152fe72c0ef134a8369dfbe76221c3d97008baa945 SHA512 f571a1adf2963bbd7c653077a41ff95d31896790a05ffdb9fd85b5e60af485f49299e04270eeed7ae72668af2985b2b9a79f24cae4db7d73b27edeadb6af28b3
 EBUILD audit-2.8.4.ebuild 5711 BLAKE2B e6956eff8afffcae7e22919680cb7db63af7c1dfdfd9e35e14af73ae378031a821beee4fc782741393421e6a3873a401f3f8e86e5567595d4d5e93f26ecea2a7 SHA512 d659215b7caf54d1c68aa3f7d18fa1951c938eff67c3b8c2ca666c368e90bfbe8112133e45d85905b909a55026bb1e53ed635dedacc7d9ac34934ceb414300a3
-EBUILD audit-2.8.5-r2.ebuild 6406 BLAKE2B 9c61f61da20c7d3521476425176392eb62cb637e59326e173fca8bc98f8a2ed73137d2b218a1aa4a09735d3d5bac4d797529e48e0185ef7d648035a75e731d03 SHA512 674d2209a11ea363737514cfac68e17de81081bb9e518443bb2b1c4338023b55f5d13fff18f07b380cb1577280371c65319f379e70938fc815122372290c74e7
+EBUILD audit-2.8.5-r2.ebuild 6404 BLAKE2B 651fad8ae592760b672a78a2ee21286b9e6c5134b1682895922d2e28457d5f5e58b06f0062bf0923bae29c61e6716ba3aeb74702b10429fb5b02f88162d34d95 SHA512 b68dcaebf92b9ab50eccfa98eb19151237610eb620bd744a1a7d47b6d12089c8eda618be6065a70ede519617041d9711386d9cbb2f0ac005b8443f433f3d7c4a
 EBUILD audit-2.8.5.ebuild 5753 BLAKE2B 13495f6f69ca6cb3d85b091805ddcf8f78beb24414d8c797220a0ba21526a5301e014617e20aaa21bee43dbdb80e3ac4aad54692e669a2ffaba3b60bc9e6c9d0 SHA512 001dae4db073cb1d3b4de94da68cd46d27ea5eeb18a1d9c50c04d01f6f831c9e95e4d49b3362c716b874c3ed54e2d30666f717accb84bef11f34ee2b525bec5f
 MISC metadata.xml 364 BLAKE2B d056ff5b5d3a6fd968f926ceaa85eaaf9b6c54f069dfe3e3d6eb8f784dd1eb4353b3c1236a4eb7691cd48893b7b10a10647a86bd2355b33f2b682c435510422c SHA512 3e5dcff1ff9cfa5c209ab052de5f2ac44ef2bef1d991e8daab6603b72cef81cae6106a34f5181196e083596183a454cb47436d7560084cd51779ae8eb9901202
diff --git a/sys-process/audit/audit-2.8.5-r2.ebuild b/sys-process/audit/audit-2.8.5-r2.ebuild
index e63351079044..2fb218f52a4f 100644
--- a/sys-process/audit/audit-2.8.5-r2.ebuild
+++ b/sys-process/audit/audit-2.8.5-r2.ebuild
@@ -22,7 +22,7 @@ SRC_URI+=" https://github.com/linux-audit/audit-userspace/commit/017e6c6ab95df55
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="gssapi ldap python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # Testcases are pretty useless as they are built for RedHat users/groups and kernels.
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index a948144a3c90..a9f738790c72 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -4,5 +4,5 @@ DIST htop-3.0.1.tar.gz 179925 BLAKE2B d722bc49d7b546aec1359a5dc838e0f6cc4b17f8d2
 DIST htop-3.0.2.tar.gz 176132 BLAKE2B 9abc28461d346eeac7f9741bc1ba08c898d00be013abce972be4370b9b35d92661fcb4521fa715bc779c1c9b56bc3c0eeb5375c0df8ec7585df3774ac67ca504 SHA512 5b578972e40e3229aa8b2bdc931c4c8bceaafd2a150b02e0257ab35a4fbac25852e959ecc472bd6747be57ea8734b59cc4b872a5ac829624cc80e1722c54d868
 EBUILD htop-2.2.0.ebuild 1477 BLAKE2B 1a5421e1dae65c14cd719070206158989e73879ef4bc5413254aaf9b04184d35838d12704e134c16414395f491393b8660683e51e40dcc5f7e9fdb7dcd3565e7 SHA512 4acfb07731fc5bb398fb77ebadbb7131768999b4a948f9941cf9db4f3554b623e11d6ad80195a668341c16d5dc095d65b3d16c310c64a36ac85ff69c0b10551b
 EBUILD htop-3.0.1.ebuild 1471 BLAKE2B 61e570d83bfc55421ddeeddf7511f0fc165494c620e9eb80b51a92fff1810247d846aecaf94646f56a0a632622e7bf129e04af2ca2254a85e0274c9bcea4f3c5 SHA512 892925343c1526eaee61f1e21c559e91433dffb23191d45ae95b28cf236b0c93665eb277c39526fd8f4b2fe60346e592f46553c0a2ba1bcefc5760e78dcfaa8d
-EBUILD htop-3.0.2.ebuild 1471 BLAKE2B 61e570d83bfc55421ddeeddf7511f0fc165494c620e9eb80b51a92fff1810247d846aecaf94646f56a0a632622e7bf129e04af2ca2254a85e0274c9bcea4f3c5 SHA512 892925343c1526eaee61f1e21c559e91433dffb23191d45ae95b28cf236b0c93665eb277c39526fd8f4b2fe60346e592f46553c0a2ba1bcefc5760e78dcfaa8d
+EBUILD htop-3.0.2.ebuild 1467 BLAKE2B 171a944a70f32236ba6a0cdc3da4dd289ca84e647f9360f10edeb407b40ff6d43ad0fa2feae7827d29d65f7c25224e8705b668de92f06a53333ad65d1dec4ea1 SHA512 b3632f67c4d4764412e4a75c417c347beb12e6c5495b2d26c65f5b4118d46289585ff217b95edbe7bb9c9f8737c2698af2739d3cf9d48041c3e2a86a6fd9bd3f
 MISC metadata.xml 828 BLAKE2B a116a06ab632e104c2278bc9470e0a4cf5a7e36cab7f56db58cdb1aa84fd8dd14fbfb8aac61656b9942d6829cf43e4e692599d1be245121dcb091aea901a3a7d SHA512 18b1fd3c0794745117b16d717036b9b469a29b7befd910378fc62feea4ddb3d85a2c4c77dadb735d498826375ee652f70d7594552640ebaa9066316df9cdde4b
diff --git a/sys-process/htop/htop-3.0.2.ebuild b/sys-process/htop/htop-3.0.2.ebuild
index eacb7a88db21..00dce57c1e6e 100644
--- a/sys-process/htop/htop-3.0.2.ebuild
+++ b/sys-process/htop/htop-3.0.2.ebuild
@@ -10,7 +10,7 @@ inherit autotools linux-info python-any-r1
 DESCRIPTION="interactive process viewer"
 HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop"
 SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 208ecdc6854f..2ae64113c3dd 100644
Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index f7e70b956a37..f712bfa7ceb5 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -2,5 +2,5 @@ AUX 70_mod_wsgi.conf 100 BLAKE2B e0df283f4b825628cceb7538231afbba10d3dc1eaab64da
 DIST mod_wsgi-4.7.0.tar.gz 695658 BLAKE2B 4332e5c30219cde9cf44c8633f3052faa104524d5a2ccd151fe9675364760cb9c447001289094c57cef21df4e364962c93e85f3a3eef36325e9b96e7715dfc19 SHA512 4c40a07301ef7f42ff175cfd5efd9c4916ba90749780cdc470cc0c62b190af810ba4284504f2b342c1e92801637aa52ba5719e0b114a072fd50d68754abdf36f
 DIST mod_wsgi-4.7.1.tar.gz 696111 BLAKE2B 69fea421077f1ecbf1cef5c9eac4ba296fa676e0bfbb860ca8a7cb701701f405edb3760486b87e8d9dd93efcb4c23385197d770ca32e16a473d5d252d292fb76 SHA512 cbb5ec53d55e47a83f2b0630527c6a52b48ef21d5d2c18adcb875fc455795b39b3c93f4a86dfbf9738c0bd554d86cc4912cc9ff83c428af302ab94a61f66b5b4
 EBUILD mod_wsgi-4.7.0.ebuild 839 BLAKE2B b647de594d4eaa18a99402346c3fb549d15fa474f0d8144a880bf17cf0f3d714a4cc3a7724e1db0cc78d1f845102d7b3bc2f7cca5b1937ac0352a7311a6dc2b0 SHA512 ffaacb13a03e8ebb52b138eccf2548fe6173c37c726a097798ae0cbed17c2044ae9c534aa20b8985e8aeeca09f53ac799cf13eecb8e01e031e76cff4a8455b23
-EBUILD mod_wsgi-4.7.1.ebuild 1240 BLAKE2B ec3c657361e9490b534c2c2529f2ae7820451ae72a62d2b721859a5e5ea145ded8bf6d1f091c791463dc5a44f77960d9e20c046728a7533ef73b043676ad3cbd SHA512 76cbb9e16745d9f4ff78d267efa2af2c5b3739b33c8e7f5fcfd04d2679241a9fead3bbd723e29bff4672d0d7cf950759088a4e7768ef0a1fc6c98280b8f7a164
+EBUILD mod_wsgi-4.7.1.ebuild 1237 BLAKE2B 8de9a5e4e7d77f87cdca792e2843ffe98ec3b31ccd0cdeb16693576cc7904fde79b6e75092d53d1a48d80da5a225607551b20395c9156fa865714e32ffff3e8f SHA512 6cb2cb340156d10013d799fb547150948b1714a40433c05cb8fc41804c77ef222b56935ca77952947bfeb37db5da30ce9844cc051828851ccf470284f39df22b
 MISC metadata.xml 380 BLAKE2B 1b06e8ab30ece204c3b5926675346cca70352c9a0ffd7fef754fc25473b9e4040111da0005e24da304add76f1a56ccd0ab9247ae10faca316dca982052c6853a SHA512 b62536a8a79d3d5198b6cbd7eb51be455a8c7de53add3810120edc1beee7d0684e09e43de355c5da7a61486c8764c4619c809d9fadde9e9502cb5c0b364d7b68
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.7.1.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.7.1.ebuild
index 9415402eae83..6366d33571d4 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.7.1.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index adf7014f4682..3b63d596209d 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index 1a446f7d5561..5de73ccdc35f 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -5,6 +5,6 @@ DIST dillo-3.0.5.tar.bz2 734472 BLAKE2B c8a7ac3a875740d2d64269b0d368e6f9395c89a5
 DIST dillo-3.1_pre20181005.tar.xz 907752 BLAKE2B a894583e2c50baf2c2ff615dadfbe79e7652154cc0f7b80a4253d27dbe2e5463fa9c7a44622a6cfdcc60822cee0e1c38c31231b5bc5ee9c7b22bb16a15cc8c90 SHA512 f1916c6261bfcae9264037eaee37497660e43e46641c42fbcc9c2592fa41602a83fc91ddce6aeabc0122c575bcff72339d181210f3039e5d4c5a7c25f88aa642
 DIST dillo.png 6135 BLAKE2B 63aa76000934123420d0704317309639bf5dcd22c61b09406a7ec67018b17044a417209954d67f22e2000b0871d315a25388bacffab9599230fc9615877a2f08 SHA512 cfc9bcf1bfd0fff7fc625c7d288c92d0f33418b963a4e344844fd2bcb33823b3215a8a1a86162dcd1c614eea2323bb361c11bd8bd15859b771c63943c1b40833
 EBUILD dillo-3.0.5-r3.ebuild 1293 BLAKE2B 019a0535baead78934decc1e7840031d9147c95663804db672565825fdf02d8a26e6685eb3c36ad781defbd28ecf8537649ce96a0660ebbc4f5be26f43154703 SHA512 b670000f0b732c520a177c8dc047c6737edff432be389268094df54ab3cd3b7914272845d9a3d39ec49b8443adac54ca036eb047ad5d3665bdb7131e0749b68b
-EBUILD dillo-3.1_pre20181005.ebuild 1199 BLAKE2B 09e1bf6a220bc19a03f79c54b0d7f49bf345aa9d53424f691e4b2b4967a0fcad7eca6af17b6927321522af4deb3599936e88e333723d968b87bb288e4a1e1ffa SHA512 e3683e3ac46bac4947a1a87a2aeacb01647dddcf9b5fdea58fe0bffc4db6f7a621169f4180d41a3760f6c8ca0ed8a750202853e487b7f22af3f400cb7ce888d9
+EBUILD dillo-3.1_pre20181005.ebuild 1206 BLAKE2B 6ee03439127d10f70e4dfece3858ebd688d4a58af83b2e935a54f031c254c5e2716c2044cc1325cc38b431d6df56e7851d1ed8cc00c8d79868d8b04b20b24e0e SHA512 59b926338f5335d13bc72322216fd5169a7dd9a912470c70159188aabff5fb42cde86fa23047b69c1b1596a529fda3a480309f2b33b658663e47bec6df2d5c08
 EBUILD dillo-9999.ebuild 1153 BLAKE2B 8c859ca6a5d600ef275efcf30cc36352ef7b761d6971dea299cd45e19c209ccde9402e41652a6f79b7913952d8bd88b9d8b3df49e40277c46d45299be4f90468 SHA512 695e0cac6fb25b75055d8c19a77e14d5c4c6dada6af22ab0904fe43d93b96bf1c1550c170385a0a2c1243b40d0e57ea68088069025bf9d60ebc2780eb5acfbfe
 MISC metadata.xml 348 BLAKE2B 4574707b617c7f7567075d5cee2ede78364c7b5b5ed11977e2948b2df2afc27506418b20db8bbbc371f1e9e2ef095d2376c869ddba3374a0e76ebdac4de9fc84 SHA512 e2ba8ac70b1ac89f257e92f457b20bc4fb9b407b5f49d1026c54dcd0d833f149e3961c732dcfb54d8d4886f417d480f49e76e89b93045a88ce1efed015739892
diff --git a/www-client/dillo/dillo-3.1_pre20181005.ebuild b/www-client/dillo/dillo-3.1_pre20181005.ebuild
index f918f45287e4..a1bf0879c638 100644
--- a/www-client/dillo/dillo-3.1_pre20181005.ebuild
+++ b/www-client/dillo/dillo-3.1_pre20181005.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc +gif ipv6 +jpeg +png ssl +xembed"
 
 RDEPEND="
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 675d2e82be4f..4aa61e365cfa 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -103,7 +103,7 @@ DIST firefox-78.5.0esr-zh-CN.xpi 564767 BLAKE2B b5c3e773c3bc58ba80180bd018467df1
 DIST firefox-78.5.0esr-zh-TW.xpi 564724 BLAKE2B d55faedb630ecc2629d1e2b1adcfd4cde51d119fd4599d25ef0800e5875efea65db5102fec36366b6531791f16d0f94e8e0dee0bdc18868ad9bf5208471d65c3 SHA512 95e4fa378cf07927b13a9b0e9d37d6320c4cba26f26df6dfab65fcfe1ddd21d38cb5a387663c8c96b6b3e2015999af4d355c0b672848f874101c998abd117047
 DIST firefox-78.5.0esr.source.tar.xz 333995288 BLAKE2B 35140afb6b4d15052858e7864753ca74099edb24ed5e459f1f48114f0946f5e007486b5561ba9a545566033d71a69f0e6163dd17204cab717c441323972f089e SHA512 0d16013342b6e8d67adb5c111177ea4796db4fb593da8aa254d0d95bdf33fad798c2dbb235d44db4177c32dd2d7b3ac26b938b476342753ee8d6c83d968d0281
 DIST firefox-78esr-patches-07.tar.xz 66156 BLAKE2B 8f69883432dcbd484b1fb15e3fde1630b1424e502ba78d9ec3cbe70cb2676a6876853d3477c8bfe35e92bca91b200e2d14543de1778d895676a52d2608109af2 SHA512 b4a01d3499002bd33a7fb45a1a80e9e73ba27a0986b6bfa43b3482dd8d82a686a14ae0c5e013402c8c8f359a642632a40bf4c362a0e83a1f53b453914f42e3a7
-DIST firefox-83-patches-05.tar.xz 151860 BLAKE2B 48377fb34eefe768f765ea5c5f450195d1a35f2c964271cf3ce6e34fcfb9c90d7d0578a37ca65c306a5e89d4e3d72aa44c07f7357fae3e1e40fb29b6d9017437 SHA512 05cac5322c7f9feb6a228797072572f163d320f3032f25664fe1251ad17a868373ee81d71971dd5d2bd3c7577498071d4f40713fc8251c3ab41654da73a94ed4
+DIST firefox-83-patches-06.tar.xz 152572 BLAKE2B fdb8cff136379320ee35b17300a91d800dd7a0cba938fcc9687a8b0da5bdfe04826d3cf7398ec8c3184a64f44d39fc44693c2cd6c3ebed138f84536be8e68ce3 SHA512 c195036f84071db1c6ba9a2f9b2044826d7e094bd2525dd149666df308e7ddb39c923ed13bde0812aec3904504dd913ef9fd3f443c098d86c6c0d51ce172c3c9
 DIST firefox-83.0-ach.xpi 463987 BLAKE2B 2173c637ae155ec474d18250adf8cd67ff7732ed9ecc7533004296934f82dfdd2f83f5f59dbd6b095b519bf5d3caf888f5e07913004a27771a13376ac080978d SHA512 cb1644bb1451311923bcbbbafe727fe8b35c33cf9643dceac603e802b82a2684451f9005ef6bfdd1ddebde01548926eb62dcd511e1f8a960248ea5b74f5f72e0
 DIST firefox-83.0-af.xpi 431349 BLAKE2B b4f912e706b464728e779bfc3cbdb7304bd763c55347140c32bdf309b3b4869ebc4bc1433f5cf5c970774f69aabddc4b5f5fce568dc32c50c4aaf90e9d07e13f SHA512 076e9084ae00dda0cfde5b09cf2dae7ed8994543c8de645a70b2f116d01da9e024159114d4d6ef21ce134b7d7cd16b95678121b41300ec5174a36112d41da4ed
 DIST firefox-83.0-an.xpi 511284 BLAKE2B 0b6332b8dcb254bf9df13fde4e34d01c2ef6398c329cce630a0b05a91b1f4ef02c8177f1726f489e8526ffd9fa9e822a010bfd6a669f5a598e7ed60f8328a278 SHA512 43559e760a96092b4c4bfeab6830f021e69c8c7c56a187f49109ea94443372e6323d503f1f175df1d77c685fcbbab2077f7fb02dd031804cde8a7dec2aa1d988
@@ -200,6 +200,6 @@ DIST firefox-83.0-xh.xpi 430120 BLAKE2B 5cb1701736000f4404ce780c5aa18eb37fbab384
 DIST firefox-83.0-zh-CN.xpi 564100 BLAKE2B a9b89639386f0775dd1a6ab99551a2e79fbafa66801c6252084659f26dd7974d0aa86f70dcb404e5dde43deacb584c1ff19393302200fcab726bacdb86054c16 SHA512 c41654386aeecaa7691524dd563e07235b8f5962debcdbfe59a586292ebce3086a275c47873678d788462f6a5111335cb7fe0d293d11b4585ce7ffdc69a7822b
 DIST firefox-83.0-zh-TW.xpi 564079 BLAKE2B b985bd680dc620313cd217beffa87935a546e528a37854fb20a7f4cdebdbf50fd4858ac91f13bf31eca947d09de1a2a0b9956ddf5acb6978e3a7a7d8628be0c0 SHA512 d5eb2a32cf4a5dc675adae6590c5201023387df9a8854ac4814b601c413c3785ae2e694dc5b4d231e2d1686b386cde202066cd2f11c1071dc29eff81c51e3abb
 DIST firefox-83.0.source.tar.xz 351331940 BLAKE2B b3a805288f4d644f7375c78ebe771c26d59c57f6aad71877abbfe60563c06af5f162b8894cb624cec12a5c72542ffad97e6f8f0cfc3fba0506d4e246a41911e1 SHA512 4ac49cefed278d1f898907bbedacf81ea4bb4e5784f567d4c0971d9cbc2cf4a2e4472de81a7ded620bc3a516bc972d600b516b7674319cdfc9734c3824a9a2f6
-EBUILD firefox-78.5.0.ebuild 31480 BLAKE2B 28e48cc16ddb7884a7267b52db5a319ef91388ac107997f307c5197143b2382900a301821ad7c3fa3596c4f94080c98c773304985c33bce6eea60e36dfc6bcc2 SHA512 9a4070b9c3ca3b55323fff941047bec87eaa24cd843bd4b49e3afda7bdc96302e7988340fbbd5e3e03e588bb2d592c4754a258db5ce7abed8730a94e4c0eb222
-EBUILD firefox-83.0.ebuild 31429 BLAKE2B a6cd8d0417930f3ddd6140852bee83b77fcb48e0dbbd558f9fb10f97f85a81fa0cf987b5a85c4df801e26d5aca7c0b7658c6e9a85273075ac478a01d5d770645 SHA512 a61ec11e74bcd5244f56d89c0eebdba1cb2f06c64a0e1daffa2e3d55769135cac6f42aa5795215a1842439839e322719f1ed7796bf893f16e4fc2657c5e9f121
+EBUILD firefox-78.5.0.ebuild 31480 BLAKE2B d2a4f1f523670acbafa1c1a88856af208356bdd770c856642ea0cc1b93542bc6f078e473d78a7348464e3d35d52303cc8ef0c570979e39373a08e4ba9e34357e SHA512 700dda08b674002b45709b9a7ac9175f5cf95758f725aa2207ae606b9929302e178b674b3a4abea16fd67414bd1d6f73d97c3a3ae2bb11952918b35d1723f3c2
+EBUILD firefox-83.0.ebuild 31429 BLAKE2B f1a7b1c8c7be91f1802808d40f8367e9870140b3ef9d39a0be15ac0a6a6671e76e7ff38324bf70680409d0f1bafa35116279e9feb085d3228802fe6e0709c1a4 SHA512 8090f7d308ad577a8f4344321838a229645abbae070876df3152f3c7501bded711d7fa66b3ee7b9b9af4b6907d041b19d34efdfacbb5f75445719ad2f74f7029
 MISC metadata.xml 2063 BLAKE2B 4c632fd591403d8045cbf3448fd459d82b0433351305fb12322b6a1157c279311ad1a9fcba9af4576f336035f841a95b82ee7a5602d62f1b741748df7443a861 SHA512 75bb3db236d0941e6632def252cb0b90cb374fc4f1dd66e499522e446c5fe8186f57a9898cdade933da205c12b0e70d4e1bdec0d8bfd9689d37d03667eb92f5f
diff --git a/www-client/firefox/firefox-78.5.0.ebuild b/www-client/firefox/firefox-78.5.0.ebuild
index b51fe3274150..a2e1cfaece43 100644
--- a/www-client/firefox/firefox-78.5.0.ebuild
+++ b/www-client/firefox/firefox-78.5.0.ebuild
@@ -73,7 +73,7 @@ BDEPEND="${PYTHON_DEPS}
 	app-arch/unzip
 	app-arch/zip
 	>=dev-util/cbindgen-0.14.3
-	>=net-libs/nodejs-10.19.0
+	>=net-libs/nodejs-10.21.0
 	virtual/pkgconfig
 	>=virtual/rust-1.41.0
 	|| (
diff --git a/www-client/firefox/firefox-83.0.ebuild b/www-client/firefox/firefox-83.0.ebuild
index 600da29c9394..6710fa78a510 100644
--- a/www-client/firefox/firefox-83.0.ebuild
+++ b/www-client/firefox/firefox-83.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-FIREFOX_PATCHSET="firefox-83-patches-05.tar.xz"
+FIREFOX_PATCHSET="firefox-83-patches-06.tar.xz"
 
 LLVM_MAX_SLOT=11
 
@@ -73,7 +73,7 @@ BDEPEND="${PYTHON_DEPS}
 	app-arch/unzip
 	app-arch/zip
 	>=dev-util/cbindgen-0.15.0
-	>=net-libs/nodejs-10.19.0
+	>=net-libs/nodejs-10.21.1
 	virtual/pkgconfig
 	>=virtual/rust-1.43.0
 	|| (
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index b68a687d8a99..fc2e66f03993 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_88.0.4324.11-1_amd64.deb 75169984 BLAKE2B ff582bc5eed34ca53d7b4780993de7039dcb672f97b59565b39e474a49ad1907cfcfa1f009f0310c3989751ec12aeae9dc225fafaab244fbea15dff031316fe0 SHA512 bd3d5641588adc0abe6d9340b5ae690a3d41ddf4319cae038abebd99b646dfbbcac319ff798b6935da55518f26141f12446c9b424c09af59f5f6c91f737a4845
-EBUILD google-chrome-unstable-88.0.4324.11.ebuild 3004 BLAKE2B f2952b0e4f35062d7927be8b8d1f1cb10105a9827766a56d48c2864a580f2b889b1fb20b293e8ba371f98ac351d85c1f9196a1ed5fae38e5ea39e5150a8591d0 SHA512 3b3f61be007b536dfe0ae85d1a1a542dc8f6c14810a2001a909090f52c74a6453fa4591905b12f26acd7dd7e5ef018f425e91e1e061b5b6feefa4d65a7d9f6ff
+DIST google-chrome-unstable_88.0.4324.27-1_amd64.deb 75174972 BLAKE2B 5ea5343e550a5451b77f343530b898ada88671e39725c2dbe20a2ee8f2772033e46f58facbe14e447196803c1ecde1cf01e4cb1d8728bb47deb339b2865dc68a SHA512 2169d70396040c32237c549d0d79cb3d444521f567b8c6fe27eea9f10db281c715ac8df3b4e7d49eae580174ccf0f48d46a14aac4211ed66f1a58d6db94c6adb
+EBUILD google-chrome-unstable-88.0.4324.27.ebuild 3004 BLAKE2B f2952b0e4f35062d7927be8b8d1f1cb10105a9827766a56d48c2864a580f2b889b1fb20b293e8ba371f98ac351d85c1f9196a1ed5fae38e5ea39e5150a8591d0 SHA512 3b3f61be007b536dfe0ae85d1a1a542dc8f6c14810a2001a909090f52c74a6453fa4591905b12f26acd7dd7e5ef018f425e91e1e061b5b6feefa4d65a7d9f6ff
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-88.0.4324.11.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-88.0.4324.27.ebuild
similarity index 100%
rename from www-client/google-chrome-unstable/google-chrome-unstable-88.0.4324.11.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-88.0.4324.27.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index be7fbe2f479f..ab19f07c9699 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_87.0.4280.66-1_amd64.deb 72726412 BLAKE2B 81902234ab4c7df0994eb98aad31f526b05b281f46920e64af492a5f885e1dc6619979006b3c34c2954f952f1327b57e0013edd2bfc634167be94d660aa5402a SHA512 c4c173a69d59c05f5b3b159fb3ed3a6b09e880083adfe07cea45b9f7a592dc3eefca70676b5bae66e679f1030c7459523f99dd61c9a28f676bc7a91d5f72662d
-EBUILD google-chrome-87.0.4280.66.ebuild 3004 BLAKE2B f2952b0e4f35062d7927be8b8d1f1cb10105a9827766a56d48c2864a580f2b889b1fb20b293e8ba371f98ac351d85c1f9196a1ed5fae38e5ea39e5150a8591d0 SHA512 3b3f61be007b536dfe0ae85d1a1a542dc8f6c14810a2001a909090f52c74a6453fa4591905b12f26acd7dd7e5ef018f425e91e1e061b5b6feefa4d65a7d9f6ff
+DIST google-chrome-stable_87.0.4280.88-1_amd64.deb 72446160 BLAKE2B 308e73cd83f3f760bb5f6cc6dd077f3b6af9c986493bef76b6aba505bc8105746752df26e05e7d557ea45bf1986f61ab0011b85a6613ba05033f4c93764ac42b SHA512 19eea1d1be171cab60ce5135572da9388b4b72e313118478b53f65c0bf2293733809282736b98ef828a208b7426e5191258f8c666cba7510b8bf5c92d0010a47
+EBUILD google-chrome-87.0.4280.88.ebuild 3004 BLAKE2B f2952b0e4f35062d7927be8b8d1f1cb10105a9827766a56d48c2864a580f2b889b1fb20b293e8ba371f98ac351d85c1f9196a1ed5fae38e5ea39e5150a8591d0 SHA512 3b3f61be007b536dfe0ae85d1a1a542dc8f6c14810a2001a909090f52c74a6453fa4591905b12f26acd7dd7e5ef018f425e91e1e061b5b6feefa4d65a7d9f6ff
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome/google-chrome-87.0.4280.66.ebuild b/www-client/google-chrome/google-chrome-87.0.4280.88.ebuild
similarity index 100%
rename from www-client/google-chrome/google-chrome-87.0.4280.66.ebuild
rename to www-client/google-chrome/google-chrome-87.0.4280.88.ebuild
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index 46f6fb94a612..386216971f6a 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,3 +1,3 @@
-DIST microsoft-edge-dev_88.0.702.0-1_amd64.deb 88571350 BLAKE2B bc270cb7f0620c314bd6fcfa2ea47027d65f0176b000bd0dc1fdffadf427892f4fca834ecebff3a0ac3a39d60c129e7d129399d2036c4eed98a5526561927538 SHA512 36ab87ac82faf0b4d4b6b28558e9ed7efd41af07f849d16394167f852aeae8f1f60ce687e303c9ec0c34494357efee79090e4dee40f5782927cef6470c4731da
-EBUILD microsoft-edge-dev-88.0.702.0.ebuild 2359 BLAKE2B a86c2ba483cd1281f04bb7550e4e011b7040108bebadb9dd5585500f8cfa158a9ab168679b027340d1b3fcc1c664c04d1b7babd2fb88ed2842c8a7a00e8a57f0 SHA512 c1ba5fc6f667b28dcf8c0041dbb622e030f1f00b665bf229e2ae5ee2dcb448f458be1df697d41041f527097a946229b6d1eb1e14215e0408de841fc8744a4ab1
+DIST microsoft-edge-dev_88.0.705.9-1_amd64.deb 88167812 BLAKE2B cc3620ece429268e8dafdd5f2a73e2f23a6d51f0a381331cc9623805891a1211c4734dc6b5498d587a9aca52a22e56475ea36d1e4114b63d08938f667828bf20 SHA512 2afe62f5e21750919ec7931b4fb7b0e9e267a01e8388e8ad35b8449713e294a5ae743c28ce2f3c941660ebc2df8c7a6c62db8391ec101e020908a54f1df95423
+EBUILD microsoft-edge-dev-88.0.705.9.ebuild 2359 BLAKE2B a86c2ba483cd1281f04bb7550e4e011b7040108bebadb9dd5585500f8cfa158a9ab168679b027340d1b3fcc1c664c04d1b7babd2fb88ed2842c8a7a00e8a57f0 SHA512 c1ba5fc6f667b28dcf8c0041dbb622e030f1f00b665bf229e2ae5ee2dcb448f458be1df697d41041f527097a946229b6d1eb1e14215e0408de841fc8744a4ab1
 MISC metadata.xml 437 BLAKE2B 2598bcc8023b9cb612219216e6873e77072ce2b452aef80a08ee43be81d25f8c8e84cb063952d1a15681fe7fe7970ef2941e949f07c57cc7728be6e25f980a73 SHA512 9ee343225c6105150638346cdeedaa70c24ff1be6263b9134572737c8a06e7f63dac39e733aad87e2b2cf5cbaf647ba1f8577bb14d160e68db36cc328878efcc
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-88.0.702.0.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-88.0.705.9.ebuild
similarity index 100%
rename from www-client/microsoft-edge-dev/microsoft-edge-dev-88.0.702.0.ebuild
rename to www-client/microsoft-edge-dev/microsoft-edge-dev-88.0.705.9.ebuild
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 59831cbaee7f..54cbd3dcd71e 100644
Binary files a/www-misc/Manifest.gz and b/www-misc/Manifest.gz differ
diff --git a/www-misc/vdradmin-am/Manifest b/www-misc/vdradmin-am/Manifest
index 0c3c63d52f2d..3da678439cab 100644
--- a/www-misc/vdradmin-am/Manifest
+++ b/www-misc/vdradmin-am/Manifest
@@ -6,7 +6,7 @@ AUX vdradmind.conf 92 BLAKE2B 14d1abac4f0718dcf0679ffaab81f2d1867cdca3f3cf8534dd
 AUX vdradmind.service 278 BLAKE2B 58b7aca123f3dc6ac00eeed25a241cd4315b93abff33ef66a0a227623a5bfd6fb5c234166a55d66f0d4a7762ab0c9c720f8e2031bf52789a52edc3d07d61bfa2 SHA512 e862d5a54e0f9b1b8c3604933ccea840e1256fac49f1b93cd7c6446f9aa4f6b8371fbd8d8b767574efe2420c7141e7af0cd5578733311a94377db8797de32b28
 DIST vdradmin-am-3.6.10.tar.bz2 606665 BLAKE2B c475b36c840548b6e0d50b2095ce3278b0b526af856c891a25d28bb2f0cb9f950aa9979533a6b6425a2a36a594dc5d6a075fca7713eb1f59071fec854582cf5b SHA512 f7546f79b786ca383c0846656e74bd69dc9faf57fe5794ffd68776123497ec2a96c2f131801e3d5d19247ac36eaa896801e1ac9cd11291418abb518ba208e597
 DIST vdradmin-am-3.6.9.tar.bz2 562006 BLAKE2B d04d7c0c3254942a388fe0f7b9832fb83f5b6c36af8e9021da8b1e5480d0a507c14da3b55590ea3ba4f58e58c7de9f36cc2a3c5f94168be605477244f62da987 SHA512 1c84ce56da238db6ab2a2fc3d59582945440436e174b3998c21b6bcb5b99c914a195728aa24fef7de8841c3be09b6e9976497acd873e768aab5fdaacddd473d5
-EBUILD vdradmin-am-3.6.10-r1.ebuild 4745 BLAKE2B ae6dcfccc5c4ee3bb42f860cb576dc952086c45cb8418bcedae3e3bcdeb99b630754a8cf1f5bbc380d386fa3df7349839fdc04a30d265934a69ecce0a37f77d2 SHA512 4af9d07e394a6e243c88718f73747282d69e60b6d40045d5364d9fda02d860709572ab252b3954f285dc0f0c4d9df417dbaefd9d8290d81e28239e8c02564374
+EBUILD vdradmin-am-3.6.10-r1.ebuild 4744 BLAKE2B 34b6b7c2dfcebda6d62bd96b5eb1cea20c72c40a64c9f439bd69bc67a6f9e439e63778385474083c108f1dad49d356362fa4efcf5ef25563609710455722c139 SHA512 96283b5e1a46fe31f4cd2a0994396a1bd140b337b929510a2a0d36ae5440a66a7f31c5a585d90de67bacdacc57cdcf62795ff7305b029b6f1715acfb694cafd4
 EBUILD vdradmin-am-3.6.10.ebuild 4768 BLAKE2B cbddb51256653c55a36ffbfab055bf6deb93eba83b1ccafa01c98bd4d8e0237a6b0cf441894281e90d05839098384193666ee9b5a650b87d928cbf420d1f0308 SHA512 cbfe87316898d2cafd01dfb8f3bd681310a80383061c9966d0fc0a246a19cbd1894f7904a2ff94280e17dc148ec1b48c74e71a5475aaa758dacc46f00330b828
 EBUILD vdradmin-am-3.6.9-r3.ebuild 4730 BLAKE2B bdc97dd0b5be9bbf0977c9fd687c9260c14831278e43dbb2ea26a00cb4f494b48ba5571a03b3e049340d381df6beb2891b5c62c9752e0e6dacdda5cf5df72e0a SHA512 69a1ce6c895f45b2b738375bcf14501fb1771f72fbf794b99019398599ed9d553402abb17e7488822cf847440939afa644ab7ce81fdd9d21a2971a91c01d849a
 EBUILD vdradmin-am-3.6.9.ebuild 4315 BLAKE2B b69fc3e119c2ed3eaf70898515b9612012ab3fbd68395eb9c50b59dc8904293f3fd83988db6f0f6d97f47641f0b85787a01547d566dd26ad9b60f7024481c407 SHA512 1ab55053c9eefd90ca28a5cd7659e6da9cb56c1178a1fffff7e7b9a111ec8b1b0ad3631d29c0206c6ddf1996b2ccd7265b62ef5621269056d566930f063499c3
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
index 0e82c2c70929..8a225ac3f56e 100644
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://andreas.vdr-developer.org/vdradmin-am/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="ipv6 ssl"
 
 DEPEND="acct-group/vdradmin
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 8f92d94949f6..6d5f75567b16 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 8e71198841e7..292b9f762ff8 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
 DIST google-chrome-beta_87.0.4280.66-1_amd64.deb 72746672 BLAKE2B 730d100753aaeaac9254794e4bddfd9871bc5499c02faa75965089d935bc69f7f39a7d9db5ea278a0600c3a062d30ad96edaf3b15ee254b300e8dcfa44fb6d13 SHA512 23158dc27fac73b093663dae01568eafe898d3c9335206d8814c747a30df564930152c2139013d393b71f477868f5206c2642ef4ac481ec9ba89a10cf4b74260
-DIST google-chrome-stable_87.0.4280.66-1_amd64.deb 72726412 BLAKE2B 81902234ab4c7df0994eb98aad31f526b05b281f46920e64af492a5f885e1dc6619979006b3c34c2954f952f1327b57e0013edd2bfc634167be94d660aa5402a SHA512 c4c173a69d59c05f5b3b159fb3ed3a6b09e880083adfe07cea45b9f7a592dc3eefca70676b5bae66e679f1030c7459523f99dd61c9a28f676bc7a91d5f72662d
-DIST google-chrome-unstable_88.0.4324.11-1_amd64.deb 75169984 BLAKE2B ff582bc5eed34ca53d7b4780993de7039dcb672f97b59565b39e474a49ad1907cfcfa1f009f0310c3989751ec12aeae9dc225fafaab244fbea15dff031316fe0 SHA512 bd3d5641588adc0abe6d9340b5ae690a3d41ddf4319cae038abebd99b646dfbbcac319ff798b6935da55518f26141f12446c9b424c09af59f5f6c91f737a4845
-EBUILD chrome-binary-plugins-87.0.4280.66.ebuild 1218 BLAKE2B 1da82c24fa348283d6e1b470b81627cf5b5d6341279de88971d34aadccaa4a59772aeeda01c08e3d15a46dc69f9255fcac7968d1e5cdf087cb72ceb17d5d4003 SHA512 2dd57832e3adfbf3f2aa7bdaeff3392d27fa67cd8098a11a18a4a025087404a19c3208420f9167ec60ad38cb5326b9f17b8020485011424d0e295afd1e44fb95
+DIST google-chrome-stable_87.0.4280.88-1_amd64.deb 72446160 BLAKE2B 308e73cd83f3f760bb5f6cc6dd077f3b6af9c986493bef76b6aba505bc8105746752df26e05e7d557ea45bf1986f61ab0011b85a6613ba05033f4c93764ac42b SHA512 19eea1d1be171cab60ce5135572da9388b4b72e313118478b53f65c0bf2293733809282736b98ef828a208b7426e5191258f8c666cba7510b8bf5c92d0010a47
+DIST google-chrome-unstable_88.0.4324.27-1_amd64.deb 75174972 BLAKE2B 5ea5343e550a5451b77f343530b898ada88671e39725c2dbe20a2ee8f2772033e46f58facbe14e447196803c1ecde1cf01e4cb1d8728bb47deb339b2865dc68a SHA512 2169d70396040c32237c549d0d79cb3d444521f567b8c6fe27eea9f10db281c715ac8df3b4e7d49eae580174ccf0f48d46a14aac4211ed66f1a58d6db94c6adb
 EBUILD chrome-binary-plugins-87.0.4280.66_beta.ebuild 1218 BLAKE2B 1da82c24fa348283d6e1b470b81627cf5b5d6341279de88971d34aadccaa4a59772aeeda01c08e3d15a46dc69f9255fcac7968d1e5cdf087cb72ceb17d5d4003 SHA512 2dd57832e3adfbf3f2aa7bdaeff3392d27fa67cd8098a11a18a4a025087404a19c3208420f9167ec60ad38cb5326b9f17b8020485011424d0e295afd1e44fb95
-EBUILD chrome-binary-plugins-88.0.4324.11_alpha.ebuild 1218 BLAKE2B 1da82c24fa348283d6e1b470b81627cf5b5d6341279de88971d34aadccaa4a59772aeeda01c08e3d15a46dc69f9255fcac7968d1e5cdf087cb72ceb17d5d4003 SHA512 2dd57832e3adfbf3f2aa7bdaeff3392d27fa67cd8098a11a18a4a025087404a19c3208420f9167ec60ad38cb5326b9f17b8020485011424d0e295afd1e44fb95
+EBUILD chrome-binary-plugins-87.0.4280.88.ebuild 1218 BLAKE2B 1da82c24fa348283d6e1b470b81627cf5b5d6341279de88971d34aadccaa4a59772aeeda01c08e3d15a46dc69f9255fcac7968d1e5cdf087cb72ceb17d5d4003 SHA512 2dd57832e3adfbf3f2aa7bdaeff3392d27fa67cd8098a11a18a4a025087404a19c3208420f9167ec60ad38cb5326b9f17b8020485011424d0e295afd1e44fb95
+EBUILD chrome-binary-plugins-88.0.4324.27_alpha.ebuild 1218 BLAKE2B 1da82c24fa348283d6e1b470b81627cf5b5d6341279de88971d34aadccaa4a59772aeeda01c08e3d15a46dc69f9255fcac7968d1e5cdf087cb72ceb17d5d4003 SHA512 2dd57832e3adfbf3f2aa7bdaeff3392d27fa67cd8098a11a18a4a025087404a19c3208420f9167ec60ad38cb5326b9f17b8020485011424d0e295afd1e44fb95
 MISC metadata.xml 262 BLAKE2B 6958ab33a832169dbd6b7077bfeae3f398c5d825430d3d85f7f37d732951fa0585a75d28766111d82e5103fa4078cfb3e3d16b98a4520b268d4fd6b670ce811e SHA512 b440c405c25f905f11aeaab1ee3721846ac26502b1e02656f773a3b3be4bc636e85af6185c043c8e94205a3297476d3d2230d6c519d477b5c7d42268916e1128
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4280.66.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4280.88.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4280.66.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4280.88.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-88.0.4324.11_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-88.0.4324.27_alpha.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-88.0.4324.11_alpha.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-88.0.4324.27_alpha.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index cfb4dfeb076c..60f7103f8776 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index d843d950a84d..42c00a389397 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -3,7 +3,9 @@ AUX apache-2.4.41-libressl.patch 1082 BLAKE2B 98428a5653f47e6dd38452809bee92ef7a
 AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b118621f2af1498a1362e7f30b82dc12a96485652cb0c34248c290f6a1aab6a3f378d9843c2a SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3
 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48
 DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1eb4b0e732fa6140f55d136e317714591327bde3f85bab7780424e6eef04b7a4518cbdcfdddcbc094409f4ca19ffea1ce967bdf7cf1 SHA512 bc0ffa20cffd9a89c2ea64420fa2243d77e97d7922bcd0b387a7fcfcc3c6908a056972b499a81344f7c3e3e19b55ffc300fd034c54b287f4f32d8931bd50cde4
+DIST gentoo-apache-2.4.46-r3-20201202.tar.bz2 25758 BLAKE2B 7566d0092d32bba64f445451b390bc17bfb245451ac85c74d34ea75aa0473cf710870ad76454f65d58b25d64a822c8fd1a3c1ece4aa540a97658ffe936d2a016 SHA512 7a6159616ae8d03e8fb90901c7cb79237b3d29de3762a493e893bb5feb41686808d3127fe5b423fa2d1618b9258c68e4b564aba0777c0240c8389aeb0582b6a8
 DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13
 EBUILD apache-2.4.46-r1.ebuild 8645 BLAKE2B 500dd93b967c7155d6b07d59f8bb18e8473c0f993f0fd5d56c3e66d4fa80e78e1c180275fee245a7377b7fee822d86b1d21371517b0d46bf9f9ff34fb2a24e5e SHA512 e54c12333cd7390e5a2c2db0ec3bd0e2ff175304a062ccad95fc2a4cebfbc77f130d61d12b0c1e25514214feaf804843323b9532d35b80ca0fa448f5ab828e25
+EBUILD apache-2.4.46-r3.ebuild 8648 BLAKE2B 09679b7692474f0bdd3531cf2029aef2a97c80fb7adfde2860db403247016f519a22ee3576507580bc86f8a832912a19cad69b5aaa9248af0aa8f1652ab8e410 SHA512 3573361719e9e94b2f447283f240fb0e89e7501d7934bb76a8828c2a943e347f5fa21ae3fd4d74eb4ac3aebe982592d7ab501410f87498fd179e2b87f14740b8
 EBUILD apache-2.4.46.ebuild 8572 BLAKE2B 9f3a59cee0344f620d307e3316f8a17863227b0fbb8aee4a85474c6cfd23e9897d75628e66dbf0de901b9901b20ea4ec431ba7a16d79a5ec5437bc4bbf803eac SHA512 378d004209a14a97bf7358d284d9fa9bb51f1d5340daf8988739e53ef9b8f354e074c0def44d577fb9176137f136e0704ae18e4b000601acb6c63db7caa10a76
 MISC metadata.xml 1012 BLAKE2B ca2238f428144240f64b5c9e48087a07a3f77278958efb240edeb864050ca01d1e042a37fb304fde76925fb651d7d97755d354a45aff34ac0589b7405b848d54 SHA512 a4e903bb75740c54256fa96359f6a97cd75008ffeeadfd6353648f5bfa2295fb108ec9de398956c79633bc465475f5db365d20d71caa34fc14a07c4715cc8683
diff --git a/www-servers/apache/apache-2.4.46-r3.ebuild b/www-servers/apache/apache-2.4.46-r3.ebuild
new file mode 100644
index 000000000000..fd8ac93e806f
--- /dev/null
+++ b/www-servers/apache/apache-2.4.46-r3.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20201202"
+GENTOO_DEVELOPER="polynomial-c"
+GENTOO_PATCHNAME="gentoo-apache-2.4.46-r3"
+
+# IUSE/USE_EXPAND magic
+IUSE_MPMS_FORK="prefork"
+IUSE_MPMS_THREAD="event worker"
+
+# << obsolete modules:
+# authn_default authz_default mem_cache
+# mem_cache is replaced by cache_disk
+# ?? buggy modules
+# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
+# >> added modules for reason:
+# compat: compatibility with 2.2 access control
+# authz_host: new module for access control
+# authn_core: functionality provided by authn_alias in previous versions
+# authz_core: new module, provides core authorization capabilities
+# cache_disk: replacement for mem_cache
+# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
+# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
+# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
+# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
+# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
+# socache_shmcb: shared object cache provider. Default config with ssl needs it
+# unixd: fixes startup error: Invalid command 'User'
+IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest auth_form
+authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core
+authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
+brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
+dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
+ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
+lbmethod_heartbeat log_config log_forensic logio macro md mime mime_magic negotiation
+proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi
+proxy_http2 proxy_fcgi  proxy_wstunnel rewrite ratelimit remoteip reqtimeout
+session session_cookie session_crypto session_dbd setenvif slotmem_shm speling
+socache_memcache socache_shmcb status substitute unique_id userdir usertrack
+unixd version vhost_alias watchdog xml2enc"
+# The following are also in the source as of this version, but are not available
+# for user selection:
+# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
+# optional_fn_import optional_hook_export optional_hook_import
+
+# inter-module dependencies
+# TODO: this may still be incomplete
+MODULE_DEPENDS="
+	auth_form:session
+	brotli:filter
+	dav_fs:dav
+	dav_lock:dav
+	deflate:filter
+	cache_disk:cache
+	ext_filter:filter
+	file_cache:cache
+	lbmethod_byrequests:proxy_balancer
+	lbmethod_byrequests:slotmem_shm
+	lbmethod_bytraffic:proxy_balancer
+	lbmethod_bybusyness:proxy_balancer
+	lbmethod_heartbeat:proxy_balancer
+	log_forensic:log_config
+	logio:log_config
+	cache_disk:cache
+	cache_socache:cache
+	md:watchdog
+	mime_magic:mime
+	proxy_ajp:proxy
+	proxy_balancer:proxy
+	proxy_balancer:slotmem_shm
+	proxy_connect:proxy
+	proxy_ftp:proxy
+	proxy_html:proxy
+	proxy_html:xml2enc
+	proxy_http:proxy
+	proxy_http2:proxy
+	proxy_scgi:proxy
+	proxy_fcgi:proxy
+	proxy_wstunnel:proxy
+	session_cookie:session
+	session_dbd:dbd
+	session_dbd:session
+	socache_memcache:cache
+	substitute:filter
+"
+
+# module<->define mappings
+MODULE_DEFINES="
+	auth_digest:AUTH_DIGEST
+	authnz_ldap:AUTHNZ_LDAP
+	cache:CACHE
+	cache_disk:CACHE
+	cache_socache:CACHE
+	dav:DAV
+	dav_fs:DAV
+	dav_lock:DAV
+	file_cache:CACHE
+	http2:HTTP2
+	info:INFO
+	ldap:LDAP
+	md:SSL
+	proxy:PROXY
+	proxy_ajp:PROXY
+	proxy_balancer:PROXY
+	proxy_connect:PROXY
+	proxy_ftp:PROXY
+	proxy_html:PROXY
+	proxy_http:PROXY
+	proxy_fcgi:PROXY
+	proxy_scgi:PROXY
+	proxy_wstunnel:PROXY
+	socache_shmcb:SSL
+	socache_memcache:CACHE
+	ssl:SSL
+	status:STATUS
+	suexec:SUEXEC
+	userdir:USERDIR
+"
+
+# critical modules for the default config
+MODULE_CRITICAL="
+	authn_core
+	authz_core
+	authz_host
+	dir
+	mime
+	unixd
+"
+inherit apache-2 systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="The Apache Web Server"
+HOMEPAGE="https://httpd.apache.org/"
+
+# some helper scripts are Apache-1.1, thus both are here
+LICENSE="Apache-2.0 Apache-1.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+
+# Enable http2 by default (bug #563452)
+# FIXME: Move to apache-2.eclass once this has reached stable.
+IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
+# New suexec options (since 2.4.34)
+IUSE="${IUSE} +suexec-caps suexec-syslog split-usr"
+
+CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
+	apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
+	apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 )
+	apache2_modules_md? ( >=dev-libs/jansson-2.10 )
+	apache2_modules_session_crypto? (
+		libressl? ( dev-libs/apr-util[libressl] )
+		!libressl? ( dev-libs/apr-util[openssl] )
+	)"
+
+DEPEND+="${CDEPEND}
+	suexec? ( suexec-caps? ( sys-libs/libcap ) )"
+RDEPEND+="${CDEPEND}"
+
+REQUIRED_USE="apache2_modules_http2? ( ssl )
+	apache2_modules_md? ( ssl )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.41-libressl.patch" #668060
+)
+
+pkg_setup() {
+	# dependend critical modules which are not allowed in global scope due
+	# to USE flag conditionals (bug #499260)
+	use ssl && MODULE_CRITICAL+=" socache_shmcb"
+	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
+	apache-2_pkg_setup
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	apache-2_src_configure
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# This header is the same across targets, so use the build compiler.
+		pushd server >/dev/null
+		emake gen_test_char
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
+			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
+		popd >/dev/null
+	fi
+
+	default
+}
+
+src_install() {
+	apache-2_src_install
+	local i
+	local apache_tools_prune_list=(
+		/usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
+		/usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
+		/usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
+		/usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
+	)
+	for i in ${apache_tools_prune_list[@]} ; do
+		rm "${ED%/}"/${i} || die "Failed to prune apache-tools bits"
+	done
+
+	# install apxs in /usr/bin (bug #502384) and put a symlink into the
+	# old location until all ebuilds and eclasses have been modified to
+	# use the new location.
+	dobin support/apxs
+	use split-usr && dosym ../bin/apxs /usr/sbin/apxs
+
+	# Note: wait for mod_systemd to be included in some forthcoming release,
+	# Then apache2.4.service can be used and systemd support controlled
+	# through --enable-systemd
+	systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
+	dotmpfiles "${FILESDIR}/apache.conf"
+	#insinto /etc/apache2/modules.d
+	#doins "${FILESDIR}/00_systemd.conf"
+
+	# Install http2 module config
+	insinto /etc/apache2/modules.d
+	doins "${FILESDIR}"/41_mod_http2.conf
+
+	# Fix path to apache libdir
+	sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED%/}"/usr/sbin/apache2ctl || die
+}
+
+pkg_postinst() {
+	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
+
+	tmpfiles_process apache.conf #662544
+
+	# warnings that default config might not work out of the box
+	local mod cmod
+	for mod in ${MODULE_CRITICAL} ; do
+		if ! use "apache2_modules_${mod}"; then
+			echo
+			ewarn "Warning: Critical module not installed!"
+			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
+			ewarn "are highly recomended but might not be in the base profile yet."
+			ewarn "Default config for ssl needs module 'socache_shmcb'."
+			ewarn "Enabling the following flags is highly recommended:"
+			for cmod in ${MODULE_CRITICAL} ; do
+				use "apache2_modules_${cmod}" || \
+					ewarn "+ apache2_modules_${cmod}"
+			done
+			echo
+			break
+		fi
+	done
+	# warning for proxy_balancer and missing load balancing scheduler
+	if use apache2_modules_proxy_balancer; then
+		local lbset=
+		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
+			if use "apache2_modules_${mod}"; then
+				lbset=1 && break
+			fi
+		done
+		if [ ! ${lbset} ] ; then
+			echo
+			ewarn "Info: Missing load balancing scheduler algorithm module"
+			ewarn "(They were split off from proxy_balancer in 2.3)"
+			ewarn "In order to get the ability of load balancing, at least"
+			ewarn "one of these modules has to be present:"
+			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
+			echo
+		fi
+	fi
+}
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 2d7a0ffc2922..fd6885498f7e 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -40,9 +40,11 @@ DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
 DIST njs-0.4.3.tar.gz 460997 BLAKE2B 373a4aca51ada84d628ae6b6254c9268b4cec4ac8870f81ba43ff693f20148a9ca862038e57a68c22cbff29ea613785e83778cc708cf1b47103e9f950a198289 SHA512 b3b4294817997a06661f00f53d38e0cde08e022f41b3663f9d17a91b343fb944e21184114f09d89995096faee491187c3ae424407f2855ed0670c0cccf928cd7
 DIST njs-0.4.4.tar.gz 486870 BLAKE2B 9390bfe35249ea34b9edd4b7c2360a25c9ecb232e10f35a2324fd8586f5f74e2083d5bd7481c084065d0651ba4fed56958bc2cd1f002d12622238ebc81b9f7c5 SHA512 1bf88d23f99532bb32e96de79e49cc27b60d6231207eb06ea2f6a6884d725f7bbe7b426664aa4c872f7c40549f81489c04c2ae4a7ddd2d03c8cf1d66b9c62c78
+DIST njs-0.5.0.tar.gz 505568 BLAKE2B 5dc2a91bffa4eb2364d96e26def0959b111cc8bf88841f581e3c0d43fcb88ba1ea24b24339cb1f51b8290c08dd930dc18a274a7ab6a21ee4ba8b0e6c4f5a1ba0 SHA512 182a64ba519b1a1d29ac71ffe2c9ef8e5a6f9aaf3db9f327ac926114db73b339a424801b558068fc7ae06ae88a4dea0a601c749db4b6f2b579e427181e41d11b
 EBUILD nginx-1.18.0-r2.ebuild 40458 BLAKE2B bab6ebfd5a4ef14026cf3149757dcf207dad0245b48a31bcb93a61709bb6a9a656ebb0d8ebcc0f502daab9b7b9a0a7a4dc5d00cb2ececc4606f508d87e8e23f2 SHA512 54651ac56efa4ed927189dbbc2165af8d916097c0e623fcd7427096be4605d093772913511372dd5040ff2c7c9d305d0686ccf713205eff3c3cf41e3fa12a241
 EBUILD nginx-1.19.2-r1.ebuild 40460 BLAKE2B 620254271c03d328f5377c23307af52838a8f2eaa8e60a91eed785fdf2c02c8cf3ae349e2b7b04a29024ee14247c001253e234c1551ac2fcb665ab98ca1674a8 SHA512 0a9c9d53cf47520c5f2f04a72b6f64d5399571ce371b31a09d1d81f160ffa88e461b6e335d0ea05428d62612e014f682bfeefeb25d6b05eaf1690c31f822e134
 EBUILD nginx-1.19.3.ebuild 40431 BLAKE2B f78ec32446bf5017b58fda56370b72d1b2fc7176f2b4fcec70e4b22a00b124b96eb4d2d28182ecbf13ccd1c6ce43ee7324b36608ae13fdc1fd6d3ca947e0b52b SHA512 6445a587721d55fd09505970db538cbd2cdb9d72820526869a2d910a049b479f01ea968434eb7f2f1c4889f03fcf6921025530a686693a380f381017e40b34fb
 EBUILD nginx-1.19.4.ebuild 40431 BLAKE2B f78ec32446bf5017b58fda56370b72d1b2fc7176f2b4fcec70e4b22a00b124b96eb4d2d28182ecbf13ccd1c6ce43ee7324b36608ae13fdc1fd6d3ca947e0b52b SHA512 6445a587721d55fd09505970db538cbd2cdb9d72820526869a2d910a049b479f01ea968434eb7f2f1c4889f03fcf6921025530a686693a380f381017e40b34fb
+EBUILD nginx-1.19.5-r1.ebuild 40431 BLAKE2B cf9bfea11e1845eb2c810c474dde72f275166bb55c48cb9658f71a512ede464b953dcc3f3fd9b0e0763190d856a4aa0585414f0bcf91cc5e29dde9e259dab9c7 SHA512 d92bacc4b3d5e97e7b85485507f8483f9f5166b43c4ed95c3e04a50b77aeaf10ce2a4609cf1d25357a88bb4516e5f05b020f37d666a81e1976a689e34ab8e794
 EBUILD nginx-1.19.5.ebuild 40431 BLAKE2B f78ec32446bf5017b58fda56370b72d1b2fc7176f2b4fcec70e4b22a00b124b96eb4d2d28182ecbf13ccd1c6ce43ee7324b36608ae13fdc1fd6d3ca947e0b52b SHA512 6445a587721d55fd09505970db538cbd2cdb9d72820526869a2d910a049b479f01ea968434eb7f2f1c4889f03fcf6921025530a686693a380f381017e40b34fb
 MISC metadata.xml 1193 BLAKE2B aeb293cf75ed650c946910222d6396f726dc5ed49f1213e6a5664613d78e3b27616399bc1c9f0a360f5303b16931da7016cdf540b24601afafc3ada4428b33a9 SHA512 a96002bc9845bc465542c753c738899b77ad7a32fac7f5f9a7049336868bc41199e926422e3dc23e47f34656c9aaea255511d2ef91e9d59f48c9cd0b4a3c4903
diff --git a/www-servers/nginx/nginx-1.19.5-r1.ebuild b/www-servers/nginx/nginx-1.19.5-r1.ebuild
new file mode 100644
index 000000000000..46d444142cc3
--- /dev/null
+++ b/www-servers/nginx/nginx-1.19.5-r1.ebuild
@@ -0,0 +1,1087 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# Maintainer notes:
+# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
+# - any http-module activates the main http-functionality and overrides USE=-http
+# - keep the following requirements in mind before adding external modules:
+#	* alive upstream
+#	* sane packaging
+#	* builds cleanly
+#	* does not need a patch for nginx core
+# - TODO: test the google-perftools module (included in vanilla tarball)
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.3.1"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+
+# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
+HTTP_BROTLI_MODULE_PV="1.0.0rc"
+HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
+HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
+# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.33"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
+
+# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
+HTTP_CACHE_PURGE_MODULE_PV="2.3"
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+
+# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
+HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+
+# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
+HTTP_FANCYINDEX_MODULE_PV="0.4.4"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+
+# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.10.15"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
+HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
+
+# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
+HTTP_AUTH_PAM_MODULE_PV="1.5.2"
+HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
+HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
+HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
+
+# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
+HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
+HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
+HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+
+# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
+HTTP_METRICS_MODULE_PV="0.1.1"
+HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
+HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+
+# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+
+# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
+HTTP_NAXSI_MODULE_PV="0.56"
+HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
+HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
+HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
+
+# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
+RTMP_MODULE_PV="1.2.1"
+RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
+RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
+RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
+
+# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
+HTTP_DAV_EXT_MODULE_PV="3.0.0"
+HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
+HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
+HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
+
+# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
+HTTP_ECHO_MODULE_PV="0.62"
+HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
+HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
+HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
+
+# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
+# keep the MODULE_P here consistent with upstream to avoid tarball duplication
+HTTP_SECURITY_MODULE_PV="2.9.3"
+HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
+HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
+HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
+
+# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
+HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
+HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
+HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
+HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
+
+# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
+HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
+HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
+HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
+HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
+
+# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
+HTTP_MOGILEFS_MODULE_PV="1.0.4"
+HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
+HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+
+# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
+HTTP_MEMC_MODULE_PV="0.19"
+HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
+HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
+HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
+
+# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
+HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
+HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
+HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+
+# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
+GEOIP2_MODULE_PV="3.3"
+GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
+GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+
+# njs-module (https://github.com/nginx/njs, as-is)
+NJS_MODULE_PV="0.5.0"
+NJS_MODULE_P="njs-${NJS_MODULE_PV}"
+NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
+NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
+
+# We handle deps below ourselves
+SSL_DEPS_SKIP=1
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib pax-utils
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="https://nginx.org"
+SRC_URI="https://nginx.org/download/${P}.tar.gz
+	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
+	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
+	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
+	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
+	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
+	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
+	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
+	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
+	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
+	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
+	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
+	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
+	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
+	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
+	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
+	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
+	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
+	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
+	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
+
+LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
+	nginx_modules_http_security? ( Apache-2.0 )
+	nginx_modules_http_push_stream? ( GPL-3 )"
+
+SLOT="mainline"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+# Package doesn't provide a real test suite
+RESTRICT="test"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
+	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
+	proxy referer rewrite scgi ssi split_clients upstream_hash
+	upstream_ip_hash upstream_keepalive upstream_least_conn
+	upstream_zone userid uwsgi"
+NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
+	gzip_static image_filter mp4 perl random_index realip secure_link
+	slice stub_status sub xslt"
+NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
+	upstream_hash upstream_least_conn upstream_zone"
+NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="
+	http_auth_ldap
+	http_auth_pam
+	http_brotli
+	http_cache_purge
+	http_dav_ext
+	http_echo
+	http_fancyindex
+	http_geoip2
+	http_headers_more
+	http_javascript
+	http_lua
+	http_memc
+	http_metrics
+	http_mogilefs
+	http_naxsi
+	http_push_stream
+	http_security
+	http_slowfs_cache
+	http_sticky
+	http_upload_progress
+	http_upstream_check
+	http_vhost_traffic_status
+	stream_geoip2
+	stream_javascript
+"
+
+IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
+	pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
+
+for mod in $NGINX_MODULES_STD; do
+	IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+	IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_STD; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_OPT; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+	IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+	IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+# Add so we can warn users updating about config changes
+# @TODO: jbergstroem: remove on next release series
+IUSE="${IUSE} nginx_modules_http_spdy"
+
+CDEPEND="
+	pcre? ( dev-libs/libpcre:= )
+	pcre-jit? ( dev-libs/libpcre:=[jit] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http2? (
+		!libressl? ( >=dev-libs/openssl-1.0.1c:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http-cache? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_brotli? ( app-arch/brotli:= )
+	nginx_modules_http_geoip? ( dev-libs/geoip )
+	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
+	nginx_modules_http_gunzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
+	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
+	nginx_modules_http_secure_link? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
+	nginx_modules_http_lua? ( dev-lang/luajit:2= )
+	nginx_modules_http_auth_pam? ( sys-libs/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl:= )
+	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
+	nginx_modules_http_security? (
+		dev-libs/apr:=
+		dev-libs/apr-util:=
+		dev-libs/libxml2:=
+		net-misc/curl
+		www-servers/apache
+	)
+	nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )
+	nginx_modules_stream_geoip? ( dev-libs/geoip )
+	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-nginx )
+	!www-servers/nginx:0"
+DEPEND="${CDEPEND}
+	nginx_modules_http_brotli? ( virtual/pkgconfig )
+	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )
+	arm? ( dev-libs/libatomic_ops )
+	libatomic? ( dev-libs/libatomic_ops )"
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+REQUIRED_USE="pcre-jit? ( pcre )
+	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
+	nginx_modules_http_grpc? ( http2 )
+	nginx_modules_http_lua? (
+		luajit
+		nginx_modules_http_rewrite
+	)
+	nginx_modules_http_naxsi? ( pcre )
+	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
+	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
+	nginx_modules_http_security? ( pcre )
+	nginx_modules_http_push_stream? ( ssl )"
+
+pkg_setup() {
+	NGINX_HOME="/var/lib/nginx"
+	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
+
+	ebegin "Creating nginx user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
+	eend $?
+
+	if use libatomic; then
+		ewarn "GCC 4.1+ features built-in atomic operations."
+		ewarn "Using libatomic_ops is only needed if using"
+		ewarn "a different compiler or a GCC prior to 4.1"
+	fi
+
+	if [[ -n $NGINX_ADD_MODULES ]]; then
+		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+		ewarn "This nginx installation is not supported!"
+		ewarn "Make sure you can reproduce the bug without those modules"
+		ewarn "_before_ reporting bugs."
+	fi
+
+	if use !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+
+	if use nginx_modules_http_mogilefs && use threads; then
+		eerror "mogilefs won't compile with threads support."
+		eerror "Please disable either flag and try again."
+		die "Can't compile mogilefs with threads support"
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
+	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
+
+	if use nginx_modules_http_brotli; then
+		cd "${HTTP_BROTLI_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		eautoreconf
+
+		if use luajit ; then
+			sed -i \
+				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
+				configure || die
+		fi
+
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upload_progress; then
+		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
+		cd "${S}" || die
+	fi
+
+	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
+	# We have config protection, don't rename etc files
+	sed -i 's:.default::' auto/install || die
+	# remove useless files
+	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
+
+	# don't install to /etc/nginx/ if not in use
+	local module
+	for module in fastcgi scgi uwsgi ; do
+		if ! use nginx_modules_http_${module}; then
+			sed -i -e "/${module}/d" auto/install || die
+		fi
+	done
+
+	eapply_user
+}
+
+src_configure() {
+	# mod_security needs to generate nginx/modsecurity/config before including it
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		./configure \
+			--enable-standalone-module \
+			--disable-mlogc \
+			--with-ssdeep=no \
+			$(use_enable pcre-jit) \
+			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
+
+		cd "${S}" || die
+	fi
+
+	local myconf=() http_enabled= mail_enabled= stream_enabled=
+
+	use aio       && myconf+=( --with-file-aio )
+	use debug     && myconf+=( --with-debug )
+	use http2     && myconf+=( --with-http_v2_module )
+	use libatomic && myconf+=( --with-libatomic )
+	use pcre      && myconf+=( --with-pcre )
+	use pcre-jit  && myconf+=( --with-pcre-jit )
+	use threads   && myconf+=( --with-threads )
+
+	# HTTP modules
+	for mod in $NGINX_MODULES_STD; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+		else
+			myconf+=( --without-http_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_OPT; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+			myconf+=( --with-http_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		myconf+=( --with-http_realip_module )
+	fi
+
+	# third-party modules
+	if use nginx_modules_http_upload_progress; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_headers_more; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_lua; then
+		http_enabled=1
+		export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
+		export LUAJIT_INC=$(pkg-config --variable includedir luajit)
+		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
+		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_metrics; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_naxsi ; then
+		http_enabled=1
+		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
+	fi
+
+	if use rtmp ; then
+		http_enabled=1
+		myconf+=( --add-module=${RTMP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_dav_ext ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_echo ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_security ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
+	fi
+
+	if use nginx_modules_http_push_stream ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_sticky ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_mogilefs ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_memc ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_vhost_traffic_status; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
+		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
+		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
+	fi
+
+	if use nginx_modules_http_brotli; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
+	fi
+
+	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
+		http_enabled=1
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf+=( --without-http-cache )
+		use ssl && myconf+=( --with-http_ssl_module )
+	else
+		myconf+=( --without-http --without-http-cache )
+	fi
+
+	# Stream modules
+	for mod in $NGINX_MODULES_STREAM_STD; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+		else
+			myconf+=( --without-stream_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_STREAM_OPT; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+			myconf+=( --with-stream_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
+		stream_enabled=1
+	fi
+
+	if [ $stream_enabled ]; then
+		myconf+=( --with-stream )
+		use ssl && myconf+=( --with-stream_ssl_module )
+	fi
+
+	# MAIL modules
+	for mod in $NGINX_MODULES_MAIL; do
+		if use nginx_modules_mail_${mod}; then
+			mail_enabled=1
+		else
+			myconf+=( --without-mail_${mod}_module )
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf+=( --with-mail )
+		use ssl && myconf+=( --with-mail_ssl_module )
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf+=(  --add-module=${mod} )
+	done
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	tc-export AR CC
+
+	if ! use prefix; then
+		myconf+=( --user=${PN} )
+		myconf+=( --group=${PN} )
+	fi
+
+	local WITHOUT_IPV6=
+	if ! use ipv6; then
+		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
+	fi
+
+	if [[ -n "${EXTRA_ECONF}" ]]; then
+		myconf+=( ${EXTRA_ECONF} )
+		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
+	fi
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
+		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
+		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
+		--with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \
+		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
+		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
+		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
+		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
+		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
+		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
+		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
+		--with-compat \
+		"${myconf[@]}" || die "configure failed"
+
+	# A purely cosmetic change that makes nginx -V more readable. This can be
+	# good if people outside the gentoo community would troubleshoot and
+	# question the users setup.
+	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
+}
+
+src_compile() {
+	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" install
+
+	cp "${FILESDIR}"/nginx.conf-r2 "${ED%/}"/etc/nginx/nginx.conf || die
+
+	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
+	newconfd "${FILESDIR}"/nginx.confd nginx
+
+	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
+
+	doman man/nginx.8
+	dodoc CHANGES* README
+
+	# just keepdir. do not copy the default htdocs files (bug #449136)
+	keepdir /var/www/localhost
+	rm -rf "${ED%/}"/usr/html || die
+
+	# set up a list of directories to keep
+	local keepdir_list="${NGINX_HOME_TMP}"/client
+	local module
+	for module in proxy fastcgi scgi uwsgi; do
+		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
+	done
+
+	keepdir /var/log/nginx ${keepdir_list}
+
+	# this solves a problem with SELinux where nginx doesn't see the directories
+	# as root and tries to create them as nginx
+	fperms 0750 "${NGINX_HOME_TMP}"
+	fowners ${PN}:0 "${NGINX_HOME_TMP}"
+
+	fperms 0700 ${keepdir_list}
+	fowners ${PN}:${PN} ${keepdir_list}
+
+	fperms 0710 /var/log/nginx
+	fowners 0:${PN} /var/log/nginx
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
+
+	# Don't create /run
+	rm -rf "${ED%/}"/run || die
+
+	if use luajit; then
+		pax-mark m "${ED%/}/usr/sbin/nginx"
+	fi
+
+	if use nginx_modules_http_perl; then
+		cd "${S}"/objs/src/http/modules/perl/ || die
+		emake DESTDIR="${D}" INSTALLDIRS=vendor
+		perl_delete_localpod
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		docinto ${HTTP_CACHE_PURGE_MODULE_P}
+		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
+		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		docinto ${HTTP_FANCYINDEX_MODULE_P}
+		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_lua; then
+		docinto ${HTTP_LUA_MODULE_P}
+		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		docinto ${HTTP_AUTH_PAM_MODULE_P}
+		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
+		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		insinto /etc/nginx
+		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
+	fi
+
+	if use rtmp; then
+		docinto ${RTMP_MODULE_P}
+		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
+	fi
+
+	if use nginx_modules_http_dav_ext; then
+		docinto ${HTTP_DAV_EXT_MODULE_P}
+		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_echo; then
+		docinto ${HTTP_ECHO_MODULE_P}
+		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_security; then
+		docinto ${HTTP_SECURITY_MODULE_P}
+		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt}
+	fi
+
+	if use nginx_modules_http_push_stream; then
+		docinto ${HTTP_PUSH_STREAM_MODULE_P}
+		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
+	fi
+
+	if use nginx_modules_http_sticky; then
+		docinto ${HTTP_STICKY_MODULE_P}
+		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
+	fi
+
+	if use nginx_modules_http_memc; then
+		docinto ${HTTP_MEMC_MODULE_P}
+		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		docinto ${HTTP_LDAP_MODULE_P}
+		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	fi
+
+	if use nginx_modules_http_spdy; then
+		ewarn ""
+		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
+		ewarn "Update your configs and package.use accordingly."
+	fi
+
+	if use nginx_modules_http_lua; then
+		ewarn ""
+		ewarn "While you can build lua 3rd party module against ${P}"
+		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
+		ewarn "officially supported target yet. You are on your own."
+		ewarn "Expect runtime failures, memory leaks and other problems!"
+	fi
+
+	if use nginx_modules_http_lua && use http2; then
+		ewarn ""
+		ewarn "Lua 3rd party module author warns against using ${P} with"
+		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
+	fi
+
+	local _n_permission_layout_checks=0
+	local _has_to_adjust_permissions=0
+	local _has_to_show_permission_warning=0
+
+	# Defaults to 1 to inform people doing a fresh installation
+	# that we ship modified {scgi,uwsgi,fastcgi}_params files
+	local _has_to_show_httpoxy_mitigation_notice=1
+
+	local _replacing_version=
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
+
+		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
+			# Should never happen:
+			# Package is abusing slots but doesn't allow multiple parallel installations.
+			# If we run into this situation it is unsafe to automatically adjust any
+			# permission...
+			_has_to_show_permission_warning=1
+
+			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
+				"You will have to adjust permissions on your own."
+
+			break
+		fi
+
+		local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}")
+		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
+
+		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
+		# This was before we introduced multiple nginx versions so we
+		# do not need to distinguish between stable and mainline
+		local _need_to_fix_CVE2013_0337=1
+
+		if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then
+			# We are updating an installation which should already be fixed
+			_need_to_fix_CVE2013_0337=0
+			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
+		else
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
+		fi
+
+		# Do we need to inform about HTTPoxy mitigation?
+		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_show_httpoxy_mitigation_notice=1
+			debug-print "Need to inform about HTTPoxy mitigation!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.1-r2"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.3-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that the user has
+					# already seen the HTTPoxy mitigation notice because he/she is doing
+					# an update from previous version where we have already shown
+					# the warning. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation where we already informed
+				# that we are mitigating HTTPoxy per default
+				_has_to_show_httpoxy_mitigation_notice=0
+				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
+			else
+				_has_to_show_httpoxy_mitigation_notice=1
+				debug-print "Need to inform about HTTPoxy mitigation!"
+			fi
+		fi
+
+		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
+		# All branches up to 1.11 are affected
+		local _need_to_fix_CVE2016_1247=1
+
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.2-r3"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.6-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that we have already
+					# adjusted permissions or were never affected because user is
+					# doing an update from previous version which was safe or did
+					# the adjustments. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation which should already be adjusted
+				# or which was never affected
+				_need_to_fix_CVE2016_1247=0
+				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
+			else
+				_has_to_adjust_permissions=1
+				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+			fi
+		fi
+	done
+
+	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
+		# We do not DIE when chmod/chown commands are failing because
+		# package is already merged on user's system at this stage
+		# and we cannot retry without losing the information that
+		# the existing installation needs to adjust permissions.
+		# Instead we are going to a show a big warning ...
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The world-readable bit (if set) has been removed from the"
+			ewarn "following directories to mitigate a security bug"
+			ewarn "(CVE-2013-0337, bug #458726):"
+			ewarn ""
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
+			chmod o-rwx \
+				"${EPREFIX}"/var/log/nginx \
+				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				_has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The permissions on the following directory have been reset in"
+			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
+			ewarn ""
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "Also ensure that no other log directory used by any of your"
+			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+			ewarn "used by nginx can be abused to escalate privileges!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
+			# Should never happen ...
+			ewarn ""
+			ewarn "*************************************************************"
+			ewarn "***************         W A R N I N G         ***************"
+			ewarn "*************************************************************"
+			ewarn "The one-time only attempt to adjust permissions of the"
+			ewarn "existing nginx installation failed. Be aware that we will not"
+			ewarn "try to adjust the same permissions again because now you are"
+			ewarn "using a nginx version where we expect that the permissions"
+			ewarn "are already adjusted or that you know what you are doing and"
+			ewarn "want to keep custom permissions."
+			ewarn ""
+		fi
+	fi
+
+	# Sanity check for CVE-2016-1247
+	# Required to warn users who received the warning above and thought
+	# they could fix it by unmerging and re-merging the package or have
+	# unmerged a affected installation on purpose in the past leaving
+	# /var/log/nginx on their system due to keepdir/non-empty folder
+	# and are now installing the package again.
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
+	if [ $? -eq 0 ] ; then
+		# Cleanup -- no reason to die here!
+		rm -f "${_sanity_check_testfile}"
+
+		ewarn ""
+		ewarn "*************************************************************"
+		ewarn "***************         W A R N I N G         ***************"
+		ewarn "*************************************************************"
+		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
+		ewarn "(bug #605008) because nginx user is able to create files in"
+		ewarn ""
+		ewarn "  ${EPREFIX}/var/log/nginx"
+		ewarn ""
+		ewarn "Also ensure that no other log directory used by any of your"
+		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+		ewarn "used by nginx can be abused to escalate privileges!"
+	fi
+
+	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
+		# HTTPoxy mitigation
+		ewarn ""
+		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
+		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
+		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
+		ewarn "are sourcing one of the default"
+		ewarn ""
+		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
+		ewarn "  - 'scgi_params'"
+		ewarn "  - 'uwsgi_params'"
+		ewarn ""
+		ewarn "files in your server block(s)."
+		ewarn ""
+		ewarn "If this is causing any problems for you make sure that you are sourcing the"
+		ewarn "default parameters _before_ you set your own values."
+		ewarn "If you are relying on user-supplied proxy values you have to remove the"
+		ewarn "correlating lines from the file(s) mentioned above."
+		ewarn ""
+	fi
+}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index a0b9601ee33a..bf510ad40da0 100644
Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ
diff --git a/x11-apps/xload/Manifest b/x11-apps/xload/Manifest
index bd34c1983349..32d0252559c4 100644
--- a/x11-apps/xload/Manifest
+++ b/x11-apps/xload/Manifest
@@ -1,3 +1,3 @@
 DIST xload-1.1.3.tar.bz2 140327 BLAKE2B e3e4e817b65a405b2e4733fbf736d2f2a9803436bd752d8fc14204f2c6e342dcf60c9fe69d749283ed53345020fbf7c250c91453d4b6634c41795e91e072cd46 SHA512 8dbc4f0cee7b30d7381be819152b27653d9b0049266e59bde2e2c972a88c4f2bdea766fc407bbdfef15d0aab30fedc756189a1048170a812853133a5094fe7a5
-EBUILD xload-1.1.3.ebuild 373 BLAKE2B d0d8f802b87812212163fd4db7ccb224ddd4b0178cfa53435c682146389e74c75324f9925ecb0907197a398d85875bec2fb596cc43117a16aa6953759558c42c SHA512 3f7bd858295c56e95d2d1c107bee7091d34567a103cdcf0d561bdcc5cee4ac3c9eb8bf717895ae5c368b9e6ab601046d37c8f00cb4a44bbcd4b802f86957c8c9
+EBUILD xload-1.1.3.ebuild 380 BLAKE2B 8629c2ab95e8a284a8583190b484424fca9044ea4ff460be39ebb7cc8fb169cbfc9c5a930adc23b60e948142f87e9d0eec525ebe5f90efa1a8830912b5498e31 SHA512 57a4b983f0bba2857cee3256312e3ddf8ac6e2568fee7b7a140c75295eace65b9f34443df029b2a56cad4d6729f3f1da3f0dd099ebe00f47e455683bf4eda0e6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xload/xload-1.1.3.ebuild b/x11-apps/xload/xload-1.1.3.ebuild
index d32e2eb2a0f2..9dfb114a25b1 100644
--- a/x11-apps/xload/xload-1.1.3.ebuild
+++ b/x11-apps/xload/xload-1.1.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="system load average display for X"
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 6840d46b89aa..3a6d0825ef58 100644
Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 86a756da0e88..a5f9faa4457c 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -4,9 +4,9 @@ AUX xdm.initd-11 6033 BLAKE2B 713aa81380124326f3dce3604c44e943578d37d0c83b60778b
 AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1beaf8a8714a85f1cfe65032df3e9ea23378b4d2db0057ea7a75ab00e8d5d89ae0d63c766dce05350446f69ffe69bb668d06e2e68b SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e
 AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
+DIST xorg-server-1.20.10.tar.bz2 6307058 BLAKE2B 13306e5f4f7f2b4531f2af5103337defa1d441bff78f20ea4d564a7d046ee546406812b6836fe94ca9323189382754270989b2ac7ded8950ddb2b15562c6ff21 SHA512 a07bee380bb72f2117fe6f831a6e4aded19bea1f2b36e42a019a30348e98d6fe65c0617cf819be9c6b405502f88cafb829df30aab32393774b71f1418a4cefae
 DIST xorg-server-1.20.8.tar.bz2 6309640 BLAKE2B 0dadd3a7afdb768bcd79f99f3670f7efcb919c43ea88870c93df598b080fbbec48f88cfa996fb7bff2363cffe70d42d9b154855691a64ddb26156f1b378512a0 SHA512 ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805
-DIST xorg-server-1.20.9.tar.bz2 6302902 BLAKE2B b5d78f38dcf6a9af980a8d5caab751bd7b159a4af5503f176c5af87cce371ecc71572af67f99f08b5794410d2e9a32379ed0d70ceda9f9e2ed3eb6de3bb5fb72 SHA512 d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6
+EBUILD xorg-server-1.20.10.ebuild 5563 BLAKE2B cd74f6c4817ee56eda4ce99de40089cb027676d197aab2b40da0b74f2586dfc60bbf0691a54b25ec16f0d3adc261803c839f492c6e16cf865e67d60dbfb11be2 SHA512 adbe5b2d65170f72076bc5b902247a6ab9582071a446033f8c4fc6af7208cbb3ebac3f5e373aac075f4e7ba0be7598acdf407bbd5a226a59ac7d6830bb96e02a
 EBUILD xorg-server-1.20.8-r1.ebuild 5854 BLAKE2B eb32dc6bed38399d2ac5090676b8c2561a6878cdac863b0a52b908f5618baae55aa9f90e4caa5e485b8a0237d3b825127f74283694b75a368e3ef0b7c8a6b43e SHA512 c2c30312ceef3ae561c2f84db2c142a15d5fa2714be9971c6fbdcbbb33850873aea85b598893bee0975431e4486af114e91376bfbecd35865630a6f0b8568748
-EBUILD xorg-server-1.20.9.ebuild 5856 BLAKE2B 3637d521acf017fdddcb32bc1d8efc694b7eb332e7cc3390f3684b9e156f8034f119d67e1c3b22e8697c665eb9619a43f79ad0762a934145ce8870812a17dfe5 SHA512 b7006a75914d005a32aabc6638b0f869f1b10c1a3c3b9289eedb360bcdd50595b0d8375b7edfa7a52891162f35797991c0a8a9dd3ba2784ff2af231a92529189
-EBUILD xorg-server-9999.ebuild 5859 BLAKE2B f2099180e8c20d179f765287bb8e0534cf7ddb812ca877f1d861a1c8b5a13390c90209e80010078f6cedf1a93178e08bef5d2d796da983b21daa559fdcc62749 SHA512 56c6716463ac90322ac72790896f101f92fe62ae03ad55268a3fd0ed3a35d820525eea7ef974f9b1d231d502c68f0944fb94ac672a93e9fe9179e83a47fdb77d
+EBUILD xorg-server-9999.ebuild 5560 BLAKE2B 74c8b0f4de73dbd51416d10c6b613b9cb6b1fcae96a0dbc2310a254ab311fe3ac3745b8f20535e9a6786536f77df1ea55dd92a31ce8f65bc4c130e4c22896655 SHA512 23b5b056aead208714911fa6a15f5b65e8a945c071c35ee1a0410e439ebae018dc691e180dc452a1e60d693a7bc9c498f29114f09f6e893681f0012defedc012
 MISC metadata.xml 952 BLAKE2B 48b5bada3b2b3b16ef4806f028b8fe47a4d5cd0d19783ebb585f0389f51df589d3f53c5bff5f5ed883ad61c7e7be0fef94fd5cf11042e23dea5e456faf0a927c SHA512 34955c04ee1488a09997d0d9caf63c9202023d06e0524b74120c5c1def033d9dbc2ce82a5d4c289a6fd98df83e2e09ad54e6a084d164d2416228628df7874198
diff --git a/x11-base/xorg-server/xorg-server-1.20.9.ebuild b/x11-base/xorg-server/xorg-server-1.20.10.ebuild
similarity index 89%
rename from x11-base/xorg-server/xorg-server-1.20.9.ebuild
rename to x11-base/xorg-server/xorg-server-1.20.10.ebuild
index e7dc1b76401c..d32e3820e97a 100644
--- a/x11-base/xorg-server/xorg-server-1.20.9.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.10.ebuild
@@ -10,18 +10,14 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity"
 
-CDEPEND="libglvnd? (
-		media-libs/libglvnd[X]
-		!app-eselect/eselect-opengl
-		!!x11-drivers/nvidia-drivers[-libglvnd(-)]
-	)
-	!libglvnd? ( >=app-eselect/eselect-opengl-1.3.0	)
+CDEPEND="
+	media-libs/libglvnd[X]
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	>=x11-apps/iceauth-1.0.2
@@ -87,7 +83,8 @@ CDEPEND="libglvnd? (
 		sys-auth/elogind[pam]
 		sys-auth/pambase[elogind]
 	)
-	"
+	!!x11-drivers/nvidia-drivers[-libglvnd(-)]
+"
 
 DEPEND="${CDEPEND}
 	sys-devel/flex
@@ -212,15 +209,6 @@ src_install() {
 	find "${ED}"/var -type d -empty -delete || die
 }
 
-pkg_postinst() {
-	if ! use minimal; then
-		# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-		if ! use libglvnd; then
-			eselect opengl set xorg-x11 --use-old
-		fi
-	fi
-}
-
 pkg_postrm() {
 	# Get rid of module dir to ensure opengl-update works properly
 	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index e6b07abb3bb3..ed1a5f6c51e6 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -15,14 +15,10 @@ if [[ ${PV} != 9999* ]]; then
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity"
 
-CDEPEND="libglvnd? (
-		media-libs/libglvnd[X]
-		!app-eselect/eselect-opengl
-		!!x11-drivers/nvidia-drivers[-libglvnd(-)]
-	)
-	!libglvnd? ( >=app-eselect/eselect-opengl-1.3.0	)
+CDEPEND="
+	media-libs/libglvnd[X]
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	>=x11-apps/iceauth-1.0.2
@@ -88,7 +84,8 @@ CDEPEND="libglvnd? (
 		sys-auth/elogind[pam]
 		sys-auth/pambase[elogind]
 	)
-	"
+	!!x11-drivers/nvidia-drivers[-libglvnd(-)]
+"
 
 DEPEND="${CDEPEND}
 	sys-devel/flex
@@ -212,15 +209,6 @@ src_install() {
 	find "${ED}"/var -type d -empty -delete || die
 }
 
-pkg_postinst() {
-	if ! use minimal; then
-		# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-		if ! use libglvnd; then
-			eselect opengl set xorg-x11 --use-old
-		fi
-	fi
-}
-
 pkg_postrm() {
 	# Get rid of module dir to ensure opengl-update works properly
 	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 389f38ad1200..9fe201a2cdc4 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/goocanvas/Manifest b/x11-libs/goocanvas/Manifest
index 7108b94c1429..0cb2c3882c36 100644
--- a/x11-libs/goocanvas/Manifest
+++ b/x11-libs/goocanvas/Manifest
@@ -2,5 +2,5 @@ AUX goocanvas-1.0.0-gold.patch 848 BLAKE2B 5d808bc92fa4acedd0be7610e8b75030a3593
 DIST goocanvas-1.0.0.tar.bz2 570552 BLAKE2B 00b1a3d59448cc2f40dd20b0c97977cfc477a6656f32e2106b3f3bd5c42b8b625e270d9f96de44f30caf83b744b331699e7c6385b5269bf7b22e3bb25a879948 SHA512 fef4364b57dc777b6dcceb026f940121a24a8a3792e8d37d320eb47b7747ab0d54d8d7911b4ff77c21ca2b251937c9312da04221bbc246a07bbf4062689de644
 DIST goocanvas-2.0.4.tar.xz 584272 BLAKE2B 027ab47c1e9c241f74509001426367e86025ec8ea5901cf64c2014f8c32b83ce60870ca754dd15e8982a7023b77d3856b39dbbbdd636de6da47d361cb15a940e SHA512 e57dfd59d9b9cb64deadfeac193c11a89347c7f0e966377cfb98afcc2b46be13fe05d253a96e63dc7e6981c75e6e871040b83d8d0aee95cb62b79965d6be5688
 EBUILD goocanvas-1.0.0.ebuild 1266 BLAKE2B 6a55137d0ae30995f922cd70525420f3bf7fb351ef0091728ded8d59646e30f825e7f82d3e5f96eb06cd8d8b0dcacadcb90f1f5c108c1de009a20c73f453a06d SHA512 584d3fccd213dff57f61b25d57a37fdbdf5c3c6ade0ef400cccd83cc8b724aa76d02d482643412b5fa42117658d3c85233ff6d0174fdbbcd8999b9d2d28ef2b4
-EBUILD goocanvas-2.0.4-r1.ebuild 1220 BLAKE2B 35c7574ee407549c50c6629a000230dc42d0e2a2605b4f5a319ab65425c2fe073a7af7706403c589cdf4bdb2c1076cb580d585303bd4d7ea28501ba95df08aa3 SHA512 0865ed79174460fd99aeb0cfdf3d4f8d502a231b56df84c530ab445b5c86450019474a44c77bfe3f06b0d4a1e5a37d4e0e9eae2e6f9bfb0259be2e6925d5d85c
+EBUILD goocanvas-2.0.4-r1.ebuild 1227 BLAKE2B 12bef2421c5bd19913c73add1a63d84af9089b674bce4acde45359bc447f6acad6617975d18d4edb7275911dfce17c8405f218152cd192c19479321655d1a9a1 SHA512 2af1fa1d870da814e9911ef24d34c6e016ad947fc38916284c5176630055f2ec04a05b9c80e92c1d0896bc8010b75a9ea9ec4c3231079160437bf0ea5d029a7c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild b/x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild
index ecf7cebb1173..81583d0cb590 100644
--- a/x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild
+++ b/x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/GooCanvas"
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="examples +introspection"
 
 RDEPEND="
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 1245148781f9..af82dd0b0b32 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,5 +1,5 @@
 DIST libX11-1.6.12.tar.bz2 2376498 BLAKE2B a2c6c76d5d4a15073f7837e6a72ecd8b7711dfcec48c54da538a6100a4afa01334a9456376633f1a2365717e03231c6b777c5683e462d10564065dc2437da39a SHA512 79df7d61d9009b0dd3b65f67a62189aa0a43799c01026b3d2d534092596a0b67f246af5e398a89eb1ccc61a27335f81be8262b8a39768a76f62d862cd7415a47
 DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
 EBUILD libX11-1.6.12.ebuild 739 BLAKE2B e6cd8b1efb69830827eb1da03aa9d787b476cbedc9365aed49e73fea393f8cc976f66a48a8dafdc919f2df3b8d17cd3e975ffd4302a4b932939ba435643fa20c SHA512 ad71978aaae6e2827d79815147fb22ee2e3d4224ada3ba4a0c48d3cf8f204c936136bf601b4d57b03a7eecb5cac44f7eccaff4c7fc2e0354d1e1debd62bf7944
-EBUILD libX11-1.7.0.ebuild 850 BLAKE2B ae62f3086b5562601b7655b34648d279f07669279becb174a5ee1d8a66cdeb482256af317ec3d271cd8a53a948b70aa4bfbc4a065ecc003e77061c1128af9442 SHA512 c5c03912402202e8aa5fc1942f374af3d36106e8a6673461ceefad9a30ffb99133c36bd7d742736c6f4de6e3f21fc13ff0e1275311445e87629dd51753937591
+EBUILD libX11-1.7.0.ebuild 851 BLAKE2B ec2637c5cad910bd24b4539924b5ab793e10acd8967ae1baa7fa896457d3dbbaedd041f4ff8ccb2fc8cb8e291b3a17962ad2de52e5f2ac3d8801b78196c6b08d SHA512 8e9513e9481fa5bde9b9cceba3f6487e4ebc6f76ddce55c29866a2a96aaf46e9cc30a7260afe98f3efa8068b8a8cfcfe3f1b174eb1808969159db15a603ebbca
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.7.0.ebuild b/x11-libs/libX11/libX11-1.7.0.ebuild
index b074ab686443..583601458334 100644
--- a/x11-libs/libX11/libX11-1.7.0.ebuild
+++ b/x11-libs/libX11/libX11-1.7.0.ebuild
@@ -34,5 +34,5 @@ pkg_setup() {
 
 src_install() {
 	xorg-3_src_install
-	rm -Rf "${D}/usr/share/X11/locale"
+	rm -Rf "${ED}/usr/share/X11/locale"
 }
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 4eeab9bc42fa..b2c1c51afb16 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/cbatticon/Manifest b/x11-misc/cbatticon/Manifest
index 4fe6be3ce441..dde36e73a498 100644
--- a/x11-misc/cbatticon/Manifest
+++ b/x11-misc/cbatticon/Manifest
@@ -1,5 +1,5 @@
 DIST cbatticon-1.6.10.tar.gz 32402 BLAKE2B 91ba6eb581b4cd0b31ae5a49b12970fc7d02d1ba790bffc80886c05ad2b0573ee1aca479d90591498dd6d816bb7e24bee6918e5a8fa8823cf376a3a3da598993 SHA512 cf499eb7ac1d775918a7af01700a9e8eeefd9e31a44fd63c9f38bff83945cea9fb21dde960052768f8d0a0c004caeea115f2d80cb3838789859d43e432eae055
 DIST cbatticon-1.6.5.tar.gz 27951 BLAKE2B 41d43bd7bfd5741e37365bed1541c88e255998a4ba69143f80a9c59ac4f51c280b7d07f3f9aba95063a8c3779c9637f7b4e27b771fade0e6092215b529813bd7 SHA512 5e1648cf3b31fe42aefd0a5e79c4e5dc22c3ce4b6f594f0933229494ca6f2e28e44a7e078ef839de1df0b8c1ba494fce8a58866ad70d056799320f4dea32713b
-EBUILD cbatticon-1.6.10.ebuild 879 BLAKE2B 9eb57d5981dcb9838adb3867c0303e79c858b14d60080beacd02e19d47a59e8449481f0db9339936f0fdf47777e41ff7eed657192c5e0b3c0fa44df421d77ca5 SHA512 3f4ebde055216b84598fbde6e8ef8ccbdcece9a43808bac17343563580cbe81afefd7bcb076a790fb022f787da5a2bdd546e616e1868fcbd6fa6ddefe7e9cd23
+EBUILD cbatticon-1.6.10.ebuild 878 BLAKE2B 9b945387edf685253a18343e0b3f24ea97951142ba100e1f001493a5a8c76025c96ec91e70b92203655c31593c60e22035c36fa97a81f8ff15a162e4d3319506 SHA512 7ecf438312aede920da7dccb57ef6daecf0349e1b37c8582890940d95e2bbc584ce8ce7533ced3dd180975e317ff1e4fe6ad7b817eb32365e4a8a4e51a46752e
 EBUILD cbatticon-1.6.5.ebuild 861 BLAKE2B 2aa73a0b824ce558392943ec003d97f4cf15e736676a890f9f6fc474321410c11849cb306deec6c585c6174421f1a6f797f97fe4c5a34804941bb189a57aead7 SHA512 cbc37a6d09c1a8be7b0f9436a5d97d210b884d8e439570650339a60bd2a5ba2e9dc903c730979e4f7bb4166906a540209d5586d7610e47cce61ed94426438225
 MISC metadata.xml 324 BLAKE2B ee4a0b4dfc25fe37375a21699d236f5a72bc07b5bb6c4dd8990866a5ea3a271aaa19aa5f778ebcfe9f52eb9e7269d1c65267254f9faabcf84d413cb9e0638f22 SHA512 34dfc3da47adc4cdbaa8ffe5dac31f91664a37266599495ec64a819f8afb634373b03bc6a44687dddad86f8b12758a0338679bf290df8a686c6cdc252c21cf8d
diff --git a/x11-misc/cbatticon/cbatticon-1.6.10.ebuild b/x11-misc/cbatticon/cbatticon-1.6.10.ebuild
index 46eda4fa4753..98aa41f159d1 100644
--- a/x11-misc/cbatticon/cbatticon-1.6.10.ebuild
+++ b/x11-misc/cbatticon/cbatticon-1.6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/valr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="libnotify"
 
 RDEPEND="
diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest
index 5f607803b60c..94542926ee56 100644
--- a/x11-misc/grub2-theme-preview/Manifest
+++ b/x11-misc/grub2-theme-preview/Manifest
@@ -1,5 +1,7 @@
 DIST grub2-theme-preview-1.4.2.tar.gz 197383 BLAKE2B e380b63fd700352fa769b86da4aa9204f0f6e375f91134cc306d2bc0b108637c17127cb22ea06259338552cf04c9087a77defa3809c759e6b8931435da79ce98 SHA512 5f53d5da1ac3fa2d6597ee88df28a4e406eb5c824ea126d4386dca3718bfe4350bf399c5a4055479d34d5dd75b947e0f0af19c1533a0ee6474fea550387f676a
 DIST grub2-theme-preview-1.5.1.tar.gz 197976 BLAKE2B 561090bc4ab7fc6d170521380fe595e8db6ef553a5359bd5a1b42e986f2aab52a6c08ce0f5183dd8aa6d87d8bb44410cf6df80cb69781557cadb9f35b19ee5cf SHA512 a96ee503b793707ce59a0a691c3a0b7eaf206d0780de4f3ef53c6d6c05ab23c9dc58774a40043a35bbebdc4becc5414e520b9e5c805953c9145435d644aabfe9
+DIST grub2-theme-preview-2.1.0.tar.gz 198805 BLAKE2B ef0417d49462a78678abfbcaa6b2ad31010cc033467c76291be8f66d4a3e412ac6d015ed4ff55a4aa557e7ed5a7cd33d25a2dd04111fe1ee78af413505fdab78 SHA512 9e8f21b5b84e2564654ffff84149f8421e168bc83c39ad9adf1ba0522de3b3d041c4be3853c6749bfa4d0693e629f43f359724c14b652a599f9c202fe00ba6b1
 EBUILD grub2-theme-preview-1.4.2.ebuild 558 BLAKE2B 317dbdc198362cc346ffec5e7bf1e40fd6c878f045e30979c572f0bff1ee49dfeb2a1c189c5a081a8fac7e074cd5b186af57ecc6a41cf333b6b431321d5566f0 SHA512 13b78b3eb848220ca63b40ac1749473a8642d8af0b97a2e4d6868b063045db533bccd3b9c9af982677407118ad41675a355d0f811c48ea66e5fff40b4454422e
 EBUILD grub2-theme-preview-1.5.1.ebuild 743 BLAKE2B 300937ef4a2f6f4bfbb2fbcf4d06a9d8de98c4302b70cbc38ba189b7aec48891f787608c8c5b2b1dd246b0ec60b96a4bd47a04eb36221472f1584bd1bf111e90 SHA512 25003f6009f5513048e175c7275b2e1e0beb67964cac966fdcec65b65aaa928060e58ed2579341404011b3396b8aa9e68b4bbf5c44acc3b4c58dbf984990f2f9
+EBUILD grub2-theme-preview-2.1.0.ebuild 742 BLAKE2B 9cb7d7478a1f238a43a38968972d75618c83a83f1c348a13691b168452836f3d299082874430c900bc94f29d8c1030187756efb771e7e4fe701bf275727e4033 SHA512 89905b91c88d1d7b90dbc89007df6db8e35f901aa12cfef2cdeef675a38634ba4e2f75c76d38e4a58d65dad0b69be336b95e3f015548423d655e98d37540f6f9
 MISC metadata.xml 342 BLAKE2B b12306a165fac0714ee6a833ed2b8de2a5f598e36e38e42e521b10d5d432e980d0673266b571986d851b2be319520c020b8fba860c4cd6c28d76a8f3e72ec811 SHA512 3577ddbd08dfb9a7c5f35a5e6b102620985a932cef550f48c32298f44864c385e7fcedda171107285452d242dd3e03f60a3e6bce8c814e933cf35388e942f35f
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.1.0.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.1.0.ebuild
new file mode 100644
index 000000000000..49c8ba2a55f2
--- /dev/null
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU"
+HOMEPAGE="https://github.com/hartwork/grub2-theme-preview"
+SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="grub_platforms_efi-64"
+
+RDEPEND="app-emulation/qemu
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-libs/libisoburn
+	sys-fs/mtools
+	grub_platforms_efi-64? (
+		sys-boot/grub:2[grub_platforms_efi-64]
+		sys-firmware/edk2-ovmf
+	)
+	!grub_platforms_efi-64? (
+		sys-boot/grub:2[grub_platforms_pc]
+	)
+"
diff --git a/x11-misc/hsetroot/Manifest b/x11-misc/hsetroot/Manifest
index 27f5580da015..6f15c121cef6 100644
--- a/x11-misc/hsetroot/Manifest
+++ b/x11-misc/hsetroot/Manifest
@@ -3,5 +3,5 @@ AUX hsetroot-1.0.5-XOpenDisplay.patch 346 BLAKE2B 975ebe306ce78411912d676b8334b3
 DIST hsetroot-1.0.2.tar.gz 125535 BLAKE2B 351c022e11e3d82118db451eb6d64ff765018a09fe1ac9cc3b437f7a351d575fca66619fde9671d297b346af7c7f265442d18115388d984554bf1f9af9fbe82d SHA512 51788a6b579b82368ef5e11255ff56e2db978a02f7ad752ba64ec33c56ae5f27c1f0ef3452725d1c7bdb9d97b8a3a5b64422031c9c75a7279c407b8772d5edc3
 DIST hsetroot-1.0.5.tar.gz 12878 BLAKE2B 54e80f00d140a83a950d98663db6555a00ac770bd85826b17d8293e3af27cba2a45c2da5e4c185ca90c6adc35bbf2ccdaa3722d015b31654d5e35f4e65a61366 SHA512 b43f7cd75886e72cb6134446d383d7d9a684c818f2d8a0f829670c8dfca5eaaa1eb6c25f30dda41f3483609b25e8a44a3a3cb3a969bba7f77a9b9df712fa2167
 EBUILD hsetroot-1.0.2.ebuild 741 BLAKE2B ef440b29711e148c34e1f067d7269005afd3ab326c470c9f181d06719c699092219c93737e0f13b2dad111544169f3b6bf280a81b0fb2ba925f934a54d62ea84 SHA512 d46a6a728b029768ff522fbc39067c8f267bd5f27228ef944c82aca9102c5901c56390d2554b709b21e3a007d7ab5f5eb25e860209abd84159e91eaa307acd47
-EBUILD hsetroot-1.0.5.ebuild 1106 BLAKE2B d07155a680acbe2caf232f722c0c31a65dad0e2ebb7884e058e161943f0699cd98f06d7125f4c5138dd8f06eae9a962ce676635117822aa8604d28a115570ec0 SHA512 ff86b27595141be402860500334a54356f1b78ecd8f007315f3055e502a6a170135ea286f0fee22ed28db71007ca59f4ebdc077238b1cde15f05a717fb0f705b
+EBUILD hsetroot-1.0.5.ebuild 1105 BLAKE2B a50b8e1c465c2619135be9c14e270a9529974b88db98481a97dd48747f9c3739ed8d38640fbb15a1177005ec20feb3feb56383e27ba2ac45e6ed173025491f38 SHA512 093f6775874229fd26c950a2d553f68d51251d0313fb9d2826247988df0e7b90dc8fe7f1f391623782710d8475de858024ff95c57f0c7de7e15a3f66155f2bf5
 MISC metadata.xml 1162 BLAKE2B 2a21b9cf3ba91825ce65b577154d19ad0275219373e4d4a9560ab3651a4509ccb1f21ccd1d32abd5e2799a60b0aef21fcc7b27f49b79995d5cf15a4ea90966b4 SHA512 66a8c4cc58859f3a7fca586428330b045056c7557be0186f18f2492ef5b5cedf854e1810622505a3902e6c9bb5e13318d219924e13af9cb2513eb9b52eb3d6a9
diff --git a/x11-misc/hsetroot/hsetroot-1.0.5.ebuild b/x11-misc/hsetroot/hsetroot-1.0.5.ebuild
index 4e3c46e8d213..acdb39716fbd 100644
--- a/x11-misc/hsetroot/hsetroot-1.0.5.ebuild
+++ b/x11-misc/hsetroot/hsetroot-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/himdel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND=">=media-libs/imlib2-1.0.6.2003[X]
 	x11-libs/libX11
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index a7750b249359..d9e06c98655b 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -2,5 +2,5 @@ DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c
 DIST lightdm-gtk-greeter-2.0.7.tar.gz 580726 BLAKE2B 1cb2a92a9bda0e28b718cf033ad01e8a8a955600715c61bc5f27723a1b5f4a4624caa61bbe9bdca13064919116f5f08959db2622a5d6b097998d762ffd9cfc28 SHA512 62ad8d522db9aeea7bd0acc76c989a1d39e8be619847b294048530b2dfbebf5a5982f84daf1a5f49b0a8a7abe3234e1571fb5d4f5429b02867801015f30e4944
 DIST lightdm-gtk-greeter-2.0.8.tar.gz 583426 BLAKE2B ae06ebbc07efe5c0131c07b293671f24683699eb84f12222de8165428e935b98bbf9d1e107eaeca8f10e725a6a11c97d4f4c3d415ada0b0876b0b0a99f21d1ee SHA512 59cad69fd7f17b6a416944804be80f306ed51ee0c55826975c8564f432e8098043b677f6452e9afa290c6ef37ebdc632cd8b79e7a0a712a3407ddbf9f200b0db
 EBUILD lightdm-gtk-greeter-2.0.7-r1.ebuild 2078 BLAKE2B 5e4252ccc3d0fb4102a0f8741a051845cb9953b15004feeee6d62e22a6a385e3ee996da2ce4825e68312fa0bcb58be704e257643601bf9350e00d5d19b7689ef SHA512 8cb1c44379697de9f7328abb26ed83e18b3591dbc52eecd4f74ded1569f4daf44320d9d40dbe0cad547c4e9cccfdf5eecd9cbd7d79292172d02cb70426c989f6
-EBUILD lightdm-gtk-greeter-2.0.8.ebuild 2036 BLAKE2B e1956ef89615324916c7e64cbcae12d4b2bdbd1afa633d70287fa0cbe6105049fae958621c5f7bad47bcbc80c4d7627ec3033c7df81d929576e0e3db018f518b SHA512 98181491111cb95e37e8b5d0ee1c23234f67a04442360ffc74cda04c2c10b3377075369fe049bad87eb19b2f34332217fc840d88c956f898a676dbe04952a249
+EBUILD lightdm-gtk-greeter-2.0.8.ebuild 2034 BLAKE2B 24fef9edce9bec0d542de0918d6573d9f32255e041121d66501e0d60d85d8c880d334dda7fa6d12321be949bdb8a2c39db4b3f756381bd7960fb2b0b19548feb SHA512 e655361f54a16ed0ab33fbc3ae27ca88ec90a998baf086442114089800f9417f9e7bf9ae57bd5c141dd7f79d2cf13789127036be87ee5f52230f84bbbf02cf22
 MISC metadata.xml 338 BLAKE2B d67c21b3faacdf75178e2dd79f1365b5d8891431f2388a959c986f9e21f1da21a5138ba6d1831c4d28f6102a6964850ce3ebe8971d955e68be0d9d97fbfa2fa4 SHA512 2b2065cbe74e2166fc4fe4970fcc01e20dc34c92842e163bcc799d162da39e2cce09f1491e6fc853d5fadd9cb40cc975f0f1e4d57462fbce2442a99441ed7403
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
index a7aeadd0221c..e809fccb60a7 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Xubuntu/${PN}/releases/download/${P}/${P}.tar.gz
 LICENSE="GPL-3 LGPL-3
 	branding? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
 IUSE="appindicator branding"
 
 DEPEND="appindicator? ( dev-libs/libindicator:3 )
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index 0119a9277b00..cb61d5c691f6 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,4 +1,4 @@
 DIST mozo-1.24.0.tar.xz 228180 BLAKE2B 6eb880b82dcb608f84efd8df74e77812f9da68dfa877ec896c6f04fa18088e8e4a82641c715e3620201dbb8a1bea8bb4ded09dd72f50770edae09c1326cbf453 SHA512 e0d217d2e7bb7d2c8df777e51bfb20e8bf4fa1bee0f9f3a9348ec1c8501b386a4afbd8848735ecfa61a0f9576382d784d3ef5b884a2a34af6ba33d3a126fe193
-EBUILD mozo-1.24.0-r1.ebuild 1313 BLAKE2B 245b391e83ec524f3a14f772bccd9771d67ee65bb98b39dd085ec3a70c62fc992792e1aaea7d1f7197e797a6421470f3debacca3ccd9bec4e1f7c9e95321af66 SHA512 5099b3d2be89196d4b177c7186a7ed78dc250f9fcf285cba70c62a055e36da3822b045cacc95c5ae78d8fb325a73fe737bfb30b3014dc9478e9a5f96a6880e4c
+EBUILD mozo-1.24.0-r1.ebuild 1311 BLAKE2B a4ca8365fe09dcaca5e878003f648e154d7910a33f647bd913461c87caa4f811cb9a1ee5d9f61eb9b226068cd60f9d299f338f89dfe57f231b6a96cef4c047a2 SHA512 3b09ae2cd6f82e3026ccd58edffc54c9b0b5fcea8bd03e98a557a7c9d5ee1fc3c803d11db199bb82195ba71818e7ece23e8c444b9f60f471bb749069cd5f71f1
 EBUILD mozo-1.24.0.ebuild 1311 BLAKE2B 31a5bb689aff98fe1f37caea0a4f856262592214f24621ed6be18fba2563c601e0c41f37e96e2605104f2bae7473135e27bf0a7a7530480cec2eab00ba22cf8a SHA512 d7ffdb97ca09abe2814c244accd3d622fced0e385c1723ac22d925ca97e7b9358382540718cb877996dc7d3108156b9a9fc5c866f34e564eb055202d74e7bb56
 MISC metadata.xml 333 BLAKE2B 9901ffa7d882f0f741c95670130db70920ebbe94af75b8d9b72f48f8eb1b48d9425b7ff49dafbe001e5287ff3eafd2d60a8760a262ab6601fecc63642e242591 SHA512 eb3bc4b3cf1cfde5f96cd414138790deae0435e8ba41576e1e44b150defd5fdda0b921d4dbb0798b9653ad5aa7690247fb69cd25d03752f8bde8017419596a76
diff --git a/x11-misc/mozo/mozo-1.24.0-r1.ebuild b/x11-misc/mozo/mozo-1.24.0-r1.ebuild
index 8977a145b152..b9efa4ff3396 100644
--- a/x11-misc/mozo/mozo-1.24.0-r1.ebuild
+++ b/x11-misc/mozo/mozo-1.24.0-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml"
 inherit mate python-r1
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Mozo menu editor for MATE"
diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest
index af23c29d8faa..9da7005d549d 100644
--- a/x11-misc/spnavcfg/Manifest
+++ b/x11-misc/spnavcfg/Manifest
@@ -1,4 +1,6 @@
 AUX spnavcfg-0.3-custom-flags.patch 1568 BLAKE2B b4280b99137f36d9c3a191f25ea9a55785878a004fdf6d581ade55161e1cbd15bd5895ad8d61844a3a19f56e3ba6d226ad49ae6f31550317be0a5894e9e5c6bf SHA512 eaa831d7ef10227bf35b26f5ba32f793b382f6af7b14a147084ac93f4669e8018655cc1df711ed4ae5d0c560b34ea59abb1c1998c4fdb37a362f8130fed80632
+DIST spnavcfg-0.3.1.tar.gz 215460 BLAKE2B f2bd35022399ec085d5c8b08c7514fdac8e974b33e9923a79446fa9552827d5986abf136fdb95ed31d7dbec419eb34ce13039955c6255cff971ffedcd3cc8a02 SHA512 b5e0ef2036eebc971298d95e8a91bd89ade956933919a4a5dc062fd977ff159bba392b0092ac36142fb317a9758c26319b07680b473f9957eda0163146be5408
 DIST spnavcfg-0.3.tar.gz 214774 BLAKE2B aee45a796bd95761e4a7fe922cc5b65185c894e2fa366dea6d7677fc5ac3b7e0345b89eedef7bf8e446c598d66f161bb66fa695c07b433f5a6b7dce5055b6256 SHA512 a3411c32a6c7de2fd1cfa7960e1b0dade88e8c37435a39ded864b4b6f12fd3c8f518dad7a4ac5b465517484e74b3586f12d47e780f655fd7e4c3fea8d6186c80
+EBUILD spnavcfg-0.3.1.ebuild 631 BLAKE2B f8f8fac556180047074ce1669efdf1237d70cda815a2ee2fbd52bc06168030a9b572e84a47cd7d2aa84fdaf254cabe6aa29f81867b37d945f4d13fec754d9fdf SHA512 76850fbf0b33e739ba1633fe4548d4feb516034a61e22c0176461fecd10e0de1b082b22237ab25c02e03eb9f06c1a7ad795caaed58c0ce4fd82167691eaef043
 EBUILD spnavcfg-0.3.ebuild 625 BLAKE2B 6b2af2cb0be40861e6f944463fd63d74cf0e3d42e6c5c4bc969a1542440e960b5d73a2ca103ff9ec24e865fb05c9c3480ca63201d689ed063861463785966248 SHA512 6d4ec044c9b9d9318b4645e759436e7577179c0fba5934cda57850c6dca2da24bca939583aee098b746aafc5cfc2697f3f2cbb17ecda2f53628c165b395b11a2
 MISC metadata.xml 513 BLAKE2B 5730394269a90ee628138e0a865b15053c020dea720f442c4718baed6d6bcf7d2ba55f567085d730ccb04907c2019dcadfb2d226b53e2f91a8bd549e28ab6462 SHA512 4aee293da64f4e77b69be1c4c937787e3e1794d51ef22e3d37a5f6c20e6a3507d27c87b75495406429fdd98cd4ef3ed0d85ec9a7418c13b42422b61beb1b5a04
diff --git a/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild b/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild
new file mode 100644
index 000000000000..3f3ca2c51ac4
--- /dev/null
+++ b/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="GTK-based GUI to configure a space navigator device"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/${PN}%20${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	app-misc/spacenavd[X]"
+
+src_configure() {
+	econf --disable-debug --disable-opt
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 43e2d0fd19a6..308427815f35 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -9,6 +9,6 @@ DIST synergy-2.0.0.tar.gz 5892923 BLAKE2B 661f42031499c9c1b2cbb90d9af45f5210c8e1
 DIST synergy-core-1.12.0-stable.tar.gz 8237539 BLAKE2B deb9729cadd59b9aee058cde6c9a9e01325081af3cbde0b294fb000c4f805bdba72a6c12266e9f0f360b7aca8a40718295e7d34263ad851bb27be54f54d0c1a0 SHA512 234e8eb42624f006aa45dfcf50a80089a82347c7151da040f10066b412f729adf01600bc9ec2274a0941965e91ab7bab74abd398287a20906dd4a70b1948db5a
 DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d
 EBUILD synergy-1.12.0.ebuild 2527 BLAKE2B 7dc96e23c3234f36bb5c943933ae4441e35d19bcc23af3e99bc09a5e5ca9e46dd98c549782f68ad75e3502eba1fe1bed7e6948474954dde50d8b383192073b8a SHA512 d447a624304486d0ac170f85030553fd84a66beffdffc9f66a09fa361554180f47063596df2db86a3d31a4779e7805954648e11833797ad86dc3ba2381c18d81
-EBUILD synergy-1.9.1-r1.ebuild 2578 BLAKE2B 144ef64343b386d5a506e6ac4712e03b38642dfe378517a464ec76806b8c83291443c486084f773e1eeedf6bca02b7d07905fc5c5a774ed294d48a4a8fb5ea9f SHA512 4a148d6b93907b59daca491270df90d922b46e34986c8fd3f52c30036297051a3ac3f71b4fd5f4ae6a1dd8fe284880a6d224b986dfb45f217cb976700cd1431d
+EBUILD synergy-1.9.1-r1.ebuild 2576 BLAKE2B 0eb6ec61eba775809d6c1be030b3e46cd8576dc603d2ff509a2e2b04ac63d06ab150290556fee6bf60456decfc0d26af766ed89c9ae666bc9666a6265864e743 SHA512 e0dce2997aed22355c1d3c9f97cd61b6488f90aea2a58b7ba4d18345cb218053059d4926d1ba0d2f2f42370f75045207214d5797d833a202a4d5e8055d361d24
 EBUILD synergy-2.0.0.ebuild 1429 BLAKE2B cadd551ffa38911e4e825ffd7ada68d08f5fd8278f71af7321af48aefa81a632c608cba876a17dda8a1f66e0b5762e220389b68ac03c2bfbcf5446e51d9969c9 SHA512 9a931df7b5d5f37b3f5d951aafad19fbb24def897a46fb1d37ecab62bc07141d0f3e19e36e0f9cdd3903e44f23e7e83b8fe6daa56944dada2906026878d489fd
 MISC metadata.xml 332 BLAKE2B 04a719c2b19204a1ea7ed755c89b072b271760a85f3b2b7e734796deca104682c147372a1d154d4fdb493d7025e16cfc2012e7d352fdc88dde93d0f3df477b67 SHA512 8c447ce795a81157c40a2839d8845d6db89ee768f70aa397b686b5ec9a7e59fc66f9fec5561e25ab0aed68bcabc369c0c53660ee2a0b7e24b52e169d5debaae0
diff --git a/x11-misc/synergy/synergy-1.9.1-r1.ebuild b/x11-misc/synergy/synergy-1.9.1-r1.ebuild
index 021b8d2d54b8..017f0601c9a4 100644
--- a/x11-misc/synergy/synergy-1.9.1-r1.ebuild
+++ b/x11-misc/synergy/synergy-1.9.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="libressl qt5 test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/xautomation/Manifest b/x11-misc/xautomation/Manifest
index 8eec7fcbca8f..a3bc5352c298 100644
--- a/x11-misc/xautomation/Manifest
+++ b/x11-misc/xautomation/Manifest
@@ -1,3 +1,3 @@
 DIST xautomation-1.09.tar.gz 123995 BLAKE2B fb26c3d7c1ff7bc37412e02eaad9165fc81a908508da5da364e1d44eeb89b7e8cc3b25d9d7cd7dd18467b6abb5ec4e9ad4214e1f49d1ee133906ba0514c4b7f3 SHA512 60de78ef9e4bd605ff2cdf1cd34771940d043a2ba0498a053d54dad82476aa123afe91690e7f57d2f346845d4b1313bc0e4d3df524815265c817961978ef4ad8
-EBUILD xautomation-1.09-r1.ebuild 492 BLAKE2B 2d508c8697606ab91f2ae6727ddaac5ca86541f7fa99ba46b6b638fd2b223bdbedd94c0dfb09517b99a9aaff11d81a26f7a27769600d849745a18920f59ce56c SHA512 8718346d3335b4c12982820f6762eb26d2a8b23af903f8db72687ec993595d4f2efb06b213a3384dea0a0f96b8f7e1e5a52d53479df6433154019e7d4d5cdd32
+EBUILD xautomation-1.09-r1.ebuild 496 BLAKE2B 88c93ec5657240b014d670310f806894651b9ae334aae34e4012150af1cd2fb73a3101172dd293213b43e63ed89020bff360ffd2033a5f748ae7508166e7fd03 SHA512 8ee5f5c9006ebf4f901dd9d9a909dbdb21d2b04684d6e2c6212ef89d44153d5dfe421dedcdadb403467fc65c306e842989c6fd873de7d638408d9fc8ad52253c
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xautomation/xautomation-1.09-r1.ebuild b/x11-misc/xautomation/xautomation-1.09-r1.ebuild
index d78715f36b68..ee773eb1d6fb 100644
--- a/x11-misc/xautomation/xautomation-1.09-r1.ebuild
+++ b/x11-misc/xautomation/xautomation-1.09-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://hoopajoo.net/static/projects/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 
 RDEPEND="
 	>=media-libs/libpng-1.2:0
diff --git a/x11-misc/xdiskusage/Manifest b/x11-misc/xdiskusage/Manifest
index a277ba7cb8c5..2ffc99cdc502 100644
--- a/x11-misc/xdiskusage/Manifest
+++ b/x11-misc/xdiskusage/Manifest
@@ -3,5 +3,5 @@ AUX xdiskusage-1.52-pathbuf.patch 334 BLAKE2B f37d93288cff512a198c05759f50570c09
 DIST xdiskusage-1.51.tgz 54248 BLAKE2B a1e41eef4e3d303c7bc02cb485ab2ca33bb03c57f9713459b68621a611751f5af35be9918bbef86294e70ddcc8e2fb678b5dfa9baa237954a46fd12120bbf96f SHA512 73335bbd5dc3e1f753efb84e7921fe7568f83daae7c4026c8b23fbacc4257b885de56f4dc8f682b03663a56f7def1227b8a4b6abf419aff8ecdd26ae51d4885a
 DIST xdiskusage-1.52.tgz 54458 BLAKE2B 6e91402c4e43e1dfafbd2e689282aea1305ac309a491fd410b16502b2176cfe9a8b17a7379eef5ddea074cc550e7801d91c13db0a7b119b3ab48f32f786f0e5b SHA512 d561f84ca2c8ff73a9abe8c6e34baed430aaa6c6793064b2aa5856249dd4b309d50c3f6b19824a8c948aa8a71f7a3056771937fdce3f3fcb8f2fc8b0f39cdf54
 EBUILD xdiskusage-1.51.ebuild 586 BLAKE2B 5ec139ccb463bf6bd0a6aee0764911cf5bc558cc953b5c17aeab83042288f974995d9c96ea68fe0eceacc1991c5e445b1d152667d47b86378db69fd1eb74a9b6 SHA512 aa6921eb15f6748483dbc3631c99c0c95a9b3133ec7188ebf9c13ace3c84ee15c3bb99b0c18d7193cac18b03f0ca91b6eaf16671cf7a26ed6bb28ab2eacb748c
-EBUILD xdiskusage-1.52.ebuild 675 BLAKE2B bcc0b178091a6b2bc7ae3e30ffb585c504d767b0a6e4024bfa7a68a5ecda637ada2934d5f5184575f7de9e921bfe5e15269073df55dc244907b004c69ae7b102 SHA512 b1b53a166537e46f2b85853f059bb4bc98ef7d25ad0d07e47a84c63505a7f0a70ea45a80863859da2bb7e4c625d2536f9601e8b2295ec5705db58aba6ce6e22e
+EBUILD xdiskusage-1.52.ebuild 682 BLAKE2B 3f42da0ef7c789aae94966e55e7b1301499e4e536fc5aad87f26d0c224c292fba784cc8fd8fc2e4c2831b4ce8190b421324a36a6b762570602b3a272b3f84249 SHA512 3a1ed3de6356ef1ce9fbac3fdaed4ed7cb82f78eeea528e8741dcc844c838f9e877178d1a293ebc669b9eb58f60d0a814ceb56a22c2fb092432f42f76d2c8380
 MISC metadata.xml 366 BLAKE2B 740f17c401fabc3c0a47e332dbcda1c7d6501bf52140a32c3f552dbf05e278394df9c96da54dfd17d366633b091279e144b34199e1999a4c613b9a1d8c68edf6 SHA512 70a6112f01001d3b6d064a925c778eac80c45ff1e8f5fa5474b9c21f4f27062f3eb94cf244e3996a271ab1dd1e6d28f51a201db49cb23f38f579adff27f8aad7
diff --git a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild
index 7449a2fa676e..555166755fd6 100644
--- a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild
+++ b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://xdiskusage.sourceforge.net/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
 
 RDEPEND="
 	>=x11-libs/fltk-1.3:1
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index cdab4a7667b5..9b387e2adda5 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -4,4 +4,4 @@ DIST xosview-1.22.tar.gz 146459 BLAKE2B 7f4920b5b5a765f574694ab64e1d34ad6dbc3389
 EBUILD xosview-1.20-r1.ebuild 1199 BLAKE2B ac32bb78ba75f80e44e1f4274da49e3823aa76d86ab36626bfbb6894f4aed4100c9cccaec494884f0230410d5274db90af18fada6675c8a62d0c58945cff30fb SHA512 6495b16378dddf4a39ba53bf5d781d464ee32e5dcdbcdb1b9ae5e49d22e4841ed7414ccb85037a5292caf7d04bd24b3137f9b2947fea8861e722c6539466d0fe
 EBUILD xosview-1.21.ebuild 1201 BLAKE2B 6530a3f6d4bbc77b80b41477b42eaae3e61f23ae2249df43aa11803d3be2081ebd273cfc0c694b74ab96f2c4e6cc609072ab251aefb398914712511e4f1c5053 SHA512 342579968e7da80b5252a01f8c3d4ddd9e24f9f8bd69ab8997b07c3047797f7a8a14f706eeab1deaae465fab4f22034a6de79676ff255968be78514201f8b012
 EBUILD xosview-1.22.ebuild 1201 BLAKE2B 6530a3f6d4bbc77b80b41477b42eaae3e61f23ae2249df43aa11803d3be2081ebd273cfc0c694b74ab96f2c4e6cc609072ab251aefb398914712511e4f1c5053 SHA512 342579968e7da80b5252a01f8c3d4ddd9e24f9f8bd69ab8997b07c3047797f7a8a14f706eeab1deaae465fab4f22034a6de79676ff255968be78514201f8b012
-MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
+MISC metadata.xml 248 BLAKE2B c7f5029a5618609fad34b55b5c6e79ffe112a902735b964a3139d4ff2619f580af2268acb6bd76d5a0a4300bd6dad7e523474a9d8d12e4dd47ccb69b0d2531b0 SHA512 8363b906d5217879df7f18fdea58938e4ab205decbf5c11dcb6bb36caa58d4596ae669e4964a4660b2d9b475b8a583beb15e9208fa9cd0bb241c423173aa3b98
diff --git a/x11-misc/xosview/metadata.xml b/x11-misc/xosview/metadata.xml
index 66187a0f4213..cc7bf6e4bb7e 100644
--- a/x11-misc/xosview/metadata.xml
+++ b/x11-misc/xosview/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <maintainer type="project">
-                <email>desktop-misc@gentoo.org</email>
-                <name>Gentoo Desktop Miscellaneous Project</name>
+        <maintainer type="person">
+                <email>dilfridge@gentoo.org</email>
         </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xsnow/Manifest b/x11-misc/xsnow/Manifest
index cf9d6c60c6d2..5c018d739d7c 100644
--- a/x11-misc/xsnow/Manifest
+++ b/x11-misc/xsnow/Manifest
@@ -2,5 +2,5 @@ AUX xsnow-3.0.7-gamesdir.patch 317 BLAKE2B 747eb31910be55b1086e05f685d39118e274c
 DIST xsnow-1.42.tar.gz 56752 BLAKE2B b6feefa4aabc464097b099a0e48d27b9bd5d1b82bc02ca187ffd8ab810f3562c1d11ad01f18f79994699e1fb1fa520269976a35634388fbab2838e2e2bb122bd SHA512 7833f3c1834d64944a578dc71bbf09966d47a1b4878fb826cf121606e76c69544d96d73665572b45c47e0e017dd0cb0bf49f76799aeb859c1dc72348da4ff257
 DIST xsnow-3.0.7.tar.gz 322314 BLAKE2B 21c754daddb989a2f0771199d15342d0c08d23669525bbd9672537c200f7ff06d92708c256f2f89b483bb91947374195e4e95c2291425e630883cfe3b9898563 SHA512 1bc58d8c4542839ccc80c7612e472754f7471d2d72c61785b27d8a89d5e6826d40b892628bcea8c7dcfcf22e4c13db76a825a8c580a32f1ea74785f6c478fb79
 EBUILD xsnow-1.42-r2.ebuild 840 BLAKE2B 26e9758f489b23dc14b0bd8fb36a99f70ef559bfa0ecddfa53c30ea103cdfdd1caf739ad4644acce8ea6ac678a33cf23e93235a8aa03dc32df71855502fa4e90 SHA512 92e50bb5485cb268bac62d773447a40a696feffb7ad3ec05f7a5feed52812298cefb58a7a24bac341de7448c777d7607b2d277c9dad4d1d397af1d36696be476
-EBUILD xsnow-3.0.7.ebuild 658 BLAKE2B 3f4c503239a02c9daa1d90663da347605d192ac7312928003fcb333d676e507c4ed8461ed6c7670aba7e3385c409c1e2777273beb685d9ae0738e4652a9a6c61 SHA512 a6255df42783b011fdf782c6dee452c2d2cf47c5c41c571e3bec7bb5bcf8698c2eae154c5c8a5f5eb3243a10ba8d151a41f39ac18c6e7966bd08f6c218cf1b63
-MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
+EBUILD xsnow-3.0.7.ebuild 656 BLAKE2B 58e626e12258b9a2b771f8be450fbc3d58358df9a78b9830104ad2897510a67ba84c4d0b8feb6cf2992c5ce6d2be12dc74f1621f40ee5a5738b9244520817130 SHA512 0787153d77f2499455339bf292318a39149f2517a1374c2b2012d38890060df529cee9554c73d307b22bf00894988e7241b88699219dc3b93d3b99218a9b2f02
+MISC metadata.xml 220 BLAKE2B a2c3e050477292c8000b5bb0ffa26d84a57fb435ba5c96dac5c5f4d6f3e823c07116520102eacefd24227a4490dd340c7836cf8d1ba28d23fc76eeaadf04c7b9 SHA512 594861f664581733d740d9f501b84c56f9c9c67f932e97f5905a37d4f19b5a19ef4045c50571a412fbc64d318f3ad1d403ed37c61449b37e74df3d5753aedda8
diff --git a/x11-misc/xsnow/metadata.xml b/x11-misc/xsnow/metadata.xml
index 2ba8e9e851e4..b1dfcefdcde9 100644
--- a/x11-misc/xsnow/metadata.xml
+++ b/x11-misc/xsnow/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xsnow/xsnow-3.0.7.ebuild b/x11-misc/xsnow/xsnow-3.0.7.ebuild
index e5540612626c..6107414ab28b 100644
--- a/x11-misc/xsnow/xsnow-3.0.7.ebuild
+++ b/x11-misc/xsnow/xsnow-3.0.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/x11-misc/xteddy/Manifest b/x11-misc/xteddy/Manifest
index 5f8b0853db95..87a661adcd13 100644
--- a/x11-misc/xteddy/Manifest
+++ b/x11-misc/xteddy/Manifest
@@ -1,4 +1,4 @@
 AUX xteddy-2.2-linking.patch 477 BLAKE2B 1537f00e5b94f58fce6dc0b0f4fdffd7caddc799fa5f1141504f0f02ded3c563176f569b97a5bfb15dc7c85c6d8f25562ab96abd0f863980cb445a5ecf9c9be1 SHA512 dbfa4207f6e77435b2bef95ae426107c5f397a31e8236a87b05bca86ecd39ce3797a380f4150fa5da3e2016c8ab78b44c6d8e34d69fb8e7619821c285f6c0704
 DIST xteddy-2.2.tar.gz 867005 BLAKE2B e0f701f715c8797d4fea0ac4286bba2412bbb593563d97e621d146f36f843e0e083c6ebdd9b27943482ec00c3e4d0f2c2a1d484ba2360e047eb1a9d92e69172c SHA512 e48f1f616980b747b3e528a7bb3a46605986e87e05cbad1385992931098acd8857cdd9fa7c38bca94007e74d1ab13cfd567fe6e502eecf8691e24272bd98159b
 EBUILD xteddy-2.2.ebuild 713 BLAKE2B 81df26e399dbe378af6b535805ff1ff5941fd01ca822c0b5591d6dd83c37ddd4f40070c51593491647345cd07a40a356a7cc55092f564861355fcec4a8a2a027 SHA512 9e1f47ffeb837e25e30e1e09301988466705b7278e475e3f49babc1c76a247f1eddf493bcc06a1c7222f196dc9ccdcb5027343b9479d62ea631dd47ca76939ce
-MISC metadata.xml 656 BLAKE2B 2cbb02ea0591ab4b42c076026d09bb47e370c174fd7a88c58f8072c423844b8e9c0bf983bbb0268862525c7cc020d303df4b09d3fb3a4011a0476a90323289ce SHA512 788050bff7d1c505d389eafd049bfec1d0237742ed9e4f78c97419633239534c0b46de68f20040c5cef95b3bcdb69f686908dbe7289da3060c9ac37a6962d55d
+MISC metadata.xml 600 BLAKE2B cbb9f02ca6677772acd013dbcbeb088906a932bd3c3bceaead60f72ff89ae9285d3a1039be43f7e2011a4c43bee5545a73bb76ab616a88ad7deeaeb0acc95a62 SHA512 cc4855cd461e4b8cd1eb20d9a59e0b3770b4324b5c550ddee23f181461195b1224e7a021a0c6d9ea7d192b010016ff0df987e09e32e2c6a62f67b19212307583
diff --git a/x11-misc/xteddy/metadata.xml b/x11-misc/xteddy/metadata.xml
index c030175dcef1..6f559bd42fa2 100644
--- a/x11-misc/xteddy/metadata.xml
+++ b/x11-misc/xteddy/metadata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">
 		Normally, xteddy just sits around doing nothing. After all, that's what
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index bc8b4d321ff2..7ab3b1ea864c 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/wmbattery/Manifest b/x11-plugins/wmbattery/Manifest
index 95fd5f7ab967..f265bc949049 100644
--- a/x11-plugins/wmbattery/Manifest
+++ b/x11-plugins/wmbattery/Manifest
@@ -3,5 +3,5 @@ DIST wmbattery-2.51.tar.gz 164657 BLAKE2B f2432c9d31f4440a88ed67a0aa1b3bc494df25
 DIST wmbattery-2.54.tar.gz 87925 BLAKE2B 692549909d52096ecf7997de5122f07d9fd59b3e2d99c1421b871671a9e43f2bbdb9742e89f835a58114238509b8f8b03fd0619da4a66d8e43b6b787d4e5f6a9 SHA512 58c901ed85d3ea7e0c750bb968c3250706ed693162fe4684d75683a3897df7ff02ee4afbe12a5d26b1f1b632d4c6f9902713a632e6784173ea49bad312fd30aa
 EBUILD wmbattery-2.50.ebuild 780 BLAKE2B 17bbe9f6a0608703269710535f78c4a52a3cd99f3df2ffeb91499368ce501b047b8c3acc601db0cbd8f55fbe4a2f4d4fdb6978ac7a445f4e76e94a3535242c78 SHA512 a185eb5952a9653267fb6fdc9d12bd34da6a5ec9b7e473f16a1245e267d8bed82e5a05379b325196b814d7e17c8de8cfc1b5f3d173bee24cb137a869b3563a1a
 EBUILD wmbattery-2.51.ebuild 783 BLAKE2B c4ecb1e35b94f19d51be7b272596e17d296fb5f58dd493e34c701e9c27790ebaad78fae6cd2b871c35b6777b2b1b00adfb38331da5afe5b5cd8f3ce1725a9690 SHA512 b6e04bc74a30f25d7c1448ee73bba9f098b2a1c88fb2bf343e4ad0f9614ae1e095b3a1e82251845aba6acae7097d50fb31999f876a37034af18c0993179be77e
-EBUILD wmbattery-2.54.ebuild 636 BLAKE2B 63f16c203ac0567b973761a77166b4b8a890b3a0f5c3dfaee54e4a3176b711e82c4c3b8477f855c945c7f4ecb1ee8aa12ba53d1f6f3df25e00745941e8c15e03 SHA512 5f4d10ba906be632d1866dfac34134cf4ec741a7c58724852817c58ad8cead01e36a7f3d3a6ec6009031b3ac17795ff6654b348abc816fa4f30b0d88ffe6cfdb
+EBUILD wmbattery-2.54.ebuild 635 BLAKE2B e472f00d99bcc715d520c7f7964e7489ad24e66e5d70cbf99e50c64ebb90d0ffdd3a89083544addff1560b2912e427c92d016869b2420589c591cec098ea359a SHA512 45306a491f89c66500b652d531e145edf57a97c003db0048dbbaeb9968210b91cfd143b08f57b8fb191a47b99fcc5444c54a9906efe1e8bce1f23472bd72f680
 MISC metadata.xml 677 BLAKE2B 4711a784d2e1c2fc8f8daf171e64f9f8233c1f9f34734794481a906e7d97f67eb6c9e729ee76b430276dcc4d55f9bab999414c4b4c4d589f699f3ae6a367268b SHA512 d6101277d76e2e36dec42d8ffe6d99077d09ce288d8ac08b32c93cc9f4f50d6855028126edbacd1bdbfbf695150a35006f3ba3e4ea491b7b8926015d721c5fb2
diff --git a/x11-plugins/wmbattery/wmbattery-2.54.ebuild b/x11-plugins/wmbattery/wmbattery-2.54.ebuild
index 8d5e4ad61989..1163ee081469 100644
--- a/x11-plugins/wmbattery/wmbattery-2.54.ebuild
+++ b/x11-plugins/wmbattery/wmbattery-2.54.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc -sparc ~x86"
+KEYWORDS="~amd64 ~ppc -sparc x86"
 IUSE="apm +upower"
 
 RDEPEND="apm? ( sys-apps/apmd )
diff --git a/x11-plugins/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest
index a2c7936bd220..c4ba260005fc 100644
--- a/x11-plugins/wmbiff/Manifest
+++ b/x11-plugins/wmbiff/Manifest
@@ -5,5 +5,5 @@ DIST wmbiff-0.4.35.tar.gz 265332 BLAKE2B 049f01dafaf71af614c47379fa1e59593e6d790
 DIST wmbiff-0.4.36.tar.gz 266288 BLAKE2B 7f90ae23ff228ed775c4693beffb3e71930bc594083d75cbe25d9eb992cae3a35bc8d57699da53b034a19486846d05625dee607b0da38519ddfc50faac4cf6da SHA512 b8b14f9676ebd576f9e568bd59638c3000337713c6ef8cf5d7799ed0adea59d1ca1fe0d9c67ceb997814b1e6d26590a0c4052b1f031cee28601d7273bbd3fd23
 EBUILD wmbiff-0.4.28.ebuild 825 BLAKE2B 3e27116ec3256f882303581d48c4911aee3f360e581bb58c5da55244e94edc89a978333cd2654b2d49d2e8e141df6b05a236456c5768bb5fd5f7f0c8156518d6 SHA512 cf73dca2d7798577fed2e223f25e66261915220d198edc90884181c7d71c9b6b909e29aee41a7a9a5e284221048b4dc29b97388bba9e3a117cdad73adf2cf283
 EBUILD wmbiff-0.4.35.ebuild 854 BLAKE2B fb2e3f070a2e668f729e5748330d98876ea7108bf8c20dc91d20b49eaf52e562897879249226bd67b717ed2a659009a896c8e955615255c7d447cb18eeee75c0 SHA512 1d69747b719985f878268f8111edfde765613dd31aa135d2eb8d4569b2237b63a384514183f90c118fe47e23a73319f4fda6bf783145438d9ec1bfcae283af88
-EBUILD wmbiff-0.4.36.ebuild 750 BLAKE2B 01fdf4c2bb5e3b5ebe49d67d411e566877fc2fc623f321a76e83cfd4ccca8a5d2c89f9218ca7d478d8bb979abd6c26de5541ebb62e15474b24fd9d83bc773d1c SHA512 02e7dda9a5ed4a4ad050c151b951dde0a62ab66d5cb724df18e3465f4586f353099536241d5471b57d7e0d74b064eac411110912fed14850f978f8febe68e383
+EBUILD wmbiff-0.4.36.ebuild 749 BLAKE2B e6eec09bc83b0d23065c27efe48043d829017ffce44440094ed159ebb864b22e14e63433b7edbc7090b4559fa1d8f9d4aaaaa05125f77d9474e9264c684021bf SHA512 0eef526e14cc7e96a732eb02595790dcc703246d8551aa9049d85ae1b0d286d50a77097f2005b13cbf7ce22c1d03099a7411f9a12e15393eae29bf81a50f0b83
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
index a6b1c8e96a7d..a7c57b290a75 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.36.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="crypt"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmblob/Manifest b/x11-plugins/wmblob/Manifest
index 6ad80f842589..029c94478269 100644
--- a/x11-plugins/wmblob/Manifest
+++ b/x11-plugins/wmblob/Manifest
@@ -1,5 +1,5 @@
 DIST wmblob-1.0.3.tar.bz2 160657 BLAKE2B e36f7b8c6dd38466da490bd85d03ff2f378caced8d5908b00422428223aaa1fc3754bfd35dcacb2f162b0d44c8c04b509cf5c00d678d687e5b90cad886ce98a6 SHA512 4d8c7e30218d9ec7dc965c69e69b0fb5839c468f695ec2cc9fd9bb0b8fbc89b1386122e11b75906169bb16d13dae16cd8287c5bcf8bd28ccbbad4d4f057b3414
 DIST wmblob-1.0.4.tar.bz2 179284 BLAKE2B 79025a4d80c05bd8f9d1a962762680e24ae0eb09c8bf961833f4f4c59b086ecc8563ef71c28678c969da75f1f074c691c9fd6a6919358886e64f7fcb814611a3 SHA512 d325711e6c6c865a97386793a7c3f0e0833044001ccc336f2a4e9974799e5ff00936b0d90a0dc4a3280ba27a8d1f97239ba51d61e6e5b104e7cf82c8aeed5ec1
 EBUILD wmblob-1.0.3.ebuild 742 BLAKE2B b9f20004b0180beb5b3dd5261740cf517bfb0bfe65d37d84457cacef08799ca550cb9b4febddecebfd8e51939ddfe142f14de9d1e2caa253d318f1bc3162a0fc SHA512 d94b21672f157ba2da3808d4e03028a9cefaa952a83ec28a536205ec5e565cbdf1d94e6985ee5f99d112f669f7ea6cb2566477d082c31f1220fc05a220c9e832
-EBUILD wmblob-1.0.4.ebuild 734 BLAKE2B 3737d48814cd8c2659ea2783b270ab871f37eb6bec8b9ba8e4f50b52b475fdbabeb8a916592578082996b1602eb0813df9962d8127612a304f68d2da37ae4099 SHA512 1a1a91ec4294047d4d441cf790d4e5ff88ceeb6f7e4aede06ce68bfa9122a4c995a64d909cd952c4653c56fb6b03ccb95e47fab080fefecdd1ba530b6d0430c4
+EBUILD wmblob-1.0.4.ebuild 732 BLAKE2B 30ff8efe3b1cb23fb76fd5ec1bf69a5827efe314e6af82c1d3e4d4dd262c805b75beaad6bed4acf1eb034b5d522f342cedef0bbf628d8649bfb22b093a529c15 SHA512 4940a898be7cf6c450aaf0d023f54326883f21797c8d1ed2f0fc7b67e590b895fd6de18af158085f502336fe034515e6edb358556d363bb25bc4f59159ab7c73
 MISC metadata.xml 326 BLAKE2B 1da63467b87683bcbb2e3e8a74094449c20b94c5a891a59fa154cb9f0ad21ee89c4bacec8b19bbc74d3ce687f18740eb972a0051e7fbb6794e3b1ef30a83ecb2 SHA512 73f3d392f88613008cd221ee98c5836f324127237cd3e64681b90f7067c3d60ed1b52855e79aada62cd70157fe78cb2c7f7d93c6cc81c58498b8b6734f2dc420
diff --git a/x11-plugins/wmblob/wmblob-1.0.4.ebuild b/x11-plugins/wmblob/wmblob-1.0.4.ebuild
index ac34a60c5f2e..60206498e9ec 100644
--- a/x11-plugins/wmblob/wmblob-1.0.4.ebuild
+++ b/x11-plugins/wmblob/wmblob-1.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/bbidulock/wmblob/releases/download/${PV}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/x11-plugins/wmbutton/Manifest b/x11-plugins/wmbutton/Manifest
index fcbad9de8bbf..abb94d277ec4 100644
--- a/x11-plugins/wmbutton/Manifest
+++ b/x11-plugins/wmbutton/Manifest
@@ -4,5 +4,5 @@ DIST wmbutton-0.7.0.tar.gz 48381 BLAKE2B 051a6da83e575425aca44c88e3011e1c9413d23
 DIST wmbutton-0.7.1.tar.gz 140293 BLAKE2B 55ab4926b833ae4e57e73cbd4e0fdb6177510099a140bd17d1378c31fe4f42a5fa35c1dbe58398412d465ceb99065a3c7a45a496dc3cb71d045edd879bd70f18 SHA512 61e846c2c7edf6375fdf7e86490ef80feab986b24ce83110283b7e336562a670142e326bfda24ddad832c563da0cb4bc2c3d7379e88e647954c6d93a4dcf6068
 DIST wmbutton-buttons.xpm 25003 BLAKE2B 84830b939cf22605977796ab756d03c110bae8e565eec2b75f479a5b19d9027851ef0178e170da34537b0725073f24544dc0f9c1c701f0f0089701bdfaffd87b SHA512 eb73812b8a4060a6bb13a477275224a2e6d50f7b77944f2f674c4995e0053f3d3c667d483c86dda98b69f398fd332e4c836ddf9eb3410e1e29b69449b874537c
 EBUILD wmbutton-0.7.0.ebuild 887 BLAKE2B e3eb678104beadca07744851347b5ca5566c007fc8e6fbf209669d122cf527d68556cd5e8a0cf3311d0b1ea0082d26afe75be449d7152d6b0a839e5da0a51f22 SHA512 80e0788d374244587175b8dff5268d58e27e1cc08c0a0b79a0a6af2ce24dc537c91737b4d24f62a9cb99ddc7a1971eabec27ebe3e43ba8ac669fc55f18b7cbc1
-EBUILD wmbutton-0.7.1.ebuild 469 BLAKE2B 16180e152b2e9729a3da089ede13fb1d72a8e2436f9b01009e7ee14288ef27fe0491a3f1bc970dd9c92145aa68de2ae17b2d1ed1a9692ebad175f4e9414eec4e SHA512 381c3001afcbf2435e5bcce0ec8127c42ec300c285192dc92f81cb1e3be6dbb38ed33f37eadf4b9edf664efbcbee3165b0317d7b4a5a7a606dc1d53f6a36611b
+EBUILD wmbutton-0.7.1.ebuild 468 BLAKE2B 22dad644f40abbae6bd0966b085560cf1438924121f902751c16f2842f479754443e6d622bb36543f00d077115b5e87b3f4a760b08b208c4ab0e356e55ab9619 SHA512 f50eb462507b287e1caabf836bc4c7f028081a2f44a5660907fca5e5f4bb45a0da8a7bec1e80ee601892373d8bcf05585c660835863fdff1ca3ddc1af83d1d12
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild b/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
index c11da385997e..9beb0fa72849 100644
--- a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
+++ b/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
 IUSE="branding"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmix/Manifest b/x11-plugins/wmix/Manifest
index 2df3fe5681a3..ae22999b1da1 100644
--- a/x11-plugins/wmix/Manifest
+++ b/x11-plugins/wmix/Manifest
@@ -5,5 +5,5 @@ DIST wmix-3.4.tar.gz 116220 BLAKE2B 01aac1603c34298d9b4aa45ec3425ec52e75965634f6
 DIST wmix-3.5.tar.gz 118052 BLAKE2B 54461c59d46a2ccf7f81aaf422b9e9fadf260001621396543deb996cb346a1dea5d100b38517b79974acc4d429d6a2f4fcde10e88d114e9f6978d1c0bb599d2e SHA512 ca702368cd5db55958e5f25c9703bf6659987534795fe58fd1ade426220f468ae3979e98ed1a00ffa162b094e53e37974d626a6bc48e2f6099c8c6eaa1f3dfd6
 EBUILD wmix-3.2.ebuild 674 BLAKE2B d7c082f0d5e54415ea880d0ddc08695fdecc7bb4db3916dad02069579cd7aa1101c5f2b2764e3f5a498a9e99e45d4d13758f43e3ed9e1a26bf2b72ca92616b57 SHA512 74e06a9c9b2007284e8688192c60880557208aeab1c23bd0f45ea1470b6f24a0588166ecd24ed1d3660679dca0a2ae808cf7e35ef2b37049d2ae804e1e1cf444
 EBUILD wmix-3.4.ebuild 536 BLAKE2B 940782ea3a564f33dc211a4e880a74801081d1304372c713712ab7a6e609746a382f901aff04d71994e85ab867d0f40d3a8370a76dc45365f6f535c4272fd540 SHA512 b6c13bae7f0b28fe25f37a1fbe162387fe6883e38f9c74f65ef0dbbe6ecb6e1f9045ca8d73110ad8ee33f16779f513078e3fee572fdbf66da5f4a1913b5c6db9
-EBUILD wmix-3.5.ebuild 466 BLAKE2B b2b6fe621ec8e350ceb363b3558a7f72a760344b6be8e2fbe65fb4400e01ab9e7d15b1f34c465bbdeeca1ca0a59da193c2dba7e056b9a8ef1ef42e455dbd98df SHA512 35b1bb0c07e844a7cbbc4c1a3da7ef5e4843e947ad069a2c6224dbd87ef54fb3ab6e1f02c78e023ad8a282a99e1158a83381099fe64ce4113e946e532861b326
+EBUILD wmix-3.5.ebuild 465 BLAKE2B 02456642bd0df0a9a600774a4e1f70dbe42297406be6bac10a412d28dc6e12d2aaf1063c4ee494f57095820d8ba949e28c090ffdd2e427f50beb48aa708469e1 SHA512 d396802d7ffc74cc7ecbc0d40f205fb9bceb9406e2035ca256e33a69a89528b1df20862975f3e3446b9d8a7ef30624a8c375e138dda480f6baef5a57e91d3a47
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmix/wmix-3.5.ebuild b/x11-plugins/wmix/wmix-3.5.ebuild
index a0a0b34ad7b8..1853696d8c69 100644
--- a/x11-plugins/wmix/wmix-3.5.ebuild
+++ b/x11-plugins/wmix/wmix-3.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/alsa-lib
diff --git a/x11-plugins/wmmaiload/Manifest b/x11-plugins/wmmaiload/Manifest
index cfd38728cd61..b17d42baf081 100644
--- a/x11-plugins/wmmaiload/Manifest
+++ b/x11-plugins/wmmaiload/Manifest
@@ -3,5 +3,5 @@ AUX wmmaiload-2.2.1-gtk.patch 6148 BLAKE2B 082a2f93bde9fe08c227770789e1e1b54286f
 DIST wmmaiload-2.2.1.tar.gz 183538 BLAKE2B 5859051ca2040399d1cc3db863e89a1d779a22f9c47a171c11e5bfee6a835b03eaaaa7f47ef95ddc9cb29a24b914e84a4b448600a001959ab5471afa409ec646 SHA512 2f4cd4980feefb1022384880a57aea628d3e976dad7d1c838a23dbeb8bf86df6c061c14661bb562e36c51e2ca40d5f9ed3d465d9d26b9c7b9193fe448dbb9394
 DIST wmmaiload-2.3.0.tar.bz2 42852 BLAKE2B abee44716ff74e48a480881c3327bc4a4f02600044a587b3322429567a3454f01c733542fbaa42cb074a2da48ecd1c453d19ed42c30efc04e634c44330d729d3 SHA512 c4e63eb2868474e3b76f5f4f401bdd23172f23dfdb0e90712e3eca607494057e067805b83a53490d38b6f7b2c876e2ec8fdb1d95b871d3febeeda35369550de9
 EBUILD wmmaiload-2.2.1-r1.ebuild 1067 BLAKE2B 80def6a5e04b70b103f33ea42eddf7baf86237a8933ee6ba65d0f66670021ef48b91a5c74580f1b730e36d4774540f5d86176e97e7636b08503ba99376c359f1 SHA512 7e39a7833f6114e9d4b8da0995bd61c2f1defdeea5649728d9d81e2035d1f8d00ec41f1566853a7416b62eef6c0b6d3bd41a94e8e2d4ae1a962548944be76b63
-EBUILD wmmaiload-2.3.0-r1.ebuild 1116 BLAKE2B 78a3f2fae82c78299db17b17af7eeeeaac2d34893297491653ca4560074a9134040a8a01216e69f8983de2dbb9b3617ad22438a6e1f6c732371cae0c106ac35f SHA512 6b892146fa24ce24f3ee889b7aa93b56b9a7ce2b4992aafa4356ddad2089bd62c0bbc11aca06ca004c91435e35269734e80b0acd17f6df6658f1dc35fdf0660a
+EBUILD wmmaiload-2.3.0-r1.ebuild 1114 BLAKE2B 30e0376578d019b240a9b5d3e1db64d0a1a37b13fd01ad86ca3914deb3a42dd6f1675266991aca78f335933f4800865f21a4d220b8684c3ba42bd1a1c56cf5a4 SHA512 d192ded9a4797a81ea1671e50b8598da7c99eadf6eec1e53e8d1ff8de7baa145043baa55a8b4d55f6cb48a5362e79f0e47f39114c70344c804ba9e97a81fca99
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
index 0fc1edf1cff8..40f3b8d428ab 100644
--- a/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
+++ b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/x11-plugins/wmpasman/Manifest b/x11-plugins/wmpasman/Manifest
index ad3b9a6cd821..5b6ea2aeda71 100644
--- a/x11-plugins/wmpasman/Manifest
+++ b/x11-plugins/wmpasman/Manifest
@@ -4,5 +4,5 @@ DIST wmpasman-2.0.tar.gz 154433 BLAKE2B c6bb3441a34252f450d1d81e83cb400dd242c0f2
 DIST wmpasman-2.2.tar.gz 155077 BLAKE2B d7d9bd1c3e34d4f03661babd42ed5abbf42637709fb2f31358b51fda13dcd682e083af683640a7ef75ae0087f2de179136635e9be3979f9a36a067b5b634fcd2 SHA512 2f24e2ef84d6e5cab1c3a51d032ecabbd21b22e81341ee48b1f86fc96f493d42cde42fd20cf5523f0f8462906cab4f22a2238b6c147b61b33e812f98f32c0157
 EBUILD wmpasman-0.8.5.3.ebuild 626 BLAKE2B d972dffc0fffd94470f3081a4e18db2b9589ce3a14dc51f39f952980d513b0cc5734daf1b86bdf75815de19cda176f483c464ac747cdb4c41e42dad6b5ec5b9a SHA512 8547ea9e379ca454f6431e98a5cc6e4404a127ce4fe78d3f1f298f25bcf9ea52aa2041cffd89a0adf242a9d68e90fc662acf7ae3b172ea50743a4cc8e5428dbd
 EBUILD wmpasman-2.0.ebuild 467 BLAKE2B 402c03eb19ad2a1d6054ad18b8437f84f1b304d2551e17d89bf182f9a66419a6f1f1bc177d5e70dd9b2ffce2a7a62d0cf4cd022f5ed59bff586ca6ebdb446dc2 SHA512 d63f3d5b6ebbd362e2dd4ff2e417e8092744840e6f95d43fbe92103f6cfa405da2ae668a1b4409a8f2943c2d29ec45da69f4dfb689a9c5f36eccbb972de674f0
-EBUILD wmpasman-2.2.ebuild 464 BLAKE2B 8e7cb4190eb09f853fd284be40f0310f2235ac468dbf836e630b5a44b2f0e0c94e43f48716e73888f1db7c12261da50b9486f337a1e82d9d2e597b9e0d5875f5 SHA512 5392b5b8bd60b60f9e0080f9e78f1fd89075a182c285b43bab21f9cdf201906850839d44e66e4005d8066f91fb19ac7f1208dcc3c5a37ffe8ba8446d3204c0ce
+EBUILD wmpasman-2.2.ebuild 463 BLAKE2B c1d74696b6728e3578e84f7010e010bfa42ce9e5c824cbba9c45bfc979a1ee825decf2c9cb8e04cf0f18c2db0e27f3d8f5dcab76ac47518e0dec5ca1286dc31a SHA512 ae1bf543aa64f34b7b56cd5c21f7dcfb260f021d2d37fda4800caf4bbc0fdfde0f20b60f1daf9c827e476f75638ebb62a0ac59e6c0f8e488de523fd978cda7bd
 MISC metadata.xml 603 BLAKE2B 20e83900219fe3124a32af326c94834ffcaa2303a2fcb7d33d30d9943397c88a38b0ed09c6130307ad1a5be45ffbef36d37ccd6f9c28dce8db080f2acfa3ace9 SHA512 5cc8f2cc54d2298a15f330444e0d06f941c74efb88177e4ebb45d36688f22807c65cdf50c9b2f519a78c76336060ea6f815a67013e9df36ef2a2df1a1de0055a
diff --git a/x11-plugins/wmpasman/wmpasman-2.2.ebuild b/x11-plugins/wmpasman/wmpasman-2.2.ebuild
index 5eb588f9aab4..efd06674dcd3 100644
--- a/x11-plugins/wmpasman/wmpasman-2.2.ebuild
+++ b/x11-plugins/wmpasman/wmpasman-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/wmpasman/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="app-crypt/libsecret
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index e28e6ab626a4..50135775c21b 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/tilda/Manifest b/x11-terms/tilda/Manifest
index 8d97620784c9..5d3273e9b8e4 100644
--- a/x11-terms/tilda/Manifest
+++ b/x11-terms/tilda/Manifest
@@ -3,5 +3,5 @@ DIST tilda-1.5.0.tar.gz 484754 BLAKE2B 8f04a5046b642e0cd67d375817d046920bbefd9b4
 DIST tilda-1.5.2.tar.gz 485261 BLAKE2B 2ce0059ad695ac3e920cf8e40841b850967ff1e05b88a1c527b7154112c88a3435b66d0f31b882b6fdaf0dee038b7a7e6ab0401184ab701bed8d23d44a2856d8 SHA512 5f950696626005d6f8711fe1403313b36f065796ac07946e9782997aaf67a4bfdb3bfa5e37889bff95d77655d3546100a48327bfa175aa24c39a28685ee0306a
 EBUILD tilda-1.4.1.ebuild 695 BLAKE2B 33d4ffd0915fcbc42591161eba09ec2a36ad63c45ca31f85b9d471afb9ad5cad1fbe7277b1714153d12c43b1dfcee0cea2764dc08c401727b2ccbf97dfa241a5 SHA512 440c50ad4f9c5e738d948951848f25bfbd9a167374bbbb1cc264594d09911759fa5c5df9d35013db1a4f6411c2ed218252fce532563df42a9a10f51cba2edda6
 EBUILD tilda-1.5.0.ebuild 698 BLAKE2B 339df837f44a5c428b6b13639f5a55c5d34734daf59accff528f769e73187955a2a098ba1069eacdc3d8b3330130be71538e5c810aa11a09b395edb5b01a8308 SHA512 e577adb64da6f0be2635d0c1761d3d63099aaae0721cd62f05e1117224f9165af851e88987682ca1345c1d21f13d8e3e14b15059c2c98dac25b747164659a181
-EBUILD tilda-1.5.2.ebuild 705 BLAKE2B ca1bc4b1d8b0a5af8702ee5fa63aa6934d1b806be38b085d29219069e23b1c032dbefe9c74281305da425e04b922de675ee7bec7b399a784c947e531c28a9115 SHA512 1f2f54154ba34c24e743ea89236f58fafa0b949b98465f67922b12571cdee01d8c0d8639055b1e8ef62ba09f5affb26573e580fe84beb9308fd2df54310f1495
+EBUILD tilda-1.5.2.ebuild 712 BLAKE2B 5123c28038a63c3f8914679f58c51ef84519c1e4ad52bf47ced0d52fe7a7360c07a82b8f3d3e527b627ca83f9a3949ab5a01c9f08061861b8d6b4de783aab134 SHA512 7f62565b0755a6a23c00736c07d15b1e4cca91a27e8f8bac442c7a87aef37b37457a5f98fd6e0034d79e4d20be29b45cace6cb36aeb307521065237b108d084a
 MISC metadata.xml 319 BLAKE2B 69510b8b8d8658d9cc6884a960bd6b2511da1ae40e771c1edcfa836b0f1033bd4b66d5cbdb3d664108d90d0afa77de6caacb42f8f0bed5d9f8c88abeb34463d4 SHA512 013ac97bba6505168215a97c531a4fcac607b678aaf804ffdfb44611b61e930709621bedd71f7fbea06b25f8bd7000530f878cf57c419c9938afd61155ff060a
diff --git a/x11-terms/tilda/tilda-1.5.2.ebuild b/x11-terms/tilda/tilda-1.5.2.ebuild
index 83b145b42c18..247f2520dd04 100644
--- a/x11-terms/tilda/tilda-1.5.2.ebuild
+++ b/x11-terms/tilda/tilda-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lanoxx/tilda/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="x11-libs/vte:2.91
 	>=dev-libs/glib-2.8.4:2
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index c6ef4c1f81cc..49755f490c32 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/faenza-icon-theme/Manifest b/x11-themes/faenza-icon-theme/Manifest
index 5d03707a8b90..c6c603d974d5 100644
--- a/x11-themes/faenza-icon-theme/Manifest
+++ b/x11-themes/faenza-icon-theme/Manifest
@@ -1,3 +1,3 @@
 DIST faenza-icon-theme_1.3.1.tar.gz 24647057 BLAKE2B 3ca9dec15797ac196480d50c2fd2c81356db48ffdd5f42ba07d26841f05e66c18a9f3a7684907ee89f19ed65bb6998abfd455b61f787fa98c561f32403ec9fc4 SHA512 0c017ddbaa2dba485341d3bb1e321fafad026aafc893fa2519ddfd3fe0475fc8d011c99ce3de581c9b1c6aa7d250312673dda7c10bb12783db2d45816646ddc9
-EBUILD faenza-icon-theme-1.3.1.ebuild 1396 BLAKE2B c9c7147767f3dfd4916b2809bbb87a5b7f2a1d62dd3d9946fef1b434962eb747b4020a47cf5add20aab96db4e9cb3991283f8e954a4be95b438aa4bbad8322bf SHA512 79d2dfe3b38c776b5777f0f8533a8eb21f9ba7c7653bbe07f8b4dc242b3eac0d1baae187e061cb28921ccd0e9225fcd306b9a3970228edbf84f0ae31b3d99072
+EBUILD faenza-icon-theme-1.3.1.ebuild 1400 BLAKE2B 23f2dd347bf87a9d27d5afdaa91d2899326c8466cf83ba8ac57ff25482a179966b2296db471ee41bab98baa344fef16d46cce5c6496d77386a2c4106d0900a6d SHA512 ff16e22417cda0a41da0f449aefc53eb6dc5d8a17fdc1c9294a9011d863895a33fc349b2fda913484f98048462288f8276708e767e4ef9a3bde1702b27506cfd
 MISC metadata.xml 363 BLAKE2B ed05676f6960e20d5be63b0cf8af3fc70e321ea62a02c57ff75588d14aea97cbf0dc9b99b1bc33acdb76135131551250f4018db8a6b1a25b25280e134e464792 SHA512 fa1d77fb1a6dd9908d9c0ceb3f1822941b1f47df0ea55391fdd414d1a14e24495bd9c606391b3e01d3a7003467557794ec44bf64bdb61ae365cea9941b83d73a
diff --git a/x11-themes/faenza-icon-theme/faenza-icon-theme-1.3.1.ebuild b/x11-themes/faenza-icon-theme/faenza-icon-theme-1.3.1.ebuild
index dbe0fd18600e..ed16020b395f 100644
--- a/x11-themes/faenza-icon-theme/faenza-icon-theme-1.3.1.ebuild
+++ b/x11-themes/faenza-icon-theme/faenza-icon-theme-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ RESTRICT="binchecks strip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="minimal"
 
 RDEPEND="!minimal? ( x11-themes/adwaita-icon-theme )
diff --git a/x11-themes/gtk-chtheme/Manifest b/x11-themes/gtk-chtheme/Manifest
index 5223776fb4c5..cf9d0e36641e 100644
--- a/x11-themes/gtk-chtheme/Manifest
+++ b/x11-themes/gtk-chtheme/Manifest
@@ -2,5 +2,5 @@ AUX gtk-chtheme-0.3.1-asneeded.patch 798 BLAKE2B 400934bf1efea7ecd2f9e520e925a44
 AUX gtk-chtheme-0.3.1-implicit.patch 542 BLAKE2B a74777d479158e923ab3ac3891705813e389085c295a0733e5750c8c3071685775975296cb743ebf24fac5c55ac55e1617918a3d9c3545f5d62b68cc3921ce20 SHA512 94ac90e53b49bee88b09d4c54671bc0bb8e7dc2767c52bc7821aaf114edb1b75bfd2f1eb8b45532d0338f03cd29b29f40c3ffa00efacd0d1daa8bd82dbf88d3b
 AUX gtk-chtheme-0.3.1-qgtkstyle.patch 484 BLAKE2B 4138c7f0c7b7f7256db7a334381002bd7c90b9a715d5a59fa5f05773299fc14ad3bd9b6dbda9e3e95ec0a98d9386036ab705fddbe93ac122cad01de4c6abd360 SHA512 8a3ce1278155dfa61e69fb639829b652d21dd0946578c6ac0e371cae2e54ea2834cbd15c7124fc02fd2839feda29184b41cd45205d0b56c368435cb1fdfbd1d7
 DIST gtk-chtheme-0.3.1.tar.bz2 18205 BLAKE2B 628f10656be4560c476b74b4c1379a4bafd1cc6a6593852bdce352919663fa10519494ca5cac3f920b036bc7a06f045488635bce91148ebc94613aae1ecb8d3d SHA512 162cdafe81294621f43c5aab550d6bda08a07f9f23456b82d9e885b677ed9e56ee6f602c86ce5b6f2dac5bab91a09d9e97bb07e59c9a393867410bcdcff375dd
-EBUILD gtk-chtheme-0.3.1-r3.ebuild 917 BLAKE2B e4419f233b8e9994cacb991279ca28139d30701ea971a92e5f82d3cd97db70ec636a084566a3fbc7049f29393f8479a558637fe008b58e3ab9ccd790238291fb SHA512 7d2a65dbf749981da3afc4670225201197941810a3c475db8b2da2ac026f0f4bf39bc7ce82b3fdefdf14fac67fe5f81626f041c2cb175e1915319ddc249a5dcc
+EBUILD gtk-chtheme-0.3.1-r3.ebuild 921 BLAKE2B 837b29b1c866655d15a64857f98616d792e32194512ade8cc8e9305fa342b1a3370e3052e56a797c2249b7b5fa07b6755539f17d799b07ea05b176da7ece05b1 SHA512 2c3cd6cf90e40b37e7189fb554a8032c2d896f513aa055381cd0c82233ba507ab2e4cc3ad22e0d2ccb7d13ca51159a9132d8d05fd05178b58615858e17b6f42e
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r3.ebuild b/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r3.ebuild
index 5175d37b2688..8a4738799648 100644
--- a/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r3.ebuild
+++ b/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://plasmasturm.org/programs/gtk-chtheme/${P}.tar.bz2"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 LICENSE="GPL-2"
 
 RDEPEND="x11-libs/gtk+:2"
diff --git a/x11-themes/wm-icons/Manifest b/x11-themes/wm-icons/Manifest
index f982e1cfb580..6ca82799b437 100644
--- a/x11-themes/wm-icons/Manifest
+++ b/x11-themes/wm-icons/Manifest
@@ -1,4 +1,4 @@
 AUX wm-icons-0.4.0-build.patch 673 BLAKE2B a34fd33584928874f4c0a24a34842b640dc1ab4ad030a77d9d596bab1c5eea4cf182c2c06074fe2994cbb7ed09641b43ed5683f51d4976174f608f0fb3cc50d9 SHA512 c55c6b94cfbe4d7502db4c9bb5727fe9858865f7205c06959b483c9a3714d41d22508710322bd17b8aae3259f7b5eb9b01840bb540add3de5d8543b8c72d0b79
 DIST wm-icons-0.4.0.tar.bz2 3433177 BLAKE2B d5d04aaa8da0f0bc8c4887de77febd5a7546981c2f7da0b0869bb2ce9e080488c57ddc4ed89374bb24c0b708c3ac77a6890da4a3624cd98db7e4031336098d98 SHA512 9b21dbb1ac697520792c1e8bfc6b06d4d9933828759571b7af978a670223841fcfe9adcf7f945de3f3a4a39e0d991045d6086be9b293bd89b67cf937262d53a5
-EBUILD wm-icons-0.4.0.ebuild 1225 BLAKE2B 02a6d767f8c995995be84ed72e1c179a8e93ee363a44a322f536773531091c7aca15b4355a680c50cec422816b48dcbf9d79fc4613462a596df68b620bc3b612 SHA512 7431ce294f297cc4e61149037df461c6d5e3ecdee540b610c4d00972f6c3f86edb4c287324e364f41cc90a7ab414afdbf21e1b4b452f1c9a1f6e9f9ed7752c6e
+EBUILD wm-icons-0.4.0.ebuild 1229 BLAKE2B 43cc1b9d8a5306bfc5a1277907928b07ac73c6b65a50fde93647bc4c54ec02c24a0f1b349a879ff3e075ab7825ca34f06ae686649efbf573e5beed70f7aea827 SHA512 cc731fa7b9132ec3a2104971437705829955b487224ad62e98eae0cd93f0530b13a8dee81549f526e66576ba058ed9599ce1d0c017cc0aeba703c55bb3333c7b
 MISC metadata.xml 413 BLAKE2B 8658f6251830bc9b10bb617d272d7b77b5ec50e8af755e0b1b906a931634c723535a46f870aab969762a05a6f5b66f4603e22c43db5c41e02076bf160e9a7b9e SHA512 3ac253166be95b1fc9bdc58cf47efeb6095e8ce37ebb76dc8e9a3db57c9385f4777eb0233a0214b044812639ec9406c1f0c80b3ae20c26f411c8494434b5f5b4
diff --git a/x11-themes/wm-icons/wm-icons-0.4.0.ebuild b/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
index 274b254b905b..133b45ebf592 100644
--- a/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
+++ b/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/wm-icons/wm-icons-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 64d2f6b40192..5fc56200dca7 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 7905d623ea29..9c71a4c94479 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,8 +1,10 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af SHA512 abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
 DIST herbstluftwm-0.8.2.tar.gz 377790 BLAKE2B 88cee9937f134f6784fb5917435f629db67971339b09da8c6b91b55286fc50a7ba9d8dbea98dc583a92f5ae6e0e427dd487265cfb7d1ca4bbc10f865a2532e3e SHA512 1a2bf3861ce23e33bb09afed285f7d85450307b46d00a666d02eaf9c454d53904e4d54ca8b0245da5ef095667a0adf9cdfc3aff170089c99df6b7f01e9038d5f
 DIST herbstluftwm-0.8.3.tar.gz 379052 BLAKE2B e8216d856df7111951842001992cac07b37efa89ba8cd52c804a763135a91512f92902910e726193a2cc902e93dacc1bae1e701ff4c669e164080992a3410bca SHA512 ff6acb64a6609030abfe315452567f7011088b39e123f3fd988448183c4bf1c65aa0ba49ba1b0ab18b959448e12638a8198093db25bcfba828791e3305966ef1
+DIST herbstluftwm-0.9.0.tar.gz 406897 BLAKE2B 06a2d6f303e1cf3990ae5247104952936e374b39ec4be316885718a94741f21c868f084ac7c3d4854d3e2870c26b4037153f3f18bffdb7458e56b3039eb4f1e1 SHA512 a9d4486729a65c8eb87b0d36f0cc28349f670abee82e20c9649e1348298ca5e73f9b349921007d555d620327cc09dab4c24e9c76dd971afc7f4de98b9408d925
 EBUILD herbstluftwm-0.7.2-r1.ebuild 1534 BLAKE2B a88a23d3cdcaf5761198b31112ebeeac213f5e576e3d5e566121713875e1e9b8a78d9c7e63659da6144b6733905f0b2def82761dff36e29400b899670d3c2aec SHA512 8bf19a5fc434271eeafc58a168dd852a8962cd9c8c35ecd2779eb2f195d4fae3942ff7884c96c8177592d4374e4b3bcd63a5c33bee46e73ff5b08b5dd20f0e9f
 EBUILD herbstluftwm-0.8.2.ebuild 1110 BLAKE2B 2079a99b70b18b38e39876135b44532261bee69a94679f2e7941b5baa9cd16b871386d9160121b5faaa0aad064dc7b9d429f47cd3bf0a6f38d9a309344fc9a1d SHA512 56d405e82d5ba44aa8e33e5d3883a528cc4d7b482ed4d00d4345b6e57705f2115ba16c09c8992e7c73558dff7c79094c303c855e176ce12a8fad878fc9e8701d
 EBUILD herbstluftwm-0.8.3.ebuild 954 BLAKE2B f5cad9f6b9303e33f7c57d9551d49f371cc50acbe0489cf12131ae22beb0291a4b6de8c60995cb39f25746524335e5d250baa2ccf5bc1d7de090414c5d0f5118 SHA512 888d78e245b8183e08cd15cffe4d8af680c3facc0c8b10beeef444106761e001a8db9b7ae0950f5a862546058b8b35bcf5655ade47ce0e84623188e2945c904d
-EBUILD herbstluftwm-9999.ebuild 943 BLAKE2B ec900c2b66998af382063030ca5881673ded5492484ec3fff432472869c1366f40712e64c305de09eba20a81a048fbd720412183d62a597cf0731e51425b9afa SHA512 9b7d43645203175a1435e3a40cb8b6851cdac6d1b552d0b65bfac154fe092e7fe605ef376a57f2d9ff95e5b3bd3e6244cc9e5c58289a72472d8db5f0f675df55
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD herbstluftwm-0.9.0.ebuild 930 BLAKE2B 5aa5c8be1806e29b3f0e6f37ecb7132cef0a51b62d58725b0a06768c5b76c1e3e554e819aafd48ca7f6b9e76638b5b99a3584d92dc7fe1748133dfcbf0c906e8 SHA512 8e020bf24206958b7c5d8a6a80da68742b5bf60540a066240dc26865978b257fe30e4002dda510dd12ddf3e3e605b3971525678d132e5058056837a5e08bf795
+EBUILD herbstluftwm-9999.ebuild 919 BLAKE2B ab6e147439be27c948e76f7daa1b011ed3a4623fe6511280501651361bc23081936df36d18f5221cc4616ba3bfb9a9ec697cba5cf147aa94c012c05112edbfc1 SHA512 c702d88eddca8da725f351a7db7c5ce3dadb17ed336646fdabb5b95d5f1df7f8064f9c1ede59e3f68ed52da3fb9d22b09a0474629b38f0db7cd56621bbf67589
+MISC metadata.xml 535 BLAKE2B 0a0d6cc68bc3e5a21d1c561279947f2174ef91ba6d18c487720069928462379a6c4c23affa425236364b711a40f85faf98af78b5f28ea5148f9dcdb8795252f3 SHA512 34849ec9fe1cdd2a40af6c334844c648eb8d26fda26331618adb285d7c9ffa7360cbb07fd963e8a047ace524abee7b17085b38ae153a83c52127b1909b278b5c
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild
new file mode 100644
index 000000000000..c2dc9d85fed9
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake toolchain-funcs
+
+DESCRIPTION="A manual tiling window manager for X"
+HOMEPAGE="https://herbstluftwm.org/"
+SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc examples"
+
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+"
+RDEPEND="
+	${DEPEND}
+	app-shells/bash
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/asciidoc )
+"
+
+src_prepare() {
+	sed -i \
+		-e '/^install.*LICENSEDIR/d' \
+		-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
+		CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_DOCUMENTATION=$(usex doc)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use examples; then
+		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
+	fi
+}
diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
index 4ebb6b1f0ad3..383fa9d17eae 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 toolchain-funcs cmake-utils
+inherit git-r3 toolchain-funcs cmake
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/"
@@ -32,7 +32,7 @@ src_prepare() {
 		-e '/^install.*LICENSEDIR/d' \
 		-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
 		CMakeLists.txt || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -40,11 +40,11 @@ src_configure() {
 		-DWITH_DOCUMENTATION=$(usex doc)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if ! use examples; then
 		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
diff --git a/x11-wm/herbstluftwm/metadata.xml b/x11-wm/herbstluftwm/metadata.xml
index 6f49eba8f496..213c69357452 100644
--- a/x11-wm/herbstluftwm/metadata.xml
+++ b/x11-wm/herbstluftwm/metadata.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>flo@geekplace.eu</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrey_utkin@gentoo.org</email>
+		<name>Andrey Utkin</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">herbstluftwm/herbstluftwm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index f283f19bb0d0..c8ea1f9450ff 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/thunar-shares-plugin/Manifest b/xfce-extra/thunar-shares-plugin/Manifest
index 60991ca4dbe3..e61358bd3a4d 100644
--- a/xfce-extra/thunar-shares-plugin/Manifest
+++ b/xfce-extra/thunar-shares-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST thunar-shares-plugin-0.3.1.tar.bz2 373071 BLAKE2B 25562e8583503a170d15b611aa07c2e1426bee292b8cda4ae9c4eaa6861fa4c1a2fec531b3bdeca6bf06097e4bb2be924fddc07d73633c5f9d714837e8fe80f5 SHA512 08fca3fbf88448808ca84753d867c71114d1700fa63d792771c3c99a6da8c69ee7c53f05f883b2180cb06d2c187ee2a4d1fc889c7f392b1ec0d5981532284a3c
-EBUILD thunar-shares-plugin-0.3.1.ebuild 615 BLAKE2B 2420257c33062fc7a2e0825602eff29a26f2e50569a500b4ce828f2690b8fa49b0cb4a075d66f15595e6c527d229457a3313d9c4c845bb7f0fe801c7e3b64b39 SHA512 d2fb941999e4abd46615eaee75e50f6a552a31e0bc59f31dbc86185a7e78f2094c5a845946e1e841f9441febe9e474d3f148ed358b8f97aa0255b1aa787220a5
+EBUILD thunar-shares-plugin-0.3.1.ebuild 622 BLAKE2B 0e0be5d5dc764e4f34a1b0163cf4a2f3359967783fda861563349bca57adcdc2799fd669fd4c59904fa82be468a7e8b2d021b0e7e856d4ebd42895bf70acabf5 SHA512 4581d274d865fbd846ea9bef37263dafa00bef418eca76501d1dd3bb8c6a30a9f48ea41d1fb0eab4a3c779ce449c5fb464409069958861e926b4498a8f291ec6
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.1.ebuild b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.1.ebuild
index 501566b11ff0..b8133e2cf817 100644
--- a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.1.ebuild
+++ b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/thunar-plugins/thunar-shares-plugin/${PV%.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.18
diff --git a/xfce-extra/xfce4-cpufreq-plugin/Manifest b/xfce-extra/xfce4-cpufreq-plugin/Manifest
index 84fb0766a008..0b553ec3472d 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/Manifest
+++ b/xfce-extra/xfce4-cpufreq-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-cpufreq-plugin-1.2.1.tar.bz2 394576 BLAKE2B ad9646c079b3728680fe82256568d9a57eccb7be959831684c800fb35d00d90069e30c8c5f6bcd12e2872da527ad4ed3d3348586f0a097c7ac67bd1e307d5dee SHA512 60d0f1f36bd2c49701acaf61fc51c434cb591812662f55a8bfc21f6820d34c5b091af0edf3951c958e179019067532afec989940dae23478e792889c8f4d7b0d
 DIST xfce4-cpufreq-plugin-1.2.2.tar.bz2 408480 BLAKE2B da6f38a57126b8ad06dd77c9a1f09ffee78e58b390b53b5020af8da403b51f20ed8965b9d0bd0da2add993228d19ec9fcaa15ea4c22b42011140a8bfdb440dfa SHA512 b0cab40fa0e6cdbb59606d7712b1b1479e4a1e8ca1aa5a59d43fc863ac10eee6477461c827805d7544db49fa6e821f0351973fe650e2ef1520ddcadcbbde096e
 EBUILD xfce4-cpufreq-plugin-1.2.1.ebuild 810 BLAKE2B 24321adaa14dc8fec66f85e481789d71845590bd458ae1c8d4bd9fd80408566a01bfb3d51cbac37140965051c7e9791b3f1fe4e5c6ee9738d9811c5e184773c4 SHA512 ab756b259b693eb55e74447f231054aa3603174bb2946b2ce63cf52a3944f6ba7806ff5ce6af61a91094cea2fa8955b2945f1831249d7a8e530510b1ac9d1a8c
-EBUILD xfce4-cpufreq-plugin-1.2.2.ebuild 801 BLAKE2B e055085857c99b9035e5e8b4414caf9b955906bf7d31beb5b6015898e7b739d0d089c0c857cf404134c9ea456f7252f2d342102ba2fe088008887f72eac0720b SHA512 38f91ca853308ae7b9dc974e3395595fd395fca613f1a4ccd567fc24e1796e061c57e413b4d4fbb25a7d882fab489f6a1bd54b8aa0e535384f6bce1ebb8c2d72
+EBUILD xfce4-cpufreq-plugin-1.2.2.ebuild 808 BLAKE2B 80c8eb54af5cab054ddf19f65ce267f9379ca27dedf2824e56c426562e57604f83116f73f6dcf3c496e9aba906e82d80cfbadbc96f0a4eb1608e61bf81273055 SHA512 38b38bfac8e184db72f84730990afe7ee572210ea90c90289a880b49ebecdd380627150260a4be54556c1221fe340e55a2ea2030c48d0a0e6f200aadb569470e
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.2.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.2.ebuild
index 1305400a5c7d..02b916c4639a 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.2.ebuild
+++ b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.20:=
diff --git a/xfce-extra/xfce4-indicator-plugin/Manifest b/xfce-extra/xfce4-indicator-plugin/Manifest
index fd772a727505..5d0cf17f582e 100644
--- a/xfce-extra/xfce4-indicator-plugin/Manifest
+++ b/xfce-extra/xfce4-indicator-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-indicator-plugin-2.3.4.tar.bz2 406991 BLAKE2B 3d499f9f923e9cc51b25e2bed3dc6dfb6d4413c90d0a1afeacd14e0d1f33c9f9d5bdd6bdeb03a3e61bef0c3ec8cb1d1c766d89d921aaf9610bc797dc99a12219 SHA512 b1fd065c8221ae91d95b540411317cd67bb9b26d46c7cfe85ec90d7ccdcd11e7b8832008c8b6fb5c257e0b1a08360f00ad9da5520108024cc36c63d865ffdca6
-EBUILD xfce4-indicator-plugin-2.3.4.ebuild 1113 BLAKE2B 4310185956297f740b5195525c472fd0ce1a4066d3fb754da85c0b1b44e7e0fe312e2db839c49a0c407e1995283b3a75590cd05791a811fc6e466e3038178942 SHA512 158c88209b122c25402a69bcd51aecebc4e81455f37afea22016e92491dda249750ef4d661990213244cf3f8952ff6c9e59e2454130df743c44c2e4fbd7912a5
+EBUILD xfce4-indicator-plugin-2.3.4.ebuild 1117 BLAKE2B 279106516082dbdb43caa6baeb12ecba0f9170845804dbaca04df10b2d847929aed8357355db87101b48e1700ce1a49a04a36e1fd5488515e3d2ca3c11690687 SHA512 fb74791fdf0900d13bfa170717d1f7a5d07d02600f9fb7b1b5d5d319c493effcfbd5ef85d69d0f316ec3f1e36f4cd0b0b8e36b21caa73ffce1e52d7884e7669f
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.4.ebuild b/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.4.ebuild
index 472a735dc6b5..a19a0da53776 100644
--- a/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.4.ebuild
+++ b/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libindicator-12.10.1:3=
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index 138b6e8425a6..a688482c9ded 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-screenshooter-1.9.7.tar.bz2 536583 BLAKE2B de6376b68a7936f7ea22762449389ddd8ae1bf29f5fb062054691e4dc3f19471b63ef6201e813624cf2ec34c565ec0ac0d1de9db7d1b86296c736def5ab5023e SHA512 364594bd00172f0becb85f8643e4106b4a7b71ac5dad765850f54de011a77175801bd9e7eaab6a8bbb3b1353299fdfa25cc0a4a52d49017f9b51330377eb9add
-EBUILD xfce4-screenshooter-1.9.7.ebuild 1114 BLAKE2B 6ab724f5d42a762c056e5362846889c58c8164ffd9529ffa51dbfa2a5085613177dfb36a7e43e20729f0d01914b224eebd71ee0ddc5ba651bce7f81396f7fc37 SHA512 760f4e8c8173a93de0ac144f5f78026cf66af45f1d4c8092343e2cb0b4dff16dd0124ee9d65179fe76a3e4c4733cf089a3189e8c3a6abc6ac7ba53ee40a5b1b4
+EBUILD xfce4-screenshooter-1.9.7.ebuild 1121 BLAKE2B 16039ff39697a796277e7303664d1e0af0781be1de04a67ccbab89f0feb73ef6d076ce0ba84297cbf0392943623b5d76b31b6ddd32a020e30bc990535a20784c SHA512 65ea209913d87288be164ff707923e0c30800d57f0df38aed17590f61d189bb211df36d8f0d17e6f384733722399027b32da7738c58f611d8d29bceb6e839b29
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild
index d1dd296ed8c9..6c2368f94622 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.16:=
diff --git a/xfce-extra/xfce4-systemload-plugin/Manifest b/xfce-extra/xfce4-systemload-plugin/Manifest
index fe096beb9eb4..66dacc3a52b3 100644
--- a/xfce-extra/xfce4-systemload-plugin/Manifest
+++ b/xfce-extra/xfce4-systemload-plugin/Manifest
@@ -1,4 +1,4 @@
 AUX xfce4-systemload-plugin-1.2.3-panel-4.15.patch 691 BLAKE2B a4957c90625825b4d7d96bacc9072245be6588ce80df567e91a5b6af8dfd4b9a313114195745e24e376081017070c3db3a6ba5b742e0de870d222739a3848774 SHA512 2b0c5090086588a59011138ece073d4b626e84235e0551a1d147e69271037948affe7eb708af12655f2243a57054a9677b4dfc71561a84f9d36354bb9290ecb5
 DIST xfce4-systemload-plugin-1.2.3.tar.bz2 349074 BLAKE2B 74cdc8f759824222faf5da04fd3189210883db1ad1ed138978e8cb31075a390d17f32ffa4648cace7745faadfc818878601c70b89a8da9d7e7961768a3f9caac SHA512 98985b2250bfff3ae8314f5671ec4438f4c53702cf9e1b76563cdc5d1b4b62174d6cfa559603294c1fc8fbbd5e15a833cc112c75b106a85b1e11788ded4da538
-EBUILD xfce4-systemload-plugin-1.2.3.ebuild 824 BLAKE2B 47f19d591352f9fdf43e08ed5ff1394d2d260b40bf7d86ae4be9242bd052afa024e001bdd30a5a4d6b215613eec638371e22d1be521ed2e5b77f98935c0aaa9b SHA512 83ae9d45e2efe380ad235d3ea09970e1d88b3224bb909be46df50626a66a29f3b8667aad8beff649ed38e62518097a681fe655b84b0264466fa86d6d460455b4
+EBUILD xfce4-systemload-plugin-1.2.3.ebuild 831 BLAKE2B 950bebaae05acdfaa3efd1a0968a35fafac3ca3eb8a58ad0ba73919d661f9fca08d6dfcf95981f3a31b0abb606a3861e3eefbd731ce017ccb994a2376d7b1a08 SHA512 74d4427d04f69b2e090f7328c49823d210ca39710e9c2c0dba8f210b248b31f45c7fe09db77622716cf13e6f32f8308293894b78bb3bda8b9f81b5c871c09aa7
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.3.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.3.ebuild
index 79aebb924271..945435ae7f08 100644
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.3.ebuild
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="upower"
 
 RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
diff --git a/xfce-extra/xfce4-xkb-plugin/Manifest b/xfce-extra/xfce4-xkb-plugin/Manifest
index 0d78ce0e83cc..94d000a3f31e 100644
--- a/xfce-extra/xfce4-xkb-plugin/Manifest
+++ b/xfce-extra/xfce4-xkb-plugin/Manifest
@@ -1,4 +1,4 @@
 AUX xfce4-xkb-plugin-0.8.1-panel-4.15.patch 633 BLAKE2B dac32f28a935af31aa7a90bc348a6a82dcaa437ae42156ef026a1e6a1a2a3e982efe56eeab1c128d1359f12ee1af18fe426b8f6af4e2800735ff2fcaa3ce39bd SHA512 cd0d6fe9d6353f26410d1e04f6e3e7e70071c7bb6025aeb4824c89911acb97dc78e8aecc018c88ad61eb5c7ffb5a4c3bb75e0f7b008b04877e8442af4756cd2f
 DIST xfce4-xkb-plugin-0.8.1.tar.bz2 842814 BLAKE2B be6dfce8e605be346dcd0a5259da980ffd4f7160a808de288bcc7c970c47c678dc6dfde8615e21042142221c6ba66d328dd741f3ce70d988c94562ec061230f2 SHA512 4f0362f429489d111544126697880cdb0a768533803a104f73802fe2c5cfbef5efbf6edd658dbb0ef788ae2a3761f1877c191637a6a06d4a5159bc8f71ad524f
-EBUILD xfce4-xkb-plugin-0.8.1.ebuild 1141 BLAKE2B 1edb324b30ade473ac69a6b6f35e73312e3f1943baabdc3c4829395ab224cc25a2693bc06774db583e151c90160f3ec208b5ee4b8782d60caa8b2bc7f8c4af6a SHA512 b5ae5a3287a7569da7d74deab7f63d685140d03fa1adbcf885b6b92bb4e12ad35cf96e72877ad56830df6a58be875fd7f6d51969af5c9deb6bc5f043e8a7e8c1
+EBUILD xfce4-xkb-plugin-0.8.1.ebuild 1148 BLAKE2B 81514b3746a9c21f5b69aa77e60392da1ab73a81b42392cf32706655448820027b35dbeeb1ccccdadceb6175780d29dd5927f27108c42caa34331579f0d40eac SHA512 00e85399100eb8c86bcffbd7aa198f1d22db8a7ad5aef1066671e5e3ad7ce234fb82f85f92612c6b426254740d7a415b762dad2af2b498899e3ca358c74d5a97
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild
index fe250799a9ff..de5974e72236 100644
--- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild
+++ b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 COMMON_DEPEND="gnome-base/librsvg:=